[gentoo-commits] repo/gentoo:master commit in: profiles/base/, x11-libs/cairo/

2020-01-14 Thread Matt Turner 
commit: 1459b3170fba09b7e933ffecc2b3011cda0e5cd9
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Jan 14 21:19:37 2020 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Jan 14 21:19:37 2020 +
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  gentoo.org>

 profiles/base/package.use.mask| 2 +-
 x11-libs/cairo/cairo-1.16.0-r3.ebuild | 8 
 x11-libs/cairo/cairo-.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  (2013-07-13)
 # GL/GLES support in cairo is mutually exclusive, bug #428770.
-x11-libs/cairo gles2
+x11-libs/cairo gles2-only
 
 # Kacper Kowalik  (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} == ** ]] && 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-.ebuild b/x11-libs/cairo/cairo-.ebuild
index 45d38bca293..e6b26da6441 100644
--- a/x11-libs/cairo/cairo-.ebuild
+++ b/x11-libs/cairo/cairo-.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} == ** ]] && 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 @@


Build 
the OpenGL backend
-   Build

[gentoo-commits] repo/gentoo:master commit in: profiles/base/, x11-libs/cairo/

2017-12-29 Thread Matt Turner 
commit: 06f1e7b6cd6831cbf122684a81385790661d7feb
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Dec 29 18:40:57 2017 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Dec 29 18:42:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f1e7b6

x11-libs/cairo: Drop directfb support

Has been masked since late 2014.

Bug: https://bugs.gentoo.org/642516

 profiles/base/package.use.mask  |  5 -
 x11-libs/cairo/cairo-1.14.10.ebuild | 15 ++-
 x11-libs/cairo/cairo-1.14.12.ebuild | 15 ++-
 x11-libs/cairo/cairo-1.14.8.ebuild  | 15 ++-
 x11-libs/cairo/cairo-.ebuild| 15 ++-
 5 files changed, 8 insertions(+), 57 deletions(-)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 3d4894937bc..dd7fe22d001 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -424,11 +424,6 @@ dev-db/mysql cluster
 # is implemented. Masking for testing and evaluation.
 app-admin/clsync cluster mhash
 
-# Michał Górny  (30 Nov 2014)
-# Not supported at the moment. DirectFB lacks multilib support,
-# and we have to decide if we want it.
-x11-libs/cairo directfb
-
 # Brian Evans  (29 Nov 2014)
 # Strongly recommened by upstream to disable lzo and zlib due to memory leaks
 # https://github.com/groonga/groonga/issues/6 (Japanese)

diff --git a/x11-libs/cairo/cairo-1.14.10.ebuild 
b/x11-libs/cairo/cairo-1.14.10.ebuild
index 396118fc061..a6ea82e1c36 100644
--- a/x11-libs/cairo/cairo-1.14.10.ebuild
+++ b/x11-libs/cairo/cairo-1.14.10.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="A vector graphics library with cross-device 
output support"
 HOMEPAGE="https://www.cairographics.org;
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg valgrind xcb"
+IUSE="X aqua debug gles2 +glib opengl static-libs +svg valgrind xcb"
 # gtk-doc regeneration doesn't seem to work with out-of-source builds
 #[[ ${PV} == ** ]] && IUSE="${IUSE} doc" # API docs are provided in 
tarball, no need to regenerate
 
@@ -32,7 +32,6 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
-   directfb? ( dev-libs/DirectFB )
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}] )
@@ -64,10 +63,6 @@ REQUIRED_USE="
gles2? ( !opengl )
 "
 
-MULTILIB_WRAPPED_HEADERS=(
-   /usr/include/cairo/cairo-directfb.h
-)
-
 PATCHES=(
"${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
"${FILESDIR}"/${PN}-respect-fontconfig.patch
@@ -99,12 +94,6 @@ multilib_src_configure() {
use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
[[ ${CHOST} == *-darwin* ]] && myopts+=" --disable-symbol-lookup"
 
-   # TODO: remove this (and add USE-dep) when DirectFB is converted,
-   # bug #484248 -- but beware of the circular dep.
-   if ! multilib_is_native_abi; then
-   myopts+=" --disable-directfb"
-   fi
-
# TODO: remove this (and add USE-dep) when qtgui is converted, bug 
#498010
if ! multilib_is_native_abi; then
myopts+=" --disable-qt"
@@ -122,7 +111,6 @@ multilib_src_configure() {
$(use_enable aqua quartz) \
$(use_enable aqua quartz-image) \
$(use_enable debug test-surfaces) \
-   $(use_enable directfb) \
$(use_enable gles2 glesv2) \
$(use_enable glib gobject) \
$(use_enable opengl gl) \
@@ -135,6 +123,7 @@ multilib_src_configure() {
--enable-pdf \
--enable-png \
--enable-ps \
+   --disable-directfb \
--disable-drm \
--disable-gallium \
--disable-qt \

diff --git a/x11-libs/cairo/cairo-1.14.12.ebuild 
b/x11-libs/cairo/cairo-1.14.12.ebuild
index 396118fc061..1d8b4ec96d4 100644
--- a/x11-libs/cairo/cairo-1.14.12.ebuild
+++ b/x11-libs/cairo/cairo-1.14.12.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="A vector graphics library with cross-device 
output support"
 HOMEPAGE="https://www.cairographics.org;
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg valgrind xcb"
+IUSE="X aqua debug gles2 +glib opengl static-libs +svg valgrind xcb"
 # gtk-doc regeneration doesn't seem to work with out-of-source builds
 #[[ ${PV} == ** ]] && IUSE="${IUSE} doc" # API docs are provided in 
tarball, no need to regenerate
 
@@ -32,7 +32,6 @@ RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
sys-libs/binutils-libs:0=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]