commit: 1459b3170fba09b7e933ffecc2b3011cda0e5cd9 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Tue Jan 14 21:19:37 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue Jan 14 21:19:37 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1459b317
x11-libs/cairo: Rename IUSE=gles2 to gles2-only Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> profiles/base/package.use.mask | 2 +- x11-libs/cairo/cairo-1.16.0-r3.ebuild | 8 ++++---- x11-libs/cairo/cairo-9999.ebuild | 8 ++++---- x11-libs/cairo/metadata.xml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index f82aab63ac5..b0f8da7a101 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -536,7 +536,7 @@ media-libs/libsdl2 custom-cflags # Chí-Thanh Christopher Nguyễn <chith...@gentoo.org> (2013-07-13) # GL/GLES support in cairo is mutually exclusive, bug #428770. -x11-libs/cairo gles2 +x11-libs/cairo gles2-only # Kacper Kowalik <xarthis...@gentoo.org> (2013-05-19) # Fails to build, haven't had time to debug diff --git a/x11-libs/cairo/cairo-1.16.0-r3.ebuild b/x11-libs/cairo/cairo-1.16.0-r3.ebuild index 35ca0745c48..94c39df2186 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" +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} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate @@ -36,7 +36,7 @@ RDEPEND=" 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}] ) + 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? ( @@ -54,7 +54,7 @@ DEPEND="${RDEPEND} # )" REQUIRED_USE=" - gles2? ( !opengl ) + gles2-only? ( !opengl ) " PATCHES=( @@ -101,7 +101,7 @@ multilib_src_configure() { $(use_enable aqua quartz) \ $(use_enable aqua quartz-image) \ $(use_enable debug test-surfaces) \ - $(use_enable gles2 glesv2) \ + $(use_enable gles2-only glesv2) \ $(use_enable glib gobject) \ $(use_enable opengl gl) \ $(use_enable static-libs static) \ diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild index 45d38bca293..e6b26da6441 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" +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} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate @@ -36,7 +36,7 @@ RDEPEND=" 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}] ) + 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? ( @@ -54,7 +54,7 @@ DEPEND="${RDEPEND} # )" REQUIRED_USE=" - gles2? ( !opengl ) + gles2-only? ( !opengl ) " PATCHES=( @@ -99,7 +99,7 @@ multilib_src_configure() { $(use_enable aqua quartz) \ $(use_enable aqua quartz-image) \ $(use_enable debug test-surfaces) \ - $(use_enable gles2 glesv2) \ + $(use_enable gles2-only glesv2) \ $(use_enable glib gobject) \ $(use_enable opengl gl) \ $(use_enable static-libs static) \ diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml index be776cc3696..4d03eec8d35 100644 --- a/x11-libs/cairo/metadata.xml +++ b/x11-libs/cairo/metadata.xml @@ -7,7 +7,7 @@ </maintainer> <use> <flag name="opengl" restrict=">=x11-libs/cairo-1.10.0">Build the OpenGL backend</flag> - <flag name="gles2">Build the OpenGL ES 2 backend</flag> + <flag name="gles2-only">Build the OpenGL ES 2 backend</flag> <flag name="glib">Compile with GLib Object System support</flag> <flag name="utils">Build support for Cairo script and trace utilities</flag> <flag name="valgrind">Built-in support to mark memory regions</flag>
