Version bump. XDG patch and translation updates. Call gnome2_src_compile to respect user settings.

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

3 files changed, 104 insertions, 5 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 5887a1d1d80c..940fe0efcc24 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,13 @@
 # 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.153 2010/09/11 18:43:30 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.154 2010/09/15 22:28:37 eva Exp $
+
+*gnome-menus-2.30.3 (15 Sep 2010)
+
+  15 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  +gnome-menus-2.30.3.ebuild:
+  Version bump. XDG patch and translation updates. Call gnome2_src_compile
+  to respect user settings.
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org>
   gnome-menus-2.30.2-r1.ebuild:
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index d2a35e9d3dfb..2035d7543ade 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -7,15 +7,17 @@ AUX gnome-menus-2.30.2-XDG_MENU_PREFIX-fix.patch 1240 RMD160 a7110e0e80fb4e1a87e
 DIST gnome-menus-2.26.2.tar.bz2 438945 RMD160 a3b526d908448c52737edecb8f83c6c99e0d72e9 SHA1 ab914a083ef63bacd960349b3dee3dbd3a005a82 SHA256 c9709695819ffaea92d41647adef8c0a6a408aa9a725e4b2987273bb06115a1c
 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
 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
-MISC ChangeLog 20497 RMD160 a738cf3be4c07051d89b8714e8a030a7ad95023a SHA1 af036c75c978d9a6da96fe1156be8e8deeb6d750 SHA256 a2d27ae7b2fa3c897f0f0ab3203f109a1ccb0c47492fc4c5a5c1d2d47766ce95
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyLzOYACgkQcsIHjyDViGQm4QCg3+AWJzJLrXPyy1Zfq7d4jdPZ
-1P0An2pmBez9BMjA729BlOv1G3KuCXvE
-=yeqs
+iEYEARECAAYFAkyRSKEACgkQ1fmVwcYIWAaS8ACgl7gIgGuzA708NSWpBI+tiXpE
+HMkAnRNkLSu8/TUUE1kqnPThzZXouJ3/
+=RXAk
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-menus/gnome-menus-2.30.3.ebuild b/gnome-base/gnome-menus/gnome-menus-2.30.3.ebuild
new file mode 100644
index 000000000000..4177f1e867fc
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-2.30.3.ebuild
@@ -0,0 +1,90 @@
+# 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.3.ebuild,v 1.1 2010/09/15 22:28:37 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 python"
+
+RDEPEND=">=dev-libs/glib-2.18.0
+	python? ( dev-python/pygtk )"
+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}
+		$(use_enable python)
+		--disable-static
+		--disable-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"
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
+
+	# 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
+}