Clean up ebuild and merge live git version from E overlay.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

5 files changed, 210 insertions, 173 deletions

diff --git a/media-libs/evas/ChangeLog b/media-libs/evas/ChangeLog
index e9e6be63447f..14cb9c78f7c3 100644
--- a/media-libs/evas/ChangeLog
+++ b/media-libs/evas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/evas
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/ChangeLog,v 1.27 2013/09/17 14:37:00 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/ChangeLog,v 1.28 2013/09/28 09:26:37 vapier Exp $
+
+*evas-9999 (28 Sep 2013)
+
+  28 Sep 2013; Mike Frysinger <vapier@gentoo.org> +evas-9999.ebuild,
+  -evas-1.7.7.ebuild, evas-1.7.8.ebuild, evas-1.7.9_pre1.ebuild:
+  Clean up ebuild and merge live git version from E overlay.
 
 *evas-1.7.9_pre1 (17 Sep 2013)
 
diff --git a/media-libs/evas/Manifest b/media-libs/evas/Manifest
index 0e53f5c5b075..aa6571c456f8 100644
--- a/media-libs/evas/Manifest
+++ b/media-libs/evas/Manifest
@@ -1,20 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST evas-1.7.7.tar.bz2 9408256 SHA256 a53ba1f944db4369e56cb80ea782096d2135229711982c8adf95c7abe8f83fea SHA512 9976f9c1f2774335ab24eb3a7aff37bb582f83e96966e986729c46bd19f02063764f6c8a38ace37656d8440b192570c120d5614797b34c593156e8ec0abdf601 WHIRLPOOL 53eebbae1a3aa1e80a4a1783dbbec327f21dbef83fc33be50c67b2736784d0d3c0e5e1366264642cb47a453d9ed8dfd0c498f5cd17d8402d6fed7d4ae9d5975a
 DIST evas-1.7.8.tar.bz2 9453923 SHA256 9ce94f5da82aeb6fe571d9a648d8c4749ee86a7fb02c4132e3a2c145316d531c SHA512 e915beb930d9906ba6b2b2d768643aeb45f7cbf23786e3f7972992380b6f3a4a2bc08b290094f352c494721db74db6aac3c547ed11a8878a976c8e4fad8158b0 WHIRLPOOL 41151ac770742c27cf785c5e30d0f526fae1331633ed310514e0506e7d090e19cea9ea41da65de6d7eca1ba6a86e72a539ba89f520ad2a490f9b67ec9510f0fd
 DIST evas-1.7.9_pre1.tar.bz2 9457432 SHA256 b16480ca799883378ad25cd994be6ed76e190ca49d7dd0bfd4c29e151d0e4bc5 SHA512 ea3f221db0f7b9a7f592c5b73c56380e805961a8e3ffefca889ede41031745a49c01189ac44e6a6daf5108121f3742ebb31fb129e4bde17aebaa6080b800ca41 WHIRLPOOL 9ca5d7109e016f74020a7bbd7ca814c78ccb79c8add677b20feba44a1d01ae5148ae419dde6d58d9a77e8c335774eaf8baf8b7cbe2be87e1309a1e9cab778b0a
-EBUILD evas-1.7.7.ebuild 4039 SHA256 d71f109edde7e0afa84ef5560ac43696c19a4af2834fee589c9b3d398ad414f2 SHA512 b9634fe7d1ffd748f45c1c0ee8e2e7bc9c70ddd7c45d348b76242960d61c576089a449f0369f396f0a51ff65c974816fad87a4e10b99cca1db78a12a6a354d92 WHIRLPOOL 86a13778e4f93715834d5cc55e6e51baf22539d7f208bace5a533ee35bab51b86bc2560435a323b29fc4e9d5302f7ac2ef919d25b573f33d6baa620ca16c7bd3
-EBUILD evas-1.7.8.ebuild 4039 SHA256 2581561a44351181002ccb1fdf51dc2785a982e0393454c7d01e1f1ffcceff28 SHA512 e37221bba731295b62a930c66cf10969c4ba84d4ade5b91b0c7f83f5435c3933b8d64ded45d7b70982a5a46f049e5dafb6d05a25b73ce8be91e599c288ccd531 WHIRLPOOL 4ef14008a80b0d7f52fdd080e084c59107c9c0e712e389cc4def3f348a4a0871ec9d03ac64eb5887624a74971a9c54588a41a79b78843cb9ccd9ff3784dec2c3
-EBUILD evas-1.7.9_pre1.ebuild 4286 SHA256 61fc073334ee6984c65221539f07bb91b26d93315f043bd49d9bc7dc84b0fd46 SHA512 421600ff5f67f809c4f1d2177ddb5523706b3505d0e966ebe02f82d9263f8baaa72573dd117395b49f0f78829d5f5c7ff019d7430a2ef927599d7bf381f09d47 WHIRLPOOL 458c51c08cc7c6ee1baeaf392d68565a2de1abe73c10915aae14cffe5dc7d5794cbda95cb463984661d22d25efbeefee0aa4c45449536068fbeff88caf0866d3
-MISC ChangeLog 4268 SHA256 4e65b0e9d8f7f6e360815c8f1007e2312a6179795614d772ed2b4f149fbc3ef1 SHA512 ba3f8ddd9cc1e1779c6d5a0adf430969160fd99f85f2d8f5c846a8234e4029bbbe1b334bfb96a0e8942c66341a668df973deb667c82c32811437a14cb778da70 WHIRLPOOL 0eb8aa0c000ef5a7ef4f2bc64df512f231a1dd69cbded0469dde1267a1248de7cfbefbb2ccfba88f26b4c30930b94f8a2f20be4acec4ab16a9dfe31b96f7b2a6
+EBUILD evas-1.7.8.ebuild 4076 SHA256 c285d7bf092b5fb87fd1d2df61a789ad73cfb0f2b25fe3fdb59a7dc798f88d95 SHA512 eec2a3d4d68593644eac5fb4b0c6b7569328dd6f310c68bd6430ccc39429064f61354cad21098acc0e1011db25248ed3f8345b211b237ccc6abfbdb6ac34eabf WHIRLPOOL 3c932ff97a7f92cacdc9b548dac605440f54616a2101422d04aceb959023a6288b793670edd2c6dcd44b41c73b215652b863bd5ed8fee39a8d2ef5c05c5305be
+EBUILD evas-1.7.9_pre1.ebuild 4324 SHA256 ec2c91e95a566680f76d5900ec2c6d7847cd531451ac93a71c9bad78c8e92ed9 SHA512 f3fd1b171d471b795fccda46bf2093f9dae6e066749ebf697feac448728ece7c949875b3ce3c9944583fd37b4ab4a9bc96ad3974685b9119cfdd702f918fbbce WHIRLPOOL d95949e50a0976f8ee2cf0687e2844174d8338d0329947932b634552101c9cd4a2a831a4183ec336fe8af4562c0699e155b06f578f884466de9760413a8d4ccf
+EBUILD evas-9999.ebuild 4075 SHA256 7cf628c8a0331ec3101fa4223edce9fbf69b1b47cf92b350ed04ad60efc297cd SHA512 75216027ef894cf2bc2158d603db6244219f0065941cef31ad7f10cc65310d79df19df09818a15187c98f78609bf8644015dd541e0bc49a964bc071533f8d430 WHIRLPOOL 63185e3b35c1411e682206614cae071ad68cf7f3e615f954cfec209c8de0ff1ce0023f34e4573facd1a7dce6abfcfc278543e75ff93efb1e067021e111216ef2
+MISC ChangeLog 4491 SHA256 0c0dd5b783195c5b7cfd48c83809407e61cffd45ea7c755c5b7e6039922a1dde SHA512 7e8b48074661cc4a67d2e58cccc16f47b0e675b2ee29d436710ff7bf9e9b3b6943bbdce9db5adf15e83bcfccb92dba3aac9d5ad75842c578b3c30391329cace8 WHIRLPOOL 2c0dc45a04cd43a27eedfdf3aec00f27d2a5b7def37006ae1e46109e8bdbd3bbca438d67062b7b2da1d9af5ebf1c9559e235e1280728f55f716c8a48c65d1a5b
 MISC metadata.xml 1703 SHA256 1d57b9419e6394389114428a96747ee6b099a5b80bc2e126351cd9a867a3039c SHA512 e8466b93faeccab1ea06ee9a6e13b1ec8c26633fa7ba5c62165248da0f01d461d089e7cccd124b6da48ff1a2bf9144bfc96c5a48226189df27132691aeaec35e WHIRLPOOL 89f39e887fa5983b30a2c7433d673b350a8da47284cdf54c4f7ed01e25c73fd7394914133f74baa269d46783d31f654d0ef7a4c7d98f5e947e41040ba4864df7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iJwEAQEIAAYFAlI4aRIACgkQG7kqcTWJkGczxAP9GUOdFVLzlzt0fdIaudbZzKQW
-eBLdP9SKk002PolYiJMJkQLGsPiSAoKyDIl/1XliWL/nyh3kgPLyFeqlU7SwFUJ+
-eZHEb/O8nihZu24B9rhn3DyrFLp/OD7wVfxCvlc2wvBKkPc9eG3kWFeo/yi8Dmo1
-wQdaTWkt2TNLF8RhUVA=
-=Svd3
+iQIcBAEBCAAGBQJSRqDQAAoJELEHsLL7fEFWwaMP/i3IfDmQ/GYhWKOni3pc+gdW
+Y6c6pCJkYpMKHRP1IuopNGk80+RYWkXVvJ71om42pQKadSINYdr7oiEDSjtxyaKT
+YXS9aqsqfI9rIdC7CUcEV6SVfY+5J8t8S3vc50Q2JLu+tsuytc//A+nlDMw8Lqtv
+Qrf4XS3b086yNQjvV+BJAzR4bnF6x1675UImW1vUV+pLtqBk6dmoYp9y1p2vmlv1
+NElbrm/yekN5JJjtRHsV3qF6pHiONBHgsBQcMMLZCDSYC+evVVIkysH7GR87NRdE
+hBLHqSiEaznpZKRq9DwRuu1XgOg70RDm6GwlC5Q2qfgn0r4lK/tgwtC+UyumcN4e
+0tg4eq8Ez5dXCaDVHb0VWeLd2mm+Ow2u3bI67fosLhoNoKN+TwdcDFKYXVKqYjEo
+mmZb8Rt+NT5QbYBDTbHU17W+JI9OuTFXWCdqcjPjk5FeEsNh6YJAL/JDqQN5NxtL
+ciIgwZyk1sLaeUXUXBnKBX/HPoaJ1gmFY9gEShcYkE32QBP8gAPP19Y9iNCU20wQ
+FROMF/Xkcn5cI/ugr+/wcHr2tAs6djwJqj423RNyxqpD6ZUDhd2LsiHekrXNN6k6
+65UKIQOf0cZo4paAmNX9WzMwkTIK36WeLzcujE64aRhxjpGduI1LGZ3GH8CF3t5Y
+qL2RChV4Fz1+8+aGhDRx
+=dGKD
 -----END PGP SIGNATURE-----
diff --git a/media-libs/evas/evas-1.7.8.ebuild b/media-libs/evas/evas-1.7.8.ebuild
index 70c261efc241..d8d521300ec7 100644
--- a/media-libs/evas/evas-1.7.8.ebuild
+++ b/media-libs/evas/evas-1.7.8.ebuild
@@ -1,20 +1,27 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/evas-1.7.8.ebuild,v 1.1 2013/08/04 10:08:10 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/evas-1.7.8.ebuild,v 1.2 2013/09/28 09:26:37 vapier Exp $
 
-EAPI=5
+EAPI="5"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_SUB_PROJECT="legacy"
+	EGIT_URI_APPEND=${PN}
+	EGIT_BRANCH=${PN}-1.7
+else
+	SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
+	EKEY_STATE="snap"
+fi
 
 inherit enlightenment
 
 DESCRIPTION="hardware-accelerated retained canvas API"
 HOMEPAGE="http://trac.enlightenment.org/e/wiki/Evas"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
 
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="altivec bidi +bmp directfb +eet fbcon +fontconfig gles gif +ico +jpeg mmx opengl +png +ppm +psd sse sse3 static-libs tga tiff wayland X xcb xpm"
 
-RDEPEND=">=dev-libs/eina-1.7.8
+RDEPEND=">=dev-libs/eina-${PV}
 	>=media-libs/freetype-2.3.9
 	fontconfig? ( media-libs/fontconfig )
 	gles? ( media-libs/mesa[gallium,gles2] )
@@ -36,7 +43,7 @@ RDEPEND=">=dev-libs/eina-1.7.8
 		xcb? (
 			x11-libs/xcb-util
 		) )
-	eet? ( >=dev-libs/eet-1.7.8 )"
+	eet? ( >=dev-libs/eet-${PV} )"
 DEPEND="${RDEPEND}"
 
 src_configure() {
@@ -45,44 +52,44 @@ src_configure() {
 			ewarn "You have enabled both 'X' and 'xcb', so we will use"
 			ewarn "X as it's considered the most stable for evas"
 		fi
-		MY_ECONF="
+		E_ECONF+=(
 			--disable-software-xcb
 			$(use_enable opengl gl-xlib)
-		"
+		)
 	elif use xcb ; then
-		MY_ECONF="
+		E_ECONF+=(
 			--disable-gl-xlib
 			--enable-software-xcb
 			$(use_enable opengl gl-xcb)
-		"
+		)
 	else
-		MY_ECONF="
+		E_ECONF+=(
 			--disable-gl-xlib
 			--disable-software-xcb
 			--disable-gl-xcb
-		"
+		)
 	fi
 	if use wayland ; then
-		MY_ECONF+="
+		E_ECONF+=(
 			--enable-wayland-shm
-		"
+		)
 		if use gles ; then
-			MY_ECONF+="
+			E_ECONF+=(
 				--enable-wayland-egl
-			"
+			)
 		else
-			MY_ECONF+="
+			E_ECONF+=(
 				--disable-wayland-egl
-			"
+			)
 		fi
 	else
-		MY_ECONF+="
+		E_ECONF+=(
 			--disable-wayland-egl
 			--disable-wayland-shm
-		"
+		)
 	fi
 
-	MY_ECONF+="
+	E_ECONF+=(
 		$(use_enable altivec cpu-altivec)
 		$(use_enable bidi fribidi)
 		$(use_enable bmp image-loader-bmp)
@@ -112,39 +119,40 @@ src_configure() {
 		--enable-async-preload
 		$(use_enable X software-xlib)
 		$(use_enable xpm image-loader-xpm)
-		--enable-evas-magic-debug \
-		--enable-static-software-generic \
-		--enable-buffer \
-		--enable-cpu-c \
-		--enable-scale-sample \
-		--enable-scale-smooth \
-		--enable-convert-8-rgb-332 \
-		--enable-convert-8-rgb-666 \
-		--enable-convert-8-rgb-232 \
-		--enable-convert-8-rgb-222 \
-		--enable-convert-8-rgb-221 \
-		--enable-convert-8-rgb-121 \
-		--enable-convert-8-rgb-111 \
-		--enable-convert-16-rgb-565 \
-		--enable-convert-16-rgb-555 \
-		--enable-convert-16-rgb-444 \
-		--enable-convert-16-rgb-rot-0 \
-		--enable-convert-16-rgb-rot-270 \
-		--enable-convert-16-rgb-rot-90 \
-		--enable-convert-24-rgb-888 \
-		--enable-convert-24-bgr-888 \
-		--enable-convert-32-rgb-8888 \
-		--enable-convert-32-rgbx-8888 \
-		--enable-convert-32-bgr-8888 \
-		--enable-convert-32-bgrx-8888 \
-		--enable-convert-32-rgb-rot-0 \
-		--enable-convert-32-rgb-rot-270 \
-		--enable-convert-32-rgb-rot-90 \
-		--enable-image-loader-generic \
-		--disable-harfbuzz \
-		--disable-image-loader-edb \
-		--disable-static-software-16 \
-		--disable-software-16-x11"
+		--enable-evas-magic-debug
+		--enable-static-software-generic
+		--enable-buffer
+		--enable-cpu-c
+		--enable-scale-sample
+		--enable-scale-smooth
+		--enable-convert-8-rgb-332
+		--enable-convert-8-rgb-666
+		--enable-convert-8-rgb-232
+		--enable-convert-8-rgb-222
+		--enable-convert-8-rgb-221
+		--enable-convert-8-rgb-121
+		--enable-convert-8-rgb-111
+		--enable-convert-16-rgb-565
+		--enable-convert-16-rgb-555
+		--enable-convert-16-rgb-444
+		--enable-convert-16-rgb-rot-0
+		--enable-convert-16-rgb-rot-270
+		--enable-convert-16-rgb-rot-90
+		--enable-convert-24-rgb-888
+		--enable-convert-24-bgr-888
+		--enable-convert-32-rgb-8888
+		--enable-convert-32-rgbx-8888
+		--enable-convert-32-bgr-8888
+		--enable-convert-32-bgrx-8888
+		--enable-convert-32-rgb-rot-0
+		--enable-convert-32-rgb-rot-270
+		--enable-convert-32-rgb-rot-90
+		--enable-image-loader-generic
+		--disable-harfbuzz
+		--disable-image-loader-edb
+		--disable-static-software-16
+		--disable-software-16-x11
+	)
 
 	enlightenment_src_configure
 }
diff --git a/media-libs/evas/evas-1.7.9_pre1.ebuild b/media-libs/evas/evas-1.7.9_pre1.ebuild
index 72dcd5285da3..13e90729f70e 100644
--- a/media-libs/evas/evas-1.7.9_pre1.ebuild
+++ b/media-libs/evas/evas-1.7.9_pre1.ebuild
@@ -1,18 +1,25 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/evas-1.7.9_pre1.ebuild,v 1.1 2013/09/17 14:37:00 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/evas-1.7.9_pre1.ebuild,v 1.2 2013/09/28 09:26:37 vapier Exp $
 
-EAPI=5
+EAPI="5"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_SUB_PROJECT="legacy"
+	EGIT_URI_APPEND=${PN}
+	EGIT_BRANCH=${PN}-1.7
+else
+	#SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
+	SRC_URI="http://download.enlightenment.org/pre-releases/efl-${PV/_pre1}/${P/_pre1}.tar.bz2 -> ${P}.tar.bz2"
+	EKEY_STATE="snap"
+fi
 
 inherit autotools enlightenment
 
 DESCRIPTION="hardware-accelerated retained canvas API"
 HOMEPAGE="http://trac.enlightenment.org/e/wiki/Evas"
-#SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-SRC_URI="http://download.enlightenment.org/pre-releases/efl-${PV/_pre1}/${P/_pre1}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="altivec bidi +bmp directfb +eet fbcon +fontconfig gles gif +ico +jpeg mmx opengl +png +ppm +psd sse sse3 static-libs tga tiff wayland X xcb xpm"
 
 RDEPEND=">=dev-libs/eina-1.7.8
@@ -54,44 +61,44 @@ src_configure() {
 			ewarn "You have enabled both 'X' and 'xcb', so we will use"
 			ewarn "X as it's considered the most stable for evas"
 		fi
-		MY_ECONF="
+		E_ECONF+=(
 			--disable-software-xcb
 			$(use_enable opengl gl-xlib)
-		"
+		)
 	elif use xcb ; then
-		MY_ECONF="
+		E_ECONF+=(
 			--disable-gl-xlib
 			--enable-software-xcb
 			$(use_enable opengl gl-xcb)
-		"
+		)
 	else
-		MY_ECONF="
+		E_ECONF+=(
 			--disable-gl-xlib
 			--disable-software-xcb
 			--disable-gl-xcb
-		"
+		)
 	fi
 	if use wayland ; then
-		MY_ECONF+="
+		E_ECONF+=(
 			--enable-wayland-shm
-		"
+		)
 		if use gles ; then
-			MY_ECONF+="
+			E_ECONF+=(
 				--enable-wayland-egl
-			"
+			)
 		else
-			MY_ECONF+="
+			E_ECONF+=(
 				--disable-wayland-egl
-			"
+			)
 		fi
 	else
-		MY_ECONF+="
+		E_ECONF+=(
 			--disable-wayland-egl
 			--disable-wayland-shm
-		"
+		)
 	fi
 
-	MY_ECONF+="
+	E_ECONF+=(
 		$(use_enable altivec cpu-altivec)
 		$(use_enable bidi fribidi)
 		$(use_enable bmp image-loader-bmp)
@@ -121,39 +128,40 @@ src_configure() {
 		--enable-async-preload
 		$(use_enable X software-xlib)
 		$(use_enable xpm image-loader-xpm)
-		--enable-evas-magic-debug \
-		--enable-static-software-generic \
-		--enable-buffer \
-		--enable-cpu-c \
-		--enable-scale-sample \
-		--enable-scale-smooth \
-		--enable-convert-8-rgb-332 \
-		--enable-convert-8-rgb-666 \
-		--enable-convert-8-rgb-232 \
-		--enable-convert-8-rgb-222 \
-		--enable-convert-8-rgb-221 \
-		--enable-convert-8-rgb-121 \
-		--enable-convert-8-rgb-111 \
-		--enable-convert-16-rgb-565 \
-		--enable-convert-16-rgb-555 \
-		--enable-convert-16-rgb-444 \
-		--enable-convert-16-rgb-rot-0 \
-		--enable-convert-16-rgb-rot-270 \
-		--enable-convert-16-rgb-rot-90 \
-		--enable-convert-24-rgb-888 \
-		--enable-convert-24-bgr-888 \
-		--enable-convert-32-rgb-8888 \
-		--enable-convert-32-rgbx-8888 \
-		--enable-convert-32-bgr-8888 \
-		--enable-convert-32-bgrx-8888 \
-		--enable-convert-32-rgb-rot-0 \
-		--enable-convert-32-rgb-rot-270 \
-		--enable-convert-32-rgb-rot-90 \
-		--enable-image-loader-generic \
-		--disable-harfbuzz \
-		--disable-image-loader-edb \
-		--disable-static-software-16 \
-		--disable-software-16-x11"
+		--enable-evas-magic-debug
+		--enable-static-software-generic
+		--enable-buffer
+		--enable-cpu-c
+		--enable-scale-sample
+		--enable-scale-smooth
+		--enable-convert-8-rgb-332
+		--enable-convert-8-rgb-666
+		--enable-convert-8-rgb-232
+		--enable-convert-8-rgb-222
+		--enable-convert-8-rgb-221
+		--enable-convert-8-rgb-121
+		--enable-convert-8-rgb-111
+		--enable-convert-16-rgb-565
+		--enable-convert-16-rgb-555
+		--enable-convert-16-rgb-444
+		--enable-convert-16-rgb-rot-0
+		--enable-convert-16-rgb-rot-270
+		--enable-convert-16-rgb-rot-90
+		--enable-convert-24-rgb-888
+		--enable-convert-24-bgr-888
+		--enable-convert-32-rgb-8888
+		--enable-convert-32-rgbx-8888
+		--enable-convert-32-bgr-8888
+		--enable-convert-32-bgrx-8888
+		--enable-convert-32-rgb-rot-0
+		--enable-convert-32-rgb-rot-270
+		--enable-convert-32-rgb-rot-90
+		--enable-image-loader-generic
+		--disable-harfbuzz
+		--disable-image-loader-edb
+		--disable-static-software-16
+		--disable-software-16-x11
+	)
 
 	enlightenment_src_configure
 }
diff --git a/media-libs/evas/evas-1.7.7.ebuild b/media-libs/evas/evas-9999.ebuild
index c707212df227..1e607b92b0df 100644
--- a/media-libs/evas/evas-1.7.7.ebuild
+++ b/media-libs/evas/evas-9999.ebuild
@@ -1,20 +1,27 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/evas-1.7.7.ebuild,v 1.1 2013/05/20 10:19:34 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/evas-9999.ebuild,v 1.1 2013/09/28 09:26:37 vapier Exp $
 
-EAPI=5
+EAPI="5"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_SUB_PROJECT="legacy"
+	EGIT_URI_APPEND=${PN}
+	EGIT_BRANCH=${PN}-1.7
+else
+	SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
+	EKEY_STATE="snap"
+fi
 
 inherit enlightenment
 
 DESCRIPTION="hardware-accelerated retained canvas API"
 HOMEPAGE="http://trac.enlightenment.org/e/wiki/Evas"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
 
 LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="altivec bidi +bmp directfb +eet fbcon +fontconfig gles gif +ico +jpeg mmx opengl +png +ppm +psd sse sse3 static-libs tga tiff wayland X xcb xpm"
 
-RDEPEND=">=dev-libs/eina-1.7.6
+RDEPEND=">=dev-libs/eina-${PV}
 	>=media-libs/freetype-2.3.9
 	fontconfig? ( media-libs/fontconfig )
 	gles? ( media-libs/mesa[gallium,gles2] )
@@ -36,7 +43,7 @@ RDEPEND=">=dev-libs/eina-1.7.6
 		xcb? (
 			x11-libs/xcb-util
 		) )
-	eet? ( >=dev-libs/eet-1.7.6 )"
+	eet? ( >=dev-libs/eet-${PV} )"
 DEPEND="${RDEPEND}"
 
 src_configure() {
@@ -45,44 +52,44 @@ src_configure() {
 			ewarn "You have enabled both 'X' and 'xcb', so we will use"
 			ewarn "X as it's considered the most stable for evas"
 		fi
-		MY_ECONF="
+		E_ECONF+=(
 			--disable-software-xcb
 			$(use_enable opengl gl-xlib)
-		"
+		)
 	elif use xcb ; then
-		MY_ECONF="
+		E_ECONF+=(
 			--disable-gl-xlib
 			--enable-software-xcb
 			$(use_enable opengl gl-xcb)
-		"
+		)
 	else
-		MY_ECONF="
+		E_ECONF+=(
 			--disable-gl-xlib
 			--disable-software-xcb
 			--disable-gl-xcb
-		"
+		)
 	fi
 	if use wayland ; then
-		MY_ECONF+="
+		E_ECONF+=(
 			--enable-wayland-shm
-		"
+		)
 		if use gles ; then
-			MY_ECONF+="
+			E_ECONF+=(
 				--enable-wayland-egl
-			"
+			)
 		else
-			MY_ECONF+="
+			E_ECONF+=(
 				--disable-wayland-egl
-			"
+			)
 		fi
 	else
-		MY_ECONF+="
+		E_ECONF+=(
 			--disable-wayland-egl
 			--disable-wayland-shm
-		"
+		)
 	fi
 
-	MY_ECONF+="
+	E_ECONF+=(
 		$(use_enable altivec cpu-altivec)
 		$(use_enable bidi fribidi)
 		$(use_enable bmp image-loader-bmp)
@@ -112,39 +119,40 @@ src_configure() {
 		--enable-async-preload
 		$(use_enable X software-xlib)
 		$(use_enable xpm image-loader-xpm)
-		--enable-evas-magic-debug \
-		--enable-static-software-generic \
-		--enable-buffer \
-		--enable-cpu-c \
-		--enable-scale-sample \
-		--enable-scale-smooth \
-		--enable-convert-8-rgb-332 \
-		--enable-convert-8-rgb-666 \
-		--enable-convert-8-rgb-232 \
-		--enable-convert-8-rgb-222 \
-		--enable-convert-8-rgb-221 \
-		--enable-convert-8-rgb-121 \
-		--enable-convert-8-rgb-111 \
-		--enable-convert-16-rgb-565 \
-		--enable-convert-16-rgb-555 \
-		--enable-convert-16-rgb-444 \
-		--enable-convert-16-rgb-rot-0 \
-		--enable-convert-16-rgb-rot-270 \
-		--enable-convert-16-rgb-rot-90 \
-		--enable-convert-24-rgb-888 \
-		--enable-convert-24-bgr-888 \
-		--enable-convert-32-rgb-8888 \
-		--enable-convert-32-rgbx-8888 \
-		--enable-convert-32-bgr-8888 \
-		--enable-convert-32-bgrx-8888 \
-		--enable-convert-32-rgb-rot-0 \
-		--enable-convert-32-rgb-rot-270 \
-		--enable-convert-32-rgb-rot-90 \
-		--enable-image-loader-generic \
-		--disable-harfbuzz \
-		--disable-image-loader-edb \
-		--disable-static-software-16 \
-		--disable-software-16-x11"
+		--enable-evas-magic-debug
+		--enable-static-software-generic
+		--enable-buffer
+		--enable-cpu-c
+		--enable-scale-sample
+		--enable-scale-smooth
+		--enable-convert-8-rgb-332
+		--enable-convert-8-rgb-666
+		--enable-convert-8-rgb-232
+		--enable-convert-8-rgb-222
+		--enable-convert-8-rgb-221
+		--enable-convert-8-rgb-121
+		--enable-convert-8-rgb-111
+		--enable-convert-16-rgb-565
+		--enable-convert-16-rgb-555
+		--enable-convert-16-rgb-444
+		--enable-convert-16-rgb-rot-0
+		--enable-convert-16-rgb-rot-270
+		--enable-convert-16-rgb-rot-90
+		--enable-convert-24-rgb-888
+		--enable-convert-24-bgr-888
+		--enable-convert-32-rgb-8888
+		--enable-convert-32-rgbx-8888
+		--enable-convert-32-bgr-8888
+		--enable-convert-32-bgrx-8888
+		--enable-convert-32-rgb-rot-0
+		--enable-convert-32-rgb-rot-270
+		--enable-convert-32-rgb-rot-90
+		--enable-image-loader-generic
+		--disable-harfbuzz
+		--disable-image-loader-edb
+		--disable-static-software-16
+		--disable-software-16-x11
+	)
 
 	enlightenment_src_configure
 }