old

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

4 files changed, 13 insertions, 131 deletions

diff --git a/sys-power/upower/ChangeLog b/sys-power/upower/ChangeLog
index 15e5d002a69c..1ef97ece23d0 100644
--- a/sys-power/upower/ChangeLog
+++ b/sys-power/upower/ChangeLog
@@ -1,6 +1,10 @@
 # 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.127 2013/10/08 16:53:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/upower/ChangeLog,v 1.128 2013/10/08 16:56:53 ssuominen Exp $
+
+  08 Oct 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -files/upower-0.9.20-hidraw_with_udev-196.patch, -upower-0.9.20-r2.ebuild:
+  old
 
 *upower-0.9.22 (08 Oct 2013)
 
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index eef4b72d89a7..15633ab9f099 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,23 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX upower-0.9.20-hidraw_with_udev-196.patch 1333 SHA256 25b3422123fb41e70c1ec8d8c9e61624f1cbd15ee9454f04148831ab3a06e168 SHA512 bed396008a5609c4454601f4a4a9f52aa671c3aa941cc60e6594ced72176793c3405f845d0f2d5a902822fae3fbc3de459cf237d83c0523eb6bbcbddcdb7dcb6 WHIRLPOOL 4ef2e71764cf99e81128deb9f4258af9be2354c45788f80105c8af2e49133090c49e3e096ef1db19cf0f95db9cdd4d1ecbe6b2f0b3aa2fd5ae27e285998b589f
-DIST upower-0.9.20.tar.xz 413632 SHA256 6817237486561294b1004a9a50a01a4d69f17e8d708c6baf9d92104fe2e6e184 SHA512 d78fc0f53a89e72753c6807ccec70209efa0660c9b93ecdf450c43d33a6f8e39e55ad790ce19c67d335ec137655cf701b09069dbfc68707a8ba6fdbda72fde72 WHIRLPOOL 7fc09931304ef53373cb335d912f4a61c15f5522220fde88c829a4b02ea9dd8eeb42f1070e42e2532fb17d2fea7d3b228539efdfe3337d6b32bccb4e76cbfd6d
 DIST upower-0.9.21.tar.xz 421204 SHA256 13c28e0a700291a322e0674894fedfd695889845ab82df2aafd699aa9bdbb2e2 SHA512 71f3d0bd328265094792cf1e91fb57952fa275415358c50286fb177b212867ac670a27b7caf84072552b5d84e665f9387a4998a5c04d2b9f92d4415a77885ab7 WHIRLPOOL 3378d9cf3d3c4c35ff801e85213f047d4eb481413801851d3b83bd39c46b5b8354663d00f7e5c1e0c8c162fad8bd0a2040164dec72c340510968e549a590b59e
 DIST upower-0.9.22.tar.xz 395800 SHA256 d31e81b5123c597df1bd246a371dd5eec88b3fdef5f514086f153577e3215f11 SHA512 48a85d007fa2b7e07772b8641f1b71e88b11b1fde708f6ea321df74743f3c8901eefa4eb4369dcc9a63d89b2203fa81cc872ff6b905ff6be501bca6d92f54f3a WHIRLPOOL 726177f66327972f7c5612963f20a516786a25ae7615ee8d5bb2709061759d35ffd8c226e019aa423d63baaddbe6c79b0d21d29aa4ee813ccdb611107154affc
-EBUILD upower-0.9.20-r2.ebuild 2297 SHA256 03835a84e3eab68bbc6c1bb8ac5628c9cb8b1c79dc14c9091eb371c1fae57960 SHA512 c5dd158f860554aa57b86ffabd82437a883a89a4e2e5e9ee60361eddd9886dca7ae7b0c37eec28c7574fb9a43a6cd83595c8cfcbe29dd827860ed02a7feba96a WHIRLPOOL f97fe06b1116d703845e203fbf32a198bdcc7acdedf52703d07372aa758df26d3f58fbd83661950ada66186113ca95ca7d5cc396dfffc65a1d38e8400c845351
 EBUILD upower-0.9.21.ebuild 2080 SHA256 bcff19873384ca4cb7fd801626efc64d170c2fb792ab0965f2c0a71a8d75f944 SHA512 7f14196e2d085a9cced5047bcd3b2d1c0af36bc46644cff90d4a2d42f9aa12f46f1f8fdbe36c40d0c49c596c2555908ea3712c89229166ad1a3b3bb2379b5eca WHIRLPOOL 3189a62bcc913d15deda72451dbcbf9be725e699edd9af76b343149a8b2ace2b6e945b7a456a11cf99aa417268d1e62a37032f039479ac040de42d5c569dda60
 EBUILD upower-0.9.22.ebuild 2094 SHA256 6d1d45f983bd42fd2c978d92ea0769c099e8a698d033db0061a0e9f9ff6948f9 SHA512 878321989e14104a5d6fc78e9287b07cb319ec24641d88f099b586e788c6f724882f935f7fd15fa0f85453c4e20f10e12a688d7312b8e19d20a8e008976f66e0 WHIRLPOOL d9346d2f96d0779dbaa3776f66023abd0d603971786867c277683b16381021bea416617a88b34d5a11e0e160d83891225b987b28740fe96bac136d1bd4d91ec0
-MISC ChangeLog 15997 SHA256 76d9288f7587a1e5171173106d4232dc2262125e4a2ef4ac58c47741dccd0260 SHA512 8b40d0c4f0be2bc72fc28a99013d36a41d23c9f7df01224280375378df50b99153710d223b7a0d27a9f19594ea6bcc4f278412e8146091cfe90113eeb7fc9d33 WHIRLPOOL c05888c79837fcbef2887fcad59ed6a35730d4ac4d3763451fdbf603c6fe7acee0339dfada8a2d2fc38e8645004ebce62012b7a46bbb6f73cc83d7e2c54de953
+MISC ChangeLog 16135 SHA256 abceafb1c29e612bad41e2908242b727697d5fd059dc4ba440c5b12aa177f3f8 SHA512 36b8a57c2cde250cd702b069a13222b101f09068483dd0159d6590c69a613eff2cbee0e3811525970353cb15c64e432ac2900767513ee6c387e4bb3d8159f9e7 WHIRLPOOL 261302467e15075d6f0deeff31d7fdb28291c7a68d944a93e753ac354517208af3f8ddf757dee2fa9ac5da1fa3b920a8cc185e4716593314e849a0da8250d5c1
 MISC metadata.xml 373 SHA256 e5e7b3292fcc941400944f79de0622fc927cd4abe2c81fdfa098c29139ac2a53 SHA512 24597947ff98cb3a1faaf48dc77657f516e5766d20944bddb88096f0001cd3e4c62a5b40e084dbd549fe98e04d6093301ac846437ff392e9a2f45244ede33a5e WHIRLPOOL ed7ed47d42fc899dfa92df93eb2d5e7778d9bfe79f90cc0d500e159b321c27d58ee2be1c53bfec8311d73269ae2e23db0f3b8708decb5ce90b5fc086079a205d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSVDgAAAoJEEdUh39IaPFNgdEIAJjPC2S81JYqnF4gZFIVvOWk
-dP/9Z6aMNoiA/Wl/YYcYFvt6LXGYFM2FUmlhGHGx10WWz+rUPRB221O8UbaZglHG
-ln4H+See9frtqLl831TKbUIDTTBEDN95PWPIQexx1dE1ziMjPCZzDQgwpT7/zXRT
-Q3qRDXfADVAaKccK5IKG735ZY/RX5oCEOMleQrZs00dVyREeMwdfOK6p3oK85XNL
-dt3TCp4Y2PnX9MlMMwFOaAlVU13BVQ2XmiI8bGgbCvbGirD5OEE2wMTgWmk0R4/q
-0aeXkJfH0sCqp28JkiHxN2pZ5n6zcp9+hYEJ9Sr6Wg+P50CThXsumrpmDRyjotI=
-=zmeq
+iQEcBAEBCAAGBQJSVDjIAAoJEEdUh39IaPFNWbIH/1ttqsL8aCV2S1Nhfjqv/WZ/
++ln3GpZ5WJ0m6LdgrwozDLeDAIG6d4vuC/1v/X2Vii1V0Xzg5U+PXWFiUWVNKi+O
+Cn8oEc9UdCnlyTjoDzp0mFE6S+FLBhbYYfGSE4lJSqli9AdwBVv3dzyCDSQqj4tH
+UY2vT7YMzMM4s6QU0wtrn/RKgzNvDdW5Fu/ffqqTec/0LXMyKqmgVeCc+5BoH7Qo
+Jv5TGn0iFy39ZCtHyUKCWMaY9djLze4jIFN8lt+I/LnJX1vqXewKMw7C8yFAxIIN
+JG3eOdJSPi48h8InOedfhRN8/Eb5FU7kwUgKl3aBl6LROCZnttvSpMYSf/NkjL4=
+=8+6x
 -----END PGP SIGNATURE-----
diff --git a/sys-power/upower/files/upower-0.9.20-hidraw_with_udev-196.patch b/sys-power/upower/files/upower-0.9.20-hidraw_with_udev-196.patch
deleted file mode 100644
index 850e010bc17c..000000000000
--- a/sys-power/upower/files/upower-0.9.20-hidraw_with_udev-196.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 232d70155c45d24afabe47ed37954cc000678295 Mon Sep 17 00:00:00 2001
-From: Arkadiusz Miśkiewicz <arekm@maven.pl>
-Date: Wed, 20 Mar 2013 16:51:14 +0000
-Subject: Find hidraw devices correctly with systemd udev >= v196.
-
-udev v196 libraries changed behaviour of g_udev_device_get_sysfs_attr()
-by stopping following symlinks for "device" attribute [1]. That change
-broke hiddev finding for unifying devices. Fix that by getting sysfs
-path from parent hiddev device.
-
-1. http://cgit.freedesktop.org/systemd/systemd/commit/?id=5ae18ddc0d86673520c0dd6b59ccac8afc8aa605
-
-Signed-off-by: Arkadiusz Miśkiewicz <arekm@maven.pl>
-Signed-off-by: Richard Hughes <richard@hughsie.com>
----
-diff --git a/src/linux/up-device-unifying.c b/src/linux/up-device-unifying.c
-index c7f0103..4b659c3 100644
---- a/src/linux/up-device-unifying.c
-+++ b/src/linux/up-device-unifying.c
-@@ -165,7 +165,7 @@ up_device_unifying_coldplug (UpDevice *device)
- 	hidraw_list = g_udev_client_query_by_subsystem (client, "hidraw");
- 	for (l = hidraw_list; l != NULL; l = l->next) {
- 		if (g_strcmp0 (g_udev_device_get_sysfs_path (parent),
--			       g_udev_device_get_sysfs_attr (l->data, "device")) == 0) {
-+			       g_udev_device_get_sysfs_path(g_udev_device_get_parent(l->data))) == 0) {
- 			receiver = g_object_ref (l->data);
- 			break;
- 		}
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-power/upower/upower-0.9.20-r2.ebuild b/sys-power/upower/upower-0.9.20-r2.ebuild
deleted file mode 100644
index 8a48d5736cee..000000000000
--- a/sys-power/upower/upower-0.9.20-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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-r2.ebuild,v 1.10 2013/05/11 22:04:28 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
-	epatch "${FILESDIR}"/${P}-hidraw_with_udev-196.patch
-}
-
-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
-}