Depend on python-2, run cleanup and convert python 'shebangs'

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

4 files changed, 43 insertions, 8 deletions

diff --git a/kde-base/system-config-printer-kde/ChangeLog b/kde-base/system-config-printer-kde/ChangeLog
index 1547d7365b26..f947929f9a34 100644
--- a/kde-base/system-config-printer-kde/ChangeLog
+++ b/kde-base/system-config-printer-kde/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/system-config-printer-kde
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/ChangeLog,v 1.19 2010/03/27 00:29:15 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/ChangeLog,v 1.20 2010/03/27 20:33:15 reavertm Exp $
+
+  27 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  system-config-printer-kde-4.4.0.ebuild,
+  system-config-printer-kde-4.4.1.ebuild:
+  Depend on python-2, run cleanup and convert python 'shebangs'
 
   27 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org>
   system-config-printer-kde-4.4.0.ebuild,
diff --git a/kde-base/system-config-printer-kde/Manifest b/kde-base/system-config-printer-kde/Manifest
index 7e375f50f997..4ab11066115b 100644
--- a/kde-base/system-config-printer-kde/Manifest
+++ b/kde-base/system-config-printer-kde/Manifest
@@ -6,7 +6,7 @@ DIST kdeadmin-4.4.1.tar.bz2 1430974 RMD160 de1c78e3fda376a0af6a901647dd2d18859c5
 EBUILD system-config-printer-kde-4.3.3.ebuild 603 RMD160 6b9720bd269bc93c8b1bfe72d5bcdcfe1342966f SHA1 e124ae04b49e80a8ea555c7f0c0c563200e159e6 SHA256 f27899ee3689da501663e50dc61a4fa4eb4403b46298fdcd1e5a754dd63b78de
 EBUILD system-config-printer-kde-4.3.4.ebuild 601 RMD160 3761f9e5f9c21a46a9958707216be2405c967ec0 SHA1 cc1097ba49fd5cec5050d7566a5725858f623df4 SHA256 a48e05aeabeb50cd1125c8886edb39f8056db16f1470072040f32c3035bbaf17
 EBUILD system-config-printer-kde-4.3.5.ebuild 605 RMD160 07f679d76422884216b9a73de567a3328947433c SHA1 ef4637503749e21cf872f86c2864d35ae303ed21 SHA256 69cb776a3fa32cf6ce3d4e80a7f71c8f878d096a6679c2db544e9c34e6aae115
-EBUILD system-config-printer-kde-4.4.0.ebuild 604 RMD160 2c0f5b9aab2336807d4c409a6781421dc699f33f SHA1 c6cf8e5e3c7ab0b4dac86fc6996778480febd9b1 SHA256 315584148775b797a71ebdbc135b97ae4256f0e3524a6b9b77423e74a2900c8f
-EBUILD system-config-printer-kde-4.4.1.ebuild 604 RMD160 c3f16953c2cd0467afb952b2b8bb8c09c04aec66 SHA1 703766ba20ed0fd4747c99d4df1e5abed49aca97 SHA256 d4abff41d6c11e378e96f3a2019c141f2462a21e5e8c1e27af52a2ccd98f96bd
-MISC ChangeLog 3036 RMD160 6532c57f9fee41e7508bd99c4d66c7c34fe790bd SHA1 ee087ccfb535b4c607807001295cd72bd5a26eeb SHA256 52cad8781ba1cb488ab9ea60ea948952f7efdcf6c54667c34dff8e807371ca56
+EBUILD system-config-printer-kde-4.4.0.ebuild 894 RMD160 1fb2783dba5aa13ea6839c68e643345735b003a5 SHA1 3f8cd79254a9d7eb51aabfb655b36a659f2b25ad SHA256 f1461b96fcabf6d0052a0023185718364c5f61ff40ec12d8e31c4305de4c6792
+EBUILD system-config-printer-kde-4.4.1.ebuild 894 RMD160 9a428f008f97705f31cc2961571a9e91d4faa97d SHA1 0afc18237b44dc72b97df079c8fcc541cf85c50d SHA256 569b475e5d2b44f12a21cd30a0af00c94f396026e93fc5b705b129a98932c898
+MISC ChangeLog 3239 RMD160 e728b5852ef4e37a790da6224cbaac5ce924aaf6 SHA1 71a1659617679d5f9e8e6f8f670d5f7f40f1682e SHA256 895cebff6edb3349edb1b34410f6ac6aa4a09981c81cb1ed860e26d15bd487d1
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.0.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.0.ebuild
index 5b1198e48d7f..700a6b35cdb4 100644
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.0.ebuild
+++ b/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.0.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.0.ebuild,v 1.2 2010/03/27 00:29:15 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.0.ebuild,v 1.3 2010/03/27 20:33:15 reavertm Exp $
 
 EAPI="2"
 
 KMNAME="kdeadmin"
-inherit kde4-meta python
+PYTHON_DEPEND="2"
+inherit python kde4-meta
 
 DESCRIPTION="KDE port of Red Hat's Gnome system-config-printer"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -19,3 +20,17 @@ DEPEND="
 RDEPEND="${DEPEND}
 	net-print/cups[dbus]
 "
+
+pkg_setup() {
+	kde4-meta_pkg_setup
+	python_set_active_version 2
+}
+
+src_install() {
+	kde4-meta_src_install
+	python_convert_shebangs -q -r $(python_get_version) "${ED}${PREFIX}/share/apps/${PN}"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${EPREFIX}${PREFIX}share/apps/${PN}"
+}
diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.1.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.1.ebuild
index 26fd648ad016..9e7ad390e56c 100644
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.1.ebuild
+++ b/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.1.ebuild,v 1.2 2010/03/27 00:29:15 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/system-config-printer-kde/system-config-printer-kde-4.4.1.ebuild,v 1.3 2010/03/27 20:33:15 reavertm Exp $
 
 EAPI="3"
 
 KMNAME="kdeadmin"
-inherit kde4-meta python
+PYTHON_DEPEND="2"
+inherit python kde4-meta
 
 DESCRIPTION="KDE port of Red Hat's Gnome system-config-printer"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -19,3 +20,17 @@ DEPEND="
 RDEPEND="${DEPEND}
 	net-print/cups[dbus]
 "
+
+pkg_setup() {
+	kde4-meta_pkg_setup
+	python_set_active_version 2
+}
+
+src_install() {
+	kde4-meta_src_install
+	python_convert_shebangs -q -r $(python_get_version) "${ED}${PREFIX}/share/apps/${PN}"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${EPREFIX}${PREFIX}share/apps/${PN}"
+}