Version bump. drop old

(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)

6 files changed, 41 insertions, 213 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index d8955adc9c3e..0ef6eb353bc1 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,6 +1,12 @@
 # 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.24 2010/10/18 09:45:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.25 2010/11/08 11:36:05 ssuominen Exp $
+
+*upower-0.9.7 (08 Nov 2010)
+
+  08 Nov 2010; Samuli Suominen <ssuominen@gentoo.org> +upower-0.9.7.ebuild,
+  +files/upower-0.9.7-linux-2.6.36.patch:
+  Version bump.
 
   18 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> upower-0.9.6.ebuild,
   +files/upower-0.9.6-introspection.patch,
diff --git a/sys-power/upower/files/upower-0.9.6-introspection-2.patch b/sys-power/upower/files/upower-0.9.6-introspection-2.patch
deleted file mode 100644
index 7bdf57745494..000000000000
--- a/sys-power/upower/files/upower-0.9.6-introspection-2.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From 58f3d9fbdff88173276f05e0d6da2cf864758381 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Tue, 05 Oct 2010 10:13:09 +0000
-Subject: Fix up all the warnings when building with new versions of gobject-introspection
-
----
-diff --git a/libupower-glib/up-client.c b/libupower-glib/up-client.c
-index 13d5bf7..01ceeb8 100644
---- a/libupower-glib/up-client.c
-+++ b/libupower-glib/up-client.c
-@@ -120,7 +120,7 @@ up_client_get_device (UpClient *client, const gchar *object_path)
-  * You must have called up_client_enumerate_devices_sync() before calling this
-  * function.
-  *
-- * Return value: an array of #UpDevice objects, free with g_ptr_array_unref()
-+ * Return value: (transfer full): an array of #UpDevice objects, free with g_ptr_array_unref()
-  *
-  * Since: 0.9.0
-  **/
-diff --git a/libupower-glib/up-device.c b/libupower-glib/up-device.c
-index 41097b2..999f25b 100644
---- a/libupower-glib/up-device.c
-+++ b/libupower-glib/up-device.c
-@@ -568,7 +568,7 @@ out:
-  *
-  * Gets the device history.
-  *
-- * Return value: an array of #UpHistoryItem's, else #NULL and @error is used
-+ * Return value: (transfer full): an array of #UpHistoryItem's, else #NULL and @error is used
-  *
-  * Since: 0.9.0
-  **/
-@@ -653,7 +653,7 @@ out:
-  *
-  * Gets the device current statistics.
-  *
-- * Return value: an array of #UpStatsItem's, else #NULL and @error is used
-+ * Return value: (transfer full): an array of #UpStatsItem's, else #NULL and @error is used
-  *
-  * Since: 0.9.0
-  **/
-diff --git a/libupower-glib/up-wakeup-item.c b/libupower-glib/up-wakeup-item.c
-index 776473b..7060a3d 100644
---- a/libupower-glib/up-wakeup-item.c
-+++ b/libupower-glib/up-wakeup-item.c
-@@ -66,7 +66,7 @@ G_DEFINE_TYPE (UpWakeupItem, up_wakeup_item, G_TYPE_OBJECT)
- 
- /**
-  * up_wakeup_item_get_is_userspace:
-- * @history_item: #UpWakeupItem
-+ * @wakeup_item: #UpWakeupItem
-  *
-  * Gets if the item is userspace.
-  *
-@@ -83,7 +83,7 @@ up_wakeup_item_get_is_userspace (UpWakeupItem *wakeup_item)
- 
- /**
-  * up_wakeup_item_set_is_userspace:
-- * @history_item: #UpWakeupItem
-+ * @wakeup_item: #UpWakeupItem
-  * @is_userspace: the new value
-  *
-  * Sets if the item is userspace.
-@@ -100,7 +100,7 @@ up_wakeup_item_set_is_userspace (UpWakeupItem *wakeup_item, gboolean is_userspac
- 
- /**
-  * up_wakeup_item_get_id:
-- * @history_item: #UpWakeupItem
-+ * @wakeup_item: #UpWakeupItem
-  *
-  * Gets the item id.
-  *
-@@ -117,7 +117,7 @@ up_wakeup_item_get_id (UpWakeupItem *wakeup_item)
- 
- /**
-  * up_wakeup_item_set_id:
-- * @history_item: #UpWakeupItem
-+ * @wakeup_item: #UpWakeupItem
-  * @id: the new value
-  *
-  * Sets the item id.
-@@ -134,7 +134,7 @@ up_wakeup_item_set_id (UpWakeupItem *wakeup_item, guint id)
- 
- /**
-  * up_wakeup_item_get_old:
-- * @history_item: #UpWakeupItem
-+ * @wakeup_item: #UpWakeupItem
-  *
-  * Gets the item old.
-  *
-@@ -151,7 +151,7 @@ up_wakeup_item_get_old (UpWakeupItem *wakeup_item)
- 
- /**
-  * up_wakeup_item_set_old:
-- * @history_item: #UpWakeupItem
-+ * @wakeup_item: #UpWakeupItem
-  * @old: the new value
-  *
-  * Sets the item old.
-@@ -168,7 +168,7 @@ up_wakeup_item_set_old (UpWakeupItem *wakeup_item, guint old)
- 
- /**
-  * up_wakeup_item_get_value:
-- * @history_item: #UpWakeupItem
-+ * @wakeup_item: #UpWakeupItem
-  *
-  * Gets the item value.
-  *
-@@ -185,7 +185,7 @@ up_wakeup_item_get_value (UpWakeupItem *wakeup_item)
- 
- /**
-  * up_wakeup_item_set_value:
-- * @history_item: #UpWakeupItem
-+ * @wakeup_item: #UpWakeupItem
-  * @value: the new value
-  *
-  * Sets the item value.
-@@ -202,7 +202,7 @@ up_wakeup_item_set_value (UpWakeupItem *wakeup_item, gdouble value)
- 
- /**
-  * up_wakeup_item_get_cmdline:
-- * @history_item: #UpWakeupItem
-+ * @wakeup_item: #UpWakeupItem
-  *
-  * Gets the item cmdline.
-  *
-@@ -219,7 +219,7 @@ up_wakeup_item_get_cmdline (UpWakeupItem *wakeup_item)
- 
- /**
-  * up_wakeup_item_set_cmdline:
-- * @history_item: #UpWakeupItem
-+ * @wakeup_item: #UpWakeupItem
-  * @cmdline: the new value
-  *
-  * Sets the item cmdline.
-@@ -237,7 +237,7 @@ up_wakeup_item_set_cmdline (UpWakeupItem *wakeup_item, const gchar *cmdline)
- 
- /**
-  * up_wakeup_item_get_details:
-- * @history_item: #UpWakeupItem
-+ * @wakeup_item: #UpWakeupItem
-  *
-  * Gets the item details.
-  *
-@@ -254,7 +254,7 @@ up_wakeup_item_get_details (UpWakeupItem *wakeup_item)
- 
- /**
-  * up_wakeup_item_set_details:
-- * @history_item: #UpWakeupItem
-+ * @wakeup_item: #UpWakeupItem
-  * @details: the new value
-  *
-  * Sets the item details.
-diff --git a/libupower-glib/up-wakeups.c b/libupower-glib/up-wakeups.c
-index 1388eab..2843891 100644
---- a/libupower-glib/up-wakeups.c
-+++ b/libupower-glib/up-wakeups.c
-@@ -95,7 +95,7 @@ up_wakeups_get_total_sync (UpWakeups *wakeups, GCancellable *cancellable, GError
-  *
-  * Gets the wakeups data from the daemon.
-  *
-- * Return value: an array of %UpWakeupItem's
-+ * Return value: (transfer full): an array of %UpWakeupItem's
-  *
-  * Since: 0.9.1
-  **/
---
-cgit v0.8.3-6-g21f6
diff --git a/sys-power/upower/files/upower-0.9.6-introspection.patch b/sys-power/upower/files/upower-0.9.6-introspection.patch
deleted file mode 100644
index 53dbe03f9d5d..000000000000
--- a/sys-power/upower/files/upower-0.9.6-introspection.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From cfd3641501b23ae68beb9656489e8c3077c3dad5 Mon Sep 17 00:00:00 2001
-From: Edward Sheldrake <ejsheldrake@gmail.com>
-Date: Tue, 05 Oct 2010 10:03:42 +0000
-Subject: Fix building with gobject-introspection 0.9.10
-
----
-diff --git a/libupower-glib/Makefile.am b/libupower-glib/Makefile.am
-index 83322c4..652f2de 100644
---- a/libupower-glib/Makefile.am
-+++ b/libupower-glib/Makefile.am
-@@ -60,14 +60,15 @@ EXTRA_DIST =							\
- CLEANFILES = $(BUILT_SOURCES)
- 
- if HAVE_INTROSPECTION
--introspection_sources = $(libupower_glib_la_SOURCES)
-+introspection_sources = $(libupower_glib_include_HEADERS) $(libupower_glib_la_SOURCES)
- 
- UPowerGlib-1.0.gir: libupower-glib.la
- UPowerGlib_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
- UPowerGlib_1_0_gir_CFLAGS = $(INCLUDES)
--PackageKitGlib_1_0_gir_SCANNERFLAGS = --identifier-prefix=Up --warn-all --add-include-path=$(srcdir)
-+UPowerGlib_1_0_gir_SCANNERFLAGS = --identifier-prefix=Up --symbol-prefix=up_ --warn-all --add-include-path=$(srcdir)
- UPowerGlib_1_0_gir_LIBS = libupower-glib.la
- UPowerGlib_1_0_gir_FILES = $(introspection_sources)
-+UPowerGlib_1_0_gir_NAMESPACE = UPowerGlib
- INTROSPECTION_GIRS += UPowerGlib-1.0.gir
- 
- girdir = $(datadir)/gir-1.0
---
-cgit v0.8.3-6-g21f6
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
new file mode 100644
index 000000000000..75102767696b
--- /dev/null
+++ b/sys-power/upower/files/upower-0.9.7-linux-2.6.36.patch
@@ -0,0 +1,26 @@
+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.4.ebuild b/sys-power/upower/upower-0.9.4.ebuild
index 40e98585c11a..37f0a66c5897 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.8 2010/10/17 08:16:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.4.ebuild,v 1.9 2010/11/08 11:36:05 ssuominen Exp $
 
 EAPI=3
 inherit eutils linux-info
@@ -11,7 +11,7 @@ SRC_URI="http://upower.freedesktop.org/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="ppc"
 IUSE="debug doc nls introspection kernel_FreeBSD kernel_linux"
 
 COMMON_DEPEND=">=dev-libs/glib-2.21.5:2
diff --git a/sys-power/upower/upower-0.9.6.ebuild b/sys-power/upower/upower-0.9.7.ebuild
index 7ecfa0b1977e..50a1b7b6b999 100644
--- a/sys-power/upower/upower-0.9.6.ebuild
+++ b/sys-power/upower/upower-0.9.7.ebuild
@@ -1,9 +1,9 @@
 # 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.3 2010/10/18 09:46:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.7.ebuild,v 1.1 2010/11/08 11:36:05 ssuominen Exp $
 
 EAPI=3
-inherit autotools eutils linux-info
+inherit eutils linux-info
 
 DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
 HOMEPAGE="http://upower.freedesktop.org/"
@@ -31,10 +31,9 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.0
 	dev-util/pkgconfig
 	doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2 )
-	introspection? ( dev-util/gtk-doc-am )" # eautoreconf
+		app-text/docbook-xml-dtd:4.1.2 )"
 
-RESTRICT="test" # error getting system bus
+RESTRICT="test"
 
 pkg_setup() {
 	if use kernel_linux; then
@@ -46,13 +45,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if use introspection; then
-		sed -i -e '/DISABLE_DEPRECATED/d' configure.ac || die
-		epatch "${FILESDIR}"/${P}-introspection{,-2}.patch
-		eautoreconf
-	else
-		sed -i -e '/DISABLE_DEPRECATED/d' configure || die
-	fi
+	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
+	epatch "${FILESDIR}"/${P}-linux-2.6.36.patch
 }
 
 src_configure() {