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

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 111 insertions, 10 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/Manifest b/sys-power/upower/Manifest
index 92040059ae62..fa37a686b982 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -4,17 +4,18 @@ Hash: SHA256
 DIST upower-0.9.19.tar.xz 411604 SHA256 54c7facb3049f3c1b6ff9510c46aa378f53a2eb606a3ce7be3f6b0a227547e14 SHA512 616502dddec23108fc51662e0e08efc2cd7893043558696ea87cc02c05b85322362be3740c81674b619f5e7acfaa42bdbd56444faab8c11820ebc427e127a9b7 WHIRLPOOL 0cbe033a8ace8520f86f025b513e20d24dbe5e529baa1df1aaebf67ec548a7433ae4f6ba433fd96611722bc7722311c57506270593bb29a942f69f0abb2b4ab1
 DIST upower-0.9.20.tar.xz 413632 SHA256 6817237486561294b1004a9a50a01a4d69f17e8d708c6baf9d92104fe2e6e184 SHA512 d78fc0f53a89e72753c6807ccec70209efa0660c9b93ecdf450c43d33a6f8e39e55ad790ce19c67d335ec137655cf701b09069dbfc68707a8ba6fdbda72fde72 WHIRLPOOL 7fc09931304ef53373cb335d912f4a61c15f5522220fde88c829a4b02ea9dd8eeb42f1070e42e2532fb17d2fea7d3b228539efdfe3337d6b32bccb4e76cbfd6d
 EBUILD upower-0.9.19.ebuild 2095 SHA256 195b11385484413bd70c7830c19b371aab80860a9335de9a730a0b3937b8ea57 SHA512 e61a932516fe971fe621028b134e38e785ac4f5fdb6b16487a4c57502b57231d4a29ac71748448dd69f6dfcb0d90908c8ac6f67800cfc00d2fe2da8226cb4083 WHIRLPOOL d49bd45c8b446ca6ca8e838221546e9329d54a39ba99acb7fc63aa297c7429f30300227f11a0a7d6122498208a7440f18a83b165e4586dbefd7d881b93c231a2
+EBUILD upower-0.9.20-r1.ebuild 2246 SHA256 f2ad81744cb0a19f2dcda4b6937d5287ae539e9139ff33db5436a036a7b08ab9 SHA512 7784955ea4dd90060e3d0851bb0e91831fa402fc36f1814703cc0fd7efaab2314b53f9883c833f852dc05955b0abe8c01dbf21a3181abdb61246ada75afc66cd WHIRLPOOL ff141ae6522135af1854f97737700a1c11835a3e1c126364d92fbe4a545ccbd751d472b5ad192cd99d88a51401c5fe88e01a92b808c84d94900cdc3d54218629
 EBUILD upower-0.9.20.ebuild 2070 SHA256 0f00f3ba4906557f36cc2bfe60224df1095b170b4bc3c4914d8c7dd2e7222f70 SHA512 79030486018bee8be249c528f005c8a5dfe3a031fcae71b42d6f9c20cc7d554877782e20f12f1b32ca0c9f83eb5ce4694c2fb5707607d2d6d3c83e51178332ae WHIRLPOOL 4b3c61b083c78a9b0fddf5553f66428f81a2ded10c0fd6ddbd2ead2e8f14b3da2915dac5ac40492766181a97044f2ca520ecb567cdcb974d36acf5669c9e69bd
-MISC ChangeLog 13001 SHA256 c4a40bbf46f773e9f1d892e87f0a72c70219f1194755f38e3655d79ed15951f5 SHA512 eb6ef2ecf3d1e88e3f152a418208ab02dce35bae63a6b15c48b84ae902bd93b8259ab38c95000131df5f74bf61abb1639f2faee65c676ea645bab736170f6a6c WHIRLPOOL 7193482fc1ccdcb6305672a9dcaf73b940bb97c78c7c88a4004c77b84e25918f1838a3e74fe99c4e14910a584e7943d9eef1c1f37a090d3d603136f364fbe5c5
-MISC metadata.xml 239 SHA256 5d929c534d63615358eacbd035a386109d5deebdc7bb562511b4a6338ee2bbb8 SHA512 ab6b74388bf69a67b0d1f4283475f97eb5a731f31b5c9db4ee50b819a846c77d4ef09f63856e31a68b0bfdf18ee3baa6c76720d4345ccadf154385caaf1033bb WHIRLPOOL bcac6415c046557e53bf04579e077fed4d694dee8f7c0faeecf15f3f036137a2c9f0eaa0c492cecef23a45bd5af2c45542acd26641209d3c9be3108bf1ff09a7
+MISC ChangeLog 13387 SHA256 6c1fdee0e68a7dbb8d899d347c20085e9f2ea63ff251a77b6342b1a060654a30 SHA512 36211a271cc9e83d940eb8aaef8d71e36527a1ad99ae730a72ad6f18efedaf0491ac525a27a17c7ae8e0f493da23d9caca1ed8a3ed5026f13887d25d4e6143ae WHIRLPOOL 84f09720ef7417f9388e28b512c604c2197b9a10eb0771d45956f9002329203ae5784b3a7c5d0e958bd9e714d482866f7f63e88b89afdd935e09a266dc35d7ab
+MISC metadata.xml 373 SHA256 e5e7b3292fcc941400944f79de0622fc927cd4abe2c81fdfa098c29139ac2a53 SHA512 24597947ff98cb3a1faaf48dc77657f516e5766d20944bddb88096f0001cd3e4c62a5b40e084dbd549fe98e04d6093301ac846437ff392e9a2f45244ede33a5e WHIRLPOOL ed7ed47d42fc899dfa92df93eb2d5e7778d9bfe79f90cc0d500e159b321c27d58ee2be1c53bfec8311d73269ae2e23db0f3b8708decb5ce90b5fc086079a205d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRSCLeAAoJEEdUh39IaPFN9nAIAJrrm+gqruzScUEUShGgs6w3
-BsrJw1Juzi0Q0UNpPxPZKkKos3MuQyVdR1kvoDi4w8qI9aLPXxxJvn+8Fomwz0Hc
-S5wbj+Gua64mSMmPIp1180nV5JB5VVOWTaoSL7ZdJqSn73CxseL4he5WD3cwXm63
-5DKcusNzbFdv9JHBqFMzx7O/BP74G4r/pIc3SEv8ogVaPhtSf/a6KyvUrdv/w9C9
-Pk6+BEEnNIvtmtdX+yZ6ahurIdxuiJ0TxIktpYk/1Qboyz1vmnIkV/MVa7KCViFg
-PhOUYnGyVXd2TSX2MJKjPOczOqyakB04PIjtb2d9SwWXrYkvJOIiNV6KR8LI928=
-=xx5U
+iQEcBAEBCAAGBQJRSdk/AAoJEEdUh39IaPFNb94H/2v7gStNXUMFKGpas4kSeiQI
+3QH+3ZjzwoWWp7DrRdK/DDz9E94a1L2G+dW4ccv+ARoL450ZhTUQz+dctkK8TAgx
+CRY5Js+nRh4OGdOlhS3DVyS0LPnjfee6KlTqkq9FXqnoFheXlqD8109VZVPxTQZl
+C7ozZjkasum9GCE+LYpCRVsFMDckh1SUuPnuiAQcrLYjok705xpRcNXJzBHFbE3j
+I9MOineILTUt/7Z4FRTNHvNkreWayzsRa5oEfgFNoUsJqCJyKfIqdCOjeLW16JKi
+BeO9agJdUbVeh2OC5+XgmLH/tpqKMak2+Rx+eHQts7G2bt0dw4R1lNOpclTltbA=
+=FJXF
 -----END PGP SIGNATURE-----
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
+}