Version bump. Add introspection support. Remove unnecessary intltool fix.

(Portage version: 2.2_rc86/cvs/Linux x86_64)

3 files changed, 99 insertions, 2 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 940fe0efcc24..0d45bb191df3 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.154 2010/09/15 22:28:37 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.155 2010/09/27 21:37:00 eva Exp $
+
+*gnome-menus-2.30.4 (27 Sep 2010)
+
+  27 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-menus-2.30.4.ebuild, metadata.xml:
+  Version bump. Add introspection support. Remove unnecessary intltool fix.
 
 *gnome-menus-2.30.3 (15 Sep 2010)
 
diff --git a/gnome-base/gnome-menus/gnome-menus-2.30.4.ebuild b/gnome-base/gnome-menus/gnome-menus-2.30.4.ebuild
new file mode 100644
index 000000000000..bc35a787980f
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-2.30.4.ebuild
@@ -0,0 +1,87 @@
+# 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.1 2010/09/27 21:37:00 eva Exp $
+
+EAPI="2"
+PYTHON_DEPEND="python? 2:2.4"
+
+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"
+
+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}
+		--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
+}
+
+src_configure() {
+	gnome2_src_configure
+}
+
+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/metadata.xml b/gnome-base/gnome-menus/metadata.xml
index da6fd63d0085..44825d13c084 100644
--- a/gnome-base/gnome-menus/metadata.xml
+++ b/gnome-base/gnome-menus/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
+	<herd>gnome</herd>
+	<use>
+		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+			for introspection</flag>
+	</use>
 </pkgmetadata>