Bump to 3.2.0.1 and 3.0.1-r1 from the gnome overlay and drop old. Note that 3.2 is now slotted as 3 (since it installs libgnome-menu-3) and <=3.0 is slotted as 0 (since it installs libgnome-menu). But the actual menu definitions should only be installed by one of the slots, hence the blocker in the 3.2.0.1 ebuild and the pdepend in 3.0.1-r1.

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

4 files changed, 157 insertions, 21 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 0b1bfefc1208..a06d64c02f50 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,18 @@
 # 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.171 2011/10/23 23:03:09 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.172 2011/10/29 01:58:08 tetromino Exp $
+
+*gnome-menus-3.2.0.1 (29 Oct 2011)
+*gnome-menus-3.0.1-r1 (29 Oct 2011)
+
+  29 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-menus-3.0.1.ebuild, +gnome-menus-3.0.1-r1.ebuild,
+  +files/gnome-menus-3.0.2-library-only.patch, +gnome-menus-3.2.0.1.ebuild:
+  Bump to 3.2.0.1 and 3.0.1-r1 from the gnome overlay and drop old. Note that
+  3.2 is now slotted as 3 (since it installs libgnome-menu-3) and <=3.0 is
+  slotted as 0 (since it installs libgnome-menu). But the actual menu
+  definitions should only be installed by one of the slots, hence the blocker
+  in the 3.2.0.1 ebuild and the pdepend in 3.0.1-r1.
 
   23 Oct 2011; Jonathan Callen <abcd@gentoo.org> gnome-menus-2.30.5.ebuild,
   gnome-menus-3.0.1.ebuild:
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch
new file mode 100644
index 000000000000..b55ed7edd9f2
--- /dev/null
+++ b/gnome-base/gnome-menus/files/gnome-menus-3.0.2-library-only.patch
@@ -0,0 +1,26 @@
+From f2ad7820b3a6b197f8cfec9e2bec877e51671ec9 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Thu, 18 Aug 2011 20:05:56 -0400
+Subject: [PATCH 2/2] Do not install anything other than the library
+
+---
+ Makefile.am |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 565ab87..65c059a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+-SUBDIRS = libmenu desktop-directories layout util po
++SUBDIRS = libmenu util po
+ 
+ if HAVE_PYTHON
+-SUBDIRS += python simple-editor
++SUBDIRS += python
+ endif
+ 
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+-- 
+1.7.6
+
diff --git a/gnome-base/gnome-menus/gnome-menus-3.0.1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild
index 7491c6cd3b36..828fe3cdd148 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.0.1.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-3.0.1.ebuild,v 1.2 2011/10/23 23:03:09 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild,v 1.1 2011/10/29 01:58:08 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -10,7 +10,7 @@ PYTHON_DEPEND="python? 2:2.4"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 
-inherit eutils gnome2 python
+inherit autotools eutils gnome2 python
 
 DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
 HOMEPAGE="http://www.gnome.org"
@@ -19,15 +19,16 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
-IUSE="debug +introspection python"
+IUSE="debug python +introspection"
 
 RDEPEND=">=dev-libs/glib-2.18
-	python? ( dev-python/pygtk )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.9
 	>=dev-util/intltool-0.40"
+# The actual menus are provided by slot 3
+PDEPEND="gnome-base/gnome-menus:3"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
@@ -45,11 +46,11 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Only build the library (everything else is coming from slot 3)
+	epatch "${FILESDIR}/${PN}-3.0.2-library-only.patch"
+	eautoreconf
 	gnome2_src_prepare
 
-	# Don't show KDE standalone settings desktop files in GNOME others menu
-	epatch "${FILESDIR}/${PN}-3.0.0-ignore_kde_standalone.patch"
-
 	# disable pyc compiling
 	mv py-compile py-compile-disabled
 	ln -s $(type -P true) py-compile
@@ -72,25 +73,12 @@ src_test() {
 src_install() {
 	python_execute_function -s gnome2_src_install
 	python_clean_installation_image
-
-	# Prefix menu, bug #256614
-	mv "${ED}"/etc/xdg/menus/applications.menu \
-		"${ED}"/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
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	if use python; then
-		python_mod_cleanup GMenuSimpleEditor
-	fi
 }
diff --git a/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild
new file mode 100644
index 000000000000..4bd8f8daa25b
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild
@@ -0,0 +1,110 @@
+# 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-3.2.0.1.ebuild,v 1.1 2011/10/29 01:58:08 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+PYTHON_DEPEND="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="3"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+# +python for gmenu-simple-editor
+IUSE="debug +introspection +python test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.29.15:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	python? (
+		>=dev-libs/gobject-introspection-0.9.5
+		dev-python/pygobject:3
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection] )"
+# Older versions of slot 0 install the menu editor and the desktop directories
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-menus-3.0.1-r1:0"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40
+	test? ( dev-libs/gjs )"
+
+pkg_setup() {
+	python_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
+
+	if use python || use introspection; then
+		use introspection || ewarn "Enabling introspection due to USE=python"
+		G2CONF="${G2CONF} --enable-introspection"
+	else
+		G2CONF="${G2CONF} --disable-introspection"
+	fi
+
+	G2CONF="${G2CONF} --disable-static"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Don't show KDE standalone settings desktop files in GNOME others menu
+	epatch "${FILESDIR}/${PN}-3.0.0-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 "${ED}"/etc/xdg/menus/applications.menu \
+		"${ED}"/etc/xdg/menus/gnome-applications.menu || die "menu move failed"
+
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}/10-xdg-menu-gnome"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if use python; then
+		python_mod_optimize GMenuSimpleEditor
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	if use python; then
+		python_mod_cleanup GMenuSimpleEditor
+	fi
+}