[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: d12c1812ef81d5eb87c23bb3b6d65978ab6d
Author: Matt Turner gentoo org>
AuthorDate: Sat Dec 2 16:22:45 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Dec 2 16:22:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d12c1812
x11-libs/cairo: Drop empty assignments
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-1.18.0.ebuild | 1 -
x11-libs/cairo/cairo-.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.18.0.ebuild
b/x11-libs/cairo/cairo-1.18.0.ebuild
index 40384eee69d7..080fd2318b5c 100644
--- a/x11-libs/cairo/cairo-1.18.0.ebuild
+++ b/x11-libs/cairo/cairo-1.18.0.ebuild
@@ -8,7 +8,6 @@ inherit meson-multilib
if [[ ${PV} == ** ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git;
- SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index 7abcac37db5a..f51355062fef 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -8,7 +8,6 @@ inherit meson-multilib
if [[ ${PV} == ** ]]; then
inherit git-r3
EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git;
- SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~x64-solaris"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/
commit: a1706f49e1fd8c1605c4af96774563e3da549fd4
Author: Matt Turner gentoo org>
AuthorDate: Sat Dec 2 16:22:03 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Dec 2 16:22:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1706f49
x11-libs/cairo: Drop old versions
Bug: https://bugs.gentoo.org/717778
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/Manifest| 1 -
x11-libs/cairo/cairo-1.17.8.ebuild | 100 ---
.../1.17.8-tee-Fix-cairo-wrapper-functions.patch | 109 -
3 files changed, 210 deletions(-)
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 5536b5d0d0f9..644677d49780 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,2 +1 @@
-DIST cairo-1.17.8.tar.bz2 43730163 BLAKE2B
6089b3488425c577ad70896bb82eaad1d26cbbb38b4b38902d1eaf82a47c11170a2b0f0a6439e2cf0efa53db1f49ed74d801f7023de25d381d17e26a185a7bf9
SHA512
86d59c60c0436dde1cced60f11774e08bc483b3310faa066f9cb1cd60e64c4b7d61a27d1f5d4781187b1a3839c7b3e490a7503d09f25dbdcd5be21290f066cf8
DIST cairo-1.18.0.tar.bz2 43979246 BLAKE2B
1afb01a934a41c9f4c2cac0d6f1fd842bfd3297378b7692a0c38786d151ca568a63707ceee4b220da7ec9a605f65eb87b546a78392c5fe652345e749e6d3da6b
SHA512
bd702f3b64061f8add954c243c9b59f5d44271adfa76d997941ddab629ff8018c2a1d3368edf2362573e0018c342c61483de58240c63e15e1e6035d2511d3e40
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild
b/x11-libs/cairo/cairo-1.17.8.ebuild
deleted file mode 100644
index 0a245be4edad..
--- a/x11-libs/cairo/cairo-1.17.8.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson-multilib
-
-if [[ ${PV} == ** ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git;
- SRC_URI=""
-else
-
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
-fi
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="X aqua debug +glib gtk-doc test"
-# Tests need more wiring up like e.g.
https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/.gitlab-ci.yml
-# any2ppm tests seem to hang for now.
-RESTRICT="test !test? ( test )"
-
-RDEPEND="
- >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
- >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/pixman-0.36[${MULTILIB_USEDEP}]
- debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
- glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- test? (
- app-text/ghostscript-gpl
- app-text/poppler[cairo]
- gnome-base/librsvg
- )
- X? ( x11-base/xorg-proto )"
-BDEPEND="
- virtual/pkgconfig
- gtk-doc? ( dev-util/gtk-doc )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-respect-fontconfig.patch
-
- # Upstream
- "${FILESDIR}"/${PV}-tee-Fix-cairo-wrapper-functions.patch
-)
-
-multilib_src_configure() {
- local emesonargs=(
- -Ddwrite=disabled
- -Dfontconfig=enabled
- -Dfreetype=enabled
- -Dpng=enabled
- $(meson_feature aqua quartz)
- $(meson_feature X tee)
- $(meson_feature X xcb)
- $(meson_feature X xlib)
- -Dxlib-xcb=disabled
- -Dxml=disabled
- -Dzlib=enabled
-
- # Requires poppler-glib (poppler[cairo]) which isn't available
in multilib
- $(meson_native_use_feature test tests)
-
- -Dgtk2-utils=disabled
-
- $(meson_feature glib)
- -Dspectre=disabled # only used for tests
- $(meson_feature debug symbol-lookup)
-
- $(meson_use gtk-doc gtk_doc)
- )
-
- meson_src_configure
-}
-
-multilib_src_test() {
- multilib_is_native_abi && meson_src_test
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use gtk-doc; then
- mkdir -p "${ED}"/usr/share/gtk-doc/cairo || die
- mv
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 73fc397dce71939a92e12fed784641572d3bbe66
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Nov 28 05:29:26 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Nov 28 05:29:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73fc397d
x11-libs/cairo: Stabilize 1.18.0 amd64, #916771
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.18.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.18.0.ebuild
b/x11-libs/cairo/cairo-1.18.0.ebuild
index 0dda207b4c2a..40384eee69d7 100644
--- a/x11-libs/cairo/cairo-1.18.0.ebuild
+++ b/x11-libs/cairo/cairo-1.18.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 35b5e2ef722601db52773740bf402d5184fa6ee2
Author: Michał Górny gentoo org>
AuthorDate: Sat Nov 25 16:16:01 2023 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Nov 25 16:16:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b5e2ef
x11-libs/cairo: Stabilize 1.18.0 arm64, #916771
Signed-off-by: Michał Górny gentoo.org>
x11-libs/cairo/cairo-1.18.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.18.0.ebuild
b/x11-libs/cairo/cairo-1.18.0.ebuild
index 0e79ce5a8cbc..34be05e3af73 100644
--- a/x11-libs/cairo/cairo-1.18.0.ebuild
+++ b/x11-libs/cairo/cairo-1.18.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 7bfba4dbd6d46342e5d874b16e9bc52b5bcd391c
Author: Sam James gentoo org>
AuthorDate: Sat Nov 4 09:06:12 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Nov 4 09:06:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bfba4db
x11-libs/cairo: Stabilize 1.18.0 hppa, #916771
Signed-off-by: Sam James gentoo.org>
x11-libs/cairo/cairo-1.18.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.18.0.ebuild
b/x11-libs/cairo/cairo-1.18.0.ebuild
index fc4bbc767ad3..cea43abe88ff 100644
--- a/x11-libs/cairo/cairo-1.18.0.ebuild
+++ b/x11-libs/cairo/cairo-1.18.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 21a6496b0eac96b440f3ae157d19e287f6efc3de
Author: Sam James gentoo org>
AuthorDate: Sat Nov 4 09:06:11 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Nov 4 09:06:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21a6496b
x11-libs/cairo: Stabilize 1.18.0 arm, #916771
Signed-off-by: Sam James gentoo.org>
x11-libs/cairo/cairo-1.18.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.18.0.ebuild
b/x11-libs/cairo/cairo-1.18.0.ebuild
index bda2976504ad..fc4bbc767ad3 100644
--- a/x11-libs/cairo/cairo-1.18.0.ebuild
+++ b/x11-libs/cairo/cairo-1.18.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 0d0ffd812d649bac860d5c6665d0805216000318
Author: Sam James gentoo org>
AuthorDate: Fri Nov 3 23:57:14 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Nov 3 23:57:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d0ffd81
x11-libs/cairo: Stabilize 1.18.0 x86, #916771
Signed-off-by: Sam James gentoo.org>
x11-libs/cairo/cairo-1.18.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.18.0.ebuild
b/x11-libs/cairo/cairo-1.18.0.ebuild
index ccc3d957b603..bda2976504ad 100644
--- a/x11-libs/cairo/cairo-1.18.0.ebuild
+++ b/x11-libs/cairo/cairo-1.18.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 12a2ffdd75ae6634fe940a8c76683dc0444de266
Author: Guillermo Joandet gmail com>
AuthorDate: Sat Sep 23 18:30:45 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Sep 25 00:08:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12a2ffdd
x11-libs/cairo: Version bump to 1.18.0
Signed-off-by: Guillermo Joandet gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33014
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/Manifest| 1 +
x11-libs/cairo/cairo-1.18.0.ebuild | 96 ++
2 files changed, 97 insertions(+)
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index b4450e6885bc..5536b5d0d0f9 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1 +1,2 @@
DIST cairo-1.17.8.tar.bz2 43730163 BLAKE2B
6089b3488425c577ad70896bb82eaad1d26cbbb38b4b38902d1eaf82a47c11170a2b0f0a6439e2cf0efa53db1f49ed74d801f7023de25d381d17e26a185a7bf9
SHA512
86d59c60c0436dde1cced60f11774e08bc483b3310faa066f9cb1cd60e64c4b7d61a27d1f5d4781187b1a3839c7b3e490a7503d09f25dbdcd5be21290f066cf8
+DIST cairo-1.18.0.tar.bz2 43979246 BLAKE2B
1afb01a934a41c9f4c2cac0d6f1fd842bfd3297378b7692a0c38786d151ca568a63707ceee4b220da7ec9a605f65eb87b546a78392c5fe652345e749e6d3da6b
SHA512
bd702f3b64061f8add954c243c9b59f5d44271adfa76d997941ddab629ff8018c2a1d3368edf2362573e0018c342c61483de58240c63e15e1e6035d2511d3e40
diff --git a/x11-libs/cairo/cairo-1.18.0.ebuild
b/x11-libs/cairo/cairo-1.18.0.ebuild
new file mode 100644
index ..ccc3d957b603
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.18.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+if [[ ${PV} == ** ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git;
+ SRC_URI=""
+else
+
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug +glib gtk-doc test"
+# Tests need more wiring up like e.g.
https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/.gitlab-ci.yml
+# any2ppm tests seem to hang for now.
+RESTRICT="test !test? ( test )"
+
+RDEPEND="
+ >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/pixman-0.36[${MULTILIB_USEDEP}]
+ debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
+ glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ test? (
+ app-text/ghostscript-gpl
+ app-text/poppler[cairo]
+ gnome-base/librsvg
+ )
+ X? ( x11-base/xorg-proto )"
+BDEPEND="
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-respect-fontconfig.patch
+)
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Ddwrite=disabled
+ -Dfontconfig=enabled
+ -Dfreetype=enabled
+ -Dpng=enabled
+ $(meson_feature aqua quartz)
+ $(meson_feature X tee)
+ $(meson_feature X xcb)
+ $(meson_feature X xlib)
+ -Dxlib-xcb=disabled
+ -Dzlib=enabled
+
+ # Requires poppler-glib (poppler[cairo]) which isn't available
in multilib
+ $(meson_native_use_feature test tests)
+
+ -Dgtk2-utils=disabled
+
+ $(meson_feature glib)
+ -Dspectre=disabled # only used for tests
+ $(meson_feature debug symbol-lookup)
+
+ $(meson_use gtk-doc gtk_doc)
+ )
+
+ meson_src_configure
+}
+
+multilib_src_test() {
+ multilib_is_native_abi && meson_src_test
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if use gtk-doc; then
+ mkdir -p "${ED}"/usr/share/gtk-doc/cairo || die
+ mv "${ED}"/usr/share/gtk-doc/{html/cairo,cairo/html} || die
+ rmdir "${ED}"/usr/share/gtk-doc/html || die
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: fdc85b19c8d3c14d701b6a6ce79b2d9ed26df357
Author: Alfred Wingate protonmail com>
AuthorDate: Tue Aug 1 21:42:31 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Aug 2 14:51:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdc85b19
x11-libs/cairo: add missing gtk-doc to BDEPEND
https://gitlab.freedesktop.org/cairo/cairo/-/blob/1.17.8/doc/public/meson.build#L133
Closes: https://bugs.gentoo.org/887335
Closes: https://github.com/gentoo/gentoo/pull/32135
Signed-off-by: Alfred Wingate protonmail.com>
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-1.17.8.ebuild | 4 +++-
x11-libs/cairo/cairo-.ebuild | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild
b/x11-libs/cairo/cairo-1.17.8.ebuild
index fe4390edcb24..0a245be4edad 100644
--- a/x11-libs/cairo/cairo-1.17.8.ebuild
+++ b/x11-libs/cairo/cairo-1.17.8.ebuild
@@ -45,7 +45,9 @@ DEPEND="${RDEPEND}
gnome-base/librsvg
)
X? ( x11-base/xorg-proto )"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )"
PATCHES=(
"${FILESDIR}"/${PN}-respect-fontconfig.patch
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index b5264c6c0772..7abcac37db5a 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -45,7 +45,9 @@ DEPEND="${RDEPEND}
gnome-base/librsvg
)
X? ( x11-base/xorg-proto )"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )"
PATCHES=(
"${FILESDIR}"/${PN}-respect-fontconfig.patch
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 20ce65d3eaa63a98cacf924c3bfe6f7dd523ff6c
Author: Matt Turner gentoo org>
AuthorDate: Sun Apr 9 04:01:03 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Sun Apr 9 04:05:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ce65d3
x11-libs/cairo: Drop old versions
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/Manifest | 1 -
x11-libs/cairo/cairo-1.17.6-r1.ebuild | 82 ---
2 files changed, 83 deletions(-)
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 8de7a387b7f5..b4450e6885bc 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,2 +1 @@
-DIST cairo-1.17.6.tar.bz2 43700076 BLAKE2B
05ac766d33e9bdfc5df0347e9a80611554d64886715d1620fbe6f05f36f0134e46e1e6107738d260b380fab5ef2ac609922dce9ebcac01234710d8e2a76e9724
SHA512
1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185
DIST cairo-1.17.8.tar.bz2 43730163 BLAKE2B
6089b3488425c577ad70896bb82eaad1d26cbbb38b4b38902d1eaf82a47c11170a2b0f0a6439e2cf0efa53db1f49ed74d801f7023de25d381d17e26a185a7bf9
SHA512
86d59c60c0436dde1cced60f11774e08bc483b3310faa066f9cb1cd60e64c4b7d61a27d1f5d4781187b1a3839c7b3e490a7503d09f25dbdcd5be21290f066cf8
diff --git a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
deleted file mode 100644
index a44a2cd3aa6a..
--- a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson-multilib
-
-if [[ ${PV} == ** ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git;
- SRC_URI=""
-else
-
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="X aqua debug +glib gtk-doc test"
-RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available
in multilib
-
-RDEPEND="
- >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
- >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/pixman-0.36[${MULTILIB_USEDEP}]
- debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
- glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-respect-fontconfig.patch
-)
-
-multilib_src_configure() {
- local emesonargs=(
- -Dfontconfig=enabled
- -Dfreetype=enabled
- -Dpng=enabled
- $(meson_feature aqua quartz)
- $(meson_feature X tee)
- $(meson_feature X xcb)
- $(meson_feature X xlib)
- -Dxlib-xcb=disabled
- -Dxml=disabled
- -Dzlib=enabled
-
- $(meson_feature test tests)
-
- -Dgtk2-utils=disabled
-
- $(meson_feature glib)
- -Dspectre=disabled # only used for tests
- $(meson_feature debug symbol-lookup)
-
- $(meson_use gtk-doc gtk_doc)
- )
-
- meson_src_configure
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use gtk-doc; then
- mkdir -p "${ED}"/usr/share/gtk-doc/cairo || die
- mv "${ED}"/usr/share/gtk-doc/{html/cairo,cairo/html} || die
- rmdir "${ED}"/usr/share/gtk-doc/html || die
- fi
-}
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: ac6c184952c473db3ec5fdff0928b119f573ac86
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 8 17:17:42 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 8 17:17:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac6c1849
x11-libs/cairo: Stabilize 1.17.8 sparc, #903989
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild
b/x11-libs/cairo/cairo-1.17.8.ebuild
index 83732d84ed81..cbd5c327f61c 100644
--- a/x11-libs/cairo/cairo-1.17.8.ebuild
+++ b/x11-libs/cairo/cairo-1.17.8.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: fdff5df6a9a130ba3db3e56689df4e20d9144cc9
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 8 14:59:17 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 8 14:59:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdff5df6
x11-libs/cairo: Stabilize 1.17.8 ppc64, #903989
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild
b/x11-libs/cairo/cairo-1.17.8.ebuild
index c8bd0faa6f0d..83732d84ed81 100644
--- a/x11-libs/cairo/cairo-1.17.8.ebuild
+++ b/x11-libs/cairo/cairo-1.17.8.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 7e275e7be9cca7706544d25b84e6faa06f8a3877
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 8 14:46:51 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 8 14:46:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e275e7b
x11-libs/cairo: Stabilize 1.17.8 ppc, #903989
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild
b/x11-libs/cairo/cairo-1.17.8.ebuild
index 54245d70bb4e..c8bd0faa6f0d 100644
--- a/x11-libs/cairo/cairo-1.17.8.ebuild
+++ b/x11-libs/cairo/cairo-1.17.8.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 0d22dfce88bb8b3bee06df8dbf643a08f8804442
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 8 10:45:13 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 8 10:45:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d22dfce
x11-libs/cairo: Stabilize 1.17.8 amd64, #903989
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild
b/x11-libs/cairo/cairo-1.17.8.ebuild
index 3564eb4fc891..54245d70bb4e 100644
--- a/x11-libs/cairo/cairo-1.17.8.ebuild
+++ b/x11-libs/cairo/cairo-1.17.8.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: ba81cb2c186428be755742dee45e4d486e1b978e
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 8 09:56:29 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 8 09:56:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba81cb2c
x11-libs/cairo: Stabilize 1.17.8 x86, #903989
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild
b/x11-libs/cairo/cairo-1.17.8.ebuild
index 09a5bf2d2a32..3564eb4fc891 100644
--- a/x11-libs/cairo/cairo-1.17.8.ebuild
+++ b/x11-libs/cairo/cairo-1.17.8.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: be310499b49788db4aa2a7b9b36a901141f00747
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 8 09:01:03 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 8 09:01:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be310499
x11-libs/cairo: Stabilize 1.17.8 arm, #903989
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild
b/x11-libs/cairo/cairo-1.17.8.ebuild
index 3023985509b5..09a5bf2d2a32 100644
--- a/x11-libs/cairo/cairo-1.17.8.ebuild
+++ b/x11-libs/cairo/cairo-1.17.8.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 509277f8bc5033542b4d22a9250e4fbb05a76fcf
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 8 06:17:04 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 8 06:17:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=509277f8
x11-libs/cairo: Stabilize 1.17.8 arm64, #903989
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.8.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild
b/x11-libs/cairo/cairo-1.17.8.ebuild
index fe287a31035e..3023985509b5 100644
--- a/x11-libs/cairo/cairo-1.17.8.ebuild
+++ b/x11-libs/cairo/cairo-1.17.8.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 62cf35e04c65efdc6b5a8ed2670c9b48451571ea
Author: Sam James gentoo org>
AuthorDate: Sat Mar 25 08:07:29 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Mar 25 08:34:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62cf35e0
x11-libs/cairo: further test plumbing
- Only build tests for native ABI because poppler[glib] isn't available for
multilib.
- Depend on poppler[glib] for tests.
- Depend on ghostscript for tests.
But we keep tests restricted for now because they seem to hang for me and
there's
a rather elaborate test setup in CI:
https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/.gitlab-ci.yml.
This partly reverts commit 4350d1484c0ab46f8f74f973438e47ec24e2c01b.
Signed-off-by: Sam James gentoo.org>
x11-libs/cairo/cairo-1.17.8.ebuild | 18 +++---
x11-libs/cairo/cairo-.ebuild | 18 +++---
2 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild
b/x11-libs/cairo/cairo-1.17.8.ebuild
index c32c5a8d50e5..edc9523e91bc 100644
--- a/x11-libs/cairo/cairo-1.17.8.ebuild
+++ b/x11-libs/cairo/cairo-1.17.8.ebuild
@@ -18,8 +18,10 @@ DESCRIPTION="A vector graphics library with cross-device
output support"
HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-IUSE="X aqua debug +glib gtk-doc"
-RESTRICT="test" # Test suite has many failures. Requires poppler-glib, which
isn't available in multilib
+IUSE="X aqua debug +glib gtk-doc test"
+# Tests need more wiring up like e.g.
https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/.gitlab-ci.yml
+# any2ppm tests seem to hang for now.
+RESTRICT="test !test? ( test )"
RDEPEND="
>=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
@@ -37,6 +39,11 @@ RDEPEND="
>=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
)"
DEPEND="${RDEPEND}
+ test? (
+ app-text/ghostscript-gpl
+ app-text/poppler[cairo]
+ gnome-base/librsvg
+ )
X? ( x11-base/xorg-proto )"
BDEPEND="virtual/pkgconfig"
@@ -61,7 +68,8 @@ multilib_src_configure() {
-Dxml=disabled
-Dzlib=enabled
- -Dtests=disabled
+ # Requires poppler-glib (poppler[cairo]) which isn't available
in multilib
+ $(meson_native_use_feature test tests)
-Dgtk2-utils=disabled
@@ -75,6 +83,10 @@ multilib_src_configure() {
meson_src_configure
}
+multilib_src_test() {
+ multilib_is_native_abi && meson_src_test
+}
+
multilib_src_install_all() {
einstalldocs
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index 5ead761e1e7f..21df436410a7 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -18,8 +18,10 @@ DESCRIPTION="A vector graphics library with cross-device
output support"
HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-IUSE="X aqua debug +glib gtk-doc"
-RESTRICT="test" # Test suite has many failures. Requires poppler-glib, which
isn't available in multilib
+IUSE="X aqua debug +glib gtk-doc test"
+# Tests need more wiring up like e.g.
https://gitlab.freedesktop.org/cairo/cairo/-/blob/master/.gitlab-ci.yml
+# any2ppm tests seem to hang for now.
+RESTRICT="test !test? ( test )"
RDEPEND="
>=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
@@ -37,6 +39,11 @@ RDEPEND="
>=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
)"
DEPEND="${RDEPEND}
+ test? (
+ app-text/ghostscript-gpl
+ app-text/poppler[cairo]
+ gnome-base/librsvg
+ )
X? ( x11-base/xorg-proto )"
BDEPEND="virtual/pkgconfig"
@@ -56,7 +63,8 @@ multilib_src_configure() {
-Dxlib-xcb=disabled
-Dzlib=enabled
- -Dtests=disabled
+ # Requires poppler-glib (poppler[cairo]) which isn't available
in multilib
+ $(meson_native_use_feature test tests)
-Dgtk2-utils=disabled
@@ -70,6 +78,10 @@ multilib_src_configure() {
meson_src_configure
}
+multilib_src_test() {
+ multilib_is_native_abi && meson_src_test
+}
+
multilib_src_install_all() {
einstalldocs
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 4350d1484c0ab46f8f74f973438e47ec24e2c01b
Author: Matt Turner gentoo org>
AuthorDate: Sat Mar 25 02:19:44 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Mar 25 02:20:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4350d148
x11-libs/cairo: Disable building tests
Even though tests are restricted, it's still possible to set USE=test
and then configure will fail with missing dependencies.
Closes: https://bugs.gentoo.org/902775
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-1.17.8.ebuild | 6 +++---
x11-libs/cairo/cairo-.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild
b/x11-libs/cairo/cairo-1.17.8.ebuild
index a27acb5ec771..c32c5a8d50e5 100644
--- a/x11-libs/cairo/cairo-1.17.8.ebuild
+++ b/x11-libs/cairo/cairo-1.17.8.ebuild
@@ -18,8 +18,8 @@ DESCRIPTION="A vector graphics library with cross-device
output support"
HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-IUSE="X aqua debug +glib gtk-doc test"
-RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available
in multilib
+IUSE="X aqua debug +glib gtk-doc"
+RESTRICT="test" # Test suite has many failures. Requires poppler-glib, which
isn't available in multilib
RDEPEND="
>=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
@@ -61,7 +61,7 @@ multilib_src_configure() {
-Dxml=disabled
-Dzlib=enabled
- $(meson_feature test tests)
+ -Dtests=disabled
-Dgtk2-utils=disabled
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index 8057aa2f9d64..5ead761e1e7f 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -18,8 +18,8 @@ DESCRIPTION="A vector graphics library with cross-device
output support"
HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-IUSE="X aqua debug +glib gtk-doc test"
-RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available
in multilib
+IUSE="X aqua debug +glib gtk-doc"
+RESTRICT="test" # Test suite has many failures. Requires poppler-glib, which
isn't available in multilib
RDEPEND="
>=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
@@ -56,7 +56,7 @@ multilib_src_configure() {
-Dxlib-xcb=disabled
-Dzlib=enabled
- $(meson_feature test tests)
+ -Dtests=disabled
-Dgtk2-utils=disabled
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 931c76e72531bcea7a9164cad36a0936bb85f71e
Author: Matt Turner gentoo org>
AuthorDate: Mon Mar 20 14:32:50 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Mar 20 14:32:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=931c76e7
x11-libs/cairo: Remove xml backend
Closes: https://bugs.gentoo.org/902143
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index 4803af7d4c3d..8057aa2f9d64 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -54,7 +54,6 @@ multilib_src_configure() {
$(meson_feature X xcb)
$(meson_feature X xlib)
-Dxlib-xcb=disabled
- -Dxml=disabled
-Dzlib=enabled
$(meson_feature test tests)
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: eacd3d5ea964340f9e41932109f8ea313e308b5b
Author: Matt Turner gentoo org>
AuthorDate: Mon Mar 13 19:49:03 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Mar 13 20:07:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eacd3d5e
x11-libs/cairo: Drop old versions
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-1.17.6.ebuild | 100 -
x11-libs/cairo/metadata.xml| 3 --
2 files changed, 103 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.17.6.ebuild
b/x11-libs/cairo/cairo-1.17.6.ebuild
deleted file mode 100644
index 156fa08987a5..
--- a/x11-libs/cairo/cairo-1.17.6.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson-multilib
-
-if [[ ${PV} == ** ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git;
- SRC_URI=""
-else
-
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="X aqua debug gles2-only gles3 +glib gtk-doc opengl test"
-REQUIRED_USE="
- gles2-only? ( !opengl )
- gles3? ( gles2-only )
-"
-RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available
in multilib
-
-RDEPEND="
- >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
- >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/pixman-0.36[${MULTILIB_USEDEP}]
- debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
- gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
- glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-respect-fontconfig.patch
-)
-
-multilib_src_configure() {
- local emesonargs=(
- -Dfontconfig=enabled
- -Dfreetype=enabled
- -Dpng=enabled
- $(meson_feature aqua quartz)
- $(meson_feature X tee)
- $(meson_feature X xcb)
- $(meson_feature X xlib)
- -Dxlib-xcb=disabled
- -Dxml=disabled
- -Dzlib=enabled
-
- $(meson_feature test tests)
-
- -Dgtk2-utils=disabled
-
- $(meson_feature glib)
- -Dspectre=disabled # only used for tests
- $(meson_feature debug symbol-lookup)
-
- $(meson_use gtk-doc gtk_doc)
- )
-
- if use opengl; then
- emesonargs+=(-Dgl-backend=gl)
- elif use gles2-only; then
- if use gles3; then
- emesonargs+=(-Dgl-backend=glesv3)
- else
- emesonargs+=(-Dgl-backend=glesv2)
- fi
- else
- emesonargs+=(-Dgl-backend=disabled)
- fi
-
- meson_src_configure
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use gtk-doc; then
- mkdir -p "${ED}"/usr/share/gtk-doc/cairo || die
- mv "${ED}"/usr/share/gtk-doc/{html/cairo,cairo/html} || die
- rmdir "${ED}"/usr/share/gtk-doc/html || die
- fi
-}
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index bdaadf1326b7..8b4901f0d9a8 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -6,9 +6,6 @@
X11
-Build the OpenGL
backend
-Build the OpenGL ES 2 backend
-Use OpenGL ES 3.0
features (instead of ES 2.0; requires USE=gles2-only)
Compile with GLib Object System support
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 5493ebe30ad246df5fc1541b9f9de21130b19357
Author: Arthur Zamarin gentoo org>
AuthorDate: Mon Mar 13 19:17:23 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Mar 13 19:17:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5493ebe3
x11-libs/cairo: Stabilize 1.17.6-r1 sparc, #898950
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
index b5f91f28230d..a44a2cd3aa6a 100644
--- a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: fe657171a3d3e336ad67a820ffa145ac0e31c2fe
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Mar 4 13:49:13 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Mar 4 13:49:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe657171
x11-libs/cairo: Stabilize 1.17.6-r1 ppc64, #898950
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
index 3b2e47825c19..b5f91f28230d 100644
--- a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 635c6f9853a641126e72b7e7ac7060baa8a5dbb6
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Mar 4 07:02:31 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Mar 4 07:02:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=635c6f98
x11-libs/cairo: Stabilize 1.17.6-r1 ppc, #898950
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
index 4e41fa72cfb2..3b2e47825c19 100644
--- a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 1914a50c197820d5b6d00989742b0cb24e2eea45
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Mar 3 18:46:22 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Mar 3 18:46:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1914a50c
x11-libs/cairo: Stabilize 1.17.6-r1 amd64, #898950
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
index 79504866fde3..4e41fa72cfb2 100644
--- a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 4c207f622a1e19dfda3423781e298a63ef07957b
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Mar 3 18:41:55 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Mar 3 18:41:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c207f62
x11-libs/cairo: Stabilize 1.17.6-r1 x86, #898950
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
index b73b40350eca..79504866fde3 100644
--- a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: ddec814ed063da7b9c9ccc521bd171fea9f6c7a2
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Mar 3 05:56:38 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Mar 3 05:56:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddec814e
x11-libs/cairo: Stabilize 1.17.6-r1 arm64, #898950
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
index 3b22ae19fe25..b73b40350eca 100644
--- a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: a5eb00a0d807e6ebafc0cfb1646509ef8f8004b9
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Mar 3 05:56:30 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Mar 3 05:56:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5eb00a0
x11-libs/cairo: Stabilize 1.17.6-r1 hppa, #898950
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
index b6710b153eba..3b22ae19fe25 100644
--- a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 5325f155f3d34e2ea9f5220e22324988938e79f1
Author: Arthur Zamarin gentoo org>
AuthorDate: Thu Mar 2 19:52:09 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Mar 2 19:52:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5325f155
x11-libs/cairo: Stabilize 1.17.6-r1 arm, #898950
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
index 4803af7d4c3d..b6710b153eba 100644
--- a/x11-libs/cairo/cairo-1.17.6-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/
commit: 19503f976ef7032187350847b70aace960173ec8
Author: Matt Turner gentoo org>
AuthorDate: Wed Mar 1 19:27:47 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Mar 1 20:43:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19503f97
x11-libs/cairo: Version bump to 1.17.8
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/Manifest| 1 +
x11-libs/cairo/cairo-1.17.8.ebuild | 86
.../1.17.8-tee-Fix-cairo-wrapper-functions.patch | 109 +
3 files changed, 196 insertions(+)
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 7a62019cb85a..8de7a387b7f5 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1 +1,2 @@
DIST cairo-1.17.6.tar.bz2 43700076 BLAKE2B
05ac766d33e9bdfc5df0347e9a80611554d64886715d1620fbe6f05f36f0134e46e1e6107738d260b380fab5ef2ac609922dce9ebcac01234710d8e2a76e9724
SHA512
1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185
+DIST cairo-1.17.8.tar.bz2 43730163 BLAKE2B
6089b3488425c577ad70896bb82eaad1d26cbbb38b4b38902d1eaf82a47c11170a2b0f0a6439e2cf0efa53db1f49ed74d801f7023de25d381d17e26a185a7bf9
SHA512
86d59c60c0436dde1cced60f11774e08bc483b3310faa066f9cb1cd60e64c4b7d61a27d1f5d4781187b1a3839c7b3e490a7503d09f25dbdcd5be21290f066cf8
diff --git a/x11-libs/cairo/cairo-1.17.8.ebuild
b/x11-libs/cairo/cairo-1.17.8.ebuild
new file mode 100644
index ..a27acb5ec771
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.17.8.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+if [[ ${PV} == ** ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git;
+ SRC_URI=""
+else
+
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug +glib gtk-doc test"
+RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available
in multilib
+
+RDEPEND="
+ >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/pixman-0.36[${MULTILIB_USEDEP}]
+ debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
+ glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-respect-fontconfig.patch
+
+ # Upstream
+ "${FILESDIR}"/${PV}-tee-Fix-cairo-wrapper-functions.patch
+)
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Ddwrite=disabled
+ -Dfontconfig=enabled
+ -Dfreetype=enabled
+ -Dpng=enabled
+ $(meson_feature aqua quartz)
+ $(meson_feature X tee)
+ $(meson_feature X xcb)
+ $(meson_feature X xlib)
+ -Dxlib-xcb=disabled
+ -Dxml=disabled
+ -Dzlib=enabled
+
+ $(meson_feature test tests)
+
+ -Dgtk2-utils=disabled
+
+ $(meson_feature glib)
+ -Dspectre=disabled # only used for tests
+ $(meson_feature debug symbol-lookup)
+
+ $(meson_use gtk-doc gtk_doc)
+ )
+
+ meson_src_configure
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if use gtk-doc; then
+ mkdir -p "${ED}"/usr/share/gtk-doc/cairo || die
+ mv "${ED}"/usr/share/gtk-doc/{html/cairo,cairo/html} || die
+ rmdir "${ED}"/usr/share/gtk-doc/html || die
+ fi
+}
diff --git a/x11-libs/cairo/files/1.17.8-tee-Fix-cairo-wrapper-functions.patch
b/x11-libs/cairo/files/1.17.8-tee-Fix-cairo-wrapper-functions.patch
new file mode 100644
index ..a9bf577f9616
--- /dev/null
+++ b/x11-libs/cairo/files/1.17.8-tee-Fix-cairo-wrapper-functions.patch
@@ -0,0 +1,109 @@
+From
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: fa5a90b58a64a24730d51462510acedb9490b0c1
Author: Sam James gentoo org>
AuthorDate: Tue Jan 31 18:25:24 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Jan 31 18:26:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa5a90b5
x11-libs/cairo: drop opengl backend
Dropped entirely upstream in
https://gitlab.freedesktop.org/cairo/cairo/-/commit/47a932bffc16323b58e3c8f9bc3fe0d821838a84
and caused build failures with USE=-X.
As discussed in #gentoo-desktop.
Closes: https://bugs.gentoo.org/879045
Signed-off-by: Sam James gentoo.org>
.../{cairo-.ebuild => cairo-1.17.6-r1.ebuild} | 22 ++
x11-libs/cairo/cairo-.ebuild | 22 ++
2 files changed, 4 insertions(+), 40 deletions(-)
diff --git a/x11-libs/cairo/cairo-.ebuild
b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
similarity index 81%
copy from x11-libs/cairo/cairo-.ebuild
copy to x11-libs/cairo/cairo-1.17.6-r1.ebuild
index 74987be53131..4803af7d4c3d 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,11 +18,7 @@ DESCRIPTION="A vector graphics library with cross-device
output support"
HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-IUSE="X aqua debug gles2-only gles3 +glib gtk-doc opengl test"
-REQUIRED_USE="
- gles2-only? ( !opengl )
- gles3? ( gles2-only )
-"
+IUSE="X aqua debug +glib gtk-doc test"
RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available
in multilib
RDEPEND="
@@ -33,9 +29,7 @@ RDEPEND="
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
>=x11-libs/pixman-0.36[${MULTILIB_USEDEP}]
debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
- gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] )
X? (
>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
@@ -74,18 +68,6 @@ multilib_src_configure() {
$(meson_use gtk-doc gtk_doc)
)
- if use opengl; then
- emesonargs+=(-Dgl-backend=gl)
- elif use gles2-only; then
- if use gles3; then
- emesonargs+=(-Dgl-backend=glesv3)
- else
- emesonargs+=(-Dgl-backend=glesv2)
- fi
- else
- emesonargs+=(-Dgl-backend=disabled)
- fi
-
meson_src_configure
}
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index 74987be53131..4803af7d4c3d 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,11 +18,7 @@ DESCRIPTION="A vector graphics library with cross-device
output support"
HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-IUSE="X aqua debug gles2-only gles3 +glib gtk-doc opengl test"
-REQUIRED_USE="
- gles2-only? ( !opengl )
- gles3? ( gles2-only )
-"
+IUSE="X aqua debug +glib gtk-doc test"
RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available
in multilib
RDEPEND="
@@ -33,9 +29,7 @@ RDEPEND="
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
>=x11-libs/pixman-0.36[${MULTILIB_USEDEP}]
debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
- gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] )
X? (
>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
@@ -74,18 +68,6 @@ multilib_src_configure() {
$(meson_use gtk-doc gtk_doc)
)
- if use opengl; then
- emesonargs+=(-Dgl-backend=gl)
- elif use gles2-only; then
- if use gles3; then
- emesonargs+=(-Dgl-backend=glesv3)
- else
- emesonargs+=(-Dgl-backend=glesv2)
- fi
- else
- emesonargs+=(-Dgl-backend=disabled)
- fi
-
meson_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/files/, x11-libs/cairo/
commit: a86d7fa81e5e287e69d380daddcef043a1261b6f
Author: Matt Turner gentoo org>
AuthorDate: Thu Jan 26 17:30:28 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Jan 26 17:46:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a86d7fa8
x11-libs/cairo: Drop old versions
Bug: https://bugs.gentoo.org/777123
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/Manifest| 1 -
x11-libs/cairo/cairo-1.16.0-r6.ebuild | 134 -
.../files/cairo-1.12.18-disable-test-suite.patch | 15 ---
.../cairo/files/cairo-1.16.0-binutils-2.34.patch | 72 ---
.../files/cairo-1.16.0-binutils-2.39-ptr.patch | 29 -
...one_MM_Var-instead-of-free-when-available.patch | 30 -
.../files/cairo-1.16.0-pdf-add-missing-flush.patch | 29 -
x11-libs/cairo/files/cairo-1.16.0-strings.patch| 39 --
x11-libs/cairo/metadata.xml| 2 -
9 files changed, 351 deletions(-)
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index e13c60cdc610..7a62019cb85a 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,2 +1 @@
-DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B
aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0
SHA512
9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
DIST cairo-1.17.6.tar.bz2 43700076 BLAKE2B
05ac766d33e9bdfc5df0347e9a80611554d64886715d1620fbe6f05f36f0134e46e1e6107738d260b380fab5ef2ac609922dce9ebcac01234710d8e2a76e9724
SHA512
1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185
diff --git a/x11-libs/cairo/cairo-1.16.0-r6.ebuild
b/x11-libs/cairo/cairo-1.16.0-r6.ebuild
deleted file mode 100644
index 299a8c20e695..
--- a/x11-libs/cairo/cairo-1.16.0-r6.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic autotools multilib-minimal
-
-if [[ ${PV} == ** ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git;
- SRC_URI=""
-else
- SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="X aqua debug gles2-only +glib opengl static-libs +svg utils valgrind"
-# gtk-doc regeneration doesn't seem to work with out-of-source builds
-#[[ ${PV} == ** ]] && IUSE="${IUSE} doc" # API docs are provided in
tarball, no need to regenerate
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test
needs gtk+ so we need to block it
-RESTRICT="test"
-
-BDEPEND="
- virtual/pkgconfig
- >=sys-devel/libtool-2"
-RDEPEND="
- >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
- >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
- sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
- gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
- glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
-#[[ ${PV} == ** ]] && DEPEND="${DEPEND}
-# doc? (
-# >=dev-util/gtk-doc-1.6
-# ~app-text/docbook-xml-dtd-4.2
-# )"
-
-REQUIRED_USE="
- gles2-only? ( !opengl )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
- "${FILESDIR}"/${PN}-respect-fontconfig.patch
- "${FILESDIR}"/${P}-pdf-add-missing-flush.patch
-
"${FILESDIR}"/${P}-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
- "${FILESDIR}"/${P}-strings.patch
- "${FILESDIR}"/${P}-binutils-2.39-ptr.patch
-)
-
-src_prepare() {
- default
-
- if has_version ">=sys-libs/binutils-libs-2.34"; then
- eapply
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 17afe3c8d4e8d2c3e22118dd25a9e46d21cf2711
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Dec 17 19:27:02 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Dec 17 19:27:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17afe3c8
x11-libs/cairo: Stabilize 1.17.6 hppa, #886361
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.6.ebuild
b/x11-libs/cairo/cairo-1.17.6.ebuild
index 5512d9d39524..156fa08987a5 100644
--- a/x11-libs/cairo/cairo-1.17.6.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: b3c685fe26f8cca53c6e784d21d468ba90677f15
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Dec 16 21:16:37 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Dec 16 21:16:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3c685fe
x11-libs/cairo: Stabilize 1.17.6 arm, #886361
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.6.ebuild
b/x11-libs/cairo/cairo-1.17.6.ebuild
index 08eba58320fc..9c930a533a84 100644
--- a/x11-libs/cairo/cairo-1.17.6.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: d69d9bf84522b076f33de0e98b7e77904425c284
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Dec 16 21:16:40 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Dec 16 21:16:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d69d9bf8
x11-libs/cairo: Stabilize 1.17.6 arm64, #886361
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.6.ebuild
b/x11-libs/cairo/cairo-1.17.6.ebuild
index 9c930a533a84..af056e9ed36c 100644
--- a/x11-libs/cairo/cairo-1.17.6.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 8ea0fcfc1be24b2bb3d7830ac515e92a9b2ae83e
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Dec 16 20:21:02 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Dec 16 20:21:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ea0fcfc
x11-libs/cairo: Stabilize 1.17.6 sparc, #886361
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.6.ebuild
b/x11-libs/cairo/cairo-1.17.6.ebuild
index c44e1157ecef..08eba58320fc 100644
--- a/x11-libs/cairo/cairo-1.17.6.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: ca575427add169259f3b315ccf6058fbcc0e104a
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Dec 16 18:27:33 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Dec 16 18:27:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca575427
x11-libs/cairo: Stabilize 1.17.6 ppc, #886361
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.6.ebuild
b/x11-libs/cairo/cairo-1.17.6.ebuild
index 241963174ae8..6782d2969691 100644
--- a/x11-libs/cairo/cairo-1.17.6.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: f1db0181c95db4de24fd7f8b41deca4de77e011f
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Dec 16 18:27:36 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Dec 16 18:27:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1db0181
x11-libs/cairo: Stabilize 1.17.6 ppc64, #886361
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.6.ebuild
b/x11-libs/cairo/cairo-1.17.6.ebuild
index 6782d2969691..c44e1157ecef 100644
--- a/x11-libs/cairo/cairo-1.17.6.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: aea3f993d7fdeb72f0bf6c8827a83937139fe8f0
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Dec 16 18:26:33 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Dec 16 18:26:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aea3f993
x11-libs/cairo: Stabilize 1.17.6 amd64, #886361
Signed-off-by: Arthur Zamarin gentoo.org>
x11-libs/cairo/cairo-1.17.6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.17.6.ebuild
b/x11-libs/cairo/cairo-1.17.6.ebuild
index 74987be53131..241963174ae8 100644
--- a/x11-libs/cairo/cairo-1.17.6.ebuild
+++ b/x11-libs/cairo/cairo-1.17.6.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 894254db31e67de63abe2a31dc5e4c8f5413fad0
Author: Matt Turner gentoo org>
AuthorDate: Fri Oct 7 23:06:06 2022 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Oct 7 23:07:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=894254db
x11-libs/cairo: Always enable SVG support
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/{cairo-1.16.0-r5.ebuild => cairo-1.16.0-r6.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r5.ebuild
b/x11-libs/cairo/cairo-1.16.0-r6.ebuild
similarity index 99%
rename from x11-libs/cairo/cairo-1.16.0-r5.ebuild
rename to x11-libs/cairo/cairo-1.16.0-r6.ebuild
index dc8e73c91275..299a8c20e695 100644
--- a/x11-libs/cairo/cairo-1.16.0-r5.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r6.ebuild
@@ -110,7 +110,7 @@ multilib_src_configure() {
$(use_enable glib gobject) \
$(use_enable opengl gl) \
$(use_enable static-libs static) \
- $(use_enable svg) \
+ --enable-svg \
$(use_enable utils trace) \
$(use_enable valgrind) \
--enable-ft \
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, profiles/
commit: 0f56f8cba094e6d35237e4f2bca81b3327bd6bea
Author: Matt Turner gentoo org>
AuthorDate: Thu Oct 6 15:52:24 2022 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Oct 7 21:49:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f56f8cb
x11-libs/cairo: Version bump to 1.17.6
Closes: https://bugs.gentoo.org/866305
Signed-off-by: Matt Turner gentoo.org>
profiles/package.mask | 4 ++
x11-libs/cairo/Manifest| 1 +
x11-libs/cairo/cairo-1.17.6.ebuild | 100
x11-libs/cairo/cairo-.ebuild | 133 -
x11-libs/cairo/metadata.xml| 1 +
5 files changed, 162 insertions(+), 77 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index 3f6158c87170..bebd5ef4b88c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,10 @@
#--- END OF EXAMPLES ---
+# Matt Turner (2022-10-07)
+# Unstable release. Masked for testing.
+>=x11-libs/cairo-1.17
+
# Sam James (2022-10-07)
# Ancient K C codebase which fails to compile with modern Clang; surface
# level fixes are doable, but then get into various dangerous constructs
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index a9d5249c5cb1..e13c60cdc610 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1 +1,2 @@
DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B
aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0
SHA512
9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
+DIST cairo-1.17.6.tar.bz2 43700076 BLAKE2B
05ac766d33e9bdfc5df0347e9a80611554d64886715d1620fbe6f05f36f0134e46e1e6107738d260b380fab5ef2ac609922dce9ebcac01234710d8e2a76e9724
SHA512
1537b34ca49b853f4f60a7ceac0c1b878e7e2874f1ca3a37ab6ccbb704a37872314447016ad07b82312b302bb6df86b71265232a802ccdb9fb8cd18f211ff185
diff --git a/x11-libs/cairo/cairo-1.17.6.ebuild
b/x11-libs/cairo/cairo-1.17.6.ebuild
new file mode 100644
index ..74987be53131
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.17.6.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+if [[ ${PV} == ** ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git;
+ SRC_URI=""
+else
+
SRC_URI="https://gitlab.freedesktop.org/cairo/cairo/-/archive/${PV}/cairo-${PV}.tar.bz2;
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug gles2-only gles3 +glib gtk-doc opengl test"
+REQUIRED_USE="
+ gles2-only? ( !opengl )
+ gles3? ( gles2-only )
+"
+RESTRICT="!test? ( test ) test" # Requires poppler-glib, which isn't available
in multilib
+
+RDEPEND="
+ >=dev-libs/lzo-2.06-r1:2[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/pixman-0.36[${MULTILIB_USEDEP}]
+ debug? ( sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}] )
+ gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+ glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-respect-fontconfig.patch
+)
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dfontconfig=enabled
+ -Dfreetype=enabled
+ -Dpng=enabled
+ $(meson_feature aqua quartz)
+ $(meson_feature X tee)
+ $(meson_feature X xcb)
+ $(meson_feature X xlib)
+ -Dxlib-xcb=disabled
+ -Dxml=disabled
+ -Dzlib=enabled
+
+ $(meson_feature test tests)
+
+ -Dgtk2-utils=disabled
+
+ $(meson_feature glib)
+ -Dspectre=disabled # only used for tests
+ $(meson_feature debug
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/
commit: 3392d007e80240e76b457782760e558afb1b2a4f
Author: Sam James gentoo org>
AuthorDate: Sun Sep 4 18:06:13 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Sep 4 18:06:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3392d007
x11-libs/cairo: fix build with binutils-2.39
Closes: https://bugs.gentoo.org/868405
Signed-off-by: Sam James gentoo.org>
x11-libs/cairo/cairo-1.16.0-r5.ebuild | 1 +
.../files/cairo-1.16.0-binutils-2.39-ptr.patch | 29 ++
2 files changed, 30 insertions(+)
diff --git a/x11-libs/cairo/cairo-1.16.0-r5.ebuild
b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
index bf5a7256fd4b..dc8e73c91275 100644
--- a/x11-libs/cairo/cairo-1.16.0-r5.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
@@ -63,6 +63,7 @@ PATCHES=(
"${FILESDIR}"/${P}-pdf-add-missing-flush.patch
"${FILESDIR}"/${P}-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
"${FILESDIR}"/${P}-strings.patch
+ "${FILESDIR}"/${P}-binutils-2.39-ptr.patch
)
src_prepare() {
diff --git a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch
b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch
new file mode 100644
index ..6749786d23bd
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.39-ptr.patch
@@ -0,0 +1,29 @@
+https://gitlab.freedesktop.org/cairo/cairo/-/commit/74f2da7b70179a363b5a4649b9c5d6fd18d9cbc0
+https://bugs.gentoo.org/868405
+
+From 24996e6ee241ebcd303dd34a2b06b37a6dd0c217 Mon Sep 17 00:00:00 2001
+From: Simon McVittie
+Date: Wed, 13 Jul 2022 21:26:57 +0100
+Subject: [PATCH] Fix build with newer binutils-dev installed
+
+It seems the PTR typedef (or macro?) has been removed from newer versions
+of libbfd.
+
+Resolves: https://gitlab.freedesktop.org/cairo/cairo/-/issues/581
+Signed-off-by: Simon McVittie
+--- a/util/cairo-trace/lookup-symbol.c
b/util/cairo-trace/lookup-symbol.c
+@@ -106,10 +106,10 @@ _symtab_init (struct symtab *symtab, const char
*filename)
+ if (! bfd_check_format_matches (symtab->bfd, bfd_object, ))
+ goto BAIL;
+
+-symcount = bfd_read_minisymbols (symtab->bfd, false, (PTR) >syms,
);
++symcount = bfd_read_minisymbols (symtab->bfd, false, (void **)
>syms, );
+ if (symcount == 0) {
+ symcount = bfd_read_minisymbols (symtab->bfd, true /* dynamic */ ,
+- (PTR) >syms, );
++ (void **) >syms, );
+ }
+ if (symcount < 0)
+ goto BAIL;
+GitLab
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: dabc3b3814afa8c035b38a31e07bc0de42350c2e
Author: WANG Xuerui gentoo org>
AuthorDate: Sat May 7 04:15:21 2022 +
Commit: WANG Xuerui gentoo org>
CommitDate: Sat May 7 04:27:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dabc3b38
x11-libs/cairo: keyword 1.16.0-r5 for ~loong
Signed-off-by: WANG Xuerui gentoo.org>
x11-libs/cairo/cairo-1.16.0-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r5.ebuild
b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
index a1546a49797f..bf5a7256fd4b 100644
--- a/x11-libs/cairo/cairo-1.16.0-r5.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 1e502937f749c7bea9b1a08ef5d03ac557b1ac7b
Author: WANG Xuerui gentoo org>
AuthorDate: Sat May 7 04:15:23 2022 +
Commit: WANG Xuerui gentoo org>
CommitDate: Sat May 7 04:27:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e502937
x11-libs/cairo: forward ~loong
Signed-off-by: WANG Xuerui gentoo.org>
x11-libs/cairo/cairo-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index 0c5c1384ad56..1ee8a6752f0d 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/files/
commit: 8fca8acb895fa9fea2f3a6f0ce539b39af5f97ed
Author: Matt Turner gentoo org>
AuthorDate: Sat Feb 26 03:02:46 2022 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Feb 26 03:09:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fca8acb
x11-libs/cairo: Use upstream patches
Signed-off-by: Matt Turner gentoo.org>
.../cairo/files/cairo-1.16.0-binutils-2.34.patch | 54 +-
x11-libs/cairo/files/cairo-1.16.0-strings.patch| 22 -
2 files changed, 74 insertions(+), 2 deletions(-)
diff --git a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
index 03daac0eca4b..a10cad5ee553 100644
--- a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
+++ b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
@@ -1,6 +1,55 @@
+From e30259f6237571c61992433c110bc6e1ef900244 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?=
+Date: Tue, 23 Feb 2021 11:36:24 +
+Subject: [PATCH] cairo-trace: fix build with newer versions of bfd
+
+And update configure/meson checks to check for the new function.
+
+Drop libiberty.h check since it's only needed by backtrace-symbols.c
+which we're about to remove.
+
+Closes #391, #460
+---
+ Makefile.am| 1 +
+ configure.ac | 8 +++-
+ meson-cc-tests/bfd-section-flags.c | 9 +
+ meson.build| 11 ++-
+ util/cairo-trace/lookup-symbol.c | 7 +++
+ 5 files changed, 26 insertions(+), 10 deletions(-)
+ create mode 100644 meson-cc-tests/bfd-section-flags.c
+
+diff --git a/configure.ac b/configure.ac
+index 18e4a305f..6444a3da3 100644
+--- a/configure.ac
b/configure.ac
+@@ -826,7 +826,13 @@ CAIRO_ENABLE(interpreter, cairo-script-interpreter, yes, [
+ AC_CHECK_LIB(bfd, bfd_openr,
+[AC_CHECK_HEADER(bfd.h, [have_bfd=yes],
+[have_bfd=no])], [have_bfd=no])
+-AC_CHECK_HEADER(libiberty.h,, [have_bfd=no])
++dnl bfd_section_flags is an inline func so we don't bother with linking the
lib in
++AC_LINK_IFELSE([AC_LANG_PROGRAM([
++ #include
++ asection *s;
++],[
++ return bfd_section_flags(s) == 0;
++])],[],[have_bfd=no])
+ if test "x$have_bfd" = "xyes"; then
+ AC_DEFINE([HAVE_BFD], [1], [Define to 1 if you have the binutils
development files installed])
+ BFD_LIBS=-lbfd
+diff --git a/util/cairo-trace/lookup-symbol.c
b/util/cairo-trace/lookup-symbol.c
+index f9665b36f..9af0b5944 100644
--- a/util/cairo-trace/lookup-symbol.c
+++ b/util/cairo-trace/lookup-symbol.c
-@@ -145,14 +145,14 @@ find_address_in_section (bfd *abfd,
+@@ -65,7 +65,6 @@
+
+ #if HAVE_BFD
+ #include
+-#include
+
+ struct symtab {
+ bfd *bfd;
+@@ -145,14 +144,14 @@ find_address_in_section (bfd *abfd,
if (symbol->found)
return;
@@ -18,3 +67,6 @@
if (symbol->pc >= vma + size)
return;
+--
+2.34.1
+
diff --git a/x11-libs/cairo/files/cairo-1.16.0-strings.patch
b/x11-libs/cairo/files/cairo-1.16.0-strings.patch
index ee72f9dec7ce..2c4742887e36 100644
--- a/x11-libs/cairo/files/cairo-1.16.0-strings.patch
+++ b/x11-libs/cairo/files/cairo-1.16.0-strings.patch
@@ -1,4 +1,21 @@
-https://bugs.gentoo.org/726200
+From 23b6e8bb5798c77550da613fadc3da8b3be14573 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich
+Date: Sun, 14 Jun 2020 09:58:52 +0100
+Subject: [PATCH] build/aclocal.float.m4: detect 'strings' with AC_CHECK_TOOL
+
+This way all binutils tools are detected with $CHOST prefix
+if exist. And strings is allowed to be substituted with
+STRINGS environment override, so 'llvm-strings' (or other)
+alternative can be used.
+
+Bug: https://bugs.gentoo.org/726200
+Signed-off-by: Sergei Trofimovich
+---
+ build/aclocal.float.m4 | 7 +--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/build/aclocal.float.m4 b/build/aclocal.float.m4
+index f92db03e6..d9728c123 100644
--- a/build/aclocal.float.m4
+++ b/build/aclocal.float.m4
@@ -31,10 +31,13 @@ int main() { return 0; }
@@ -17,3 +34,6 @@ https://bugs.gentoo.org/726200
if test "$ax_cv_c_float_words_bigendian" = unknown; then
ax_cv_c_float_words_bigendian=no
else
+--
+2.34.1
+
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: fcbbe6d27e5bb09b42c3cc78a5553e60567f71a7
Author: Matt Turner gentoo org>
AuthorDate: Sat Feb 26 03:08:18 2022 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Feb 26 03:09:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcbbe6d2
x11-libs/cairo: Drop dead build flags
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-.ebuild | 5 -
1 file changed, 5 deletions(-)
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index 1eb05d30fd2f..0c5c1384ad56 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -111,11 +111,6 @@ multilib_src_configure() {
--enable-png \
--enable-ps \
--enable-script \
- --disable-drm \
- --disable-directfb \
- --disable-gallium \
- --disable-qt \
- --disable-vg \
--disable-xlib-xcb \
${myopts}
}
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 06fc27edc13dca6716faa8f2601e197d547db8fe
Author: Matt Turner gentoo org>
AuthorDate: Sat Feb 26 03:06:08 2022 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Feb 26 03:09:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06fc27ed
x11-libs/cairo: Drop binutils patch against -
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-.ebuild | 4
1 file changed, 4 deletions(-)
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index f2e78b07a7b0..1eb05d30fd2f 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -65,10 +65,6 @@ PATCHES=(
src_prepare() {
default
- if has_version ">=sys-libs/binutils-libs-2.34"; then
- eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
- fi
-
# tests and perf tools require X, bug #483574
if ! use X; then
sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am
|| die
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: e82d5d39c2feca2bc396b857491a1f6f15f80ee6
Author: David Seifert gentoo org>
AuthorDate: Sun Jan 2 17:49:06 2022 +
Commit: David Seifert gentoo org>
CommitDate: Sun Jan 2 17:49:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e82d5d39
x11-libs/cairo: remove freebsd-libc
Signed-off-by: David Seifert gentoo.org>
x11-libs/cairo/cairo-1.16.0-r5.ebuild | 4 +---
x11-libs/cairo/cairo-.ebuild | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r5.ebuild
b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
index 03d9d52ed6af..a1546a49797f 100644
--- a/x11-libs/cairo/cairo-1.16.0-r5.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -92,8 +92,6 @@ multilib_src_configure() {
[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
- use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
-
# [[ ${PV} == ** ]] && myopts+=" $(use_enable doc gtk-doc)"
ECONF_SOURCE="${S}" \
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index 526be1dcbbf9..f2e78b07a7b0 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -89,8 +89,6 @@ multilib_src_configure() {
[[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
- use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
-
# [[ ${PV} == ** ]] && myopts+=" $(use_enable doc gtk-doc)"
ECONF_SOURCE="${S}" \
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 309780f1a7ffa8f44dbfd8b01df1d8ea2a6ccecc
Author: Matt Turner gentoo org>
AuthorDate: Thu Jul 22 05:38:36 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 31 00:19:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=309780f1
x11-libs/cairo: Set USE-defaults for mesa[egl,gbm]
Signed-off-by: Matt Turner gentoo.org>
Signed-off-by: Sam James gentoo.org>
x11-libs/cairo/{cairo-1.16.0-r4.ebuild => cairo-1.16.0-r5.ebuild} | 2 +-
x11-libs/cairo/cairo-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
similarity index 98%
rename from x11-libs/cairo/cairo-1.16.0-r4.ebuild
rename to x11-libs/cairo/cairo-1.16.0-r5.ebuild
index d5b20a6b420..03d9d52ed6a 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),${MULTILIB_USEDEP}] )
+ opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] )
X? (
>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index 804c6cdb000..526be1dcbbf 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
>=x11-libs/pixman-0.36.0[${MULTILIB_USEDEP}]
gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),${MULTILIB_USEDEP}] )
+ opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] )
X? (
>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 383656ae55a9f310a1721e6a7a5bc0717cbd5be0
Author: Matt Turner gentoo org>
AuthorDate: Mon Dec 21 18:59:18 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Dec 21 19:00:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=383656ae
x11-libs/cairo: Raise pixman version requirement
Raised upstream in commit a34cb719cd9c (Add support for RGBA128F and
RGB96F formats.)
Closes: https://bugs.gentoo.org/760878
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index ad1c3a73e92..e66a1b9fece 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+ >=x11-libs/pixman-0.36.0[${MULTILIB_USEDEP}]
gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),${MULTILIB_USEDEP}] )
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 535e3ba1df6c9c249c0660843df5570b13b63e35
Author: William Breathitt Gray gmail com>
AuthorDate: Thu Dec 10 11:54:43 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Dec 17 16:49:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=535e3ba1
x11-libs/cairo: Add RDEPEND on media-libs/freetype[png]
Closes: https://bugs.gentoo.org/759337
Closes: https://github.com/gentoo/gentoo/pull/18593
Signed-off-by: William Breathitt Gray gmail.com>
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-1.16.0-r4.ebuild | 2 +-
x11-libs/cairo/cairo-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
index 2423c2db9ab..e200da77f6d 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
RDEPEND="
>=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index 453aa1b0d5e..ad1c3a73e92 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
RDEPEND="
>=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2[png,${MULTILIB_USEDEP}]
>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 50ebb0f666c95958fa6316f3d7c78a7d6a4408dc
Author: Matt Turner gentoo org>
AuthorDate: Sun Aug 9 17:49:47 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Sun Aug 9 17:52:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50ebb0f6
x11-libs/cairo: Drop old versions
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 134 --
1 file changed, 134 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
deleted file mode 100644
index 541a19e9c30..000
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic autotools multilib-minimal
-
-if [[ ${PV} == ** ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git;
- SRC_URI=""
-else
- SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="X aqua debug gles2-only +glib opengl static-libs +svg utils valgrind"
-# gtk-doc regeneration doesn't seem to work with out-of-source builds
-#[[ ${PV} == ** ]] && IUSE="${IUSE} doc" # API docs are provided in
tarball, no need to regenerate
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test
needs gtk+ so we need to block it
-RESTRICT="test"
-
-BDEPEND="
- virtual/pkgconfig
- >=sys-devel/libtool-2"
-RDEPEND="
- >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
- >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
- sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
- gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
- glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
-#[[ ${PV} == ** ]] && DEPEND="${DEPEND}
-# doc? (
-# >=dev-util/gtk-doc-1.6
-# ~app-text/docbook-xml-dtd-4.2
-# )"
-
-REQUIRED_USE="
- gles2-only? ( !opengl )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
- "${FILESDIR}"/${PN}-respect-fontconfig.patch
- "${FILESDIR}"/${P}-pdf-add-missing-flush.patch
-
"${FILESDIR}"/${P}-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
-)
-
-src_prepare() {
- default
-
- if has_version ">=sys-libs/binutils-libs-2.34"; then
- eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
- fi
-
- # tests and perf tools require X, bug #483574
- if ! use X; then
- sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am
|| die
- fi
-
- # Slightly messed build system YAY
- if [[ ${PV} == ** ]]; then
- touch boilerplate/Makefile.am.features
- touch src/Makefile.am.features
- touch ChangeLog
- fi
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myopts
-
- [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-
- use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
-
- # [[ ${PV} == ** ]] && myopts+=" $(use_enable doc gtk-doc)"
-
- ECONF_SOURCE="${S}" \
- econf \
- $(use_with X x) \
- $(use_enable X tee) \
- $(use_enable X xlib) \
- $(use_enable X xlib-xrender) \
- $(use_enable X xcb) \
- $(use_enable X xcb-shm) \
- $(use_enable aqua quartz) \
- $(use_enable aqua quartz-image) \
- $(use_enable debug test-surfaces) \
- $(use_enable gles2-only glesv2) \
- $(use_enable glib gobject) \
- $(use_enable opengl gl) \
- $(use_enable static-libs static) \
- $(use_enable svg) \
- $(use_enable utils trace) \
- $(use_enable valgrind) \
-
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 96465721e45e5533baf324839907749d408a41a3
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Fri Jul 31 14:03:24 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Jul 31 17:52:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96465721
x11-libs/cairo: stable 1.16.0-r4 for hppa, bug #732948
Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
x11-libs/cairo/cairo-1.16.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
index e5f6838fccd..672498559bf 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 22eb55656f71120766792af88750604eb9e41f95
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Jul 21 09:33:17 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Jul 21 09:33:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22eb5565
x11-libs/cairo: x86 stable wrt bug #732948
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-libs/cairo/cairo-1.16.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
index 202506b7952..e5f6838fccd 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: d322922fc60468d058b43ddbe7ad88ccfbc41a64
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Jul 21 08:48:03 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Jul 21 08:48:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d322922f
x11-libs/cairo: amd64 stable wrt bug #732948
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-libs/cairo/cairo-1.16.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
index 098ecc6d78e..202506b7952 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64
s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390
sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 7cd9eec5b6923d9af9c006ee10aea29235682969
Author: Sam James gentoo org>
AuthorDate: Sun Jul 19 01:35:42 2020 +
Commit: Sam James gentoo org>
CommitDate: Sun Jul 19 01:35:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cd9eec5
x11-libs/cairo: ppc64 stable (bug #732948)
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
x11-libs/cairo/cairo-1.16.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
index 15678b2aa9c..098ecc6d78e 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64
s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64
s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 0829da794c001d7ed997e18833fb476415023dd0
Author: Sam James gentoo org>
AuthorDate: Fri Jul 17 20:45:10 2020 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 17 20:47:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0829da79
x11-libs/cairo: arm64 stable (bug #732948)
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
x11-libs/cairo/cairo-1.16.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
index c056365e871..15678b2aa9c 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64
s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64
s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 58855334a1dd7beeb2f883471974389c1126b48a
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Jul 17 15:15:03 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Jul 17 15:15:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58855334
x11-libs/cairo: sparc stable wrt bug #732948
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-libs/cairo/cairo-1.16.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
index 9865a9c0199..c056365e871 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64
s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64
s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 418f44a64194e52876eb1a439a9940f17cdcb7ef
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Jul 17 15:13:53 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Jul 17 15:13:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=418f44a6
x11-libs/cairo: s390 stable wrt bug #732948
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="s390"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-libs/cairo/cairo-1.16.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
index 74ae1e74131..9865a9c0199 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64
s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 545b5e5bdb618d707ecc7d3e4ba5673d0e1daccd
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Jul 17 15:08:27 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Jul 17 15:08:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=545b5e5b
x11-libs/cairo: ppc stable wrt bug #732948
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-libs/cairo/cairo-1.16.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
index 554ee832766..74ae1e74131 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 628085b3e78f660d588efc30a2238dd9c2810402
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Jul 17 15:07:15 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Jul 17 15:07:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=628085b3
x11-libs/cairo: arm stable wrt bug #732948
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo gentoo.org>
x11-libs/cairo/cairo-1.16.0-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
index d9108285f73..554ee832766 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/
commit: 75aebadc586d4bbce67e1bb948a10da28b5c703d
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sat Jun 13 20:11:50 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Jun 13 20:13:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75aebadc
x11-libs/cairo: detect 'strings' with AC_CHECK_TOOL
This way all binutils tools are detected with $CHOST prefix
if exist. Fixes 64-bit build on sys-devel/binutils-config[-native-symlinks]
system.
Closes: https://bugs.gentoo.org/726200
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich gentoo.org>
x11-libs/cairo/cairo-1.16.0-r4.ebuild | 135
x11-libs/cairo/files/cairo-1.16.0-strings.patch | 19
2 files changed, 154 insertions(+)
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
new file mode 100644
index 000..d9108285f73
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.16.0-r4.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == ** ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git;
+ SRC_URI=""
+else
+ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug gles2-only +glib opengl static-libs +svg utils valgrind"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == ** ]] && IUSE="${IUSE} doc" # API docs are provided in
tarball, no need to regenerate
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test
needs gtk+ so we need to block it
+RESTRICT="test"
+
+BDEPEND="
+ virtual/pkgconfig
+ >=sys-devel/libtool-2"
+RDEPEND="
+ >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+ sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+ gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+ glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )"
+#[[ ${PV} == ** ]] && DEPEND="${DEPEND}
+# doc? (
+# >=dev-util/gtk-doc-1.6
+# ~app-text/docbook-xml-dtd-4.2
+# )"
+
+REQUIRED_USE="
+ gles2-only? ( !opengl )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+ "${FILESDIR}"/${PN}-respect-fontconfig.patch
+ "${FILESDIR}"/${P}-pdf-add-missing-flush.patch
+
"${FILESDIR}"/${P}-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
+ "${FILESDIR}"/${P}-strings.patch
+)
+
+src_prepare() {
+ default
+
+ if has_version ">=sys-libs/binutils-libs-2.34"; then
+ eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
+ fi
+
+ # tests and perf tools require X, bug #483574
+ if ! use X; then
+ sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am
|| die
+ fi
+
+ # Slightly messed build system YAY
+ if [[ ${PV} == ** ]]; then
+ touch boilerplate/Makefile.am.features
+ touch src/Makefile.am.features
+ touch ChangeLog
+ fi
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myopts
+
+ [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+ use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+ # [[ ${PV} == ** ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+ ECONF_SOURCE="${S}" \
+ econf \
+ $(use_with X x) \
+ $(use_enable X tee) \
+ $(use_enable X xlib) \
+ $(use_enable X xlib-xrender) \
+ $(use_enable X xcb) \
+ $(use_enable X xcb-shm) \
+ $(use_enable aqua quartz) \
+ $(use_enable aqua
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/
commit: 66be6eece6fb20cd720d5c0490eedfc947c918bc
Author: Sergei Trofimovich gentoo org>
AuthorDate: Tue Feb 4 09:02:14 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Tue Feb 4 09:03:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66be6eec
x11-libs/cairo: tweak for binutils-2.34, bug #707960
Reported-by: Hugo Ribeiro
Closes: https://bugs.gentoo.org/707960
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich gentoo.org>
x11-libs/cairo/cairo-1.16.0-r3.ebuild| 6 +-
x11-libs/cairo/cairo-.ebuild | 6 +-
.../cairo/files/cairo-1.16.0-binutils-2.34.patch | 20
3 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 275c687dcf5..2d3601c7a39 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -67,6 +67,10 @@ PATCHES=(
src_prepare() {
default
+ if has_version ">=sys-libs/binutils-libs-2.34"; then
+ eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
+ fi
+
# tests and perf tools require X, bug #483574
if ! use X; then
sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am
|| die
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index d5022d1759a..29d74b12d97 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -65,6 +65,10 @@ PATCHES=(
src_prepare() {
default
+ if has_version ">=sys-libs/binutils-libs-2.34"; then
+ eapply "${FILESDIR}"/${PN}-1.16.0-binutils-2.34.patch
+ fi
+
# tests and perf tools require X, bug #483574
if ! use X; then
sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am
|| die
diff --git a/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
new file mode 100644
index 000..03daac0eca4
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.16.0-binutils-2.34.patch
@@ -0,0 +1,20 @@
+--- a/util/cairo-trace/lookup-symbol.c
b/util/cairo-trace/lookup-symbol.c
+@@ -145,14 +145,14 @@ find_address_in_section (bfd *abfd,
+ if (symbol->found)
+ return;
+
+-if ((bfd_get_section_flags (symtab->bfd, section) & SEC_ALLOC) == 0)
++if ((bfd_section_flags (section) & SEC_ALLOC) == 0)
+ return;
+
+-vma = bfd_get_section_vma (symtab->bfd, section);
++vma = bfd_section_vma (section);
+ if (symbol->pc < vma)
+ return;
+
+-size = bfd_section_size (symtab->bfd, section);
++size = bfd_section_size (section);
+ if (symbol->pc >= vma + size)
+ return;
+
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 808f2b7342710bca96885e8a247eaf88c2c9a5ac
Author: Matt Turner gentoo org>
AuthorDate: Tue Jan 14 22:23:48 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Jan 14 22:28:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=808f2b73
x11-libs/cairo: Enable xcb stuff with USE=X.
Whoops.
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 4 ++--
x11-libs/cairo/cairo-.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 94c39df2186..5c4c80e79af 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -98,6 +98,8 @@ multilib_src_configure() {
$(use_enable X tee) \
$(use_enable X xlib) \
$(use_enable X xlib-xrender) \
+ $(use_enable X xcb) \
+ $(use_enable X xcb-shm) \
$(use_enable aqua quartz) \
$(use_enable aqua quartz-image) \
$(use_enable debug test-surfaces) \
@@ -114,8 +116,6 @@ multilib_src_configure() {
--enable-png \
--enable-ps \
--enable-script \
- --enable-xcb
- --enable-xcb-shm
--disable-drm \
--disable-directfb \
--disable-gallium \
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index e6b26da6441..d5022d1759a 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -96,6 +96,8 @@ multilib_src_configure() {
$(use_enable X tee) \
$(use_enable X xlib) \
$(use_enable X xlib-xrender) \
+ $(use_enable X xcb) \
+ $(use_enable X xcb-shm) \
$(use_enable aqua quartz) \
$(use_enable aqua quartz-image) \
$(use_enable debug test-surfaces) \
@@ -112,8 +114,6 @@ multilib_src_configure() {
--enable-png \
--enable-ps \
--enable-script \
- --enable-xcb
- --enable-xcb-shm
--disable-drm \
--disable-directfb \
--disable-gallium \
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: bb0ed566f6399041c55a6d409d5399f5b0ca9cb3
Author: Matt Turner gentoo org>
AuthorDate: Tue Jan 14 21:07:01 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Jan 14 21:07:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb0ed566
x11-libs/cairo: Drop IUSE=xcb
Cairo's USE=X depends on libX11 which unconditionally depends on libxcb,
so IUSE=xcb is pretty silly. I guess you could have built with USE="-X
xcb" but why would you do that... Just include it within USE=X.
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 10 --
x11-libs/cairo/cairo-.ebuild | 10 --
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 1c3590a8d2a..35ca0745c48 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="A vector graphics library with cross-device
output support"
HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb"
+IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind"
# gtk-doc regeneration doesn't seem to work with out-of-source builds
#[[ ${PV} == ** ]] && IUSE="${IUSE} doc" # API docs are provided in
tarball, no need to regenerate
@@ -43,8 +43,6 @@ RDEPEND="
>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- )
- xcb? (
>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
)"
DEPEND="${RDEPEND}
@@ -110,14 +108,14 @@ multilib_src_configure() {
$(use_enable svg) \
$(use_enable utils trace) \
$(use_enable valgrind) \
- $(use_enable xcb) \
- $(use_enable xcb xcb-shm) \
--enable-ft \
+ --enable-interpreter \
--enable-pdf \
--enable-png \
--enable-ps \
--enable-script \
- --enable-interpreter \
+ --enable-xcb
+ --enable-xcb-shm
--disable-drm \
--disable-directfb \
--disable-gallium \
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index 6b69a9ab32b..45d38bca293 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="A vector graphics library with cross-device
output support"
HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb"
+IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind"
# gtk-doc regeneration doesn't seem to work with out-of-source builds
#[[ ${PV} == ** ]] && IUSE="${IUSE} doc" # API docs are provided in
tarball, no need to regenerate
@@ -43,8 +43,6 @@ RDEPEND="
>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- )
- xcb? (
>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
)"
DEPEND="${RDEPEND}
@@ -108,14 +106,14 @@ multilib_src_configure() {
$(use_enable svg) \
$(use_enable utils trace) \
$(use_enable valgrind) \
- $(use_enable xcb) \
- $(use_enable xcb xcb-shm) \
--enable-ft \
+ --enable-interpreter \
--enable-pdf \
--enable-png \
--enable-ps \
--enable-script \
- --enable-interpreter \
+ --enable-xcb
+ --enable-xcb-shm
--disable-drm \
--disable-directfb \
--disable-gallium \
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 9e9e288b6f0e95521aae6540d423ec015ec4a0cd
Author: Matt Turner gentoo org>
AuthorDate: Mon Jan 13 17:51:43 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Jan 13 18:13:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e9e288b
x11-libs/cairo: Port to EAPI=7
Thanks to David Michael.
Closes: https://bugs.gentoo.org/705130
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 11 ++-
x11-libs/cairo/cairo-.ebuild | 11 ++-
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index b759d204805..1c3590a8d2a 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit eutils flag-o-matic autotools multilib-minimal
+inherit flag-o-matic autotools multilib-minimal
if [[ ${PV} == ** ]]; then
inherit git-r3
@@ -25,6 +25,9 @@ IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils
valgrind xcb"
# Test causes a circular depend on gtk+... since gtk+ needs cairo but test
needs gtk+ so we need to block it
RESTRICT="test"
+BDEPEND="
+ virtual/pkgconfig
+ >=sys-devel/libtool-2"
RDEPEND="
>=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
@@ -45,8 +48,6 @@ RDEPEND="
>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
)"
DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/libtool-2
X? ( x11-base/xorg-proto )"
#[[ ${PV} == ** ]] && DEPEND="${DEPEND}
# doc? (
@@ -127,6 +128,6 @@ multilib_src_configure() {
}
multilib_src_install_all() {
- prune_libtool_files --all
+ find "${D}" -name '*.la' -delete || die
einstalldocs
}
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index f2e28c9ed36..6b69a9ab32b 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit eutils flag-o-matic autotools multilib-minimal
+inherit flag-o-matic autotools multilib-minimal
if [[ ${PV} == ** ]]; then
inherit git-r3
@@ -25,6 +25,9 @@ IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils
valgrind xcb"
# Test causes a circular depend on gtk+... since gtk+ needs cairo but test
needs gtk+ so we need to block it
RESTRICT="test"
+BDEPEND="
+ virtual/pkgconfig
+ >=sys-devel/libtool-2"
RDEPEND="
>=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
@@ -45,8 +48,6 @@ RDEPEND="
>=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
)"
DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/libtool-2
X? ( x11-base/xorg-proto )"
#[[ ${PV} == ** ]] && DEPEND="${DEPEND}
# doc? (
@@ -125,6 +126,6 @@ multilib_src_configure() {
}
multilib_src_install_all() {
- prune_libtool_files --all
+ find "${D}" -name '*.la' -delete || die
einstalldocs
}
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: c66f744d5ed212ac0d65297e0900d555a2328723
Author: Aaron Bauman gentoo org>
AuthorDate: Tue Apr 9 01:47:07 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Tue Apr 9 01:47:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c66f744d
x11-libs/cairo: drop vulnerable wrt bug #672908
Signed-off-by: Aaron Bauman gentoo.org>
x11-libs/cairo/cairo-1.16.0-r2.ebuild | 130 --
1 file changed, 130 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
deleted file mode 100644
index 33d36a60703..000
--- a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic autotools multilib-minimal
-
-if [[ ${PV} == ** ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git;
- SRC_URI=""
-else
- SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb"
-# gtk-doc regeneration doesn't seem to work with out-of-source builds
-#[[ ${PV} == ** ]] && IUSE="${IUSE} doc" # API docs are provided in
tarball, no need to regenerate
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test
needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND="
- >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
- >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
- sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
- gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
- glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- )
- xcb? (
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/libtool-2
- X? ( x11-base/xorg-proto )"
-#[[ ${PV} == ** ]] && DEPEND="${DEPEND}
-# doc? (
-# >=dev-util/gtk-doc-1.6
-# ~app-text/docbook-xml-dtd-4.2
-# )"
-
-REQUIRED_USE="
- gles2? ( !opengl )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
- "${FILESDIR}"/${PN}-respect-fontconfig.patch
-)
-
-src_prepare() {
- default
-
- # tests and perf tools require X, bug #483574
- if ! use X; then
- sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am
|| die
- fi
-
- # Slightly messed build system YAY
- if [[ ${PV} == ** ]]; then
- touch boilerplate/Makefile.am.features
- touch src/Makefile.am.features
- touch ChangeLog
- fi
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myopts
-
- [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-
- use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
-
- # [[ ${PV} == ** ]] && myopts+=" $(use_enable doc gtk-doc)"
-
- ECONF_SOURCE="${S}" \
- econf \
- --disable-dependency-tracking \
- $(use_with X x) \
- $(use_enable X tee) \
- $(use_enable X xlib) \
- $(use_enable X xlib-xrender) \
- $(use_enable aqua quartz) \
- $(use_enable aqua quartz-image) \
- $(use_enable debug test-surfaces) \
- $(use_enable gles2 glesv2) \
- $(use_enable glib gobject) \
- $(use_enable opengl gl) \
- $(use_enable static-libs static) \
- $(use_enable svg) \
- $(use_enable utils trace) \
- $(use_enable valgrind) \
- $(use_enable xcb) \
- $(use_enable xcb xcb-shm) \
- --enable-ft \
- --enable-pdf \
- --enable-png \
- --enable-ps \
- --enable-script \
- --enable-interpreter \
-
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 6f4aea9f929eec0839d93bf32120a52d0911ab76
Author: Aaron Bauman gentoo org>
AuthorDate: Tue Apr 9 00:04:01 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Tue Apr 9 00:05:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f4aea9f
x11-libs/cairo: arm64 stable (bug #672908)
Signed-off-by: Aaron Bauman gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index e91d19441b9..5b9b8adaa41 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 73e8b2ac5f6c2f6b6dad8dd1d7c9325d1965acb8
Author: Matt Turner gentoo org>
AuthorDate: Mon Apr 8 23:21:18 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Apr 8 23:23:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73e8b2ac
x11-libs/cairo-1.16.0-r3: alpha stable, bug 672908
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 0acfd3e86aa..e91d19441b9 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: a00925b2e3671bcc01fc9125b6251e5779e3c364
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun Apr 7 21:50:11 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun Apr 7 21:50:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a00925b2
x11-libs/cairo: s390 stable wrt bug #672908
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="s390"
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 8c661615c96..0acfd3e86aa 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 9bdee8f4451054c548a44b90fcc842d4b5169c0d
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sat Apr 6 09:25:34 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sat Apr 6 09:56:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bdee8f4
x11-libs/cairo: stable 1.16.0-r3 for hppa, bug #672908
Signed-off-by: Rolf Eike Beer sf-mail.de>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich gentoo.org>
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 189a0e2b92e..9b837c44da8 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64
~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64
~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: b1cf9b2fc54d0a4918236028077f37ddc3d81f92
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Fri Apr 5 09:14:48 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Apr 5 19:03:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1cf9b2f
x11-libs/cairo: stable 1.16.0-r3 for sparc, bug #672908
Signed-off-by: Rolf Eike Beer sf-mail.de>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich gentoo.org>
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index b0553c5ca83..189a0e2b92e 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64
~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64
~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 343e68801b9778758b56243935aff8282b8afd8a
Author: Matt Turner gentoo org>
AuthorDate: Sun Mar 31 19:11:46 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Sun Mar 31 19:12:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=343e6880
x11-libs/cairo-1.16.0-r3: ppc stable, bug 672908
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 9af679b451f..8c726472641 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 6b7f20adf7a95fedf7d4908c9aa7c1cf35db7f82
Author: Matt Turner gentoo org>
AuthorDate: Sun Mar 31 19:11:49 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Sun Mar 31 19:12:22 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b7f20ad
x11-libs/cairo-1.16.0-r3: ppc64 stable, bug 672908
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 8c726472641..2f064b70112 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: ed3bf3dfe24ee1a8a8c589d6589745f0d7b8b5cb
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Mar 30 19:04:28 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Mar 30 19:05:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed3bf3df
x11-libs/cairo: arm stable wrt bug #672908
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index dad0da893c6..9af679b451f 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: dbdd42a94b3a18e455609c4fa7dd05ad3666ba8b
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sat Mar 30 10:45:34 2019 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sat Mar 30 10:45:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbdd42a9
x11-libs/cairo: amd64 stable wrt bug #672908
Signed-off-by: Agostino Sarubbo gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
index 127a9e7d75f..dad0da893c6 100644
--- a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/, x11-libs/cairo/files/
commit: 8e27a74b58384414d920401521f7460a240ea37a
Author: Matt Turner gentoo org>
AuthorDate: Sat Mar 30 02:00:30 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Mar 30 02:03:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e27a74b
x11-libs/cairo: Pull in a few fixes from upstream
Bug: https://bugs.gentoo.org/672908
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-1.16.0-r3.ebuild | 132 +
...one_MM_Var-instead-of-free-when-available.patch | 30 +
.../files/cairo-1.16.0-pdf-add-missing-flush.patch | 29 +
3 files changed, 191 insertions(+)
diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild
b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
new file mode 100644
index 000..127a9e7d75f
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.16.0-r3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == ** ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/cairo/cairo.git;
+ SRC_URI=""
+else
+ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org/
https://gitlab.freedesktop.org/cairo/cairo;
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == ** ]] && IUSE="${IUSE} doc" # API docs are provided in
tarball, no need to regenerate
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test
needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+ sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+ gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+ glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ )
+ xcb? (
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=sys-devel/libtool-2
+ X? ( x11-base/xorg-proto )"
+#[[ ${PV} == ** ]] && DEPEND="${DEPEND}
+# doc? (
+# >=dev-util/gtk-doc-1.6
+# ~app-text/docbook-xml-dtd-4.2
+# )"
+
+REQUIRED_USE="
+ gles2? ( !opengl )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+ "${FILESDIR}"/${PN}-respect-fontconfig.patch
+ "${FILESDIR}"/${P}-pdf-add-missing-flush.patch
+
"${FILESDIR}"/${P}-ft-Use-FT_Done_MM_Var-instead-of-free-when-available.patch
+)
+
+src_prepare() {
+ default
+
+ # tests and perf tools require X, bug #483574
+ if ! use X; then
+ sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am
|| die
+ fi
+
+ # Slightly messed build system YAY
+ if [[ ${PV} == ** ]]; then
+ touch boilerplate/Makefile.am.features
+ touch src/Makefile.am.features
+ touch ChangeLog
+ fi
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myopts
+
+ [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+ use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+ # [[ ${PV} == ** ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+ ECONF_SOURCE="${S}" \
+ econf \
+ --disable-dependency-tracking \
+ $(use_with X x) \
+ $(use_enable X tee) \
+ $(use_enable X xlib) \
+ $(use_enable X xlib-xrender) \
+ $(use_enable aqua quartz) \
+ $(use_enable aqua quartz-image) \
+ $(use_enable debug test-surfaces) \
+ $(use_enable gles2 glesv2) \
+ $(use_enable glib gobject) \
+ $(use_enable opengl gl) \
+ $(use_enable static-libs static) \
+ $(use_enable svg) \
+ $(use_enable utils trace) \
+
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: c09a8c7673506b1954d3831bb97914a16d69ca21
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Feb 16 07:32:18 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Feb 16 07:32:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c09a8c76
x11-libs/cairo: mark s390 stable
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
x11-libs/cairo/cairo-1.16.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
index 009282297c6..f4962758523 100644
--- a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 43a50b5516f97e0fc7151c5e6803384757eb900a
Author: Matt Turner gentoo org>
AuthorDate: Thu Jan 31 18:10:19 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Thu Jan 31 18:11:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43a50b55
x11-libs/cairo: Drop old versions
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/Manifest | 1 -
x11-libs/cairo/cairo-1.14.12.ebuild | 132
2 files changed, 133 deletions(-)
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index f485786b3a4..a9d5249c5cb 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,2 +1 @@
-DIST cairo-1.14.12.tar.xz 36251896 BLAKE2B
3a6b374390cbc7ff965bcfdf72b5df28c72e8be1ed524adf0dbde2ae74840991e6c158c528c626fb0c902be95bd846366690b280449d6f74689e7090a562958e
SHA512
ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1
DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B
aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0
SHA512
9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
diff --git a/x11-libs/cairo/cairo-1.14.12.ebuild
b/x11-libs/cairo/cairo-1.14.12.ebuild
deleted file mode 100644
index 56b515b4962..000
--- a/x11-libs/cairo/cairo-1.14.12.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic autotools multilib-minimal
-
-if [[ ${PV} == ** ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/cairo;
- SRC_URI=""
-else
- SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org;
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="X aqua debug gles2 +glib opengl static-libs +svg valgrind xcb"
-# gtk-doc regeneration doesn't seem to work with out-of-source builds
-#[[ ${PV} == ** ]] && IUSE="${IUSE} doc" # API docs are provided in
tarball, no need to regenerate
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test
needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
- >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
- sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
- gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
- glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- )
- xcb? (
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/libtool-2
- X? ( x11-base/xorg-proto )"
-#[[ ${PV} == ** ]] && DEPEND="${DEPEND}
-# doc? (
-# >=dev-util/gtk-doc-1.6
-# ~app-text/docbook-xml-dtd-4.2
-# )"
-
-REQUIRED_USE="
- gles2? ( !opengl )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
- "${FILESDIR}"/${PN}-respect-fontconfig.patch
-)
-
-src_prepare() {
- default
-
- # tests and perf tools require X, bug #483574
- if ! use X; then
- sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am
|| die
- fi
-
- # Slightly messed build system YAY
- if [[ ${PV} == ** ]]; then
- touch boilerplate/Makefile.am.features
- touch src/Makefile.am.features
- touch ChangeLog
- fi
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myopts
-
- [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
-
- use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
- [[ ${CHOST} == *-darwin* ]] && myopts+=" --disable-symbol-lookup"
-
- # TODO: remove this (and add USE-dep) when qtgui is converted, bug
#498010
- if ! multilib_is_native_abi; then
- myopts+=" --disable-qt"
- fi
-
- # [[ ${PV} == ** ]] && myopts+="
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 2bc90430e480fefe801da6ef5068ea7e26f6b7e5
Author: Matt Turner gentoo org>
AuthorDate: Mon Jan 28 05:10:42 2019 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Jan 28 05:10:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bc90430
x11-libs/cairo-1.16.0-r2: alpha stable, bug 675818
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-1.16.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
index e94f463e93a..009282297c6 100644
--- a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 2d1b1a6f766859c8b0c0b93615ae48efc3e27561
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Jan 27 14:12:45 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Jan 27 14:14:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d1b1a6f
x11-libs/cairo: stable 1.16.0-r2 for ppc64, bug #675818
Package-Manager: Portage-2.3.58, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich gentoo.org>
x11-libs/cairo/cairo-1.16.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
index 2bd5eb72ef2..e94f463e93a 100644
--- a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 04465e622c9f6f534269ba55fca1d7101e668853
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Jan 27 12:15:52 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Jan 27 12:18:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04465e62
x11-libs/cairo: stable 1.16.0-r2 for hppa, bug #675818
Package-Manager: Portage-2.3.58, Repoman-2.3.12
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich gentoo.org>
x11-libs/cairo/cairo-1.16.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
index 68bdb8a0bce..0f0760e04bf 100644
--- a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: bd430f85db9045578ea5cb549caf60064ca0
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Jan 24 21:42:41 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Jan 24 22:22:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd430f85
x11-libs/cairo: x86 stable (bug #675818)
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
x11-libs/cairo/cairo-1.16.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
index 31430c1f1f3..68bdb8a0bce 100644
--- a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 24ac86b2b22f8669c681e8eeabbba941946b21d2
Author: Mart Raudsepp gentoo org>
AuthorDate: Tue Jan 22 10:44:15 2019 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Tue Jan 22 10:47:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24ac86b2
x11-libs/cairo: arm64 stable (bug #675818)
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp gentoo.org>
x11-libs/cairo/cairo-1.16.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
index 2e968b9dfe1..31430c1f1f3 100644
--- a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: e30c9d60c863f4698e9f21cc97b08d668b799ee0
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon Jan 21 23:21:52 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Jan 21 23:21:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e30c9d60
x11-libs/cairo: stable 1.16.0-r2 for ia64, bug #675818
Package-Manager: Portage-2.3.56, Repoman-2.3.12
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich gentoo.org>
x11-libs/cairo/cairo-1.16.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
index 33fb3476ef6..2e968b9dfe1 100644
--- a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: d1a7165a4364c18632d745a1ae8ace337056fbec
Author: Mikle Kolyada gentoo org>
AuthorDate: Mon Jan 21 07:42:11 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Mon Jan 21 07:42:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1a7165a
x11-libs/cairo: arm stable wrt bug #675818
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
x11-libs/cairo/cairo-1.16.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
index 99d06563c19..33fb3476ef6 100644
--- a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: d9c2e5705f861a92cba6d38390be6b2004820953
Author: Mikle Kolyada gentoo org>
AuthorDate: Mon Jan 21 07:38:05 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Mon Jan 21 07:38:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9c2e570
x11-libs/cairo: amd64 stable wrt bug #675818
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
x11-libs/cairo/cairo-1.16.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
index 1508d805c7e..99d06563c19 100644
--- a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 2f09c3aa1cec5cadd3b279ea2bd96cce2cd22be0
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sun Jan 20 08:24:37 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Jan 20 09:53:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f09c3aa
x11-libs/cairo: stable 1.16.0-r2 for sparc, bug #675818
Signed-off-by: Rolf Eike Beer sf-mail.de>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich gentoo.org>
x11-libs/cairo/cairo-1.16.0-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
index 50f6c6a7649..1508d805c7e 100644
--- a/x11-libs/cairo/cairo-1.16.0-r2.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: f45db7d7e34271c0fd46d7d69a5462a76c27a2d2 Author: Matt Turner gentoo org> AuthorDate: Wed Oct 31 19:03:23 2018 + Commit: Matt Turner gentoo org> CommitDate: Wed Oct 31 19:09:54 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f45db7d7 x11-libs/cairo: Drop tetromino as maintainer Has no commits to this package since the transition to git. Signed-off-by: Matt Turner gentoo.org> x11-libs/cairo/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml index 7c19663b4c4..be776cc3696 100644 --- a/x11-libs/cairo/metadata.xml +++ b/x11-libs/cairo/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - tetrom...@gentoo.org - Alexandre Rostovtsev - x...@gentoo.org X11
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 216aa553ff6229a4ca88cabb75f2a3dca7bbaa45
Author: Matt Turner gentoo org>
AuthorDate: Wed Oct 31 19:07:15 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Oct 31 19:09:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=216aa553
x11-libs/cairo: x11-libs/cairo: Build interpreter unconditionally
Closes: https://bugs.gentoo.org/669972
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/{cairo-1.16.0-r1.ebuild => cairo-1.16.0-r2.ebuild} | 3 ++-
x11-libs/cairo/cairo-.ebuild | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.16.0-r1.ebuild
b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
similarity index 98%
rename from x11-libs/cairo/cairo-1.16.0-r1.ebuild
rename to x11-libs/cairo/cairo-1.16.0-r2.ebuild
index 52e56a49b8f..50f6c6a7649 100644
--- a/x11-libs/cairo/cairo-1.16.0-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r2.ebuild
@@ -105,7 +105,6 @@ multilib_src_configure() {
$(use_enable opengl gl) \
$(use_enable static-libs static) \
$(use_enable svg) \
- $(use_enable utils interpreter) \
$(use_enable utils trace) \
$(use_enable valgrind) \
$(use_enable xcb) \
@@ -114,6 +113,8 @@ multilib_src_configure() {
--enable-pdf \
--enable-png \
--enable-ps \
+ --enable-script \
+ --enable-interpreter \
--disable-drm \
--disable-directfb \
--disable-gallium \
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index 52e56a49b8f..50f6c6a7649 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -105,7 +105,6 @@ multilib_src_configure() {
$(use_enable opengl gl) \
$(use_enable static-libs static) \
$(use_enable svg) \
- $(use_enable utils interpreter) \
$(use_enable utils trace) \
$(use_enable valgrind) \
$(use_enable xcb) \
@@ -114,6 +113,8 @@ multilib_src_configure() {
--enable-pdf \
--enable-png \
--enable-ps \
+ --enable-script \
+ --enable-interpreter \
--disable-drm \
--disable-directfb \
--disable-gallium \
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 76c3bd643515a6398f211c45b1c70a87341d3143
Author: Matt Turner gentoo org>
AuthorDate: Tue Oct 30 14:00:51 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Oct 30 14:01:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76c3bd64
x11-libs/cairo: Build cairo script unconditionally
Lots of reverse dependencies need it, at least optionally. Saving the
lzo dependency is not a worthy goal, so let's just reenable it instead
of forcing reverse dependencies to change.
Closes: https://bugs.gentoo.org/669196
Closes: https://bugs.gentoo.org/669448
Closes: https://bugs.gentoo.org/669952
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/{cairo-1.16.0.ebuild => cairo-1.16.0-r1.ebuild} | 3 +--
x11-libs/cairo/cairo-.ebuild | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/x11-libs/cairo/cairo-1.16.0.ebuild
b/x11-libs/cairo/cairo-1.16.0-r1.ebuild
similarity index 97%
rename from x11-libs/cairo/cairo-1.16.0.ebuild
rename to x11-libs/cairo/cairo-1.16.0-r1.ebuild
index ecceec47019..52e56a49b8f 100644
--- a/x11-libs/cairo/cairo-1.16.0.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r1.ebuild
@@ -26,6 +26,7 @@ IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils
valgrind xcb"
RESTRICT="test"
RDEPEND="
+ >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
@@ -35,7 +36,6 @@ RDEPEND="
gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
- utils? ( >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] )
X? (
>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
@@ -106,7 +106,6 @@ multilib_src_configure() {
$(use_enable static-libs static) \
$(use_enable svg) \
$(use_enable utils interpreter) \
- $(use_enable utils script) \
$(use_enable utils trace) \
$(use_enable valgrind) \
$(use_enable xcb) \
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index ecceec47019..52e56a49b8f 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -26,6 +26,7 @@ IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils
valgrind xcb"
RESTRICT="test"
RDEPEND="
+ >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
@@ -35,7 +36,6 @@ RDEPEND="
gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
- utils? ( >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] )
X? (
>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
@@ -106,7 +106,6 @@ multilib_src_configure() {
$(use_enable static-libs static) \
$(use_enable svg) \
$(use_enable utils interpreter) \
- $(use_enable utils script) \
$(use_enable utils trace) \
$(use_enable valgrind) \
$(use_enable xcb) \
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 002507830ea1c239c5bf87bdf28806abc612e23d
Author: Matt Turner gentoo org>
AuthorDate: Fri Oct 19 22:20:32 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Oct 19 22:30:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00250783
x11-libs/cairo: Version bump to 1.16.0
Closes: https://bugs.gentoo.org/581532
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/Manifest| 1 +
x11-libs/cairo/cairo-1.16.0.ebuild | 130 +
2 files changed, 131 insertions(+)
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 1aa5bb15b3d..f485786b3a4 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1 +1,2 @@
DIST cairo-1.14.12.tar.xz 36251896 BLAKE2B
3a6b374390cbc7ff965bcfdf72b5df28c72e8be1ed524adf0dbde2ae74840991e6c158c528c626fb0c902be95bd846366690b280449d6f74689e7090a562958e
SHA512
ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1
+DIST cairo-1.16.0.tar.xz 41997432 BLAKE2B
aa37edf7fdf0c952484fd0adc9281724227db93958d6e4919216b30e9017fab670bc2340e3b975737080f1f67dec24025fe0e4680e275ab7703cfb9235eb1fe0
SHA512
9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f
diff --git a/x11-libs/cairo/cairo-1.16.0.ebuild
b/x11-libs/cairo/cairo-1.16.0.ebuild
new file mode 100644
index 000..ecceec47019
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.16.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == ** ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/cairo;
+ SRC_URI=""
+else
+ SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="https://www.cairographics.org;
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == ** ]] && IUSE="${IUSE} doc" # API docs are provided in
tarball, no need to regenerate
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test
needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+ sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+ gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+ glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+ utils? ( >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ )
+ xcb? (
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=sys-devel/libtool-2
+ X? ( x11-base/xorg-proto )"
+#[[ ${PV} == ** ]] && DEPEND="${DEPEND}
+# doc? (
+# >=dev-util/gtk-doc-1.6
+# ~app-text/docbook-xml-dtd-4.2
+# )"
+
+REQUIRED_USE="
+ gles2? ( !opengl )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+ "${FILESDIR}"/${PN}-respect-fontconfig.patch
+)
+
+src_prepare() {
+ default
+
+ # tests and perf tools require X, bug #483574
+ if ! use X; then
+ sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am
|| die
+ fi
+
+ # Slightly messed build system YAY
+ if [[ ${PV} == ** ]]; then
+ touch boilerplate/Makefile.am.features
+ touch src/Makefile.am.features
+ touch ChangeLog
+ fi
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myopts
+
+ [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+ use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+ # [[ ${PV} == ** ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+ ECONF_SOURCE="${S}" \
+ econf \
+ --disable-dependency-tracking \
+ $(use_with X x) \
+
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: d09964cd3a4631942122d45dc74d8a5dde8ab2fc
Author: Matt Turner gentoo org>
AuthorDate: Fri Oct 19 22:29:10 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Fri Oct 19 22:30:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d09964cd
x11-libs/cairo: Remove stale code
In fact --disable-qt is unconditionally passed below.
Signed-off-by: Matt Turner gentoo.org>
x11-libs/cairo/cairo-.ebuild | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/x11-libs/cairo/cairo-.ebuild b/x11-libs/cairo/cairo-.ebuild
index cf8db822d91..ecceec47019 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -88,11 +88,6 @@ multilib_src_configure() {
use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
- # TODO: remove this (and add USE-dep) when qtgui is converted, bug
#498010
- if ! multilib_is_native_abi; then
- myopts+=" --disable-qt"
- fi
-
# [[ ${PV} == ** ]] && myopts+=" $(use_enable doc gtk-doc)"
ECONF_SOURCE="${S}" \
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: bf30dda1153051ac9324aeac87f68286c613e34c
Author: Matt Turner gentoo org>
AuthorDate: Tue Jul 31 21:49:46 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Jul 31 21:50:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf30dda1
x11-libs/cairo: Drop old versions
x11-libs/cairo/Manifest | 2 -
x11-libs/cairo/cairo-1.14.10.ebuild | 132
x11-libs/cairo/cairo-1.14.8.ebuild | 132
3 files changed, 266 deletions(-)
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index f80afa31c95..1aa5bb15b3d 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,3 +1 @@
-DIST cairo-1.14.10.tar.xz 36251788 BLAKE2B
2015594f2a263250b7fd924840155aa3f813e4b6f0eaeaa3f3eec6b26935c073590a32f17b6268d99bb297ba516da7debe7e3e0abf16d36e012e761dbc7ecada
SHA512
a381d97e6046da0012eb5595118efb95ff02e3e84310682e458b503ebf22d6b2663bcc1391980768bb9cd02ae809b8df2e11d6200b48745dc5ec824c342b5852
DIST cairo-1.14.12.tar.xz 36251896 BLAKE2B
3a6b374390cbc7ff965bcfdf72b5df28c72e8be1ed524adf0dbde2ae74840991e6c158c528c626fb0c902be95bd846366690b280449d6f74689e7090a562958e
SHA512
ede6e75ae95605bf5c4b3859b1824cf125c4a2a35a67d38244cc70951ca44b1d4fd7cf622953d3a7cb868fb5b00856ef6d68ee615276b76eec437641290b01e1
-DIST cairo-1.14.8.tar.xz 35392464 BLAKE2B
d1d8b283bc55bcb8f34a1e1d8dd6384292c128e38589672f404ee1d15b32004398c3b4668737e1ef34a58b841445530603c9105644076cbda289ec576c55a252
SHA512
dfe77a01ca72e21e11610243a5f6e92e6b0821c4ace11686fb0bac8f0bf9217a79974ff46bdf3d19fd85173f5f24f2c3f6d4e00cf729a55a6492e6798d6c4ec2
diff --git a/x11-libs/cairo/cairo-1.14.10.ebuild
b/x11-libs/cairo/cairo-1.14.10.ebuild
deleted file mode 100644
index 38c7f9c4921..000
--- a/x11-libs/cairo/cairo-1.14.10.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic autotools multilib-minimal
-
-if [[ ${PV} == ** ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/cairo;
- SRC_URI=""
-else
- SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
-fi
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="https://www.cairographics.org;
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-IUSE="X aqua debug gles2 +glib opengl static-libs +svg valgrind xcb"
-# gtk-doc regeneration doesn't seem to work with out-of-source builds
-#[[ ${PV} == ** ]] && IUSE="${IUSE} doc" # API docs are provided in
tarball, no need to regenerate
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test
needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
- >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
- >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
- sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
- >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
- gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
- glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- )
- xcb? (
- >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- >=sys-devel/libtool-2
- X? ( x11-base/xorg-proto )"
-#[[ ${PV} == ** ]] && DEPEND="${DEPEND}
-# doc? (
-# >=dev-util/gtk-doc-1.6
-# ~app-text/docbook-xml-dtd-4.2
-# )"
-
-REQUIRED_USE="
- gles2? ( !opengl )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
- "${FILESDIR}"/${PN}-respect-fontconfig.patch
-)
-
-src_prepare() {
- default
-
- # tests and perf tools require X, bug #483574
- if ! use X; then
- sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am
|| die
- fi
-
- # Slightly messed build system YAY
- if [[ ${PV} == ** ]]; then
- touch boilerplate/Makefile.am.features
- touch src/Makefile.am.features
- touch ChangeLog
- fi
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myopts
-
- [[ ${CHOST} == *-interix* ]] && append-flags
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 04fca63423f012d4033d7f4dc12ba3b0d3d46452
Author: Mikle Kolyada gentoo org>
AuthorDate: Thu Jun 14 19:10:01 2018 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Thu Jun 14 19:10:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04fca634
x11-libs/cairo: mark s390 stable
Package-Manager: Portage-2.3.40, Repoman-2.3.9
x11-libs/cairo/cairo-1.14.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.14.12.ebuild
b/x11-libs/cairo/cairo-1.14.12.ebuild
index 93a2b8f96d0..4aa4c57a63c 100644
--- a/x11-libs/cairo/cairo-1.14.12.ebuild
+++ b/x11-libs/cairo/cairo-1.14.12.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 71f73f81c63236bd25111352eaf9f0ddcd096cbc
Author: Markus Meier gentoo org>
AuthorDate: Thu Mar 22 06:05:45 2018 +
Commit: Markus Meier gentoo org>
CommitDate: Thu Mar 22 06:05:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71f73f81
x11-libs/cairo: arm stable, bug #641356
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="arm"
x11-libs/cairo/cairo-1.14.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.14.12.ebuild
b/x11-libs/cairo/cairo-1.14.12.ebuild
index 6c345fe74ce..37c94b9168c 100644
--- a/x11-libs/cairo/cairo-1.14.12.ebuild
+++ b/x11-libs/cairo/cairo-1.14.12.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 7591fe3db0758c37cd669ae607bf87d928794823
Author: Matt Turner gentoo org>
AuthorDate: Tue Mar 20 20:36:10 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Tue Mar 20 20:36:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7591fe3d
x11-libs/cairo-1.14.12: hppa stable, bug 641356
x11-libs/cairo/cairo-1.14.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.14.12.ebuild
b/x11-libs/cairo/cairo-1.14.12.ebuild
index e3cfd44ca75..6c345fe74ce 100644
--- a/x11-libs/cairo/cairo-1.14.12.ebuild
+++ b/x11-libs/cairo/cairo-1.14.12.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
+ KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 3639f0b466d1f0f149d86c9d47b1a5cf3db99ef0
Author: Matt Turner gentoo org>
AuthorDate: Mon Mar 12 06:23:16 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Mar 12 06:23:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3639f0b4
x11-libs/cairo-1.14.12: ppc64 stable, bug 641356
x11-libs/cairo/cairo-1.14.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.14.12.ebuild
b/x11-libs/cairo/cairo-1.14.12.ebuild
index 3092f80f408..e3cfd44ca75 100644
--- a/x11-libs/cairo/cairo-1.14.12.ebuild
+++ b/x11-libs/cairo/cairo-1.14.12.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64
~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
+ KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390
~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 4da96e293a6351cadd691c66c7c4b7d87c883b32
Author: Matt Turner gentoo org>
AuthorDate: Mon Mar 12 06:23:13 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Mar 12 06:23:13 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da96e29
x11-libs/cairo-1.14.12: ppc stable, bug 641356
x11-libs/cairo/cairo-1.14.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.14.12.ebuild
b/x11-libs/cairo/cairo-1.14.12.ebuild
index bb7fdfa02ae..3092f80f408 100644
--- a/x11-libs/cairo/cairo-1.14.12.ebuild
+++ b/x11-libs/cairo/cairo-1.14.12.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
+ KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64
~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
[gentoo-commits] repo/gentoo:master commit in: x11-libs/cairo/
commit: 26bdd38a25be9ce890a2a9819d05050bb5f20c10
Author: Mart Raudsepp gentoo org>
AuthorDate: Sat Mar 3 00:44:14 2018 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sat Mar 3 01:39:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26bdd38a
x11-libs/cairo-1.14.12: arm64 stable (bug #641356)
Package-Manager: Portage-2.3.19, Repoman-2.3.6
x11-libs/cairo/cairo-1.14.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-libs/cairo/cairo-1.14.12.ebuild
b/x11-libs/cairo/cairo-1.14.12.ebuild
index 7fce0e20be4..bb7fdfa02ae 100644
--- a/x11-libs/cairo/cairo-1.14.12.ebuild
+++ b/x11-libs/cairo/cairo-1.14.12.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == ** ]]; then
SRC_URI=""
else
SRC_URI="https://www.cairographics.org/releases/${P}.tar.xz;
- KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
+ KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64
~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
fi
DESCRIPTION="A vector graphics library with cross-device output support"
