Move gnome2_src_prepare after eautoreconf (bug #396713, thanks to Julian W. for reporting).

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

3 files changed, 18 insertions, 13 deletions

diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog
index 19a07943fc79..6326cbeb067b 100644
--- a/gnome-extra/gnome-utils/ChangeLog
+++ b/gnome-extra/gnome-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gnome-utils
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.225 2011/12/05 11:29:40 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.226 2012/01/01 23:47:32 tetromino Exp $
+
+  01 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-utils-2.32.0-r2.ebuild:
+  Move gnome2_src_prepare after eautoreconf (bug #396713, thanks to Julian W.
+  for reporting).
 
   05 Dec 2011; Pacho Ramos <pacho@gentoo.org> -gnome-utils-2.32.0-r1.ebuild,
   gnome-utils-3.2.1.ebuild:
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
index db7f32627156..b2ac9969a303 100644
--- a/gnome-extra/gnome-utils/Manifest
+++ b/gnome-extra/gnome-utils/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gnome-utils-2.32.0-fix-uninitialized.patch 903 RMD160 bd78aea0fd11c764e7816bbe4ff9ecf2aa008bc3 SHA1 60b5875f874fbb6da90db7ef6d99199e3f637514 SHA256 e4ded0888d6350452ffc4053edd3c5133fc86807c76c4a6f9d2e311ec2fe3919
 AUX gnome-utils-2.32.0-new-icons.patch 5478 RMD160 157d0dbe228aa773e7ef6783ad940ca4737d1e25 SHA1 00b3b9cdba1e81bfc6ff044652a479bd2524d45b SHA256 9410f0dd5cc2f7484330f5fdaa336355e0b43cd5501ec118db5d14136f870b36
@@ -7,14 +7,14 @@ AUX gnome-utils-2.32.0-new-icons2.patch 564 RMD160 7000ac4e61e129ab40d8d0a09740e
 DIST gnome-utils-2.32.0-icons.tar.xz 153632 RMD160 3e0f88fced7ab807a425de67ce90834894a41b70 SHA1 231f49f11233c1bf5f95763f12d1447fee2c222c SHA256 234e86914fa49daf3b11ffe7efb7090a3caf4146dce41414724b597e0e9c508e
 DIST gnome-utils-2.32.0.tar.bz2 7705320 RMD160 c25667eec2ba4fd0d704c10a92e2e6b071eb1bfc SHA1 68ef7e12280969bde9bee4bbd566ad4ab0572e77 SHA256 033a55cf442096b28ea6292043354feafe000d1e5f4ebb962a9b6d72eb9a93fa
 DIST gnome-utils-3.2.1.tar.xz 7273572 RMD160 a0e34b7057c0b77b58f7310ec8a8a3af238071bd SHA1 2f837a420ea73ad1a1cab56656b450e704f2faab SHA256 3ac1942dbf4d9d394e2fcc5f30a4480b1b1e5d44ee0c2d4f61689f4a221ba328
-EBUILD gnome-utils-2.32.0-r2.ebuild 2507 RMD160 059c2934220838aba3d6eb68d5d4cf8d1a6b5e08 SHA1 92dc074b4c612b4cc4098034aa8c09f3dde4bd47 SHA256 9dbd894462343ca6535b29a7cc7bd88e11be31607e42f052048aad60dcdafad8
+EBUILD gnome-utils-2.32.0-r2.ebuild 2506 RMD160 4a37726ccabf34ff72c5bb91125715ef2c843e80 SHA1 be52fd196a51cde4a468ab009fec1626efd57a9e SHA256 b70690c47739af9d20b7347c8c43face655b069299775a1bba5ac485cb29c5cb
 EBUILD gnome-utils-3.2.1.ebuild 2019 RMD160 e8841fcac3a5dee1ef81332a41836b83347a3695 SHA1 fe74174a4676bff88676400388cbbf8a07314212 SHA256 7c6e585c50d89adb1c933373bc1a583271c4f96bc875a7da535a81fde4cd2d75
-MISC ChangeLog 28841 RMD160 47095e3f7cd1105656fa61b31a21323d1b5b98df SHA1 451b8582df632e93b30986a5f7f2987c66112975 SHA256 9e828a30434a6569ae8c021640c60f771431af33a8e2b6d0cb94235f6ef1e1d0
+MISC ChangeLog 29033 RMD160 2f601f6d8158b44bc1c613cb992cd4915d08586e SHA1 52b0e167bb92852484bae490ec5c692ae5c05603 SHA256 b75db644173b9c104c968de858ba11fd8fd8caee5327806c727dfcc39a347efc
 MISC metadata.xml 305 RMD160 c788a49e4dc8332a8f5a5a79268ed2bff3d164c8 SHA1 9aa1970fee27c41f0eebf198f94b1fa41b3644b9 SHA256 3c6d345a89e0c8dbacd26f232e8220bd2558bc90cff9041e3e07f2f44ce4bb85
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7cqyoACgkQCaWpQKGI+9TiFQCfd016kC0HKnyIQvPFYD3kSfFP
-zOYAn0/1UUShBq/w6aQ38E1T7bRNx3nl
-=xcpw
+iF4EAREIAAYFAk8A8JkACgkQdjK8w9WeBnDaywD+NSK71+DyGnCpJuupI8IPk2eV
+tCbecl8vBPhBg1JMj2wA/ie6lVFxmQbi3Nuc3TqJYq8iSjW9eVn3LRrRHvpmsR5D
+=Cyu+
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild
index c318280636bb..d6644e13ee59 100644
--- a/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild,v 1.6 2011/10/05 17:41:26 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild,v 1.7 2012/01/01 23:47:32 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -54,8 +54,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Fix uninitialized variable preventing crashes (already fixed in master)
 	epatch "${FILESDIR}/${P}-fix-uninitialized.patch"
 
@@ -82,4 +80,6 @@ src_prepare() {
 
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
+
+	gnome2_src_prepare
 }