Pass -DUPOWER_ENABLE_DEPRECATED from "Cflags: " of upower-glib.pc wrt http://bugzilla.xfce.org/show_bug.cgi?id=10931 and http://bugs.freedesktop.org/show_bug.cgi?id=79565

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

3 files changed, 113 insertions, 9 deletions

diff --git a/sys-power/upower-pm-utils/ChangeLog b/sys-power/upower-pm-utils/ChangeLog
index 20b578dddb24..9cbb30713781 100644
--- a/sys-power/upower-pm-utils/ChangeLog
+++ b/sys-power/upower-pm-utils/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-power/upower-pm-utils
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower-pm-utils/ChangeLog,v 1.3 2014/06/02 12:48:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower-pm-utils/ChangeLog,v 1.4 2014/06/02 21:39:07 ssuominen Exp $
+
+*upower-pm-utils-0.9.23-r1 (02 Jun 2014)
+
+  02 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +upower-pm-utils-0.9.23-r1.ebuild:
+  Pass -DUPOWER_ENABLE_DEPRECATED from "Cflags: " of upower-glib.pc wrt
+  http://bugzilla.xfce.org/show_bug.cgi?id=10931 and
+  http://bugs.freedesktop.org/show_bug.cgi?id=79565
 
   02 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
   upower-pm-utils-0.9.23.ebuild:
diff --git a/sys-power/upower-pm-utils/Manifest b/sys-power/upower-pm-utils/Manifest
index daa0eb05ddf2..139130c546a9 100644
--- a/sys-power/upower-pm-utils/Manifest
+++ b/sys-power/upower-pm-utils/Manifest
@@ -5,17 +5,18 @@ AUX upower-pm-utils-0.9.23-clamp_percentage_for_overfull_batt.patch 3396 SHA256
 AUX upower-pm-utils-0.9.23-create-dir-runtime.patch 1164 SHA256 6324c148d436e3f898b73b445411f29a7527c65ffedb574ef658c1eaaa1aa4de SHA512 1aaec53df73aa50fabffaddd380800f7ed78caddc02b16834831aa1faa09c795e0def04493f64d852a9b07b9ef4007352e111c5d7cdc1f1b2ed8043c445751f2 WHIRLPOOL 4347f169597c8e144081673d038809a4f0525410aef7e3ff3b713f22dd28e1d7f4bcc69413be2d3c87e7e228dc8da6cfab7b6a3e63feeafafb6e8dc5d4d3a018
 AUX upower-pm-utils-0.9.23-fix-segfault.patch 829 SHA256 c80d1510b3e3d0579ddbec328d2800ab7e112378f9a8ff9ef152d72de50a45c3 SHA512 31a6b5414ddd17cbbcf318da98907d745910e7632ea9a4d4d5c02eaaae87857b5bb88f9ab2f336f7b24637727005fb839f8c9564b82e56ae0065d57b1ce19ad2 WHIRLPOOL 4286fadfbb45b89891ca4aed49b11cde70afa357101f4b9b150d9f68e548af28436fa25a9d8143f7d90daaff0ee22238dd017f10e1e34e58a226553a84724682
 DIST upower-0.9.23.tar.xz 425804 SHA256 433252b0a8e9ab4bed7e17ee3ee5b7cef6d527b1f5401ee32212d82a9682981b SHA512 526ef95e43faf61744ba2bbf80bae23bc5c8672130563a87a7f18f00d85b16e2069814ad70dd66ce6ce698037b522d78579cc2135e2af0c2a636230cfa662c6d WHIRLPOOL 1599739198767ea6c70e133d50302a62a5b0b07c3786057b75636167c80b02d8e0ab6cc4781ac08994b249ffb57875bf186923d441e0b10e73c238b6be5b3538
+EBUILD upower-pm-utils-0.9.23-r1.ebuild 2406 SHA256 04b33af5104ac33c5d41e28a1bbe6eaabc068fa5ea4ca246a606fd5e6c9942ae SHA512 c76ffa425f38530f095bbcbd9af78b935293c885975830cec821c8870fa3de872a57a5fc6c9e0a8ed353d12b6677be5f95334d47979f1bdab6705d6b44c3591a WHIRLPOOL a9fe242d7a5ec9fe718c5b4b5b3674a5fd470d813a34c844235d2f29f0fe8378409337c8e83ad91e4ac8a2fa3a70603238ab605abc35fe69524583c5101b589c
 EBUILD upower-pm-utils-0.9.23.ebuild 2212 SHA256 4a9ad731493679d222732462d06eddc197742f4e0236592b71180366aeae011d SHA512 c782bb1d4e42b657ea7996f086b9620f9507364a0cf4a3ace8913ce5935c6ebe6fbd7e3b0479ad30ec0ecbbc4adb4e1584840d015a1db05cba49e3ef86eb44a0 WHIRLPOOL c551361182a4865fd9dfcf390f960295a9962e4a9f12afa2632b851b76d07b3d7b0a84b3eaa13aada1dcfafcd1610e05a680036f79f192ea2f0b94ef921bce8b
-MISC ChangeLog 1202 SHA256 2a8cc24e73e30b01fde5ec89cb5cb82c61dad45038d9cd734db1d3820ae38d07 SHA512 aa5d879b836f5823ff21dc82ad96eb6b319cc41abf9756cbd25956a82c924beb334124417942a78d37cd7fd5f80c20914206b54c8feadfd8295018db38176c12 WHIRLPOOL 249cc2be72f7a1e69b571d9323048aac80f0492b43121e2fea873d6a48de23727ecf8c7f2448fef190d533a53867d7214d5edf2cbe356182c93978ed07fcd834
+MISC ChangeLog 1513 SHA256 07527c3b8ca829add74bc34ef2c3d0dd83a8e6fa67cb3b52ee84e2fdc322d775 SHA512 9c94913df47f3845e05cd94bb4d661de6e1bab8b6d211fe1e46e1d8b2d3088ff2113450734d48b08170fe094c6a94d05f15bb76d4bd40e962692fb9b9f464ba6 WHIRLPOOL 1b0378ad8e2f67696c765dc4e7ad2d7de566a1431e93238647effd89563bdff24087759032ecbbb5abffdda12a068acc4eeb9045e8fb37656de4da051a51bcad
 MISC metadata.xml 239 SHA256 5d929c534d63615358eacbd035a386109d5deebdc7bb562511b4a6338ee2bbb8 SHA512 ab6b74388bf69a67b0d1f4283475f97eb5a731f31b5c9db4ee50b819a846c77d4ef09f63856e31a68b0bfdf18ee3baa6c76720d4345ccadf154385caaf1033bb WHIRLPOOL bcac6415c046557e53bf04579e077fed4d694dee8f7c0faeecf15f3f036137a2c9f0eaa0c492cecef23a45bd5af2c45542acd26641209d3c9be3108bf1ff09a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTjHIRAAoJEEdUh39IaPFNULgIAJ2oFfUTYrspRGUnBoxu/jbt
-J9yUvCwy8ncKjLCSGvqiV8OQi3hTdoF488DiUAFe0YuEESnFqAA5oWOUATkOFzUV
-dlW1qHBOB6tIY1iE5azp9Nl9LdEA59DGknXb19Ywg9osvrcyJqHbuYJyQcPB6bFr
-OrWWWaSkxKMv9b/r6XZ+tShRv8dCLB5yLx54djNLrZGAvgMCt7iLs7R7v8OeSkLw
-H+sLMnBjri7kWJtICEytFLOVa7geUGtZ5ysxn5BW4WRIUpMGwjEWAOuoy4GjgSJ0
-j5ssn3IT/JYvCqB+xTTqgxzVaeYg5yfKyaimTLMhdBFN6wF6F9llJsNs5oVUXw4=
-=l+GS
+iQEcBAEBCAAGBQJTjO51AAoJEEdUh39IaPFNJ5wH/2tGET8uVny2C5jPREk/cdOt
+j0xpC6DQwSL218gGrgcv9TAo88sAOM9TZtfR/Agon8CzCUALQHwunSknUFl7W0tk
+WosviUHm03qmeDkgrCSdZzI7/kE7zbtxmv66kGmZYNGzSe3ezyL+RG2SAP1P+bDS
+zATWdkxgzowMers0XpjBJ3GtiEVWuWexnXKTmg607oBEtiffhQ7rPK4M3bBMNj4Q
+9KfmF9E/SEiTbsl+8JLKtJIrFUuaY5X+awC/0Bth81eRRL25GwUDNPibZTGs4TW/
+LShA05fJwkRnE1TDzFJscVCrkppbWTyFMhmXtpa3rnZAJ1mDqL9iRfVCEQVk07U=
+=INbO
 -----END PGP SIGNATURE-----
diff --git a/sys-power/upower-pm-utils/upower-pm-utils-0.9.23-r1.ebuild b/sys-power/upower-pm-utils/upower-pm-utils-0.9.23-r1.ebuild
new file mode 100644
index 000000000000..810e4265ad94
--- /dev/null
+++ b/sys-power/upower-pm-utils/upower-pm-utils-0.9.23-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower-pm-utils/upower-pm-utils-0.9.23-r1.ebuild,v 1.1 2014/06/02 21:39:06 ssuominen Exp $
+
+EAPI=5
+inherit eutils systemd
+
+DESCRIPTION="The upstream upower 0.9 git branch for use with sys-power/pm-utils"
+HOMEPAGE="http://upower.freedesktop.org/"
+SRC_URI="http://upower.freedesktop.org/releases/upower-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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:=
+			)
+		)
+	!sys-power/upower"
+RDEPEND="${COMMON_DEPEND}
+	kernel_linux? ( >=sys-power/pm-utils-1.4.1 )"
+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/upower/.*"
+
+DOCS="AUTHORS HACKING NEWS README"
+
+S=${WORKDIR}/upower-${PV}
+
+src_prepare() {
+	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
+
+	# http://bugs.freedesktop.org/show_bug.cgi?id=79565
+	# http://bugzilla.xfce.org/show_bug.cgi?id=10931
+	sed -i -e 's|Cflags: |&-DUPOWER_ENABLE_DEPRECATED |' upower-glib.pc.in || 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="--enable-deprecated"
+	elif use kernel_FreeBSD; then
+		backend=freebsd
+	else
+		backend=dummy
+	fi
+
+	econf \
+		--libexecdir="${EPREFIX}"/usr/lib/upower \
+		--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
+}