Version bump, drop old

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

5 files changed, 18 insertions, 251 deletions

diff --git a/dev-libs/ecore/ChangeLog b/dev-libs/ecore/ChangeLog
index b47a142fef9a..269499f230e4 100644
--- a/dev-libs/ecore/ChangeLog
+++ b/dev-libs/ecore/ChangeLog
@@ -1,6 +1,13 @@
 # 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.12 2012/12/09 10:53:32 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ecore/ChangeLog,v 1.13 2012/12/21 19:56:14 tommy Exp $
+
+*ecore-1.7.4 (21 Dec 2012)
+
+  21 Dec 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -files/ecore-1.7_80526.patch, -ecore-1.7.1.ebuild, -ecore-1.7.3.ebuild,
+  +ecore-1.7.4.ebuild:
+  Version bump, drop old
 
 *ecore-1.7.3 (09 Dec 2012)
 
diff --git a/dev-libs/ecore/Manifest b/dev-libs/ecore/Manifest
index 7f903d450ee6..adcbe8ab3634 100644
--- a/dev-libs/ecore/Manifest
+++ b/dev-libs/ecore/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX ecore-1.7_80526.patch 1079 SHA256 b50b0cf7f93944023cbba65a4cdb33ca0c346b4190ed1490385f1017cc67b710 SHA512 acff3ea5e10077d77c5b0d16a9b8af016ca85bd33a112bf037302c136de4cead38746f9bf6d153c95f79ac092d9714531869c5009531d585256ecf505f7fb3d3 WHIRLPOOL 24581b256b21c70f20e79e4090e11188e99021a72e09fa2dcdea139e49605a8f770ac3224d15b0ce47eca2e96e78cdfbf22fc2180d16096e618626d200ab7cea
-DIST ecore-1.7.1.tar.bz2 3419265 SHA256 fb5f547a0a6556b5f0e274b65cfbe42f4eb8371f20d00005cd4f5a78a6b6a5d8 SHA512 a63059cab63cf97a7407f92700261f04e1170106dbebfbf99770bce656e729b139195e3aa88d6b3f6c42865ae08ea2e1f21571ff8970522ea82c17949403101c WHIRLPOOL 87f5874d5f19bd73081676a893b98b31c2a8d7f07b19197e0362c46577daad5ded21f27299d13699087fee69cb3911bc918b0d176ec7cc41208b47b585ea1538
-DIST ecore-1.7.3.tar.bz2 3457305 SHA256 62dd56329e2d353070dcd8db2355cec85c0ea08733e76ed51a8e779dbf946c4f SHA512 b714497ee14d9bc0b4b0d9295a25e04089fd913d28a97ca357fc7b222967886eaf608851a1bcd616c7e6ac5bf5081cddeca9646e0735ab6ea5c64d4c3126d576 WHIRLPOOL 302d6cd980a48be8b4342177d4cd801fb07b42e5e5679ec78d87803dfae8c513c09de2ce7efe463f68e3f0caf6b16195b398ca02288538e4ca2b3ca1644c5847
-EBUILD ecore-1.7.1.ebuild 4650 SHA256 852b10ea6a7c47f4553fc750b705cd049236b25ae563b3ae78216f93eb96fbbb SHA512 d657fa0e4147950eda1311ce363670043224b67c88ce352a0bb11eb0096de51682ea3272fbdeec0c7ee75c256112c9bcee50ce39ce6f847e23c84d70e6561673 WHIRLPOOL c5dbd3dac11fc2dc4dc43990127dc5bd6bd27dd5c643861cd4b468f810457cefe05989e8b9b836579565d57db6bf3de04bf30e69197d6a377ef4f33bcad09598
-EBUILD ecore-1.7.3.ebuild 4899 SHA256 bd6752b1cee54a673f20f6da644a03396f3d32244032dcf901ca5bdd7855045a SHA512 60c136ceb83070b2ad283b32c75bf9fd75398f709a28708013fd84471724d551380ad560a9fc4217958b3a8589528a8e356dfce9057cf903a8d4a14c838e60a2 WHIRLPOOL f42b8ccf8039f6d8795a0a93cb0a8764d00b8b96ab524f59a21ae2fc638e54e765ece3a20e3d6962bc77e91aaa85eadd2ac3dcaa0fc3a58e7522c2af553d963e
-MISC ChangeLog 2149 SHA256 23f0cb600cc110966b167320463b549a2c32ffebb6b7d3785bca2f313b2d25ec SHA512 0cee99671f41cc526e90358bb3d1aa8927843c2aea5d0a1ffbae7040b24941400cbcdd4a19afc28dca3ff45c22c4a29799a5a9edf9c2eb48af084764cfc44202 WHIRLPOOL eae88ace2a4c1de87b0e411ca144abafd4c0c1aefee23a9cda3acd6b29c6075ad055fdd1ff77530e0203991e8752c498bbb179692c5d6d10271e55db33cf7402
+DIST ecore-1.7.4.tar.bz2 3421866 SHA256 4fa52dece3cfeeb61c89038391c5c25ff31911a6dd187229f8ddb0a1bd61a03d SHA512 a84943e5b74308b4a10393d48e0daa5cb043643fea2e47af6e9a6301911fb1019e7455ddbaf0dc9f8c111ac2ecab0a30fc30a946c05b53c246209571d412635b WHIRLPOOL c9d21a2cd98a159de15a734bff007e82731d1e1767fa570b3efb7ba9e5ff7a44273a69cbebc3813ae7a53b90dde90e5325844d0192855f1d1582ec9f1be766d2
+EBUILD ecore-1.7.4.ebuild 4824 SHA256 6a4eb45abcda67931934d421019a1f4f4fa54915ddaa4787591d997f554051d6 SHA512 069ae166800a0241cedb4fa4a3f45a9b31c3914a75ddd8c32f287166deaca67d58370661e9adfcaac6d8284b82f5110e7258fd688239f5210b4463200b04eae3 WHIRLPOOL 04908514564eac05d1adc8f4efd10d3a72b2f9bd8e29cfe627efbb4b3343af7ebf62682665300bc3e061738e74fe0430105f02c837e2c57afbb842cbeacda365
+MISC ChangeLog 2359 SHA256 7f0203d83fb071dd822417d5769ac8db0c32e3c87b17825230d51525b8f55aa3 SHA512 253a0e9cbb83c788010732e3df2c64cb74c5f463cb759c1d360697080d66809d0974b9b5d45900cfdc02eaa9c53375eae321377f78cda72e088744a8bf30efeb WHIRLPOOL 727e72e30af571c249a6b60e6a782ff148473ea879e21409669594fa0ae8c112a23970c5ba552a06832b35c69be68cea04fdd137c9be1bc0acfed7dd440fd19f
 MISC metadata.xml 2938 SHA256 0cdb73abefbd88bc47155e4e29ed5f34796459544a80d31e71422bf44c52d114 SHA512 cb0bd91e0cdfd7eeb4d1ea78cb2f55e207312b645fe906a9f3c79337baa7b39ae746bace6f3ac1507f79d71eba95ad33f5d97c94e3a61c576d70e8c874b1dd63 WHIRLPOOL 640194860642409ba1bc264b1f5857cf6e97d3c04a3ce2b76540ae147275f9ce9f3fe7a2be5c158de202f6575386747e2a46e571c934070f02d69db2d87473ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlDEbbIACgkQG7kqcTWJkGexGAQApLui9IS/b5els5NbKSQOmLAt
-NskaApiiUW5hG9+6t/fmsUvITynf4Yjj1cDKuEq+pcNeaguiGapnFUV8GyeUEhGu
-QYYKQ44ZI5YbvjJ+t38LbhlkmYy+jHQocYxUNA5XUo7XNrOZ5xRCtNE2B3PY/ucq
-mJnvAc3lW1cdjrfSTUc=
-=nXQx
+iJwEAQEIAAYFAlDUvuUACgkQG7kqcTWJkGfTaQP+Kfa1qhwJO8wBoLEV9je7QWFn
+2x2nTgjtrgOPSKTehQMNAg1bA+uijkR6+PHsoW7EyanVT/UbscZbrpM3KfVGSVpZ
+BQaM8p6Qcde4ol5N7W2AOTtlocrghVEpI+jmNni7kjFW7kmuHfv3/EyO+4vfyGqm
+do03Vse9/pdQ8XW5nFM=
+=hEaV
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/ecore/ecore-1.7.1.ebuild b/dev-libs/ecore/ecore-1.7.1.ebuild
deleted file mode 100644
index 9057041f624d..000000000000
--- a/dev-libs/ecore/ecore-1.7.1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# 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.7.1.ebuild,v 1.1 2012/10/22 13:43:20 tommy Exp $
-
-EAPI=2
-
-inherit virtualx enlightenment eutils
-
-DESCRIPTION="Enlightenment's core event abstraction layer and OS abstraction layer"
-SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~arm ~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.7.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.7.0[directfb?,fbcon?,opengl?,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
-}
diff --git a/dev-libs/ecore/ecore-1.7.3.ebuild b/dev-libs/ecore/ecore-1.7.4.ebuild
index 1733186f26b2..c8fa88608d2b 100644
--- a/dev-libs/ecore/ecore-1.7.3.ebuild
+++ b/dev-libs/ecore/ecore-1.7.4.ebuild
@@ -1,6 +1,6 @@
 # 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.7.3.ebuild,v 1.1 2012/12/09 10:53:32 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ecore/ecore-1.7.4.ebuild,v 1.1 2012/12/21 19:56:14 tommy Exp $
 
 EAPI=2
 
@@ -11,6 +11,7 @@ inherit enlightenment eutils
 DESCRIPTION="Enlightenment's core event abstraction layer and OS abstraction layer"
 SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
 
+LICENSE="BSD-2"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="ares curl directfb +evas examples fbcon glib gnutls +inotify ipv6 opengl sdl ssl static-libs +threads tslib +X xcb xinerama xprint xscreensaver"
 
@@ -47,12 +48,6 @@ DEPEND="${RDEPEND}"
 #tests depend on temp data from eina WORKDIR
 RESTRICT=test
 
-src_prepare() {
-	epatch "${FILESDIR}"/ecore-1.7_80526.patch
-
-	enlightenment_src_prepare
-}
-
 src_configure() {
 	local SSL_FLAGS="" EVAS_FLAGS="" X_FLAGS=""
 
diff --git a/dev-libs/ecore/files/ecore-1.7_80526.patch b/dev-libs/ecore/files/ecore-1.7_80526.patch
deleted file mode 100644
index d8b4c8a5d722..000000000000
--- a/dev-libs/ecore/files/ecore-1.7_80526.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: branches/ecore-1.7/ChangeLog

-===================================================================

---- branches/ecore-1.7/ChangeLog	(revision 80479)

-+++ branches/ecore-1.7/ChangeLog	(revision 80526)

-@@ -1008,3 +1008,6 @@

- 	* 1.7.3 release

- 

--

-+2012-12-09  Cedric Bail

-+

-+	* Fix build without IPv6.

-+

-Index: branches/ecore-1.7/src/lib/ecore_con/ecore_con_info.c

-===================================================================

---- branches/ecore-1.7/src/lib/ecore_con/ecore_con_info.c	(revision 80479)

-+++ branches/ecore-1.7/src/lib/ecore_con/ecore_con_info.c	(revision 80526)

-@@ -39,4 +39,5 @@

- #include <sys/types.h>

- #include <unistd.h>

-+#include <fcntl.h>

- #include <ctype.h>

- #ifdef __OpenBSD__

-Index: branches/ecore-1.7/NEWS

-===================================================================

---- branches/ecore-1.7/NEWS	(revision 80479)

-+++ branches/ecore-1.7/NEWS	(revision 80526)

-@@ -1,2 +1,10 @@

-+Ecore 1.7.4

-+

-+Changes since Ecore 1.7.3:

-+--------------------------

-+

-+Fixes:

-+    * Fix build without IPv6.

-+

- Ecore 1.7.3

-