Adjust python support to force python2, bug 317015.

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

3 files changed, 24 insertions, 17 deletions

diff --git a/x11-misc/glipper/ChangeLog b/x11-misc/glipper/ChangeLog
index c5d5b3b96c4a..d63bcf004a3f 100644
--- a/x11-misc/glipper/ChangeLog
+++ b/x11-misc/glipper/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/glipper
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/glipper/ChangeLog,v 1.16 2010/02/14 21:47:34 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/glipper/ChangeLog,v 1.17 2010/05/28 19:12:14 swegener Exp $
+
+  28 May 2010; Sven Wegener <swegener@gentoo.org> glipper-1.0-r3.ebuild:
+  Adjust python support to force python2, bug 317015.
 
   14 Feb 2010; Sven Wegener <swegener@gentoo.org> glipper-1.0-r3.ebuild:
   Remove pointless .la files, bug #305147.
diff --git a/x11-misc/glipper/Manifest b/x11-misc/glipper/Manifest
index b7927ba40387..3dd6a1d20f71 100644
--- a/x11-misc/glipper/Manifest
+++ b/x11-misc/glipper/Manifest
@@ -5,13 +5,13 @@ AUX glipper-1.0-binary-data.patch 2444 RMD160 f1ca36501fbe0b44c24b84adf86b3250e8
 AUX glipper-1.0-pkgconfig.patch 261 RMD160 17b86a3eec88e07994e06799124ed768b1054a68 SHA1 4bc3bb3b353a874638afc76adcce234baae07c81 SHA256 6786d051e358084c18daed79d2d1baef6dbf9bd7ac80bd03a9fef3821480b90b
 AUX glipper-1.0-transparent.patch 723 RMD160 44df90ada6e0ac21bd697701ed9fefeb5e84d509 SHA1 922c1f49eae16a07f808934be157ce43b3559001 SHA256 a9d275319334c13390a46062860ce4acf190b26e88d53ff17998be2b8efad658
 DIST glipper-1.0.tar.bz2 364805 RMD160 131b1c9e6ab1579b444fca47d5c3858bee8f3aef SHA1 66291124adf595bd5d53809958ac197c4f80ffb3 SHA256 6581f1ed074a98deafa492c0f4aec834b4733df8f4b6812511937ad31bf15ceb
-EBUILD glipper-1.0-r3.ebuild 1571 RMD160 4898810d37bc80fa69e8e1316edf4b45aaa4ef27 SHA1 c13329e475730f48cbb64fc9dbc8e4c04c9e4fb9 SHA256 b69d72762482ebe20d3103f36977370b504b23c76eb74e6641318abe9301ca08
-MISC ChangeLog 2899 RMD160 18057fa6a39b1fa0b574d237fc354f9d91c6289a SHA1 dd7816a6e00a81fb645b10d944bc1448291bc9e2 SHA256 e61db67959a779e363fe5c44367198ee2828244715163377f5025785a3f27d3a
+EBUILD glipper-1.0-r3.ebuild 1573 RMD160 93740e476f6357c26d53f5467e6eb59c78d24176 SHA1 0b198d2840649c07361ebc1e6bfdc35715690f21 SHA256 1b5d7ca40f68ac363da1f5f05f1aec1110ca3f886fece1980a51d0f7ad7adcb6
+MISC ChangeLog 3027 RMD160 ac0e5c6bae25054ae3f0c29b41e5ced13485dd56 SHA1 0513c72e6d8d112422d4384fd21b40c83264f74c SHA256 9020f902f67885c619a79ddf0058e675700a607de47630efa0c0170c2d6c1907
 MISC metadata.xml 270 RMD160 01cecefd41441cf3f8bd37ead6ec864b154be2d7 SHA1 6762f98354ff738ecbe57163b0bbfe9c95dabf15 SHA256 2f9cdcca7aeb9551225d2854c8b3ab2048a1a6c9424b1cceb67db2bd030d4602
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkt4b3wACgkQI1lqEGTUzyTZIgCgrYmLRzv4y61sAA/l06I292wU
-GEgAnjvEa3oWZ6lAd36tuN49E46+2tan
-=0OrT
+iEYEARECAAYFAkwAFZUACgkQI1lqEGTUzyTypACfWMVJPPZp+UMlQk81xvJG7nnm
+1vgAn1VasyaHr8derCczwjYgMB4Et1tG
+=FTJt
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/glipper/glipper-1.0-r3.ebuild b/x11-misc/glipper/glipper-1.0-r3.ebuild
index ce8b8cc6c903..8de22d514865 100644
--- a/x11-misc/glipper/glipper-1.0-r3.ebuild
+++ b/x11-misc/glipper/glipper-1.0-r3.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/glipper/glipper-1.0-r3.ebuild,v 1.2 2010/02/14 21:47:34 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/glipper/glipper-1.0-r3.ebuild,v 1.3 2010/05/28 19:12:14 swegener Exp $
+
+EAPI="2"
 
 GCONF_DEBUG="no"
+PYTHON_DEPEND="2"
 
 inherit gnome2 python eutils multilib
 
@@ -15,8 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=dev-lang/python-2.4
-	>=dev-python/pygobject-2.6
+DEPEND=">=dev-python/pygobject-2.6
 	>=dev-python/pygtk-2.6
 	>=dev-python/gconf-python-2.22.0
 	>=dev-python/libgnome-python-2.22.0
@@ -29,10 +31,12 @@ RESTRICT="test"
 
 DOCS="AUTHORS ChangeLog NEWS"
 
-src_unpack() {
-	gnome2_src_unpack
-	cd "${S}"
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
 
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-binary-data.patch
 	epatch "${FILESDIR}"/${P}-transparent.patch
 	epatch "${FILESDIR}"/${P}-pkgconfig.patch
@@ -40,16 +44,16 @@ src_unpack() {
 
 src_install() {
 	gnome2_src_install py_compile=true
-	python_version
+
+	python_convert_shebangs 2 "${D}"/usr/$(get_libdir)/glipper/glipper
 
 	# remove pointless .la files, bug #305147
-	rm -f "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/glipper/{keybinder/_keybinder,osutils/_osutils}.la
+	rm -f "${D}$(python_get_sitedir)"/glipper/{keybinder/_keybinder,osutils/_osutils}.la
 }
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/glipper
+	python_mod_optimize glipper
 
 	elog "Glipper has been completely rewritten as a panel applet. Please remove your"
 	elog "existing ~/.glipper directory and then add glipper as a new panel applet."