Version bump

Package-Manager: portage-2.2.0_alpha110-r1/cvs/Linux x86_64

3 files changed, 210 insertions, 8 deletions

diff --git a/dev-libs/ecore/ChangeLog b/dev-libs/ecore/ChangeLog
index 4828bc020798..c628baf81fa2 100644
--- a/dev-libs/ecore/ChangeLog
+++ b/dev-libs/ecore/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/ecore
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ecore/ChangeLog,v 1.6 2012/02/08 20:47:55 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ecore/ChangeLog,v 1.7 2012/06/17 12:54:10 tommy Exp $
+
+*ecore-1.2.1 (17 Jun 2012)
+
+  17 Jun 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> +ecore-1.2.1.ebuild:
+  Version bump
 
 *ecore-1.1.0 (08 Feb 2012)
 
diff --git a/dev-libs/ecore/Manifest b/dev-libs/ecore/Manifest
index 98aa78f6a022..0f38782f8fcf 100644
--- a/dev-libs/ecore/Manifest
+++ b/dev-libs/ecore/Manifest
@@ -3,16 +3,18 @@ Hash: SHA1
 
 DIST ecore-1.0.1.tar.bz2 903399 RMD160 b7d98f0d270117971bc32d048f3ab9f2d214dc15 SHA1 6ba1af3dc4d4016b1db68df66cab992e2fa57208 SHA256 66d6c08fa2690b7fe0dc11fedfd08c442d8e1b9a5ea16724053c0f7dd625f366
 DIST ecore-1.1.0.tar.bz2 3217298 RMD160 901c470198149edfa87519eaaeaf4a602c8f0ce7 SHA1 94c9c871d07cbd633fa431605c8053551b103007 SHA256 c701a31941e178babad577ede886a98cf472352e5a73ee4717c0ffdc980152cc
+DIST ecore-1.2.1.tar.bz2 3316696 RMD160 7671903badde3a31695dffbb972b5cb12dc1b8a8 SHA1 ec5743b5a52315bd74a61097fd2a20ac3f2998b5 SHA256 847d13e4b79b904047a65b4bae9e0d3bcab51105b6c08b934bd647fe38df68b4
 EBUILD ecore-1.0.1.ebuild 4839 RMD160 fe9b0e5196036ede1d9250e8de3959753a6141d6 SHA1 7507f9d8cc7b53b54b0003609489f034dd9245bc SHA256 ea3a5f7d1f5f73d4cfba7b7a0b52e250f6add0a976087f3cd9f99b90b332679a
 EBUILD ecore-1.1.0.ebuild 4735 RMD160 62182489a575d1febbd70c2751aef9b5522ad96f SHA1 efa0469e8702f9180c6fc194a54f79697184307e SHA256 34743967363db488ace701b1e08978627afb920aabc7427bd272ec8a798727f4
-MISC ChangeLog 1180 RMD160 3a05ca3a6ee670350aff8d25a0b848843a8deca8 SHA1 afcefac4510fbb292d4d9e50ca1f6f22856082d6 SHA256 62e0f79f32b8d96776aebb541df4d94ea1a6b63ce43c7cb3439c0412b845e5eb
+EBUILD ecore-1.2.1.ebuild 4644 RMD160 e882b8a93ea2d6920d231df13ea9a8e24c3fcff3 SHA1 4179415086fbc3cfc0c1a10838f7f663eaad6294 SHA256 8710a42e57af1e9f56ac6113c88b3736ffbc6556425d2dbe2ed5f0e0113161c0
+MISC ChangeLog 1304 RMD160 57985f25dfcfaa770e0808eb623c474088ffd50b SHA1 32574cc9905630f75c752f5874fcbaf9693f6642 SHA256 14f88785a02ea3a63a37c0099de8e6c88355c2847a188b08f367de483fbadb1d
 MISC metadata.xml 2938 RMD160 935d28f040fcd7037dbb2d698e3d4f901a86e4da SHA1 65aebf9cc8633aacaaf377b9a9786a33600e6db7 SHA256 0cdb73abefbd88bc47155e4e29ed5f34796459544a80d31e71422bf44c52d114
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQECAAYFAk8y34YACgkQG7kqcTWJkGcncQQAnr8ZocHMNWl09j4KLXR+g23N
-jgMRosK5Z3iicVA/9+Muu8MO2RvzcS6Hb0CCQK0moX0Ccvvsp7Q0w0eEpYN8r++b
-6pBjXH/O3z9Rafbek/vHtGdAVlBABrcOOX2EsphERkVpH0Ian+xFCapE7gWsg2Pd
-xJDp18Jz+j+SIXFE5kY=
-=9pzj
+iJwEAQECAAYFAk/d030ACgkQG7kqcTWJkGc1cgP9FEI52iUyBZdDAZV3dyf1HUv3
+pITuWjzkas+ubwGHbwg2RM40PFM13gZLVxx4cYPnqbAnnNDt11zuhSWTD/Dy9HC2
+JhwnhFDrB+W8vQqlaCIg06wfGcJ1iFbLtodgP6+JxdfW6tlUaDwWZm1d0UgPJhLH
+XtsYaL3biOI7k6TDqfk=
+=LtfA
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/ecore/ecore-1.2.1.ebuild b/dev-libs/ecore/ecore-1.2.1.ebuild
new file mode 100644
index 000000000000..fa14648e8efa
--- /dev/null
+++ b/dev-libs/ecore/ecore-1.2.1.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ecore/ecore-1.2.1.ebuild,v 1.1 2012/06/17 12:54:11 tommy Exp $
+
+EAPI=2
+
+inherit virtualx enlightenment
+
+DESCRIPTION="Enlightenment's core event abstraction layer and OS abstraction layer"
+SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="ares curl directfb +evas fbcon glib gnutls +inotify ipv6 opengl sdl ssl static-libs +threads tslib +X xcb xinerama xprint xscreensaver"
+
+RDEPEND=">=dev-libs/eina-1.2.0
+	ares? ( net-dns/c-ares )
+	glib? ( dev-libs/glib )
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( ssl? ( dev-libs/openssl ) )
+	evas? (
+		>=media-libs/evas-1.2.0a[directfb?,fbcon?,opengl?,sdl?,X?,xcb?]
+		opengl? ( virtual/opengl )
+	)
+	directfb? ( >=dev-libs/DirectFB-0.9.16 )
+	tslib? ( x11-libs/tslib )
+	sdl? ( media-libs/libsdl )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+		xinerama? ( x11-libs/libXinerama x11-libs/libXrandr )
+		xprint? ( x11-libs/libXp )
+		xscreensaver? ( x11-libs/libXScrnSaver )
+	)
+	!X? ( xcb? ( x11-libs/xcb-util ) )"
+DEPEND="${RDEPEND}"
+
+#tests depend on temp data from eina WORKDIR
+RESTRICT=test
+
+src_configure() {
+	local SSL_FLAGS="" EVAS_FLAGS="" X_FLAGS=""
+
+	if use gnutls; then
+		if use ssl; then
+			einfo "You have enabled both 'ssl' and 'gnutls', so we will use"
+			einfo "gnutls and not openssl for ecore-con support"
+		fi
+		SSL_FLAGS="
+		  --disable-openssl
+		  --enable-gnutls
+		"
+	elif use ssl; then
+		SSL_FLAGS="
+		  --enable-openssl
+		  --disable-gnutls
+		"
+	else
+		SSL_FLAGS="
+		  --disable-openssl
+		  --disable-gnutls
+		"
+	fi
+
+	local x_or_xcb=""
+	if use X; then
+		x_or_xcb="X"
+	elif use xcb; then
+		x_or_xcb="xcb"
+	fi
+
+	if use evas; then
+
+		if use opengl && [[ -z "$x_or_xcb" ]]; then
+			ewarn "Ecore/Evas usage of OpenGL requires X11."
+			ewarn "Compile dev-libs/ecore with USE=X or xcb."
+			ewarn "Compiling without opengl support."
+			EVAS_FLAGS+="
+				--disable-ecore-evas-software-x11
+				--disable-ecore-evas-software-16-x11
+			"
+		else
+			EVAS_FLAGS+="
+				--enable-ecore-evas-software-x11
+				--enable-ecore-evas-software-16-x11
+			"
+		fi
+		EVAS_FLAGS+="
+			$(use_enable directfb ecore-evas-directfb)
+			$(use_enable fbcon ecore-evas-fb)
+			$(use_enable opengl ecore-evas-opengl-x11)
+		"
+	else
+		EVAS_FLAGS+="
+			--disable-ecore-evas-directfb
+			--disable-ecore-evas-fb
+			--disable-ecore-evas-software-x11
+			--disable-ecore-evas-software-16-x11
+			--disable-ecore-evas-opengl-x11
+		"
+		if use opengl; then
+			ewarn "Ecore usage of OpenGL is dependent on media-libs/evas."
+			ewarn "Compile dev-libs/ecore with USE=evas."
+		fi
+	fi
+
+	if use X; then
+		if use xcb; then
+			ewarn "You have enabled both 'X' and 'xcb', so we will use"
+			ewarn "X as it's considered the most stable for ecore-x"
+		fi
+		X_FLAGS="
+		  --enable-ecore-x
+		  --disable-ecore-x-xcb
+		"
+
+	elif use xcb; then
+		X_FLAGS="
+		  --enable-ecore-x
+		  --enable-ecore-x-xcb
+		"
+	else
+		X_FLAGS="
+		  --disable-ecore-x
+		  --disable-ecore-x-xcb
+		"
+	fi
+
+	if [[ ! -z "$x_or_xcb" ]]; then
+		X_FLAGS+="
+			$(use_enable xinerama ecore-x-xinerama)
+			$(use_enable xprint ecore-x-xprint)
+			$(use_enable xscreensaver ecore-x-screensaver)
+		"
+	else
+		X_FLAGS+="
+			--disable-ecore-x-xinerama
+			--disable-ecore-x-xprint
+			--disable-ecore-x-screensaver
+		"
+	fi
+
+	if use tslib && ! use fbcon; then
+		ewarn "Ecore just uses tslib for framebuffer input."
+		ewarn "Compile dev-libs/ecore with USE=fbcon."
+	fi
+
+	MY_ECONF="
+	--enable-ecore-con
+	--enable-ecore-ipc
+	--enable-ecore-file
+	--enable-ecore-imf
+	--enable-ecore-input
+	--disable-ecore-win32
+	--disable-ecore-wince
+	--disable-ecore-evas-software-gdi
+	--disable-ecore-evas-software-ddraw
+	--disable-ecore-evas-direct3d
+	--disable-ecore-evas-opengl-glew
+	--disable-ecore-evas-software-16-ddraw
+	--disable-ecore-evas-software-16-wince
+	$(use_enable ares cares)
+	$(use_enable curl)
+	$(use_enable directfb ecore-directfb)
+	$(use_enable doc)
+	$(use_enable evas ecore-evas)
+	$(use_enable evas ecore-input-evas)
+	$(use_enable evas ecore-imf-evas)
+	$(use_enable evas ecore-evas-software-buffer)
+	$(use_enable fbcon ecore-fb)
+	$(use_enable glib)
+	$(use_enable inotify)
+	$(use_enable ipv6)
+	$(use_enable sdl ecore-sdl)
+	$(use_enable test tests)
+	$(use_enable threads posix-threads)
+	$(use_enable tslib)
+	$(use_enable X xim)
+	${SSL_FLAGS}
+	${EVAS_FLAGS}
+	${X_FLAGS}
+	"
+	enlightenment_src_configure
+}
+
+src_test() {
+	Xemake check
+}