Restore ebuild maintainbility, econf is sorted per upstream ./configure, base.eclass is not useful here either, DISABLE flags equal -Werror and no explanation was provided why we should enable them here... overall, revert previous commit

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

3 files changed, 31 insertions, 42 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index d9ad852e769a..08b272e24715 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,11 +1,6 @@
 # ChangeLog for sys-power/upower
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.14 2010/08/04 04:05:41 reavertm Exp $
-
-  04 Aug 2010; Maciej Mrozowski <reavertm@gentoo.org> upower-0.9.5.ebuild:
-  Do not filter out DISABLE_DEPRECATED, do not rebuild gtk docs, use
-  base.eclass, deps cleanup (intltool always required, gtk-doc related deps
-  removed), use POSIX find -exec rm instead of -delete
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.15 2010/08/04 06:03:53 ssuominen Exp $
 
   30 Jul 2010; Markos Chandras <hwoarang@gentoo.org> upower-0.9.4.ebuild:
   Stable on amd64 wrt bug #329623
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 90fef9648c88..782a5a380fbe 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -2,6 +2,6 @@ AUX upower-0.9.4-enumerate.patch 847 RMD160 f2487429e40447f3f3216226b8cdac06bc7c
 DIST upower-0.9.4.tar.bz2 468727 RMD160 4403b090e831c63e6ae3846d8ccbc1c7e8d8516c SHA1 35a25ecec2f45a0f92ef5b5f916fca37703b8fac SHA256 39dd138781b2a2d820f1a2bde4ca60dbf99e6def0e0010d4c3d3f4707954a57c
 DIST upower-0.9.5.tar.bz2 473750 RMD160 0d6c84046230b17ee63428df1b103474d920ef93 SHA1 5a4763bcbdf0dae1868f8475d9eebe6188eb89c2 SHA256 b34074a5467d442720f4b5d4cee3946fa41dea932463f5e265deb90ae0e7c7a1
 EBUILD upower-0.9.4.ebuild 2060 RMD160 b3971ebd538083a7bfe6a3399e298972ece9e9f0 SHA1 81e99e1b748a62d82a082c47960bf8d0b2dff4f5 SHA256 668d7cd0ac49ad385cc5ab0b96502bb381ebc5baf841ac5c546533ab89510c6b
-EBUILD upower-0.9.5.ebuild 1977 RMD160 fab6e604ecb1c0f053e9b098e416aeb2b22b32ab SHA1 6b646b4a09a11f317680c0380896a8eb5a263c1f SHA256 e2ecfb73548189ba615e3071830acc4b27139b0ccfac9c6c16f19f4a1f9fc031
-MISC ChangeLog 2330 RMD160 c25f9ceabc6e099af0c83989614197287d7c9008 SHA1 2db806c89cba4741e0f513e832801a05a9d17163 SHA256 10dbcd550ec3b7caf605e763e1ba6ae373cd14fa9df3de9e45849545e803d2d4
+EBUILD upower-0.9.5.ebuild 2137 RMD160 2055fb8fb6c5abb6f01fff9f38b96f544d870e47 SHA1 c4cf6d6a6e87df00fcaee0ceb729af47830fa1e4 SHA256 c4b7ad978c358fb7d104af8fba22b81b38bc1e09549d7a1468d18ede3b278e77
+MISC ChangeLog 2055 RMD160 1d7f7c3fa929ff5116140e40e42f29cfab35cb42 SHA1 083ae324b0e7117258173359e98b5b3ec26befb2 SHA256 40e0b5ffaee403564dcd9f9ce3306659f857b6c59edfbb8fe8250912d648f678
 MISC metadata.xml 363 RMD160 7210445bae10f2ddf76edaa8e7144227a03c5de1 SHA1 76f5af45c1a11584d24878ee65e6773757cfa014 SHA256 b24b22d2e371b3ee7165cd9ae1ca6fac72aee10e107c192a4e94686ba95b9093
diff --git a/sys-power/upower/upower-0.9.5.ebuild b/sys-power/upower/upower-0.9.5.ebuild
index 1c3369370cba..3924a3001350 100644
--- a/sys-power/upower/upower-0.9.5.ebuild
+++ b/sys-power/upower/upower-0.9.5.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.5.ebuild,v 1.4 2010/08/04 04:05:41 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.5.ebuild,v 1.5 2010/08/04 06:03:53 ssuominen Exp $
 
 EAPI=3
-
-inherit linux-info base
+inherit linux-info
 
 DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
 HOMEPAGE="http://upower.freedesktop.org/"
@@ -13,35 +12,29 @@ SRC_URI="http://upower.freedesktop.org/releases/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd"
-IUSE="debug doc introspection ipod kernel_FreeBSD kernel_linux nls"
+IUSE="debug doc nls introspection ipod kernel_FreeBSD kernel_linux"
 
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.76
-	>=dev-libs/glib-2.21.5:2
+COMMON_DEPEND=">=dev-libs/glib-2.21.5:2
 	>=sys-apps/dbus-1
+	>=dev-libs/dbus-glib-0.76
 	>=sys-auth/polkit-0.91
 	introspection? ( dev-libs/gobject-introspection )
-	kernel_linux? (
-		>=sys-fs/udev-151[extras]
+	kernel_linux? ( >=sys-fs/udev-151[extras]
 		virtual/libusb:1
-		ipod? ( >=app-pda/libimobiledevice-0.9.7 )
-	)
-"
+		ipod? ( >=app-pda/libimobiledevice-0.9.7 ) )
+	!sys-apps/devicekit-power"
 RDEPEND="${COMMON_DEPEND}
-	!sys-apps/devicekit-power
-	kernel_linux? ( >=sys-power/pm-utils-1.4.1 )
-"
+	kernel_linux? ( >=sys-power/pm-utils-1.4.1 )"
 DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.0
 	dev-util/pkgconfig
-"
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2 )
+	nls? ( >=dev-util/intltool-0.40.0 )"
 
 RESTRICT="test" # error getting system bus
 
-DOCS=(AUTHORS HACKING NEWS README)
-
 pkg_setup() {
 	if use kernel_linux; then
 		if use amd64 || use x86; then
@@ -52,11 +45,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	base_src_prepare
-
 	if ! use ipod; then
 		sed -i -e 's:libimobiledevice:dIsAbLe&:' configure || die
 	fi
+
+	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
 }
 
 src_configure() {
@@ -71,21 +64,22 @@ src_configure() {
 	fi
 
 	econf \
-		--disable-gtk-doc \
-		--disable-static \
-		--disable-tests \
-		--enable-man-pages \
 		--localstatedir="${EPREFIX}/var" \
-		--with-backend=${backend} \
-		$(use_enable debug verbose-mode) \
 		$(use_enable introspection) \
-		$(use_enable nls)
+		--disable-dependency-tracking \
+		--disable-static \
+		$(use_enable debug verbose-mode) \
+		--enable-man-pages \
+		$(use_enable doc gtk-doc) \
+		--disable-tests \
+		$(use_enable nls) \
+		--with-html-dir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--with-backend=${backend}
 }
 
 src_install() {
-	use doc && HTML_DOCS=("${S}/doc/html/")
-
-	base_src_install
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS HACKING NEWS README
 
-	find "${ED}" -name '*.la' -exec rm {} +
+	find "${ED}" -name '*.la' -delete
 }