diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2011-01-28 16:27:11 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-01-28 16:27:11 +0000 |
commit | 74dec9d12b6f27a6e88167fe8374f286692fc743 (patch) | |
tree | 68df2548d48bfb5901b4185eb38b9f9bc62bf231 /sys-power/upower | |
parent | Stable for HPPA (bug #330855). (diff) | |
download | gentoo-2-74dec9d12b6f27a6e88167fe8374f286692fc743.tar.gz gentoo-2-74dec9d12b6f27a6e88167fe8374f286692fc743.tar.bz2 gentoo-2-74dec9d12b6f27a6e88167fe8374f286692fc743.zip |
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.
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Diffstat (limited to 'sys-power/upower')
-rw-r--r-- | sys-power/upower/ChangeLog | 5 | ||||
-rw-r--r-- | sys-power/upower/files/upower-0.9.7-linux-2.6.36.patch | 26 | ||||
-rw-r--r-- | sys-power/upower/upower-0.9.7.ebuild | 82 | ||||
-rw-r--r-- | sys-power/upower/upower-0.9.8.ebuild | 4 |
4 files changed, 6 insertions, 111 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/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 |