Update EAPI. Call python_pkg_setup().

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

4 files changed, 24 insertions, 29 deletions

diff --git a/dev-python/zsi/ChangeLog b/dev-python/zsi/ChangeLog
index ad1ee44867ea..2141d2ce23b3 100644
--- a/dev-python/zsi/ChangeLog
+++ b/dev-python/zsi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/zsi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/ChangeLog,v 1.12 2010/05/25 21:01:39 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/ChangeLog,v 1.13 2010/10/10 19:00:20 arfrever Exp $
+
+  10 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  zsi-2.0.ebuild, zsi-2.1_alpha1.ebuild:
+  Update EAPI. Call python_pkg_setup().
 
   25 May 2010; Christoph Mende <angelos@gentoo.org> zsi-2.0.ebuild,
   zsi-2.1_alpha1.ebuild:
diff --git a/dev-python/zsi/Manifest b/dev-python/zsi/Manifest
index 8c1f2537ec23..f4872155f466 100644
--- a/dev-python/zsi/Manifest
+++ b/dev-python/zsi/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST ZSI-2.0.tar.gz 805956 RMD160 9fc0171e03f759cbab89046916d979c5505ba5b8 SHA1 e691d9610f04afad9cf62f7990cfd3b4df47ff01 SHA256 368059c92c1afa6ae027d5aea6985caf0bbb890c5589c7d4564e59219ffa0f50
 DIST ZSI-2.1-a1.tar.gz 932958 RMD160 f515a8b702018d75f7bdf73e2f52fdcae8caa621 SHA1 e0a375201396ef32e9607e6ceea5d2920950a7cb SHA256 253cd6968bc52e66121ee370831b93be385d65563a0e71c9c704db83901bf244
-EBUILD zsi-2.0.ebuild 1174 RMD160 3cc80bd1c0147f6a88a2b1ced543da3cb3942791 SHA1 b03d33f4dc999ab917b567e3917ad8b18ec7ceb6 SHA256 a4852fce37d5a0efde76bf7c2e7d93e6af68b81aa30258795f947876ed3ee671
-EBUILD zsi-2.1_alpha1.ebuild 1145 RMD160 acf9bb7c142bcaca817a472f753bab75a4bc0cc0 SHA1 b93565727e33694038a4920191efdeeb25e9ea01 SHA256 4285c97ead7c2503e58ea2580a57f5dc573fb8cdb19c42f8a7c21e8e1f8492d6
-MISC ChangeLog 1483 RMD160 f1cfb46987aeafabd117ed6e8dba72084752d0ec SHA1 ef95641fb0b7977cd4c37a054972678f9a9ae9f2 SHA256 2af9c2f12c6ffe7d93952636b0d852cab28a67e0a9f0ab6bc11b87115e3ebc42
+EBUILD zsi-2.0.ebuild 1178 RMD160 a659947e91367a63af3f54e9f452035b35553e6e SHA1 7559cf6b28d80a93c41652bcb9b8dc4879d3c0b9 SHA256 184c0de5eb5fd52c4ab955fb6355a13b831b5597f38f60aeb71a8b27b4ed1bdf
+EBUILD zsi-2.1_alpha1.ebuild 1175 RMD160 bd0020079f07fd72651d21cee96551c9a19acd06 SHA1 022ecd863e3ac47f3ac0cb00cb8b4b0570ba7024 SHA256 56ca6891043b2827047d1f1628b7e8b15c32b7ee3dd35af03842b83a8b188dd8
+MISC ChangeLog 1639 RMD160 6a2abf1d82a616d6f8e0d85442aa7c01b1aeb270 SHA1 e0a0d566cea601b7b2bab446c2b1514b6e304627 SHA256 1fb29e220b161190dbb2654acf588d6442fc3df7db80cf857cbcc7907275ef55
 MISC metadata.xml 348 RMD160 e210ab4ac4e4d6b3047bf40b516ef5996d153ae5 SHA1 f8d5ea842c27b3c19afa77d4073873951b8e2d93 SHA256 79218ac601767174ad2319853be5d74731001432bf1e655eed21365d0bf9017c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iF4EAREIAAYFAkv8Or0ACgkQmWq1bYTyC0MDjwD/W3ZIPLai6k4wlnzL/5L/HNJD
-u5neM7vn0xDTeEzKyQMBALPvRuHSgVI0dec9lEkjyLtn9P/hWStzC14x2/uq82Vt
-=7si2
------END PGP SIGNATURE-----
diff --git a/dev-python/zsi/zsi-2.0.ebuild b/dev-python/zsi/zsi-2.0.ebuild
index aef44578f533..8e5f768f5254 100644
--- a/dev-python/zsi/zsi-2.0.ebuild
+++ b/dev-python/zsi/zsi-2.0.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/zsi/zsi-2.0.ebuild,v 1.9 2010/05/25 21:01:39 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/zsi-2.0.ebuild,v 1.10 2010/10/10 19:00:20 arfrever Exp $
 
+EAPI="3"
 PYTHON_DEPEND="2:2.4"
 
 inherit distutils
@@ -26,17 +27,15 @@ DEPEND=">=dev-python/pyxml-0.8.3
 			>=dev-lang/python-2.4 )"
 
 S="${WORKDIR}/${MY_P}"
-PYTHON_MODNAME=${MY_PN}
+PYTHON_MODNAME="${MY_PN}"
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if ! use twisted ; then
+src_prepare() {
+	if ! use twisted; then
 		sed -i \
 			-e "/version_info/d"\
 			-e "/ZSI.twisted/d"\
@@ -47,11 +46,11 @@ src_unpack() {
 src_install() {
 	distutils_src_install
 
-	if use doc ; then
+	if use doc; then
 		dohtml doc/*.html doc/*.css doc/*.png
 	fi
 
-	if use examples ; then
+	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
 		doins -r doc/examples/* samples/*
 	fi
diff --git a/dev-python/zsi/zsi-2.1_alpha1.ebuild b/dev-python/zsi/zsi-2.1_alpha1.ebuild
index af29e53b9217..c47a736916c9 100644
--- a/dev-python/zsi/zsi-2.1_alpha1.ebuild
+++ b/dev-python/zsi/zsi-2.1_alpha1.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/zsi-2.1_alpha1.ebuild,v 1.3 2010/05/25 21:01:39 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/zsi/zsi-2.1_alpha1.ebuild,v 1.4 2010/10/10 19:00:20 arfrever Exp $
 
-EAPI=2
+EAPI="3"
 PYTHON_DEPEND="2:2.4"
+
 inherit distutils
 
-MY_PN=ZSI
-MY_P=${MY_PN}-${PV/_alpha/-a}
+MY_PN="ZSI"
+MY_P="${MY_PN}-${PV/_alpha/-a}"
 
 DESCRIPTION="Web Services for Python"
 HOMEPAGE="http://pywebsvcs.sourceforge.net/zsi.html"
@@ -23,11 +24,12 @@ DEPEND=">=dev-python/pyxml-0.8.3
 	twisted? ( >=dev-python/twisted-2
 		>=dev-python/twisted-web-0.5 )"
 
-S=${WORKDIR}/${MY_P}
-PYTHON_MODNAME=${MY_PN}
+S="${WORKDIR}/${MY_P}"
+PYTHON_MODNAME="${MY_PN}"
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {