Version bump for Gnome 3.10

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

4 files changed, 17 insertions, 101 deletions

diff --git a/x11-misc/alacarte/ChangeLog b/x11-misc/alacarte/ChangeLog
index 997bbf7d4e31..e32f15ba3cd2 100644
--- a/x11-misc/alacarte/ChangeLog
+++ b/x11-misc/alacarte/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/alacarte
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.121 2013/12/08 19:49:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.122 2013/12/24 17:43:13 pacho Exp $
+
+*alacarte-3.10.0 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +alacarte-3.10.0.ebuild,
+  -alacarte-0.13.4.ebuild, -alacarte-3.6.1-r1.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> alacarte-3.7.90.ebuild:
   x86 stable, bug #478252
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index 03678865a3e7..0a727a2e3e3a 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -2,19 +2,17 @@
 Hash: SHA256
 
 DIST alacarte-0.13.2.tar.bz2 193746 SHA256 9fa36e5181b1eea947b184cb0f79d796b25cc5a5f122819a1ac2ff01bc7ee4ed SHA512 3922f3137e2d35c3a963c2adbbebc650d27a6e665dfdccd9d71928db816eea2ecd71d7df56d74a1103dcc3f047e298afb84435eda5b67d35adbcb4f19287a195 WHIRLPOOL 2c4ae1a4d19e8b281a0d3622d70afa62c47b67f8ea57cdf03f72ca4bb0f0f4472948f07b9d6bf638b6c82f0c298ceb435f912a75fb327305a51d8a5347eda44e
-DIST alacarte-0.13.4.tar.xz 175720 SHA256 a45953dfbd799d718ebafe850c0b20e581827023e8da4ee906edb1f60d6a4098 SHA512 71934074b6c1d0fb61323639dfa9797a72931251aee0c14c0d92ff6a4a5889399bee2aa3406a0e769d5604389b8a1b252f5bf5b402b6db8e3703ddc20b6cf85e WHIRLPOOL a9b7450bb1e78a743e3ea6393b35209d42919fd128dcfa055417ce579c89e2cbd7739f7baf3278fc2d6af7cea4fd8292c26fd34522ed10ab851c9190b59852d3
-DIST alacarte-3.6.1.tar.xz 177640 SHA256 7e17bd80e43130afea6372a957777d289c9b9b6d4893aa20ad3f45bbd48dd25e SHA512 846d560c8a3fffddcce41f7298e6a38b0a5a375f5a52647c61c42286cafc53c5b23c40a42a26743138427606e528ae0d340a38bb477a036a4de9337c61995b13 WHIRLPOOL 222436286e4fb7b11df17d139b82afb5ac031156286c068121e8fa435fc65311b197819d37400acce3ae173fde6e7613d6812513e8f245db6fddad71d49db441
+DIST alacarte-3.10.0.tar.xz 181576 SHA256 bdc91981859a5076ae38a213892074e1263629835702920d47f6ee2bb76179f1 SHA512 7ac46fe754c8ddb83856440ebd1c383ef8ec6f8b9601774442613e1a4ccbbc919eed221b4d4555b9dba3af78dbd985fed4320fbeada4eb68f7c088ebee01f564 WHIRLPOOL 231b64749c033c3e45433d743179437f2f41e9c3cfa99beea99e9040b08ed9eb2d06e25e9d7212d41d5a29a32d4f63fc21e6da091a199c4a180505c13a6b04b7
 DIST alacarte-3.7.90.tar.xz 180172 SHA256 379ae48422ff6bc7b9657d1f9968a83ee4eb8f8c69964dbb8ce2dac6e0b5ccf0 SHA512 dad5858cf55eeaaa2eca7187c57f9f0df78e2e43456a26f79f309624514514562cb83cbe1369f7990afa031c85f9e39d361f3a97938f84d354376c849fb623fc WHIRLPOOL 99dd6c592a4f3a63e9b8541cd6ffb768e0179e4b49e38d9c73ceea3d5187496593e6085fbb9786f5449b0c55650f6ab78ef0edc1b0e9d7f2c1b12c51f72168ea
 EBUILD alacarte-0.13.2.ebuild 1552 SHA256 8884984209c2cab675122036646a56a5db4d9a79fea7a2c848b6fc03ececcdaa SHA512 5c34165a4fe57f5b5785b69fa1787d050017880704ac3a8678ad4613c853310a9924d4480d4e0b0453cfe3ede6780bb0657f4455ead9660a1ea8b23dde7e4fad WHIRLPOOL 41fbb744069cb4f3c8fda2475f9c9340601dadb3f3ec4e13603c7820e39f9d08665fbed010d1028795f07cde521d0d0968ba116f24c369b01fda562ed8f4f452
-EBUILD alacarte-0.13.4.ebuild 1593 SHA256 8ce7e974da0eda27d644cde28a9362f4fb9d95fcad2aeec2556b26baedbc61d2 SHA512 660ce2e8c5796a872aaa78c6d8b42fe9fb3b1bdbf6503fa069e986e6cc918327222c5b525fd422d86af9c2639965e21a40ec35d7cf47d9e61861b98f8fd9a774 WHIRLPOOL dd3cdf1971286e2edf66220f8a675b6969c80164764bced4510b76a96f12cd3dc2096a28f059d092d918b2c557b060f71473b018e82bee8d28814af24f311d96
-EBUILD alacarte-3.6.1-r1.ebuild 1549 SHA256 64b4fa530620c6d8d9d154c8dd5f0111d16897b2aafb6b61a636da47f4f23264 SHA512 28726d1e193d01cc1be256e7fa2cb5dec8504fe76dadb5fbeb91eb372a277ddf8bf14245f97ca4d8f8bc5781fee9f351eeb4d23b9c7cdf5f23ed4f3f700beee2 WHIRLPOOL f15fe199aa4422bf709c02190d5321bdf9d6693717e779ea51cc583c64def810c480f8074af601a0587cfa7cc839c9a695ce98af9befb95864ac487c5b677347
+EBUILD alacarte-3.10.0.ebuild 1429 SHA256 068338857cc65b07771135dec695c14b4169a05736185d021526648f5d076846 SHA512 8c20dfd90d05384a853077c8652ea8e6bf4e71b7ab9c59d2387f2377821f16d14c7af507521daab971324a624e49ea90fab211425c29ac7ac597509dd1113d69 WHIRLPOOL 754b886c43f1728bfa9216b45c959b581847aa232eded04f33a461150fb863e00c152738424405c0dc5dafff3af1a66f3e817e60a7e1811308a810975f1e5956
 EBUILD alacarte-3.7.90.ebuild 1393 SHA256 888bdbceaf0f21a02b1c44c807c86e305e072a9b11ed1e574f93c5bf3ee4cc8b SHA512 4617631259f37f3f3087ddba2ae6647d26bcfc29b6fbbbd1650d2e2092da578e859dc3214a13c18ae3c706bc870bd4c29d8c21c7c1030f3209423c77c8081570 WHIRLPOOL c03ef81f99452527e13cf14495659282240c279f3c5ebf2f57e723eaf4780b2bc251b9cff55d6db6c7ce6b868faacd846793de24f252289d815a46bd900380d6
-MISC ChangeLog 16200 SHA256 16fa9febf22fd15fb5f082b9dca69a45c3f7e736140a3845c0999ebc10e0ab53 SHA512 bd69843603ad4c55506a9dac5eb226550dcad3be2cb5e67d487c91038e7bb75b52f84bacddeebca1848532b7408c92e6bac84c0e60a50c16b36b7dad5be8f680 WHIRLPOOL 82b64814cbb66d62614b09f297ef5a3eda8b239f93367acccd64b51c96f45b9b605382a907999e23deafa87b4bd5d5e26710b8cbc5daf40e7f9c0eab5730f9cb
+MISC ChangeLog 16388 SHA256 5a1c9f5964869e26f74c07a97788d469f0d3a2ba282e931508bbe0af81279065 SHA512 56a70ec9fe7ec5ff3dfeb92c925dba98b158994636406af2ead14a7b81b6af40ccc232c810d2154777ebfac10bf518dac55b508cbbf189ad0bd85b060f71bdcf WHIRLPOOL b66977014ac53fc0871e13e7cd283bdb29955ff1106b366c3efff3cafba56e99c92bf046c33bb7fd0cfd8c38845096631a813e29fb3aaed21f3822f643db8e2a
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkzVYACgkQCaWpQKGI+9RDSwCghsG5AJvzM6x+BLzLbWcFI9Tn
-TF8AnRLEuix3VED9Y9dmllXLY05XZ3AI
-=OXqt
+iEYEAREIAAYFAlK5x7IACgkQCaWpQKGI+9QxRQCfYIb2Rhn65+XZ+HL26wpRRnA5
+nIwAn1OMtwEaFJDa4B3/ugHqM2bVHQ2m
+=fDnp
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/alacarte/alacarte-0.13.4.ebuild b/x11-misc/alacarte/alacarte-0.13.4.ebuild
deleted file mode 100644
index cedfba9b0792..000000000000
--- a/x11-misc/alacarte/alacarte-0.13.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.13.4.ebuild,v 1.2 2012/12/19 10:10:21 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit gnome2 python
-
-DESCRIPTION="Simple GNOME menu editor"
-HOMEPAGE="http://live.gnome.org/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-COMMON_DEPEND="dev-python/pygobject:3
-	>=gnome-base/gnome-menus-3.2.0.1:3[introspection]
-"
-# gnome-panel needed for gnome-desktop-item-edit
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gnome-panel
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	python_pkg_setup
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	python_clean_py-compile_files
-
-	python_copy_sources
-}
-
-src_configure() {
-	configure() {
-		G2CONF="${G2CONF} PYTHON=$(PYTHON -a)"
-		gnome2_src_configure
-	}
-	python_execute_function -s 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
-	python_convert_shebangs -r 2 "${ED}"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize Alacarte
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup Alacarte
-}
diff --git a/x11-misc/alacarte/alacarte-3.6.1-r1.ebuild b/x11-misc/alacarte/alacarte-3.10.0.ebuild
index e9b7e8f73211..71ba18c65232 100644
--- a/x11-misc/alacarte/alacarte-3.6.1-r1.ebuild
+++ b/x11-misc/alacarte/alacarte-3.10.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-3.6.1-r1.ebuild,v 1.1 2012/12/19 10:10:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-3.10.0.ebuild,v 1.1 2013/12/24 17:43:13 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
+# FIXME: support python3 but installs in a weird location
 PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="xml"
-SUPPORT_PYTHON_ABIS="1"
 
 inherit gnome2 python-r1
 
 DESCRIPTION="Simple GNOME menu editor"
-HOMEPAGE="http://live.gnome.org/"
+HOMEPAGE="https://git.gnome.org/browse/alacarte"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -23,9 +23,7 @@ COMMON_DEPEND="
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	>=gnome-base/gnome-menus-3.5.3:3[introspection]
 "
-# gnome-panel needed for gnome-desktop-item-edit
 RDEPEND="${COMMON_DEPEND}
-	gnome-base/gnome-panel
 	x11-libs/gdk-pixbuf:2[introspection]
 	x11-libs/gtk+:3[introspection]
 "
@@ -37,7 +35,6 @@ DEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	gnome2_src_prepare
-
 	python_copy_sources
 }
 
@@ -63,9 +60,3 @@ src_install() {
 		}
 	python_foreach_impl run_in_build_dir installing
 }
-
-run_in_build_dir() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"$@"
-	popd > /dev/null
-}