Clean up old revisions.

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

5 files changed, 11 insertions, 223 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 911546099876..f1ed52197d6d 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.166 2011/04/05 05:33:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.167 2011/04/08 12:06:32 eva Exp $
+
+  08 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-menus-2.30.2-r1.ebuild,
+  -files/gnome-menus-2.30.2-XDG_MENU_PREFIX-fix.patch,
+  -gnome-menus-2.30.4.ebuild:
+  Clean up old revisions.
 
   05 Apr 2011; Ulrich Mueller <ulm@gentoo.org> gnome-menus-2.30.2-r1.ebuild:
   Depend on dev-lang/python because virtual/python will go away, bug 358849.
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index cafab457cc55..26fa9ac33990 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -3,19 +3,14 @@ Hash: SHA1
 
 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.30.2.tar.bz2 464086 RMD160 cbc2f5aaf529e385c835de84d6284803280494a9 SHA1 edbc9b9fc4e86f5cc772011ea768ba9487625d67 SHA256 3cfb41586cda5892aea929ff9b327cbabc37a15971fdc6c6d4334d2488bb3233
-DIST gnome-menus-2.30.4.tar.bz2 470390 RMD160 cafb5d26ed94324cf85bef10973f141eabc6fdeb SHA1 26f07b9549952c0a2c2b8374e29d9a5d60bfd4ba SHA256 31797d73c93ec4f3082d8447c6c2b6dc29009c4a4f3ac7075999c387dc4b0c9e
 DIST gnome-menus-2.30.5.tar.bz2 471327 RMD160 f3fafb467a7d9aaf0168236dab46f8bf82f71c26 SHA1 dcf7af8507d5678d6bb1bf705d2c4ac2238c6da5 SHA256 6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa
-EBUILD gnome-menus-2.30.2-r1.ebuild 2455 RMD160 6fadb7e2102a9a8f41d6dd022db9dbf1f48a9a67 SHA1 c25eb91d4d5f705b035879a3fb8316275aa467e0 SHA256 165fc02b37bde0f32e89c5350cdc6eaf8ccb2d82aad64f18eb92e512a68678c4
-EBUILD gnome-menus-2.30.4.ebuild 2453 RMD160 b7841340e823af5c887a69d3c74b047b70385e37 SHA1 e2bd18ab5447330885c335658d58c3ef01cae3bd SHA256 7ba5b91fd1556b3fbdf59f1a0392c40d24a9af2f5a86418fb4862d4b42d67ce6
 EBUILD gnome-menus-2.30.5.ebuild 2467 RMD160 0eba1ba574724c540e1070712b955457a91dc4e6 SHA1 31b538a3fed0389325b9bf30976077ae39609827 SHA256 c80fe59df5d597d99a20f2016a583756b293c2be2c8b252f494b6dbb7d7ad812
-MISC ChangeLog 22422 RMD160 5c09ab1cb18ec0a610ce3b508df960f28364254e SHA1 0b42565ced2e43d1ac4f78f36a2e2eb3b0ae4b02 SHA256 b8e71773cf562747b304f770c353324fd9eb55b647a717e91da74ec25370e682
+MISC ChangeLog 22621 RMD160 4142146db3d6a36b2affa529d07aaf555322edc2 SHA1 a6c0c581a3d3a197b0fc6598967fbc0354e9f81e SHA256 d54b1ae654c23336a99acd27650b37ffe6dffc8fd44dbf82c850e4e4b704c7db
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2aqcsACgkQOeoy/oIi7uzJ7wCeL0IEcpX3+7Exr1U5t4pnLKI6
-r10An1lvwdnISlRcvqaT9OAB1Z0uJyLA
-=/++3
+iEYEARECAAYFAk2e+k0ACgkQ1fmVwcYIWAZjVgCeM6zeScGKMuE1PnsoTr1ph64a
+xZEAn2AqRd4+/srR4os9yhAmAJFJNpfO
+=g0fh
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-menus/files/gnome-menus-2.30.2-XDG_MENU_PREFIX-fix.patch b/gnome-base/gnome-menus/files/gnome-menus-2.30.2-XDG_MENU_PREFIX-fix.patch
deleted file mode 100644
index 01e5a48219de..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-2.30.2-XDG_MENU_PREFIX-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2054996af842e6df1726e58d81a569f03e30d75f Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Wed, 30 Jun 2010 10:36:26 +0000
-Subject: [editor] Better fix for XDG_MENU_PREFIX support in editor
-
-The previous fix was partly wrong, because the menu file referenced in
-the created user menu file was not using the prefix.
-
-So instead of letting the library handle XDG_MENU_PREFIX, we handle it
-ourselves everywhere.
----
-diff --git a/simple-editor/GMenuSimpleEditor/menutreemodel.py b/simple-editor/GMenuSimpleEditor/menutreemodel.py
-index 5856d56..214319e 100644
---- a/simple-editor/GMenuSimpleEditor/menutreemodel.py
-+++ b/simple-editor/GMenuSimpleEditor/menutreemodel.py
-@@ -107,6 +107,9 @@ class MenuTreeModel (gtk.TreeStore):
-             menu_files = ["applications.menu", "settings.menu"]
- 
-         for menu_file in menu_files:
-+            if menu_file == "applications.menu" and os.environ.has_key ("XDG_MENU_PREFIX"):
-+                menu_file = os.environ["XDG_MENU_PREFIX"] + menu_file
-+
-             tree = gmenu.lookup_tree (menu_file, gmenu.FLAGS_INCLUDE_EXCLUDED)
-             tree.sort_key = gmenu.SORT_DISPLAY_NAME
-             self.__append_directory (tree.root, None, False, menu_file)
---
-cgit v0.8.3.1
diff --git a/gnome-base/gnome-menus/gnome-menus-2.30.2-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-2.30.2-r1.ebuild
deleted file mode 100644
index 5bbc37c9bab9..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-2.30.2-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2011 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.2-r1.ebuild,v 1.10 2011/04/05 05:33:01 ulm Exp $
-
-EAPI="2"
-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
-		--disable-introspection"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Don't show KDE standalone settings desktop files in GNOME others menu
-	epatch "${FILESDIR}/${PN}-2.18.3-ignore_kde_standalone.patch"
-
-	# Respect XDG_MENU_PREFIX when writing user menu file, bug #291279
-	epatch "${FILESDIR}/${P}-XDG_MENU_PREFIX-fix.patch"
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-
-	# 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
deleted file mode 100644
index e359097572c6..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-2.30.4.ebuild
+++ /dev/null
@@ -1,97 +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.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
-
-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 +introspection python"
-
-RDEPEND=">=dev-libs/glib-2.18
-	python? ( dev-python/pygtk )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40"
-
-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
-		G2CONF="${G2CONF} --enable-debug=minimum"
-	fi
-
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable python)
-		$(use_enable introspection)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# 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
-
-	python_copy_sources
-}
-
-src_configure() {
-	python_execute_function -s gnome2_src_configure
-}
-
-src_compile() {
-	python_execute_function -s gnome2_src_compile
-}
-
-src_test() {
-	python_execute_function -s -d
-}
-
-src_install() {
-	python_execute_function -s gnome2_src_install
-	python_clean_installation_image
-
-	# 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_mod_optimize 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 GMenuSimpleEditor
-	fi
-}