Version bump and fix some deps to make sure people don't use uncompatible combination

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

5 files changed, 96 insertions, 16 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index 94e61bcfb58a..51570f3905c4 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,6 +1,11 @@
 # 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.22 2010/10/13 21:37:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.23 2010/10/17 08:16:04 ssuominen Exp $
+
+*upower-0.9.6 (17 Oct 2010)
+
+  17 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> +upower-0.9.6.ebuild:
+  Version bump.
 
   13 Oct 2010; Markus Meier <maekke@gentoo.org> upower-0.9.5.ebuild:
   arm stable, bug #338988
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 5c50a00cb929..d095ef927ba2 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX upower-0.9.4-enumerate.patch 847 RMD160 f2487429e40447f3f3216226b8cdac06bc7c00d2 SHA1 86763eeea830e3a2805f3470b3abafbe626e4bc0 SHA256 7314530bb1609d24fa25b04519a8dbbab9378fe0a241d6af1e5a18ccab5160c8
 DIST upower-0.9.4.tar.bz2 468727 RMD160 4403b090e831c63e6ae3846d8ccbc1c7e8d8516c SHA1 35a25ecec2f45a0f92ef5b5f916fca37703b8fac SHA256 39dd138781b2a2d820f1a2bde4ca60dbf99e6def0e0010d4c3d3f4707954a57c
 DIST upower-0.9.5.tar.bz2 473750 RMD160 0d6c84046230b17ee63428df1b103474d920ef93 SHA1 5a4763bcbdf0dae1868f8475d9eebe6188eb89c2 SHA256 b34074a5467d442720f4b5d4cee3946fa41dea932463f5e265deb90ae0e7c7a1
-EBUILD upower-0.9.4.ebuild 2061 RMD160 2b650bd55f6fed7c16376eed5597ac470b56b542 SHA1 386502f2ce5dbd8b7daf08838e70ae8362bebb79 SHA256 a23f8c7cb21e8d96f0463b677b354a042c6fb64c36291ccf6a05c990766be137
-EBUILD upower-0.9.5.ebuild 2101 RMD160 05d132d71e90d4f928a8211a8ffa2dbd4bb4d248 SHA1 3dc97894d7d782452fdd267779dc82475689ad69 SHA256 0e5a482b5b88f1b48fb64e97679ecead26b47126f045830d5c1d0238bdcb88dc
-MISC ChangeLog 2845 RMD160 ff7f3d67d3e7299c00e729105d0ba5716e46ff9b SHA1 5a452ad6245d8d53040ab625a4bc748bdc30103f SHA256 be294cc8960695d49f65725d778d46f8b53d51055b680357ad1660d67199f4ef
+DIST upower-0.9.6.tar.bz2 453993 RMD160 f1bf3a2138d41bc7c138fb2df2b99980f64ae000 SHA1 4e21c948ac7eda57f9f0ab1fde734315517fe9ac SHA256 aeff4a0c98a12b8beb56ca92314e1e8a6711f13929a294ae3c0a725125a1db4f
+EBUILD upower-0.9.4.ebuild 2087 RMD160 d2c9c8842183225978bb62f4fc76e0ce8238bc7c SHA1 75176fc44625268a49cba4a34e4ae1cc58a5067e SHA256 afb10c591389975bc2f4065704efc5b366405c012da95ef2010fe22be886b2d7
+EBUILD upower-0.9.5.ebuild 2127 RMD160 46dcf2ef5036997ad48d18ed627d8f1474978dd4 SHA1 cc72ee3fd4c3b5ad6d3981e26ceeecd2b40a447f SHA256 1cdf5d4567f9bb36d7736ad6f34ffe13161c39d49609fefc2c80c53860d534fd
+EBUILD upower-0.9.6.ebuild 2061 RMD160 d9b88c61e297c024f6cc870b5cb6f861a3450728 SHA1 e197309ef07e60bebc7746d298fdc43987ea849d SHA256 814a76d7ff7ed67113cac87e22d01b0d86bdc3d6ed47f2a089e6d834c997534c
+MISC ChangeLog 2970 RMD160 634d07b2b3e0a6b4a4c36589d84a5fcded2353f2 SHA1 c87d997910a03a3b3f61845805abb6d7ecfbb7a8 SHA256 35516b3ef552a475d8810e442285e67d1b09027c79f1b62bab6bf9966850b4e5
 MISC metadata.xml 363 RMD160 7210445bae10f2ddf76edaa8e7144227a03c5de1 SHA1 76f5af45c1a11584d24878ee65e6773757cfa014 SHA256 b24b22d2e371b3ee7165cd9ae1ca6fac72aee10e107c192a4e94686ba95b9093
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAky2JqUACgkQkKaRLQcq0GKDDACfbSoFDfw7y6nftlHVuQtuGi8s
-dVMAnjwnFgorYGpKli8xNZEJwp7kkJF0
-=4aHE
------END PGP SIGNATURE-----
diff --git a/sys-power/upower/upower-0.9.4.ebuild b/sys-power/upower/upower-0.9.4.ebuild
index 7d2808ce6f61..40e98585c11a 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.7 2010/09/09 03:19:33 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.4.ebuild,v 1.8 2010/10/17 08:16:04 ssuominen Exp $
 
 EAPI=3
 inherit eutils linux-info
@@ -18,6 +18,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.21.5:2
 	>=sys-apps/dbus-1
 	>=dev-libs/dbus-glib-0.76
 	>=sys-auth/polkit-0.91
+	<sys-auth/polkit-0.97
 	introspection? ( dev-libs/gobject-introspection )
 	kernel_linux? ( >=sys-fs/udev-151[extras]
 		virtual/libusb:0 )
diff --git a/sys-power/upower/upower-0.9.5.ebuild b/sys-power/upower/upower-0.9.5.ebuild
index c89b7e1d2ce3..b01b0177ad7b 100644
--- a/sys-power/upower/upower-0.9.5.ebuild
+++ b/sys-power/upower/upower-0.9.5.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.5.ebuild,v 1.11 2010/10/13 21:37:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.5.ebuild,v 1.12 2010/10/17 08:16:04 ssuominen Exp $
 
 EAPI=3
 inherit linux-info
@@ -18,6 +18,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
 	>=dev-libs/glib-2.21.5:2
 	>=sys-apps/dbus-1
 	>=sys-auth/polkit-0.91
+	<sys-auth/polkit-0.97
 	introspection? ( dev-libs/gobject-introspection )
 	kernel_linux? ( >=sys-fs/udev-151[extras]
 		virtual/libusb:1
diff --git a/sys-power/upower/upower-0.9.6.ebuild b/sys-power/upower/upower-0.9.6.ebuild
new file mode 100644
index 000000000000..75c13ebb51ba
--- /dev/null
+++ b/sys-power/upower/upower-0.9.6.ebuild
@@ -0,0 +1,81 @@
+# 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.6.ebuild,v 1.1 2010/10/17 08:16:04 ssuominen 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 ~ppc ~ppc64 ~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" # error getting system bus
+
+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) \
+		--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 '{}' +
+}