Use package specific libexecdir and set QA_MULTILIB_PATHS for it. Introduce USE="+deprecated" so systemd users can also enable the use of pm-utils (for now, while waiting for gnome-shell to adapt) wrt #462476 by Albert W. Hopkins and Martin Wegner

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 101 insertions, 1 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index 65a0f21a664f..1b36b19298fb 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-power/upower
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.104 2013/03/19 08:34:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.105 2013/03/20 15:44:36 ssuominen Exp $
+
+*upower-0.9.20-r1 (20 Mar 2013)
+
+  20 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> +upower-0.9.20-r1.ebuild,
+  metadata.xml:
+  Use package specific libexecdir and set QA_MULTILIB_PATHS for it. Introduce
+  USE="+deprecated" so systemd users can also enable the use of pm-utils (for
+  now, while waiting for gnome-shell to adapt) wrt #462476 by Albert W. Hopkins
+  and Martin Wegner
 
 *upower-0.9.20 (19 Mar 2013)
 
diff --git a/sys-power/upower/metadata.xml b/sys-power/upower/metadata.xml
index c03b663ea9ff..2a7187e9575b 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='deprecated'>Use <pkg>sys-power/pm-utils</pkg> (deprecated) instead of <pkg>sys-apps/systemd</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-power/upower/upower-0.9.20-r1.ebuild b/sys-power/upower/upower-0.9.20-r1.ebuild
new file mode 100644
index 000000000000..58f1a4f27717
--- /dev/null
+++ b/sys-power/upower/upower-0.9.20-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.20-r1.ebuild,v 1.1 2013/03/20 15:44:36 ssuominen Exp $
+
+EAPI=5
+inherit eutils systemd udev
+
+DESCRIPTION="D-Bus abstraction for enumerating power devices and querying history and statistics"
+HOMEPAGE="http://upower.freedesktop.org/"
+SRC_URI="http://${PN}.freedesktop.org/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="+deprecated doc +introspection ios kernel_FreeBSD kernel_linux systemd"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.22
+	sys-apps/dbus
+	>=sys-auth/polkit-0.110
+	introspection? ( dev-libs/gobject-introspection )
+	kernel_linux? (
+		virtual/libusb:1
+		>=virtual/udev-197[gudev]
+		ios? (
+			>=app-pda/libimobiledevice-1
+			>=app-pda/libplist-1
+			)
+		systemd? ( sys-apps/systemd )
+		)"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? (
+		deprecated? ( >=sys-power/pm-utils-1.4.1 )
+		systemd? ( app-shells/bash )
+		)"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	dev-util/intltool
+	virtual/pkgconfig
+	doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2
+		)"
+REQUIRED_USE="kernel_linux? ( !deprecated? ( systemd ) )"
+
+QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
+
+src_prepare() {
+	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
+}
+
+src_configure() {
+	local backend myconf
+
+	if use kernel_linux; then
+		backend=linux
+		myconf="$(use_enable deprecated)"
+	elif use kernel_FreeBSD; then
+		backend=freebsd
+	else
+		backend=dummy
+	fi
+
+	econf \
+		--libexecdir="${EPREFIX}"/usr/lib/${PN} \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable introspection) \
+		--disable-static \
+		${myconf} \
+		--enable-man-pages \
+		$(use_enable doc gtk-doc) \
+		$(use_enable systemd) \
+		--disable-tests \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--with-backend=${backend} \
+		$(use_with ios idevice) \
+		"$(systemd_with_utildir)" \
+		"$(systemd_with_unitdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" udevrulesdir="$(get_udevdir)"/rules.d install
+
+	dodoc AUTHORS HACKING NEWS README
+	keepdir /var/lib/upower #383091
+	prune_libtool_files
+}