gentoo resync : 24.12.2018

18 files changed, 9 insertions, 347 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index ad506ec06668..767e400fa287 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 399ae4dcdb5e..2376327d2627 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 1966 BLAKE2B 40f9c6174db5f68c4d86f08eda8a8d05bbbf3cf90dbb40b08428a06cfe65c04274127f69dd8378aab4900da4389fcb48a249197cae9ff3d95771a32da32c9d32 SHA512 dfcb3507769f302a71cb685ee48d05ef8303fb0671993b334edc6702c95a4c52b5e2849d57664aa0ae96885b7ca710ab803088c0441e38f4fd159c3fd7cb3668
+EBUILD acpid-2.0.31.ebuild 1963 BLAKE2B a93ac2d1cf60b49e2a95ad37bdb51181c86a5711fb683105eba86c7a0223715a5e688c1aa67029a44f4e0a0b8f6ab961d01eef9efba54cc4c111b2066f0d03a2 SHA512 86444c7c26a616937a6d4833c8710584ab9f3766978d1435a893f78b654ceac8dda33aec7ff2e62a1de1a4f1aa6a8e919a8871bc448a2c0d828848c81bfc89af
 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 a56844b5c597..52a2ac1739cc 100644
--- a/sys-power/acpid/acpid-2.0.31.ebuild
+++ b/sys-power/acpid/acpid-2.0.31.ebuild
@@ -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/nut/Manifest b/sys-power/nut/Manifest
index cfb61b5ed9b6..040f580416c9 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -9,6 +9,6 @@ AUX nut-2.7.1-snmpusb-order.patch 1417 BLAKE2B 20c3150559d3810c8bf15a9560ccf950a
 AUX nut-2.7.2-no-libdummy.patch 535 BLAKE2B f18f65ca92e834b5e085358a09c7363cf156b4a156c6c99d4f7cc34a17d25cf1518f342c072791eb37db613a6dafc32aeed364b88063c4d92d20e21e34a5d807 SHA512 a402a70a4cfc922d31203560627ace87f82795aef072d333cb1bfb91a6b67fbc10769e5d68a8d2741ca512b81b5754e9141b68dcb197dbe558ed5556e2de37a1
 AUX nut.powerfail.initd 1306 BLAKE2B 9e9c6eb40c6a313ad625136523de730a75b811841331ae5f7dd42b71b65f591c4ab5b8da6e954ceab42da89f4a20e8655cae57354aec6ab796cec80f60ebb419 SHA512 b9aaab526d0996b36a7a6d76a3ee63c1452b0a1bed358e23f6f7f5534e0da7751281428091efc7dba2004706996850ec18318809fdacb94cd8d73ea22bda52ee
 DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf926522923e1842011ec49b67d6638620500c4eda50291feb474cc6eef39fff63764cb3e0fad5898abee981f8308 SHA512 320c4aff85d8a370c5eff77d33924fdfc3caf6a250620693cdd5bf3336b3a80d8a207488eee841bcf8b72fbad68fda4c074e63b99c56e7886716fc934122d11a
-EBUILD nut-2.7.4-r1.ebuild 8998 BLAKE2B f27602a909b1f562002ebb98e62859eb628a298ddf81e935b35c43f47a6898cd81325b7cc941e7a3b8f0b3206b2844ab4b238aa4035329bc694c5b5418a4ad07 SHA512 3a207724967ca02fc41209edbe44873ee03df35ff6fa2ddb60f4d1c5250997657925c697b3070556de7bcff964e88da75dc920f068c7d2703dc0cc0f96c38ad3
-EBUILD nut-2.7.4-r2.ebuild 9711 BLAKE2B 5e0faffab438d874c23267d033f83a5361bee034d8b2d552764c479e0c39f8dd1950f74d96aad5c0fd3ec8e0e35dfdad422720790658aa083e909723afb955b3 SHA512 fc01f44bf27f5a0e9480341c3852fb8ad83a0eab494b3080110bec5fc9f0c3bd7c9de9666b3ab5c53d80a978faab776fd8ff0c531c8791e65de6c36b520fae10
+EBUILD nut-2.7.4-r1.ebuild 9000 BLAKE2B 53cf51da6aaa6d9655b9fe68a2eeab13c53ce284fbd09b7fc5aee790220cc32a5d9c11ef50b31cae409ec034609e5e2ad7ab2d3f95db4f8fe6b38f69a4123968 SHA512 3fa055f36890e108ac31cd2cb79598a58c926ac887022c3871e7e31461b843b74744c064008afdb7e936c6b19c675881f6f53742479f5f5f070efe1167447807
+EBUILD nut-2.7.4-r2.ebuild 9713 BLAKE2B 3b462c773f1cf6e38908ef483413e1db0cfb68c07530451ecefb2112754ffaa35fba6f8954840cdb6a19179219ddde4f75f116fd00aa2813279176195514f478 SHA512 395aaf5b94fc9a8fe127113fdf5f137fe75b868eaa4dab57d4493f0286fa69898053ff07964308c1c002f6143d84567e1d48dd66774c0e6651df19fc7777367e
 MISC metadata.xml 5178 BLAKE2B 4fd7fd1ac52507faf24113bd583784bb1c14b37e6b68cd9b670580262e05d82992cb87ce3d5b9573ffed35ada17fe0399cc1437ad503b7c1d49cd781be01bad9 SHA512 d94f262b166977866e94b7a81b8c625fc78bbd0861ef04de4dc8124773c5f2374999d9cdbc1c82b7fa258548b6b2d9a5f4db1647cf3e106a09ce7049f510b3b0
diff --git a/sys-power/nut/nut-2.7.4-r1.ebuild b/sys-power/nut/nut-2.7.4-r1.ebuild
index f575b4fa11bf..a57d0c129171 100644
--- a/sys-power/nut/nut-2.7.4-r1.ebuild
+++ b/sys-power/nut/nut-2.7.4-r1.ebuild
@@ -21,7 +21,7 @@ CDEPEND="
 	cgi? ( >=media-libs/gd-2[png] )
 	snmp? ( net-analyzer/net-snmp )
 	usb? ( virtual/libusb:0 )
-	ssl? ( >=dev-libs/openssl-1 )
+	ssl? ( >=dev-libs/openssl-1:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	xml? ( >=net-libs/neon-0.25.0 )
 	ipmi? ( sys-libs/freeipmi )
diff --git a/sys-power/nut/nut-2.7.4-r2.ebuild b/sys-power/nut/nut-2.7.4-r2.ebuild
index 1e2c05067f44..d4baf524a1f0 100644
--- a/sys-power/nut/nut-2.7.4-r2.ebuild
+++ b/sys-power/nut/nut-2.7.4-r2.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 	gui? ( dev-python/pygtk[${PYTHON_USEDEP}] )
 	ipmi? ( sys-libs/freeipmi )
 	snmp? ( net-analyzer/net-snmp )
-	ssl? ( >=dev-libs/openssl-1 )
+	ssl? ( >=dev-libs/openssl-1:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	usb? ( virtual/libusb:0= )
 	xml? ( >=net-libs/neon-0.25.0 )
diff --git a/sys-power/phc-intel/Manifest b/sys-power/phc-intel/Manifest
index 3407669f84c4..cbf0b49f314c 100644
--- a/sys-power/phc-intel/Manifest
+++ b/sys-power/phc-intel/Manifest
@@ -26,4 +26,4 @@ DIST phc-intel-pack-rev24.tar.bz2 117565 BLAKE2B 450518537c6a67b05448aca2a0f495c
 EBUILD phc-intel-0.3.2.12.17.ebuild 2187 BLAKE2B a5d1300f4deddd6bc39c2af77c54c5e7340e1ab88ab94d6dac4ccef94f95176ee8f6316c5e514f5c5ef698cc4ddac7ef6958fb697fa60b98227719942d99452c SHA512 6d756387a159a905cbd73d4705e2e64cb8ae7f6ca94f78b1f46e744668b7dc4fc7e2d49fd207ed7acfe1989c3f907478b537b3b34f574c847159055a9be525be
 EBUILD phc-intel-0.3.2.12.21.ebuild 1848 BLAKE2B cc2b1690a8cc34275a940e5e70b8a9034124a9431b56e5fa29fd77a87ecec646c7359b941df37a77919bcd6e658de5eb37731e2fe0ed992e6107cf6f2b6229d7 SHA512 60af2a13ee4f98c12031a19052665c5991f0c4d107255c453c9031e11b7a2777a92d414667ec71b2f0cd8d6406b1c0708cc85d4bc35bb7e1d766900f750482ea
 EBUILD phc-intel-0.3.2.12.24.ebuild 1933 BLAKE2B 4e1f039fe24b038bf31e53b5c3e76bff364c5e2fa52565e96eb0cf61b2257289ff0ba9285c5e4096ccade5aaa8cde6e498ec9107b366c6c7fad60121f7e17259 SHA512 f014ffbd5d372b2f7d2a33c883dc6ddcbb31bb04411e69b33b52a8dd73c8792378130111393102afdfa954339dfacae8dd45b7198a5b118c44bd3faa7d00e81e
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-power/phc-intel/metadata.xml b/sys-power/phc-intel/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/sys-power/phc-intel/metadata.xml
+++ b/sys-power/phc-intel/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-power/suspend/Manifest b/sys-power/suspend/Manifest
index 344a8e4f100c..7fdb73ec616f 100644
--- a/sys-power/suspend/Manifest
+++ b/sys-power/suspend/Manifest
@@ -1,5 +1,4 @@
 DIST suspend-1.0_p20120915.tar.xz 111080 BLAKE2B 99eea1d9808219373501001f0af90973c9176c1b19d62bff7be26886b11ebb514134b68434e9b453146ef1a4af2c4cc8e26326b956a1b2378c38c100638af17c SHA512 bb714b4a7c0f5749c4b711a5c38ca5d8cb5078176a75387957123f75cfe8348adc3aa4e96335eb65c14ad1dd2f99fd6dbca3b415525dd39b3c547f9b13b775be
 DIST suspend-1.0_p20150810.patch.xz 6172 BLAKE2B 026aee69c59119b2d51ec1bf396633b2a3df018c95eecc53106a2d99017169a95951f8296a4962b32e5ea4c8d8cf4ea77f693367866137390048bc137456fe4d SHA512 cb186bdb0619ed4852e2ba12d6048f26fa23c7556d7c95713f14a4258fbb014bbec2281edee6478ebf5916600b674d47d8ba53e7644391de933b03e9fd1b96e9
 EBUILD suspend-1.0_p20150810-r1.ebuild 1238 BLAKE2B 59622315e2d58d9964c25f32c3822015291a9fadc5172607231d148faea005cfab097f4715a9d8ae903889aa67517529095526e6abee5d1a1dbfd77fe84d8dc6 SHA512 72088eb67fb794ca2baeed5f2a9b574068f959bacf58509eb5314e84a2a1807c17648f1c82e21149a277b97e37c5065c92f88369c7736e6d1b78af34376fd37b
-EBUILD suspend-1.0_p20150810.ebuild 1286 BLAKE2B 0217a2b49bdc85b6eeecef46c4c2c265d724b25910429b752d78fbd69ad2241ad15a55c688b0e4d0bf3ff37fdc94f221d8f06a5d13b2c2de39f8300375b1b968 SHA512 0908b597b3e30c527538c54531071076282047b4b4da1c8997aebbb2ae29eb9066fa6bb91e57064e6ae5f3e972f1e0d6c23086a589a8d6b73c62602745c343a0
-MISC metadata.xml 586 BLAKE2B 0b15707bf6ff21ec70345f9e6f06f55ec979410dc6a49ddf6bfe4124f2db02a515932a845dd0ceabf6ddfdd894cbd90909c3dc60d7593978fe9c73db169b0a98 SHA512 fea00b4ea8510e8b10482a5956d585b96638a9f530eae8248e83c2cf9316fc5a37769b3eb080d09182ed6d7d34e46c1f3a9939ad28c7a176c35d2dfdecb7f4b4
+MISC metadata.xml 416 BLAKE2B da4b1cd1b2d970f34fdc482fcb96fefa51b70ea9bcac664c9548604daafa264e144487d217fbfa5b3f9ea129b6af662481fde7b997f6e1ffa15b3ada04957f5e SHA512 7b38f6bb474ba4520804f3abf5010ca31d5b6353d5a2092df898a7d01dc6a4a55e9d827581a8f3dd1962edd7f373ee44750c0579b512399237b2d980269052b3
diff --git a/sys-power/suspend/metadata.xml b/sys-power/suspend/metadata.xml
index 959bb49c8fc6..886b7a4a7949 100644
--- a/sys-power/suspend/metadata.xml
+++ b/sys-power/suspend/metadata.xml
@@ -2,15 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>bircoph@gentoo.org</email>
 		<name>Andrew Savchenko</name>
 	</maintainer>
 	<use>
-		<flag name="fbsplash">Add support for framebuffer splash</flag>
 		<flag name="crypt">Allows suspend and resume from encrypted disk</flag>
 	</use>
 	<upstream>
diff --git a/sys-power/suspend/suspend-1.0_p20150810.ebuild b/sys-power/suspend/suspend-1.0_p20150810.ebuild
deleted file mode 100644
index 6d53161ba3bc..000000000000
--- a/sys-power/suspend/suspend-1.0_p20150810.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-BASE_PV="1.0_p20120915"
-
-DESCRIPTION="Userspace Software Suspend and S2Ram"
-HOMEPAGE="http://suspend.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${PN}-${BASE_PV}.tar.xz
-	https://dev.gentoo.org/~bircoph/patches/${P}.patch.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="crypt fbsplash +lzo threads"
-
-RDEPEND="
-	dev-libs/libx86
-	crypt? (
-		>=dev-libs/libgcrypt-1.6.3:0[static-libs]
-		dev-libs/libgpg-error[static-libs] )
-	fbsplash? ( >=media-gfx/splashutils-1.5.4.4-r6 )
-	lzo? ( >=dev-libs/lzo-2[static-libs] ) "
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5.10
-	>=sys-apps/pciutils-2.2.4
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${WORKDIR}/${P}.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		$(use_enable crypt encrypt) \
-		$(use_enable fbsplash) \
-		$(use_enable lzo compress) \
-		$(use_enable threads)
-}
-
-src_install() {
-	dodir etc
-	emake DESTDIR="${D}" install
-	rm "${D}/usr/share/doc/${PF}"/COPYING* || die
-}
-
-pkg_postinst() {
-	elog "In order to make this package work with genkernel see:"
-	elog "https://bugs.gentoo.org/show_bug.cgi?id=156445"
-}
diff --git a/sys-power/upower-pm-utils/Manifest b/sys-power/upower-pm-utils/Manifest
deleted file mode 100644
index db04fcfa8f66..000000000000
--- a/sys-power/upower-pm-utils/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX upower-pm-utils-0.9.23-always_use_pm-utils_backend.patch 1477 BLAKE2B cfe69eb55aab9e5d4511ea787d67a3111b2d6d92a4d94bc493b64677b4a2773d3b3257bf7aa9ffe0fd55fe99feee420c550cdd649d54ec19dc603b9566bb549e SHA512 83adcdd52739c825b7a280fe3ddac122f9b681a52bfaa1af0a14e7b95fdfa8b6b4a87e290c04af5692537e2a87f6b9770209bd67b869287bdecdbb62b2add0fb
-AUX upower-pm-utils-0.9.23-clamp_percentage_for_overfull_batt.patch 3396 BLAKE2B c7c06ed4d352394892565f5312290eaa9cecd4438c1cef66d99b78eb1a2ee04850362f4ebeeff095a65fa4ef32e11239539b597e58f29820a3ebdfb0e671ecd6 SHA512 6bb869f1e2c5d93983b20bb65f5fc0803709b690f70b17a78204c98afca41a97b60b1c3cf8f564c931f189bd2db1dab00cd42121f5f022b5e8f0f044faf836d7
-AUX upower-pm-utils-0.9.23-create-dir-runtime.patch 1164 BLAKE2B 949a14510bb0b64269899ed6e7cfd612045cd2bddc89b75295bc04cbcf3beb7366976e34649d24fe22d9b1541751188b6c09dbdc3fd4caf9a3dc460342f7bf4f SHA512 1aaec53df73aa50fabffaddd380800f7ed78caddc02b16834831aa1faa09c795e0def04493f64d852a9b07b9ef4007352e111c5d7cdc1f1b2ed8043c445751f2
-AUX upower-pm-utils-0.9.23-fix-segfault.patch 829 BLAKE2B ced556dbf9933446409b5d89b1fc30b189846a5ddd009f91262a770291a4d68c60c553976e26de7f4de02a8e3dcd895cbf0b44166b1acf061129b0fd433d6c35 SHA512 31a6b5414ddd17cbbcf318da98907d745910e7632ea9a4d4d5c02eaaae87857b5bb88f9ab2f336f7b24637727005fb839f8c9564b82e56ae0065d57b1ce19ad2
-DIST upower-0.9.23.tar.xz 425804 BLAKE2B 981fbc076ba969a0b19919b45a19ccc48fb19717ec61810d4df28341dae55d29937b89cd895882946eff8dde08e0bed3aadec1da22cbe40ee48334b3901efeb8 SHA512 526ef95e43faf61744ba2bbf80bae23bc5c8672130563a87a7f18f00d85b16e2069814ad70dd66ce6ce698037b522d78579cc2135e2af0c2a636230cfa662c6d
-EBUILD upower-pm-utils-0.9.23-r2.ebuild 2558 BLAKE2B ce8967b72559b9fbb9be827ad91f924698801b0408126ba8f45673e83dd5f67da1515b4dccbc55f70e2d6cedc8e3b6e405f666e58f659634e5c4218954cd6888 SHA512 380b6ef1fd19767149649fb03a360c9a254f00d6ccf247699527fb605625a143a61a3dcd9bc3a100402f590043c36004d382f1b07b95cf6ddeb6ffef577b7799
-MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-always_use_pm-utils_backend.patch b/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-always_use_pm-utils_backend.patch
deleted file mode 100644
index b1cb5c7334e0..000000000000
--- a/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-always_use_pm-utils_backend.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Always use the pm-utils backend for now
- Redirecting the suspend / hibernate request to logind requires systemd
- to be running, as logind tries to start the suspend.target /
- hibernate.target via the D-Bus interface provided by systemd.
- The availability of logind does not necessarily imply that systemd is
- available since we made logind D-Bus activatable under sysvinit.
- Also, the systemd version currently in unstable (v44) is too old and
- doesn't provide that functionality yet.
- Ubuntu ships a very basic implementation of that D-Bus inferface in
- systemd-shim which can be run under sysvinit. But we don't have that
- package in Debian (yet).
- For now, it's the safest option to just continue using the old
- pm-utils backend always.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718493
-diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c
-index b9f75f5..595a1b2 100644
---- a/src/linux/up-backend.c
-+++ b/src/linux/up-backend.c
-@@ -51,7 +51,7 @@
- 
- #ifdef ENABLE_DEPRECATED
- 
--#define LOGIND_AVAILABLE() (access("/run/systemd/seats/", F_OK) >= 0)
-+#define LOGIND_AVAILABLE() (FALSE)
- 
- #define SD_HIBERNATE_COMMAND	"gdbus call --system --dest org.freedesktop.login1 --object-path /org/freedesktop/login1 --method org.freedesktop.login1.Manager.Hibernate 'true'"
- #define SD_SUSPEND_COMMAND	"gdbus call --system --dest org.freedesktop.login1 --object-path /org/freedesktop/login1 --method org.freedesktop.login1.Manager.Suspend 'true'"
diff --git a/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-clamp_percentage_for_overfull_batt.patch b/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-clamp_percentage_for_overfull_batt.patch
deleted file mode 100644
index 6e643c42de5e..000000000000
--- a/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-clamp_percentage_for_overfull_batt.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From b8fe9902f3c6c50ca6a23e24fcea99582beebc65 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martinpitt@gnome.org>
-Date: Tue, 22 Oct 2013 08:02:51 +0000
-Subject: linux: Clamp percentage for overfull batteries
-
-Some batteries report energy > energy_full and a percentage ("capacity"
-attribute) > 100%. Clamp these within 0 and 100% for both plausibility as well
-as to avoid setting an out-of-range property which would then become 0%.
-
-https://launchpad.net/bugs/1240673
----
-diff --git a/src/linux/integration-test b/src/linux/integration-test
-index 8489bf3..4be1922 100755
---- a/src/linux/integration-test
-+++ b/src/linux/integration-test
-@@ -442,6 +442,39 @@ class Tests(unittest.TestCase):
-         self.assertEqual(self.get_dbus_property('OnLowBattery'), False)
-         self.stop_daemon()
- 
-+    def test_battery_overfull(self):
-+        '''battery which reports a > 100% percentage for a full battery'''
-+
-+        self.testbed.add_device('power_supply', 'BAT0', None,
-+                                ['type', 'Battery',
-+                                 'present', '1',
-+                                 'status', 'Full',
-+                                 'current_now', '1000',
-+                                 'charge_now', '11000000',
-+                                 'charge_full', '10000000',
-+                                 'charge_full_design', '11000000',
-+                                 'capacity', '110',
-+                                 'voltage_now', '12000000'], [])
-+
-+        self.start_daemon()
-+        devs = self.proxy.EnumerateDevices()
-+        self.assertEqual(len(devs), 1)
-+        bat0_up = devs[0]
-+
-+        # should clamp percentage
-+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Percentage'), 100.0)
-+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'IsPresent'), True)
-+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'State'),
-+                         UP_DEVICE_STATE_FULLY_CHARGED)
-+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Energy'), 132.0)
-+        # should adjust EnergyFull to reality, not what the battery claims
-+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFull'), 132.0)
-+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFullDesign'), 132.0)
-+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Voltage'), 12.0)
-+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'PowerSupply'), True)
-+        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Type'), 2)
-+        self.stop_daemon()
-+
-     def test_battery_temperature(self):
-         '''battery which reports temperature'''
- 
-diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c
-index 8020277..b953d65 100644
---- a/src/linux/up-device-supply.c
-+++ b/src/linux/up-device-supply.c
-@@ -708,6 +708,10 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply)
- 	/* get a precise percentage */
-         if (sysfs_file_exists (native_path, "capacity")) {
- 		percentage = sysfs_get_double (native_path, "capacity");
-+		if (percentage < 0.0f)
-+			percentage = 0.0f;
-+		if (percentage > 100.0f)
-+			percentage = 100.0f;
-                 /* for devices which provide capacity, but not {energy,charge}_now */
-                 if (energy < 0.1f && energy_full > 0.0f)
-                     energy = energy_full * percentage / 100;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-create-dir-runtime.patch b/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-create-dir-runtime.patch
deleted file mode 100644
index 34340d44ec30..000000000000
--- a/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-create-dir-runtime.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b9cff29978113aefe3ad18521f383f12ab099a34 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimo@endlessm.com>
-Date: Tue, 25 Feb 2014 09:43:04 +0000
-Subject: Create the history directory at runtime
-
-In addition to build time - this increases compatibilty with OSTree,
-which starts out with an empty /var.
-
-Signed-off-by: Richard Hughes <richard@hughsie.com>
----
-diff --git a/src/up-history.c b/src/up-history.c
-index f9d0fdf..795b093 100644
---- a/src/up-history.c
-+++ b/src/up-history.c
-@@ -414,6 +414,7 @@ up_history_set_directory (UpHistory *history, const gchar *dir)
- {
- 	g_free (history->priv->dir);
- 	history->priv->dir = g_strdup (dir);
-+	g_mkdir_with_parents (dir, 0755);
- }
- 
- /**
-@@ -887,7 +888,8 @@ up_history_init (UpHistory *history)
- 	history->priv->data_time_full = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
- 	history->priv->data_time_empty = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
- 	history->priv->max_data_age = UP_HISTORY_DEFAULT_MAX_DATA_AGE;
--	history->priv->dir = g_build_filename (HISTORY_DIR, NULL);
-+
-+	up_history_set_directory (history, HISTORY_DIR);
- }
- 
- /**
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-fix-segfault.patch b/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-fix-segfault.patch
deleted file mode 100644
index 3e8976320777..000000000000
--- a/sys-power/upower-pm-utils/files/upower-pm-utils-0.9.23-fix-segfault.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0d64bbddaa0078ef148d609a3cfad854cf00d7de Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martinpitt@gnome.org>
-Date: Fri, 08 Nov 2013 13:59:50 +0000
-Subject: lib: Fix segfault on getting property when daemon is not running
-
-This fixes "upower --version" when the daemon is not running, and thus the
-client proxy is NULL.
----
-diff --git a/libupower-glib/up-client.c b/libupower-glib/up-client.c
-index 35d7b5d..17fb02d 100644
---- a/libupower-glib/up-client.c
-+++ b/libupower-glib/up-client.c
-@@ -322,6 +322,9 @@ up_client_get_property (GObject *object,
- 	UpClient *client;
- 	client = UP_CLIENT (object);
- 
-+	if (client->priv->proxy == NULL)
-+                return;
-+
- 	switch (prop_id) {
- 	case PROP_DAEMON_VERSION:
- 		g_value_set_string (value, up_client_glue_get_daemon_version (client->priv->proxy));
---
-cgit v0.9.0.2-2-gbebe
diff --git a/sys-power/upower-pm-utils/metadata.xml b/sys-power/upower-pm-utils/metadata.xml
deleted file mode 100644
index 95e86c12108a..000000000000
--- a/sys-power/upower-pm-utils/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>freedesktop-bugs@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/sys-power/upower-pm-utils/upower-pm-utils-0.9.23-r2.ebuild b/sys-power/upower-pm-utils/upower-pm-utils-0.9.23-r2.ebuild
deleted file mode 100644
index 6359e7400a38..000000000000
--- a/sys-power/upower-pm-utils/upower-pm-utils-0.9.23-r2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd
-
-DESCRIPTION="The upstream upower 0.9 git branch for use with sys-power/pm-utils"
-HOMEPAGE="https://upower.freedesktop.org/"
-SRC_URI="https://upower.freedesktop.org/releases/upower-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="+introspection ios kernel_FreeBSD kernel_linux"
-
-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/libgudev:=
-		virtual/udev
-		ios? (
-			>=app-pda/libimobiledevice-1:=
-			>=app-pda/libplist-1:=
-			)
-		)
-	!sys-power/upower"
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( >=sys-power/pm-utils-1.4.1-r2 )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	dev-util/intltool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig"
-
-QA_MULTILIB_PATHS="usr/lib/upower/.*"
-
-DOCS="AUTHORS HACKING NEWS README"
-
-S=${WORKDIR}/upower-${PV}
-
-src_prepare() {
-	sed -i -e '/DISABLE_DEPRECATED/d' configure || die
-
-	# https://bugs.freedesktop.org/show_bug.cgi?id=79565
-	# https://bugzilla.xfce.org/show_bug.cgi?id=10931
-	# Same effect as Debian -no_deprecation_define.patch, they patch .h, we patch .pc
-	sed -i -e 's|Cflags: |&-DUPOWER_ENABLE_DEPRECATED |' upower-glib.pc.in || die
-
-	# From upstream 0.9 git branch:
-	epatch \
-		"${FILESDIR}"/${P}-create-dir-runtime.patch \
-		"${FILESDIR}"/${P}-fix-segfault.patch \
-		"${FILESDIR}"/${P}-clamp_percentage_for_overfull_batt.patch
-
-	# From Debian:
-	epatch "${FILESDIR}"/${P}-always_use_pm-utils_backend.patch
-}
-
-src_configure() {
-	local backend myconf
-
-	if use kernel_linux; then
-		backend=linux
-		myconf="--enable-deprecated"
-	elif use kernel_FreeBSD; then
-		backend=freebsd
-	else
-		backend=dummy
-	fi
-
-	econf \
-		--libexecdir="${EPREFIX}"/usr/lib/upower \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable introspection) \
-		--disable-static \
-		${myconf} \
-		--enable-man-pages \
-		--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() {
-	default
-
-	# https://bugs.gentoo.org/487400
-	insinto /usr/share/doc/${PF}/html/UPower
-	doins doc/html/*
-	dosym /usr/share/doc/${PF}/html/UPower /usr/share/gtk-doc/html/UPower
-
-	keepdir /var/lib/upower #383091
-	prune_libtool_files
-}