gentoo resync : 22.10.2018

5 files changed, 85 insertions, 10 deletions

diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 8eb778b66b59..2d69c3357735 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,7 +1,8 @@
+AUX upower-0.99.8-keyboard-backlight.patch 831 BLAKE2B 530ca1f8a4a7d9caf830813c99c9a1619b540a7a1e45384ab01a348e3830e34edd8972d313becc4cc0eb84ec3517a90a0d153ad05cdf80ee867936cc313105ec SHA512 43e33447769696c99a96cd801d4397ab21400814e5df40d1dfb22504b25caa0be2f0a28a54fa27cc579505b184fb29f29e161e54b568a600156b7e1ef2237d33
+AUX upower-0.99.8-udev-events.patch 915 BLAKE2B 8f951b607bbe0237d71bec20d55310c227680f6df4035ac53c335215234c48d40a120bcd1ac2a992a280263525797981c7316bb3e269fcb3507292bf5cb7222d SHA512 9ed2522a45318c8c7b2fd4b9d6c10f029df0909c76625b553ba8f76f4a4af8018bef3f56a30913eb5eed53dc9bdf2d71486ec5930d00375e24597997f26cf2c8
 DIST upower-0.99.5.tar.xz 432344 BLAKE2B 048471cee61e57ee673e2ba2e2f826ef1770291ca5b7a02adcce11acd78f96a3aa443b5f66abc595ce6578ca59a15a940b0c4924b443babc798fa54f4f629564 SHA512 2fb06bea69455f538146576665e36c5b91eb18b119fa77e29d383fcb2a86ea58650b82e258f157d03c40147ecb12ea545997199580f0e24847ac6ea04d46e5ea
-DIST upower-0.99.7.tar.xz 447832 BLAKE2B 3342f38552a5eb6abffc6b15803db0e8a24e6a3345fe1007f3a5fa66dd06ddebacf2352a751f7a3adf7ee0fe28797d7a1c5b3ec27cd190aabed17e2c7070a438 SHA512 a1ad200e715284eae815580bba3faad480f7f13401f6ff1a2e7446172796a2413990ce2b553de713ddc530849b2dff1f0ddc12fbd2fd9b55510bbb644d2340a4
 DIST upower-0.99.8.tar.xz 448664 BLAKE2B e101e7d1b2aede77c1ed2da1fd23b87a95ccac8d901bd8d1f8bebcd5de7052a66f1840cf578a48453538e166aae56ef4bc6d3a2b85f7ba148ecac5cc0a486809 SHA512 dfd2960cae382195dfc7a703a02af298d9de55bc626cde2a1f97e7983842191ba9d99eb2044190214e792539e7d6c9d8e00b5aed17e5e86b04544e9ab90278b1
 EBUILD upower-0.99.5.ebuild 1978 BLAKE2B 9c989aba064d6208a66d283acac361e5d64965b76838f13709e3d4fad815e9d7170393965b0438cd0a8d7da1813da4d3016d0f2544f380cb90a96c375d16fe4c SHA512 e3d30dd8aa51bf408510d2809f984e74940c4ebb1658b66ff75ca5e25cc3459589a64ea7faf263fd39012304f5a0793d6a75df79f75fb013e0fd1610c74dbf7c
-EBUILD upower-0.99.7.ebuild 1986 BLAKE2B e527fbadac423b52703d289dad520cf20f3ee6edec82161195f13c319393de65a6d29879fd1f1cdc2999f7e678676b077979a2db24fae6ac1fc71b03e9a35daf SHA512 515f932021a9b31b6439fb385b08d394915ba1cb4cdf4e83d1c077e62dfb8b84453c3c8e8cf0bc68b78cc5562fdacb01bbea15fdd61a9184d4c84ba1a1a3f83a
-EBUILD upower-0.99.8.ebuild 2173 BLAKE2B e9ed21c7e7a47902768db82aff42c6b79e98845efeb73cf9a868ab4eaec97f2918158ef2537bc67fee4ac30d904331c8a5450218117c527d65d239aae6ae1dd2 SHA512 0c9991706616683feb6f92a3a6410136af797d8e1a571098b2e44840b09fb3b2f7396ed7084ecc8fffcdac4351d9e25ea79743fccd1cbd5412d8781cbee86637
+EBUILD upower-0.99.8-r1.ebuild 2373 BLAKE2B d96df72161a3c2735728aa3d3275d6f8dba95ad4519fea3fcc988fff7fbf402c004b040956b5fdc696c042e9274222bc5da1a9264066981435e9f8375fd88d7c SHA512 63e349f2f93205892b8b5fb6f2003181d00ab01d3801475ac43a6806770d44f0c6eb5286bd842ec4be29b121c2aec2bc05ced85cba42898d1db87b9f83f575f3
+EBUILD upower-0.99.8.ebuild 2170 BLAKE2B d6ef2e7c688f16893ed08a6897ad659d83630e8986731a0265a284acdecb23d9d73b3c83e2c3c41919c395eb9ad55ea3c811ba8cb0d4bdae84fc8e8578caf32b SHA512 aef6c980937ef5ea1ceb872066415529abeed577680faf970f7dd36753185cfe588792751b8b1c198035036393029b7774521bd406dc7c859548b3e27aaba0f9
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/sys-power/upower/files/upower-0.99.8-keyboard-backlight.patch b/sys-power/upower/files/upower-0.99.8-keyboard-backlight.patch
new file mode 100644
index 000000000000..07b1731ad2c4
--- /dev/null
+++ b/sys-power/upower/files/upower-0.99.8-keyboard-backlight.patch
@@ -0,0 +1,30 @@
+From 0a9d9ab4949effb20e77aa52e7b4ee07e776fc0d Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 4 Sep 2018 09:58:21 +0200
+Subject: daemon: Fix upower's keyboard backlight support
+
+Disabling kernel tunables blocked us from accessing /sys, meaning we
+couldn't change keyboard backlight levels.
+
+Closes: #73
+---
+ src/upower.service.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/upower.service.in b/src/upower.service.in
+index 8838655..4566ad3 100644
+--- a/src/upower.service.in
++++ b/src/upower.service.in
+@@ -10,7 +10,8 @@ Restart=on-failure
+ 
+ # Filesystem lockdown
+ ProtectSystem=strict
+-ProtectKernelTunables=true
++# Needed by keyboard backlight support
++ProtectKernelTunables=false
+ ProtectControlGroups=true
+ ReadWritePaths=@historydir@
+ ProtectHome=true
+-- 
+cgit v1.1
+
diff --git a/sys-power/upower/files/upower-0.99.8-udev-events.patch b/sys-power/upower/files/upower-0.99.8-udev-events.patch
new file mode 100644
index 000000000000..d164824b735f
--- /dev/null
+++ b/sys-power/upower/files/upower-0.99.8-udev-events.patch
@@ -0,0 +1,32 @@
+From fe356951a9d45fee73036aaa72661f0319dffba3 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Tue, 21 Aug 2018 13:30:44 +0200
+Subject: daemon: Fix upower not having access to udev events
+
+PrivateNetwork=true will cut off upower from the udev netlink socket, so
+it's not what we want to use, as we want those events.
+
+See https://lists.freedesktop.org/archives/systemd-devel/2018-July/041000.html
+
+Closes: #68
+---
+ src/upower.service.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/upower.service.in b/src/upower.service.in
+index 835529a..8838655 100644
+--- a/src/upower.service.in
++++ b/src/upower.service.in
+@@ -17,7 +17,8 @@ ProtectHome=true
+ PrivateTmp=true
+ 
+ # Network
+-PrivateNetwork=true
++# PrivateNetwork=true would block udev's netlink socket
++RestrictAddressFamilies=AF_UNIX AF_NETLINK
+ 
+ # Execute Mappings
+ MemoryDenyWriteExecute=true
+-- 
+cgit v1.1
+
diff --git a/sys-power/upower/upower-0.99.7.ebuild b/sys-power/upower/upower-0.99.8-r1.ebuild
index b41d3df9819a..be82b5b6047a 100644
--- a/sys-power/upower/upower-0.99.7.ebuild
+++ b/sys-power/upower/upower-0.99.8-r1.ebuild
@@ -1,16 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit ltprune systemd xdg-utils
+inherit systemd xdg-utils
 
 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"
+
+# No tarball released, use the same commit as Fedora
+#SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
+COMMIT="9125ab7ee96fdc4ecc68cfefb50c1cab"
+SRC_URI="https://gitlab.freedesktop.org/upower/upower/uploads/${COMMIT}/${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"
@@ -47,8 +51,17 @@ QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
 
 DOCS=( AUTHORS HACKING NEWS README )
 
+PATCHES=(
+	# daemon: Fix upower not having access to udev events
+	"${FILESDIR}"/${P}-udev-events.patch
+
+	# daemon: Fix upower's keyboard backlight support
+	"${FILESDIR}"/${P}-keyboard-backlight.patch
+)
+
 src_prepare() {
 	default
+	xdg_environment_reset
 	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
 }
 
@@ -76,12 +89,11 @@ src_configure() {
 		$(use_enable introspection)
 		$(use_with ios idevice)
 	)
-	xdg_environment_reset
 	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
+	find "${D}" -name '*.la' -delete || die
 	keepdir /var/lib/upower #383091
-	prune_libtool_files
 }
diff --git a/sys-power/upower/upower-0.99.8.ebuild b/sys-power/upower/upower-0.99.8.ebuild
index 2885a37afdab..b209ba507eb5 100644
--- a/sys-power/upower/upower-0.99.8.ebuild
+++ b/sys-power/upower/upower-0.99.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/upower/upower/uploads/${COMMIT}/${P}.tar
 
 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"