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

Package-Manager: portage-2.1.9.25/cvs/Linux ppc64

4 files changed, 11 insertions, 94 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/Manifest b/sys-power/upower/Manifest
index 423001335677..cad680c3086b 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,10 +1,8 @@
 AUX upower-0.9.4-enumerate.patch 847 RMD160 f2487429e40447f3f3216226b8cdac06bc7c00d2 SHA1 86763eeea830e3a2805f3470b3abafbe626e4bc0 SHA256 7314530bb1609d24fa25b04519a8dbbab9378fe0a241d6af1e5a18ccab5160c8
 AUX upower-0.9.7-linux-2.6.36.patch 871 RMD160 79aacb81bd413ac92016c6e46cc4415c5ee6b6dd SHA1 4d553a05c3e907f6da2d021d9f6c011aecff3ed9 SHA256 f3a806575c9bffde8bcd8df982c4a8cf57f204a85b40d9cb1851fe01a32911b5
-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
 DIST upower-0.9.7.tar.bz2 459717 RMD160 3f66a8a0f0a3a4e91428b13a068be820b1f4a44f SHA1 9fbf0bd9252430af66a23f71d661cdc60692f9cc SHA256 7db45ff675e6836e89adc84d6937e9e5cd468ded89e8bd19edcbfb1a28f42933
-EBUILD upower-0.9.4.ebuild 2056 RMD160 d28787deffa0d93fa1a361021e28529ddcfec3b2 SHA1 8a7916621ad2f6a837ca034842875d7a5550189e SHA256 a00f51952eb1f3171573b4229849d98c20d884baa225bf24163487a4c95b699c
-EBUILD upower-0.9.5.ebuild 2142 RMD160 b45cf3a71b892320901c4c9cc79c3db5dff43382 SHA1 d761e0a2ed817628cdabbabeee91a550a52ae5f9 SHA256 04d5c9a6965692c810c3e6a107bbc9ce257130a0ab137fb114fa505edad831df
+EBUILD upower-0.9.5.ebuild 2144 RMD160 5dbd062abae094c06ab1e0eeda179dc0fec8e5f4 SHA1 f1d22f3cbb7ca16d9b5c4e4db47323bb20bc9818 SHA256 44e55ac922726795338c9bd2a0b43ed49dc1b0527d7f4ed74bdd500fc09805ef
 EBUILD upower-0.9.7.ebuild 2106 RMD160 ce44d72977d7401202c82cabcd58e5013170c503 SHA1 bbe383e492c2deeb0129de7bc880a662490dc643 SHA256 1706feb1acc52deafc68e78aa329aac21b1c44c669691b83c1fdc4b762ac381d
-MISC ChangeLog 3606 RMD160 c95d92d15e2e3848d45155dab9800085070cd1b6 SHA1 94383bdcb77fcfa2e55c37b76a692d731e643aee SHA256 9ca8d1620b593c6cda2814fb4467ec0e4a35f90cde05653a899abe100cb048ab
+MISC ChangeLog 3745 RMD160 d368e155761f2721ef55a91edb2cabd2dcfff81a SHA1 efb5b01331938dbeb5b89ff4b8fcf5ed9baadad6 SHA256 87ee7e196970cc13cdc2625e0ba6c8a0e2b2fce1109f886b66f3ee0fe7266751
 MISC metadata.xml 363 RMD160 7210445bae10f2ddf76edaa8e7144227a03c5de1 SHA1 76f5af45c1a11584d24878ee65e6773757cfa014 SHA256 b24b22d2e371b3ee7165cd9ae1ca6fac72aee10e107c192a4e94686ba95b9093
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