Version bump, drop old.

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

3 files changed, 55 insertions, 15 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 4bc1b07f7054..ef50c04c5ae0 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.177 2012/05/05 05:38:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.178 2012/05/13 18:43:24 tetromino Exp $
+
+*gnome-menus-3.4.0 (13 May 2012)
+
+  13 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-menus-3.2.0.1.ebuild, +gnome-menus-3.4.0.ebuild:
+  Version bump, drop old.
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> gnome-menus-2.30.5.ebuild,
   gnome-menus-3.0.1-r1.ebuild, gnome-menus-3.2.0.1.ebuild,
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 27311a74130f..fb4624dff966 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 10-xdg-menu-gnome 115 RMD160 3e235da94ec1e7f97be144358f105d24ca8144e8 SHA1 f4d0e6dff08acd5b06531973f1f68b5f4a640240 SHA256 d6a4938ed879f908e93d0c917db4c99321cb6fa126b79fe1e878ff2ddade963b
 AUX 10-xdg-menu-gnome-r1 159 RMD160 a0e1372c398b06fb6d6590acaf8e6155f2858a4b SHA1 86b702d6926a5c3588a457f2c8c40532b1255210 SHA256 8c1f628109ed791e00857f5808dbe1d35a15575a2b36cbb764c3ea14d1ea0378
 AUX gnome-menus-2.18.3-ignore_kde_standalone.patch 1208 RMD160 302201bbc2a9b4d6a673904d11ce60390268b4b5 SHA1 58880f2807bc6a11a724a15c4f626f7385e650be SHA256 6b13ae1708b5d4753f38e57e161e58bd31d0b7a9de8b78145052388b150eedb8
@@ -7,10 +10,22 @@ AUX gnome-menus-3.2.0.1-ignore-invalid-entries.patch 1240 RMD160 b2e8e7498b9b866
 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
 DIST gnome-menus-3.2.0.1.tar.xz 402080 RMD160 98cdb483c0f1a16a1aa6f589a2d130484c970a42 SHA1 8b4bba2f1bb5d8533f7cd241016719ef42cb0ebf SHA256 17e2ea745b1e80fba4f6ec03c4bac561aa6e7ca275fcc79a3df3d318cb64972b
+DIST gnome-menus-3.4.0.tar.xz 405964 RMD160 7959492e62876232910777446061efe8bda85ece SHA1 51954c515fd2424ce1e8f88cac40bbde255a3c11 SHA256 199ce6bce3e24cbab8aed7f3488e7557a8f365314eae354aa2b50727b2f11f86
 DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae
 EBUILD gnome-menus-2.30.5.ebuild 2553 RMD160 c2fc9ec79dc50d75e975be98b92dd0e8103c2a9b SHA1 bb2174cd2ede54fbd64c50e907ea06455fdf1990 SHA256 a55a419f5cd3b188934e4b297685200876953e10a87c5dfb81c9e91df15d7f34
 EBUILD gnome-menus-3.0.1-r1.ebuild 2195 RMD160 6893fa004122c569024805e619650c98206c3754 SHA1 f4bda6870e89f118442779eef1789f0bdfa74d5c SHA256 eb6580d171069bd254dfa96d152d6269e6e56932ce3b4522f7780b3d3a126d93
 EBUILD gnome-menus-3.2.0.1-r1.ebuild 2883 RMD160 7fce01554eecb699f61d796e0e7bc49b5a6a0da3 SHA1 93cd882bdba8468eaa776c9a55d49c726998a350 SHA256 5a731b6881526c107ebde21735ce27e6dc582703a087fe4368cb39ac071cd183
-EBUILD gnome-menus-3.2.0.1.ebuild 2734 RMD160 31abcf6e1c4ccea6596c9a3131a5d255856926b7 SHA1 19be94234d9a2180444ba59f2b2fdff3a076b057 SHA256 16bfa7a14b499e695107ff0e653abe7e1c0152817a707ebc234ace76a39660fd
-MISC ChangeLog 25249 RMD160 59bcccb96f66a5ca654c76bcf5eec05027774b04 SHA1 d11d38b695454f8fc915a2e0d300274fca620c41 SHA256 0eeda24c5cf1280681cc05f0705aa41a4594a091f0a5def15d3b65016e9e9a6f
+EBUILD gnome-menus-3.4.0.ebuild 3066 RMD160 1719db934e0b1218053e36fafbbff3c203f6b93e SHA1 1dec88b1553b731f819e7f843bf53ac2cc2190e1 SHA256 3698dbd7a8ff2b3f60e187ad3fe19cd0dcb06e8d02dc132df59fbfa4d3132d22
+MISC ChangeLog 25430 RMD160 20c1b6452e71bdb01b8481e5b259df3b292c51a0 SHA1 16931c1d9abf246e35b61bcfb6c9ac8c1d730d61 SHA256 656dd0fab45dd7d70af9d2969c884c027c854d6e57ef86576caedd4e444969b2
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPsADSAAoJEJ0WA1zPCt1h7aAIALaytX8dhMZJj/6HkRRbZ8+1
+C0PNkwjbWYn7ZvIb3k396COdT1SLcvz4HYZzYuoaCra0Q6fZNmaupzZPBogY7vIm
+9pCxLGsEMusS2iqpU83qgWxyS4FF8PlUPNLjTZ3j1aDnF8lsyxJuOXvTIL0Nfr2p
+PWlSBPhH1unFhvdHa0HMRFp7igv2J4HkMyK42cQ9wM+RAvsjFhcTohKTWBxdNfBP
+ao16F8Vhhz7/j86vYSfl2raqQJduzDUhzuguU1ZJ2U7iN8dgqmS0qXoD+c5iPmIV
+H58As6sR5o8tIriDX0mf8nxvD1GkppJG/lTURiiz3ul+9iWZ2nnLgxIQtXWUIvg=
+=jl65
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.4.0.ebuild
index ecd54f2c26d1..6c8418e902a8 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.2.0.1.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.4.0.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.2.0.1.ebuild,v 1.4 2012/05/05 05:38:10 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.4.0.ebuild,v 1.1 2012/05/13 18:43:24 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -39,7 +39,7 @@ DEPEND="${COMMON_DEPEND}
 	test? ( dev-libs/gjs )"
 
 pkg_setup() {
-	python_pkg_setup
+	use python && python_pkg_setup
 	DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
 	# Do NOT compile with --disable-debug/--enable-debug=no
@@ -64,34 +64,53 @@ 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
-	echo '#!/bin/sh' > py-compile
-
-	python_copy_sources
+	if use python; then
+		python_clean_py-compile_files
+		python_copy_sources
+	else
+		sed -e 's/\(SUBDIRS.*\) simple-editor/\1/' \
+			-i Makefile.* || die "sed failed"
+	fi
 }
 
 src_configure() {
-	python_execute_function -s gnome2_src_configure
+	if use python; then
+		python_execute_function -s gnome2_src_configure
+	else
+		gnome2_src_configure
+	fi
 }
 
 src_compile() {
-	python_execute_function -s gnome2_src_compile
+	if use python; then
+		python_execute_function -s gnome2_src_compile
+	else
+		gnome2_src_compile
+	fi
 }
 
 src_test() {
-	python_execute_function -s -d
+	if use python; then
+		python_execute_function -s -d
+	else
+		default
+	fi
 }
 
 src_install() {
-	python_execute_function -s gnome2_src_install
-	python_clean_installation_image
+	if use python; then
+		python_execute_function -s gnome2_src_install
+		python_clean_installation_image
+	else
+		gnome2_src_install
+	fi
 
 	# 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"
+	newexe "${FILESDIR}/10-xdg-menu-gnome-r1" 10-xdg-menu-gnome
 }
 
 pkg_postinst() {