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

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

3 files changed, 11 insertions, 85 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/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}