Hardcode python interpreter to python-2 in .py files where needed, set python ABI to 2, run cleanup in /usr/share/s-c-p

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

2 files changed, 30 insertions, 14 deletions

diff --git a/app-admin/system-config-printer-gnome/ChangeLog b/app-admin/system-config-printer-gnome/ChangeLog
index dad048a64152..e5f7908767fa 100644
--- a/app-admin/system-config-printer-gnome/ChangeLog
+++ b/app-admin/system-config-printer-gnome/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/system-config-printer-gnome
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.2 2010/03/12 17:03:59 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.3 2010/03/27 17:24:03 reavertm Exp $
+
+*system-config-printer-gnome-1.1.18-r1 (27 Mar 2010)
+
+  27 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -system-config-printer-gnome-1.1.18.ebuild,
+  +system-config-printer-gnome-1.1.18-r1.ebuild:
+  Hardcode python interpreter to python-2 in .py files where needed, set
+  python ABI to 2, run cleanup in /usr/share/s-c-p
 
 *system-config-printer-gnome-1.1.18 (11 Mar 2010)
 
diff --git a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.18.ebuild b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.18-r1.ebuild
index 8e74e95f63bf..3c5c595ee791 100644
--- a/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.18.ebuild
+++ b/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.18-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.18.ebuild,v 1.1 2010/03/12 17:03:59 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.18-r1.ebuild,v 1.1 2010/03/27 17:24:03 reavertm Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
 inherit python autotools
 
 MY_P="${PN%-gnome}-${PV}"
@@ -16,16 +17,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="gnome-keyring"
 
-COMMON_DEPEND="
-	dev-lang/python
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/xmlto
-	dev-util/intltool
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
 	>=app-admin/system-config-printer-common-${PV}
 	dev-python/libgnome-python
 	dev-python/notify-python
@@ -33,6 +25,12 @@ RDEPEND="${COMMON_DEPEND}
 	dev-python/pyxml
 	gnome-keyring? ( dev-python/gnome-keyring-python )
 "
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/xmlto
+	dev-util/intltool
+	sys-devel/gettext
+"
 
 APP_LINGUAS="ar as bg bn_IN bn bs ca cs cy da de el en_GB es et fa fi fr gu he
 hi hr hu hy id is it ja ka kn ko lo lv mai mk ml mr ms nb nl nn or pa pl pt_BR
@@ -43,6 +41,10 @@ done
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_prepare() {
 	epatch "${FILESDIR}/${P}-split.patch"
 
@@ -52,7 +54,7 @@ src_prepare() {
 src_configure() {
 	local myconf
 
-	# disable installation of translations when LINGUAS not chosen
+	# Disable installation of translations when LINGUAS not chosen
 	if [[ -z "${LINGUAS}" ]]; then
 		myconf="${myconf} --disable-nls"
 	else
@@ -66,4 +68,10 @@ src_install() {
 	dodoc AUTHORS ChangeLog README || die "dodoc failed"
 
 	emake DESTDIR="${D}" install || die "emake install failed"
+
+	python_convert_shebangs -q -r $(python_get_version) "${D}"usr/share/system-config-printer
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/system-config-printer
 }