gnome2_src_prepare should be after eautoreconf (bug #398585, thanks to Jack Hill...

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

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 3801d8e8c8a994fc35000e1e57f1db5c451a89d8..ed9568407a68e0fe5b7a9fcd437bcc71320c9d66 100644 (file)
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-vfs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.341 2011/03/27 07:33:15 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.342 2012/01/12 02:24:50 tetromino Exp $
+
+  12 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-vfs-2.24.4-r1.ebuild:
+  gnome2_src_prepare should be after eautoreconf (bug #398585, thanks to Jack
+  Hill for reporting).
 
   27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
   gnome-vfs-2.24.4-r1.ebuild:

diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index 26465018e0cd48b49ae8e90b64580097fa53f659..caa1f5b65c8cdd7efdc04887eff3446fee927a1a 100644 (file)
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gnome-vfs-2.12.0-afs.patch 663 RMD160 a8ac6fbb9792b02090d3783ce10481bbc6b3b830 SHA1 fc7eb54b19a3bf43f1edc253c6517ea9bb60cb6c SHA256 a0bef85feae74a1ecc46f148a476d295e65c92b7a379546fb68186a7733e2e00
 AUX gnome-vfs-2.15.2-headers-define.patch 569 RMD160 5ff16b2fc13ef170a39dad9c300a8fb1581f8f93 SHA1 f448746dd581d8bee99377d860f3d4fb51659eb8 SHA256 ac0136ec0df6ba7efac5ac3403809383e7f681556f082537ee866d0398110918
 AUX gnome-vfs-2.16.0-no-dbus-crash.patch 710 RMD160 816b75d144fc264a34e45f0e2d17e37f528f1682 SHA1 a3011624f5078b468c0a67023109723f9455bd83 SHA256 b68247cc6abf30d183efb51480793917e820ce461b0c62003321aceced177345
@@ -9,6 +12,13 @@ AUX gnome-vfs-2.24.4-build-tests-asneeded.patch 632 RMD160 8135b3d02f5b82bc297fe
 AUX gnome-vfs-2.24.4-disable-test-async-cancel.patch 689 RMD160 5289d40fdad2581985a6a97295df101904a8f0c4 SHA1 d24a56fd996e5cb315626e5d69dae820109f5f2d SHA256 77dcd6c2dd00d05b036efee3014334e4d96bcbd40de9d4632290df6125dbfbbe
 AUX gnome-vfs-2.24.4-home_dir_fakeroot.patch 4996 RMD160 ee9a680747ed1060dd41bc64fd78d9791faa2fa8 SHA1 97b5a7ab01ba0976fac02accad7671ade5b8cbe0 SHA256 4d1841e7c296f7774aea01649d28549b5d04db486c5c7cd0b4c0e63ba04e4dc0
 DIST gnome-vfs-2.24.4.tar.bz2 1890370 RMD160 6a5952bea02dfc96782b6f1129fe765f5313a75b SHA1 0dc634e7dd979fd218f378902c0ca1af80738961 SHA256 62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa
-EBUILD gnome-vfs-2.24.4-r1.ebuild 3580 RMD160 3a64bb9fc65a3c1d488735d8fd83963b8f4e3f82 SHA1 26eef87955eb2a4b7aa8298e900c9b6988a1c4d2 SHA256 48a38d2b958859f711c146abdfde71fb805aa9cd785369e1537d071d567ce5c5
-MISC ChangeLog 45472 RMD160 b3eadfa38d96b8ed697fab8083ba451e83494fc0 SHA1 d79cc17d908dcf2fa294dd184370694c498c395e SHA256 dc5d7bf0e4c753758a07f670b4cdf9d134c634839c0a328bd160f3941daa182b
+EBUILD gnome-vfs-2.24.4-r1.ebuild 3580 RMD160 c344409780764eef3c88c35a18fe7ae0888d8b66 SHA1 70d847e92086fdb7cc1a79e241e215ef1933b299 SHA256 5fbb2f7131e83a1f605d4e2c4949f5d7728b318f006d83530b8ecf4ce707e577
+MISC ChangeLog 45663 RMD160 7344f1e9c5f3ea81692b3f075a8bb45aa47067fc SHA1 0b33eba44bba7d09b5913b9cadf4ce7350e4663c SHA256 663b5c1daab91e80525c691caa7c1811b59d51e618d28dddc2c7c5bc50897321
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk8ORHgACgkQdjK8w9WeBnBNyAD/bJlhAX19gJQrQGVgMAunATO2
+F5K1KNbx6156+9AYJrYA/0nH1B5uiEw9hmFxhj/UM0yyFOjv2uWRWXiZjE8xtILA
+=poSZ
+-----END PGP SIGNATURE-----

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild
index 42f54f54a8ade038acb1f401538a2bef6af78075..844edd3b17df89ff4fabba6e5e8e7ff01390f889 100644 (file)
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-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/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild,v 1.2 2011/03/27 07:33:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild,v 1.3 2012/01/12 02:24:50 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -71,8 +71,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-       gnome2_src_prepare
-
        # Allow the Trash on afs filesystems (#106118)
        epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
 
@@ -114,6 +112,8 @@ src_prepare() {
 
        intltoolize --force --copy --automake || die "intltoolize failed"
        eautoreconf
+
+       gnome2_src_prepare
 }
 
 src_test() {