gentoo resync : 13.10.2019

4 files changed, 6 insertions, 27 deletions

diff --git a/sys-power/powerstat/Manifest b/sys-power/powerstat/Manifest
index f2680d2d94ca..0f6739c16687 100644
--- a/sys-power/powerstat/Manifest
+++ b/sys-power/powerstat/Manifest
@@ -1,9 +1,7 @@
 AUX powerstat-0.02.17-makefile.patch 432 BLAKE2B d917331055d4c33df53e926ad7aa0fb8aec2d45d5d1f80f7dee4ac67ba351f8d5602304ac9d750c182b84ead33cea9a92cecc36bad1f1b1b1ae076461866c05f SHA512 f9da9311295b420bf1101a1a19aaa23617368319b7d825667195d66965ad292b111a2c8779d4a0183e9c1693892d848b686a53a1eb377e61b87f91eb597d71c8
-DIST powerstat-0.02.15.tar.gz 58529 BLAKE2B f5429392fbb6f3b42b2bef5ff3218adb8b421bae055a302b00ee26aaaf219eca561a39238150786de94f6b74110ce7df1318e784a80c1caa903a2d7758dc5625 SHA512 15fdcee2ffecf7ceb6895a9fcd74ce30708c40cdb35e5e15de2b3c0d39b63b3500862a7117b08ce0f388372aace849aa5f8343d97c2315ec19e499cb5d76e204
-DIST powerstat-0.02.17.tar.gz 58854 BLAKE2B c8459c410de2311fa409e80b2395958c9080e7b9991a9c39818fa60ad420039415b70dc891fdd293f0952f3228a9766cb237d6c98b85b7feb78c717958e83b82 SHA512 fa6ee1da5f75b0415f3e495dfd8db0ea416493c1ddb7d0a079c8136220c609207001c66dfedf624c8675b9ba12a25698e59154ae62b2647403a2447522f68f11
 DIST powerstat-0.02.18.tar.gz 59205 BLAKE2B 80230b0571b0920d68ed0148220d0b50c84dece6a24c11d866a885c63da336d5a632119a667a3348dcc8b6f62ed98a5785ad91120a3ee9d98ddd0dbb5952aaea SHA512 2634ae760d2cd68f71d315033d53bcda843b977bfe34190f792a5937a29dc4b6d220b91bd3b538be75394c8ba9b5a8d883e3d99ea8b840abf4106880da7a1404
-EBUILD powerstat-0.02.15.ebuild 459 BLAKE2B a915f5373b04953c575ff321c2334f458bf51ce7e4842891e86d9293338f399ab0ed16ceeb89a889685c2060af2d8fe4538149aebeb3e9fcce1ec6ce2b643419 SHA512 e2b655308006e62b610566396c2bec028790ec1f3bb25a99eb088e33cdf3c28c73a7bae8785eaef6f76f1fb331761badad6f8d780e8aa60e76660592d3e4ec2b
-EBUILD powerstat-0.02.17.ebuild 544 BLAKE2B 2e254b84fb5fc7b931ae2dc2529442994c9f74d79aa25026d8e7e3873d12fb38edff0b109ec6a64f38aa6fae5dc7b613fbd0c9104e5317e1810e58b326bf59d1 SHA512 a4e3eb59a3542457e6c42ee1eb3ed8a34b5d270e3ec7346d555a2769f9b6f344724ff7857825a68651ca85473dde1ecf86aad9d7041cc4c577636a156a880057
+DIST powerstat-0.02.20.tar.gz 59127 BLAKE2B 893637b3b2ebb2969dcea34a02ff9c90aa1d08b2bb5fafcb80b6d41520e03b5696acc6020a337afaac676eb29e48e5449f718a40d88535d114766d77f70f6fca SHA512 1bfe33cb06d4647c8552ee4b85e12f55475b3a0aa77aaa9cbd72ba11c9c67bb087d64dbda2b6362fb60440e30060e670eb6ba4b7f164f7ab306320994e54fabe
 EBUILD powerstat-0.02.18.ebuild 553 BLAKE2B 17bf6c3d17e60e5bf12dbc0b6803aedbeb1bbc30b154ae39dbe70c3f73b622494d409f56977cb9fd1fad8e9b0e9e46ca90ef7f736b1e0dbb34e48baa3bb066de SHA512 4496f0de0283beeffab6c6fbfb1a8ecccd5cf09e22bed6e5f1e4dba049cb22cc5efa28f7a7322e7bd5164e7e22a18f6c49c2664cfadeda946dff68b1e5bdbc27
-EBUILD powerstat-9999.ebuild 534 BLAKE2B 64f7af80b27ce9233766d6772def12720f29d0c6bef7d531e7b99e0520ddc9203c70fd38704e23ce7fac35ce3bb2bf7ff852c9b0608c03aeab7de8c98ec0d700 SHA512 bd722e97c60b9e1c15c3587b1952c311c74cf95b063dfae0a6d2bf6bc59ce4bbb0b0695c9d03d7b255f5de9d631efd4f70c467c3969eeed0155e950bcf3f5f6a
+EBUILD powerstat-0.02.20.ebuild 550 BLAKE2B ed53a9fc2ad8a40eb4f45c9a19dfda3a77701d4c28c1bfa8ab004488c6fc20613587ec438b35b6f98bb51d8ae54086d4165ec34158ae6a6a0176620d95f25fc9 SHA512 e02f7061f81f66901cd5a388dc319dae9ee66dec404c68b0382f83b858db6e0b505d78f3ae0adaf2575048345b07f208e076cbcd6f9ff3ddd30f6b27cb6d1491
+EBUILD powerstat-9999.ebuild 531 BLAKE2B 2fc562f4da1d7a9261fbb429eac189375d7047296b6fd33f1c3596f32034b7e0457f5fbd60f3f33303d091fd4f82d5b177b1c4938012cfdf8148c1235079d61a SHA512 dd7e7f083efc2775ffa29e5ec1cf2b362f3d9949cbd565e5c07d8337d4a3eb29c24e13e8883d0a48089ae923cf29e62d8848d1621c4004ea490740daebcc8eb0
 MISC metadata.xml 858 BLAKE2B 75ca9db98e72e80d14d2f17970fe65183bca67ff52fa19e61101de1cad8bd8c5119b9cfe3286a67282c5cbdcdfe821b627dbffee7a04ceae0a158f2fb3f50462 SHA512 59311c93c878c4dd09141428ccfb72fa030b72538978ddd2b44c505c0e083a5a0dfe017c865dfaff27fdd3edf3abb9a78fd938e2e0d32ff92fa121ad27a84f1f
diff --git a/sys-power/powerstat/powerstat-0.02.15.ebuild b/sys-power/powerstat/powerstat-0.02.15.ebuild
deleted file mode 100644
index 2d3546fc1d32..000000000000
--- a/sys-power/powerstat/powerstat-0.02.15.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Laptop power measuring tool"
-HOMEPAGE="https://launchpad.net/ubuntu/+source/${PN} https://github.com/ColinIanKing/${PN}"
-SRC_URI="https://github.com/ColinIanKing/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
diff --git a/sys-power/powerstat/powerstat-0.02.17.ebuild b/sys-power/powerstat/powerstat-0.02.20.ebuild
index 4d2dc7ae7ca7..9a3027b8978c 100644
--- a/sys-power/powerstat/powerstat-0.02.17.ebuild
+++ b/sys-power/powerstat/powerstat-0.02.20.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
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # Don't compress manpages
-PATCHES=( "${FILESDIR}"/"${P}"-makefile.patch )
+PATCHES=( "${FILESDIR}"/"${PN}"-0.02.17-makefile.patch )
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/sys-power/powerstat/powerstat-9999.ebuild b/sys-power/powerstat/powerstat-9999.ebuild
index 502040bb982d..d86952ed42b3 100644
--- a/sys-power/powerstat/powerstat-9999.ebuild
+++ b/sys-power/powerstat/powerstat-9999.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