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

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

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index 123185bcd5a65968fe7f6745b6568d1afbffb2c9..05e68f11d5d0e80ef2f773ebe6b614955d52aa0c 100644 (file)
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.347 2012/01/01 00:33:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.348 2012/01/01 23:43:54 tetromino Exp $
+
+  01 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-applets-2.32.1.1.ebuild:
+  Move gnome2_src_prepare after eautoreconf (bug #396713, thanks to Julian W.
+  for reporting).
 
   01 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   gnome-applets-2.32.1.1.ebuild, gnome-applets-3.2.1.ebuild:

diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index a7100769b1180572fc9b04d7b467f2ee56bbe28f..b26c8fa9be0c86ad731bc7e9f733c8fe522b66e3 100644 (file)
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -6,14 +6,14 @@ AUX gnome-applets-2.32.1.1-libnotify-0.7.patch 1431 RMD160 4c8edc49404fa45ce8e0c
 AUX gnome-applets-2.32.1.1-underlinking.patch 3606 RMD160 4a9223719c2e3a96d54ce6d39f413dcdfa947d50 SHA1 89cc472c7b69387ed2e85f2ef9d748c1d260d5d7 SHA256 874b1b0656f6e0c94d76f255c2b7539bb123ecf72add770ce3c8ee3bbf8cbc75
 DIST gnome-applets-2.32.1.1.tar.bz2 10083534 RMD160 50c8e169b02aa002917f4c6ea0f575522e3ae984 SHA1 6edc3aea2bd2198b2bdbdb1fa63b481f724c8fe2 SHA256 2b92fe4b3062dfbe264f45472b4db3a27d1e69e13260d37da9fb36b2cbd40327
 DIST gnome-applets-3.2.1.tar.xz 8032112 RMD160 35a99d55308a5292b5a4e8b1e073db730b35a3f4 SHA1 99fc40a80197edd84649b7d5243d2c8645a90104 SHA256 cba1dff05bf2aad57f0df2ea746a9bf1c3483a0388a70bf501f61d95b1017dc1
-EBUILD gnome-applets-2.32.1.1.ebuild 3663 RMD160 9dc12a7d63f9fee083acb408de37252b14964ada SHA1 df54a530d1051f4d5e846f0224009629f65ba748 SHA256 c54e8225d91c27da9260091ac62d91a9b3b8a1c4e39c38dab380c26487106c9a
+EBUILD gnome-applets-2.32.1.1.ebuild 3663 RMD160 309605c88421bbf7669d117ce52c2014f74e8e20 SHA1 fd61fe62eb69ce380d353085270f9f0d6f860b95 SHA256 57fb24c35c69369e8e275729b5bc4c65d10a58a334e34a8f8d74ac5192dfd60a
 EBUILD gnome-applets-3.2.1.ebuild 3544 RMD160 6c3041a7ee90eb64986d415545750e484fc869df SHA1 affed753fdbce52cc320938490c65d97c088f9d5 SHA256 d679b6be843ce270d1af14e1d6989e70949d8f7348f5d67a1305dcd8a8ba2848
-MISC ChangeLog 50611 RMD160 1a33bb5fa58241a6036cbd75b7d7fb056455b796 SHA1 dc5a16caf881a9abf85cc3803dae70490f1819b6 SHA256 a2ecdb68a5ba90df3cacc2a8c6859965f76f98cc5a254e410e5c522c3d2b61f4
+MISC ChangeLog 50800 RMD160 d7c16ac441a6c8574d26a77caa6414bd60e7cd1b SHA1 8d800e153d29f721e64bdbec1e9f9844d0728c9d SHA256 5da032684110943960dd834631dff5e3e2e5a47c3b3da0adec5e5d35fc62621c
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7/qdYACgkQdjK8w9WeBnBb7wD+P936QIgXrUzRTpt+9s5OYCeR
-vv6TpFlff3iBkRg9UgwA/ionk3tt8jztgU//9jN21vrAIFjqZEAtXlfkLmiFOgag
-=e9CJ
+iF4EAREIAAYFAk8A778ACgkQdjK8w9WeBnC9YAEAi2GvuF69n+MzBv9yohRA8Bn5
+WhahxLkZ13k5eK+hgvIA/R8NKwEEpUmyMmnOi2ESfrHM9owoBE+rZHF1L+KBt8tP
+=sPu4
 -----END PGP SIGNATURE-----

diff --git a/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild
index 86fababea1362916d2c05d02e8abc56dd7db32dc..d772eda63b357ca2c7d8254972e9e02182f6d22b 100644 (file)
--- a/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild,v 1.17 2012/01/01 00:33:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild,v 1.18 2012/01/01 23:43:54 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -80,8 +80,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-       gnome2_src_prepare
-
        epatch \
                "${FILESDIR}"/${P}-libnotify-0.7.patch \
                "${FILESDIR}"/${P}-underlinking.patch
@@ -100,6 +98,8 @@ src_prepare() {
 
        intltoolize --force --copy --automake || die "intltoolize failed"
        eautoreconf
+
+       gnome2_src_prepare
 }
 
 src_test() {