Version bump, require disabled sdl for gles for bug 496256

Package-Manager: portage-2.2.6-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x35899067

4 files changed, 304 insertions, 20 deletions

diff --git a/dev-libs/efl/ChangeLog b/dev-libs/efl/ChangeLog
index a56eb124bb2a..ac9d55486412 100644
--- a/dev-libs/efl/ChangeLog
+++ b/dev-libs/efl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/efl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/ChangeLog,v 1.6 2014/03/06 01:04:33 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/ChangeLog,v 1.7 2014/03/08 16:49:26 tommy Exp $
+
+*efl-1.8.6 (08 Mar 2014)
+
+  08 Mar 2014; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> +efl-1.8.6.ebuild,
+  efl-1.8.5.ebuild:
+  Version bump, require disabled sdl for gles for bug 496256
 
   06 Mar 2014; Rick Farina <zerochaos@gentoo.org> efl-1.8.5.ebuild,
   efl-1.9.0.ebuild:
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 8b8381eaa80a..be5894ac5e52 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,29 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST efl-1.8.4.tar.bz2 28174225 SHA256 785250179fd9f3ec6809169a9596a7c4f6226fa608288af2d1980e39f1151906 SHA512 177942497306024dd1312360e6160a17ac5fb22bc837939ced007312bb63a87329a70f3dedeb1eba125cb15806eac010001c15b78762f7c552f26bf1bbad0acd WHIRLPOOL c9111e285c4a3e5780a28aa364f75746f44e0be57d3b2fc7821a1d513ca7a8a0e7c2672d14b64b08a8c609502aad179bc47a6767d4cfd68e04c812bde3f99617
 DIST efl-1.8.5.tar.bz2 28175735 SHA256 4456ce34bdc8294336c451a44e12f2f928ac9b857040da6d72c10432611646de SHA512 155542aa900980c59745dd2b25244d52b38de0de400b8432f9183c53c9770efdbca9d6e31f3305cf16d19357660ff8383447442d6a08c9ddec2e83a5b054e6df WHIRLPOOL d8efbc474a6d62837ab94c7ab6a060c1440fa16a2e798c2d722d6029ac17421afb8b07b3cf614c94fa9fed9f55fad8994377bc7a37b1e024fcf28423b45221a0
+DIST efl-1.8.6.tar.bz2 28101148 SHA256 0cc0a559ee7b249000771734e4c037695284d4980839436b57ac3afbaffb2089 SHA512 8bd02faa155500cdeab5dab878e7884c05829c5e6e7c645cd4802ffe597bb4abca8e783e771595be56a72ba2a10c8e361626b51f94292a05a8747985dbba064e WHIRLPOOL 35353c081872fb316e61f4a379a650be18bd61c213872715c4b363d3664afc92bdb2f90d454862b31e0523739071a716d1e4bbe7d25482ff82ba2681f611e098
 DIST efl-1.9.0.tar.bz2 28182561 SHA256 9641cad419a07efabb5657b166502d04f0e867341128ed30c73cd147aa29b553 SHA512 35c52cafa3f051865efb65ab145c6bfd8a6c2b03a08690b2a5c8b2e5a2d2613b43577cd49288d1b9d3638d3f15b896b3a0c500f758ab42bef9f494530312f85b WHIRLPOOL c09a649e1b0fdc92a6c8977c6a24c92fa2b5b9a5b33902bcd5a6fba5cc19bcb9bd66e632b8d5a240ee5ec095cc6ee3a59bce3913b669f3d755e3db1de8d79681
 EBUILD efl-1.8.4.ebuild 6017 SHA256 9ee5ae5304fbf3d8eac146183136fb0eb450e6d0229b0bd10fe66e1db657dc61 SHA512 d3857a3f605c8cc7c4f139a4979c0293fd19262127be8d723fb1221f631142e2d8dcd94018198c81d961010eb86fa8bbfb64170ecc76fe12c6f06930e2b496cc WHIRLPOOL 8578ee745dcc95c2ba9e50c694ef3d24686fc8779d2c2d8b672d40f5794911d71af64ae9358b8c9a551941fc2c8d61e455fbac15226958e618ee84f5874a4f2d
-EBUILD efl-1.8.5.ebuild 6353 SHA256 59a26d1581f1608da86ed2180345f7411974ec29919590cc3b6cae7b086e68fd SHA512 902af053bb69d2c813410ab1e2d6d92b460fa63f3514b1e352679642ea9f92dbf98a4327326da1c2e73e86578e459a8cd6cb221f7ed366f2975754031faed5c7 WHIRLPOOL 195e7758c0b0adc9723b1d17cfd47892a12915057108251385f8025f20a858f32bd6955f4be9dbdfdc22cc742d811345f38ba916d02455b6c5af9e5ba8df6c31
+EBUILD efl-1.8.5.ebuild 6336 SHA256 767c524ff3a6dc0ebebdd297242dc3bc61b9753044e3aa611dd9e20ffb532831 SHA512 3e59bed7aa12936bae627097626b659e7c3374e81f13eea0720e7141677573884fe22b205ea71f9bbc1e44b2fd6532e1a8f94c04b30a8beb12aaf1a0d7a39c83 WHIRLPOOL 73923d3abc84d7f87c609b599d38e835ab4dcfa49db81e4403b9ed202e4330bd9136a302c6f5eb0c0d0283ce5faca8d215df5d8d44f87b4c5e60214782ff7587
+EBUILD efl-1.8.6.ebuild 6332 SHA256 8d5b5bdb578200a253ded4374cfebf952ba745870c6349d28f8ec5d457d6a114 SHA512 b9e5ed0b68ee6236a60e9b2afd39318275abbaf3b9d8ec5c36084828a4e9b4c399f5ef126bda4c90182fdaf7e6addc440e5f08a46150c29b5fb115b357e533ec WHIRLPOOL 43b60354164a9fa5337e93afba93c922ffe2a0b7965470ce629969a62c1a2101f82724ba17f6afb8df6f03a62052fca77035910673e0003f80f207cd70d72243
 EBUILD efl-1.9.0.ebuild 6808 SHA256 a93ada62415d5b3498795374a75e83ba5723d4aeb13777acfb7946fd4dd4268c SHA512 62d3f6313c6cf467aa886ad4f7427b05901cfdfed6ff58395a93ab67f808bfc157ed0b8227007a8792c248cd18ceb2f4629978e16abfa5e042d4d6075211b7ef WHIRLPOOL ed0f3db982d62b6bca5b391d5de350ab3954e858923130006bc278705ac1e2a021d086a85d48b4451c35764233e3661c22aa37399aaf2f4faf70ea9ab9568e50
-MISC ChangeLog 1429 SHA256 4b64094ad766f66d5f38cc55a0676bcfc8e3d9327afd14d63a64e99632832fb0 SHA512 e8fc14d783a14928cc5e10f62c11d56fee0ed4853b93184fbcdaa7bb78379e5297e23f0c20eade55ccf9b3112dfb3e4493f4722f529f84f6e59048eb11893225 WHIRLPOOL 8e1047fc4c8e794d587f6b8b9effcd4c5f82dc220857d462182120c3ec0d412b3fdecc222db7ee9e53a64a4437f46f83f1b2e3201347f0e0e0f7088ffd522fa6
-MISC efl-1.9.0.ebuild.orig 6385 SHA256 7a5b728be58e97752f7c36fe1d8041f4cb22cdb5d5c6131f09fa7b5952d43959 SHA512 f1beab5dab79706102e053761f485a4a3fe217251ef5e3affe644d78d26f917b798001a492f0ee4ab9d0956a285c6267b1b00f0f62617a5aa207fc79404e6c6a WHIRLPOOL 2fe62f7eb59ac3b10379308f65fa7f992abf71e7cfce3b96c4298c9be87a73bea07c48c23bc0241763e5804f3326f06b7e43448f247c027f6e9bb85cffcb8961
+MISC ChangeLog 1611 SHA256 42df997172d4242feeb266f966c8c212195de4a6a1d9d0c57ebba2f90c707859 SHA512 2afdfbe9d63e8b4dafef566c922146349fd8f409a51f2243f44b2e67dbb5f702cdee3aa95c8794f9bfc9eee0a57798072ecbefde02440a73e76d75c8922483ac WHIRLPOOL c9e37bd24043f4b33e127636822fefd8cfa2246346b3973f9ba9d10c7700928e09d129ee63a4c27b363b87ff0d6788880e807a9e53bdad0298828460eeeffcce
 MISC metadata.xml 1541 SHA256 91a338d398a7e49894eae40880f09c029b31e15b8a1be8968aa7e28ae8a20a2f SHA512 c66c241389cd0b4465102b2aab3d7384d7b8cb2b4106b6bbf61b94d53f13ba79d4794a3ca43f850b8671ce55a44b363a6c05d12618ca1e27a3e7fbd758e225a8 WHIRLPOOL 7d6d90847e711a7ae7315b6b6c90d5df260317d47173cf07c3edd5def9ec898feb0002b20f9392999827cad0da809b089d7a18f45e3533a3a3497fc677437abe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJTF8okAAoJEKXdFCfdEflKjhEP/0CdFUV1YWstF/kvFsgUaoqo
-HCUvohtuPc+rETQXxmrYxPczGwQHyo323uTrVMm/svFrU+CF5YRKKCBOTU55F2NK
-OejuVZTCXi+ZjKEosfqlltp8Dn0K3WggMaSYh/ZjYSEOxAHftltio0inntnmdohD
-oZAZgW/e4uek8lDbDo+rCDv5NROUtozeoABYrGRzM9DVXr8rmTr8gMA7QyO5tf/+
-6lSUrnLadXNCs+K6Zs0B7Dfd7+TCuOi7n1wOFc+Qkbh3z4HuDXDiZK3H/oomZcZl
-5IScJDvR0EdWCLxOGMLZoKjnM+K8202ad8a4AaQVGFmWA71enXba/k5lMEBllqlD
-+cPB8Ewmoa0t9dnywnjRZ6L09vM1U/GSgE1WXuOBl8pfHDB+YkJi+YNAAYhk7d6y
-k+znLtTTFJiPdCxLBkZNhBn1F8UcuO3S/zimV4MvgCyRnOVQJW8mvyED+JCvPtFu
-cqPyJAS4+2bgUB0ShJomm4cyvTj0/DisxSwsr0VbGRKLwrtSQPqsvNC+eaBNDmb/
-7/r0xstxBVjBCDeQ/n5taQG+EmeZved4jSH0/DBCWKRbBj91smZkLBDzpbXhuYoJ
-vGrUVNL4v1Wl+sYu0rP60oKeJJtgyI2nw7I0FO7SUSyzk38rGUJWIIw6JuFokuTI
-LP/1WJhEIlFFPrbfQxl+
-=34PR
+iJwEAQEIAAYFAlMbShwACgkQG7kqcTWJkGfNTQQAgW/hqvhkKrHeKHOyxmKBSPLP
+ZlMqm8J67R0OY4PNtxMaHGqxF5C6mKo/F9J4OugeKndjPkX1Cgywq15y2ZhMqoqs
+HdCDAfIKhqXhbCF0sLHfOUqo2onP5+pBoabjojhzvFRr6gf+Zw2Mu74BhwAcQOM1
+KSOG2cs5qmvPfoCw9XM=
+=OBn+
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/efl/efl-1.8.5.ebuild b/dev-libs/efl/efl-1.8.5.ebuild
index 9e05a9a65d9d..80466b4748f7 100644
--- a/dev-libs/efl/efl-1.8.5.ebuild
+++ b/dev-libs/efl/efl-1.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.8.5.ebuild,v 1.3 2014/03/06 01:04:33 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.8.5.ebuild,v 1.4 2014/03/08 16:49:26 tommy Exp $
 
 EAPI="5"
 
@@ -28,9 +28,9 @@ REQUIRED_USE="
 	pulseaudio?	( audio )
 	opengl?		( || ( X xcb sdl wayland ) )
 	gles?		( || ( X xcb sdl wayland ) )
+	gles?		( !sdl )
 	gles?		( egl )
 	xcb?		( pixman )
-	sdl?		( || ( opengl gles ) )
 	wayland?	( egl !opengl gles )
 	xim?		( || ( X xcb ) )
 "
diff --git a/dev-libs/efl/efl-1.8.6.ebuild b/dev-libs/efl/efl-1.8.6.ebuild
new file mode 100644
index 000000000000..8513d44b2a5e
--- /dev/null
+++ b/dev-libs/efl/efl-1.8.6.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.8.6.ebuild,v 1.1 2014/03/08 16:49:26 tommy Exp $
+
+EAPI="5"
+
+MY_P=${P/_/-}
+
+if [[ "${PV}" == "9999" ]] ; then
+	EGIT_SUB_PROJECT="core"
+	EGIT_URI_APPEND="${PN}"
+else
+	SRC_URI="http://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.bz2"
+	EKEY_STATE="snap"
+fi
+
+inherit enlightenment
+
+DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
+
+LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE="audio +bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jp2k +jpeg opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl systemd tga tiff tslib v4l2 wayland webp X xcb xim xine xpm"
+
+REQUIRED_USE="
+	X?		( !xcb )
+	pulseaudio?	( audio )
+	opengl?		( || ( X xcb sdl wayland ) )
+	gles?		( || ( X xcb wayland ) )
+	gles?		( !sdl )
+	gles?		( egl )
+	xcb?		( pixman )
+	wayland?	( egl !opengl gles )
+	xim?		( || ( X xcb ) )
+"
+
+RDEPEND="
+	audio? ( media-libs/libsndfile )
+	debug? ( dev-util/valgrind )
+	fontconfig? ( media-libs/fontconfig )
+	fribidi? ( dev-libs/fribidi )
+	gif? ( media-libs/giflib )
+	glib? ( dev-libs/glib )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( ssl? ( dev-libs/openssl ) )
+	gstreamer? (
+		=media-libs/gstreamer-0.10*
+		=media-libs/gst-plugins-good-0.10*
+		=media-plugins/gst-plugins-ffmpeg-0.10*
+	)
+	harfbuzz? ( media-libs/harfbuzz )
+	ibus? ( app-i18n/ibus )
+	jp2k? ( media-libs/openjpeg )
+	jpeg? ( virtual/jpeg )
+	physics? ( sci-physics/bullet )
+	pixman? ( x11-libs/pixman )
+	png? ( media-libs/libpng:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	scim?	( app-i18n/scim )
+	sdl? (
+		media-libs/libsdl
+		virtual/opengl
+	)
+	systemd? ( sys-apps/systemd )
+	tiff? ( media-libs/tiff )
+	tslib? ( x11-libs/tslib )
+	wayland? (
+		>=dev-libs/wayland-1.3.0
+		>=x11-libs/libxkbcommon-0.3.1
+		media-libs/mesa[gles2,wayland]
+	)
+	webp? ( media-libs/libwebp )
+	X? (
+		x11-libs/libXcursor
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXp
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXtst
+		x11-libs/libXScrnSaver
+
+		opengl? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+
+		gles? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+		)
+	)
+	xcb? (
+		x11-libs/libxcb
+
+		opengl? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+			x11-libs/xcb-util-renderutil
+		)
+
+		gles? (
+			x11-libs/libX11
+			x11-libs/libXrender
+			virtual/opengl
+			x11-libs/xcb-util-renderutil
+		)
+	)
+	xine? ( >=media-libs/xine-lib-1.1.1 )
+	xpm? ( x11-libs/libXpm )
+
+	dev-lang/lua
+	sys-apps/dbus
+	>=sys-apps/util-linux-2.20.0
+	sys-libs/zlib
+
+	!dev-libs/ecore
+	!dev-libs/edbus
+	!dev-libs/eet
+	!dev-libs/eeze
+	!dev-libs/efreet
+	!dev-libs/eina
+	!dev-libs/eio
+	!dev-libs/embryo
+	!dev-libs/eobj
+	!dev-libs/ephysics
+	!media-libs/edje
+	!media-libs/emotion
+	!media-libs/ethumb
+	!media-libs/evas
+"
+
+#soft blockers added above for binpkg users
+#hard blocks are needed for building
+CORE_EFL_CONFLICTS="
+	!!dev-libs/ecore
+	!!dev-libs/edbus
+	!!dev-libs/eet
+	!!dev-libs/eeze
+	!!dev-libs/efreet
+	!!dev-libs/eina
+	!!dev-libs/eio
+	!!dev-libs/embryo
+	!!dev-libs/eobj
+	!!dev-libs/ephysics
+	!!media-libs/edje
+	!!media-libs/emotion
+	!!media-libs/ethumb
+	!!media-libs/evas
+"
+
+DEPEND="
+	${CORE_EFL_CONFLICTS}
+
+	${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	use ssl && use gnutls && {
+		einfo "You enabled both USEssl and USE=gnutls, but only one can be used"
+		einfo "gnutls has been selected for you"
+	}
+	use opengl && use gles && {
+		einfo "You enabled both USE=opengl and USE=gles, but only one can be used"
+		einfo "opengl has been selected for you"
+	}
+
+	local profile="release"
+
+	use debug && profile="debug"
+
+	local crypto="none"
+
+	use gnutls && crypto="gnutls"
+	use ssl && crypto="openssl"
+
+	local x11="none"
+	local enable_graphics=""
+
+	use X && x11="xlib"
+	use xcb && x11="xcb"
+
+	local MY_ECONF
+	( use X || use xcb ) && MY_ECONF+=" --with-x"
+
+	local opengl="none"
+
+	use gles && opengl="es"
+	use opengl && opengl="full"
+
+	local glib="no"
+
+	use glib && glib="yes"
+
+	MY_ECONF+="
+	--with-profile=${profile}
+	--with-crypto=${crypto}
+	--with-x11=${x11}
+	--with-opengl=${opengl}
+	--with-glib=${glib}
+
+	$(use_enable audio)
+	$(use_enable bmp image-loader-bmp)
+	$(use_enable bmp image-loader-wbmp)
+	$(use_enable drm)
+	$(use_enable doc)
+	$(use_enable eet image-loader-eet)
+	$(use_enable egl)
+	$(use_enable fbcon fb)
+	$(use_enable fontconfig)
+	$(use_enable fribidi)
+	$(use_enable gif image-loader-gif)
+	$(use_enable gstreamer)
+	$(use_enable harfbuzz)
+	$(use_enable ico image-loader-ico)
+	$(use_enable ibus)
+	$(use_enable jp2k image-loader-jp2k)
+	$(use_enable jpeg image-loader-jpeg)
+	$(use_enable nls)
+	$(use_enable physics)
+	$(use_enable pixman)
+	$(use_enable pixman pixman-font)
+	$(use_enable pixman pixman-rect)
+	$(use_enable pixman pixman-line)
+	$(use_enable pixman pixman-poly)
+	$(use_enable pixman pixman-image)
+	$(use_enable pixman pixman-image-scale-sample)
+	$(use_enable png image-loader-png)
+	$(use_enable ppm image-loader-pmaps)
+	$(use_enable psd image-loader-psd)
+	$(use_enable pulseaudio)
+	$(use_enable scim)
+	$(use_enable sdl)
+	$(use_enable systemd)
+	$(use_enable tga image-loader-tga)
+	$(use_enable tiff image-loader-tiff)
+	$(use_enable tslib)
+	$(use_enable v4l2)
+	$(use_enable wayland)
+	$(use_enable webp image-loader-webp)
+	$(use_enable xim)
+	$(use_enable xine)
+	$(use_enable xpm image-loader-xpm)
+	--enable-cserve
+	--enable-image-loader-generic
+
+	--disable-tizen
+	--disable-gesture
+	--enable-xinput2
+	--disable-xinput22
+	--disable-multisense
+	--enable-libmount
+	"
+
+	enlightenment_src_configure
+}
+
+src_compile() {
+	ewarn "If the following compile phase fails with a message including"
+	ewarn "lib/edje/.libs/libedje.so: undefined reference to 'eet_mmap'"
+	ewarn "then most likely the @preserved-rebuild feature of portage"
+	ewarn "preserved the 1.7 libraries, which cause the build failure."
+	ewarn "As a workaround, either remove those libs manually or"
+	ewarn "uninstall all packages still using those old libs with"
+	ewarn "emerge -aC @preserved-rebuild"
+
+	enlightenment_src_compile
+}
+
+src_install() {
+	MAKEOPTS+=" -j1"
+
+	enlightenment_src_install
+}