x11-libs/cairo: Rename IUSE=gles2 to gles2-only

Signed-off-by: Matt Turner <mattst88@gentoo.org>

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index f82aab63ac5bf500e00914ce4567a51915e1f550..b0f8da7a101f5e313d56116acfd5443b18e0580d 100644 (file)
--- 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 <chithanh@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 <xarthisius@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 35ca0745c48e0309e0c7dcaaf9dd7f543bfb157d..94c39df21863a301cfacb64bc6dce2ff3a8f1122 100644 (file)
--- 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 45d38bca293a053883b0d5d0d9741b423011d5d3..e6b26da644177692751465a70bc5be8027e5d9e6 100644 (file)
--- 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 be776cc36965729deb854674d132557ef2d68835..4d03eec8d35e745ec4d49213c3273446a75ef32d 100644 (file)
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -7,7 +7,7 @@
        </maintainer>
        <use>
                <flag name="opengl" restrict="&gt;=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>