| 1 |
commit: 76c3bd643515a6398f211c45b1c70a87341d3143 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 30 14:00:51 2018 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 30 14:01:22 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76c3bd64 |
| 7 |
|
| 8 |
x11-libs/cairo: Build cairo script unconditionally |
| 9 |
|
| 10 |
Lots of reverse dependencies need it, at least optionally. Saving the |
| 11 |
lzo dependency is not a worthy goal, so let's just reenable it instead |
| 12 |
of forcing reverse dependencies to change. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/669196 |
| 15 |
Closes: https://bugs.gentoo.org/669448 |
| 16 |
Closes: https://bugs.gentoo.org/669952 |
| 17 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 18 |
|
| 19 |
x11-libs/cairo/{cairo-1.16.0.ebuild => cairo-1.16.0-r1.ebuild} | 3 +-- |
| 20 |
x11-libs/cairo/cairo-9999.ebuild | 3 +-- |
| 21 |
2 files changed, 2 insertions(+), 4 deletions(-) |
| 22 |
|
| 23 |
diff --git a/x11-libs/cairo/cairo-1.16.0.ebuild b/x11-libs/cairo/cairo-1.16.0-r1.ebuild |
| 24 |
similarity index 97% |
| 25 |
rename from x11-libs/cairo/cairo-1.16.0.ebuild |
| 26 |
rename to x11-libs/cairo/cairo-1.16.0-r1.ebuild |
| 27 |
index ecceec47019..52e56a49b8f 100644 |
| 28 |
--- a/x11-libs/cairo/cairo-1.16.0.ebuild |
| 29 |
+++ b/x11-libs/cairo/cairo-1.16.0-r1.ebuild |
| 30 |
@@ -26,6 +26,7 @@ IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb" |
| 31 |
RESTRICT="test" |
| 32 |
|
| 33 |
RDEPEND=" |
| 34 |
+ >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] |
| 35 |
>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] |
| 36 |
>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] |
| 37 |
>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] |
| 38 |
@@ -35,7 +36,6 @@ RDEPEND=" |
| 39 |
gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) |
| 40 |
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) |
| 41 |
opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] ) |
| 42 |
- utils? ( >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] ) |
| 43 |
X? ( |
| 44 |
>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] |
| 45 |
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] |
| 46 |
@@ -106,7 +106,6 @@ multilib_src_configure() { |
| 47 |
$(use_enable static-libs static) \ |
| 48 |
$(use_enable svg) \ |
| 49 |
$(use_enable utils interpreter) \ |
| 50 |
- $(use_enable utils script) \ |
| 51 |
$(use_enable utils trace) \ |
| 52 |
$(use_enable valgrind) \ |
| 53 |
$(use_enable xcb) \ |
| 54 |
|
| 55 |
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild |
| 56 |
index ecceec47019..52e56a49b8f 100644 |
| 57 |
--- a/x11-libs/cairo/cairo-9999.ebuild |
| 58 |
+++ b/x11-libs/cairo/cairo-9999.ebuild |
| 59 |
@@ -26,6 +26,7 @@ IUSE="X aqua debug gles2 +glib opengl static-libs +svg utils valgrind xcb" |
| 60 |
RESTRICT="test" |
| 61 |
|
| 62 |
RDEPEND=" |
| 63 |
+ >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] |
| 64 |
>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] |
| 65 |
>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] |
| 66 |
>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] |
| 67 |
@@ -35,7 +36,6 @@ RDEPEND=" |
| 68 |
gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) |
| 69 |
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) |
| 70 |
opengl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] ) |
| 71 |
- utils? ( >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] ) |
| 72 |
X? ( |
| 73 |
>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] |
| 74 |
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] |
| 75 |
@@ -106,7 +106,6 @@ multilib_src_configure() { |
| 76 |
$(use_enable static-libs static) \ |
| 77 |
$(use_enable svg) \ |
| 78 |
$(use_enable utils interpreter) \ |
| 79 |
- $(use_enable utils script) \ |
| 80 |
$(use_enable utils trace) \ |
| 81 |
$(use_enable valgrind) \ |
| 82 |
$(use_enable xcb) \ |
Archives