Improve usage of python eclass (bug 308301): use PYTHON_DEPEND, set active python version to 2, convert shebangs to be version specific and remove unneeded python_version call. Remove old.

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

5 files changed, 33 insertions, 64 deletions

diff --git a/app-arch/q7z/ChangeLog b/app-arch/q7z/ChangeLog
index 87d9cfd3af28..4c90ae6e642c 100644
--- a/app-arch/q7z/ChangeLog
+++ b/app-arch/q7z/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/q7z
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/q7z/ChangeLog,v 1.6 2009/06/06 23:28:35 yngwin Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/q7z/ChangeLog,v 1.7 2010/03/20 19:03:20 spatz Exp $
+
+  20 Mar 2010; Dror Levin <spatz@gentoo.org> -q7z-0.7.1.ebuild,
+  -q7z-0.7.1-r1.ebuild, q7z-0.8.0.ebuild:
+  Improve usage of python eclass (bug 308301): use PYTHON_DEPEND, set active
+  python version to 2, convert shebangs to be version specific and remove
+  unneeded python_version call. Remove old.
 
 *q7z-0.8.0 (06 Jun 2009)
 
diff --git a/app-arch/q7z/Manifest b/app-arch/q7z/Manifest
index 31d9f1b72c0d..1130e91048f4 100644
--- a/app-arch/q7z/Manifest
+++ b/app-arch/q7z/Manifest
@@ -1,11 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 0.8.0-fix_7z_flags.patch 635 RMD160 81b9e6272ebe127d2f7fd8a314584bb3799b8577 SHA1 32c3c2578ba084afc743f3906f160f8bb4956e27 SHA256 151efdfa15ea39ed95802f6ef734e33ce489f1ce0e1b19a0c63b9c4d808f8110
 AUX 0.8.0-fix_imports.patch 532 RMD160 f29f4e82d7a95670eb7acf98b2a6efe4f90ad7a4 SHA1 3afcb18366ecfc2ee6ecc154c8132ff22efae2ad SHA256 31fbe456fe79fdba7141ea4a5a11b22ef2e1196620c3bc1f1924a4552773a6c4
 AUX 0.8.0-fix_paths.patch 2283 RMD160 ea4e7a361298165decae8beb213f70c5770e1a49 SHA1 7404ad156993a5cec5d5cb2e5dff9813f423b984 SHA256 a6e04c18c57249367d5ea4fd7f1adcbb83c1f018fb250b3ab2c24a67165e5834
 AUX 0.8.0-init.py 1 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 SHA1 adc83b19e793491b1c6ea0fd8b46cd9f32e592fc SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
-DIST Q7Z-0.7.1.tar.bz2 178867 RMD160 370b0a82a929d3efb46b80a1dc8a83d6fb387ed7 SHA1 b105e498f3799f3104e4c345051b7ec15b313258 SHA256 5e54c7d66f3d7a180d022c0b28d7dae5685500c4b2005fce748201719fecfde9
 DIST Q7Z-0.8.0.tar.bz2 177144 RMD160 63b4506a832e45cc98c2d041b5f9a26dce4aed18 SHA1 632a68d50b9ec9d1e1b2b796d0c812bd14dec609 SHA256 3dd799028b4eac2d6d2654d52824363b1c1e814c8cbf0a764d29b948cf8a6678
-EBUILD q7z-0.7.1-r1.ebuild 796 RMD160 9c44b21cf074803aa58588581d1eba882465d495 SHA1 01840f362590e5c445123d9cab3f07df4affbd20 SHA256 e7a80c43c62234ff31ea938e4de2fa64db059ab27a4fd41d8cb16acae674f958
-EBUILD q7z-0.7.1.ebuild 781 RMD160 96e79e22ea643d5c53ddf18effda3696e97f2878 SHA1 a21ea39ddaf97ce9aa8fb90d356706d59c1bddca SHA256 d50e04ea65a64989de669c579b3f529e8c90d13733720da952caaf714ca59fcb
-EBUILD q7z-0.8.0.ebuild 1781 RMD160 23ebfcbe2e72af06e0d2add2dd51643f83257530 SHA1 756775c0b11397e3d2a6c5bd2c47b5a177855155 SHA256 b8571d7ac595d315362cd40e5d8e16514345bd97059d2b485a34985b71967493
-MISC ChangeLog 1081 RMD160 04ea3eabda7a69da0193480cdef738ec060fb53e SHA1 e6ab3bb1f14973a074c0ea24119363397004e37c SHA256 3d9b2a2b3b47855ce87157f2cd621ab28dd95ae0d24e0d73072c91b16c87470f
+EBUILD q7z-0.8.0.ebuild 1842 RMD160 bf3f6a79416b019a775bb110ebb2fb88bbcac09d SHA1 b43431024b511b9298dd5a9e6998b33702400e82 SHA256 bebaef0326f225ff5e987ffdfd83b9af94a2e4b7831e0da8228b2c99b570a0b1
+MISC ChangeLog 1382 RMD160 9f4ae7b22a842ae919d18e90f73475c3f5786a7f SHA1 b4b7abf9d353b18e1e643f4256b5fd35d09b779d SHA256 e8f82c194691a644d4e5211faa0459281123ee0f95573bab1759894ec9d53e6e
 MISC metadata.xml 157 RMD160 84dc01e4115bf31e84059fa795c95e94ad39df23 SHA1 fe6fa39ce2ba5cd6a8e7da28113fe05e22b5a39a SHA256 a2ffc792d4df94c3f8088e329c4bf74804540c2797f3e24ab0030acbdfd4b535
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQEcBAEBCgAGBQJLpRwAAAoJEAWF714uGAc6YJ8IAIygTqL/t98x1g/h0FOMUP/j
++maVpoEnBZ94ITJrsQkAz19W0chVbTaWzQjc6F/w4YuYQb3kcfrDZu3UVvl9+1NL
+EEtmwLugD0tLt3DWV1bOoC83+PorH14ZcVZ0nltNZ56ZfcpRWwpFNguqaU60h1pq
+siXZwwrFiVJnwZzl3D7oJ5LFI4nfLlXl39wTXioUW4+uoRKEGeFo2j1uWjtXeanB
+qXFe4W14+9Bgon42qr7sqSE94xPW0SLnxnIwXxyPHG3cGmH1mWZE89YRUclFuper
+KdkVcZWHxvzOay/LgVnt6duof7SlpY+lf2DMEart06vlSbVPv+GfSKPiZ+HPVo0=
+=/kPj
+-----END PGP SIGNATURE-----
diff --git a/app-arch/q7z/q7z-0.7.1-r1.ebuild b/app-arch/q7z/q7z-0.7.1-r1.ebuild
deleted file mode 100644
index 4d51d8239af0..000000000000
--- a/app-arch/q7z/q7z-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/q7z/q7z-0.7.1-r1.ebuild,v 1.1 2009/06/01 22:41:17 hwoarang Exp $
-
-EAPI="2"
-
-MY_PN="Q7Z"
-DESCRIPTION="A GUI frontend for p7zip"
-HOMEPAGE="http://k7z.sourceforge.net/7Z/Q7Z/"
-SRC_URI="mirror://sourceforge/k7z/${MY_PN}-${PV}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-DEPEND=">=dev-python/PyQt4-4.3[X]"
-RDEPEND="app-arch/p7zip
-	app-arch/tar
-	>=dev-python/PyQt4-4.3"
-
-S="${WORKDIR}/${MY_PN}/Build"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	rm ../Doc/COPYING.txt ../Doc/LICENCE.txt   # unneeded GPL copies
-	dodoc ../Doc/*
-	rm -rf "${D}"/usr/share/apps/Q7Z/Doc   # which is now superfluous
-}
diff --git a/app-arch/q7z/q7z-0.7.1.ebuild b/app-arch/q7z/q7z-0.7.1.ebuild
deleted file mode 100644
index 7fd0f060554a..000000000000
--- a/app-arch/q7z/q7z-0.7.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/q7z/q7z-0.7.1.ebuild,v 1.3 2008/10/05 11:30:38 flameeyes Exp $
-
-MY_PN="Q7Z"
-DESCRIPTION="A GUI frontend for p7zip"
-HOMEPAGE="http://k7z.sourceforge.net/7Z/Q7Z/"
-SRC_URI="mirror://sourceforge/k7z/${MY_PN}-${PV}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-DEPEND=">=dev-python/PyQt4-4.3"
-RDEPEND="app-arch/p7zip
-	app-arch/tar
-	>=dev-python/PyQt4-4.3"
-
-S="${WORKDIR}/${MY_PN}/Build"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	rm ../Doc/COPYING.txt ../Doc/LICENCE.txt   # unneeded GPL copies
-	dodoc ../Doc/*
-	rm -rf "${D}"/usr/share/apps/Q7Z/Doc   # which is now superfluous
-}
diff --git a/app-arch/q7z/q7z-0.8.0.ebuild b/app-arch/q7z/q7z-0.8.0.ebuild
index 81a8fda10ab7..ddd7bfbb7a25 100644
--- a/app-arch/q7z/q7z-0.8.0.ebuild
+++ b/app-arch/q7z/q7z-0.8.0.ebuild
@@ -1,9 +1,9 @@
-# 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/app-arch/q7z/q7z-0.8.0.ebuild,v 1.1 2009/06/06 23:28:35 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/q7z/q7z-0.8.0.ebuild,v 1.2 2010/03/20 19:03:20 spatz Exp $
 
 EAPI="2"
-NEED_PYTHON="2.5"
+PYTHON_DEPEND="2"
 inherit eutils python
 
 MY_PN="Q7Z"
@@ -25,6 +25,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_PN}/Build"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_prepare() {
 	cd ..
 
@@ -40,13 +44,13 @@ src_prepare() {
 	sed -i "s/${MY_PN}/${PN}/" "Desktop/Menu/${PN}.desktop" \
 		|| die "sed failed"
 
+	python_convert_shebangs -r 2 .
+
 	cd Source
 	mv "${MY_PN}.pyw" "${PN}.pyw"
 }
 
 src_install() {
-	python_version
-
 	cd ..
 
 	insinto "$(python_get_sitedir)/${PN}"