Version bump, also update dependency for wayland-client, fixes bug 499928, add a warning message for failures due to @preserved-rebuild feature of portage

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

4 files changed, 299 insertions, 11 deletions

diff --git a/dev-libs/efl/ChangeLog b/dev-libs/efl/ChangeLog
index c60b65d68763..74dfc103e3f5 100644
--- a/dev-libs/efl/ChangeLog
+++ b/dev-libs/efl/ChangeLog
@@ -1,6 +1,13 @@
 # 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.1 2014/01/25 15:02:41 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/ChangeLog,v 1.2 2014/02/01 15:12:17 tommy Exp $
+
+*efl-1.8.5 (01 Feb 2014)
+
+  01 Feb 2014; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> +efl-1.8.5.ebuild,
+  efl-1.8.4.ebuild:
+  Version bump, also update dependency for wayland-client, fixes bug 499928, add
+  a warning message for failures due to @preserved-rebuild feature of portage
 
   25 Jan 2014; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> +metadata.xml:
   Add USE flag descriptions, thanks to Patrick McMunn for providing them
@@ -9,4 +16,3 @@
 
   25 Jan 2014; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> +efl-1.8.4.ebuild:
   Initial addition to main tree, based on version in enlightenment overlay
-
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 1331182063bc..71e7edb1508b 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -2,15 +2,17 @@
 Hash: SHA256
 
 DIST efl-1.8.4.tar.bz2 28174225 SHA256 785250179fd9f3ec6809169a9596a7c4f6226fa608288af2d1980e39f1151906 SHA512 177942497306024dd1312360e6160a17ac5fb22bc837939ced007312bb63a87329a70f3dedeb1eba125cb15806eac010001c15b78762f7c552f26bf1bbad0acd WHIRLPOOL c9111e285c4a3e5780a28aa364f75746f44e0be57d3b2fc7821a1d513ca7a8a0e7c2672d14b64b08a8c609502aad179bc47a6767d4cfd68e04c812bde3f99617
-EBUILD efl-1.8.4.ebuild 5526 SHA256 1bb137e18e4740a2c305e2c23f295ccdbf0cece4d9bd444e9f7cee6608788ba4 SHA512 0625ffeae85173486123fe895f5955087674586deae09b5993f182762a3a82d4f30f9b162948d3ffff5f7b1c0e8ff38fd4ae395afd915f6dcc4958f6fe3edaf1 WHIRLPOOL bb1c79ac0a9619a4cfdafa2c391fec74f4364d86878ed84e2793dfd07a64f430647019b89f31fbb907e9c5eccac1f0c8ffc9355e95be5a9aa8fd729b7bbea189
-MISC ChangeLog 524 SHA256 51cc65716224c3a4011afbf0e7e685aa35f6c2eca84b979c0955a572c24a1d0e SHA512 e0bcf9feed7d79cf7ca3c1bb42a9b494ea9b70d43f6b2dd0abed78500987c01074433329b2b1f2f6028d720b832504bb456721ffd8e1b71aebb0a50cfbf04574 WHIRLPOOL c12ab280d6109a6cf7a1eb60add40a73b78b43a9dcb012f1435eb76b8ad70f9d64cab24adfd0454557f45e651a628fbc1cd4c718819f1f64da4ca5340ce2e2d8
+DIST efl-1.8.5.tar.bz2 28175735 SHA256 4456ce34bdc8294336c451a44e12f2f928ac9b857040da6d72c10432611646de SHA512 155542aa900980c59745dd2b25244d52b38de0de400b8432f9183c53c9770efdbca9d6e31f3305cf16d19357660ff8383447442d6a08c9ddec2e83a5b054e6df WHIRLPOOL d8efbc474a6d62837ab94c7ab6a060c1440fa16a2e798c2d722d6029ac17421afb8b07b3cf614c94fa9fed9f55fad8994377bc7a37b1e024fcf28423b45221a0
+EBUILD efl-1.8.4.ebuild 6017 SHA256 9ee5ae5304fbf3d8eac146183136fb0eb450e6d0229b0bd10fe66e1db657dc61 SHA512 d3857a3f605c8cc7c4f139a4979c0293fd19262127be8d723fb1221f631142e2d8dcd94018198c81d961010eb86fa8bbfb64170ecc76fe12c6f06930e2b496cc WHIRLPOOL 8578ee745dcc95c2ba9e50c694ef3d24686fc8779d2c2d8b672d40f5794911d71af64ae9358b8c9a551941fc2c8d61e455fbac15226958e618ee84f5874a4f2d
+EBUILD efl-1.8.5.ebuild 6017 SHA256 6f868f39f4b93af226b2a5bf23539cf8811492eb6df485b652b28477b854d562 SHA512 5de097710ecdb10b9960a2dc44b2bf395c2c4acea732d763e8116957b059ebf038770c1dcf534d544dc39db9ff1938d377f493e94c780e7ae07427ca0cfb36d1 WHIRLPOOL 73553f46b560585c16843b5df729d53dcd2db814c3de0b6871960a61810a3d65fe734706edc92256c3ab789fc866540a1b6ebf892373852ef5b36524236c128b
+MISC ChangeLog 807 SHA256 9f504b568d2c9d248c6e7db74f0f47a2efb80fae81ad59595e99a3d3a7a60c30 SHA512 673984f3b613494a56b2845b7acd2f2e3a7acd0ebe6f0a7dc40d52386997f45a7c1d360947c55e3f0972ec23b50c7560e98804a2e94b77fab7d3b68fc3fa5db6 WHIRLPOOL 4585fabe8bd50b22fb21719845c02b31e0e1f77d98dfc34f3178d9a0e6087a567ae77e2f43e6ac9d26b0cfa2aba19d52e134fc4aedc09954b6e5d2baf902751e
 MISC metadata.xml 1447 SHA256 928287bdcc2c6de36430a98ee337c4739e7246af93adec2666ca581f82440e4a SHA512 57ffdf3dc6e66b6bf456262f4355ac662061183d05306453e0c77d55e37741ed3fc6773ffb8a56cfcee5bdc099dc9f8d54352157429a054be71590cec616c4ff WHIRLPOOL f86a6942d13df4a15f79d5ecc690d45ee2bc1af3e3031dafa599fed5c0c9c884f49bd593f11a7b179476bcec96a9a2b4a09b966688333ba0f4b2456b12644041
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlLj0hkACgkQG7kqcTWJkGfIIwP/bFGjZO5b17d++m9pcA44nzED
-AJtf6PSvxSkDCzDUfeXTpu5L4AOG7D484MZxC782AvsmX5Fhvhi4zSXW9/eZ/FiR
-k77Up5X3oFDYuClx7/OPku6GyjofaqDiAJdCs/b79PyR6LPEvC8fbnUF/S1AZwgR
-bbmy3ydXjSA8qbDdiMQ=
-=0jLC
+iJwEAQEIAAYFAlLtDtgACgkQG7kqcTWJkGdrhAQAxS1p+WRhr8pjx1XOBTpfsmsG
+ZpiG+UppFcQcunlkwmARrxgOOt9XQG6DGCKjtr/MaqONWjv9BX7CI27FwX7VYyR9
+EH86tade9n6JHmzHRq/Pi+s3qjUnlHvgcuLCzFdbBS/rta2FQnudUA5E5JR9K20r
+lioZbN60UwAMcpK3nfY=
+=yf9p
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/efl/efl-1.8.4.ebuild b/dev-libs/efl/efl-1.8.4.ebuild
index ac9d8c99592a..9bea73912a27 100644
--- a/dev-libs/efl/efl-1.8.4.ebuild
+++ b/dev-libs/efl/efl-1.8.4.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.4.ebuild,v 1.1 2014/01/25 15:02:41 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.8.4.ebuild,v 1.2 2014/02/01 15:12:17 tommy Exp $
 
 EAPI="5"
 
@@ -66,7 +66,7 @@ RDEPEND="
 	tiff? ( media-libs/tiff )
 	tslib? ( x11-libs/tslib )
 	wayland? (
-		>=dev-libs/wayland-1.2.0
+		>=dev-libs/wayland-1.3.0
 		>=x11-libs/libxkbcommon-0.3.1
 		media-libs/mesa[gles2,wayland]
 	)
@@ -249,6 +249,18 @@ src_configure() {
 	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"
 
diff --git a/dev-libs/efl/efl-1.8.5.ebuild b/dev-libs/efl/efl-1.8.5.ebuild
new file mode 100644
index 000000000000..4a67ec9a9db5
--- /dev/null
+++ b/dev-libs/efl/efl-1.8.5.ebuild
@@ -0,0 +1,268 @@
+# 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.1 2014/02/01 15:12:17 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 ~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 sdl wayland ) )
+	gles?		( egl )
+	xcb?		( pixman )
+	sdl?		( || ( opengl gles ) )
+	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
+"
+
+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
+}