Version bump for gnome-3.6. Update license, switch to global introspection flag. Drop old.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

10 files changed, 57 insertions, 298 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 3596e5f0fdbe..7df197251afd 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.180 2012/11/24 23:43:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.181 2012/12/19 09:55:31 tetromino Exp $
+
+*gnome-menus-3.6.1-r2 (19 Dec 2012)
+
+  19 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-menus-2.30.5.ebuild, gnome-menus-2.30.5-r1.ebuild,
+  -gnome-menus-3.0.1-r1.ebuild, gnome-menus-3.0.1-r2.ebuild,
+  -gnome-menus-3.2.0.1-r1.ebuild,
+  -files/gnome-menus-3.2.0.1-ignore-invalid-entries.patch,
+  -gnome-menus-3.4.2.ebuild, gnome-menus-3.4.2-r1.ebuild,
+  +gnome-menus-3.6.1-r2.ebuild, metadata.xml:
+  Version bump for gnome-3.6. Update license, switch to global introspection
+  flag. Drop old.
 
 *gnome-menus-3.4.2-r1 (24 Nov 2012)
 *gnome-menus-3.0.1-r2 (24 Nov 2012)
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.2.0.1-ignore-invalid-entries.patch b/gnome-base/gnome-menus/files/gnome-menus-3.2.0.1-ignore-invalid-entries.patch
deleted file mode 100644
index ec4144da9e29..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.2.0.1-ignore-invalid-entries.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a09c25177a5643f8596dc81d97b87ebce74c75f9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Fri, 21 Oct 2011 19:57:55 +0200
-Subject: [PATCH] libmenu: Ignore invalid desktop entries
-
-Both "Name" and "Exec" are mandatory keys according to the desktop
-entry spec; some .desktop files missing one or the other have been
-spotted in the while, so ignore them explicitly.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=662409
----
- libmenu/desktop-entries.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/libmenu/desktop-entries.c b/libmenu/desktop-entries.c
-index bb6076d..a8c13d9 100644
---- a/libmenu/desktop-entries.c
-+++ b/libmenu/desktop-entries.c
-@@ -256,7 +256,9 @@ desktop_entry_load (DesktopEntry *entry)
-       const char *categories_str;
- 
-       entry_desktop->appinfo = g_desktop_app_info_new_from_filename (entry->path);
--      if (!entry_desktop->appinfo)
-+      if (!entry_desktop->appinfo ||
-+          !g_app_info_get_name (G_APP_INFO (entry_desktop->appinfo)) ||
-+          !g_app_info_get_executable (G_APP_INFO (entry_desktop->appinfo)))
-         {
-           menu_verbose ("Failed to load \"%s\"\n", entry->path);
-           return FALSE;
--- 
-1.7.8.3
-
diff --git a/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild
index 7b7ebb4bee78..6fb26cd70a01 100644
--- a/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.5-r1.ebuild,v 1.1 2012/11/24 23:43:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild,v 1.2 2012/12/19 09:55:31 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ 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"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug +introspection python"
diff --git a/gnome-base/gnome-menus/gnome-menus-2.30.5.ebuild b/gnome-base/gnome-menus/gnome-menus-2.30.5.ebuild
index 9f229d680314..23cf72d424dd 100644
--- a/gnome-base/gnome-menus/gnome-menus-2.30.5.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-2.30.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.5.ebuild,v 1.12 2012/05/05 05:38:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.30.5.ebuild,v 1.13 2012/12/19 09:55:31 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ 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"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="debug +introspection python"
diff --git a/gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild
deleted file mode 100644
index a646408eb7f2..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.5 2012/05/05 05:38:10 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-PYTHON_DEPEND="python? 2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit autotools eutils gnome2 python
-
-DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
-HOMEPAGE="http://www.gnome.org"
-SRC_URI="${SRC_URI} mirror://gentoo/introspection.m4.bz2"
-
-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 python +introspection"
-
-RDEPEND=">=dev-libs/glib-2.18
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-
-	gnome-base/gnome-common"
-# eautoreconf requires gnome-common
-# The actual menus are provided by slot 3
-PDEPEND="gnome-base/gnome-menus:3"
-
-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)"
-
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Only build the library (everything else is coming from slot 3)
-	epatch "${FILESDIR}/${PN}-3.0.2-library-only.patch"
-	# introspection.m4 needed for eautoreconf
-	mv "${WORKDIR}/introspection.m4" m4/ || die
-	eautoreconf
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	python_clean_py-compile_files
-
-	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
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild b/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild
index 949604acf88c..00937f63579e 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r2.ebuild,v 1.1 2012/11/24 23:43:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild,v 1.2 2012/12/19 09:55:31 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -16,7 +16,7 @@ inherit autotools 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"
+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"
 
diff --git a/gnome-base/gnome-menus/gnome-menus-3.2.0.1-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.2.0.1-r1.ebuild
deleted file mode 100644
index 60f6396a25ed..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-3.2.0.1-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.3 2012/05/05 05:38:10 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-PYTHON_DEPEND="2:2.5"
-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
-	virtual/pkgconfig
-	>=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"
-
-	# Ignore invalid .desktop files (prevents gnome-shell crash), in next release
-	epatch "${FILESDIR}/${P}-ignore-invalid-entries.patch"
-
-	# disable pyc compiling
-	echo > 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/
-	newexe "${FILESDIR}/10-xdg-menu-gnome-r1" 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
-}
diff --git a/gnome-base/gnome-menus/gnome-menus-3.4.2-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.4.2-r1.ebuild
index f9f4280c8161..f54dd4391ddd 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.4.2-r1.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.4.2-r1.ebuild,v 1.1 2012/11/24 23:43:39 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.4.2-r1.ebuild,v 1.2 2012/12/19 09:55:31 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ 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"
+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"
 
diff --git a/gnome-base/gnome-menus/gnome-menus-3.4.2.ebuild b/gnome-base/gnome-menus/gnome-menus-3.6.1-r2.ebuild
index 5761479912d6..b0aad30cd152 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.4.2.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.6.1-r2.ebuild
@@ -1,71 +1,51 @@
 # Copyright 1999-2012 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.4.2.ebuild,v 1.1 2012/05/20 09:47:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.6.1-r2.ebuild,v 1.1 2012/12/19 09:55:31 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit eutils gnome2 python
+inherit eutils gnome2 python-r1
 
 DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
 HOMEPAGE="http://www.gnome.org"
 
-LICENSE="GPL-2 LGPL-2"
+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"
+REQUIRED_USE="python? ( introspection )"
 
 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
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 		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}
+	>=dev-util/intltool-0.40
 	sys-devel/gettext
 	virtual/pkgconfig
-	>=dev-util/intltool-0.40
 	test? ( dev-libs/gjs )"
 
-pkg_setup() {
-	use python && 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"
 
+	# https://bugzilla.gnome.org/show_bug.cgi?id=688972
+	epatch "${FILESDIR}/${PN}-3.6.1-applications-merged.patch"
+
 	if use python; then
-		python_clean_py-compile_files
 		python_copy_sources
 	else
 		sed -e 's/\(SUBDIRS.*\) simple-editor/\1/' \
@@ -74,8 +54,17 @@ src_prepare() {
 }
 
 src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+	# Do NOT compile with --disable-debug/--enable-debug=no
+	# It disables api usage checks
+	G2CONF="${G2CONF}
+		$(usex debug --enable-debug=yes --enable-debug=minimum)
+		$(use_enable introspection)
+		--disable-static"
+
 	if use python; then
-		python_execute_function -s gnome2_src_configure
+		python_foreach_impl run_in_build_dir gnome2_src_configure
 	else
 		gnome2_src_configure
 	fi
@@ -83,7 +72,7 @@ src_configure() {
 
 src_compile() {
 	if use python; then
-		python_execute_function -s gnome2_src_compile
+		python_foreach_impl run_in_build_dir gnome2_src_compile
 	else
 		gnome2_src_compile
 	fi
@@ -91,7 +80,7 @@ src_compile() {
 
 src_test() {
 	if use python; then
-		python_execute_function -s -d
+		python_foreach_impl run_in_build_dir default
 	else
 		default
 	fi
@@ -99,8 +88,14 @@ src_test() {
 
 src_install() {
 	if use python; then
-		python_execute_function -s gnome2_src_install
-		python_clean_installation_image
+		installing() {
+			gnome2_src_install
+			# Massage shebang to make python_doscript happy
+			sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
+				-i simple-editor/gmenu-simple-editor || die
+				python_doscript simple-editor/gmenu-simple-editor
+			}
+		python_foreach_impl run_in_build_dir installing
 	else
 		gnome2_src_install
 	fi
@@ -113,16 +108,8 @@ src_install() {
 	newexe "${FILESDIR}/10-xdg-menu-gnome-r1" 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
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null
 }
diff --git a/gnome-base/gnome-menus/metadata.xml b/gnome-base/gnome-menus/metadata.xml
index 44825d13c084..dad9001338dc 100644
--- a/gnome-base/gnome-menus/metadata.xml
+++ b/gnome-base/gnome-menus/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>
-	<use>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
-	</use>
 </pkgmetadata>