gobject-introspection support wrt #319105 by Priit Laes.

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

5 files changed, 17 insertions, 86 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index 96c748e19d2e..b5af0a7af4ff 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.4 2010/05/10 22:09:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.5 2010/05/11 08:35:49 ssuominen Exp $
+
+*upower-0.9.3-r1 (11 May 2010)
+
+  11 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +upower-0.9.3-r1.ebuild, metadata.xml:
+  gobject-introspection support wrt #319105 by Priit Laes.
 
 *upower-0.9.3 (10 May 2010)
 
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 1fb62ac337dc..0902da4d1053 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,6 +1,4 @@
-DIST upower-0.9.2.tar.bz2 467544 RMD160 2ae3639c42e292fd2f879f0748f32614eb3691e0 SHA1 7f6daa167eee3a2e1d74322c15c5b2f93213563e SHA256 4a0532fbda7afee29984f7b96b3b3114c68b0525278beb10c98ef287ca5a8377
 DIST upower-0.9.3.tar.bz2 468427 RMD160 dbb4a269eae3d5f4eabe76a61513c098f6c15231 SHA1 1682091f037a28675323d6603edf5fdd803f9646 SHA256 05eb4bd73493c779a6972893d7439f92ca8cc30cd81cf00663cfb4dca10896a1
-EBUILD upower-0.9.2.ebuild 1873 RMD160 1c6151a846ac93b99e2de51fa55388717fd5f2a2 SHA1 9005db39fd9ceea5c2bdcc1a0e727dc0e677897f SHA256 ef4cba6a3512c33b3e01d8c25232b4f5c81e42e0974b4cf024211858a82c8997
-EBUILD upower-0.9.3.ebuild 1873 RMD160 5f53e13499d045720c326cdd8a6a1cdbba6bc6fb SHA1 4c439bc0551ead8b6b314f924fc699d0243da9e5 SHA256 736d675bbc08d4129fb9bb78853e5f65186ddd492ab115a79408e9e3b6962100
-MISC ChangeLog 775 RMD160 4edc2fc23fc88c76f556dbab4cb1e49ba2eab6d2 SHA1 8c72f19d87e5c587e95bd4fb9c419439726c9d05 SHA256 10992a902b3c4021af95fb4d7034841d48d66f473d3bd07836ca141097dca99d
-MISC metadata.xml 244 RMD160 244bfcdb5c3c5eab051189d8adf5e572866b8c64 SHA1 580ce8a447f3237ea98b1d289b440bc89245e89b SHA256 552982cb042dce6d0051aef928f3cca7553e6d7327e0556f97f9e6e52e651b6c
+EBUILD upower-0.9.3-r1.ebuild 1973 RMD160 c14bd90b6ec1bfd3ad85bfb8c7286422a569e9bb SHA1 dedd62b37084ce6af3069f70532853c0f08e344c SHA256 f3a970624dad03bd047aee00fa44d9b74a3b9240e6dcb67c526534e7cac57771
+MISC ChangeLog 962 RMD160 fd8e9011a90c76138b55674d3d2c2e68ddedc171 SHA1 73defabbb21fe5a455d8555fd615128a0ce5897b SHA256 52db52380c5235ad95b68a375f877ae21a45c09e9192be1debd97a2b2d9e3441
+MISC metadata.xml 363 RMD160 7210445bae10f2ddf76edaa8e7144227a03c5de1 SHA1 76f5af45c1a11584d24878ee65e6773757cfa014 SHA256 b24b22d2e371b3ee7165cd9ae1ca6fac72aee10e107c192a4e94686ba95b9093
diff --git a/sys-power/upower/metadata.xml b/sys-power/upower/metadata.xml
index 9879e83b822e..1d2462d712ff 100644
--- a/sys-power/upower/metadata.xml
+++ b/sys-power/upower/metadata.xml
@@ -5,4 +5,7 @@
   <maintainer>
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
+  <use>
+    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+  </use>
 </pkgmetadata>
diff --git a/sys-power/upower/upower-0.9.2.ebuild b/sys-power/upower/upower-0.9.2.ebuild
deleted file mode 100644
index 756d1d5fca29..000000000000
--- a/sys-power/upower/upower-0.9.2.ebuild
+++ /dev/null
@@ -1,78 +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.2.ebuild,v 1.6 2010/04/17 11:37:26 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 ~x86 ~x86-fbsd"
-IUSE="debug doc nls kernel_FreeBSD kernel_linux test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.21.5:2
-	>=sys-apps/dbus-1
-	>=dev-libs/dbus-glib-0.76
-	>=sys-auth/polkit-0.91
-	kernel_linux? ( >=sys-fs/udev-151[extras]
-		virtual/libusb:0 )
-	!sys-apps/devicekit-power"
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( >=sys-power/pm-utils-1.3.0-r2 )"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	doc? ( dev-util/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2 )
-	nls? ( >=dev-util/intltool-0.40.0 )"
-
-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" \
-		--disable-dependency-tracking \
-		--disable-static \
-		$(use_enable debug verbose-mode) \
-		--enable-man-pages \
-		$(use_enable doc gtk-doc) \
-		$(use_enable test tests) \
-		$(use_enable nls) \
-		--with-html-dir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--with-backend=${backend}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS HACKING NEWS README
-
-	find "${ED}" -name '*.la' -delete
-}
diff --git a/sys-power/upower/upower-0.9.3.ebuild b/sys-power/upower/upower-0.9.3-r1.ebuild
index c25badbf1d92..5510175caaa9 100644
--- a/sys-power/upower/upower-0.9.3.ebuild
+++ b/sys-power/upower/upower-0.9.3-r1.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.3.ebuild,v 1.1 2010/05/10 22:09:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.3-r1.ebuild,v 1.1 2010/05/11 08:35:49 ssuominen Exp $
 
 EAPI=3
 inherit linux-info
@@ -12,12 +12,13 @@ SRC_URI="http://upower.freedesktop.org/releases/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="debug doc nls kernel_FreeBSD kernel_linux test"
+IUSE="debug doc nls introspection kernel_FreeBSD kernel_linux test"
 
 COMMON_DEPEND=">=dev-libs/glib-2.21.5:2
 	>=sys-apps/dbus-1
 	>=dev-libs/dbus-glib-0.76
 	>=sys-auth/polkit-0.91
+	introspection? ( dev-libs/gobject-introspection )
 	kernel_linux? ( >=sys-fs/udev-151[extras]
 		virtual/libusb:0 )
 	!sys-apps/devicekit-power"
@@ -59,6 +60,7 @@ src_configure() {
 
 	econf \
 		--localstatedir="${EPREFIX}/var" \
+		$(use_enable introspection) \
 		--disable-dependency-tracking \
 		--disable-static \
 		$(use_enable debug verbose-mode) \