Perform python2->3 fixes as per bug #311793

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

diff --git a/app-portage/portpeek/ChangeLog b/app-portage/portpeek/ChangeLog
index 3859a288a9638e8bf5e53a2c472fd2e5de0aec70..fc45e0dc04c3a2c9467ff81d4ae1677765dbf69d 100644 (file)
--- a/app-portage/portpeek/ChangeLog
+++ b/app-portage/portpeek/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/portpeek
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/ChangeLog,v 1.63 2010/03/28 21:05:26 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/ChangeLog,v 1.64 2010/03/28 21:22:08 mpagano Exp $
+
+  28 Mar 2010; Michael Pagano <mpagano@gentoo.org> portpeek-1.5.7.2.ebuild,
+  portpeek-1.5.8.4.ebuild, portpeek-1.9.36.ebuild:
+  Perform python2->3 fixes as per bug #311793
 
   28 Mar 2010; Mike Pagano <mpagano@gentoo.org> -portpeek-1.9.35.ebuild:
   Drop old version

diff --git a/app-portage/portpeek/Manifest b/app-portage/portpeek/Manifest
index c99b1c1ff432d0568024d6205fb36df6e05eb826..574b7bebdae028fb54d87e467979d679ba2cc224 100644 (file)
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@@ -4,15 +4,15 @@ Hash: SHA1
 DIST portpeek-1.5.7.2.tar.gz 6286 RMD160 72178e5601def706752027bef4ad8e7358b1841a SHA1 f52db5a55e0681ea1f7a4b826632913105ec61ad SHA256 42493232a5e21f233f2a37bb77a27aed6d1bb7a465ec93f08e23dd2c5eca9dfd
 DIST portpeek-1.5.8.4.tar.gz 7531 RMD160 32741d739be4a321bf67f905801b7c9cc788256c SHA1 5d9c8d68c9101bf9595b665e5eeb759236dafc05 SHA256 301ed1a2da8e518f34e1a28f751242f652981ba905805685012b274a07cd87fc
 DIST portpeek-1.9.36.tar.gz 8271 RMD160 1a3c837ceeef68696a78bfc14e8097e9ae3eb537 SHA1 78424fb73a4f5c72a941fd4a4d66a28bd5101e45 SHA256 0d69a051a1b1c59998fd71ed882cf603f143e31c20b41db0d08f5b3bfaf6f12d
-EBUILD portpeek-1.5.7.2.ebuild 644 RMD160 074409aad9edc5d29bc650dbfba24a74b4f7600d SHA1 8f6b41be4ab3469a44f7095769da0ac016de301c SHA256 5ba0fbbc65fd6005008d982c855a5547c46c06244d445fb4004752a81b4ff901
-EBUILD portpeek-1.5.8.4.ebuild 646 RMD160 6e5b87bb339e4a7b1290416dd6d54397938afb72 SHA1 3287cf9a871c4cc8b37f55df715afa7e5c410848 SHA256 9e96a29c1826c9edebe31364ab266a854afc9d24fd7ae2404475841aebfe8809
-EBUILD portpeek-1.9.36.ebuild 689 RMD160 2e99c3cc44ca2f957c7ebf1ed8cb6090ab83d032 SHA1 2ee3f1b6500506997543c7277e4f0b3d308eb7e4 SHA256 7084dcbf1afd098d9363f36f9e13e45b5c155e931ce97cbf013e4f56228e4821
-MISC ChangeLog 11074 RMD160 d66fb0cb3ab4ee82fe15f43acd541a4939d4bd7b SHA1 72aced93e82c41dc1902fe1c7205133d61ff76aa SHA256 1703811ab9cf88f44304b00ee168fe1c0cf63ab7cb49c6a8e9bc6d740dad1e98
+EBUILD portpeek-1.5.7.2.ebuild 786 RMD160 fe7dcb56796cec5c1ebb5b6102f5b42efb67773c SHA1 4c8a0495295b3d33ad5412cf9a9e18234d9f13b8 SHA256 2574809ca2d0a96caad6f93b7876d0d54beee012d3ba0fe38618b1ae4e0ec821
+EBUILD portpeek-1.5.8.4.ebuild 788 RMD160 d3353ae955b953c1a85a0165ca5d53de44b0f384 SHA1 3e5d0d1c189731a250f7505aacaa6555134f9cc6 SHA256 45ff2a131c4cae85873a6dc89072c30f62616c5fd1acc57a97c87178260fafb0
+EBUILD portpeek-1.9.36.ebuild 831 RMD160 a8d9d454657f6bb3ded060468f0d9dd289face4a SHA1 5f24edd0401d5e4bba136d3441c7ed56f7667ff6 SHA256 321770654faa7cfef460005bde36ad736a92d9c79d439317d5de629708bb57a9
+MISC ChangeLog 11248 RMD160 39cfb0f893186a5c9838f92f9e0b3e59b931fad1 SHA1 e454c4838f7e8d20f36d4897411d644e7247775a SHA256 128f6f7858307320dce8821c48c7d38950abc5cea6f19865a3fc0410b56abea4
 MISC metadata.xml 223 RMD160 f1dbda8042f764bb9ee2669116d1b913dd74aff1 SHA1 b5bf88b5ffd7421c3a6587fb2be3f1f1a63d24d2 SHA256 f758aa7033a6e5c4c1023abf7787acca62408ccc718a84430b6fb982c97dd873
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuvxLEACgkQPDPGULV25OP/6QCcDEyDnZcqJYbi02+TBxPTguMX
-LqcAoL0JzieJ1yoHS9MRzbXZ4hWwcFIW
-=Hyq8
+iEYEARECAAYFAkuvyIsACgkQPDPGULV25OM5hgCffxzBKJ+7FS5SBBvp38j4ZJwg
+KA0An1t5JtRbfDr8eOG4zGhZ/CuIsInw
+=/ExS
 -----END PGP SIGNATURE-----

diff --git a/app-portage/portpeek/portpeek-1.5.7.2.ebuild b/app-portage/portpeek/portpeek-1.5.7.2.ebuild
index 2edb698d3ac36c57cf77ded950e012c15e9d7987..88c4a535f6eb3df9ee12e50f0c2fb50a3f7ec215 100644 (file)
--- a/app-portage/portpeek/portpeek-1.5.7.2.ebuild
+++ b/app-portage/portpeek/portpeek-1.5.7.2.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-1.5.7.2.ebuild,v 1.7 2010/03/25 00:43:15 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-1.5.7.2.ebuild,v 1.8 2010/03/28 21:22:08 mpagano Exp $
 
-EAPI="1"
+EAPI="2"
+PYTHON_DEPEND="2"
+
+inherit eutils python
 
 DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
 HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
@@ -17,6 +20,14 @@ DEPEND=""
 RDEPEND=">=app-portage/gentoolkit-0.2.4.2
        dev-lang/python:2.6"
 
+pkg_setup() {
+       python_set_active_version 2
+}
+
+src_prepare() {
+       python_convert_shebangs 2 portpeek
+}
+
 src_install() {
        dobin ${PN} || die "dobin failed"
        doman *.[0-9]

diff --git a/app-portage/portpeek/portpeek-1.5.8.4.ebuild b/app-portage/portpeek/portpeek-1.5.8.4.ebuild
index 2501fb4066be9261404e03f79f509c670421518e..50517f395f0a6e16d582d80247666af866f98bf3 100644 (file)
--- a/app-portage/portpeek/portpeek-1.5.8.4.ebuild
+++ b/app-portage/portpeek/portpeek-1.5.8.4.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-1.5.8.4.ebuild,v 1.4 2010/03/25 00:43:15 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-1.5.8.4.ebuild,v 1.5 2010/03/28 21:22:08 mpagano Exp $
 
-EAPI="1"
+EAPI="2"
+PYTHON_DEPEND="2"
+
+inherit eutils python
 
 DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
 HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
@@ -17,6 +20,14 @@ DEPEND=""
 RDEPEND=">=app-portage/gentoolkit-0.2.4.5
        dev-lang/python:2.6"
 
+pkg_setup() {
+       python_set_active_version 2
+}
+
+src_prepare() {
+       python_convert_shebangs 2 portpeek
+}
+
 src_install() {
        dobin ${PN} || die "dobin failed"
        doman *.[0-9]

diff --git a/app-portage/portpeek/portpeek-1.9.36.ebuild b/app-portage/portpeek/portpeek-1.9.36.ebuild
index 64efbcb7262dbeaf84c627383aebbb106c564f6e..0ccf740b183a454032cf16db85821cb03aeea555 100644 (file)
--- a/app-portage/portpeek/portpeek-1.9.36.ebuild
+++ b/app-portage/portpeek/portpeek-1.9.36.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-1.9.36.ebuild,v 1.2 2010/03/25 00:43:15 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/portpeek/portpeek-1.9.36.ebuild,v 1.3 2010/03/28 21:22:08 mpagano Exp $
 
-EAPI="1"
+EAPI="2"
+PYTHON_DEPEND="2"
+
+inherit eutils python
 
 DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
 HOMEPAGE="http://www.mpagano.com/blog/?page_id=3"
@@ -18,6 +21,14 @@ RDEPEND=">=app-portage/gentoolkit-0.3.0_rc9
        >=sys-apps/portage-2.2_rc67
        dev-lang/python:2.6"
 
+pkg_setup() {
+       python_set_active_version 2
+}
+
+src_prepare() {
+       python_convert_shebangs 2 portpeek
+}
+
 src_install() {
        dobin ${PN} || die "dobin failed"
        doman *.[0-9]