diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2018-10-30 07:00:51 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2018-10-30 07:01:22 -0700 |
| commit | 76c3bd643515a6398f211c45b1c70a87341d3143 (patch) | |
| tree | 9a6769180a99c8367617c4eb0183adf7b539c45c | |
| parent | dev-libs/gost-engine: Update dependencies for test (diff) | |
| download | gentoo-76c3bd64.tar.gz gentoo-76c3bd64.tar.bz2 gentoo-76c3bd64.zip | |
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 <mattst88@gentoo.org>
| -rw-r--r-- | x11-libs/cairo/cairo-1.16.0-r1.ebuild (renamed from x11-libs/cairo/cairo-1.16.0.ebuild) | 3 | ||||
| -rw-r--r-- | x11-libs/cairo/cairo-9999.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 index ecceec470191..52e56a49b8fe 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-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild index ecceec470191..52e56a49b8fe 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-9999.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) \ |