6 files changed, 12 insertions, 173 deletions
diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 73c2cdf92fa6..adb54d74182a 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.106 2008/04/09 21:34:27 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.107 2008/05/21 10:22:44 eva Exp $
+
+  21 May 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/gnome-menus-2.18.3-other_category_fix.patch,
+  -gnome-menus-2.18.2.ebuild, -gnome-menus-2.18.3-r1.ebuild,
+  -gnome-menus-2.22.0.ebuild:
+  clean up old revisions.
 
 *gnome-menus-2.22.1 (09 Apr 2008)
 
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 9b15a947ba44..d228aeb8058b 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -2,23 +2,16 @@
 Hash: SHA1
 
 AUX gnome-menus-2.18.3-ignore_kde_standalone.patch 1208 RMD160 302201bbc2a9b4d6a673904d11ce60390268b4b5 SHA1 58880f2807bc6a11a724a15c4f626f7385e650be SHA256 6b13ae1708b5d4753f38e57e161e58bd31d0b7a9de8b78145052388b150eedb8
-AUX gnome-menus-2.18.3-other_category_fix.patch 869 RMD160 e10c8adc4275028335ef52023dd85a139666a350 SHA1 13c6234154de00c1fd50af2d2d55d9c9b2563027 SHA256 b225a08af45290eedcc3ad0fa63766fdc667a1016addedba74bf3dcd7c2628ee
-DIST gnome-menus-2.18.2.tar.bz2 437032 RMD160 e188476dc59e152c0c3a9bd65450af9fb696329c SHA1 1c1b5a32b1b27438fe6fb077e3bf0e3163827668 SHA256 17cf58f617acfbbcfa368212f51ac2c6c2ea6c8c318ef32da5b5e45f3676e080
-DIST gnome-menus-2.18.3.tar.bz2 437539 RMD160 06f26fc98db6650526fdb7bb3557f80b3a598ece SHA1 c50f2503f59b61269a6056d09118f5e04a57ca72 SHA256 c6c0b9a93426dbdcb47fb7e586b9d910e2dbc0e9c894c0f322d08971a7b70933
 DIST gnome-menus-2.20.3.tar.bz2 446966 RMD160 eb1ff84b161d8354b1ee30364cefec91a43ff57d SHA1 25c8161f1bb4ecd4a868cbf1b59edcfb06adaa51 SHA256 2ce7a6aabed338ca3f65685e7e46149cdacc80fab0a8701c2d827fcb950a9897
-DIST gnome-menus-2.22.0.tar.bz2 482226 RMD160 96bcfbf2c913a6627ac0e53d1efcfcca0f664d3c SHA1 1a18addef1659f7c1a20fba602600ccb181d8fbe SHA256 3b461efd7b4831b5ca7105d52295f7b3417690cf4701532acf9481082d55db7e
 DIST gnome-menus-2.22.1.tar.bz2 461978 RMD160 7875afc047c8c8592133058c62e084e7708f90de SHA1 a943facc7d279145b683fe8b13aff0abe8c102c5 SHA256 4d3cb5550f4c1970435b86b03a936629ead6ad3b89de19e5cfa4cfb793ed79f5
-EBUILD gnome-menus-2.18.2.ebuild 1096 RMD160 ffeb7d76d370d64bf2a936e506cad3290d3f422d SHA1 cfd47aa75907efa7d191194e7a96d70ba57be790 SHA256 218e04d69c45b30cf1394cb4f213ebd356dd9ff57b2cd9e437047ef7e708fd30
-EBUILD gnome-menus-2.18.3-r1.ebuild 1417 RMD160 6361639b0491d1eef5fd8a6ca738f6cbe0d30ced SHA1 4c3038cf2e4c85d3e67b7c74e471913f708c6333 SHA256 a251d8c2bedfd0215fb5a8b954cef0a1da2a5158e2614599c134aa867ee6e0f8
 EBUILD gnome-menus-2.20.3.ebuild 1561 RMD160 e5f392126765f72879f84aaa6890a5d5ab98a8e6 SHA1 9b64cb45aad3e8ee2bfdf4fb40387e245d532449 SHA256 218e4ac028612c4c17e6a11261a868fbf5c0f4df6db133eef11070de67fec3a2
-EBUILD gnome-menus-2.22.0.ebuild 1441 RMD160 312cdd70ef1acf77c953bb2c202dc45c996ac1a6 SHA1 6f069dd36b03530cb16b2ca181c5b07beb6e11e1 SHA256 5b945f747e9fb85deb08f7a7880df6d21aac7cad85b767cd54c559294e621ee6
 EBUILD gnome-menus-2.22.1.ebuild 1440 RMD160 b99ff45ce826e0a66b201ed9c1c69ec3c550d25a SHA1 dfdcdf7a65467ea45ca9ebf8919c07808644fb03 SHA256 d0c11c3d02e8b2b80774ebbcabc08ca07cbad8dd82f838f2b3e4893b80d1ba36
-MISC ChangeLog 13775 RMD160 e0e427cf9d6063f7b31d4499d5e59bc9e4796c5a SHA1 179ee2f92d0a1c818a8f8d18f6759e26871a1507 SHA256 c88d31c96af591ff855a4c62112fee7ff4061529149e25ab96985787f7645dfd
+MISC ChangeLog 14001 RMD160 063276ce819bbd0b4824de9b359da8d12fbfed0b SHA1 15162974712d3609aaa231e73a31b6b41b6daefb SHA256 9d409f9417699a114bb6ab749197ff7c31803bdce25e39cdef7d554816bd9a0f
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFICp4mj9hvisErhMIRArHUAJ477bOjFK4fZRaN2B48ChbKAuGB5ACfcT41
-kLjoATjBFVUrUlv3+2SCL+M=
-=KXLy
+iEYEARECAAYFAkgz+C4ACgkQ1fmVwcYIWAbbuQCdG/iuvEtFbW5GKFQxXv9vVhR2
+omkAoJR5LbWvrCa+1xiMVbeW35zpCCOf
+=gzFm
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-menus/files/gnome-menus-2.18.3-other_category_fix.patch b/gnome-base/gnome-menus/files/gnome-menus-2.18.3-other_category_fix.patch
deleted file mode 100644
index b71829dc60c1..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-2.18.3-other_category_fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From http://svn.gnome.org/viewcvs/gnome-menus/trunk/layout/applications.menu?view=patch&r1=666&r2=702&pathrev=702
-Fixes the "Other" submenu, as Application is not a valid category in desktop files, so we shouldn't require it.
-Also exclude screensavers because they'd show up otherwise combined with the previous change.
-This makes all menu entries, that don't match any other category, properly show up in the "Other" submenu.
-
---- trunk/layout/applications.menu	2007/05/01 10:11:09	666
-+++ trunk/layout/applications.menu	2007/06/26 21:20:55	702
-@@ -143,9 +143,9 @@
-     <OnlyUnallocated/>
-     <Include>
-       <And>
--        <Category>Application</Category>
-         <Not><Category>Core</Category></Not>
-         <Not><Category>Settings</Category></Not>
-+        <Not><Category>Screensaver</Category></Not>
-       </And>
-     </Include>
-   </Menu> <!-- End Other -->
diff --git a/gnome-base/gnome-menus/gnome-menus-2.18.2.ebuild b/gnome-base/gnome-menus/gnome-menus-2.18.2.ebuild
deleted file mode 100644
index 514fe4374797..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-2.18.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 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.18.2.ebuild,v 1.9 2007/08/28 18:49:53 jer Exp $
-
-inherit eutils gnome2 python multilib
-
-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 hppa ia64 ppc ~ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug python kernel_linux"
-
-RDEPEND=">=dev-libs/glib-2.6
-	python? (
-				>=dev-lang/python-2.2
-				dev-python/pygtk
-			)"
-DEPEND="${RDEPEND}
-	  sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="$(use_enable kernel_linux inotify) $(use_enable debug) $(use_enable python)"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use python && python_mod_optimize "${ROOT}"usr/$(get_libdir)/python*/site-packages
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	use python && python_mod_cleanup "${ROOT}"usr/$(get_libdir)/python*/site-packages
-}
diff --git a/gnome-base/gnome-menus/gnome-menus-2.18.3-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-2.18.3-r1.ebuild
deleted file mode 100644
index 44428e11fa24..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-2.18.3-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 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.18.3-r1.ebuild,v 1.9 2008/04/20 01:35:52 vapier Exp $
-
-inherit eutils gnome2 python multilib
-
-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 hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug python kernel_linux"
-
-RDEPEND=">=dev-libs/glib-2.6
-	python? (
-				>=dev-lang/python-2.3
-				dev-python/pygtk
-			)"
-DEPEND="${RDEPEND}
-	  sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="$(use_enable kernel_linux inotify) $(use_enable debug) $(use_enable python)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-	# Don't require the invalid Application category for the Other submenu
-	# This makes all valid desktop files that don't match other categories show up properly in "Other"
-	epatch "${FILESDIR}/${P}-other_category_fix.patch"
-	epatch "${FILESDIR}/${P}-ignore_kde_standalone.patch"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	use python && python_mod_optimize "${ROOT}"usr/$(get_libdir)/python*/site-packages
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	use python && python_mod_cleanup "${ROOT}"usr/$(get_libdir)/python*/site-packages
-}
diff --git a/gnome-base/gnome-menus/gnome-menus-2.22.0.ebuild b/gnome-base/gnome-menus/gnome-menus-2.22.0.ebuild
deleted file mode 100644
index d8e8832d8700..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-2.22.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2008 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.22.0.ebuild,v 1.1 2008/03/18 00:10:41 leio 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 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug python"
-
-RDEPEND=">=dev-libs/glib-2.15.2
-		 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.35"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable debug) $(use_enable python)"
-}
-
-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.orig
-	ln -s $(type -P true) py-compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_version
-		python_mod_optimize "${ROOT}"usr/$(get_libdir)/python${PYVER}/site-packages/GMenuSimpleEditor
-	fi
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	if use python; then
-		python_version
-		python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/GMenuSimpleEditor
-	fi
-}