bump to 2.20.1

(Portage version: 2.1.3.13)

5 files changed, 68 insertions, 5 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 28a78b67bb79..aa3b401a524d 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gnome-menus
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.88 2007/10/01 09:53:20 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.89 2007/10/17 20:25:59 eva Exp $
+
+  17 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-menus-2.16.1.ebuild:
+  fix minor QA
+
+*gnome-menus-2.20.1 (17 Oct 2007)
+
+  17 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-menus-2.20.0.ebuild, +gnome-menus-2.20.1.ebuild:
+  bump to 2.20.1 and fix inherit
 
 *gnome-menus-2.20.0 (01 Oct 2007)
 
diff --git a/gnome-base/gnome-menus/files/digest-gnome-menus-2.20.1 b/gnome-base/gnome-menus/files/digest-gnome-menus-2.20.1
new file mode 100644
index 000000000000..12de56891c42
--- /dev/null
+++ b/gnome-base/gnome-menus/files/digest-gnome-menus-2.20.1
@@ -0,0 +1,3 @@
+MD5 ad141dc4d5e485e613b68f9fa58bae5f gnome-menus-2.20.1.tar.bz2 450569
+RMD160 8ffef9d7e76c9876df720436feb99ab36404ee9d gnome-menus-2.20.1.tar.bz2 450569
+SHA256 f6c147983b8c2a6ed0798667d9bd2f58a47b6e6b8e4ab850f83db82beda6badb gnome-menus-2.20.1.tar.bz2 450569
diff --git a/gnome-base/gnome-menus/gnome-menus-2.16.1.ebuild b/gnome-base/gnome-menus/gnome-menus-2.16.1.ebuild
index 261b664ed031..c2a1461d1dc7 100644
--- a/gnome-base/gnome-menus/gnome-menus-2.16.1.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-2.16.1.ebuild
@@ -1,6 +1,6 @@
 # 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.16.1.ebuild,v 1.13 2007/06/17 15:25:00 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.16.1.ebuild,v 1.14 2007/10/17 20:25:59 eva Exp $
 
 inherit eutils gnome2 python multilib
 
@@ -32,7 +32,7 @@ src_unpack() {
 
 pkg_postinst() {
 	gnome2_pkg_postinst
-	python_mod_optimize ${ROOT}usr/$(get_libdir)/python*/site-packages
+	python_mod_optimize "${ROOT}"usr/$(get_libdir)/python*/site-packages
 }
 
 pkg_postrm() {
diff --git a/gnome-base/gnome-menus/gnome-menus-2.20.0.ebuild b/gnome-base/gnome-menus/gnome-menus-2.20.0.ebuild
index 0456926df240..0bcbe3caafab 100644
--- a/gnome-base/gnome-menus/gnome-menus-2.20.0.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-2.20.0.ebuild
@@ -1,8 +1,8 @@
 # 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.20.0.ebuild,v 1.1 2007/10/01 09:53:20 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.20.0.ebuild,v 1.2 2007/10/17 20:25:59 eva Exp $
 
-inherit eutils gnome2 python multilib
+inherit eutils gnome2 python multilib linux-info
 
 DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
 HOMEPAGE="http://www.gnome.org"
diff --git a/gnome-base/gnome-menus/gnome-menus-2.20.1.ebuild b/gnome-base/gnome-menus/gnome-menus-2.20.1.ebuild
new file mode 100644
index 000000000000..08d236d52d3a
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-2.20.1.ebuild
@@ -0,0 +1,50 @@
+# 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.20.1.ebuild,v 1.1 2007/10/17 20:25:59 eva Exp $
+
+inherit eutils gnome2 python multilib linux-info
+
+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.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() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY"
+		linux-info_pkg_setup
+	fi
+
+	G2CONF="$(use_enable kernel_linux inotify) $(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"
+}
+
+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
+}