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

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

2 files changed, 40 insertions, 29 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index e94e62b4aa2a..d9ad852e769a 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,6 +1,11 @@
 # 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.13 2010/07/30 09:43:10 hwoarang Exp $
+# $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
 
   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/upower-0.9.5.ebuild b/sys-power/upower/upower-0.9.5.ebuild
index 09133eee0084..1c3369370cba 100644
--- a/sys-power/upower/upower-0.9.5.ebuild
+++ b/sys-power/upower/upower-0.9.5.ebuild
@@ -1,9 +1,10 @@
 # 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.3 2010/07/24 15:50:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.5.ebuild,v 1.4 2010/08/04 04:05:41 reavertm Exp $
 
 EAPI=3
-inherit linux-info
+
+inherit linux-info base
 
 DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
 HOMEPAGE="http://upower.freedesktop.org/"
@@ -12,29 +13,35 @@ 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 nls introspection ipod kernel_FreeBSD kernel_linux"
+IUSE="debug doc introspection ipod kernel_FreeBSD kernel_linux nls"
 
-COMMON_DEPEND=">=dev-libs/glib-2.21.5:2
-	>=sys-apps/dbus-1
+COMMON_DEPEND="
 	>=dev-libs/dbus-glib-0.76
+	>=dev-libs/glib-2.21.5:2
+	>=sys-apps/dbus-1
 	>=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 ) )
-	!sys-apps/devicekit-power"
+		ipod? ( >=app-pda/libimobiledevice-0.9.7 )
+	)
+"
 RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( >=sys-power/pm-utils-1.4.1 )"
+	!sys-apps/devicekit-power
+	kernel_linux? ( >=sys-power/pm-utils-1.4.1 )
+"
 DEPEND="${COMMON_DEPEND}
-	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 )"
+	dev-libs/libxslt
+	>=dev-util/intltool-0.40.0
+	dev-util/pkgconfig
+"
 
 RESTRICT="test" # error getting system bus
 
+DOCS=(AUTHORS HACKING NEWS README)
+
 pkg_setup() {
 	if use kernel_linux; then
 		if use amd64 || use x86; then
@@ -45,11 +52,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() {
@@ -64,22 +71,21 @@ src_configure() {
 	fi
 
 	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable introspection) \
-		--disable-dependency-tracking \
+		--disable-gtk-doc \
 		--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}
+		--enable-man-pages \
+		--localstatedir="${EPREFIX}/var" \
+		--with-backend=${backend} \
+		$(use_enable debug verbose-mode) \
+		$(use_enable introspection) \
+		$(use_enable nls)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS HACKING NEWS README
+	use doc && HTML_DOCS=("${S}/doc/html/")
+
+	base_src_install
 
-	find "${ED}" -name '*.la' -delete
+	find "${ED}" -name '*.la' -exec rm {} +
 }