Leave 0.9.23-r3 with --disable-deprecated for sys-apps/systemd users; non-systemd users have been moved to sys-power/upower-pm-utils.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x4868F14D

3 files changed, 107 insertions, 9 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index 9a397e89ba16..116ecee53062 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/upower
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.150 2014/06/02 12:47:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.151 2014/06/02 18:45:13 ssuominen Exp $
+
+*upower-0.9.23-r3 (02 Jun 2014)
+
+  02 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> +upower-0.9.23-r3.ebuild:
+  Leave 0.9.23-r3 with --disable-deprecated for sys-apps/systemd users; non-
+  systemd users have been moved to sys-power/upower-pm-utils.
 
   02 Jun 2014; Samuli Suominen <ssuominen@gentoo.org> upower-0.9.23-r2.ebuild,
   upower-0.99.0.ebuild:
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index c36e0acc588f..1d20eee3627c 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -7,17 +7,18 @@ AUX upower-0.9.23-fix-segfault.patch 829 SHA256 c80d1510b3e3d0579ddbec328d2800ab
 DIST upower-0.9.23.tar.xz 425804 SHA256 433252b0a8e9ab4bed7e17ee3ee5b7cef6d527b1f5401ee32212d82a9682981b SHA512 526ef95e43faf61744ba2bbf80bae23bc5c8672130563a87a7f18f00d85b16e2069814ad70dd66ce6ce698037b522d78579cc2135e2af0c2a636230cfa662c6d WHIRLPOOL 1599739198767ea6c70e133d50302a62a5b0b07c3786057b75636167c80b02d8e0ab6cc4781ac08994b249ffb57875bf186923d441e0b10e73c238b6be5b3538
 DIST upower-0.99.0.tar.xz 429076 SHA256 5f354b9949108cb21180224ef3dba33b41c9221a79f71a8f76c47f56246a39a1 SHA512 efb9544730a1baa8abdc5af4b5320ec1fa7518bdaa9e56129eef4aa4caf8167c7bf72f7bc0e71ca7b6d127a1464462667b86039a4c5248c8c75c66334e038ea7 WHIRLPOOL 15634811ae267a9811933c75af25321e885d9646782c21cac237d20bea4a673930af3bf9a1873d5295e31676714c64ef6fb187c780b903e872e4e6677b615e20
 EBUILD upower-0.9.23-r2.ebuild 2260 SHA256 b551558b602a0e9adbee1e1ae9904f511a4ae26b8c996fe404bde18e31d1e061 SHA512 3451b5903053c95f4691dc23a9bb776e6a9b6efaf083e440d766d4b599c5887e705a1dcae1d315b90f7dba497ff21fc47fd1d8e4b7c0a84725804e07b00305f8 WHIRLPOOL 69a48d8c30a30e0228c237caffacc8c20c7556cfeb57ebc221a3e03a7d8decbc8d05d1a7297367f154e6818f2a890ab7a9450c78161c4d8168d4de795fd9a203
+EBUILD upower-0.9.23-r3.ebuild 2159 SHA256 ab69b44944b8e5f71258bf14c209491504e0f56bde33907bb6e483d0deead087 SHA512 e5169e6a197365dd065ccb6137be21d00354bd40b330c287f87e84cf6a71f49b774f2209fd51b3e219bd19cbbb0a092e4f41a9e5200d906f5286a720fa32f7fa WHIRLPOOL 16a770c25b808e542dda0113ad972da35c03c61a0ac3f208a503f1c5b496503349d6f9a689efbc88dae44aaa595d5c6cf3a7f08ca0e6221bdf34f19e621c0c0e
 EBUILD upower-0.99.0.ebuild 1926 SHA256 22593d151cc25bdcdae3d0c99b7f7902b7e33314019084bd002c0f47e3aa3834 SHA512 7940ff18d14dbeacf3b321faaffb4994379cabb214e34c7e1693aedfdca13b1af224091015f3d7010c8394d44850d0c66c08c9f1a33e240c700a1b649e74e43b WHIRLPOOL 97bceb35915f235f9d306f74357ea685b505a89d281b0bc57ebdd8f924dcb40fb3865a32f31f1d0c666de02c492316eefa42531d81726b66c74e0c992c8e5cb8
-MISC ChangeLog 19412 SHA256 6bcbdf8d2cec0c27c695dfc03d3b88279989de382a46b061fccf12ac521381cc SHA512 c4359c5d60185c46fcbd9bd6832c4e32dd31223d003f0ca3a132e877e403db4328ed656d42df6d974dc125057bb55900972e545920a1045a59b7a19134d633c3 WHIRLPOOL 6ac0f1f935c6262248a7a40d9d3c39625bbac1526e0fc2ce7e47633ed3b5d1f43b4732684e79fe1eb7b05aea9a2969a5c2cee14a95dea6db3f47b253377956ac
+MISC ChangeLog 19665 SHA256 51db424d74dcc208d16da7a08021416520e06e0c58e1f90e7ffdea7392c46d70 SHA512 4c36a48dfac97e7b7a164eda0ceeee1599c479b0a23e3c60f76793b37c3d23b45e38af70249e2efe3607da20e97931dfe2fe685e3ed95ffc6726405784b4be62 WHIRLPOOL c0e5922132a87615103ca840506589b30aaea69908b5235be21b1a393cc1dc8e9779324f4ed1468252c3c24c52cfa8b8e67efb45ce305090ad37e1290f8264f3
 MISC metadata.xml 239 SHA256 5d929c534d63615358eacbd035a386109d5deebdc7bb562511b4a6338ee2bbb8 SHA512 ab6b74388bf69a67b0d1f4283475f97eb5a731f31b5c9db4ee50b819a846c77d4ef09f63856e31a68b0bfdf18ee3baa6c76720d4345ccadf154385caaf1033bb WHIRLPOOL bcac6415c046557e53bf04579e077fed4d694dee8f7c0faeecf15f3f036137a2c9f0eaa0c492cecef23a45bd5af2c45542acd26641209d3c9be3108bf1ff09a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTjHHhAAoJEEdUh39IaPFNKbMH/2LO6Vds4hMmGshynB9H400G
-AjNq2vLKPCBKyAdtRXXCdAlY9cigRlS/4Ayhv1QgrlNCzQIB2S0UPmbEX/Jid6cP
-CSETydx7kURTCvHfBEsNlM7MFdIZPPvIZciRtWnvKc5bLFxgfh1+PuXld4QY2pVB
-JSNYMilJgkC1GVcAPw8A//tzKyqdITzCkcVVui2l/jehf3DeHMuHHsUV4G4XGe3G
-4nCKUM4MB63TRSIAWHkc9bscFgBP7mqpY4zZhx7rHq0TV/WWvF1a2hmJbPpD6lDO
-wGGzi2jmY7SoBmLjxSmO/3ElFWaypa0FzdsQvODCA/M0cdUgeFcFc8HQ/laSV3A=
-=TQXd
+iQEcBAEBCAAGBQJTjMW0AAoJEEdUh39IaPFNulgIAIoBjR+KX6kyWlaTUaZs/yQM
+NhGSbARSR7sxNrFVlwl0JD7SmUexl3XUm22b5j7R4gOVGG43tj594diHJNXURXad
+IAsHr5qZc9g7o4Q7uu+jyMnt7de2UPYTlTiM9Hvb3D4jLAef2RogkScfBIlw6XEN
+vrQn6JcMa7Gm9HMYe9ALQK/GQu5IKJZ/HyBG445/Lv+V1C1fwMO1MctS6tAFCjz0
+nYGMaJIV+C8cq4ZTJoe3szPCFDthu90uVpsshEARkL7H/gtk+1kdniROUzCNMANO
+A8ttL23oS3wTm8irg78EZ86Q/xtKgmmE+8aHm7pklDekfdn2wXct60SgdJ/NZ4Q=
+=2SjP
 -----END PGP SIGNATURE-----
diff --git a/sys-power/upower/upower-0.9.23-r3.ebuild b/sys-power/upower/upower-0.9.23-r3.ebuild
new file mode 100644
index 000000000000..9224084de359
--- /dev/null
+++ b/sys-power/upower/upower-0.9.23-r3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.23-r3.ebuild,v 1.1 2014/06/02 18:45:13 ssuominen Exp $
+
+EAPI=5
+inherit eutils systemd
+
+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 ppc ppc64 sparc x86"
+IUSE="doc +introspection ios kernel_FreeBSD kernel_linux"
+
+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/libgudev:=
+		virtual/udev
+		ios? (
+			>=app-pda/libimobiledevice-1:=
+			>=app-pda/libplist-1:=
+			)
+		)"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? (
+		app-shells/bash
+		>=sys-apps/systemd-200
+	)"
+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
+		)"
+
+QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
+
+DOCS="AUTHORS HACKING NEWS README"
+
+src_prepare() {
+	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
+
+	epatch \
+		"${FILESDIR}"/${P}-create-dir-runtime.patch \
+		"${FILESDIR}"/${P}-fix-segfault.patch \
+		"${FILESDIR}"/${P}-clamp_percentage_for_overfull_batt.patch
+}
+
+src_configure() {
+	local backend myconf
+
+	if use kernel_linux; then
+		backend=linux
+		myconf="--disable-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) \
+		--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() {
+	default
+	keepdir /var/lib/upower #383091
+	prune_libtool_files
+}