Support mulitple-python installations, bug #313447. Clean up old revisions.

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

5 files changed, 29 insertions, 171 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 92d40d258e55..33df36aa483d 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-menus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.158 2010/10/17 15:16:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.159 2010/11/08 22:08:18 eva Exp $
+
+  08 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-menus-2.26.2.ebuild, -gnome-menus-2.28.0.1.ebuild,
+  gnome-menus-2.30.4.ebuild:
+  Support mulitple-python installations, bug #313447. Clean up old
+  revisions.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org>
   gnome-menus-2.30.2-r1.ebuild:
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index c58729ba3d6e..f3bd7970c5d6 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,15 +1,11 @@
 AUX 10-xdg-menu-gnome 115 RMD160 3e235da94ec1e7f97be144358f105d24ca8144e8 SHA1 f4d0e6dff08acd5b06531973f1f68b5f4a640240 SHA256 d6a4938ed879f908e93d0c917db4c99321cb6fa126b79fe1e878ff2ddade963b
 AUX gnome-menus-2.18.3-ignore_kde_standalone.patch 1208 RMD160 302201bbc2a9b4d6a673904d11ce60390268b4b5 SHA1 58880f2807bc6a11a724a15c4f626f7385e650be SHA256 6b13ae1708b5d4753f38e57e161e58bd31d0b7a9de8b78145052388b150eedb8
 AUX gnome-menus-2.30.2-XDG_MENU_PREFIX-fix.patch 1240 RMD160 a7110e0e80fb4e1a87eef3a057a7346ed552807b SHA1 9923318bc624712d42f85d406a1dc40c7bca3ad9 SHA256 b094d0cd36d3146d19da94de5b46188da468ef11bfa452c3c35268e446290b95
-DIST gnome-menus-2.26.2.tar.bz2 438945 RMD160 a3b526d908448c52737edecb8f83c6c99e0d72e9 SHA1 ab914a083ef63bacd960349b3dee3dbd3a005a82 SHA256 c9709695819ffaea92d41647adef8c0a6a408aa9a725e4b2987273bb06115a1c
-DIST gnome-menus-2.28.0.1.tar.bz2 461356 RMD160 9d74e64375c4c14c347dbbbe010035ccb3a7b5b0 SHA1 af3469cc2ffd41aad3e3931176e17e9c91e94a29 SHA256 75e73554cd0b0a8356956e76ccb517def5382eafa7bdb14336499cd271570dbc
 DIST gnome-menus-2.30.2.tar.bz2 464086 RMD160 cbc2f5aaf529e385c835de84d6284803280494a9 SHA1 edbc9b9fc4e86f5cc772011ea768ba9487625d67 SHA256 3cfb41586cda5892aea929ff9b327cbabc37a15971fdc6c6d4334d2488bb3233
 DIST gnome-menus-2.30.3.tar.bz2 469400 RMD160 3afc1c25bb8e989343a8ea2ed66097705d6e8aa8 SHA1 b9812c022ce35163b89fa056508918de3a4910c4 SHA256 3a823a22949996cc9d7e814e8c460ea447c18ddf5eae113fc0cfe20fc8874150
 DIST gnome-menus-2.30.4.tar.bz2 470390 RMD160 cafb5d26ed94324cf85bef10973f141eabc6fdeb SHA1 26f07b9549952c0a2c2b8374e29d9a5d60bfd4ba SHA256 31797d73c93ec4f3082d8447c6c2b6dc29009c4a4f3ac7075999c387dc4b0c9e
-EBUILD gnome-menus-2.26.2.ebuild 2081 RMD160 76c30adaf2be3b0ecc62cd93caa5f8d0e8d0707f SHA1 04e8279b77692d6ebc04850d343a14e7b44e1a50 SHA256 b4ad208e4b66376356ce0a09be1f53d91dea497a37a9b35eeae6fd988553f9d2
-EBUILD gnome-menus-2.28.0.1.ebuild 2153 RMD160 e45a9f91db6bc99521b7f693c3b87c21a66e65b8 SHA1 862d018d92b318607ae8c9b70354fe6930b54209 SHA256 24b54cd336a75a164da757b27e190653c13ecd8428d34b1b3e268362cb5e8222
 EBUILD gnome-menus-2.30.2-r1.ebuild 2457 RMD160 1a981fc64429eadf309fe0ced5d9773b208b493d SHA1 3bf1163d7f3e53bdebaa71f103d364a38a8b3003 SHA256 4bc22be21fc519e9462a07cd2157619d493c4560b16fc8e9f10121fc1e43d25f
 EBUILD gnome-menus-2.30.3.ebuild 2381 RMD160 e6ea3051cf17f1bd6633e335710447d2d5c695d9 SHA1 df1c0ca33f7658f5cdaa9f332d94369e62f8466d SHA256 7439d8fe67c959d9c74c05d0bfe18f20312d38d5838c3907d198fcc8d956b01e
-EBUILD gnome-menus-2.30.4.ebuild 2315 RMD160 74335da5a90081154517e69f4724e284feafbddf SHA1 eca871af9401e8754de3ea81959e2d60570c57f9 SHA256 b11fba74867ae428112e88c203f211d5d0b80117080ea3a567e3d7f77dc7838e
-MISC ChangeLog 21275 RMD160 f0fefef6559a18b746d8ef9077efede4d5300a89 SHA1 5350aa84a2a86d1d74fb6c8a7de70d9faebdb411 SHA256 f05ba0acdc2900a58c04a99290475e6e30c534859cc2253a42c09bd9763a0f27
+EBUILD gnome-menus-2.30.4.ebuild 2453 RMD160 b7841340e823af5c887a69d3c74b047b70385e37 SHA1 e2bd18ab5447330885c335658d58c3ef01cae3bd SHA256 7ba5b91fd1556b3fbdf59f1a0392c40d24a9af2f5a86418fb4862d4b42d67ce6
+MISC ChangeLog 21495 RMD160 47095c06f7f9e0aa7d6e794b5502516e4bffc4c8 SHA1 7b9ba8ca4f174f2630debc2088760cd7effdd699 SHA256 14551b5d8a5464aa878068e27aced5ca0ef7ed35b59361f33ff989690097d09a
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
diff --git a/gnome-base/gnome-menus/gnome-menus-2.26.2.ebuild b/gnome-base/gnome-menus/gnome-menus-2.26.2.ebuild
deleted file mode 100644
index 0754723ad415..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-2.26.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.26.2.ebuild,v 1.13 2010/07/20 01:51:05 jer Exp $
-
-inherit eutils gnome2 python
-
-DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug python"
-
-RDEPEND=">=dev-libs/glib-2.18.0
-	python? (
-		>=dev-lang/python-2.4.4-r5
-		dev-python/pygtk )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	# Do NOT compile with --disable-debug/--enable-debug=no
-	# FIXME: fix autofoo and report upstream
-	if use debug ; then
-		G2CONF="${G2CONF} --enable-debug=yes"
-	fi
-
-	G2CONF="${G2CONF} $(use_enable python) --disable-static"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Don't show KDE standalone settings desktop files in GNOME others menu
-	epatch "${FILESDIR}/${PN}-2.18.3-ignore_kde_standalone.patch"
-
-	# disable pyc compiling
-	mv py-compile py-compile-disabled
-	ln -s $(type -P true) py-compile
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Prefix menu, bug #256614
-	mv "${D}"/etc/xdg/menus/applications.menu \
-		"${D}"/etc/xdg/menus/gnome-applications.menu || die "menu move failed"
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/10-xdg-menu-gnome" || die "doexe failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize $(python_get_sitedir)/GMenuSimpleEditor
-	fi
-
-	ewarn "Due to bug #256614, you might lose icons in applications menus."
-	ewarn "If you use a login manager, please re-select your session."
-	ewarn "If you use startx and have no .xinitrc, just export XSESSION=Gnome."
-	ewarn "If you use startx and have .xinitrc, export XDG_MENU_PREFIX=gnome-."
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	if use python; then
-		python_mod_cleanup $(python_get_sitedir)/GMenuSimpleEditor
-	fi
-}
diff --git a/gnome-base/gnome-menus/gnome-menus-2.28.0.1.ebuild b/gnome-base/gnome-menus/gnome-menus-2.28.0.1.ebuild
deleted file mode 100644
index ef8f695f61c0..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-2.28.0.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.28.0.1.ebuild,v 1.9 2010/08/18 22:00:09 maekke Exp $
-
-inherit eutils gnome2 python
-
-DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug python"
-
-RDEPEND=">=dev-libs/glib-2.18.0
-	python? (
-		>=dev-lang/python-2.4.4-r5
-		dev-python/pygtk )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	# Do NOT compile with --disable-debug/--enable-debug=no
-	# It disables api usage checks
-	if ! use debug ; then
-		G2CONF="${G2CONF} --enable-debug=minimum"
-	fi
-
-	G2CONF="${G2CONF} $(use_enable python) --disable-static"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Don't show KDE standalone settings desktop files in GNOME others menu
-	epatch "${FILESDIR}/${PN}-2.18.3-ignore_kde_standalone.patch"
-
-	# disable pyc compiling
-	mv py-compile py-compile-disabled
-	ln -s $(type -P true) py-compile
-}
-
-src_install() {
-	gnome2_src_install
-
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
-
-	# Prefix menu, bug #256614
-	mv "${D}"/etc/xdg/menus/applications.menu \
-		"${D}"/etc/xdg/menus/gnome-applications.menu || die "menu move failed"
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/10-xdg-menu-gnome" || die "doexe failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_need_rebuild
-		python_mod_optimize $(python_get_sitedir)/GMenuSimpleEditor
-	fi
-
-	ewarn "Due to bug #256614, you might lose icons in applications menus."
-	ewarn "If you use a login manager, please re-select your session."
-	ewarn "If you use startx and have no .xinitrc, just export XSESSION=Gnome."
-	ewarn "If you use startx and have .xinitrc, export XDG_MENU_PREFIX=gnome-."
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	if use python; then
-		python_mod_cleanup $(python_get_sitedir)/GMenuSimpleEditor
-	fi
-}
diff --git a/gnome-base/gnome-menus/gnome-menus-2.30.4.ebuild b/gnome-base/gnome-menus/gnome-menus-2.30.4.ebuild
index bc35a787980f..e359097572c6 100644
--- a/gnome-base/gnome-menus/gnome-menus-2.30.4.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-2.30.4.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.30.4.ebuild,v 1.1 2010/09/27 21:37:00 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.30.4.ebuild,v 1.2 2010/11/08 22:08:18 eva Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2:2.4"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 
 inherit eutils gnome2 python
 
@@ -23,9 +25,9 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.40"
 
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
 	# Do NOT compile with --disable-debug/--enable-debug=no
 	# It disables api usage checks
 	if ! use debug ; then
@@ -47,16 +49,25 @@ src_prepare() {
 	# disable pyc compiling
 	mv py-compile py-compile-disabled
 	ln -s $(type -P true) py-compile
+
+	python_copy_sources
 }
 
 src_configure() {
-	gnome2_src_configure
+	python_execute_function -s gnome2_src_configure
 }
 
-src_install() {
-	gnome2_src_install
+src_compile() {
+	python_execute_function -s gnome2_src_compile
+}
+
+src_test() {
+	python_execute_function -s -d
+}
 
-	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+src_install() {
+	python_execute_function -s gnome2_src_install
+	python_clean_installation_image
 
 	# Prefix menu, bug #256614
 	mv "${D}"/etc/xdg/menus/applications.menu \
@@ -69,8 +80,7 @@ src_install() {
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if use python; then
-		python_need_rebuild
-		python_mod_optimize $(python_get_sitedir)/GMenuSimpleEditor
+		python_mod_optimize GMenuSimpleEditor
 	fi
 
 	ewarn "Due to bug #256614, you might lose icons in applications menus."
@@ -82,6 +92,6 @@ pkg_postinst() {
 pkg_postrm() {
 	gnome2_pkg_postrm
 	if use python; then
-		python_mod_cleanup $(python_get_sitedir)/GMenuSimpleEditor
+		python_mod_cleanup GMenuSimpleEditor
 	fi
 }