Hardcode python interpreter to python-2 in .py files where needed, set python ABI...

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

diff --git a/app-admin/system-config-printer-gnome/ChangeLog b/app-admin/system-config-printer-gnome/ChangeLog
index dad048a64152d40733ea54eeb5125df7b4905938..e5f7908767fafc2f3f62c67484d3f6bcbf71dfc9 100644 (file)
--- 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/Manifest b/app-admin/system-config-printer-gnome/Manifest
index 1c977fa0cf1418c55e392d8a51df0149c9548b5d..2fa62a8c413adf9b7af809429b67b73235c8d983 100644 (file)
--- a/app-admin/system-config-printer-gnome/Manifest
+++ b/app-admin/system-config-printer-gnome/Manifest
@@ -1,5 +1,5 @@
 AUX system-config-printer-gnome-1.1.18-split.patch 3957 RMD160 853e121d1a5c9e29bcd774e649cbd2d98bd0b4ca SHA1 83a02bee831f58eb6a2f9a988833c753841fc4b6 SHA256 7856c45180c526aceec4fbb47e1f9833d3a9cb56da5a765bd012fceaa72d1be3
 DIST system-config-printer-1.1.18.tar.bz2 1041454 RMD160 6aa621e7d21c9fec4dacd5ff121bbd5cc2c479f5 SHA1 b57c7a401b8d82612c8496edd94d46d651c6019e SHA256 66ef4efc9c2c0a2da8f1c47779098eafafa57791f2806549d8358b2523bff5d0
-EBUILD system-config-printer-gnome-1.1.18.ebuild 1756 RMD160 bea1a15afc14496a486519f2337c529cf696a3df SHA1 5e159a0e29d6e72636826d03e540d046caac7e2a SHA256 ac2d0b76a213b27a718c77ccd31da852a89ad5b946773ed58cfc962535cddf21
-MISC ChangeLog 843 RMD160 dc27a41553eb9140b41915ad9848ba97279d5cd2 SHA1 394ee91e67e2b9a3a9d6d0041653fffe67de4ae0 SHA256 9601d70e8a9d4998315018abfa2d22800e0894bf7339704a1ab489224a352d11
+EBUILD system-config-printer-gnome-1.1.18-r1.ebuild 1929 RMD160 734877ef13103663b6906cee4e305339d2706d0b SHA1 54434e35fb916a1fd6c5ace7382af40cdadf18df SHA256 ada16b8dc3979aa398d3bf7582bb79c737a8e267f60efbd0e0856f4693c08ca1
+MISC ChangeLog 1171 RMD160 b55c33bd64935674942cd24fbbd6aae00a790419 SHA1 7d8edb79803c891b33f7abf0e290d29259029a61 SHA256 1020e3ba22db68e4e48c8335def6d653554a12dc28e85a772f0562848870ba56
 MISC metadata.xml 254 RMD160 be5b2268822666a03bff56bc20c85795772aa681 SHA1 9549afc09d047f3ded7142e747c1389a4a56403d SHA256 b6dc3cc192a99a1d968bf9fc1c332b37d1ffb6854aa99f8f82fc31946eeb3ad5

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
similarity index 78%
rename from app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.18.ebuild
rename to app-admin/system-config-printer-gnome/system-config-printer-gnome-1.1.18-r1.ebuild
index 8e74e95f63bf453c83251db175936985f4d9563c..3c5c595ee7914e270b9b28cb6f9817e5751891c6 100644 (file)
--- 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
 }