gentoo resync : 22.01.2019

9 files changed, 188 insertions, 6 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index f2af7e51b2ee..4772fef729bc 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 2376327d2627..9f690b841572 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -13,5 +13,5 @@ DIST sys-power_acpid_2.0.29-r1_extras.tar.xz 2548 BLAKE2B 4568f0e44d33382fd29424
 EBUILD acpid-2.0.29-r1.ebuild 2104 BLAKE2B f477d8ec3a9f417e2b3b44ef24652c0653ed01ed7b013ef86c9bab17463441da4da3c8939c1b4fdad4cae78f4eca783dca1dc251fa8621d2c92961c7c1eec6a9 SHA512 a88604dc9044e2dc401b3dd5bf469b88fe8526b0250c2c266ba81c260e785e68aa13ce8ddf8c4b37c9c6f069c31b45e22893799648ef10524f3f063f6960d575
 EBUILD acpid-2.0.29.ebuild 1858 BLAKE2B 4bf788cb1010e66eebc1aaa34b4b3851307588bcb1b78f6dfcc0fd236db897f512d4ca3f98d0c0864c6bd10fb1fc27fcbaa94c8439d2d647caf1f684de9f1847 SHA512 a76fbf6aa2260cecf8a08a0fa013dc14a7a4d7fd90ad65f6a8a70c64d1dea445c97cff7413cb08c13e1251e9634ae3f2c33f8866f4e0c561635c79eb4e6e08be
 EBUILD acpid-2.0.30.ebuild 1963 BLAKE2B a93ac2d1cf60b49e2a95ad37bdb51181c86a5711fb683105eba86c7a0223715a5e688c1aa67029a44f4e0a0b8f6ab961d01eef9efba54cc4c111b2066f0d03a2 SHA512 86444c7c26a616937a6d4833c8710584ab9f3766978d1435a893f78b654ceac8dda33aec7ff2e62a1de1a4f1aa6a8e919a8871bc448a2c0d828848c81bfc89af
-EBUILD acpid-2.0.31.ebuild 1963 BLAKE2B a93ac2d1cf60b49e2a95ad37bdb51181c86a5711fb683105eba86c7a0223715a5e688c1aa67029a44f4e0a0b8f6ab961d01eef9efba54cc4c111b2066f0d03a2 SHA512 86444c7c26a616937a6d4833c8710584ab9f3766978d1435a893f78b654ceac8dda33aec7ff2e62a1de1a4f1aa6a8e919a8871bc448a2c0d828848c81bfc89af
+EBUILD acpid-2.0.31.ebuild 1962 BLAKE2B 4095dace6957e021be73c336ccf9b33049abcdc789be44820a99f06f092f0b309b6629ebeab97246fdbe12a72fedee5c4fb7a4ce029f79a11e7f79ea05b046a7 SHA512 a4178b8e8d93aabadc3b9be21728ff387a7e2259ff78fa4431cb32cbd913e6463c942bbaf19cce2132b3b1bd7a20ceae0d59a24be313337598cd345130b7a1b1
 MISC metadata.xml 327 BLAKE2B f6c546808131faaccf65580107772b21a3fe59b681b1ae6c66846ce230c9bb4ce9209287ff88f150f4bd691d71cdbf7e2c4fd4ac8a049a2e8b9d9ab57967c1b3 SHA512 8e93170bc36e09c1cf6c1db7eb751cc1ddf737d3ed240ef69a5ba00279ea3d9e92c5ba5185faa5f2f3c86fca9922adfb8e8e0ffe673817984948aa941a2a7a3a
diff --git a/sys-power/acpid/acpid-2.0.31.ebuild b/sys-power/acpid/acpid-2.0.31.ebuild
index 52a2ac1739cc..16f46b163fbf 100644
--- a/sys-power/acpid/acpid-2.0.31.ebuild
+++ b/sys-power/acpid/acpid-2.0.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ia64 x86"
+KEYWORDS="amd64 ~arm arm64 ia64 x86"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-apm )"
diff --git a/sys-power/hibernate-script/Manifest b/sys-power/hibernate-script/Manifest
index b9c3d80b21b9..6ea7fcbd5ff0 100644
--- a/sys-power/hibernate-script/Manifest
+++ b/sys-power/hibernate-script/Manifest
@@ -1,4 +1,4 @@
 DIST hibernate-script-2.0-patches-5.tar.bz2 4203 BLAKE2B 4635f1e39c92b7d63de7fe0cf75903d0fd12763c63ac303f06015893268dda81727725cdb4ef055e1a266d9298598776b498f00f9f683a295abb4e9c97c29dbb SHA512 9e9c45c8f9bfde9bfb7d2ab229e355e635ae2f98cfdefa964c07401cdef5e57d0c58976bd491f82a3b9204af213c82f840e0a9b794b2869f2dfe7783dbdb4970
 DIST hibernate-script-2.0.tar.gz 84453 BLAKE2B 14b0b2fef2d3e84503a12feed935d44cb65be9e67a14686b5dad18cfa69177bd27dd9e287ffddb13533a005c6106fd81f85f78082a27f0170d26019421090ef9 SHA512 625efdf8bd8561dd9ab93c09436f2fb93edef2fbb0fb2d259727bacffab0b7bd4a6c99d445131390883be75658f6dd28f329fdaf4f03a7d218c0021223ac1a1e
-EBUILD hibernate-script-2.0-r6.ebuild 1820 BLAKE2B ca8794a6fca001e254befc76dda1a3191f97dbe71cfad69f8ebba667120ea765fccb841657dbfdca702527c6d9072ddb799e0b2c2e8ad8eb7cbfbf70de60bdaa SHA512 a59f90a76e4b2baca4ad58a19c49d587d3a83d53fa79748d3a687b327ae4143ef6433f0eec1c9f7f58cab69f7db3081d197ff412dfe69a2a0a88cbdefe9e9a8a
+EBUILD hibernate-script-2.0-r6.ebuild 1817 BLAKE2B 972d42269effee28788c0d68f2d3c02f4b54389804de983fd1d46ef7f4a39c8c4d5a673debd29d7a2f1792c0d84da0595283ca8d6561fbe267a16b68b575082e SHA512 7b4fea0024d876735a929ff0f58f45da6fcfc4c4d20616e006c95c230268bb4197957aabb3fd5b5f13918a318588aca79dc2a6a3df83761c08fc6fdd1596c28e
 MISC metadata.xml 217 BLAKE2B 6e1cd12af01db3565487a9412bae9a06912408439877e1a81fc466c0dc0612175846256a14be3b1102bbd43ac663311d34bc441b5d64caf9462c25ada2cfa3a3 SHA512 1cb210be8d67d18e50ea53bedbfe8b2807e4b2e5c9bf82cc037ce5d60f98d60b5a967e8863a2964769eb6a15626db1e001cc1a38a18b2d1809cc73a3578df4e4
diff --git a/sys-power/hibernate-script/hibernate-script-2.0-r6.ebuild b/sys-power/hibernate-script/hibernate-script-2.0-r6.ebuild
index d53f1555016d..680a7bc423fc 100644
--- a/sys-power/hibernate-script/hibernate-script-2.0-r6.ebuild
+++ b/sys-power/hibernate-script/hibernate-script-2.0-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 PATCH_VERSION="5"
 
 DESCRIPTION="Hibernate script supporting multiple suspend methods"
-HOMEPAGE="https://github.com/NigelCunningham/Hibernate-Script"
+HOMEPAGE="https://gitlab.com/nigelcunningham/Hibernate-Script"
 SRC_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${P}.tar.gz
 	mirror://gentoo/${P}-patches-${PATCH_VERSION}.tar.bz2"
 
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 9a472e058f31..f44b20b942c4 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,7 +1,10 @@
 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
+AUX upower-0.99.9-pending-charge1.patch 1351 BLAKE2B 719581956d7bed9efb148bb84a83b0b90cabadf1113fece846416b980c1919895bd1e85575bba0198d856d5a39209ab7c919e2142361ee2cf6361f631f312fc9 SHA512 f100c9cb06c8407fdb8cc2ea27651f3e1eb563e40b98b2a0d7589577652d5c14d824a4de3d503cb858fa5d4360993f63da49cd5f4c8caaec43fde4f20e075f47
+AUX upower-0.99.9-pending-charge2.patch 2016 BLAKE2B 87a3078acf6c95dd8237f894aa25dbf803d42f766682e3e53f5ec30fcd7725178ebab94111945fbf0b4d0e16b656e8723240b14358d1c6e5285086b30da541d2 SHA512 15aa04bcd892feec125508d6a9edb8df98cd5317fce27d9c8907994f1d735be32934c5010566f0a38221ef20b48d8faf73841df6e35447ef0efccdaab371fb0b
 DIST upower-0.99.8.tar.xz 448664 BLAKE2B e101e7d1b2aede77c1ed2da1fd23b87a95ccac8d901bd8d1f8bebcd5de7052a66f1840cf578a48453538e166aae56ef4bc6d3a2b85f7ba148ecac5cc0a486809 SHA512 dfd2960cae382195dfc7a703a02af298d9de55bc626cde2a1f97e7983842191ba9d99eb2044190214e792539e7d6c9d8e00b5aed17e5e86b04544e9ab90278b1
 DIST upower-0.99.9.tar.xz 448408 BLAKE2B 5fa2436f33c94cffb736d8e3fad433acf58954cf06ccd403a0361214be5afc45d79ea279f3c5c48dcd58b92ccaf995777c95987d1749fd8c8c8958317e439570 SHA512 45eb587b0e5ffcce88bad8c56bc5efa30559748913016a55d58313280f5159378e5fbb4a9842c3a6409257bb97822d235f96b03704268b8471455c93eb05fe2f
 EBUILD upower-0.99.8-r1.ebuild 2372 BLAKE2B 05870dca284b3a0288fbd8bdaf1509fb7c099d56a6f5c55adf60046c1c80645e3e3aa08534fdb89ed5d3c480b61bac7291dff487fe5a8d831634b5c3053c878a SHA512 8997f794ece5ccd9ec617e8ba1747abecfa5d0273fb9a6c3dd82c357a12a545e6239c0fa1d6bd8f0a0936f0e9f9664ea4e97ac0162ca9209716f3763a6edecad
+EBUILD upower-0.99.9-r1.ebuild 2360 BLAKE2B 15cf585d54d1826b14571c4a0f723d3a3836736d0d8a830dd303243e2cda0f61ddfe96860bc88e8a3e3077450da37ee768ecacf0479b09446f9861edcf7677b2 SHA512 31cbebe95a69271f104d10c61035cb51e18cf4fbf98c6d55c1c7930d84b6ee183e1b0b9c9d919e9531c752fead0caa31233b2abb2abe2a8fa3901af90a03a9aa
 EBUILD upower-0.99.9.ebuild 2174 BLAKE2B d2397d31fe8c5134f5eb2dbe20662de6e94428c3b59384ebf5797bf9042a37e6af1af74487a1d908199f4ad0de603bec0e7a0fd17d9d02bc98e6f7290ba2b2bd SHA512 327131fb34743dfc992fad6ca1144021afa3954dcc7b7f02bb483ead32a780d9bb5b9f693bdcd3fc47cd0a9079e1333ffc4df431d11d26a8188045e936d33f8a
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/sys-power/upower/files/upower-0.99.9-pending-charge1.patch b/sys-power/upower/files/upower-0.99.9-pending-charge1.patch
new file mode 100644
index 000000000000..9ce91c10a66e
--- /dev/null
+++ b/sys-power/upower/files/upower-0.99.9-pending-charge1.patch
@@ -0,0 +1,33 @@
+From a074a5462ab9749ad4aaca52e0202602897660aa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <jprvita@endlessm.com>
+Date: Thu, 1 Nov 2018 14:45:28 -0700
+Subject: [PATCH] daemon: Make comment more succinct
+
+This will help make it more clear when adding an extra state on the
+following commit. It also makes the language consistent between the
+different lines. There are no changes on the meaning of these lines nor
+any functional changes on this commit.
+---
+ src/up-daemon.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/up-daemon.c b/src/up-daemon.c
+index 1a5dddc..95fff6b 100644
+--- a/src/up-daemon.c
++++ b/src/up-daemon.c
+@@ -209,9 +209,9 @@ up_daemon_update_display_battery (UpDaemon *daemon)
+ 		    power_supply == FALSE)
+ 			continue;
+ 
+-		/* If one battery is charging, then the composite is charging
+-		 * If all batteries are discharging, then the composite is discharging
+-		 * If all batteries are fully charged, then they're all fully charged
++		/* If one battery is charging, the composite is charging
++		 * If all batteries are discharging, the composite is discharging
++		 * If all batteries are fully charged, the composite is fully charged
+ 		 * Everything else is unknown */
+ 		if (state == UP_DEVICE_STATE_CHARGING)
+ 			state_total = UP_DEVICE_STATE_CHARGING;
+-- 
+2.18.1
+
diff --git a/sys-power/upower/files/upower-0.99.9-pending-charge2.patch b/sys-power/upower/files/upower-0.99.9-pending-charge2.patch
new file mode 100644
index 000000000000..a79ebac7ed18
--- /dev/null
+++ b/sys-power/upower/files/upower-0.99.9-pending-charge2.patch
@@ -0,0 +1,48 @@
+From a074631c0b1748c8a791c4f0dad99da75805a328 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <jprvita@endlessm.com>
+Date: Mon, 15 Oct 2018 17:05:27 -0700
+Subject: [PATCH] daemon: Consider pending-charge when calculating the display
+ state
+
+Without this change if all batteries in the system are in the
+pending-charge state, the display device state is set to unknown, and
+its icon to battery-missing-symbolic.
+
+This change makes the pending-charge state be considered when
+calculating the DisplayDevice state, setting it to pending-charge if at
+least one battery in the system is pending-charge and no other is
+charging or discharging.
+
+Closes: #81
+Closes: #19
+---
+ src/up-daemon.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/up-daemon.c b/src/up-daemon.c
+index 95fff6b..690f379 100644
+--- a/src/up-daemon.c
++++ b/src/up-daemon.c
+@@ -210,14 +210,18 @@ up_daemon_update_display_battery (UpDaemon *daemon)
+ 			continue;
+ 
+ 		/* If one battery is charging, the composite is charging
+-		 * If all batteries are discharging, the composite is discharging
++		 * If all batteries are discharging or pending-charge, the composite is discharging
+ 		 * If all batteries are fully charged, the composite is fully charged
++		 * If one battery is pending-charge and no other is charging or discharging, then the composite is pending-charge
+ 		 * Everything else is unknown */
+ 		if (state == UP_DEVICE_STATE_CHARGING)
+ 			state_total = UP_DEVICE_STATE_CHARGING;
+ 		else if (state == UP_DEVICE_STATE_DISCHARGING &&
+ 			 state_total != UP_DEVICE_STATE_CHARGING)
+ 			state_total = UP_DEVICE_STATE_DISCHARGING;
++		else if (state == UP_DEVICE_STATE_PENDING_CHARGE &&
++			 (state_total == UP_DEVICE_STATE_UNKNOWN || state_total == UP_DEVICE_STATE_PENDING_CHARGE))
++			state_total = UP_DEVICE_STATE_PENDING_CHARGE;
+ 		else if (state == UP_DEVICE_STATE_FULLY_CHARGED &&
+ 			 state_total == UP_DEVICE_STATE_UNKNOWN)
+ 			state_total = UP_DEVICE_STATE_FULLY_CHARGED;
+-- 
+2.18.1
+
diff --git a/sys-power/upower/upower-0.99.9-r1.ebuild b/sys-power/upower/upower-0.99.9-r1.ebuild
new file mode 100644
index 000000000000..c154b148365d
--- /dev/null
+++ b/sys-power/upower/upower-0.99.9-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd xdg-utils
+
+DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
+HOMEPAGE="https://upower.freedesktop.org/"
+
+# No tarball released, use the same commit as Fedora
+#SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
+COMMIT="2282c7c0e53fb31816b824c9d1f547e8"
+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"
+
+# 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=(
+	# daemon: Consider pending-charge when calculating the display state
+	# (from 'master')
+	"${FILESDIR}/${P}-pending-charge1.patch"
+	"${FILESDIR}/${P}-pending-charge2.patch"
+)
+
+src_prepare() {
+	default
+	xdg_environment_reset
+	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
+	find "${ED}" -name '*.la' -delete || die
+	keepdir /var/lib/upower #383091
+}