Keyword ~ppc64 wrt #323823. Disable testsuite because it needs running instance of system dbus.

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

4 files changed, 13 insertions, 89 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index b537e36e43fe..74778fc98e11 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.7 2010/06/05 18:58:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.8 2010/07/06 07:55:05 ssuominen Exp $
+
+  06 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> upower-0.9.4.ebuild:
+  Keyword ~ppc64 wrt #323823. Disable testsuite because it needs running
+  instance of system dbus.
 
   05 Jun 2010; Raúl Porcel <armin76@gentoo.org> upower-0.9.3-r1.ebuild,
   upower-0.9.4.ebuild:
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index fd040e693a0f..d1c6c64728cd 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,7 +1,5 @@
 AUX upower-0.9.4-enumerate.patch 847 RMD160 f2487429e40447f3f3216226b8cdac06bc7c00d2 SHA1 86763eeea830e3a2805f3470b3abafbe626e4bc0 SHA256 7314530bb1609d24fa25b04519a8dbbab9378fe0a241d6af1e5a18ccab5160c8
-DIST upower-0.9.3.tar.bz2 468427 RMD160 dbb4a269eae3d5f4eabe76a61513c098f6c15231 SHA1 1682091f037a28675323d6603edf5fdd803f9646 SHA256 05eb4bd73493c779a6972893d7439f92ca8cc30cd81cf00663cfb4dca10896a1
 DIST upower-0.9.4.tar.bz2 468727 RMD160 4403b090e831c63e6ae3846d8ccbc1c7e8d8516c SHA1 35a25ecec2f45a0f92ef5b5f916fca37703b8fac SHA256 39dd138781b2a2d820f1a2bde4ca60dbf99e6def0e0010d4c3d3f4707954a57c
-EBUILD upower-0.9.3-r1.ebuild 1976 RMD160 f9d5424a9ef1cbb11c4e68df5a83657af06f4d55 SHA1 da3ad5a7067efa90d4e8979d7650fc4744a823eb SHA256 b4748c783778a46a7e41dd96255c3e23c8f9c45e66116d52a47f7db672a2eb34
-EBUILD upower-0.9.4.ebuild 2024 RMD160 54541b7e9679636af77e776abc37e3575c75a081 SHA1 59f4007fca8af582267b2da3abedc1623d98ef6b SHA256 839e47ba8b527a9eeed462593dbb6d96201a43f8628c547a31f1e1efad678f3f
-MISC ChangeLog 1340 RMD160 d9def7f809a6143b055b597ee36293a0d5868d96 SHA1 e3f7327cbcafedb1b6cdc6735d7ae461cc47555c SHA256 76103596572d8a363db69a964e05e950cd8fd20207e9076ce0face4e09324291
+EBUILD upower-0.9.4.ebuild 2063 RMD160 535bd45db86d4caa5edbf74b3cfa4b7517f98231 SHA1 56053b263c157e1e27ddd72dac7d60bd68c5e853 SHA256 99f9d7bb0b5d90ef0a345b67a7682af41c2f449877c08c58cfccbfb0e694d83a
+MISC ChangeLog 1518 RMD160 e22cce11edec48f854a253be54cc38b13e35ec56 SHA1 bd4719350a688fa23456e20ca110f9b7383537df SHA256 0ba890b333d9819b26d9f39415fda421e40ccaaf5559d2408d27e6a394474941
 MISC metadata.xml 363 RMD160 7210445bae10f2ddf76edaa8e7144227a03c5de1 SHA1 76f5af45c1a11584d24878ee65e6773757cfa014 SHA256 b24b22d2e371b3ee7165cd9ae1ca6fac72aee10e107c192a4e94686ba95b9093
diff --git a/sys-power/upower/upower-0.9.3-r1.ebuild b/sys-power/upower/upower-0.9.3-r1.ebuild
deleted file mode 100644
index 017751d7112c..000000000000
--- a/sys-power/upower/upower-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,80 +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.3-r1.ebuild,v 1.2 2010/06/05 18:58:14 armin76 Exp $
-
-EAPI=3
-inherit 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="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE="debug doc nls introspection kernel_FreeBSD kernel_linux test"
-
-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]
-		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 )"
-
-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() {
-	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) \
-		$(use_enable test 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.4.ebuild b/sys-power/upower/upower-0.9.4.ebuild
index af0a5d2a8623..b5e105bfbcec 100644
--- a/sys-power/upower/upower-0.9.4.ebuild
+++ b/sys-power/upower/upower-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2010/06/05 18:58:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.4.ebuild,v 1.3 2010/07/06 07:55:05 ssuominen Exp $
 
 EAPI=3
 inherit eutils linux-info
@@ -11,8 +11,8 @@ SRC_URI="http://upower.freedesktop.org/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE="debug doc nls introspection kernel_FreeBSD kernel_linux test"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd"
+IUSE="debug doc nls introspection kernel_FreeBSD kernel_linux"
 
 COMMON_DEPEND=">=dev-libs/glib-2.21.5:2
 	>=sys-apps/dbus-1
@@ -32,6 +32,8 @@ DEPEND="${COMMON_DEPEND}
 		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
@@ -68,7 +70,7 @@ src_configure() {
 		$(use_enable debug verbose-mode) \
 		--enable-man-pages \
 		$(use_enable doc gtk-doc) \
-		$(use_enable test tests) \
+		--disable-tests \
 		$(use_enable nls) \
 		--with-html-dir="${EPREFIX}/usr/share/doc/${PF}/html" \
 		--with-backend=${backend}