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

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

4 files changed, 106 insertions, 7 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/Manifest b/gnome-base/gnome-menus/Manifest
index 2035d7543ade..ffadee0fa2b2 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -8,16 +8,18 @@ DIST gnome-menus-2.26.2.tar.bz2 438945 RMD160 a3b526d908448c52737edecb8f83c6c99e
 DIST gnome-menus-2.28.0.1.tar.bz2 461356 RMD160 9d74e64375c4c14c347dbbbe010035ccb3a7b5b0 SHA1 af3469cc2ffd41aad3e3931176e17e9c91e94a29 SHA256 75e73554cd0b0a8356956e76ccb517def5382eafa7bdb14336499cd271570dbc
 DIST gnome-menus-2.30.2.tar.bz2 464086 RMD160 cbc2f5aaf529e385c835de84d6284803280494a9 SHA1 edbc9b9fc4e86f5cc772011ea768ba9487625d67 SHA256 3cfb41586cda5892aea929ff9b327cbabc37a15971fdc6c6d4334d2488bb3233
 DIST gnome-menus-2.30.3.tar.bz2 469400 RMD160 3afc1c25bb8e989343a8ea2ed66097705d6e8aa8 SHA1 b9812c022ce35163b89fa056508918de3a4910c4 SHA256 3a823a22949996cc9d7e814e8c460ea447c18ddf5eae113fc0cfe20fc8874150
+DIST gnome-menus-2.30.4.tar.bz2 470390 RMD160 cafb5d26ed94324cf85bef10973f141eabc6fdeb SHA1 26f07b9549952c0a2c2b8374e29d9a5d60bfd4ba SHA256 31797d73c93ec4f3082d8447c6c2b6dc29009c4a4f3ac7075999c387dc4b0c9e
 EBUILD gnome-menus-2.26.2.ebuild 2081 RMD160 76c30adaf2be3b0ecc62cd93caa5f8d0e8d0707f SHA1 04e8279b77692d6ebc04850d343a14e7b44e1a50 SHA256 b4ad208e4b66376356ce0a09be1f53d91dea497a37a9b35eeae6fd988553f9d2
 EBUILD gnome-menus-2.28.0.1.ebuild 2153 RMD160 e45a9f91db6bc99521b7f693c3b87c21a66e65b8 SHA1 862d018d92b318607ae8c9b70354fe6930b54209 SHA256 24b54cd336a75a164da757b27e190653c13ecd8428d34b1b3e268362cb5e8222
 EBUILD gnome-menus-2.30.2-r1.ebuild 2462 RMD160 cabe3f54df35b98a3b740bcde5f35631c3f79da5 SHA1 3457f2adb8f1bb6f1bc62fd611896cd8009f7301 SHA256 93df40cf7bf3f16abad57bed874e2ce1d8cb7e8ac359fa0865d2a0a68b56e88c
 EBUILD gnome-menus-2.30.3.ebuild 2381 RMD160 e6ea3051cf17f1bd6633e335710447d2d5c695d9 SHA1 df1c0ca33f7658f5cdaa9f332d94369e62f8466d SHA256 7439d8fe67c959d9c74c05d0bfe18f20312d38d5838c3907d198fcc8d956b01e
-MISC ChangeLog 20717 RMD160 5ff2ec03bebc8a4b63db478f8eb8e9d8e4d16efe SHA1 a5c55a7e4657cf43d2c8cffa32b6e8b9455e108b SHA256 29d027e027a273b5d215f56a7695e8b5b4ab21b88c16676aec43e3b2e9ff6e6d
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+EBUILD gnome-menus-2.30.4.ebuild 2315 RMD160 74335da5a90081154517e69f4724e284feafbddf SHA1 eca871af9401e8754de3ea81959e2d60570c57f9 SHA256 b11fba74867ae428112e88c203f211d5d0b80117080ea3a567e3d7f77dc7838e
+MISC ChangeLog 20927 RMD160 55ffe92c3cb71227303cd2e64732b64c36b36011 SHA1 03344452a2acf1ec2252373479e29cf0d2556e42 SHA256 5c8c2d756adf95502c850086daa10d2ca96190b5b12b8b19178c96b2a16d044f
+MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyRSKEACgkQ1fmVwcYIWAaS8ACgl7gIgGuzA708NSWpBI+tiXpE
-HMkAnRNkLSu8/TUUE1kqnPThzZXouJ3/
-=RXAk
+iEYEARECAAYFAkyhDoIACgkQ1fmVwcYIWAY2BACg6Md7AP5kCihTdEpuJ3MiWOaS
+nrAAoKN1QN/cKHTkt8Q7rUKxjKlEI+st
+=opMN
 -----END PGP SIGNATURE-----
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>