Use udev.pc pkg-config file to determine udevrulesdir for compability with sys-fs/udev >= 187.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 106 insertions, 15 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index 2ae80ff78b56..46017a6e6150 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/upower
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.79 2012/06/27 11:17:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.80 2012/08/06 11:26:15 ssuominen Exp $
+
+*upower-0.9.17-r1 (06 Aug 2012)
+
+  06 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> +upower-0.9.17-r1.ebuild:
+  Use udev.pc pkg-config file to determine udevrulesdir for compability with
+  sys-fs/udev >= 187.
 
 *upower-0.9.17 (27 Jun 2012)
 
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 366d1eb57e8e..36da715eeef5 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST upower-0.9.16.tar.xz 401948 RMD160 b3587dc2072722b60b0411027cfee9ed99dddd6d SHA1 be935f1c327b6561211e65a1025406171d674421 SHA256 eb9a3d39a8cb62970fd612e333bc7a43437ab0e7890303578b0a7e3c67c8c212
-DIST upower-0.9.17.tar.xz 402336 RMD160 2d99e3a4a05caa0e5ef46eb568cc605b3d33e629 SHA1 b0014930a88054df4459a8cac3f1ad4e395d8d40 SHA256 cf9f68d28fec9cacfb44054c2996a877a9ef4a449cfe279394d46442de153228
-EBUILD upower-0.9.16.ebuild 1963 RMD160 a79a02292c09c943c5cd058385ca2c11005273c5 SHA1 5549c8506bb814e36dd603ec58697c66c90c2f8a SHA256 76d058c0a9809ebedafc67f38e67905ff717010cb217bd4cf6b3a8722301eaa2
-EBUILD upower-0.9.17.ebuild 1956 RMD160 fb5118e481cca4e5406ee2348e6a9ab03d60746e SHA1 4c9aba8bf1d2643831dece2b07b993368eb8191f SHA256 a2f99afa150e566548c080dd058d3f174107e9fd15e444efb14908a42bb7fd09
-MISC ChangeLog 9844 RMD160 93e5d63663b959dec9290b06fb9fb2a08ad8b98d SHA1 b47c10ef91fed4349fcf96ecf385ff2bee5be07c SHA256 be800a2bc1dcaaa42fd16df9e87fd220459161a7f6057abeb970eea3779e63d5
-MISC metadata.xml 363 RMD160 7210445bae10f2ddf76edaa8e7144227a03c5de1 SHA1 76f5af45c1a11584d24878ee65e6773757cfa014 SHA256 b24b22d2e371b3ee7165cd9ae1ca6fac72aee10e107c192a4e94686ba95b9093
+DIST upower-0.9.16.tar.xz 401948 SHA256 eb9a3d39a8cb62970fd612e333bc7a43437ab0e7890303578b0a7e3c67c8c212 SHA512 a38fa82b376a12c3ef17ea6998a4ad6c0410f0371ddd4403c68f6dc2edf3c762243f1721189dc8d884b74fadd74a31a5b096fa4abe2ffb84c44496cad16346bd WHIRLPOOL 5560e3e692e595cd8a78c717fb2c801453364cd7fd213ee488ba3d1952e96162a859bb95469d46dcff09936e46e3764291b414c079fe895493a315ff401faa43
+DIST upower-0.9.17.tar.xz 402336 SHA256 cf9f68d28fec9cacfb44054c2996a877a9ef4a449cfe279394d46442de153228 SHA512 f8a279d3da048164bb7bc720bb0cd590bd00ef79e1b56f211b5025acbf46016fcabc39c91ae8a16577b8c383a751c43204a49893bdbd64adb0a6259aa1e2bccd WHIRLPOOL b4842d5f1c7ecf7e9e879b230e3ec05851c54ae7e98f7be492157f12a1c21bf00047a264d007547310b6642363025df6aafd605166a858a17bdc547b00e3c727
+EBUILD upower-0.9.16.ebuild 1963 SHA256 76d058c0a9809ebedafc67f38e67905ff717010cb217bd4cf6b3a8722301eaa2 SHA512 35f5e7914890bfeaf6a578ee21be63f3cc9b8b1e6d55b92f8719acfa367ef786c5004d2aa10632108592c4e33ffd186a73594f07d45955429d7898395790429e WHIRLPOOL 46e4310fcca41a644b19e3e6e20ea87b4204c29f078600706ae1c5ecb95019da388464ed11ece4fb2024f1af589e987858f8994d388e22ad2711932b6caa4510
+EBUILD upower-0.9.17-r1.ebuild 2134 SHA256 6efa5fbab8141e291c5c42bce067c55965b088ed46afe71abb9d3e95bdf2131d SHA512 b563be0d687d5e5cfcc2f2912325793de37a305d4cef9ad51b2a58942f9612714f7de88fa5b25d30c628dd307a9246dae4e9d19b55b03fe1b55e397fcd032d0c WHIRLPOOL efd5bb4e547f04b8eb820f264a1a65669f247a0e997bed78759f6cc40f12da6526c3623ede8ab547739c2715a31e0bf2529a6492d999dc584f0e91dae25e2592
+EBUILD upower-0.9.17.ebuild 1956 SHA256 a2f99afa150e566548c080dd058d3f174107e9fd15e444efb14908a42bb7fd09 SHA512 1882bebb1e406055bb38621b611ff46073714f4b0d3f89c5783b4690b352c6d38ccaf0596c3ab5bad334df77f415446e9826c0467cbe490a4d9522d823d85321 WHIRLPOOL db03fd4a0e44cde85c20b07e10cdb909f59ca9cf3b703b39db88e82bdbf7703793b03c12f384b81681305cb90d3b19e0ab4742a3dd93c3b0e4a779f3f934a160
+MISC ChangeLog 10057 SHA256 bd1ec6787950cf20dfd28930f05ea70abedd5c89d7803863ee19641a2309edf1 SHA512 db9122e4577f267b36181d2be0117253bb3688f101521b97c2784f7cf63a5fb118f51020565d0f5b7d4b6b7da2e206ec93cb16beaf3abf5e9dc06ae98e1787a5 WHIRLPOOL 1fb730ecfc1e33015c173b8f1a3a8f34e86f4f174368d29d422f295406c9b3bf33e99eb02c27e0e12d03f7babc37d6c7381f5ec3eb8a6a78ec1d48d43e2161d3
+MISC metadata.xml 363 SHA256 b24b22d2e371b3ee7165cd9ae1ca6fac72aee10e107c192a4e94686ba95b9093 SHA512 0138bfa50f6a572b7a947b52de90ac42f019b00feb4ab4c138dec36285b885cd61bea84e6e4d79bdfafd7a05b4eddfca848b2a4fa7bc10a74b600911a9936e2c WHIRLPOOL eead2d2674f1c773cab2c137591099eb90021fa54c7f3d2ac10e892f2ae7d5cbe57bb3edef16b0c502b907a29d775a9c8466e1d52bb992c833fddcd58a58b28c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP6uqRAAoJEEdUh39IaPFNp2sH/0i+db4b1qmZRmvSYuRaoVFa
-cbEFkPAqNoVWHZJxg2zqsji8x5fmGoHcQ+mAHTGU9OB0pxjd7ch66/xc4pj2l7iz
-jNGgQpMO+8QKYTyt/JQhjapKG2jnnHWsnQxomd512zku1KHwGNqjuF1nNEBE+twA
-J+f0DPUUru1UenXzYwpsMMviNN6PaaPpgTwUVWRhtZr6Clnk1BSo8dUrmOuHNQJG
-wIbxwl9a7a5yk3JLzVQTjpdTLonJb+YX7DjDn0DqLc8goA9yBnd7vHi2njEkVK2W
-1HK+2apwx46YPjsh89owdARb3J5xIdvVA9LuLbkNBs1n06yDNbr6TQakoucQ3AE=
-=mKZj
+iQEcBAEBCAAGBQJQH6nSAAoJEEdUh39IaPFN+LcH/3VJAcB30ZijpTpBYiMN0Tt5
+kzIFSMyrZljv+8P8TjVvlUubdp2oWB/pooy6UpU5EGjEE/pWFMrljfGLQSWw3n/8
+SztvJ9QW1vjujK/0tu5PMbGV/BsrM4hkB/KlwlVZn01mEPxfKsoR/pgBztVJ10c/
+TCz6bB726d6CAOLC1esUPYrB1sGGxtPmq2i8Nq+FO9zh2M0Ocdd1pIB+dtmN//Hj
+Hc/GlKBflG/MZqphGM6iAXf5i/QBeaU1FkPw4DWDQg4dhZmhVCWEx9BYo77oPTXA
+Jv32fUJ8GJPocWjp5Df2L5rilW4sjH1jqstTuyIbjTUgtvJMG8XER60pnlj0amA=
+=xTwA
 -----END PGP SIGNATURE-----
diff --git a/sys-power/upower/upower-0.9.17-r1.ebuild b/sys-power/upower/upower-0.9.17-r1.ebuild
new file mode 100644
index 000000000000..9386ced03346
--- /dev/null
+++ b/sys-power/upower/upower-0.9.17-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/upower-0.9.17-r1.ebuild,v 1.1 2012/08/06 11:26:15 ssuominen Exp $
+
+EAPI=4
+
+# PYTHON_DEPEND="test? 3"
+# inherit python
+
+inherit eutils systemd toolchain-funcs
+
+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="debug doc +introspection ios kernel_FreeBSD kernel_linux" # test
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.98
+	>=dev-libs/glib-2.22
+	sys-apps/dbus
+	>=sys-auth/polkit-0.104-r1
+	introspection? ( dev-libs/gobject-introspection )
+	kernel_linux? (
+		|| ( >=sys-fs/udev-171-r6[gudev] <sys-fs/udev-171[extras] )
+		virtual/libusb:1
+		ios? (
+			>=app-pda/libimobiledevice-1
+			>=app-pda/libplist-1
+			)
+		)"
+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
+		)"
+
+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 \
+		$(use_enable introspection) \
+		--disable-static \
+		$(use_enable debug verbose-mode) \
+		--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_unitdir)"
+}
+
+src_install() {
+	local udevdir="/lib/udev"
+	use kernel_linux && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+
+	emake DESTDIR="${D}" udevrulesdir="${udevdir}/rules.d" install
+
+	dodoc AUTHORS HACKING NEWS README
+	keepdir /var/lib/upower #383091
+	prune_libtool_files
+}