Clean up old revisions.

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

4 files changed, 7 insertions, 214 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/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
-}