Check ACPI_SYSFS_POWER only for Linux version less than 2.6.37 wrt #352360. Punt old since there is still no dev-libs/glib stable bug, so it's unlikely it'll go stable for a while.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

5 files changed, 8 insertions, 116 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index e84e83d98d79..a01ce4475acd 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-power/upower
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.29 2011/01/21 15:58:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.30 2011/01/28 16:27:11 ssuominen Exp $
+
+  28 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> upower-0.9.8.ebuild:
+  Check ACPI_SYSFS_POWER only for Linux version less than 2.6.37 wrt #352360.
 
 *upower-0.9.8 (21 Jan 2011)
 
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index a7a2018e461e..d3c1e55d1b24 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,9 +1,6 @@
-AUX upower-0.9.7-linux-2.6.36.patch 871 RMD160 79aacb81bd413ac92016c6e46cc4415c5ee6b6dd SHA1 4d553a05c3e907f6da2d021d9f6c011aecff3ed9 SHA256 f3a806575c9bffde8bcd8df982c4a8cf57f204a85b40d9cb1851fe01a32911b5
 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
 DIST upower-0.9.8.tar.bz2 462754 RMD160 cf3f0ec75e4e53b3e57a6429329c19e4826844be SHA1 4eb30f974dd817e7552698483e47c2d27838fbdc SHA256 7afaec3cb10ebbc898308c7abd250c27fd58e10379a42e80444d7a4b32f2eb91
 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
-EBUILD upower-0.9.8.ebuild 2082 RMD160 0d0356a4620ca4f280ec6b922fb8aaddf4f7ebee SHA1 3a81ff2ffdb92d5daa404542db551ccc3c481736 SHA256 22c3f1b2f9cef5caca345b2a3544db432c2841bdc347f8eaae504e724e983d8b
-MISC ChangeLog 3866 RMD160 56adcc888b1a03e314be8e13ba950e66cd420fa5 SHA1 5e97d86ae280ff7df1234e7bcb9a2a381caf908f SHA256 3a8e3e5a15a8c2983220042428e048bc9114569361b2a4e2060b86e0822af8c0
+EBUILD upower-0.9.8.ebuild 2105 RMD160 43ff7d699ab72df43e2ce040e2c41fbf99bccb20 SHA1 c4ac13e7475b1cf65346758686206bc086b7a176 SHA256 be662d2bb4501e6f16d3c79a7e63dc4b060f199e9a932424f17821def9399f2f
+MISC ChangeLog 4020 RMD160 f2b026e4eee71217b14b9aead7775f6d775feb71 SHA1 2dda77713bf4f37519acd1962b96e400afbfd3d0 SHA256 9d8ad8759e0c8d529d9c32e3f3c396e23d6e004c810dc0606515ee27fa9407d7
 MISC metadata.xml 363 RMD160 7210445bae10f2ddf76edaa8e7144227a03c5de1 SHA1 76f5af45c1a11584d24878ee65e6773757cfa014 SHA256 b24b22d2e371b3ee7165cd9ae1ca6fac72aee10e107c192a4e94686ba95b9093
diff --git a/sys-power/upower/files/upower-0.9.7-linux-2.6.36.patch b/sys-power/upower/files/upower-0.9.7-linux-2.6.36.patch
deleted file mode 100644
index 75102767696b..000000000000
--- a/sys-power/upower/files/upower-0.9.7-linux-2.6.36.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 04dd349103ac1db8660d5c4fd86e91e3b488650c Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Thu, 04 Nov 2010 22:45:10 +0000
-Subject: Fix compilation eror against Linux 2.6.36
-
-Include <stdint.h> so that <linux/fs.h> can use uint64_t. Arguably a bug in the
-kernel headers, but it costs us nothing to safeguard against it.
-
-  CC     libupshared_la-up-device-idevice.lo
-In file included from sysfs-utils.c:39:0:
-/usr/include/linux/fs.h:37:2: error: expected specifier-qualifier-list before ‘uint64_t’
----
-diff --git a/src/linux/sysfs-utils.c b/src/linux/sysfs-utils.c
-index 01c3623..efba253 100644
---- a/src/linux/sysfs-utils.c
-+++ b/src/linux/sysfs-utils.c
-@@ -36,6 +36,7 @@
- #include <fcntl.h>
- #include <pwd.h>
- #include <grp.h>
-+#include <stdint.h>
- #include <linux/fs.h>
- #include <sys/ioctl.h>
- #include <glib.h>
---
-cgit v0.8.3-6-g21f6
diff --git a/sys-power/upower/upower-0.9.7.ebuild b/sys-power/upower/upower-0.9.7.ebuild
deleted file mode 100644
index 2c14ff48bee3..000000000000
--- a/sys-power/upower/upower-0.9.7.ebuild
+++ /dev/null
@@ -1,82 +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.7.ebuild,v 1.3 2010/12/12 16:52:05 armin76 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="~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
-	>=dev-libs/glib-2.21.5:2
-	>=sys-apps/dbus-1
-	>=sys-auth/polkit-0.97
-	introspection? ( dev-libs/gobject-introspection )
-	kernel_linux? ( >=sys-fs/udev-151[extras]
-		virtual/libusb:1
-		ipod? ( >=app-pda/libimobiledevice-0.9.7 ) )
-	!sys-apps/devicekit-power"
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( >=sys-power/pm-utils-1.4.1 )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	>=dev-util/intltool-0.40.0
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2 )"
-
-RESTRICT="test"
-
-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
-	epatch "${FILESDIR}"/${P}-linux-2.6.36.patch
-}
-
-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 \
-		--with-html-dir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--with-backend=${backend} \
-		$(use_with ipod idevice)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS HACKING NEWS README
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
diff --git a/sys-power/upower/upower-0.9.8.ebuild b/sys-power/upower/upower-0.9.8.ebuild
index 256ce074e289..e36ad7a9e1ab 100644
--- a/sys-power/upower/upower-0.9.8.ebuild
+++ b/sys-power/upower/upower-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # 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.8.ebuild,v 1.2 2011/01/21 16:04:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.8.ebuild,v 1.3 2011/01/28 16:27:11 ssuominen Exp $
 
 EAPI=3
 inherit linux-info
@@ -37,7 +37,7 @@ DEPEND="${COMMON_DEPEND}
 RESTRICT="test"
 
 pkg_setup() {
-	if use kernel_linux; then
+	if use kernel_linux && kernel_is lt 2 6 37; then
 		if use amd64 || use x86; then
 			CONFIG_CHECK="~ACPI_SYSFS_POWER"
 			linux-info_pkg_setup