gentoo resync : 16.06.2018

5 files changed, 32 insertions, 35 deletions

diff --git a/sys-power/powerstat/Manifest b/sys-power/powerstat/Manifest
index f229904683d1..9c96d003a3b1 100644
--- a/sys-power/powerstat/Manifest
+++ b/sys-power/powerstat/Manifest
@@ -1,8 +1,7 @@
-DIST powerstat-0.02.11.tar.gz 57173 BLAKE2B 3a019a5aedb82ec68b9649e8ca0f491a2928883f8162f6d6ceb36d449a4c5123b3506f841ce840b58d94504a7780f44896122939b2f9c9eadd8137872027218d SHA512 ec1a00c0496997410d8a5d07e572d37ce1d7eee0fc37a6d9fdbcd9bf8bebe74cbde1f53d9b55d9bae48e8e1bc44ff61f29fed195d69499a8eed8007b67eacbe6
-DIST powerstat-0.02.14.tar.gz 58433 BLAKE2B 3deb345ca469e80eac340fe171024df23cc10d33416766686fc399571ac04e696a576e9e1a0e1e3e5b3fa493d560019ca5861b2a5cc68019415b5508568a0200 SHA512 58ffdea7c4eb4b0888b75560b0fe348e5551ac1582f525f38fbe6c8cbcdbf14eccfdbde0a95cdd139ee5dc2e834245ce691a8dbba736739898930959526f6bf9
+AUX powerstat-0.02.17-makefile.patch 432 BLAKE2B d917331055d4c33df53e926ad7aa0fb8aec2d45d5d1f80f7dee4ac67ba351f8d5602304ac9d750c182b84ead33cea9a92cecc36bad1f1b1b1ae076461866c05f SHA512 f9da9311295b420bf1101a1a19aaa23617368319b7d825667195d66965ad292b111a2c8779d4a0183e9c1693892d848b686a53a1eb377e61b87f91eb597d71c8
 DIST powerstat-0.02.15.tar.gz 58529 BLAKE2B f5429392fbb6f3b42b2bef5ff3218adb8b421bae055a302b00ee26aaaf219eca561a39238150786de94f6b74110ce7df1318e784a80c1caa903a2d7758dc5625 SHA512 15fdcee2ffecf7ceb6895a9fcd74ce30708c40cdb35e5e15de2b3c0d39b63b3500862a7117b08ce0f388372aace849aa5f8343d97c2315ec19e499cb5d76e204
-EBUILD powerstat-0.02.11.ebuild 459 BLAKE2B 9c8f80b8958b8a2a5de6c1e08015f94369e64dd15bb876cedb379a63b3b3c441818de1dd6c023f85cdd9cff24db7ff86ece3dee6a7523b23a7d18d2507bc2c64 SHA512 2ef250750c3f9cd1c655ea2cae92c8f89b2fd20d5d8cd08c711faad2eba26c9df196f86818b02da103bbee13e96e22d4aff0bd0e60ef3227a6c60cf787492461
-EBUILD powerstat-0.02.14.ebuild 459 BLAKE2B a915f5373b04953c575ff321c2334f458bf51ce7e4842891e86d9293338f399ab0ed16ceeb89a889685c2060af2d8fe4538149aebeb3e9fcce1ec6ce2b643419 SHA512 e2b655308006e62b610566396c2bec028790ec1f3bb25a99eb088e33cdf3c28c73a7bae8785eaef6f76f1fb331761badad6f8d780e8aa60e76660592d3e4ec2b
+DIST powerstat-0.02.17.tar.gz 58854 BLAKE2B c8459c410de2311fa409e80b2395958c9080e7b9991a9c39818fa60ad420039415b70dc891fdd293f0952f3228a9766cb237d6c98b85b7feb78c717958e83b82 SHA512 fa6ee1da5f75b0415f3e495dfd8db0ea416493c1ddb7d0a079c8136220c609207001c66dfedf624c8675b9ba12a25698e59154ae62b2647403a2447522f68f11
 EBUILD powerstat-0.02.15.ebuild 459 BLAKE2B a915f5373b04953c575ff321c2334f458bf51ce7e4842891e86d9293338f399ab0ed16ceeb89a889685c2060af2d8fe4538149aebeb3e9fcce1ec6ce2b643419 SHA512 e2b655308006e62b610566396c2bec028790ec1f3bb25a99eb088e33cdf3c28c73a7bae8785eaef6f76f1fb331761badad6f8d780e8aa60e76660592d3e4ec2b
-EBUILD powerstat-9999.ebuild 488 BLAKE2B 8b80e62f9822e4905129ccce9baa26851706a7ecb8d8e012b2cb91121f6f1069f6934488f7a1f37307058e888665b424dcaa39e61f9a8adb272e57d8029e5513 SHA512 04f9b7e14c48f66315145485819fa09091fe0fb0d81559258be8f89dab1a52642f93689fdb0805dea30c36dba282128a9f0b0a3fd413e9fc4a464d676ee265f0
+EBUILD powerstat-0.02.17.ebuild 544 BLAKE2B 2e254b84fb5fc7b931ae2dc2529442994c9f74d79aa25026d8e7e3873d12fb38edff0b109ec6a64f38aa6fae5dc7b613fbd0c9104e5317e1810e58b326bf59d1 SHA512 a4e3eb59a3542457e6c42ee1eb3ed8a34b5d270e3ec7346d555a2769f9b6f344724ff7857825a68651ca85473dde1ecf86aad9d7041cc4c577636a156a880057
+EBUILD powerstat-9999.ebuild 534 BLAKE2B 64f7af80b27ce9233766d6772def12720f29d0c6bef7d531e7b99e0520ddc9203c70fd38704e23ce7fac35ce3bb2bf7ff852c9b0608c03aeab7de8c98ec0d700 SHA512 bd722e97c60b9e1c15c3587b1952c311c74cf95b063dfae0a6d2bf6bc59ce4bbb0b0695c9d03d7b255f5de9d631efd4f70c467c3969eeed0155e950bcf3f5f6a
 MISC metadata.xml 858 BLAKE2B 75ca9db98e72e80d14d2f17970fe65183bca67ff52fa19e61101de1cad8bd8c5119b9cfe3286a67282c5cbdcdfe821b627dbffee7a04ceae0a158f2fb3f50462 SHA512 59311c93c878c4dd09141428ccfb72fa030b72538978ddd2b44c505c0e083a5a0dfe017c865dfaff27fdd3edf3abb9a78fd938e2e0d32ff92fa121ad27a84f1f
diff --git a/sys-power/powerstat/files/powerstat-0.02.17-makefile.patch b/sys-power/powerstat/files/powerstat-0.02.17-makefile.patch
new file mode 100644
index 000000000000..1134a814d027
--- /dev/null
+++ b/sys-power/powerstat/files/powerstat-0.02.17-makefile.patch
@@ -0,0 +1,13 @@
+--- a/Makefile	2018-06-11 07:57:10.308456253 +0300
++++ b/Makefile	2018-06-11 07:57:51.277432564 +0300
+@@ -51,8 +51,8 @@
+ 	rm -f powerstat powerstat.o powerstat.8.gz
+ 	rm -f powerstat-$(VERSION).tar.gz
+ 
+-install: powerstat powerstat.8.gz
++install: powerstat
+ 	mkdir -p ${DESTDIR}${BINDIR}
+ 	cp powerstat ${DESTDIR}${BINDIR}
+ 	mkdir -p ${DESTDIR}${MANDIR}
+-	cp powerstat.8.gz ${DESTDIR}${MANDIR}
++	cp powerstat.8 ${DESTDIR}${MANDIR}
diff --git a/sys-power/powerstat/powerstat-0.02.11.ebuild b/sys-power/powerstat/powerstat-0.02.11.ebuild
deleted file mode 100644
index 4a5df3b62e40..000000000000
--- a/sys-power/powerstat/powerstat-0.02.11.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 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.14.ebuild b/sys-power/powerstat/powerstat-0.02.17.ebuild
index 2d3546fc1d32..4d2dc7ae7ca7 100644
--- a/sys-power/powerstat/powerstat-0.02.14.ebuild
+++ b/sys-power/powerstat/powerstat-0.02.17.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
 DESCRIPTION="Laptop power measuring tool"
-HOMEPAGE="https://launchpad.net/ubuntu/+source/${PN} https://github.com/ColinIanKing/${PN}"
+HOMEPAGE="https://launchpad.net/ubuntu/+source/powerstat https://github.com/ColinIanKing/powerstat"
 SRC_URI="https://github.com/ColinIanKing/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
@@ -14,6 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+# Don't compress manpages
+PATCHES=( "${FILESDIR}"/"${P}"-makefile.patch )
+
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
diff --git a/sys-power/powerstat/powerstat-9999.ebuild b/sys-power/powerstat/powerstat-9999.ebuild
index a9c566f33fbd..502040bb982d 100644
--- a/sys-power/powerstat/powerstat-9999.ebuild
+++ b/sys-power/powerstat/powerstat-9999.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/ColinIanKing/${PN}.git"
 
 inherit git-r3 toolchain-funcs
 
 DESCRIPTION="Laptop power measuring tool"
-EGIT_REPO_URI=(
-	"git://kernel.ubuntu.com/cking/${PN}.git"
-	"https://github.com/ColinIanKing/${PN}.git"
-	)
-HOMEPAGE="https://launchpad.net/ubuntu/+source/${PN} https://github.com/ColinIanKing/${PN}"
+HOMEPAGE="https://launchpad.net/ubuntu/+source/powerstat https://github.com/ColinIanKing/powerstat"
 SRC_URI=""
 
 LICENSE="GPL-2+"
@@ -18,6 +16,9 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
+# Don't compress manpages
+PATCHES=( "${FILESDIR}"/"${PN}"-0.02.17-makefile.patch )
+
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }