Version bump, translation updates only.

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

3 files changed, 145 insertions, 9 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index ef50c04c5ae0..b4d7f640093d 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.178 2012/05/13 18:43:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.179 2012/05/20 09:47:16 tetromino Exp $
+
+*gnome-menus-3.4.2 (20 May 2012)
+
+  20 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gnome-menus-3.4.2.ebuild:
+  Version bump, translation updates only.
 
 *gnome-menus-3.4.0 (13 May 2012)
 
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index fb4624dff966..5fcb4ae227b3 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -11,21 +11,23 @@ DIST gnome-menus-2.30.5.tar.bz2 471327 RMD160 f3fafb467a7d9aaf0168236dab46f8bf82
 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 gnome-menus-3.4.2.tar.xz 406316 RMD160 71fc8ec7077f397bfc7c1e91246ea23c968b2e26 SHA1 93edd01ce24fc68eec5fe16b95d9e34ba9688e38 SHA256 fa8b98eb5c62da20f1fb4f6e251f819d78c925006b00d2f63005a6418aa81e63
 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.4.0.ebuild 3066 RMD160 1719db934e0b1218053e36fafbbff3c203f6b93e SHA1 1dec88b1553b731f819e7f843bf53ac2cc2190e1 SHA256 3698dbd7a8ff2b3f60e187ad3fe19cd0dcb06e8d02dc132df59fbfa4d3132d22
-MISC ChangeLog 25430 RMD160 20c1b6452e71bdb01b8481e5b259df3b292c51a0 SHA1 16931c1d9abf246e35b61bcfb6c9ac8c1d730d61 SHA256 656dd0fab45dd7d70af9d2969c884c027c854d6e57ef86576caedd4e444969b2
+EBUILD gnome-menus-3.4.2.ebuild 3066 RMD160 8387c4e013c30f64ee622ba4be01e41135a527b1 SHA1 a9ffbafd0fac3fe9e68d94a30c761513a6a92e96 SHA256 118e67c8146a8d21e8c1d2728b9d26bd502a6e9733d0b437fc6cff3e93c5799f
+MISC ChangeLog 25595 RMD160 31c995e26ce4c5d1be7528d7bcefbbf9e0bc5566 SHA1 be6d42dd6712541e3d81130955c925e36d0bc49c SHA256 901c576bb3d2fd66078d49d5109e5158d9786865d3c2f5b5ce8b14d6df9fb5a9
 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
+iQEcBAEBAgAGBQJPuL2pAAoJEJ0WA1zPCt1h9g4H/jDOE+H/B0r85uh17AndZrMP
+ySmaKciCl5eNe9LVM7tmIJGPXkU84GYKP04CWEgwRl1bpqtOF/6fZzuM9kTJpgJO
+4GZt6LDKbavzzxKM/GOH8sbn8GoPQaJCCX3KMuNhVWGRNIYLMNrcc6F5JNl3CXLB
+7LB/ypqlPxy/V3LZjn11bZucYOLzpOim2IivTT2uEsAPi+76xAsagIPs0/gjnryz
+AU18cydYgAywoXKLP1iwWkfMMlUIhhuhnCTsbvTkNd2SqOPe6xgtbnBh4vhSiv9H
+GJvlsLTfgeB8OamR7Ovb2eak05QLng0CpKD7DWh0Iiv6OSH+jRK8tFTB5Xn1Ba0=
+=J4eL
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-menus/gnome-menus-3.4.2.ebuild b/gnome-base/gnome-menus/gnome-menus-3.4.2.ebuild
new file mode 100644
index 000000000000..5761479912d6
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-3.4.2.ebuild
@@ -0,0 +1,128 @@
+# 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.4.2.ebuild,v 1.1 2012/05/20 09:47:16 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+PYTHON_DEPEND="2:2.5"
+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="3"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+# +python for gmenu-simple-editor
+IUSE="debug +introspection +python test"
+
+COMMON_DEPEND=">=dev-libs/glib-2.29.15:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	python? (
+		>=dev-libs/gobject-introspection-0.9.5
+		dev-python/pygobject:3
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection] )"
+# Older versions of slot 0 install the menu editor and the desktop directories
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gnome-menus-3.0.1-r1:0"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	>=dev-util/intltool-0.40
+	test? ( dev-libs/gjs )"
+
+pkg_setup() {
+	use python && python_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
+
+	if use python || use introspection; then
+		use introspection || ewarn "Enabling introspection due to USE=python"
+		G2CONF="${G2CONF} --enable-introspection"
+	else
+		G2CONF="${G2CONF} --disable-introspection"
+	fi
+
+	G2CONF="${G2CONF} --disable-static"
+}
+
+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"
+
+	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() {
+	if use python; then
+		python_execute_function -s gnome2_src_configure
+	else
+		gnome2_src_configure
+	fi
+}
+
+src_compile() {
+	if use python; then
+		python_execute_function -s gnome2_src_compile
+	else
+		gnome2_src_compile
+	fi
+}
+
+src_test() {
+	if use python; then
+		python_execute_function -s -d
+	else
+		default
+	fi
+}
+
+src_install() {
+	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/
+	newexe "${FILESDIR}/10-xdg-menu-gnome-r1" 10-xdg-menu-gnome
+}
+
+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
+}