gentoo resync : 24.12.2018

4 files changed, 28 insertions, 11 deletions

diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 103201fade94..54399974d382 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,5 +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-r1.ebuild 7790 BLAKE2B 8949614b2b22abd64583b987f5b2bbfa50f87575951833899c19245f191acc4fa08244307af6a23c9b8a2d4179f8cbf7a8cdc69698bb29897a9ea6ff80f85e17 SHA512 d4e847eac0d3f36aea057a7596d7277966343c80bd90338a4043cf0ad52d3ec7ac2aaa42fdcb4e94a750f81cd5cc712271c1631bf3e778354fb93d40a26eb773
-EBUILD efl-1.21.1.ebuild 6587 BLAKE2B 3d0eac3de903e7e01d5cf0299504bfe1db128080a9fe12995bd61fc85facd8e9a70310aff74d9fa50c6e09de01386dde00a1b8d92c760d2985118db0b492e61c SHA512 7eddc1df3186324e52cc3336c1207f5c4c46dfe7bfb69824e94ca313c510e2b9fb11de376d72ded9b2f9131cd95a77b93bcc33395cb23a4d111c7ef9ce719394
+EBUILD efl-1.20.7-r2.ebuild 7801 BLAKE2B ae7c174c2df99540483b1b0de1bb89e661e2f4441a743701555628aad39c5f5b6f7e1a6ddbb4dac0831878b5ba67e38fbd6163a60fbfc6e6481e87ca4378e185 SHA512 49bd3450f13a4f772d2f05635eaddaa952dde536b47eafe90eb427c9edde12eae2b6177b81c9fb14459a303d82bb7e1948f4124cfccb53c6aade83794cb0b8fa
+EBUILD efl-1.21.1-r2.ebuild 6685 BLAKE2B 05b5ef33a7b5341593d0a8d4f873e96b6e8a2dc080cf39ef1795b5da5410f5425b21b4d29299aba69839439ec45bb246a43e93a79aa0d2e468a924cc090d4668 SHA512 99c02c9ef63fa6319b3d8d359dadde7c671daaf0d42246264b7e3ecddc0be4f6aa5958f62759cb723c211198754a3d473285235b6961fedf083298059580db70
 MISC metadata.xml 2169 BLAKE2B 884096e54342ea876d8c6aaad16ac3f1928fbf2b791dcbf6ca5913fbc62800f63db5a1672a2b053f103e502fe581d6eaed7f978e02682f977688a3f038037b3f SHA512 2aa1f3dd9e121ec9f321329d4a209d671b8195cc1bdf41b70c4dfd3b0ba8a64c8b23231f11b3097023bfae013c49ded5eb1cfcafeeccd81ab81631757b8b2974
diff --git a/dev-libs/efl/efl-1.20.7-r1.ebuild b/dev-libs/efl/efl-1.20.7-r2.ebuild
index 69bf06a886f0..e340440bf9b2 100644
--- a/dev-libs/efl/efl-1.20.7-r1.ebuild
+++ b/dev-libs/efl/efl-1.20.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ IUSE="avahi +bmp dds connman debug doc drm +eet egl examples fbcon +fontconfig f
 REQUIRED_USE="
 	?? ( opengl egl )
 	?? ( opengl gles )
+	egl ( gles )
 	fbcon? ( !tslib )
 	gles? (
 		|| ( X wayland )
diff --git a/dev-libs/efl/efl-1.21.1.ebuild b/dev-libs/efl/efl-1.21.1-r2.ebuild
index c627b1a33b84..609c8e0bae66 100644
--- a/dev-libs/efl/efl-1.21.1.ebuild
+++ b/dev-libs/efl/efl-1.21.1-r2.ebuild
@@ -11,12 +11,13 @@ 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 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="avahi +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 xpresent xpm"
+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"
 
 REQUIRED_USE="
 	?? ( opengl egl )
 	?? ( opengl gles )
+	egl ( gles )
 	fbcon? ( !tslib )
 	gles? (
 		|| ( X wayland )
@@ -40,7 +41,6 @@ RDEPEND="
 	sys-apps/util-linux
 	sys-libs/zlib:=
 	virtual/jpeg:0=
-	avahi? ( net-dns/avahi )
 	connman? ( net-misc/connman )
 	drm? (
 		dev-libs/libinput
@@ -52,8 +52,8 @@ RDEPEND="
 	fontconfig? ( media-libs/fontconfig )
 	fribidi? ( dev-libs/fribidi )
 	gif? ( media-libs/giflib:= )
-	glib? ( dev-libs/glib:2 )
 	gles? ( media-libs/mesa[gles2] )
+	glib? ( dev-libs/glib:2 )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -61,7 +61,7 @@ RDEPEND="
 	harfbuzz? ( media-libs/harfbuzz )
 	hyphen? ( dev-libs/hyphen )
 	ibus? ( app-i18n/ibus )
-	jpeg2k? ( media-libs/openjpeg:0= )
+	jpeg2k? ( media-libs/openjpeg:= )
 	libuv? ( dev-libs/libuv )
 	luajit? ( dev-lang/luajit:= )
 	!luajit? ( dev-lang/lua:* )
@@ -115,12 +115,12 @@ RDEPEND="
 		x11-libs/libXrender
 		x11-libs/libXtst
 		x11-libs/libXScrnSaver
-		opengl? (
+		gles? (
 			x11-libs/libX11
 			x11-libs/libXrender
 			virtual/opengl
 		)
-		gles? (
+		opengl? (
 			x11-libs/libX11
 			x11-libs/libXrender
 			virtual/opengl
@@ -129,6 +129,7 @@ RDEPEND="
 	xine? ( media-libs/xine-lib )
 	xpm? ( x11-libs/libXpm )
 	xpresent? ( x11-libs/libXpresent )
+	zeroconf? ( net-dns/avahi )
 "
 
 DEPEND="
@@ -136,6 +137,10 @@ DEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix_evas_preload_segfault.patch"
+)
+
 src_prepare() {
 	default
 
@@ -166,7 +171,6 @@ src_configure() {
 		--disable-tizen
 		--disable-wayland-ivi-shell
 
-		$(use_enable avahi)
 		$(use_enable bmp image-loader-bmp)
 		$(use_enable bmp image-loader-wbmp)
 		$(use_enable dds image-loader-dds)
@@ -217,6 +221,7 @@ src_configure() {
 		$(use_enable xine)
 		$(use_enable xpm image-loader-xpm)
 		$(use_enable xpresent)
+		$(use_enable zeroconf avahi)
 
 		--with-crypto=$(usex gnutls gnutls $(usex ssl openssl none))
 		--with-glib=$(usex glib)
diff --git a/dev-libs/efl/files/efl-1.21.1-fix_evas_preload_segfault.patch b/dev-libs/efl/files/efl-1.21.1-fix_evas_preload_segfault.patch
new file mode 100644
index 000000000000..8d42cbb0f250
--- /dev/null
+++ b/dev-libs/efl/files/efl-1.21.1-fix_evas_preload_segfault.patch
@@ -0,0 +1,10 @@
+--- a/src/lib/evas/cache/evas_cache_image.c 14:09:44.971119099 +0100
++++ b/src/lib/evas/cache/evas_cache_image.c 14:10:21.521226043 +0100
+@@ -361,6 +361,7 @@
+    cache = current->cache;
+ 
+    if ((!current->flags.loaded) &&
++       (current->info.loader) &&
+        current->info.loader->threadable)
+      {
+         evas_module_task_register(evas_cache_image_cancelled, current);