Depend on python-2, explicitly compile bytecode in /usr/share/system-config-printer, patch by Arfrever

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

3 files changed, 27 insertions, 5 deletions

diff --git a/app-admin/system-config-printer-common/ChangeLog b/app-admin/system-config-printer-common/ChangeLog
index a26c75af58fa..a0b88a4eb1f5 100644
--- a/app-admin/system-config-printer-common/ChangeLog
+++ b/app-admin/system-config-printer-common/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/system-config-printer-common
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.12 2010/03/11 01:44:07 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.13 2010/03/27 15:44:48 reavertm Exp $
+
+*system-config-printer-common-1.1.18-r1 (27 Mar 2010)
+
+  27 Mar 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -system-config-printer-common-1.1.18.ebuild,
+  +system-config-printer-common-1.1.18-r1.ebuild:
+  Depend on python-2, explicitly compile bytecode in
+  /usr/share/system-config-printer, patch by Arfrever
 
 *system-config-printer-common-1.1.18 (11 Mar 2010)
 
diff --git a/app-admin/system-config-printer-common/Manifest b/app-admin/system-config-printer-common/Manifest
index f6419ed3b6c0..039fd46ad59c 100644
--- a/app-admin/system-config-printer-common/Manifest
+++ b/app-admin/system-config-printer-common/Manifest
@@ -3,6 +3,6 @@ AUX system-config-printer-common-1.1.18-split.patch 5115 RMD160 3e7eb282f434221f
 DIST system-config-printer-1.1.13.tar.bz2 1014102 RMD160 eaa7b24bc30719a836749c06f72eb502b2fe5ac5 SHA1 9a193cca59f07dd1da97c7a76d26a33c1c57df21 SHA256 6842e337101dd7924d0c02317eff3b2b32d42a6ba7a70ae51fa8ebd51db15da2
 DIST system-config-printer-1.1.18.tar.bz2 1041454 RMD160 6aa621e7d21c9fec4dacd5ff121bbd5cc2c479f5 SHA1 b57c7a401b8d82612c8496edd94d46d651c6019e SHA256 66ef4efc9c2c0a2da8f1c47779098eafafa57791f2806549d8358b2523bff5d0
 EBUILD system-config-printer-common-1.1.13.ebuild 1353 RMD160 2cc7bd3908a6fcd667164022da9ea7e7ce338a71 SHA1 2ab5154fd1fefbd175a3c9749f5ede136b1bd1bc SHA256 cee1b4481d77439b5d26d0a949321e06c8700a24ac9293018b17aaaa94f4a4db
-EBUILD system-config-printer-common-1.1.18.ebuild 1484 RMD160 120233f8d4fccfe620504c3d3f6fb58edb665ed0 SHA1 924e89d740cabb36373977c97e11320f5e9287c5 SHA256 d440b126502a3b7a5c981e3b4433065b192bea55de54419e2a1c4ad98a4a041c
-MISC ChangeLog 2658 RMD160 9dcd9a50e73457935e9a05fd855dea433f92ca35 SHA1 9cbcca64f632e1624a5c25ffa3f7121546aa00c4 SHA256 825c46c3e163bb6e8153b40d6e0e348b7f0e3bfc8b1b8b1bd190c9eae770583e
+EBUILD system-config-printer-common-1.1.18-r1.ebuild 1721 RMD160 d08cc6c740e85520573f121fb1adc47de0c2a2cb SHA1 3bcffacfe7146c5a770e3b2676da3bb574588dcc SHA256 1d6783795b56af2239dd51c7bc2ac4e01c4875b35a089280b5e581e3be37f3cf
+MISC ChangeLog 2972 RMD160 214257407dff16b7aafb0608472ce9792f5deaf7 SHA1 601339d9e7d7f9bb5366ca7ae97e46cdb1ae82c7 SHA256 d2187668251a237485ef0ad815990382e217a71f53ffcf76f4420a3ffca4a772
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/app-admin/system-config-printer-common/system-config-printer-common-1.1.18.ebuild b/app-admin/system-config-printer-common/system-config-printer-common-1.1.18-r1.ebuild
index e09f533e0d1c..1f2b965133f1 100644
--- a/app-admin/system-config-printer-common/system-config-printer-common-1.1.18.ebuild
+++ b/app-admin/system-config-printer-common/system-config-printer-common-1.1.18-r1.ebuild
@@ -1,8 +1,10 @@
 # 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-common/system-config-printer-common-1.1.18.ebuild,v 1.1 2010/03/11 01:44:07 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.1.18-r1.ebuild,v 1.1 2010/03/27 15:44:48 reavertm Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
 
-EAPI="2"
 inherit python autotools
 
 MY_P="${PN%-common}-${PV}"
@@ -35,6 +37,10 @@ RDEPEND="${COMMON_DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_prepare() {
 	epatch "${FILESDIR}/${P}-split.patch"
 
@@ -63,3 +69,11 @@ src_install() {
 
 	emake DESTDIR="${D}" install || die "emake install failed"
 }
+
+pkg_postinst() {
+	python_mod_optimize cupshelpers /usr/share/system-config-printer
+}
+
+pkg_postrm() {
+	python_mod_cleanup cupshelpers /usr/share/system-config-printer
+}