Remove old versions, fix ACPI test to be restricted to amd64/x86

(Portage version: 2.1.8.1/cvs/Linux i686)

8 files changed, 19 insertions, 325 deletions

diff --git a/sys-apps/devicekit-power/ChangeLog b/sys-apps/devicekit-power/ChangeLog
index 7cd434fe7184..caea54545200 100644
--- a/sys-apps/devicekit-power/ChangeLog
+++ b/sys-apps/devicekit-power/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/devicekit-power
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/ChangeLog,v 1.7 2010/02/23 19:31:23 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/ChangeLog,v 1.8 2010/03/11 13:33:51 nirbheek Exp $
+
+  11 Mar 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  devicekit-power-009.ebuild, -devicekit-power-011.ebuild,
+  -devicekit-power-012.ebuild, -devicekit-power-012-r1.ebuild,
+  -files/devicekit-power-012-hibernate-encrypted-swap.patch,
+  -devicekit-power-013.ebuild, devicekit-power-014.ebuild:
+  Remove old versions, fix ACPI test to be restricted to amd64/x86
 
 *devicekit-power-014 (23 Feb 2010)
 
diff --git a/sys-apps/devicekit-power/devicekit-power-009.ebuild b/sys-apps/devicekit-power/devicekit-power-009.ebuild
index 4291ba0d9430..550b118dd2d8 100644
--- a/sys-apps/devicekit-power/devicekit-power-009.ebuild
+++ b/sys-apps/devicekit-power/devicekit-power-009.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-009.ebuild,v 1.2 2009/09/08 18:37:48 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-009.ebuild,v 1.3 2010/03/11 13:33:51 nirbheek Exp $
 
 EAPI="2"
 
@@ -49,7 +49,10 @@ pkg_setup() {
 		$(use_enable debug verbose-mode)
 	"
 
-	check_battery
+	# ACPI is only availably on amd64/x86
+	if use amd64 || use x86; then
+		check_battery
+	fi
 }
 
 src_prepare() {
diff --git a/sys-apps/devicekit-power/devicekit-power-011.ebuild b/sys-apps/devicekit-power/devicekit-power-011.ebuild
deleted file mode 100644
index 79cf16231e0b..000000000000
--- a/sys-apps/devicekit-power/devicekit-power-011.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-011.ebuild,v 1.2 2009/11/16 21:57:32 eva Exp $
-
-EAPI="2"
-
-inherit gnome2 linux-info
-
-MY_PN="DeviceKit-power"
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/DeviceKit"
-SRC_URI="http://hal.freedesktop.org/releases/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc test"
-
-RDEPEND=">=dev-libs/glib-2.21.5
-	>=dev-libs/dbus-glib-0.76
-	>=sys-fs/udev-145[extras]
-	>=sys-auth/polkit-0.91
-	sys-apps/dbus
-	virtual/libusb:0
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	dev-libs/libxslt
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.3 )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-function check_battery() {
-	# check sysfs power interface, bug #263959
-	local CONFIG_CHECK="ACPI_SYSFS_POWER"
-	check_extra_config
-}
-
-pkg_setup() {
-	# Pedantic is currently broken
-	G2CONF="${G2CONF}
-		--localstatedir=/var
-		--disable-ansi
-		--enable-man-pages
-		$(use_enable debug verbose-mode)
-		$(use_enable test tests)
-	"
-
-	check_battery
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix crazy cflags
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.ac configure \
-		|| die "sed 1 failed"
-	# Drop this command line option, because only available since gcc 4.3,
-	# bug 289873.
-	sed 's:WARNINGFLAGS_C=\"$WARNINGFLAGS_C -Wtype-limits\"::g' -i configure.ac configure \
-		|| die "sed 2 failed"
-}
diff --git a/sys-apps/devicekit-power/devicekit-power-012-r1.ebuild b/sys-apps/devicekit-power/devicekit-power-012-r1.ebuild
deleted file mode 100644
index 55a113b9e4d9..000000000000
--- a/sys-apps/devicekit-power/devicekit-power-012-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-012-r1.ebuild,v 1.1 2009/11/16 21:57:32 eva Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 linux-info
-
-MY_PN="DeviceKit-power"
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/DeviceKit"
-SRC_URI="http://hal.freedesktop.org/releases/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc test"
-
-RDEPEND=">=dev-libs/glib-2.21.5
-	>=dev-libs/dbus-glib-0.76
-	>=sys-fs/udev-145[extras]
-	>=sys-auth/polkit-0.91
-	sys-apps/dbus
-	virtual/libusb:0
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	dev-libs/libxslt
-	dev-util/gtk-doc-am
-	doc? (
-		>=dev-util/gtk-doc-1.3
-		app-text/docbook-xml-dtd:4.1.2 )
-	app-text/docbook-xsl-stylesheets
-"
-# docbook xsl is required for man pages
-# FIXME: needs dbus-dtd currently only available with dbus[doc]
-
-DOCS="AUTHORS HACKING NEWS"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-function check_battery() {
-	# check sysfs power interface, bug #263959
-	local CONFIG_CHECK="ACPI_SYSFS_POWER"
-	check_extra_config
-}
-
-pkg_setup() {
-	# Pedantic is currently broken
-	G2CONF="${G2CONF}
-		--localstatedir=/var
-		--disable-ansi
-		--disable-static
-		--enable-man-pages
-		$(use_enable debug verbose-mode)
-		$(use_enable test tests)
-	"
-
-	check_battery
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix crazy cflags
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.ac configure \
-		|| die "sed 1 failed"
-	# Drop this command line option, because only available since gcc 4.3,
-	# bug 289873.
-	sed 's:WARNINGFLAGS_C=\"$WARNINGFLAGS_C -Wtype-limits\"::g' -i configure.ac configure \
-		|| die "sed 2 failed"
-
-	# Fix detection of encrypted swap partition for hibernation, bug #292090
-	epatch "${FILESDIR}/${P}-hibernate-encrypted-swap.patch"
-}
diff --git a/sys-apps/devicekit-power/devicekit-power-012.ebuild b/sys-apps/devicekit-power/devicekit-power-012.ebuild
deleted file mode 100644
index f1765785abae..000000000000
--- a/sys-apps/devicekit-power/devicekit-power-012.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-012.ebuild,v 1.2 2009/11/16 21:57:32 eva Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 linux-info
-
-MY_PN="DeviceKit-power"
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/DeviceKit"
-SRC_URI="http://hal.freedesktop.org/releases/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc test"
-
-RDEPEND=">=dev-libs/glib-2.21.5
-	>=dev-libs/dbus-glib-0.76
-	>=sys-fs/udev-145[extras]
-	>=sys-auth/polkit-0.91
-	sys-apps/dbus
-	virtual/libusb:0
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	dev-libs/libxslt
-	dev-util/gtk-doc-am
-	doc? (
-		>=dev-util/gtk-doc-1.3
-		app-text/docbook-xml-dtd:4.1.2 )
-	app-text/docbook-xsl-stylesheets
-"
-# docbook xsl is required for man pages
-# FIXME: needs dbus-dtd currently only available with dbus[doc]
-
-DOCS="AUTHORS HACKING NEWS"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-function check_battery() {
-	# check sysfs power interface, bug #263959
-	local CONFIG_CHECK="ACPI_SYSFS_POWER"
-	check_extra_config
-}
-
-pkg_setup() {
-	# Pedantic is currently broken
-	G2CONF="${G2CONF}
-		--localstatedir=/var
-		--disable-ansi
-		--disable-static
-		--enable-man-pages
-		$(use_enable debug verbose-mode)
-		$(use_enable test tests)
-	"
-
-	check_battery
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix crazy cflags
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.ac configure \
-		|| die "sed 1 failed"
-	# Drop this command line option, because only available since gcc 4.3,
-	# bug 289873.
-	sed 's:WARNINGFLAGS_C=\"$WARNINGFLAGS_C -Wtype-limits\"::g' -i configure.ac configure \
-		|| die "sed 2 failed"
-}
diff --git a/sys-apps/devicekit-power/devicekit-power-013.ebuild b/sys-apps/devicekit-power/devicekit-power-013.ebuild
deleted file mode 100644
index 51c51103fcd3..000000000000
--- a/sys-apps/devicekit-power/devicekit-power-013.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-013.ebuild,v 1.1 2009/12/11 19:12:05 nirbheek Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 linux-info
-
-MY_PN="DeviceKit-power"
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/DeviceKit"
-SRC_URI="http://hal.freedesktop.org/releases/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc test"
-
-RDEPEND=">=dev-libs/glib-2.21.5
-	>=dev-libs/dbus-glib-0.76
-	>=sys-fs/udev-145[extras]
-	>=sys-auth/polkit-0.91
-	sys-apps/dbus
-	virtual/libusb:0
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	dev-util/pkgconfig
-	dev-libs/libxslt
-	dev-util/gtk-doc-am
-	doc? (
-		>=dev-util/gtk-doc-1.3
-		app-text/docbook-xml-dtd:4.1.2 )
-	app-text/docbook-xsl-stylesheets
-"
-# docbook xsl is required for man pages
-# FIXME: needs dbus-dtd currently only available with dbus[doc]
-
-DOCS="AUTHORS HACKING NEWS"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-function check_battery() {
-	# check sysfs power interface, bug #263959
-	local CONFIG_CHECK="ACPI_SYSFS_POWER"
-	check_extra_config
-}
-
-pkg_setup() {
-	# Pedantic is currently broken
-	G2CONF="${G2CONF}
-		--localstatedir=/var
-		--disable-ansi
-		--disable-static
-		--enable-man-pages
-		$(use_enable debug verbose-mode)
-		$(use_enable test tests)
-	"
-
-	check_battery
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix crazy cflags
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.ac configure \
-		|| die "sed 1 failed"
-	# Drop this command line option, because only available since gcc 4.3,
-	# bug 289873.
-	sed 's:WARNINGFLAGS_C=\"$WARNINGFLAGS_C -Wtype-limits\"::g' -i configure.ac configure \
-		|| die "sed 2 failed"
-}
diff --git a/sys-apps/devicekit-power/devicekit-power-014.ebuild b/sys-apps/devicekit-power/devicekit-power-014.ebuild
index 1834cdbc64e1..5dc57577d3d3 100644
--- a/sys-apps/devicekit-power/devicekit-power-014.ebuild
+++ b/sys-apps/devicekit-power/devicekit-power-014.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-apps/devicekit-power/devicekit-power-014.ebuild,v 1.1 2010/02/23 19:31:23 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/devicekit-power/devicekit-power-014.ebuild,v 1.2 2010/03/11 13:33:51 nirbheek Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -59,7 +59,10 @@ pkg_setup() {
 		$(use_enable test tests)
 	"
 
-	check_battery
+	# ACPI is only availably on amd64/x86
+	if use amd64 || use x86; then
+		check_battery
+	fi
 }
 
 src_prepare() {
diff --git a/sys-apps/devicekit-power/files/devicekit-power-012-hibernate-encrypted-swap.patch b/sys-apps/devicekit-power/files/devicekit-power-012-hibernate-encrypted-swap.patch
deleted file mode 100644
index 18210ec72574..000000000000
--- a/sys-apps/devicekit-power/files/devicekit-power-012-hibernate-encrypted-swap.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 390c5b3aeb3d07ff6de3594fd08370e43b43c652 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Wed, 21 Oct 2009 09:26:48 +0100
-Subject: [PATCH] Fix a trivial copy-paste error that broke hibernate for a lot of people
-
----
- src/dkp-daemon.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/dkp-daemon.c b/src/dkp-daemon.c
-index 20e65f8..eb16a63 100644
---- a/src/dkp-daemon.c
-+++ b/src/dkp-daemon.c
-@@ -563,7 +563,7 @@ dkp_daemon_hibernate (DkpDaemon *daemon, DBusGMethodInvocation *context)
- 	}
- 
- 	/* encrypted swap? */
--	if (!daemon->priv->hibernate_has_encrypted_swap) {
-+	if (daemon->priv->hibernate_has_encrypted_swap) {
- 		error = g_error_new (DKP_DAEMON_ERROR,
- 				     DKP_DAEMON_ERROR_GENERAL,
- 				     "Swap space is encrypted");
--- 
-1.6.5
-