Version bump.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 105 insertions, 74 deletions

diff --git a/x11-misc/alacarte/ChangeLog b/x11-misc/alacarte/ChangeLog
index 25df4ea9416d..35e053681b5f 100644
--- a/x11-misc/alacarte/ChangeLog
+++ b/x11-misc/alacarte/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/alacarte
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.114 2012/05/24 05:01:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.115 2012/10/28 16:50:07 eva Exp $
+
+*alacarte-0.13.4 (28 Oct 2012)
+
+  28 Oct 2012; Gilles Dartiguelongue <eva@gentoo.org> -alacarte-0.12.4.ebuild,
+  +alacarte-0.13.4.ebuild:
+  Version bump.
 
 *alacarte-0.13.3 (24 May 2012)
 
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index 1d54c8d69085..070029b808bc 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -1,29 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX alacarte-0.11.5-python-2.6.patch 448 RMD160 db11ef6e261fa0b72af5eeb02a810834288898fb SHA1 e7c0dfed53e4ef4ce06342dea5c8b675b516a703 SHA256 ea7a0b5962de081766809268ce226bd6b606e15d76110b32157af6f3a0c1affa
-AUX alacarte-0.13.2-selection_browse.patch 1066 RMD160 7bd0a5ffc720932d2547b54fd5ba49948b122a08 SHA1 8a208340c60c5ae2cd4679f1182a1f84b015a298 SHA256 f575383f14baa5a4bef875c214ace7eb01aacbc21bea6d7a189ecc273d61cc77
-AUX alacarte-0.13.2-settings_menu.patch 4766 RMD160 c55d170ded2b88182b6efc60606dcec1cf6c007d SHA1 78e69196da2e7b37c9a4d0d9c940187ce27d7ffd SHA256 64610f00ed9f0f78c28d6cadbb00e59ca5dc18e1675a8011141199bcecf33deb
-AUX alacarte-0.13.3-cursor-changed-selection-none.patch 1503 RMD160 c15d99a0312584e5165bafedb120e11a9289a9bb SHA1 f010ce48d9c83a288a03c22e64877a7f3d53152c SHA256 8b19fc6d6c7c2c8d59c1a36eef5e2a5fa396dae5461a1b1ac951eecb13617346
-AUX alacarte-0.13.3-icon-crash.patch 780 RMD160 516d34ebc20a77dc6e5d56f0b7c82e5fd3dd9b2d SHA1 733b5e1c13df730822085d25cfa5b01f87da19a4 SHA256 504733b065064125214c0a54fae42684d34c842cba43cd765ee370902fc416e7
-AUX alacarte-0.13.3-no-pygtk-checks.patch 2437 RMD160 eb6a0038e12e7cee592372a54ffd5a889405412a SHA1 5df86c589b5e105f14a80ea67333f6701a774805 SHA256 91779fdaba540200cdd9ebfe75b8cc3417fb40c4b83aae95f3518e295df8f873
-DIST alacarte-0.12.4.tar.bz2 189318 RMD160 e0bbef89f1603c2de2ed60d6de087c3407f06040 SHA1 a44b3c3bba625c570d3ef7f451f912e537fccedb SHA256 f5bccd47d96b22ee73cf537d86bb90cb7b7e0f70ac68253fe512540e5bf64823
-DIST alacarte-0.13.2.tar.bz2 193746 RMD160 97924d34e9d460267b6118a01488b635551a8aaa SHA1 6eb6a0f308be0da84ead38fbfae0b247743f6038 SHA256 9fa36e5181b1eea947b184cb0f79d796b25cc5a5f122819a1ac2ff01bc7ee4ed
-DIST alacarte-0.13.3.tar.xz 178044 RMD160 38b8835a1ebf1f58253cbd4d022ab8cb47b62279 SHA1 5ffb7dd7081cc116582aa29c2dc9752925583db4 SHA256 47671bcc346096f19e9f569297a1b91502b78042ba14c15d9d6dd3a2e1427e07
-EBUILD alacarte-0.12.4.ebuild 1131 RMD160 65f75695e3f2200952129bd081d1a997ca03e9c6 SHA1 63251e65955801d5b6076cbdb5d0bc614528693b SHA256 f07a38e1b6539b94a285fa74853436c550cbfbe1d9f6686669e3ef5f0bfcbf19
-EBUILD alacarte-0.13.2-r50.ebuild 1928 RMD160 87b9a323c19f4ba4c16b1c7199680f95f092b9af SHA1 269dab6bc1f4e6db1d8c0e1a5deb75ffa7f949a2 SHA256 d35afcb5db4a38f37f12c3d46ad6f1133941362e41ee0f3a6d68185f2b2be8aa
-EBUILD alacarte-0.13.2.ebuild 1542 RMD160 cfc3249d44ba719ebdeb1c2e9c8296c6fa6fb90c SHA1 f7956abf42d8c73fdcd4fcd8985935a9918f6299 SHA256 b880297857fba7100b9583d2b5a4be64cd2880b9e9084f9bc1b3009e22701267
-EBUILD alacarte-0.13.3.ebuild 1964 RMD160 88f659e04e91bdd30c30bf6fa12b598745a54add SHA1 e3f7bee325a2aaeac8cea3520896f4b402707ec9 SHA256 67b009da773c1df0c6add9344ce0b2a9bc841127e320b091845ea9b7a4d79dfa
-MISC ChangeLog 14839 RMD160 7cf59d1d5565f73e21a9d11b8f10a5bb81581368 SHA1 286c7688368ba1097aceae4938f30bca4058d94d SHA256 0ee3bcd44ded215dbce6bb7ac4b31373ca81064efb2b7fbe0b4b98a21f04affa
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+AUX alacarte-0.11.5-python-2.6.patch 448 SHA256 ea7a0b5962de081766809268ce226bd6b606e15d76110b32157af6f3a0c1affa SHA512 3b633805a551bf902a79badef8692f0b29926e43818494175ba47082187acbeb85836426cdbd0263d39a3cbe74198b3394d29195497558cf8b7739defdd34321 WHIRLPOOL d7a5e63630db0a9f5525d92a6830010d2ef9b303284ffe3c98c93adb2fbc923218075bdec29613f351f81b1b1e191e4d927155cdfdaabd6fb5b89a36c461c184
+AUX alacarte-0.13.2-selection_browse.patch 1066 SHA256 f575383f14baa5a4bef875c214ace7eb01aacbc21bea6d7a189ecc273d61cc77 SHA512 b3ccb2872e161abd8c284375df2280553baa8b69c880fa8dc41c6a727f8a9caa4d977cd7c31f35642351fa53e43aeaf2e946aa4f928bca006a5c0fcfb225e2f5 WHIRLPOOL 27fcc65eca259b167988e1faf3048bf6f13dfaaf2611e39d17af47608ee12446191c060b009770f4e3c0cbfe014e44865c8e58afbd6cd1e88c7d7b0ed2116acb
+AUX alacarte-0.13.2-settings_menu.patch 4766 SHA256 64610f00ed9f0f78c28d6cadbb00e59ca5dc18e1675a8011141199bcecf33deb SHA512 3a7dafeaf24039aee720c9c9d67120dd4dcba29fba22e9eab5cd5b66d5857047777bc7b03be480f39fe0c6289b564f3bf78dc08bd413467e273da8421f81b782 WHIRLPOOL e80f865eb45328b82aceff745af908b9a76729a492c2fb3b03ec65a333bddea45b1adebfec2674c464bef0003e2416fc9dd4de922b4b0fa510b2b0b39c275140
+AUX alacarte-0.13.3-cursor-changed-selection-none.patch 1503 SHA256 8b19fc6d6c7c2c8d59c1a36eef5e2a5fa396dae5461a1b1ac951eecb13617346 SHA512 7074f832ce2713b9e147a02ec027526be26ac030a3f4624b6ae98f5fecf505d1d4217a6f7e12c0a57ba52851b49876dc71fa9508f45d0a4e940f5d41df22fa1d WHIRLPOOL a52d3bf338a5aca005bf55e1ce828134d725891f348a0e529cceaff8d21b8dd05b976c7eb6ebb7b8f675bbc5c67836a9c895c9e9d304cea50e46214e04064b9f
+AUX alacarte-0.13.3-icon-crash.patch 780 SHA256 504733b065064125214c0a54fae42684d34c842cba43cd765ee370902fc416e7 SHA512 15aad31bcbd3e69250d362de9e538b232525e6d9d402824b3a52280d2e391a6f1cebe05479874fa0dec129a16ae8980edc6b9da0b926c625514028c2d897ffc7 WHIRLPOOL da07a1226bc8597e30b04237b9877527e1c4897d4d0c7a941e1063ff525c5be8236fff15086cf1faf6fe796440f8b00bfe985256858be9e0b78867570e6a2b28
+AUX alacarte-0.13.3-no-pygtk-checks.patch 2437 SHA256 91779fdaba540200cdd9ebfe75b8cc3417fb40c4b83aae95f3518e295df8f873 SHA512 8f89885df7ab1b17c1014734bae1d2972d71bc1e25324237b99c6b89e762276e989f1593869db066e7f30a15408ec01485bf4eac8976ea6abf95f815ed22d5cc WHIRLPOOL e4a3b02b11be90ab8a6717507df399434fbd82b9c1f097ec87c2f918f15a84bfb77534666708ca2369331f4196bf90bbf121b2622e82832bbc3a758bf371d469
+DIST alacarte-0.13.2.tar.bz2 193746 SHA256 9fa36e5181b1eea947b184cb0f79d796b25cc5a5f122819a1ac2ff01bc7ee4ed
+DIST alacarte-0.13.3.tar.xz 178044 SHA256 47671bcc346096f19e9f569297a1b91502b78042ba14c15d9d6dd3a2e1427e07 SHA512 eb5f885d33ee322c43c93281381367f834314ca2b2ab014077e59f14d2134958a6015fe1d4bcf6d952d5145775d7bf44040ec4164978e63072c7f71cdf0cf3c2 WHIRLPOOL 3b8efd97a18c3500d64371f2a3e58eaa2145c5aee744dfb3536db38b675dafbfc766821711745b31296adcfdca5967b8c7cf20dae60397863afcfbdbc544fbd0
+DIST alacarte-0.13.4.tar.xz 175720 SHA256 a45953dfbd799d718ebafe850c0b20e581827023e8da4ee906edb1f60d6a4098 SHA512 71934074b6c1d0fb61323639dfa9797a72931251aee0c14c0d92ff6a4a5889399bee2aa3406a0e769d5604389b8a1b252f5bf5b402b6db8e3703ddc20b6cf85e WHIRLPOOL a9b7450bb1e78a743e3ea6393b35209d42919fd128dcfa055417ce579c89e2cbd7739f7baf3278fc2d6af7cea4fd8292c26fd34522ed10ab851c9190b59852d3
+EBUILD alacarte-0.13.2-r50.ebuild 1928 SHA256 d35afcb5db4a38f37f12c3d46ad6f1133941362e41ee0f3a6d68185f2b2be8aa SHA512 dbd6014e0786aa9cd592073dd926cf0bb9a07d81dca8ab6c47f0fdcbd9b793427bcce04ca9dccc9b3225f65b4b9e416d05cef82ff4d6fd2082107e91a751a4e8 WHIRLPOOL 1b076f13e658492070b61a0bd1546a6bb293ef7bb453cc44f3ed6dd045956f30493ea7291b8b9fecd08932c13ede66aa1b6fc2a54360692b3efe0cfd4c4a2f1c
+EBUILD alacarte-0.13.2.ebuild 1542 SHA256 b880297857fba7100b9583d2b5a4be64cd2880b9e9084f9bc1b3009e22701267 SHA512 006a12becc38fa03770d1ec8f823084235dbfa4201c7341cad6ddfd1257905be9f9a29ee171a3a06029cfa3b334c941d2a6fd9b968b90efdba90f4d1b65dada6 WHIRLPOOL 8eac01ec96d1c29a66c71045025edf31ca5f287b9a5745cc1bb036d78ed68e3242bbe4f5650190a3e092ba0831e01e24878c56f540e7f08859a528daf079fbc4
+EBUILD alacarte-0.13.3.ebuild 1964 SHA256 67b009da773c1df0c6add9344ce0b2a9bc841127e320b091845ea9b7a4d79dfa SHA512 0ba8759252e576e7fcafb55a712e68eca95e640422b0f54f14a2bd2a6d28a96c2afab4fbfb20f39ed5911309dca3f08d2dba8df04dd7ba9877421670d2fbb33a WHIRLPOOL 430d5e170905a6a9f1e9df5e41dbfb58ff3e46b720f502acc10979523b78cade8abe334ef3b9437daf53886f88a10715f3d2b63c7d1fb1b5e153f0b54b6b6ac4
+EBUILD alacarte-0.13.4.ebuild 1586 SHA256 67700c647f2c50332fafa50b11028f89208dffc4679b467182b0cc00faa75e0e SHA512 42972706ec7c638a6582e43e503a326da23b5effb47290fc473036389d155dc1c4ddb405cc481002ad59d4a9cf6de3c08857f5c37e36fdc61ac6684160fb39f3 WHIRLPOOL c5c21586607fcd78eb517db807ebf64660cbe5f85ef7e30c9344a4c3321d7441752fdeef65cfce35cf055fb4799e299237cb4e48da6975d0fd88026544544c48
+MISC ChangeLog 14988 SHA256 8bf0b14aa51af85d979eeb59523e96b22af8a3c8f04ce039911989f8009cf375 SHA512 fc938f0bc52701041367d53160e40aee71716b9f01a3e34defaa9b83727aa92af900e8a5fcb69a8d4724e507cf90a8ad5be89fcdd8042ae5f2668907e1410f05 WHIRLPOOL 96ae89a960a127f087ebc8fa65c85a992f07d41288faee01dcf0887e7d086a19990d1447a6d0f291a44579fcdee696a4a990bb80e82bb0e81e97b41f9a787318
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPvcCjAAoJEJ0WA1zPCt1hAGMIAJ3eAFncsNF7T2Wwp3Ut2ahz
-tCkG/ad749SPkhs/Owff3MVW+bexZYQzQBfZZ2plYAstcBOoJXuIKtOHZNzHDzMM
-Y42xpgelYWxFTMO1GKPZxZB1dfwdTiQR0L8s3i3n2wXQG1jIuTLq0cPt/mc/4GcQ
-ayynEoaMsOrc5hYWhGjW71niyVf3oNfiaMZCOIznwLRg8ZAvc6yt8JFJBp73oPG0
-zxOi19y7Sw+TVEkpTQ1U5NAoWItryWB7zX3GlNZzQLPOI4eM0k73y699fZIpLzyL
-8M1RPRFzYp1q9sTJO61g3bU9eNeet7WAoyRtzFLE+loF5HhWCRlPN0YVQ90XBNk=
-=6zEY
+iEYEAREIAAYFAlCNYkAACgkQ1fmVwcYIWAbMCQCZAdO/QNt9NhAwGrB4JGJAd/lO
+fCcAoLL0BzbA8OBkVJjkqAvvuC9626aT
+=UJQe
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/alacarte/alacarte-0.12.4.ebuild b/x11-misc/alacarte/alacarte-0.12.4.ebuild
deleted file mode 100644
index 704472f014eb..000000000000
--- a/x11-misc/alacarte/alacarte-0.12.4.ebuild
+++ /dev/null
@@ -1,50 +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.12.4.ebuild,v 1.10 2012/05/05 04:53:41 jdhore Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 multilib python
-
-DESCRIPTION="Simple GNOME menu editor"
-HOMEPAGE="http://live.gnome.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-SLOT=0
-
-common_depends=">=dev-lang/python-2.4
-	>=dev-python/pygobject-2.15.1:2
-	>=dev-python/pygtk-2.13
-	>=gnome-base/gnome-menus-2.27.92:0[python]"
-
-RDEPEND="${common_depends}
-	>=gnome-base/gnome-panel-2.16"
-
-DEPEND="${common_depends}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_need_rebuild
-	python_mod_optimize $(python_get_sitedir)/Alacarte
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/Alacarte
-}
diff --git a/x11-misc/alacarte/alacarte-0.13.4.ebuild b/x11-misc/alacarte/alacarte-0.13.4.ebuild
new file mode 100644
index 000000000000..5e5d9ca0bc23
--- /dev/null
+++ b/x11-misc/alacarte/alacarte-0.13.4.ebuild
@@ -0,0 +1,79 @@
+# 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.1 2012/10/28 16:50:07 eva 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
+}