Run docbook2man sed in proper place (like in 2.30) to prevent HAVE_DOCBOOK2MAN_TRUE to be regenerated (bug #356277 by Robin Johnson).

Package-Manager: portage-2.1.9.41/cvs/Linux x86_64

3 files changed, 20 insertions, 15 deletions

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index 48d42cf5f869..9a71171a83f8 100644
--- 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.149 2011/02/24 19:32:13 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.150 2011/02/25 08:38:04 pacho Exp $
+
+  25 Feb 2011; Pacho Ramos <pacho@gentoo.org>
+  gnome-power-manager-2.32.0.ebuild:
+  Run docbook2man sed in proper place (like in 2.30) to prevent
+  HAVE_DOCBOOK2MAN_TRUE to be regenerated (bug #356277 by Robin Johnson).
 
   24 Feb 2011; Thomas Kahle <tomka@gentoo.org>
   gnome-power-manager-2.32.0.ebuild:
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index 114d66f2be9c..f65680435ac9 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -6,13 +6,13 @@ AUX org.freedesktop.hal.power-management.policy 850 RMD160 42a5da73e27416a897d37
 DIST gnome-power-manager-2.30.1.tar.bz2 3854167 RMD160 f2c77edf592d3854cfc4a68586b4267e1122c48d SHA1 a57ff84975e6274e03e3ab5dadf2be781bc2441a SHA256 47af6221ae83d329088abd8f5176f503fe5f81417a7c6766c95279b0af05021c
 DIST gnome-power-manager-2.32.0.tar.bz2 3892164 RMD160 77e8b95ba6d34d83b94b410d860f23d2efb953c8 SHA1 829d65addba1dc3a7e91ebb871525dc16223a082 SHA256 17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476
 EBUILD gnome-power-manager-2.30.1.ebuild 3262 RMD160 f2f2b9d082a2feeefa1db7a3a8323efd04ab850d SHA1 51faa266267eb07f1c7d01dcf9a049279cbee7c5 SHA256 dfce5d39ebcc2373e8153c1822752b96fd7da68ef4bc41696458ff4dcc63c675
-EBUILD gnome-power-manager-2.32.0.ebuild 3021 RMD160 7213ae1ca718fe3652e56d14d8467c6d5bd9f37f SHA1 56a7cc3746e8cddec48f1abd1c9020593930b0c7 SHA256 0b8988912863aaca6ea53cd42795f76d6bc7c91c1cfe51a642394584317a994b
-MISC ChangeLog 24904 RMD160 60069ea7dd4d54c7ac184ed48175f53ed09e4acc SHA1 eb260d703a25e21d5aff189834b4e1b5a6cbde58 SHA256 73493c3636f43b0d44201aa5a14a79d08646dfdbb71d2cfd82da250f951f3e74
+EBUILD gnome-power-manager-2.32.0.ebuild 3075 RMD160 01e97eec63b0aa6147e6030f7615640bc5c0c510 SHA1 dd19b255e40c9d1b79ed2013ec9f91c116ef1c96 SHA256 eb78fef052da46484b475b806c72ceb3114dea03521241afec13d62cccf827f7
+MISC ChangeLog 25126 RMD160 30845e57e0682282754a2020d54ba8b0d3ea6f80 SHA1 b36d56b1ef870aded05af4cbe8524de94498bed1 SHA256 eb3ca792b44843066f00772013b3912be2bdd98aaa3d5687ea7cab054c839fea
 MISC metadata.xml 328 RMD160 e83b5cef91422ece7e4991cc9f9422220d36b775 SHA1 c25df9c021e54eaf6c9add8db1c9954ac710b95e SHA256 2507b21284e65f9e7f5608d9865921192d0d6cdf46a35a705b0b2cb220583794
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1msqsACgkQnZsgo/h8kNae9gCfQzhO1+YHvvNml3l1sOVtiOXX
-46YAoKdHWNL8NFNU5iU2fu1oGN8pm1Iq
-=a79v
+iEYEARECAAYFAk1nanIACgkQCaWpQKGI+9R5MwCcCwEcYy/49inAVoNJxx9HImaI
+lTYAnjcAGqcITji9T2/g8z1iCo86Um8O
+=0c3I
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild
index 4914a5f24995..f052537c1798 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.ebuild,v 1.10 2011/02/24 19:32:13 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild,v 1.11 2011/02/25 08:38:04 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -80,14 +80,6 @@ src_prepare() {
 	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
 		-i configure.ac configure || die "debugger sed failed"
 
-	if ! use doc; then
-		# Remove the docbook2man rules here since it's not handled by a proper
-		# parameter in configure.in.
-		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' \
-			-i man/Makefile.am man/Makefile.in \
-			|| die "docbook sed failed"
-	fi
-
 	# glibc splits this out, whereas other libc's do not tend to
 	if use elibc_glibc; then
 		sed -e 's/-lresolv//' \
@@ -97,6 +89,14 @@ src_prepare() {
 	# FIXME: This is required to prevent maintainer mode after "debugger sed"
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
+
+	# 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
+		# parameter in configure.in.
+		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
+			|| die "docbook sed failed"
+	fi
 }
 
 src_test() {