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

(Portage version: 2.2_rc42/cvs/Linux x86_64)

3 files changed, 21 insertions, 15 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/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"
 }