ppc stable wrt #338988. Drop old since ppc was sole consumer

(Portage version: 2.1.9.25/cvs/Linux ppc64)

3 files changed, 9 insertions, 90 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index 244dcb8cea31..76b0f0aa1be9 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,6 +1,10 @@
 # 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.27 2010/12/12 16:52:05 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.28 2011/01/11 10:56:17 xarthisius Exp $
+
+  11 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org> -upower-0.9.4.ebuild,
+  upower-0.9.5.ebuild:
+  ppc stable wrt #338988. Drop old.
 
   12 Dec 2010; Raúl Porcel <armin76@gentoo.org> upower-0.9.5.ebuild,
   upower-0.9.7.ebuild:
diff --git a/sys-power/upower/upower-0.9.4.ebuild b/sys-power/upower/upower-0.9.4.ebuild
deleted file mode 100644
index 37f0a66c5897..000000000000
--- a/sys-power/upower/upower-0.9.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.4.ebuild,v 1.9 2010/11/08 11:36:05 ssuominen Exp $
-
-EAPI=3
-inherit eutils linux-info
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
-HOMEPAGE="http://upower.freedesktop.org/"
-SRC_URI="http://upower.freedesktop.org/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc"
-IUSE="debug doc nls introspection kernel_FreeBSD kernel_linux"
-
-COMMON_DEPEND=">=dev-libs/glib-2.21.5:2
-	>=sys-apps/dbus-1
-	>=dev-libs/dbus-glib-0.76
-	>=sys-auth/polkit-0.91
-	<sys-auth/polkit-0.97
-	introspection? ( dev-libs/gobject-introspection )
-	kernel_linux? ( >=sys-fs/udev-151[extras]
-		virtual/libusb:0 )
-	!sys-apps/devicekit-power"
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( >=sys-power/pm-utils-1.3.0-r2 )"
-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 )"
-
-RESTRICT="test" # error getting system bus
-
-pkg_setup() {
-	if use kernel_linux; then
-		if use amd64 || use x86; then
-			CONFIG_CHECK="~ACPI_SYSFS_POWER"
-			linux-info_pkg_setup
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-enumerate.patch
-
-	sed -i \
-		-e '/DISABLE_DEPRECATED/d' \
-		configure || die
-}
-
-src_configure() {
-	local backend
-
-	if use kernel_linux; then
-		backend=linux
-	elif use kernel_FreeBSD; then
-		backend=freebsd
-	else
-		backend=dummy
-	fi
-
-	econf \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable introspection) \
-		--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() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS HACKING NEWS README
-
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/sys-power/upower/upower-0.9.5.ebuild b/sys-power/upower/upower-0.9.5.ebuild
index 557016d686c0..97be0205a41f 100644
--- a/sys-power/upower/upower-0.9.5.ebuild
+++ b/sys-power/upower/upower-0.9.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.14 2010/12/12 16:52:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.5.ebuild,v 1.15 2011/01/11 10:56:17 xarthisius Exp $
 
 EAPI=3
 inherit linux-info
@@ -11,7 +11,7 @@ SRC_URI="http://upower.freedesktop.org/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="debug doc introspection ipod kernel_FreeBSD kernel_linux"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.76