commit: bb0ed566f6399041c55a6d409d5399f5b0ca9cb3 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Tue Jan 14 21:07:01 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue Jan 14 21:07:01 2020 +0000 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 <mattst88 <AT> gentoo.org> x11-libs/cairo/cairo-1.16.0-r3.ebuild | 10 ++++------ x11-libs/cairo/cairo-9999.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} == *9999* ]] && 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-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild index 6b69a9ab32b..45d38bca293 100644 --- a/x11-libs/cairo/cairo-9999.ebuild +++ b/x11-libs/cairo/cairo-9999.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} == *9999* ]] && 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 \
