Improve python handling (bug #317003), thanks a lot to Arfrever Frehtes Taifersar Arahesis for this help. Remove old

(Portage version: 2.1.9.25/cvs/Linux x86_64)

3 files changed, 21 insertions, 57 deletions

diff --git a/x11-misc/alacarte/ChangeLog b/x11-misc/alacarte/ChangeLog
index f0da168c62c5..aa62e3e6dd8f 100644
--- a/x11-misc/alacarte/ChangeLog
+++ b/x11-misc/alacarte/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/alacarte
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.101 2010/10/09 10:33:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.102 2010/12/08 20:52:52 pacho Exp $
+
+  08 Dec 2010; Pacho Ramos <pacho@gentoo.org> -alacarte-0.12.1.ebuild,
+  alacarte-0.13.2.ebuild:
+  Improve python handling (bug #317003), thanks a lot to Arfrever Frehtes
+  Taifersar Arahesis for this help.
 
   09 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
   alacarte-0.12.4.ebuild:
diff --git a/x11-misc/alacarte/alacarte-0.12.1.ebuild b/x11-misc/alacarte/alacarte-0.12.1.ebuild
deleted file mode 100644
index d504bc90b268..000000000000
--- a/x11-misc/alacarte/alacarte-0.12.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.12.1.ebuild,v 1.9 2010/07/19 23:48:35 jer Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 python
-
-DESCRIPTION="Simple GNOME menu editor"
-HOMEPAGE="http://www.realistanew.com/projects/alacarte"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-SLOT=0
-
-common_depends=">=dev-lang/python-2.4
-	>=dev-python/pygobject-2.15.1
-	>=dev-python/pygtk-2.13
-	>=gnome-base/gnome-menus-2.22.2[python]"
-
-RDEPEND="${common_depends}
-	>=gnome-base/gnome-panel-2.16"
-
-DEPEND="${common_depends}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0
-	>=dev-util/pkgconfig-0.19"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_need_rebuild
-	python_mod_optimize $(python_get_sitedir)/Alacarte
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/Alacarte
-}
diff --git a/x11-misc/alacarte/alacarte-0.13.2.ebuild b/x11-misc/alacarte/alacarte-0.13.2.ebuild
index 237c418068e9..6184f462b1f1 100644
--- a/x11-misc/alacarte/alacarte-0.13.2.ebuild
+++ b/x11-misc/alacarte/alacarte-0.13.2.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.13.2.ebuild,v 1.1 2010/09/16 20:41:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.13.2.ebuild,v 1.2 2010/12/08 20:52:52 pacho Exp $
 
-EAPI="2"
+EAPI="3"
 GCONF_DEBUG="no"
+PYTHON_DEPEND="2"
 
 inherit gnome2 python
 
@@ -15,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
 SLOT=0
 
-common_depends=">=dev-lang/python-2.4
+common_depends="
 	>=dev-python/pygobject-2.15.1
 	>=dev-python/pygtk-2.13
 	>=gnome-base/gnome-menus-2.27.92[python]"
@@ -28,7 +29,11 @@ DEPEND="${common_depends}
 	>=dev-util/intltool-0.40.0
 	>=dev-util/pkgconfig-0.19"
 
-DOCS="AUTHORS ChangeLog NEWS README"
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	python_set_active_version 2
+	python_pkg_setup
+}
 
 src_prepare() {
 	gnome2_src_prepare
@@ -38,13 +43,17 @@ src_prepare() {
 	ln -s $(type -P true) py-compile
 }
 
+src_configure() {
+	PYTHON="$(PYTHON -a)" gnome2_src_configure
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
 	python_need_rebuild
-	python_mod_optimize $(python_get_sitedir)/Alacarte
+	python_mod_optimize Alacarte
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/Alacarte
+	python_mod_cleanup Alacarte
 }