Version bump.

Package-Manager: portage-2.2.0_alpha158/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

3 files changed, 130 insertions, 10 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 7df197251afd..c8cb95cd1235 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.181 2012/12/19 09:55:31 tetromino Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.182 2013/01/22 08:38:59 tetromino Exp $
+
+*gnome-menus-3.6.2 (22 Jan 2013)
+
+  22 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gnome-menus-3.6.2.ebuild:
+  Version bump.
 
 *gnome-menus-3.6.1-r2 (19 Dec 2012)
 
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index 74525c2501e1..7a7c05d48f22 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -12,21 +12,23 @@ DIST gnome-menus-2.30.5.tar.bz2 471327 SHA256 6dcc565006d6e8c2025ae83ab1f82edf6b
 DIST gnome-menus-3.0.1.tar.bz2 474839 SHA256 579c119c26f37781f66708e867ea45b3c37589b3b69e5b32d33e9bdb944165f0 SHA512 05eda56b741d7236b17276b3b208b8370ec8ff0db82e32a2c0adb84334c4d9365fe61dea08183858fb7c0093cf04a02ba1311483e3318dbe816a02c28f4198eb WHIRLPOOL f2583e79ea6aef0c5cffb94001ceba166b97e237861b51d39530155f36720bcfabbf50af0a16735f8112e44a7b8d7243ae9460285f590a0c2a351ad2203dc85e
 DIST gnome-menus-3.4.2.tar.xz 406316 SHA256 fa8b98eb5c62da20f1fb4f6e251f819d78c925006b00d2f63005a6418aa81e63 SHA512 a2710df76e375c3e99ac671a4ea222944b391a731f09fd1615579e89cf847e0eaa837e48a2f56b643e1bb0a2b1da1e952231265661aa71b4f7c2bb31c9e064fd WHIRLPOOL f043295d7f21e14555e72e75d79f228ece0eb6b1953d0fef3c107e841880de39232a5e5fc1ff35a2d152d3a54322074b56d2c5a94b9b15ac3a44a80329e1ee55
 DIST gnome-menus-3.6.1.tar.xz 423060 SHA256 1615f6852280a161cd137d5b8b59f35519a3a7ba89738f55c578325b0512043e SHA512 3124ca6a825e1ab551b44c37ece1872cb50fe6eb5087c04ffd30fd96fce5b9d831ab8727a12bd819d0a3a7025f6f85b0f5c7fa563050a0d5eedf5fb14819808c WHIRLPOOL e39b5d5165d4c972b29aef9f56c9427b01257b1b049270b2a5413f59a43093f6b20d4d77fd54eec2f482b14ce3aa591ed19792783f022895969c58506c31caf5
+DIST gnome-menus-3.6.2.tar.xz 423948 SHA256 f6cefb25ce3ca2a0e4cb43894089cc6079bf948230e99bc0e244b380fa84bf4f SHA512 53beac950e40f121327ab404f42094350c8b2567dbc14e90ee21b5bf514e528bac12beba943f13008a6b860227e01bc630aedb733ae71a9f824688ce640c6ed5 WHIRLPOOL 5f38e1f1c182f67df05a66756c76754737ca5afe2b25e23354c7aead4d8877169c2443fd3a60eeb4bfd4d1fe7193f7d8db9c95afc5f1e4fb505a2d35eed213c2
 EBUILD gnome-menus-2.30.5-r1.ebuild 2682 SHA256 7167af028d6b32cbdb6e5a2814877bbff9f97f697471929aa6a40062ee0aa3e0 SHA512 fbdfa28798997442072d9d8009378bbe57f714ed14971808265543b07ee57e682673314677685f441d12fbaa582715a887fd2ec96950e33133c54207bf6b4b30 WHIRLPOOL 16adfffdee72afe92372a376ddd09692e5ff34dd744c32539e2460fcbb81bd4af6c8d49e7818f0401e6e603437f7c2dc94dc5aae2e467955fd2f322acdaa45a7
 EBUILD gnome-menus-2.30.5.ebuild 2558 SHA256 0734cef39b9dcd27217ab9379e25a503583846761f9ed51b7b6338a0918a0ccf SHA512 41ae0c80b759ca1e61ef9153cbfd2e3b18caff2d3d5931de928c7a8e96caa93f70b99b039e36b337ba1b907587574011bd00c406b368fcdb0a381b495ebb01e7 WHIRLPOOL d37376c813275c2dfd28422d2b61b040b43bcf3193aef5295aa04f4e623904f83bf972d93bbcd946ca1f9376aac386e423afa6a431661f88090f23064f430a86
 EBUILD gnome-menus-3.0.1-r2.ebuild 2206 SHA256 23d9e981e9155512e7929ce28ddc46fbdd6a8d869d0702de3c0e8641235468ce SHA512 9b8961a351bea57f5ba548334c5f3cae34e389b988931c2ac6bb6d2414050131e23298065e49b1a49f09e3d70c7d727ac85055bd016d9809ab4ba320d52d01d8 WHIRLPOOL 2a159c661b56c28e48518152aac51f562ee0c8580a4c024004f1e3368d201b220c88caa21a6a85862d31c47af3abd1f789ac5deba990b270de8be612988ee675
 EBUILD gnome-menus-3.4.2-r1.ebuild 3185 SHA256 353f82dda5686f0f3d64f047c340b36b1fb9fda3cc82aaca41468b36f31364d9 SHA512 e2efcecc6b1cfa3b4fdc534aef837746f5ec6f41ac872f7a6c21c9af8fc297d599f25afe82eb67446bb06de8aaf9d86102737d73c0979be735f5eb6eeb6a84d1 WHIRLPOOL 4cac9da70d8733811ca77fcf8127933f55f25fae1ee1a304e53a651b962f1e9bb298994792cc162183b4cf43ea4cc2e576a85f0b9500e055f848a66acfad08c7
 EBUILD gnome-menus-3.6.1-r2.ebuild 3038 SHA256 f17c8adcc2ab02d69c419c49464bbbcc5ef203df891e16a460e601b478aa07f0 SHA512 09158f995658c3009d63172fe7dbc7e4cd70b7526a9c04fc87cfa5e104bb47d0940b68cedbba7089ca973ab1d63e11b45aeeb4ca970dcb8dd94734631904699b WHIRLPOOL 52bbc7fd9c60e0f56a4bc3071ffbcd9e26a03899229bc26952de4e4a5ea30d66983e8a5d2486b203d8fd401620456b3b0ea427f65e17a9b5bfc51f0c792e4121
-MISC ChangeLog 26604 SHA256 2338eff10434dcbdccec24ff55c67baca15042761c3c2d11c0402ac0f9dc2fff SHA512 648e8ea85658cdb110f3202397b74dac6e431bb7f051b4ab2394d6022da6b9009c35e8596d6adfc4f10391219f8e369fad36a9445ca53d33b33f4f872fa047e4 WHIRLPOOL eca6fc93b22cf3d2291c5a97e0616c37595a122352b437389b3f75d46b6b5385a64b205fdb94b415762669c0dec35bbc7b61035e9523109b46f76377f0a1b27a
+EBUILD gnome-menus-3.6.2.ebuild 2914 SHA256 228c56b929906a0be6e56889c74f6f9f527087b989ffae8b44bdb973f6f7758c SHA512 e44d210aba6b8b603ea9c350c1d7cf764e02b3b211b9615b7017f7c7df072282f233e97d482d27150ea67ad38a4f5a4b5a4dac8e0a3837f206b5580d73c5ac6e WHIRLPOOL a9de37d74d9166d885374b327649cf556d594f88b2e014b7d7be88e0edb7cac5983bbe4a2a7c10e7aedf11242d819517fc54e8b8e46c6b05c2527fee045a5ac8
+MISC ChangeLog 26743 SHA256 f32081bd0a340f51ecdb9d1d0ab930595b8109f4666c36d60e778e5737977c86 SHA512 1085433329d9e0176dd8808802149c1fbb9a7e5dcb5da433586a3b12b33f06ae4baecbe471e35bb7da4ba53fd5389a78d5a4329901223a838364f4e5f27bffa6 WHIRLPOOL d06db939d1c99ecf47d6056451aa09e70be07c35f596ee42f9ab8a45aabeaa3d6526fdb78bb9c2b8685d310efd29912a8b1f6c2f053a254f7c6404e71ac1cebd
 MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ0Y8VAAoJEJ0WA1zPCt1hs1oH/3bZm3nbGhLZ31TwvYhcpMN/
-74DR+WziLbhezrt1XDC9rnzN71xvIjK7eQ13U6E4kgwkHcjn2qcEz6w2wRSZIPNQ
-kt3NQTDFLuBq3hD6FveGKKB4Ec7yClrxMeYFfT59Z8sXh8LjU9uexGf6O0UmDuwH
-rMvZ5/Ed4IE6o46i/Cb0Fh1Ib+yS5iw3+9SxLqszcpDpxS5fFXR1hQBoI4GDOJkL
-re/BDyEkuvAovzYuqDRNpoOh+vj3Ee5E4BCYKl1tiZrbtLV4AxaFkEMjw2cSr5u7
-UEe4RWsNFbPYKoi9WH+PYlT15c3osriPY4cgJbYq4yY4/svtyXgAdpGmwnw5xqg=
-=lL7C
+iQEcBAEBCAAGBQJQ/lAkAAoJEJ0WA1zPCt1ht9UH/jZje72cASi0nOO2dW2D4CT9
+O2lgtF4522Dr2u8EKtrO43kuFmifMUHQJS5uKTFuUKqVDbifwMswHDcdAEr5vsMJ
+dQ3WLm0qNXgEKwFXTHy7GHwyRSUUoG4XmHUk/wKUM1tlLqQEXPVTZIaEgXXCKTKI
+lPd3gZQ4+zlWmY0LYSNuB/maIMmZhYZCKkLYicUSSB0MtwfmUOiaN2DA+p8nWidN
+dp0vDwX02LjyqpYnYYIC4RYR/gy9SrJ/YBxVuw+QM2uZSXTEAeSu2rfhXcQ5ppc3
+1nG1Hq9EZe1M3wHgyj3OVh9PTB+usCIec5qY0hjqmDyk3f15FAZS6ql8KUAbYis=
+=PfHQ
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-menus/gnome-menus-3.6.2.ebuild b/gnome-base/gnome-menus/gnome-menus-3.6.2.ebuild
new file mode 100644
index 000000000000..71389155d08f
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-3.6.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2013 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.6.2.ebuild,v 1.1 2013/01/22 08:38:59 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit gnome2 python-r1
+
+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"
+REQUIRED_USE="python? ( introspection )"
+
+COMMON_DEPEND=">=dev-libs/glib-2.29.15:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		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}
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-libs/gjs )"
+
+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_copy_sources
+	else
+		sed -e 's/\(SUBDIRS.*\) simple-editor/\1/' \
+			-i Makefile.* || die "sed failed"
+	fi
+}
+
+src_configure() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+	# Do NOT compile with --disable-debug/--enable-debug=no
+	# It disables api usage checks
+	G2CONF="${G2CONF}
+		$(usex debug --enable-debug=yes --enable-debug=minimum)
+		$(use_enable introspection)
+		--disable-static"
+
+	if use python; then
+		python_foreach_impl run_in_build_dir gnome2_src_configure
+	else
+		gnome2_src_configure
+	fi
+}
+
+src_compile() {
+	if use python; then
+		python_foreach_impl run_in_build_dir gnome2_src_compile
+	else
+		gnome2_src_compile
+	fi
+}
+
+src_test() {
+	if use python; then
+		python_foreach_impl run_in_build_dir default
+	else
+		default
+	fi
+}
+
+src_install() {
+	if use python; then
+		installing() {
+			gnome2_src_install
+			# Massage shebang to make python_doscript happy
+			sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
+				-i simple-editor/gmenu-simple-editor || die
+				python_doscript simple-editor/gmenu-simple-editor
+			}
+		python_foreach_impl run_in_build_dir installing
+	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
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null
+}