Move gnome2_src_prepare after eautoreconf (bug #403685, thanks to Kris Hepler for reporting).

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

4 files changed, 21 insertions, 19 deletions

diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index 8df2c312f599..21429eb1f858 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -6,14 +6,14 @@ AUX libgnome-keyring-2.32.0-hang-tests.patch 607 RMD160 13926efd8ba29ead2648bd34
 AUX libgnome-keyring-2.32.0-run-test.patch 2090 RMD160 58b7eb297dd901a0bb4d1abd54091f36ce82847a SHA1 c93f326daf89f0a91c86ad05b638375e77a7f15f SHA256 cdcbd565a4508b3f7211e69617b66442248414c1486cba70d59bc0bf93b21740
 DIST libgnome-keyring-2.32.0.tar.bz2 412592 RMD160 201df6c60a931a43edd58c994dea5bb20d5d378f SHA1 9d7c9dc923e03ed2f201cb563e28922e35b88ea0 SHA256 56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c
 DIST libgnome-keyring-3.2.2.tar.xz 358976 RMD160 ea1483361d3865b00f90d4ca24fc6f0af0329c35 SHA1 1c8c02bcfa68d8457437ac9ea8f5ad76e9a997d8 SHA256 2bcbe47b1960737866835a516056c36d1a3d82d5ad101c70d5a87e1ad616adb3
-EBUILD libgnome-keyring-2.32.0.ebuild 1669 RMD160 6fe1c5ad4a95cf10ce23944a04976ec2c6d9924a SHA1 200adcdbae51efb475c7abb9927b39b604285586 SHA256 cc7f8a1d56915f5f52179e953cb86c6a82c2160fe53c944a817bee8c32a7806e
+EBUILD libgnome-keyring-2.32.0.ebuild 1668 RMD160 3c52192738db85a1d0f01bfb15108f706da1954a SHA1 3fbf1e0ce7335ade12c956f344b084196f6f4653 SHA256 c566161510e078a5c7bad015b940e347c395b9a7d8e74d430f457f4c6a60836e
 EBUILD libgnome-keyring-3.2.2.ebuild 1323 RMD160 abea4c378bc25576da0611e5f0c8bdd2535611e0 SHA1 6d35a127690ed21107e88d216b318df246d35f88 SHA256 caabfe20207a951441911a2c184ec5a1d796d390fbaf1334469dea17ac045e8f
-MISC ChangeLog 5263 RMD160 ff91141e785000de24ad63c73fd43fadbf10fc5c SHA1 5c9ba3c094b819c601ab7e1fdb87261261b6588b SHA256 b8b074a5330c8f51f4c55b36a320ccf2d9f88cfddb2d35973da3cb5bc4a977a4
+MISC ChangeLog 5455 RMD160 4580912a2bad9ec9eb4bf9624e804dc3d7565269 SHA1 57e1ceabe682c0c24bb9df1e141d723831debb8d SHA256 2dabe8007d0ba24700363b5ec4038bdb197993e2d4c7bddee4bb44094556b606
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8QktsACgkQdjK8w9WeBnCaXgD8DDBpIkHG1YW/hR5F0P/j5dhH
-IR5f/e9jlRWyoO+dToEA/1JbIXNFrIdAEhiXCm+pyq+XisH5Rry7dbDGfKN0mLQi
-=gr/I
+iF4EAREIAAYFAk87LgUACgkQdjK8w9WeBnAcFgD/cmvEp1+7mxCiB71yGTm4A7sV
+PcHDdVGgbO6VT5RN7FwA/iTMf2iRJ2uHn6+PvVrl4/jCYrvx6I96gotRe2p5Hjzw
+=5vz7
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/orbit/ChangeLog b/gnome-base/orbit/ChangeLog
index 03e9c24e65ae..627ef821e9be 100644
--- a/gnome-base/orbit/ChangeLog
+++ b/gnome-base/orbit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/orbit
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.181 2011/10/05 17:35:18 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/ChangeLog,v 1.182 2012/02/15 03:56:39 tetromino Exp $
+
+  15 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  orbit-2.14.19-r1.ebuild:
+  Move gnome2_src_prepare after eautoreconf (bug #403685, thanks to Kris Hepler
+  for reporting).
 
   05 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> orbit-2.14.19-r1.ebuild:
   ppc/ppc64 stable wrt #369909
diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest
index 4c86d1a43adc..da7d1286258a 100644
--- a/gnome-base/orbit/Manifest
+++ b/gnome-base/orbit/Manifest
@@ -1,17 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 DIST ORBit2-2.14.19.tar.bz2 764820 RMD160 e16c1697efc4ad3dafca47828954f39438b4a8d4 SHA1 e7c26aa4b82c146b3ec08d490e3469b4913e4e2f SHA256 55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550
-EBUILD orbit-2.14.19-r1.ebuild 2193 RMD160 55e49bf6cdbba98c1c31c44aead5ef298afa9eb9 SHA1 ad7728d1f5a7104f9df1b2ba2d9feaffac94a183 SHA256 59a6e00d1dbf052b0652717059b671f00032f4f92e3f30570b19b3472dd559df
+EBUILD orbit-2.14.19-r1.ebuild 2192 RMD160 6d990da89f111bfc81b17dec3395d1a789ad5661 SHA1 3286627ded6084f257f37ee5f4afaf92dada5972 SHA256 72f6bd3cb212442c0940d73a2d3d45f2d68aa6bb33907b2ff53a7b611932b697
 EBUILD orbit-2.14.19.ebuild 2023 RMD160 7f87026c6a1e9300dda0633ef51f9927eeaea943 SHA1 df4e266eedda1e61df91066e3180ab514c9a59ff SHA256 0064b50558c1ffe537cc3ccf5319d8af55fc08bf18674fe2a33548b0cbe814a9
-MISC ChangeLog 22567 RMD160 02af175390fffff8854882a03e67abb49633722d SHA1 3fb9ca8ee5f01910d6cd1e63d49e6407a435f0f9 SHA256 53a616ddafdcc31d7a2f785bcadcd56588e82f862a314eb2e1a535d473c0be48
+MISC ChangeLog 22751 RMD160 df7d95d71758c24a5583e0c8602fc6c1cfa8d5f4 SHA1 13643bbdcc0a342e98dd14e41c86502a6d6fa593 SHA256 b59e726fe56b245815c813373fe088debeb22808985317ae15d0eb44f598a80c
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk6MlV0ACgkQIiMqcbOVdxRf2QP/THvF93/Mlx3m/yBCJ5rm/ES+
-Jd3AH22Q60XeGtwkOW65R3uq8T74g0R9afNTWRSRJ2mL+KSs+8qczUA6X1R2DTWY
-ENAf78dYtP2hUqxVkHBmlvUx24RMQeG5hjco73P3dNMdjdkd5y4p01LhIvAOgwO9
-tUNUvUq4Cgtd/tgL6p0=
-=69oq
+iF4EAREIAAYFAk87LP0ACgkQdjK8w9WeBnAoYAD+JSRaZaR7PU5YYk9CXwNpfpj+
+JDiwBnMiJaNmKCy9RaIA/iU9MiXqjCiJg8PhC38lNfuhyrXNPF2ZdaknS7FX/eEp
+=2BhY
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/orbit/orbit-2.14.19-r1.ebuild b/gnome-base/orbit/orbit-2.14.19-r1.ebuild
index 17ae1b558964..c8243a51f7c9 100644
--- a/gnome-base/orbit/orbit-2.14.19-r1.ebuild
+++ b/gnome-base/orbit/orbit-2.14.19-r1.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-base/orbit/orbit-2.14.19-r1.ebuild,v 1.9 2011/10/05 17:35:18 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/orbit/orbit-2.14.19-r1.ebuild,v 1.10 2012/02/15 03:56:39 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -35,8 +35,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Fix wrong process kill, bug #268142
 	sed "s:killall lt-timeout-server:killall timeout-server:" \
 		-i test/timeout.sh || die "sed 1 failed"
@@ -52,6 +50,7 @@ src_prepare() {
 	sed -i -e 's/test-mem //' test/Makefile.am || die
 
 	eautoreconf
+	gnome2_src_prepare
 }
 
 src_configure() {