Update to use EAPI=2 due to eclass changes.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 33 insertions, 57 deletions

diff --git a/dev-python/gdl-python/ChangeLog b/dev-python/gdl-python/ChangeLog
index 602fd8207f55..692229ea5047 100644
--- a/dev-python/gdl-python/ChangeLog
+++ b/dev-python/gdl-python/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/gdl-python
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gdl-python/ChangeLog,v 1.24 2010/04/08 18:28:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gdl-python/ChangeLog,v 1.25 2010/06/02 21:10:56 eva Exp $
+
+  02 Jun 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gdl-python-2.19.1.ebuild, gdl-python-2.19.1-r1.ebuild,
+  gdl-python-2.19.1-r2.ebuild:
+  Update to use EAPI=2 due to eclass changes.
 
   08 Apr 2010; Raúl Porcel <armin76@gentoo.org>
   gdl-python-2.19.1-r2.ebuild:
diff --git a/dev-python/gdl-python/Manifest b/dev-python/gdl-python/Manifest
index 133bc65ef133..0ea6a2bf975f 100644
--- a/dev-python/gdl-python/Manifest
+++ b/dev-python/gdl-python/Manifest
@@ -1,9 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gdl-python-2.19.1-gdlapi-removal.patch 3324 RMD160 d089035ea3589be52eeb9221bfb07ce10532a69b SHA1 1694fe3699a1a21014314820f15fa1a439618a1a SHA256 805f5eb8c63607560a1ce8b9016413086fd5da49a544ce754088238fdc2e4db8
 AUX gdl-python-2.19.1-gdlicons.patch 446 RMD160 c618285e44f4e6c0b1c9f21c41089ce2be2de0bf SHA1 693afa5d6f3d4b602ba5cdb0962be35109a3e116 SHA256 dcec718872c51d7e1ae86f998f4e8274b0324ce8845028b8e407ce0b16c8d9e3
 DIST gnome-python-extras-2.19.1-split.patch.gz 2372 RMD160 b8585c0ae6b2e5308c397a596089204e14a6d4f7 SHA1 6235ea983e30cccf28d7ca6ee35e46708c68a511 SHA256 749de35005b788e9f49e463ded51fbcda3f39900014f92eef77b305bf729ddd1
 DIST gnome-python-extras-2.19.1.tar.bz2 361721 RMD160 1dd556def13b6cd10ef9a3a747e73ea38ee70e62 SHA1 f97303aa92c300050818ac8a01d0bc0657b2a9e3 SHA256 c5f74f4c46dbb379d119d6f74ca4a47653af251bea176dc7a0ecacccb88339f0
-EBUILD gdl-python-2.19.1-r1.ebuild 880 RMD160 da51381f7b464ed7e74878eacf3af65186760238 SHA1 dacf14f64b9966c119a8c0c8f00290944c626b72 SHA256 add08180491742bf5718a4b1092d2c6b737e42c3d02937e63b9f12139a48b553
-EBUILD gdl-python-2.19.1-r2.ebuild 963 RMD160 dc2040e3ec2512b4b1063a1461653b318b56fa62 SHA1 dcbe30492bd6b9a1db1d75077915ffa1a626a337 SHA256 2859aa072404262ca282ac5c37f24487f1798e2d9beebe36035a7e85ab1c1f2f
-EBUILD gdl-python-2.19.1.ebuild 1075 RMD160 aff1817b7fd01d202bbeb4bf1444013d65a0c648 SHA1 847706098d080e1aa5f2fef1defc83f79e20124b SHA256 b227960081a395f8762dfb0fb1fabb457f80b5af9d59a43f0adfd6e8c01288ea
-MISC ChangeLog 3508 RMD160 f6b17c345d5944bf32ed149dcbb32fd4de0ab3ef SHA1 cf1d6ccf9e284fe3de71581dca6c8d0ee2091e84 SHA256 9db1ce64927d3cfafe0e2bcad6e505ceab8a64bdaca3e74fd856ebfd8f79986e
+EBUILD gdl-python-2.19.1-r1.ebuild 844 RMD160 609f9d86af0955ff0f0feb3e4a39a157698186ec SHA1 8de4be6fee6efafb764c465088aafb22e2a01d70 SHA256 4f731f8b07c0ecddc3a5ce010e449b032b6aa09be4924093a66b19c5f988b403
+EBUILD gdl-python-2.19.1-r2.ebuild 968 RMD160 ea43d3b8f4da94a9fb425f340053494d8565a119 SHA1 2a4d7f104ca5b4dde3f5422e787f056ea9c6512d SHA256 cbe2f87da9a43169aa9c47322b0c06bcbf7bda70682233ce4883ef0aed43731a
+MISC ChangeLog 3694 RMD160 e7f5316d666b0aa2006e5b40e06a4c6a991794dd SHA1 bd8d16e2c994de5f18b60b363ccce5577f035419 SHA256 0ca17667593f8325d3609e212ded6ca86745c31b7c237aa0d853df855d934fba
 MISC metadata.xml 178 RMD160 52828e1ca616ad731f2ab1ed2890d6d3a7cc8043 SHA1 a42d68a6c263ea8d8cbb678548e209aa9642a74e SHA256 aeea09173ed30175422e4f951e369e1882919be3d56e655468e5d4bffea0fc3c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwG5QkACgkQ1fmVwcYIWAZteQCdGYvfCzkcnDm7lbkFtXcvd9nb
+Z6oAn3TW6h94IpE4LPsFk5W5z4JZic2j
+=N3Fo
+-----END PGP SIGNATURE-----
diff --git a/dev-python/gdl-python/gdl-python-2.19.1-r1.ebuild b/dev-python/gdl-python/gdl-python-2.19.1-r1.ebuild
index dac7588bb227..9b97796ef25f 100644
--- a/dev-python/gdl-python/gdl-python-2.19.1-r1.ebuild
+++ b/dev-python/gdl-python/gdl-python-2.19.1-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gdl-python/gdl-python-2.19.1-r1.ebuild,v 1.11 2009/10/30 07:44:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gdl-python/gdl-python-2.19.1-r1.ebuild,v 1.12 2010/06/02 21:10:56 eva Exp $
 
+EAPI="2"
 G_PY_PN="gnome-python-extras"
 
 inherit gnome-python-common
@@ -13,20 +14,20 @@ SRC_URI="mirror://gnome/sources/${G_PY_PN}/${PVP}/${G_PY_PN}-${PV}.tar.bz2
 DESCRIPTION="Python bindings for GDL"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha ~amd64 hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="hppa ppc64"
 IUSE="examples"
 
-RDEPEND=">=dev-libs/gdl-2.24.0"
+RDEPEND=">=dev-libs/gdl-2.24"
 DEPEND="${RDEPEND}"
 
 EXAMPLES="examples/gdl/*"
 
-src_unpack() {
-	gnome-python-common_src_unpack
-
+src_prepare() {
 	epatch "${WORKDIR}/${G_PY_PN}-${PV}-split.patch"
 	eautoreconf
 
 	# Fix build failure with recent gdl
 	epatch "${FILESDIR}/${P}-gdlicons.patch"
+
+	gnome-python-common_src_prepare
 }
diff --git a/dev-python/gdl-python/gdl-python-2.19.1-r2.ebuild b/dev-python/gdl-python/gdl-python-2.19.1-r2.ebuild
index dc253691adf2..448fa3977a21 100644
--- a/dev-python/gdl-python/gdl-python-2.19.1-r2.ebuild
+++ b/dev-python/gdl-python/gdl-python-2.19.1-r2.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gdl-python/gdl-python-2.19.1-r2.ebuild,v 1.5 2010/04/08 18:28:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gdl-python/gdl-python-2.19.1-r2.ebuild,v 1.6 2010/06/02 21:10:56 eva Exp $
 
+EAPI="2"
 G_PY_PN="gnome-python-extras"
 
 inherit gnome-python-common
@@ -16,14 +17,12 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="examples"
 
-RDEPEND=">=dev-libs/gdl-2.28.0"
+RDEPEND=">=dev-libs/gdl-2.28"
 DEPEND="${RDEPEND}"
 
 EXAMPLES="examples/gdl/*"
 
-src_unpack() {
-	gnome-python-common_src_unpack
-
+src_prepare() {
 	epatch "${WORKDIR}/${G_PY_PN}-${PV}-split.patch"
 	eautoreconf
 
@@ -32,4 +31,6 @@ src_unpack() {
 
 	# Fix build failure with gdl-2.28
 	epatch "${FILESDIR}/${P}-gdlapi-removal.patch"
+
+	gnome-python-common_src_prepare
 }
diff --git a/dev-python/gdl-python/gdl-python-2.19.1.ebuild b/dev-python/gdl-python/gdl-python-2.19.1.ebuild
deleted file mode 100644
index eb049b1a1c36..000000000000
--- a/dev-python/gdl-python/gdl-python-2.19.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gdl-python/gdl-python-2.19.1.ebuild,v 1.12 2009/05/14 23:14:08 gengor Exp $
-
-G_PY_PN="gnome-python-extras"
-
-inherit gnome-python-common
-
-PVP="$(get_version_component_range 1-2)"
-SRC_URI="mirror://gnome/sources/${G_PY_PN}/${PVP}/${G_PY_PN}-${PV}.tar.bz2
-	mirror://gentoo/${G_PY_PN}-${PV}-split.patch.gz"
-
-DESCRIPTION="Python bindings for GDL"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
-IUSE="examples"
-
-RDEPEND=">=dev-libs/gdl-0.6.1"
-DEPEND="${RDEPEND}"
-
-EXAMPLES="examples/gdl/*"
-
-pkg_setup() {
-	# we need gdl-gnome
-	if ! built_with_use --missing true dev-libs/gdl gnome; then
-		eerror "If you want to build ${PN} you need to build dev-libs/gdl with"
-		eerror "the the 'gnome' USE flag."
-		die "gdl must be built with USE='gnome'"
-	fi
-
-	gnome-python-common_pkg_setup
-}
-
-src_unpack() {
-	gnome-python-common_src_unpack
-
-	epatch "${WORKDIR}/${G_PY_PN}-${PV}-split.patch"
-	eautoreconf
-}