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-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index 644a13881d1c1bfbcec57ceb646099cea70f5b8f..bb28f12a277ba39783ff05cb8daec47865c115af 100644 (file)
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gnome-power-manager
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.166 2011/11/25 06:58:03 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.167 2012/01/02 00:51:49 tetromino Exp $
+
+  02 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-power-manager-2.32.0-r2.ebuild:
+  Move gnome2_src_prepare after eautoreconf (bug #396713, thanks to Julian W.
+  for reporting).
 
   25 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   -gnome-power-manager-3.0.2-r1.ebuild,

diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index 72720e3d713ded505766de51fb02d379007ae28d..fc8fbc5a2fd4aece65309cf6931a9fe5279b8297 100644 (file)
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -10,15 +10,15 @@ DIST gnome-power-manager-2.32.0-keyboard-backlight.patch.xz 16632 RMD160 51e545a
 DIST gnome-power-manager-2.32.0.tar.bz2 3892164 RMD160 77e8b95ba6d34d83b94b410d860f23d2efb953c8 SHA1 829d65addba1dc3a7e91ebb871525dc16223a082 SHA256 17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476
 DIST gnome-power-manager-3.2.1.tar.xz 734932 RMD160 727a3f97f602058c629f911f74aef3d0b182def5 SHA1 d2ea72da27dc2129f4d1a1b9d4a98d3b90fde1cb SHA256 11bc604dd237e28eb08a67e6d507c3edebb96a43a3483390bd0c8100a206dbdb
 EBUILD gnome-power-manager-2.32.0-r1.ebuild 3125 RMD160 aa4e6781cc6013b90dc026560cd569a802c52cc8 SHA1 da01a615096bd44dc6dc920e92a1c7512d9c6994 SHA256 84ceae153c06110c18b88437ece0cf8c6cd4b8d25d8a327f2e304d2ed87dc38d
-EBUILD gnome-power-manager-2.32.0-r2.ebuild 3854 RMD160 5fd57ea8716bf8537c5c1594681b8c87d23e345e SHA1 4548980806b595292c4e55df8e01dcf1bd7f778b SHA256 31b593b264720e2fed78a6f46e6924dfb2d6427d03cb90883f9f57cd9eff44ee
+EBUILD gnome-power-manager-2.32.0-r2.ebuild 3856 RMD160 cc7d3c8df6567cee86c5f79dd58471fb3101159d SHA1 c282650cb91830048b3b3d8fc2ea6f47eecd67e5 SHA256 3221dc34ede0530e56ec13ab5dd0ed21913982ae04fcfd270ca24c519f1e87fa
 EBUILD gnome-power-manager-2.32.0.ebuild 3071 RMD160 49dd288e5a74c55ac340418605a3ba5fba67a75b SHA1 65406135a6080b201f2febef1f154c6e56d2041d SHA256 0b35c5dbe1ee81e7858ad9112d81ae70a0509f2935971fbc0a3829d8160f83f6
 EBUILD gnome-power-manager-3.2.1.ebuild 1825 RMD160 edec4a59eb158628ccc18137a8da3ae283985a9b SHA1 ad11cf82d479bf7216b607a29424032ee43b53ad SHA256 e6313b33a55319b773d22723d7fb530a18161876bc44bed2c897633d63865eac
-MISC ChangeLog 28251 RMD160 6ce2d0fe4519b9a98a702c084dde8c75a5feec89 SHA1 ad2d7fd4cfab851bbef7fbc4692a5ffe84245adf SHA256 6983dd2ec03586c48d981775d423be85ac28ad0b24e618e20d2047cc9ed48fc7
+MISC ChangeLog 28447 RMD160 85cddfe1a25b3be62ad9abb5f858f50ddb39f319 SHA1 8cecbed03c70acffe293318a08eeb834bf4f27c3 SHA256 4acca88faa78c71902328817e8dfc9622e619d22636a4968b5e96dd8941ec94e
 MISC metadata.xml 401 RMD160 f8df805516184795fc0eae8621e623000179dcf7 SHA1 f34033fb88478710119be397997f9fdb6fba56d9 SHA256 6c07ca73308c0284c064e45eecff3b959b6d84c5cdf0b557eca7b4fc398ea639
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7PPIEACgkQdjK8w9WeBnCyugD/RHNybVsmL343/KwcErB3Zf2V
-4auxp5gf65SeNe4jftEA/0DnGel+eu5byOfwPXsSo4g7nwmc3IIBsz+F1x5gyFxJ
-=mBHb
+iF4EAREIAAYFAk8A/6sACgkQdjK8w9WeBnBDsgEAnWsr3J5hBgmcqDJfdLq9q2DG
+zeDxjcpNLNWYiGSArygA/A+Rf30gp1aB3D3OsnFEpu8WSnLUoCBPaE33ehdpawko
+=oFXg
 -----END PGP SIGNATURE-----

diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r2.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r2.ebuild
index d159a0521710de955d64d949e1ca4ac4c72ec4ba..d1c7f285cb3eb4ea9e32d2606c7e3695522c57ca 100644 (file)
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r2.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-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-power-manager/gnome-power-manager-2.32.0-r2.ebuild,v 1.5 2011/10/30 16:21:52 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r2.ebuild,v 1.6 2012/01/02 00:51:49 tetromino Exp $
 
 EAPI="4"
 GNOME_TARBALL_SUFFIX="bz2"
@@ -75,8 +75,6 @@ pkg_setup() {
 src_prepare() {
        epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
 
-       gnome2_src_prepare
-
        # Fix intltoolize broken file, see upstream #577133
        sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
                || die "sed libtoolize failed"
@@ -110,6 +108,8 @@ src_prepare() {
        intltoolize --force --copy --automake || die "intltoolize failed"
        eautoreconf
 
+       gnome2_src_prepare
+
        # This needs to be after eautoreconf to prevent problems like bug #356277
        if ! use doc; then
                # Remove the docbook2man rules here since it's not handled by a proper