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

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

4 files changed, 42 insertions, 8 deletions

diff --git a/kde-base/printer-applet/ChangeLog b/kde-base/printer-applet/ChangeLog
index 7d84229c7fe0..6e49d12fc9fb 100644
--- a/kde-base/printer-applet/ChangeLog
+++ b/kde-base/printer-applet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/printer-applet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/printer-applet/ChangeLog,v 1.21 2010/03/27 00:31:01 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/printer-applet/ChangeLog,v 1.22 2010/03/27 20:25:48 reavertm Exp $
+
+  27 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  printer-applet-4.4.0.ebuild, printer-applet-4.4.1.ebuild:
+  Depend on python-2, run cleanup and convert python 'shebangs'
 
   27 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org>
   printer-applet-4.4.0.ebuild, printer-applet-4.4.1.ebuild:
diff --git a/kde-base/printer-applet/Manifest b/kde-base/printer-applet/Manifest
index 5c7819d413ee..2f2249c358d7 100644
--- a/kde-base/printer-applet/Manifest
+++ b/kde-base/printer-applet/Manifest
@@ -6,7 +6,7 @@ DIST kdeutils-4.4.1.tar.bz2 2692100 RMD160 aaf8b9f46425d3a4603014747dde4e7fc3141
 EBUILD printer-applet-4.3.3.ebuild 988 RMD160 dde195c4cb10b30b7e9dbc441087f1f250276b1d SHA1 9e21352069bbd68c34e1c2b0b7fb942e0ad967f4 SHA256 7ab5afafcf85ce4485b21602b67895d66eddfd065e44047149d27e5a60ec469a
 EBUILD printer-applet-4.3.4.ebuild 987 RMD160 40d4800fcf39679f147350b8bb93b37aa184d9b0 SHA1 1c53ce9ecfbc4c3e7ad2f2ad3bbce82e4a0ca652 SHA256 e0682c33a60132ffc81dcf5d38b9c1f385594e3e1bb49c47c15dc949223376ce
 EBUILD printer-applet-4.3.5.ebuild 991 RMD160 c0a13922230c545e15d2ca3f2dec8bdd2e9c9e7a SHA1 5c2609eb7c16586dd39e3d887ed716019ca9c737 SHA256 107b39b3efe8e525a7d3a933f9a09c1b7deb6712b32ef41cfcd19b9c718d0a9b
-EBUILD printer-applet-4.4.0.ebuild 990 RMD160 e1777679643985fdfb82ee1e0535b72cde55285e SHA1 1400688df416a9536ac3bdcc904682ce2b1a92a8 SHA256 736ff166379d84e665ca8f9c9aff24a0c936387a6e3def9f17767adf1065e041
-EBUILD printer-applet-4.4.1.ebuild 990 RMD160 ec402fcc5c79fb805ee2e04aa5f939605d6eae89 SHA1 a9a606caff5939d9b2f23e240008b0eadaee2693 SHA256 8712fed539896d9af6eec816652185a8ce129b513dcd1734742a16309d4026bf
-MISC ChangeLog 2869 RMD160 38b54ae2a8ae6eee77870b6a18534355a2a27737 SHA1 1f4802a11c3f5fb16b6e004818b5fc008995c6bd SHA256 f21cc1f93c222bab76a4a21b3bdd2df7184b3ecfb5dd457f969e3400bda674f6
+EBUILD printer-applet-4.4.0.ebuild 1287 RMD160 d37e4be94a06b16ca321bb0243c69908f70c82e0 SHA1 55662d03599ea7f12522bf67a37369682bee0755 SHA256 ac60a873c61e2a60caedb2d680ed0b2899613217eb43b737bc2766d23ab757b2
+EBUILD printer-applet-4.4.1.ebuild 1287 RMD160 318539d609d1cec07cc1fc64c19f8406a9993679 SHA1 586da938dd3afaee5310880757fac3a3f278eaba SHA256 c0f92dff7c42f02f81a40016fc0a1a29deb01afbea54237116520664a51e8a3d
+MISC ChangeLog 3048 RMD160 0ad8170c810e8631f6b73e9e7223b2f1570d15e6 SHA1 eb248e411856c21c8c78362278becd515b0bf4ff SHA256 45b7439913f61a058e697f169d1d0d13cc21bc301eb4cfe9dab100b38276e847
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/printer-applet/printer-applet-4.4.0.ebuild b/kde-base/printer-applet/printer-applet-4.4.0.ebuild
index ea5ccc899091..2ff6d7d772f0 100644
--- a/kde-base/printer-applet/printer-applet-4.4.0.ebuild
+++ b/kde-base/printer-applet/printer-applet-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/printer-applet/printer-applet-4.4.0.ebuild,v 1.2 2010/03/27 00:31:01 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/printer-applet/printer-applet-4.4.0.ebuild,v 1.3 2010/03/27 20:25:48 reavertm Exp $
 
 EAPI="2"
 
 KMNAME="kdeutils"
-inherit kde4-meta
+PYTHON_DEPEND="2"
+inherit python kde4-meta
 
 DESCRIPTION="KDE printer system tray utility"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -18,6 +19,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+pkg_setup() {
+	kde4-meta_pkg_setup
+	python_set_active_version 2
+}
+
 src_prepare() {
 	kde4-meta_src_prepare
 
@@ -29,3 +35,12 @@ src_prepare() {
 	sed -e "/Exec/s/printer-applet/${newname}/" \
 		-i "${PN}"/printer-applet.desktop || die "failed to patch .desktop file"
 }
+
+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/printer-applet/printer-applet-4.4.1.ebuild b/kde-base/printer-applet/printer-applet-4.4.1.ebuild
index 192b72bcf846..a0afa9144a7d 100644
--- a/kde-base/printer-applet/printer-applet-4.4.1.ebuild
+++ b/kde-base/printer-applet/printer-applet-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/printer-applet/printer-applet-4.4.1.ebuild,v 1.2 2010/03/27 00:31:01 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/printer-applet/printer-applet-4.4.1.ebuild,v 1.3 2010/03/27 20:25:48 reavertm Exp $
 
 EAPI="3"
 
 KMNAME="kdeutils"
-inherit kde4-meta
+PYTHON_DEPEND="2"
+inherit python kde4-meta
 
 DESCRIPTION="KDE printer system tray utility"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -18,6 +19,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+pkg_setup() {
+	kde4-meta_pkg_setup
+	python_set_active_version 2
+}
+
 src_prepare() {
 	kde4-meta_src_prepare
 
@@ -29,3 +35,12 @@ src_prepare() {
 	sed -e "/Exec/s/printer-applet/${newname}/" \
 		-i "${PN}"/printer-applet.desktop || die "failed to patch .desktop file"
 }
+
+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}"
+}