diff options
| -rw-r--r-- | gnome-extra/gnome-power-manager/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0.ebuild | 18 |
2 files changed, 15 insertions, 10 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/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() { |