eautoreconf after applying patches that modifies autotools, bug #263476.

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

3 files changed, 11 insertions, 79 deletions

diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog
index 42a1960f04d2..100e2db92f6f 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.102 2009/03/22 10:42:22 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.103 2009/03/25 21:32:51 eva Exp $
+
+  25 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-power-manager-2.16.3.ebuild, gnome-power-manager-2.24.4-r1.ebuild:
+  eautoreconf after applying patches that modifies autotools, bug #263476.
 
 *gnome-power-manager-2.24.4-r1 (22 Mar 2009)
 
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.3.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.3.ebuild
deleted file mode 100644
index faab6c423257..000000000000
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.16.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2008 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.16.3.ebuild,v 1.13 2008/05/14 21:50:16 eva Exp $
-
-GNOME_TARBALL_SUFFIX="gz"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Gnome Power Manager"
-HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="doc libnotify"
-
-RDEPEND=">=dev-libs/glib-2.6.0
-	>=x11-libs/gtk+-2.10.0
-	>=gnome-base/libgnome-2.14.0
-	>=gnome-base/libgnomeui-2.10.0
-	>=sys-apps/hal-0.5.7-r1
-	>=gnome-base/libglade-2.5.0
-	>=x11-libs/libwnck-2.10.0
-	>=x11-libs/cairo-1.0.0
-	>=gnome-base/gconf-2
-	>=dev-libs/dbus-glib-0.71
-	libnotify? (
-			>=x11-libs/libnotify-0.4.3
-			>=x11-misc/notification-daemon-0.2.1
-		   )
-
-	x11-libs/libX11
-	x11-libs/libXext"
-
-# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
-# (files under ${S}/man).
-# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	>=app-text/gnome-doc-utils-0.3.2
-	~app-text/docbook-xml-dtd-4.3
-	doc? (
-		 app-text/xmlto
-		 app-text/docbook-sgml-utils
-		~app-text/docbook-sgml-dtd-4.1
-		~app-text/docbook-xml-dtd-4.4
-		~app-text/docbook-xml-dtd-4.1.2
-	     )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="$(use_enable doc docbook-docs) \
-		$(use_enable libnotify) \
-		--enable-actions-menu --with-dpms-ext"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	if use doc; then
-		# Actually install all html files, not just the index
-		sed -i -e 's:\(htmldoc_DATA = \).*:\1$(SPEC_HTML_FILES):' \
-			"${S}/docs/Makefile.in"
-	else
-		# Remove the docbook2man rules here since it's not handled by a proper
-		# parameter in configure.in.
-		sed -i -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' "${S}/man/Makefile.in"
-	fi
-
-	epatch "${FILESDIR}"/${P}-doc.patch
-}
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r1.ebuild
index 6e32d5c01c79..1e2338685085 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r1.ebuild
@@ -1,8 +1,8 @@
 # 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-r1.ebuild,v 1.1 2009/03/22 10:42:22 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.24.4-r1.ebuild,v 1.2 2009/03/25 21:32:51 eva Exp $
 
-inherit eutils gnome2 virtualx
+inherit autotools eutils gnome2 virtualx
 
 DESCRIPTION="Gnome Power Manager"
 HOMEPAGE="http://www.gnome.org/projects/gnome-power-manager/"
@@ -71,7 +71,7 @@ src_unpack() {
 	if ! use doc; then
 		# Remove the docbook2man rules here since it's not handled by a proper
 		# parameter in configure.in.
-		sed -i -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' "${S}/man/Makefile.in"
+		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i "${S}/man/Makefile.in" || die "sed 1 failed"
 	fi
 
 	# Fix cpufreq-regression bug #247614
@@ -79,8 +79,10 @@ src_unpack() {
 	epatch "${WORKDIR}/${P}-cpufreq-support.patch"
 	epatch "${WORKDIR}/${P}-cpufreq-ui.patch"
 
+	eautoreconf
+
 	# glibc splits this out, whereas other libc's do not tend to
-	use elibc_glibc || sed -i -e 's/-lresolv//' configure
+	use elibc_glibc || sed -e 's/-lresolv//' -i configure || die "sed 2 failed"
 }
 
 src_test() {