| 1 |
commit: 067f5be6b9b1a4ca07ffbe744ecfefa66b442958 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 25 23:44:06 2017 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 26 00:14:52 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=067f5be6 |
| 7 |
|
| 8 |
x11-libs/cairo: Put script and trace utilities behind IUSE=utils. |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/554646 |
| 11 |
|
| 12 |
x11-libs/cairo/cairo-9999.ebuild | 8 ++++++-- |
| 13 |
x11-libs/cairo/metadata.xml | 1 + |
| 14 |
2 files changed, 7 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild |
| 17 |
index 4a5f2bdd3b..7ec16d48f5 100644 |
| 18 |
--- a/x11-libs/cairo/cairo-9999.ebuild |
| 19 |
+++ b/x11-libs/cairo/cairo-9999.ebuild |
| 20 |
@@ -19,14 +19,14 @@ DESCRIPTION="A vector graphics library with cross-device output support" |
| 21 |
HOMEPAGE="http://cairographics.org/" |
| 22 |
LICENSE="|| ( LGPL-2.1 MPL-1.1 )" |
| 23 |
SLOT="0" |
| 24 |
-IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg valgrind xcb xlib-xcb" |
| 25 |
+IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg utils valgrind xcb xlib-xcb" |
| 26 |
# gtk-doc regeneration doesn't seem to work with out-of-source builds |
| 27 |
#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate |
| 28 |
|
| 29 |
# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it |
| 30 |
RESTRICT="test" |
| 31 |
|
| 32 |
-RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] |
| 33 |
+RDEPEND=" |
| 34 |
>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] |
| 35 |
>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] |
| 36 |
>=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] |
| 37 |
@@ -37,6 +37,7 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] |
| 38 |
gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] ) |
| 39 |
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] ) |
| 40 |
opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) ) |
| 41 |
+ utils? ( >=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}] ) |
| 42 |
X? ( |
| 43 |
>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] |
| 44 |
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] |
| 45 |
@@ -129,6 +130,9 @@ multilib_src_configure() { |
| 46 |
$(use_enable opengl gl) \ |
| 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 |
$(use_enable xcb xcb-shm) \ |
| 55 |
|
| 56 |
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml |
| 57 |
index 30f3a7330e..b75acc795c 100644 |
| 58 |
--- a/x11-libs/cairo/metadata.xml |
| 59 |
+++ b/x11-libs/cairo/metadata.xml |
| 60 |
@@ -14,6 +14,7 @@ |
| 61 |
Use Mesa backend for acceleration</flag> |
| 62 |
<flag name="gles2">Use OpenGL ES 2 backend for acceleration.</flag> |
| 63 |
<flag name="glib">Compile with GLib Object System support</flag> |
| 64 |
+ <flag name="utils">Build support for Cairo script and trace utilities</flag> |
| 65 |
<flag name="valgrind">Built-in support to mark memory regions</flag> |
| 66 |
<flag name="xlib-xcb">Use XCB renderer backend for acceleration over xlib. Enabling this may solve or introduce display corruption problems.</flag> |
| 67 |
</use> |
Archives