gentoo resync : 10.02.2019

4 files changed, 25 insertions, 34 deletions

diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 8fb014cbeb5b..db8c590f9988 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,6 +1,6 @@
 AUX efl-1.21.1-fix_evas_preload_segfault.patch 381 BLAKE2B a4b8afbe06cd44154a41766fcf12775369c2243325eab17647423a3d2b78cc3646361c0a4884de71fd876698defb9816f50343c46690b595c3701a6295a95040 SHA512 90901ab26915a6d2aba80deb610eb8bb873cd4cc7210888a4f062057891024d4e0b3f051be2fda39680d2267301251abbfbfc47072cb5c22ba6eba8f9d9567fc
 DIST efl-1.20.7.tar.xz 65509444 BLAKE2B f58f7daf850ef9983fe4b3a10a3ceb137be7f7ae32c71f476498f677de690bfcc7c16aea5032168a42aa6b5f97d1fb5ca51dafc69d80e2a9262f4d78220a8562 SHA512 c1bf18b74316cf9bd0bc16635c216ca0d8005b2ded1c014b22590388e37368343e5e5318f526dcb042cfce8ab2c7a82655e4718cbcac5dd1ed0d2522a7a2d7de
 DIST efl-1.21.1.tar.xz 71168368 BLAKE2B 4653e97f7b9a824d8e84dd1463dd6c95c0228bb3a03df1915f604136380343ad52e86e6b485f0aa14f1caef5a36451425b79cf2a5123c83d8e8a6d430ff213bf SHA512 1e26a57fca84ec85e45d707ee57abc50bd18edfa82e478e586300b6ad5ab8b9103a54a656902d29d80425988a6116a40aa01758fb8dd581dd48334ca0f4d5a63
-EBUILD efl-1.20.7-r2.ebuild 7802 BLAKE2B 537434c5ca8d4c5c8c61d3dc017df4bf64707888d7536bd6c2c607eec06d8131e256f1fa41ebc5d1dd1b29787c2927e338beee0cec8e52d4434e763180d7fe0c SHA512 9508f51fa6f028340c5c6d21e43c0df6f0bf6ff50744381b10aab4d3cdaff804fb187dbb72ec9a535253fdfb5e4fa3c09de8de8e6d17de76f04b6840010a9ae1
-EBUILD efl-1.21.1-r3.ebuild 6687 BLAKE2B 3b6cd48bd9c4186ce7c8b8928769eda0cccd9a9535d6311dd91266444c5011b773b3dcadec682b78f2131073a30312ad33718543c1a199ba5f13257e51392737 SHA512 2df46d9a38b32efece57ccf2e1e6e082b1dd8be6bda45edd9b7c2c3e4bc610c5d423aeb47c740b3f1738408b6f5cef9c3cbc88be112c75eaafdea46fd547f710
-MISC metadata.xml 2169 BLAKE2B 884096e54342ea876d8c6aaad16ac3f1928fbf2b791dcbf6ca5913fbc62800f63db5a1672a2b053f103e502fe581d6eaed7f978e02682f977688a3f038037b3f SHA512 2aa1f3dd9e121ec9f321329d4a209d671b8195cc1bdf41b70c4dfd3b0ba8a64c8b23231f11b3097023bfae013c49ded5eb1cfcafeeccd81ab81631757b8b2974
+EBUILD efl-1.20.7-r3.ebuild 7708 BLAKE2B d16c5185d86e88f6cf202ddf864c1608dc42f5c5e6c93f2b2100c69d587be3f88274b8dda345beabedd8d1118bfa3833cbbc0cb543c243f95015d820ff8a1c72 SHA512 dc55ff7bf0bb0d35194bb804679284ef2ea6fd290cd54cf3c85b1fbda4f325fbf617374b7bfb33fbd7311927c1f4939601b38c7109ffa92c49db12402edcb218
+EBUILD efl-1.21.1-r3.ebuild 6626 BLAKE2B 95e6afdf8d5975f2ec5966f9a788d4e10223f0c7f51a3585de5c91d25a651d7bdf7bf5462cfdd1d105d8e559a5a85eb2154cc8af2e7cffdaa6a95603268bb3dd SHA512 c4c9a93691c5372de96cb04bff37ad50c97696494991049fb8be976d94ad5a9c81cc2d25bf303f69bd98cfe79b42a76ede38f0bf0cef1906017d56e1a6e4e620
+MISC metadata.xml 2123 BLAKE2B 73aacd157b7dfc9bef846c985a550179c6fc2d479f578edbaeb11e005249c51bf73b94e8d6988cc1f4e9256f459f646f800389e9d0255b6d7c045763fc0efcfa SHA512 7125edb182fb323470e4604f0829ea635b1eaa966100b767427c5dd43ffeb6a99f9183512b739d18a47d070e3c3d9a7bcc667100d73bed3f642ccf53e3a0d3ad
diff --git a/dev-libs/efl/efl-1.20.7-r2.ebuild b/dev-libs/efl/efl-1.20.7-r3.ebuild
index beecaff39a29..eb9d5b8d1fa2 100644
--- a/dev-libs/efl/efl-1.20.7-r2.ebuild
+++ b/dev-libs/efl/efl-1.20.7-r3.ebuild
@@ -12,24 +12,21 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="avahi +bmp dds connman debug doc drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpresent xpm"
+IUSE="avahi +bmp dds connman debug doc drm +eet examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus ivi jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics pixman postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent"
 
 REQUIRED_USE="
-	?? ( opengl egl )
-	?? ( opengl gles )
-	egl ( gles )
+	?? ( gles2 opengl )
 	fbcon? ( !tslib )
-	gles? (
-		|| ( X wayland )
+	gles2? (
+		|| ( wayland X )
 		!sdl
-		egl
 	)
 	ibus? ( glib )
 	opengl? ( X )
 	pulseaudio? ( sound )
 	sdl? ( opengl )
-	vnc? ( X fbcon )
-	wayland? ( egl gles !opengl )
+	vnc? ( fbcon X )
+	wayland? ( gles2 !opengl )
 	xim? ( X )
 "
 
@@ -47,12 +44,11 @@ COMMON_DEPEND="
 		x11-libs/libdrm
 		x11-libs/libxkbcommon
 	)
-	egl? ( media-libs/mesa[egl] )
 	fontconfig? ( media-libs/fontconfig )
 	fribidi? ( dev-libs/fribidi )
 	gif? ( media-libs/giflib:= )
 	glib? ( dev-libs/glib:2 )
-	gles? ( media-libs/mesa[gles2] )
+	gles2? ( media-libs/mesa[egl,gles2] )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -119,7 +115,7 @@ COMMON_DEPEND="
 			x11-libs/libXrender
 			virtual/opengl
 		)
-		gles? (
+		gles2? (
 			x11-libs/libX11
 			x11-libs/libXrender
 			virtual/opengl
@@ -174,6 +170,7 @@ src_configure() {
 		--enable-libmount
 		--enable-xinput2
 
+		--disable-eglfs
 		--disable-gesture
 		--disable-gstreamer
 		--disable-image-loader-tgv
@@ -188,12 +185,12 @@ src_configure() {
 		$(use_enable drm elput)
 		$(use_enable doc)
 		$(use_enable eet image-loader-eet)
-		$(use_enable egl)
 		$(use_enable examples always-build-examples)
 		$(use_enable fbcon fb)
 		$(use_enable fontconfig)
 		$(use_enable fribidi)
 		$(use_enable gif image-loader-gif)
+		$(use_enable gles2 egl)
 		$(use_enable gstreamer gstreamer1)
 		$(use_enable harfbuzz)
 		$(use_enable hyphen)
@@ -249,13 +246,12 @@ src_configure() {
 		$(use_with X x)
 	)
 
-	use fbcon && use egl &&	myconf+=( --enable-eglfs )
 	use drm && use wayland && myconf+=( --enable-gl-drm )
 	use X && use xpresent && myconf+=( --enable-xpresent )
 
 	if use opengl ; then
 		myconf+=( --with-opengl=full )
-	elif use egl ; then
+	elif use gles2 ; then
 		myconf+=( --with-opengl=es )
 	elif use drm && use wayland ; then
 		myconf+=( --with-opengl=es )
diff --git a/dev-libs/efl/efl-1.21.1-r3.ebuild b/dev-libs/efl/efl-1.21.1-r3.ebuild
index a2bedffdb459..5d7865140e86 100644
--- a/dev-libs/efl/efl-1.21.1-r3.ebuild
+++ b/dev-libs/efl/efl-1.21.1-r3.ebuild
@@ -12,24 +12,21 @@ SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${P}.tar.xz"
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+bmp dds connman debug drm +eet egl examples fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
+IUSE="+bmp dds connman debug drm +eet examples fbcon +fontconfig fribidi gif gles2 glib gnutls gstreamer harfbuzz hyphen +ico ibus jpeg2k libressl libuv luajit neon nls opengl ssl pdf physics postscript +ppm +psd pulseaudio raw scim sdl sound static-libs svg +system-lz4 systemd tga tiff tslib unwind v4l valgrind vlc vnc wayland webp X xcf xim xine xpm xpresent zeroconf"
 
 REQUIRED_USE="
-	?? ( opengl egl )
-	?? ( opengl gles )
-	egl? ( gles )
+	?? ( gles2 opengl )
 	fbcon? ( !tslib )
-	gles? (
-		|| ( X wayland )
+	gles2? (
+		|| ( wayland X )
 		!sdl
-		egl
 	)
 	ibus? ( glib )
 	opengl? ( X )
 	pulseaudio? ( sound )
 	sdl? ( opengl )
-	vnc? ( X fbcon )
-	wayland? ( egl gles !opengl )
+	vnc? ( fbcon X )
+	wayland? ( gles2 !opengl )
 	xim? ( X )
 	xpresent? ( X )
 "
@@ -48,11 +45,10 @@ RDEPEND="
 		x11-libs/libdrm
 		x11-libs/libxkbcommon
 	)
-	egl? ( media-libs/mesa[egl] )
 	fontconfig? ( media-libs/fontconfig )
 	fribidi? ( dev-libs/fribidi )
 	gif? ( media-libs/giflib:= )
-	gles? ( media-libs/mesa[gles2] )
+	gles2? ( media-libs/mesa[egl,gles2] )
 	glib? ( dev-libs/glib:2 )
 	gstreamer? (
 		media-libs/gstreamer:1.0
@@ -115,7 +111,7 @@ RDEPEND="
 		x11-libs/libXrender
 		x11-libs/libXtst
 		x11-libs/libXScrnSaver
-		gles? (
+		gles2? (
 			x11-libs/libX11
 			x11-libs/libXrender
 			virtual/opengl
@@ -177,12 +173,12 @@ src_configure() {
 		$(use_enable drm)
 		$(use_enable drm elput)
 		$(use_enable eet image-loader-eet)
-		$(use_enable egl)
 		$(use_enable examples always-build-examples)
 		$(use_enable fbcon fb)
 		$(use_enable fontconfig)
 		$(use_enable fribidi)
 		$(use_enable gif image-loader-gif)
+		$(use_enable gles2 egl)
 		$(use_enable gstreamer gstreamer1)
 		$(use_enable harfbuzz)
 		$(use_enable hyphen)
@@ -237,7 +233,7 @@ src_configure() {
 
 	if use opengl ; then
 		myconf+=( --with-opengl=full )
-	elif use egl ; then
+	elif use gles2 ; then
 		myconf+=( --with-opengl=es )
 	elif use drm && use wayland ; then
 		myconf+=( --with-opengl=es )
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index 9a89497c2f4d..f3a7227c4bbb 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -13,9 +13,8 @@
 		<flag name="dds">Enable DDS image loader</flag>
 		<flag name="drm">Enable DRM engine</flag>
 		<flag name="eet">Enable Eet image loader</flag>
-		<flag name="egl">Enable EGL rendering</flag>
 		<flag name="fribidi">Enable bidirectional text support</flag>
-		<flag name="gles">Enable the OpenGL ES GL implementation</flag>
+		<flag name="gles2">Enable the OpenGL ES GL implementation</flag>
 		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> support</flag>
 		<flag name="harfbuzz">Enable complex text shaping and layout support</flag>
 		<flag name="hyphen">Enable text hyphenation support</flag>