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.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 17 insertions, 59 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/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}"