Bump to 3.0.1, from gnome overlay for GNOME 3

Package-Manager: portage-2.2.0_alpha39_p14/cvs/Linux x86_64

4 files changed, 143 insertions, 5 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 1bbbaecbb5d3..38f87b78639f 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.169 2011/06/22 11:59:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.170 2011/08/14 15:24:50 nirbheek Exp $
+
+*gnome-menus-3.0.1 (14 Aug 2011)
+
+  14 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +files/gnome-menus-3.0.0-ignore_kde_standalone.patch,
+  +gnome-menus-3.0.1.ebuild:
+  Bump to 3.0.1, from gnome overlay for GNOME 3
 
   22 Jun 2011; Pacho Ramos <pacho@gentoo.org> gnome-menus-2.30.5.ebuild:
   Fix shebangs only with USE python (reported by angelos).
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index d58545259aeb..4adf81d3bb18 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -3,14 +3,27 @@ Hash: SHA1
 
 AUX 10-xdg-menu-gnome 115 RMD160 3e235da94ec1e7f97be144358f105d24ca8144e8 SHA1 f4d0e6dff08acd5b06531973f1f68b5f4a640240 SHA256 d6a4938ed879f908e93d0c917db4c99321cb6fa126b79fe1e878ff2ddade963b
 AUX gnome-menus-2.18.3-ignore_kde_standalone.patch 1208 RMD160 302201bbc2a9b4d6a673904d11ce60390268b4b5 SHA1 58880f2807bc6a11a724a15c4f626f7385e650be SHA256 6b13ae1708b5d4753f38e57e161e58bd31d0b7a9de8b78145052388b150eedb8
+AUX gnome-menus-3.0.0-ignore_kde_standalone.patch 1222 RMD160 39b97747a5b87c8bc217082268fa825e767cf528 SHA1 0d9cf9fae2224a3a42ef93ca51105fa8b33f0a42 SHA256 b11842a88d41ad29ae825020432516d613d456a8f57c19ed32921a1cb4ca14fe
 DIST gnome-menus-2.30.5.tar.bz2 471327 RMD160 f3fafb467a7d9aaf0168236dab46f8bf82f71c26 SHA1 dcf7af8507d5678d6bb1bf705d2c4ac2238c6da5 SHA256 6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa
+DIST gnome-menus-3.0.1.tar.bz2 474839 RMD160 de916d4887df9a433eb858aaabf1ef91af2cd32d SHA1 e20d2b4c6ed3a19324114a5bff7ef89e058c707d SHA256 579c119c26f37781f66708e867ea45b3c37589b3b69e5b32d33e9bdb944165f0
 EBUILD gnome-menus-2.30.5.ebuild 2546 RMD160 e914320d9024228c385273b7fe2508ca371a1147 SHA1 66e06c51568a0247fa8c6bab6abc235c502350ec SHA256 a7ab647b9a89ef9eb2adf4924bff16392a0b2737b8f291a7ee2bceee097ff67d
-MISC ChangeLog 22893 RMD160 8686bc62d530110e007606036a5376621bff5c6c SHA1 103e868be774d52800dfd7bd4eb823b16dd221a4 SHA256 6854e8cee7ce2dd7433dfe6df2a217041d9ec28bc6ff75bf4e37bafd1b3f0e1c
+EBUILD gnome-menus-3.0.1.ebuild 2274 RMD160 9eef9e50b99e5f4f1f082a45662e100442941dae SHA1 151a65809f4c34564c45f36caacaf68c5146b422 SHA256 823df6431f2aa7c1e020eef2b9b67cf07ef57e46164d2e0cc80aec595df29f20
+MISC ChangeLog 23118 RMD160 d7db597430ae860a35f5404f0ff6a546f886996a SHA1 88f7aef839428c139cb07c73e60e6b0a594789ff SHA256 c925a1e6b582420694dc8bea7982c27d87855bf56dbc1f893a90c1e6be9fce45
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4B2ToACgkQCaWpQKGI+9RnqgCcCiR+My2dc3CoSGIwrczyuCAq
-wpwAn2raoWznRzdDUtaQF80EfczlSlpb
-=8VNI
+iQIcBAEBAgAGBQJOR+jLAAoJEO/kOhxWD91kIAEQAKAWdErpdLLelonC4RewwiWj
+28ffuZk1kKtm2ORR0MaiSjJbw4fkpUIJaUILsCXSF1b6HJd78ZlDi5fPIpoPdRS3
+M1fuRu8VCQQa9rgClphH0rHjKPX5N4XUHJnAxhI/4nZOLN43mgyr2i8m76aqzdBz
+t8NxQ7pp81V10vVYNuqxeU1Z6yAho5islcK7eqOD0UJMgiBpC9VdhAKgy7irsL0n
+bluW8IJZvAiULBBCRfKgfLQREewxJqKkPWTbDde0UrlkyxJm3MxIo2/RS1Q5w6J4
+oGTk4BakyGAix56TwooTX96MzviGzDnyBJQvQyv6+a4vS7JGPtZAW1JWy6b8XF7N
+1hLb1/l/AWxkGY3vN32w165uGBAjb3obNEi1yZEbSGoptHypgDxgAgVYO7Nd02Rs
+edJIYs1uvGSRau9gB8oub0t7IFNaNvN7i6Jqv+TW8ZYPR+gdD7KMhMYh0qcPFDVk
+zJ/WEJwnub4bnZz9cs3/BU7SyIBTrK88kEeTkBTEbMRJj9oYh8hXH0uoPGQwsSU6
+jqKnNxvWM+ljuJaaTUKisq5YOl6DixVkdKM4SsvRVN7AIG3kIBREIxg9m+MTJglY
+qbNWU0Spw18G9tFbImFdk6ZX+7bFVhsBJOE5m+QuTUWIL+0G3oyp+T4QRNyAK/vG
+6zyzpztPqSka0t+A33GJ
+=6hee
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch
new file mode 100644
index 000000000000..5f5f8b2703e6
--- /dev/null
+++ b/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch
@@ -0,0 +1,22 @@
+--- layout/applications.menu.orig	2007-09-21 17:51:43.000000000 +0300
++++ layout/applications.menu	2007-09-21 17:55:38.000000000 +0300
+@@ -146,6 +146,19 @@
+         <Not><Category>Core</Category></Not>
+         <Not><Category>Screensaver</Category></Not>
+         <Not><Category>X-GNOME-Settings-Panel</Category></Not>
++        <Not><Category>X-KDE-settings-accessibility</Category></Not>
++        <Not><Category>X-KDE-settings-components</Category></Not>
++        <Not><Category>X-KDE-settings-desktop</Category></Not>
++        <Not><Category>X-KDE-settings-looknfeel</Category></Not>
++        <Not><Category>X-KDE-settings-network</Category></Not>
++        <Not><Category>X-KDE-settings-webbrowsing</Category></Not>
++        <Not><Category>X-KDE-settings-peripherals</Category></Not>
++        <Not><Category>X-KDE-settings-hardware</Category></Not>
++        <Not><Category>X-KDE-settings-power</Category></Not>
++        <Not><Category>X-KDE-settings-security</Category></Not>
++        <Not><Category>X-KDE-settings-sound</Category></Not>
++        <Not><Category>X-KDE-settings-system</Category></Not>
++        <Not><Category>X-KDE-information</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Other -->
diff --git a/gnome-base/gnome-menus/gnome-menus-3.0.1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.0.1.ebuild
new file mode 100644
index 000000000000..3b6c028796a5
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-3.0.1.ebuild
@@ -0,0 +1,96 @@
+# 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.1 2011/08/14 15:24:50 nirbheek Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+PYTHON_DEPEND="python? 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="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+IUSE="debug +introspection python"
+
+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"
+
+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)"
+}
+
+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" || 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
+}