Restrict python3 and use python2 even if python3 is set as the main python interpreter. Bug #454860

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

3 files changed, 36 insertions, 16 deletions

diff --git a/sys-apps/pyrenamer/ChangeLog b/sys-apps/pyrenamer/ChangeLog
index 8c396869824b..8598aed9fd48 100644
--- a/sys-apps/pyrenamer/ChangeLog
+++ b/sys-apps/pyrenamer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/pyrenamer
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pyrenamer/ChangeLog,v 1.2 2010/08/05 21:06:19 hwoarang Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pyrenamer/ChangeLog,v 1.3 2013/02/16 00:24:16 hwoarang Exp $
+
+*pyrenamer-0.6.0-r1 (16 Feb 2013)
+
+  16 Feb 2013; Markos Chandras <hwoarang@gentoo.org> +pyrenamer-0.6.0-r1.ebuild,
+  -pyrenamer-0.6.0.ebuild:
+  Restrict python3 and use python2 even if python3 is set as the main python
+  interpreter. Bug #454860
 
   05 Aug 2010; Markos Chandras <hwoarang@gentoo.org> pyrenamer-0.6.0.ebuild:
   QA fixes thanks to Arfrever
@@ -11,4 +18,3 @@
   +pyrenamer-0.6.0.ebuild, +metadata.xml:
   Moved from sunrise overlay. Fixed bug #210970. Thanks to Fabiano
   Francesconi <fabiano.francesconi@gmail.com> for the sunrise ebuild.
-
diff --git a/sys-apps/pyrenamer/Manifest b/sys-apps/pyrenamer/Manifest
index 2f1ff62a92f8..bfbd083eaa4d 100644
--- a/sys-apps/pyrenamer/Manifest
+++ b/sys-apps/pyrenamer/Manifest
@@ -1,16 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST pyrenamer-0.6.0.tar.gz 255793 RMD160 1d07c62a4851e4f00c041c7b34efd62f97abc9ba SHA1 0dd25b8fe43f58c8be12e15cd39f5303c2267a8d SHA256 57afbabd4814efa2378de9b6d84808986eb269bd54d13467f8cf20e0122dc92a
-EBUILD pyrenamer-0.6.0.ebuild 761 RMD160 04265a2fbe97b7e4e6995511ee8cf3d8c088265f SHA1 de059d91b5faab31567d7e80d2b1439d46b363e2 SHA256 260312fb9d50979febefd872e52530440c3264e435834cd03f69ef5af857a08d
-MISC ChangeLog 584 RMD160 ae9b9aa0cc0806eec05714cac3b491c039d8bdde SHA1 0224671478a147acac67d0ad18d1bb842ed97e78 SHA256 4404a5938fa3dfe5c6ecfeeb8a1b02a2098ac1ffce924d362dcee3d73ce9b1bc
-MISC metadata.xml 309 RMD160 155cda7f830b13f04a387b0e80e38f639e96bf1b SHA1 e921c91065d5797bcc4c0978ea85bcc118a486e6 SHA256 76608c1ae8c758c9d33ac741ca0ae71f592f27a091b90be73499d10c6d68cc80
+DIST pyrenamer-0.6.0.tar.gz 255793 SHA256 57afbabd4814efa2378de9b6d84808986eb269bd54d13467f8cf20e0122dc92a SHA512 86bf38005c7f6e57546bb2aa7c2f52fd3ad98fb6500b73cc3ed911f221ff0f66262da8500e73ae7c759c5d725221b1226a63226bb37ead28a1ac47a7fdae7a10 WHIRLPOOL fa5ec1429f689c9395f1fba59668e225a7dba79d33410e01af646ff1b255c58caf8dcf4f6e2b72f911a34a923c774aaecbc9ee717dfd2e420fbba2367224739a
+EBUILD pyrenamer-0.6.0-r1.ebuild 857 SHA256 90f9ccad6cf39bed1c76711aaad9b7ee31c7dff60cc1329d3832c86163be46f5 SHA512 dc87d33a1881e328e143944546349637ab131d8eadf10a813973a30f2c90d4f3300180d0b960c99a5a99fc12e6a417b3d3ac314518d68eed6f06dc24f130ee4d WHIRLPOOL cb4e373fdfbfd2d02f496057eeb3c59b7b28f1b104eabe2459402b62c709fafcd52ac4a3a9be9d0cc6d5d475ec6d019e9ad996ca1091d6a50555546bbdb502ec
+MISC ChangeLog 831 SHA256 3eb6c617fec8a80e168f8000f831bfed6da0fa9f5e94af3c67c3c27e279afb86 SHA512 dcaddd6680a7a6fde20df41d3c16a1da5265f8f9c5d0f129d94ae42975aa64217c93f16dd0c3013724ebe723199722654f6df403a0910c87f627c01dc485d820 WHIRLPOOL 8403d276b3aeb1ee65f49cc031a5c1ec7b25372035c9cdb67b5cd1c987b3f7a06c6f3938975fd522706f8da1fa634d7d060f6498724a5e901055f2a253fb5ee1
+MISC metadata.xml 309 SHA256 76608c1ae8c758c9d33ac741ca0ae71f592f27a091b90be73499d10c6d68cc80 SHA512 219d498fbe14f13b4174aaef6593dc5a5379ca78793f383e236583646aa0224ad108e19d5edffae34358581a136ae6879777722781317f370ebd7f6668a55bfe WHIRLPOOL be0564d9fd7974ca89f805713e0619169b2820021549a27f234ece71add9a4b2c20c3ef0aef75758d43a069430ca704067a71b60c615cb615d3c5e3696555c4b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk59sbYACgkQfXuS5UK5QB3psAQApv79RQ24DqzoZJpNSPUQL221
-8A8YOakJmqShMBU1vRMluWi639dfISYNjOHZttiVZm7wSsUsp9vCUSzIMGRPBPrK
-F4Uq+xyv5Uf2zJIudKWmXDEyCMRHASAkV4Cl5t+1nft4vo5DyqMuxMCp40CTTDAz
-tDYaRFCMfILO2pLsSo8=
-=0zIK
+iQIcBAEBCAAGBQJRHtGxAAoJEPqDWhW0r/LCoYAP/imA1EZ9XHfE3OairOwxQ5i4
+n0nqYMeQaHgFxt2VUOaBBjcoVu+juVDW9hcB8f7PxfVCRzkeyMwFN4dkE9qed8h5
+KQQ2hH1pT0snUHavvbmJUg7zOd01am3T5nz6fF73syrWRvFaHLy1axD1TDrri/oG
+szZnaJPYAciZAPwAwPhYEsVC9djTJT8UPRhIsJJXDa9dYptrXYXJOACUyXrRmCCB
+/7nODbRQgUkK/lOhc1cEYaupjtmzcfMIpCQ3m1Jk5Vjlc1DszpHA4/PimU3nMd08
+7Wv/07qbbf0JhmrGgQaTBRkc1tXN/Qabusz4dNy+QuujK+DrASehendUmpX4xAVP
+zmjUP0SZ6CL+DrlPkQnghIRBIm17kdV8CxDK3DuZlBir2KLYCJhxbilVyfpRhLO+
+PbjWPvbyChn8ghq8A5dpsISh9vN3LAM66i+X9no/GT/CpyxxO7WkxmFD1VMh+GpY
+3EsxQ6gDqzSAoxIvx+HfFMzXaLhrOHi/pWYccHzfrVIl2IUOEPuLxifRikUP27lp
+c6BoaCB/yD+VGnGkAw7jy/imtpPQBmDJd6B7a1ZJ/JKaTJtU70VRIp6lDJlhp9ar
+lzyvJn1nw1jfneIDW7HlwqQicJRps4jNVWSJjb4yO/phUaCxnLhmImOEVUVDPys4
+MRwSHftzGM3Xc+jMp4n2
+=E+8I
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pyrenamer/pyrenamer-0.6.0.ebuild b/sys-apps/pyrenamer/pyrenamer-0.6.0-r1.ebuild
index 3498a5dd17ad..390de3b7898c 100644
--- a/sys-apps/pyrenamer/pyrenamer-0.6.0.ebuild
+++ b/sys-apps/pyrenamer/pyrenamer-0.6.0-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pyrenamer/pyrenamer-0.6.0.ebuild,v 1.2 2010/08/05 21:06:19 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pyrenamer/pyrenamer-0.6.0-r1.ebuild,v 1.1 2013/02/16 00:24:16 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit python gnome2
 
@@ -21,10 +23,14 @@ RDEPEND="dev-python/pygtk:2
 	music? ( || ( dev-python/eyeD3 app-misc/hachoir-metadata ) )"
 
 pkg_setup() {
-	python_set_active_version 2
 	python_pkg_setup
 }
 
+src_prepare() {
+	python_convert_shebangs -r 2 .
+	gnome2_src_prepare
+}
+
 pkg_postinst() {
 	python_mod_optimize ${PN}
 }