Fix build with USE=-doc, bug #286728.

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

4 files changed, 27 insertions, 21 deletions

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index d98e4a5b7892..829880308a91 100644
--- a/gnome-extra/gnome-power-manager/ChangeLog
+++ b/gnome-extra/gnome-power-manager/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/gnome-power-manager
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.108 2009/08/09 18:31:49 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.109 2009/09/28 19:37:52 eva Exp $
+
+  28 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-power-manager-2.24.4-r2.ebuild, gnome-power-manager-2.26.4.ebuild:
+  Fix build with USE=-doc, bug #286728.
 
 *gnome-power-manager-2.26.4 (09 Aug 2009)
 
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
index c495ed2f6a97..a92153b467e0 100644
--- a/gnome-extra/gnome-power-manager/Manifest
+++ b/gnome-extra/gnome-power-manager/Manifest
@@ -13,14 +13,14 @@ DIST gnome-power-manager-2.26.4-cpufreq-patches.tar.bz2 56366 RMD160 9ce9f124a7a
 DIST gnome-power-manager-2.26.4.tar.bz2 3755746 RMD160 6e5cc57d8776dc1a89a877b3cfb2f8675b49474e SHA1 c11683625db79567be816ecaa906941e2ec5164b SHA256 13d14b84755295b90409b6dcbc16d9bb823d3d474ba86ff3c139b0bd2b3b2168
 EBUILD gnome-power-manager-2.20.0-r1.ebuild 2442 RMD160 60ae5507c78aeb6d33aa51b4cf085ebbc9b2e0f2 SHA1 2899114ea5ba76b2811de088b595d2fe9ffc6ef3 SHA256 a5bc475f807f5bda00fa927bd2d0addf2758b472037c5bf1f7fc8a402a4fc8a5
 EBUILD gnome-power-manager-2.22.1.ebuild 2723 RMD160 4ce2281f8ad838a71d1c55e6c18d65740dd70cbb SHA1 4120137d1067331cf932fba56dbb2cfd08116e3a SHA256 4199da671daba8851e004ba54df976d9bed3f6b536666c54f21f613141f46f0e
-EBUILD gnome-power-manager-2.24.4-r2.ebuild 3086 RMD160 5e4a0f07c95d1b85b3886e6f2c66a27e6f91ba05 SHA1 9c204ce029c8eeae7384c247a6cdf4c0b92ef6fd SHA256 a50eed4f55b6fa26693359ec1cb8bada0019dd5d37637fa0b80491bc0eca7d5c
-EBUILD gnome-power-manager-2.26.4.ebuild 3691 RMD160 6d123d2dc7a71ed6c058c5a52a735ae6abdcba17 SHA1 62ea19f9c8197e8fd5e529c3646fb83acfbb87e8 SHA256 a919a8385d0c63f13415333638e59c7c843197781f8fb76a1fa842191dc13978
-MISC ChangeLog 17479 RMD160 afa867ffc19e33c6a5f6ca68df558dbc5b9a5b29 SHA1 890331d5c209a5bf813e5c4aff1d1e606fbb8d4f SHA256 3a32b8fbe5d369df5c94e58fc8312156ed8660b119cd1839239a659d33546ec0
+EBUILD gnome-power-manager-2.24.4-r2.ebuild 3090 RMD160 894e1cac1d89f2adaabd879574a8d6cd44ae4182 SHA1 4214e9c506eecdbacf6c70ca73d776c51e8953dd SHA256 a7e02c77140f0b472bb92393d979e08465d0957b4c024c54a5efd47d0ffd85a3
+EBUILD gnome-power-manager-2.26.4.ebuild 3696 RMD160 c92df5484c9be0858ee1e9e96ea3a0724515fa46 SHA1 75aa4e5b130b5c22c2e5c1a1d9a566d4d3a65c6d SHA256 74a3ffb7d1aeefa9206e908368f2483594fc6413f2460d59f745cb7647529f57
+MISC ChangeLog 17649 RMD160 702def6db7a14b313bb62267e0bd0779bc12dd82 SHA1 dc1e583b07b101b70e3b752365137d57088cbeed SHA256 fa1092a57e3fdf9eaf7e8fca6778104d4b7590f5e8a9de1c0a4a2ae4a9af4bc0
 MISC metadata.xml 438 RMD160 919237398a61022183868a6ad78259f5ba1ddb29 SHA1 22296b3f6619e92d83b5fa85e2ad1d3f15a1ba2a SHA256 b56e882af9618f6dc68e4c6d28bf85eb1cd0e12c2da53218551547760e63a489
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkp/FhsACgkQ1fmVwcYIWAZVmwCeL+tWCdKta5eGqB12kL4Q/nUm
-2VQAn14JJnKGM5uXKMWLqehXDr8A38xD
-=LvQf
+iEYEARECAAYFAkrBEMUACgkQ1fmVwcYIWAbL3ACeOVTFUzwXMLZK3in6iffTXYe7
+vt8AoL7Upm0953D3KvGiIECu2DA5sotL
+=tYea
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r2.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r2.ebuild
index a5bbcf3b6574..a26ec0dc9823 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r2.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.24.4-r2.ebuild,v 1.1 2009/05/02 18:26:31 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r2.ebuild,v 1.2 2009/09/28 19:37:52 eva Exp $
 
 inherit autotools eutils gnome2 virtualx
 
@@ -72,12 +72,6 @@ pkg_setup() {
 src_unpack() {
 	gnome2_src_unpack
 
-	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 "${S}/man/Makefile.in" || die "sed 1 failed"
-	fi
-
 	# Fix cpufreq-regression bug #247614
 	epatch "${WORKDIR}/${P}-cpufreq-libhal-glib.patch"
 	epatch "${WORKDIR}/${P}-cpufreq-support.patch"
@@ -90,6 +84,13 @@ src_unpack() {
 	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
 	eautoreconf
 
+	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 "${S}/man/Makefile.in" || die "sed 1 failed"
+	fi
+
 	# glibc splits this out, whereas other libc's do not tend to
 	use elibc_glibc || sed -e 's/-lresolv//' -i configure || die "sed 2 failed"
 }
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.26.4.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.26.4.ebuild
index 157dda4e9036..6b2eece09ef6 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.26.4.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.26.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.26.4.ebuild,v 1.1 2009/08/09 18:31:49 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.26.4.ebuild,v 1.2 2009/09/28 19:37:52 eva Exp $
 
 EAPI="2"
 
@@ -78,12 +78,6 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
-	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 "${S}/man/Makefile.in" || die "sed 1 failed"
-	fi
-
 	# Drop debugger CFLAGS
 	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' -i configure.ac \
 		|| die "sed 2 failed"
@@ -110,6 +104,13 @@ src_prepare() {
 	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
 	eautoreconf
 
+	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 "${S}/man/Makefile.in" || die "sed 1 failed"
+	fi
+
 	# glibc splits this out, whereas other libc's do not tend to
 	use elibc_glibc || sed -e 's/-lresolv//' -i configure || die "sed 4 failed"
 }