gentoo resync : 09.03.2018

8 files changed, 3 insertions, 345 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 2e85519fc23e..6da89bf6fed7 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index e1e1aca8271a..9dcbd58694e7 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,12 +1,5 @@
-AUX upower-0.99.4-copy-paste.patch 955 BLAKE2B e0a0802b040b816e5041c3f6d23ed6cb316680042619a3de0e7fe3585ccaabb4024ff5c689f453aeb25d22a0d7a6b91498792b8704e5af0bcb3e6f4594ef87dc SHA512 9f2718c7fb7ea77d07fe463d3eecae14e40cc2da71c500e2d747c52bbe2f645632cd7ee8289a7f1b8b252b3eb9d5d568ddcd74e00e5fd9985861514895847006
-AUX upower-0.99.4-timer-stats.patch 1297 BLAKE2B 2554da9c00566dc1f23b884c4b7b258ae60c03ee44c080d4b3025ccfbebb047896517e7c72549ce344a65dec50e6274954aa85cce5d2eb7d5f13656c631467bb SHA512 908bcc9fba4cce312010aefe149fa37691dd34c23684c8ee3841bc5d21efd31bc873516c9b4105de065609b9f6196e456653a9e89b35bef3d77da22c0f4cf29b
-DIST upower-0.99.4.tar.xz 426292 BLAKE2B 2a574fc9e8ad9d92c65b4159a9861afdccdb53f07506440374b10f7ad31aa31d1c1c964efa80d3d0fdb81ea0524021982da0359115eeacd3ccf1e16158ade553 SHA512 b3fdee5ccf5f4d0c69e227f543272f6952119132814e27bc8f112716b8d36b5e07741a87bcf02203e80ef910cad9ddffa1adecb338c9a9aaa5e1038b62be07f3
 DIST upower-0.99.5.tar.xz 432344 BLAKE2B 048471cee61e57ee673e2ba2e2f826ef1770291ca5b7a02adcce11acd78f96a3aa443b5f66abc595ce6578ca59a15a940b0c4924b443babc798fa54f4f629564 SHA512 2fb06bea69455f538146576665e36c5b91eb18b119fa77e29d383fcb2a86ea58650b82e258f157d03c40147ecb12ea545997199580f0e24847ac6ea04d46e5ea
-DIST upower-0.99.6.tar.xz 432056 BLAKE2B 7e62a2649806ac6bd59547aedd04572080ec9ba9700c2dd80287127f099b79aedcf206e4813ff8c6e68417eddaf79b881b69a80fc6fcbca4f276cc908c90d185 SHA512 7e7256491ecb5d3f04abf41f05a761b79761c8868a1aedadfc5085c3b9cf15f6099c1494596e6a24b0951511bc7cac074e93ebb2b84abb9fb7a4374483052d3f
 DIST upower-0.99.7.tar.xz 447832 BLAKE2B 3342f38552a5eb6abffc6b15803db0e8a24e6a3345fe1007f3a5fa66dd06ddebacf2352a751f7a3adf7ee0fe28797d7a1c5b3ec27cd190aabed17e2c7070a438 SHA512 a1ad200e715284eae815580bba3faad480f7f13401f6ff1a2e7446172796a2413990ce2b553de713ddc530849b2dff1f0ddc12fbd2fd9b55510bbb644d2340a4
-EBUILD upower-0.99.4-r1.ebuild 2218 BLAKE2B c7ad4d6e42460dd9d51dcd2b1e9a2bfa1ecd6cf21d580851048b554d1342d916a2c6698da044f3a6b9f372118a37016ce952a7c54dbe196a152a764497dd3116 SHA512 8f27db0656fbbb61940e00fe99931e8ef4ad6d3794c119df33536d77d8b50fe0916ff2847f1f81306254e5cb4f1a1b1f019255a9aa85630fde22a7770d71dc2c
-EBUILD upower-0.99.4.ebuild 1872 BLAKE2B 1c676bd031b13eaef52474dde27e0549e2bfbb1a79485da2dccc5ba44b9b00959def6b455a123324519a16084a9e034b051cf26b27e6b0296d4ac4429aa8db9e SHA512 35eb5ccc6cc440604b5f250e75f093992170cccada7f0089082e246f80a3c86380d068258e1ba7d239d135efd055fcfd84be9509404f10736f0731dd718f9891
-EBUILD upower-0.99.5.ebuild 1946 BLAKE2B 1b33a3a625ca93e652e9d83ede53044253df47a9a128f16e49017f1a377dfbf6e4eefd1540c0479850a4fbad038d1215055411ea4ae06d589284ebb851fb90b0 SHA512 0dda7ec29b9cb880a419827e34eb8bc64404e50596b4341cdbc1f7d5824f63f7e1bf64996c93bf892970de259ba73fd1c89b44be40d266c1e7f8d081d377f190
-EBUILD upower-0.99.6.ebuild 1953 BLAKE2B a8fd547d07beac2fe4116a68a7484504bdf3d43ea09d22e21e2c7bc44884db19d75f4807a1c91b4c1ed15dfdd1cd610474bb3574eee6008038b7ae60e167a9ec SHA512 49677f9bbf9efc4d6cb57ab1f9f085b5acab1986cd0d8955370792641d36ada0ea87a8bd983a13d03e8b91341a031264364669e92e8694eee4db10da555fa4c0
+EBUILD upower-0.99.5.ebuild 1945 BLAKE2B b36bd996e21184e7c8d28b41b87ee5a151312a22419183741c8fa293cdb5c709ba05b2fc48d28669e0dc635857feaae73d2b1628eba425dc389c59a97df62f4d SHA512 9cdf80221dc68092df16ead6523e011f3584f09adab74e5d437848ce663ba450c7b5d8f25b49ffd39de58092c1a19b2348805d8d0f9a27b7dbd9dff6c2823d6a
 EBUILD upower-0.99.7.ebuild 1953 BLAKE2B a8fd547d07beac2fe4116a68a7484504bdf3d43ea09d22e21e2c7bc44884db19d75f4807a1c91b4c1ed15dfdd1cd610474bb3574eee6008038b7ae60e167a9ec SHA512 49677f9bbf9efc4d6cb57ab1f9f085b5acab1986cd0d8955370792641d36ada0ea87a8bd983a13d03e8b91341a031264364669e92e8694eee4db10da555fa4c0
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/sys-power/upower/files/upower-0.99.4-copy-paste.patch b/sys-power/upower/files/upower-0.99.4-copy-paste.patch
deleted file mode 100644
index 6afe9b7a9831..000000000000
--- a/sys-power/upower/files/upower-0.99.4-copy-paste.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 28cee8e2845b094488c337c4ecfa84ada0b6be60 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Tue, 23 Feb 2016 09:51:07 +0100
-Subject: daemon: fix get_critical_action()
-
-Fix copy&paste error from e7e9156f that called the wrong _complete_ function
-for up_daemon_get_critical_action().
-
-https://bugs.freedesktop.org/show_bug.cgi?id=94262
-
-diff --git a/src/up-daemon.c b/src/up-daemon.c
-index be14cbe..e95f904 100644
---- a/src/up-daemon.c
-+++ b/src/up-daemon.c
-@@ -435,8 +435,8 @@ up_daemon_get_critical_action (UpExportedDaemon *skeleton,
- 			       GDBusMethodInvocation *invocation,
- 			       UpDaemon *daemon)
- {
--	up_exported_daemon_complete_get_display_device (skeleton, invocation,
--							up_backend_get_critical_action (daemon->priv->backend));
-+	up_exported_daemon_complete_get_critical_action (skeleton, invocation,
-+							 up_backend_get_critical_action (daemon->priv->backend));
- 	return TRUE;
- }
- 
--- 
-cgit v0.10.2
-
diff --git a/sys-power/upower/files/upower-0.99.4-timer-stats.patch b/sys-power/upower/files/upower-0.99.4-timer-stats.patch
deleted file mode 100644
index 2ac44205459d..000000000000
--- a/sys-power/upower/files/upower-0.99.4-timer-stats.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 798588a480eaae50368bed75fc78f8314523b2a3 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Sun, 23 Apr 2017 20:22:02 +0100
-Subject: Do not spin in a loop when /proc/timer_stats cannot be written
-
-Only set up the polling once the write has succeeded.
-
-Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=100626
-
-diff --git a/src/up-wakeups.c b/src/up-wakeups.c
-index 1bc3c7b..99433dd 100644
---- a/src/up-wakeups.c
-+++ b/src/up-wakeups.c
-@@ -626,6 +626,13 @@ up_wakeups_timerstats_enable (UpWakeups *wakeups)
- 
- 	g_debug ("enabling timer stats");
- 
-+	/* enable timer stats */
-+	file = fopen (UP_WAKEUPS_SOURCE_USERSPACE, "w");
-+	if (file == NULL)
-+		return FALSE;
-+	fprintf (file, "1\n");
-+	fclose (file);
-+
- 	/* setup polls */
- 	wakeups->priv->poll_kernel_id =
- 		g_timeout_add_seconds (UP_WAKEUPS_POLL_INTERVAL_KERNEL,
-@@ -637,11 +644,6 @@ up_wakeups_timerstats_enable (UpWakeups *wakeups)
- 				       (GSourceFunc) up_wakeups_poll_userspace_cb, wakeups);
- 	g_source_set_name_by_id (wakeups->priv->poll_userspace_id, "[upower] up_wakeups_poll_userspace_cb");
- 
--	file = fopen (UP_WAKEUPS_SOURCE_USERSPACE, "w");
--	if (file == NULL)
--		return FALSE;
--	fprintf (file, "1\n");
--	fclose (file);
- 	wakeups->priv->polling_enabled = TRUE;
- 	return TRUE;
- }
--- 
-cgit v0.10.2
-
diff --git a/sys-power/upower/upower-0.99.4-r1.ebuild b/sys-power/upower/upower-0.99.4-r1.ebuild
deleted file mode 100644
index 3d9123df0d9e..000000000000
--- a/sys-power/upower/upower-0.99.4-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ltprune systemd
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
-HOMEPAGE="https://upower.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# gtk-doc files are not available as prebuilt in the tarball
-IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
-
-COMMON_DEPS="
-	>=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.34:2
-	sys-apps/dbus:=
-	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_DEPS}
-	selinux? ( sec-policy/selinux-devicekit )
-"
-DEPEND="${COMMON_DEPS}
-	doc? ( dev-util/gtk-doc )
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	dev-util/intltool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-PATCHES=(
-	# Fix calling the wrong _complete_ function for up_daemon_get_critical_action()
-	# (from 'master')
-	"${FILESDIR}"/${P}-copy-paste.patch
-
-	# Do not spin in a loop when /proc/timer_stats cannot be written
-	# (from 'master')
-	"${FILESDIR}"/${P}-timer-stats.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
-}
-
-src_configure() {
-	local backend myconf
-
-	if use kernel_linux; then
-		backend=linux
-	elif use kernel_FreeBSD; then
-		backend=freebsd
-	else
-		backend=dummy
-	fi
-
-	econf \
-		$(use_enable doc gtk-doc) \
-		--libexecdir="${EPREFIX}"/usr/lib/${PN} \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable introspection) \
-		--disable-static \
-		${myconf} \
-		--enable-man-pages \
-		--disable-tests \
-		--with-backend=${backend} \
-		$(use_with ios idevice) \
-		--with-systemdutildir="$(systemd_get_utildir)" \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/upower #383091
-	prune_libtool_files
-}
diff --git a/sys-power/upower/upower-0.99.4.ebuild b/sys-power/upower/upower-0.99.4.ebuild
deleted file mode 100644
index 76b2424c8033..000000000000
--- a/sys-power/upower/upower-0.99.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
-HOMEPAGE="https://upower.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-
-# gtk-doc files are not available as prebuilt in the tarball
-IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
-
-COMMON_DEPS="
-	>=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.34:2
-	sys-apps/dbus:=
-	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_DEPS}
-	selinux? ( sec-policy/selinux-devicekit )
-"
-DEPEND="${COMMON_DEPS}
-	doc? ( dev-util/gtk-doc )
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	dev-util/intltool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-src_prepare() {
-	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
-}
-
-src_configure() {
-	local backend myconf
-
-	if use kernel_linux; then
-		backend=linux
-	elif use kernel_FreeBSD; then
-		backend=freebsd
-	else
-		backend=dummy
-	fi
-
-	econf \
-		$(use_enable doc gtk-doc) \
-		--libexecdir="${EPREFIX}"/usr/lib/${PN} \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable introspection) \
-		--disable-static \
-		${myconf} \
-		--enable-man-pages \
-		--disable-tests \
-		--with-backend=${backend} \
-		$(use_with ios idevice) \
-		"$(systemd_with_utildir)" \
-		"$(systemd_with_unitdir)"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/upower #383091
-	prune_libtool_files
-}
diff --git a/sys-power/upower/upower-0.99.5.ebuild b/sys-power/upower/upower-0.99.5.ebuild
index 81dc9d79fa24..2b214839bb83 100644
--- a/sys-power/upower/upower-0.99.5.ebuild
+++ b/sys-power/upower/upower-0.99.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 
 # gtk-doc files are not available as prebuilt in the tarball
 IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
diff --git a/sys-power/upower/upower-0.99.6.ebuild b/sys-power/upower/upower-0.99.6.ebuild
deleted file mode 100644
index a884fe3466cc..000000000000
--- a/sys-power/upower/upower-0.99.6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ltprune systemd
-
-DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
-HOMEPAGE="https://upower.freedesktop.org/"
-SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# gtk-doc files are not available as prebuilt in the tarball
-IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
-
-COMMON_DEPS="
-	>=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.34:2
-	sys-apps/dbus:=
-	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_DEPS}
-	selinux? ( sec-policy/selinux-devicekit )
-"
-DEPEND="${COMMON_DEPS}
-	doc? ( dev-util/gtk-doc )
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	dev-util/intltool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
-
-DOCS=( AUTHORS HACKING NEWS README )
-
-src_prepare() {
-	default
-	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
-
-	local myeconfargs=(
-		--disable-static
-		--disable-tests
-		--enable-man-pages
-		--libexecdir="${EPREFIX%/}"/usr/lib/${PN}
-		--localstatedir="${EPREFIX%/}"/var
-		--with-backend=${backend}
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdutildir="$(systemd_get_utildir)"
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_with ios idevice)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/upower #383091
-	prune_libtool_files
-}