Version bump, drop old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 65 insertions, 136 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 1e318b06d146..1c8b28d6e339 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.196 2013/08/28 18:44:48 jbartosik Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.197 2013/10/26 19:33:12 pacho Exp $
+
+*gnome-menus-3.8.1 (26 Oct 2013)
+
+  26 Oct 2013; Pacho Ramos <pacho@gentoo.org> +gnome-menus-3.8.1.ebuild,
+  -gnome-menus-3.6.2.ebuild:
+  Version bump, drop old
 
 *gnome-menus-3.8.0-r2 (28 Aug 2013)
 
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
index b56c1faac36b..22d342dc0258 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -12,29 +12,18 @@ AUX gnome-menus-3.8.0-gnome-calculator.patch 1765 SHA256 fa6134f15df7add10fc25fc
 AUX gnome-menus-3.8.0-ignore_kde_standalone.patch 1665 SHA256 5b27f8f02786db7383287bb233cc990934524e152778802e4c815307424e5d48 SHA512 db461006883594de834fff029b3aa769afa6955bc94062865d8c71ec224fdd64867693763c3ecb98921c98c7410bacf18dc2110b5322e1956c877e7fcf61bef0 WHIRLPOOL 5661aa027bcad2e380ca46f94143b043f43adc3ebe6ddcd9d21d951b3ab2a7d28167aa9faca183dd39d707428514b09fbe736dc0fa8bf72972230da5ab83f84e
 DIST gnome-menus-2.30.5.tar.bz2 471327 SHA256 6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa SHA512 e2722f8fc11d99b58de601171e10f87efd64e8752c26d3e2126ff909a4c263cd8be4842d3592b1029396fecf832aa094630fec2e47ea711a363cd03de2980a22 WHIRLPOOL e0d350971ecb541757ce2282e67010d29807eda61fb79be10e132fddd654529030991648d102cda43c15d0148cafc1627a814aff0b6292f947717e16f697a1bf
 DIST gnome-menus-3.0.1.tar.bz2 474839 SHA256 579c119c26f37781f66708e867ea45b3c37589b3b69e5b32d33e9bdb944165f0 SHA512 05eda56b741d7236b17276b3b208b8370ec8ff0db82e32a2c0adb84334c4d9365fe61dea08183858fb7c0093cf04a02ba1311483e3318dbe816a02c28f4198eb WHIRLPOOL f2583e79ea6aef0c5cffb94001ceba166b97e237861b51d39530155f36720bcfabbf50af0a16735f8112e44a7b8d7243ae9460285f590a0c2a351ad2203dc85e
-DIST gnome-menus-3.6.2.tar.xz 423948 SHA256 f6cefb25ce3ca2a0e4cb43894089cc6079bf948230e99bc0e244b380fa84bf4f SHA512 53beac950e40f121327ab404f42094350c8b2567dbc14e90ee21b5bf514e528bac12beba943f13008a6b860227e01bc630aedb733ae71a9f824688ce640c6ed5 WHIRLPOOL 5f38e1f1c182f67df05a66756c76754737ca5afe2b25e23354c7aead4d8877169c2443fd3a60eeb4bfd4d1fe7193f7d8db9c95afc5f1e4fb505a2d35eed213c2
 DIST gnome-menus-3.8.0.tar.xz 420556 SHA256 33c215ae8d815f4a94d2dbfc8c6679fddbbf8026d30da55a350e67ea940ce14f SHA512 b5c4e02583f1ed8dba1e658a696be3899b910fa99e94fbd897f35d7c677f232b9d501d7366b686f37bd9ba96ecca1a6efd668dd5fafb99500c3e91130a7b15aa WHIRLPOOL b805a128627713081cf7380f34f69a071c583f66b5ec6ec93829a6aa32a073991a6dc1cfaa40a3f45230ec91b41875c7f69b80605554b1441340303c1bffa996
+DIST gnome-menus-3.8.1.tar.xz 398652 SHA256 787aadd6d6c7e9b699fd4d8f04696c9559bc3eb9534c3fb3791e1d12bc21db57 SHA512 bfa319dceedab147d507b59b92d7b7698d5a90bc41cabd2773243b07d79d56b9c29c91d0fd836e86783ee560d0cb91812bc301b0d418e5b11f4aabde15f07635 WHIRLPOOL bbeab6704fdf7a61821c9a731fb4731abd05bf74bf29ec431ef83403e0ced491bbe41b35102607f3090f996cd0fe0150b3e6f7cb3a9f3e6d9f9b70142bf595e6
 EBUILD gnome-menus-2.30.5-r1.ebuild 2668 SHA256 5e2b7b9552469aca78c3dce9112d6b6867a922f84074814f224e8384f36671a4 SHA512 f98647ec8aadd2d28f523b215019c8f830cc419414ccee8f405b910019e2558c8c9c06a429d15e1eb838262b1cc501e1c6665bf9cfb8c64f26e8ed8798e26f37 WHIRLPOOL 9cfc8809793240e53e76c59085399b3517dcb42f91a7a9797e15381912838516ab89a140d27fc042c5a34ce8ccc472dd21942ef6777d26e91746e206de66fa0e
 EBUILD gnome-menus-3.0.1-r2.ebuild 2206 SHA256 23d9e981e9155512e7929ce28ddc46fbdd6a8d869d0702de3c0e8641235468ce SHA512 9b8961a351bea57f5ba548334c5f3cae34e389b988931c2ac6bb6d2414050131e23298065e49b1a49f09e3d70c7d727ac85055bd016d9809ab4ba320d52d01d8 WHIRLPOOL 2a159c661b56c28e48518152aac51f562ee0c8580a4c024004f1e3368d201b220c88caa21a6a85862d31c47af3abd1f789ac5deba990b270de8be612988ee675
-EBUILD gnome-menus-3.6.2.ebuild 2940 SHA256 fe1b5f8cd1a2d79457ff975c04905092590030aa40ee950a8db89f446c0542ba SHA512 9a08bed7fa242d1c56b948894f1090d93afeab4650c8733695ef0b6fdeadd5617a4914959c867ed5e90a0ffcf342743cf03c60949742326359960c416bc39e19 WHIRLPOOL 2a3a12482f184f1ee92d6b32fb8723a4d7c1cb20693b8d0ad25e5e674285113572c4cf262361451f9770fb961a2028f18f598144390ed34e2d261cc37fee0073
 EBUILD gnome-menus-3.8.0-r2.ebuild 1690 SHA256 a561275e3e7e1cefcc377c9f0d9b534aafb7c0478f792af2266e119196251f71 SHA512 e1280adcbcb291daf6e7f4abeafe219efa10f83aa94a69097512d882bc8d62494af022a7e588346fc542f944eca1a96527f9eee8f74e4dfc24dbcc682a198f86 WHIRLPOOL 65811d33db5be814011075a0dffedee7304d58f513dee0d080f4cb45e59b6b86da7129ff70dc4d6af46c2735cc501d1401fc8da531acadc26afdad40844edb96
-MISC ChangeLog 28923 SHA256 71448aa3dabdc0b290d98b64f66fe0dc485212b55752b6fd3ffc56e156bda82d SHA512 1d948853f156ba8c227b8794eed93b837d90238e7d808b288027a13d00a11f342d6f6a1e00d04c551d6792549dc924b37e1e806d4f37215abf04889d649574a1 WHIRLPOOL 0725bd9e5b37730d5694c4a36226f49776e705c29f3dfb1f316897451bbf50a99678768119f2a8c230bfd3651a3faa7497575d3795735cc1d8038ff5c8303c8e
-MISC gnome-menus-3.8.0-r1.ebuild.orig 1741 SHA256 ecc71a20aef70967df228366381eccf03d2b6c50ff57bba525c5ce32da2be34b SHA512 34fbce802d69b3b65feb8ff7acb0fa61666c15e50382a789bfc982cc4aacc306e4a1186a09d306ef2b867bd64e572c802234a4b4ec2b935b546962360a852129 WHIRLPOOL abb49322f12d9aae9fb5deb50ac96e1415b3546273f8b8fc3165012b1abd9b865d3018ac0c6381a28d488b423f9b786f44bc20a29616c38e569ed9f0901fa7b5
+EBUILD gnome-menus-3.8.1.ebuild 1446 SHA256 cf652d48914264a36bbb08c3d7fd1d22b05f72fbf8799a02b182d2663a063d30 SHA512 e4a332893740c454d79fc9d5bba17cb6575f22b8f87953f37c46d853b1400abcf166d62732b0a270cf2d7fa3b57e2fda849933b3f277ad5b4cb37e3ac7d628de WHIRLPOOL cb6811202f86d3822b0e30bf0fe04eca93419b32a11d19271d8c4af5e7403dd2caa69d8fde57bd68d3e47682b9c274b35bb7c7fe36ecff7e566ad446020d1104
+MISC ChangeLog 29081 SHA256 398334a81f2a77745f87a290146388753c57918eee5e55ae10595b323d8ba1b3 SHA512 709af79deac0057d117cb67576ea6c9731171d32288e1168daa5a930f9f2ab29ec84a98d78eb3b2e56fcf1eea66890911d89ebeef032bd8bb19ce26adb1ab5ec WHIRLPOOL d8851b1b3d884a73b73b9e134b2391ffca17a2ad2265cfb97d3817ef9c1af831881c99c0c5fa7335090db4b53542f778621aa3ecad54adcbc244a03471088dea
 MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSHk7mAAoJEOQW1tyOzhJl7jkP/0oJlU0T3yC079ApfFzhQ8rc
-jfZXYjeeXMlKwzdD0L4hhDJ+oSSXvb0HxEEf+f+M4fU/ZOA7QG9sfmyjxzy5BjN9
-8pIMnnP4v3LMHlWRN4EuyXpfZhXU23vqL9+Dc3myxt4uNDnCe4PqX+Vd+4XM0tqb
-rHVnu1e79hxLuFmP3xyU5SEBZ5v9mCSjgvR0P1ek6bCyXrBt6hlV3M+uu0P3b7U4
-5GWTtBa0STL1zP8JdSz3VoAOcbBkYj20zubldidU1kqjbapTKDF3afbyxMaRnp8n
-9+1mtfT31HUQ56wATB452AYDKW6QEAjejaic3olRXkDJAha7ojiM3lUSWckJuRkI
-j3vkHJrdS1X02dNKW/fiGBcjLSv1yjHtsQBLH4k7i8yZXRVbjXBkVtvsOk+Jz6XQ
-y2r/DcvXfmpwj9FZws49xidCaWYPXbVcdfZkqHXwLLkkFqDlf/jCaabe9c4C/X5h
-w7gH5i+Ua7TJC+7BHNeczuF4+VVMLsSjsANnJr/tlyE5L4t7rbE7GtsyhzUUVWvt
-V4mYj5xeLFng4+931YFgks1NZsYufyKiZEhAVEjGvZQIP/jL3EGEPTvwCKb+tKcc
-6FTqVpS7phsLtvuMk+NsFZMlrtNGGciex8vIrlgvSZscSbqddH1AvbqqbTnSf498
-l12fVHvxt/DHfm4xEYEP
-=ebVr
+iEYEAREIAAYFAlJsGPkACgkQCaWpQKGI+9QiyQCdGbIrQifnwWdTQIUOlVFZ6nEm
+hTwAnR5oFt2Dq8dUWHm2gO5cumIK8+b6
+=2zF0
 -----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
deleted file mode 100644
index fb5765dc8751..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-3.6.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.2 2013/06/02 00:12:13 abcd 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? (
-		${PYTHON_REQUIRED_USE}
-		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
-}
diff --git a/gnome-base/gnome-menus/gnome-menus-3.8.1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.8.1.ebuild
new file mode 100644
index 000000000000..89068d2cb500
--- /dev/null
+++ b/gnome-base/gnome-menus/gnome-menus-3.8.1.ebuild
@@ -0,0 +1,51 @@
+# 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.8.1.ebuild,v 1.1 2013/10/26 19:33:12 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Library for the Desktop Menu fd.o specification"
+HOMEPAGE="https://git.gnome.org/browse/gnome-menus"
+
+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"
+
+IUSE="debug +introspection test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.29.15:2
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+"
+# 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() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+	# Don't show KDE standalone settings desktop files in GNOME others menu
+	epatch "${FILESDIR}/${PN}-3.8.0-ignore_kde_standalone.patch"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Do NOT compile with --disable-debug/--enable-debug=no
+	# It disables api usage checks
+	gnome2_src_configure \
+		$(usex debug --enable-debug=yes --enable-debug=minimum) \
+		$(use_enable introspection) \
+		--disable-static
+}