gentoo resync : 08.08.2018

9 files changed, 100 insertions, 9 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 5c9e0ae871ef..91ac34ab009b 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpi_call/Manifest b/sys-power/acpi_call/Manifest
index 32591c3a88bf..f809b132c95e 100644
--- a/sys-power/acpi_call/Manifest
+++ b/sys-power/acpi_call/Manifest
@@ -1,9 +1,13 @@
 AUX acpi_call-1.1.0-linux-3.17.patch 607 BLAKE2B 1b253abd5a3a8124637313ddf44eba179011f96def5a2127b3fd4da0270ccd2c4d55947b8de3c1760b60d7c40797ffc66337b8041ac6bc685d861347c94179c3 SHA512 dec605256d0eab24542e550abec19ba64bc49c58ab84f23593f1cd835cd0db8e2da89fa7020881501ef7a4f4a00dc04c116f77fc70e0c1036554055272ed2137
 AUX acpi_call-1.1.0-linux-4.12.patch 315 BLAKE2B 49c7e3145e367169ac028dbc854659b3f7826eb494e15f54c2432f7d33f7796168145fdeade2051cd450504efd3ca50c6dd6deaee21291e8b97355a9406c299d SHA512 ce8d7c04508eb396c8633376cf21dcbfb9b7ec6110143666300ab66e1d30563b4e687d07a86dfe92566dd8be47ac43f295e7244317bdc12449b6426048edac4f
 AUX acpi_call-1.1.0-linux-4.14.patch 317 BLAKE2B f1d5067511174466d551e9747f7160c12eff6e6a83473c98b51baf80206c2b8e5045ab2c2085451794b8ccc1fe6820c7bfa38de9c280cdb248971f965d64bab8 SHA512 3c823712a59b0bf739fe06cc5dffe6b895ff869dd78457615452a13ef810976a27b7a9ef5bf61189135b8d278e2df340199f36e8016d6e90b040317d468b9b39
+AUX acpi_call-3.17-linux-4.12.patch 256 BLAKE2B ed94570d4e815c92ec5228ef5d6caefe55649902105cf071c4c1c83fa8b2240b9ace2c25c6a66528a50be0998aaf17b16e83a254b87de4b77365497a3f1a2b5d SHA512 49c12db4eefa721599096947faadc48e328f5d3a37eba5ee6f833124e228632e2cc0a871d7ee8427c1e798a1adf67df75674061c2cc6c05ffca1a3b02cffd742
+AUX acpi_call-3.17-linux-4.14.patch 341 BLAKE2B 8402c22a3f016f8b2b00805f6ce1db3b3a6005e4ce83ee43764ef248eaa5b49ba368b9dcb11ca923dd84f1bede7a1c39d64f72a09f882e53d2f3e59c1fa9e1a3 SHA512 d49ab94daf00cad83226060d8b884ba00f1d970fc1f3872ef5f47ef3ff657dc6f4d7d6656b76f8a685f6b865fb1b4d338f96f16cada5672f0e9560d6c0565dab
 DIST acpi_call-1.1.0.tar.gz 10470 BLAKE2B 000c5e6f1eb968bdea3d8dfb6d6bf7b18daffe8baa75ff32e8c6c4b98cafe0a72a67a65a17994a1c8efa16f528bdfbf2b27686a146730c319a5195dfa9ec0d51 SHA512 d5cf13c15f9057e3a27aaacfee6dcdb17b6a79194bdc8fd57b8140c07a532e2e58151bea881aa158c1183ac3bbe89f83fcfc2279ffd9e945a72331b6ddbf2c70
+DIST acpi_call-3.17.tar.gz 10470 BLAKE2B e1a4912f4b92532aa8496e668541975b7e563dfd7613d41f33503d5eecad786b84ba98b205f27c4a4fbd3b37b034a467cf7c9a73f2995539d2117f50751df682 SHA512 39f8f924995ba4e5490e93f03c33db083ced224699b1028102294b2cc99edebd1eea04d33b50beed9dea86939c124682ef8d013c990d5611471b104be3200cb1
 EBUILD acpi_call-1.1.0-r1.ebuild 779 BLAKE2B 7af9e860674878e18d42a2883049b1e9d04c4d627e4a80301a8a22e835fa7b56c10d129a4d5a11722d5a6dcfc931e916bc288f80380af12d9d10309d067d9e03 SHA512 164f8346a983c6b7c525dbc8206d5e0a51f4f3316b4efcd55cca2c884000967e4ea63280e182ca6512b8e69698e6af71f709ad4e3c64d5d7199dbd4b8bdc2245
 EBUILD acpi_call-1.1.0-r2.ebuild 834 BLAKE2B 191fcc7f9a1719a7af02a28891d37c3b4eadb976366e1be691f88e5bc6561a24f1a1f0390cf8fd88191a15e18a19e7356ad57e910b74f99285c9d9483e8858c1 SHA512 033a66d24857d3d833e5ce1f12b643fb781b212b851dce77fbe04e4b321b270ea8d0acbaa3ffdfb50fbbab589b4985ae13a2cdbebee86204f6c76cb5bc944b36
 EBUILD acpi_call-1.1.0.ebuild 710 BLAKE2B 2e1dff96cc5d66ad222f3420fc2407b66f0c4835e012338a053a4c3146197a7bb7352dbf19959f3b990648934706915f1ec0172125d344075a71a6ffafa02249 SHA512 bf3759f82e75bf3f7bdd3d5f208d5f57ebde4a6f1991b1945a6373185ec47c3723fd7edba0f0fa6f18d9e32cd0182996397e3a39dfc3c5387afca32c2f24e206
-EBUILD acpi_call-9999.ebuild 710 BLAKE2B 2e1dff96cc5d66ad222f3420fc2407b66f0c4835e012338a053a4c3146197a7bb7352dbf19959f3b990648934706915f1ec0172125d344075a71a6ffafa02249 SHA512 bf3759f82e75bf3f7bdd3d5f208d5f57ebde4a6f1991b1945a6373185ec47c3723fd7edba0f0fa6f18d9e32cd0182996397e3a39dfc3c5387afca32c2f24e206
-MISC metadata.xml 303 BLAKE2B 730454694f40b9d855afcb26f131e7c2ce833b431b405403ee2aa497347e0706ecaa015aa8dce81ff571ac6edf9331b10a7d0f66d1c4669414b50312985fca58 SHA512 ac96ee0d022c1b7f7e0e2d3823469ab00da1caa680607e634620382f0da3a114ddde2955f1ba173ffb074ccaa90030ee41022273a1f37678ec9ab62f9588b114
+EBUILD acpi_call-3.17.ebuild 750 BLAKE2B dc60fa86a87e64f5ec96a2f81b2495cfc2089add443bd84c27f474bd94c778b77dfdcaa288e5422e28cdf469723e31faf161ca6e2de5a1a81b823a5e4204139d SHA512 2f6b9f80721eda05e8c37673998385a589a3928ff849c9ff09d5668f31db462fe69b13adc216369ecbf3692fb18bb6ed7a0cb81bd43432ee80388e8373c1e272
+EBUILD acpi_call-9999.ebuild 663 BLAKE2B 1df1ee9b55b2bb366d1a483119912920a95c1a0129a594c6f099d689d6208010c5cccf5f40cad24a1a891324fd1893636b1bfb0ae51ebe1d35a105bbf1d99ef8 SHA512 373e465f8eef1c2a06edadd50596d6df26ce0991fa809fc39b31e37a0b4b798a6c604d8096049b4826d126f6c5128e85cbd22667136f18bc4f2d09dbcb73acbf
+MISC metadata.xml 304 BLAKE2B e9ebd649d5b044096dfa71d43332fb12c6577abdff31ae880ab30f7d5bf83e244afa2a57d9ca135b5378dae1c45f7b8422c08caf24e5c0a604f76c3fe1774e01 SHA512 024d05a8863a152a45a50bc42018182781d46b83c0b83dc24f844909432f7a90c2e041a6aca6b57932a773082749639500e6a8a9823fcb64b54705cb753801ce
diff --git a/sys-power/acpi_call/acpi_call-3.17.ebuild b/sys-power/acpi_call/acpi_call-3.17.ebuild
new file mode 100644
index 000000000000..b0d6197ccffa
--- /dev/null
+++ b/sys-power/acpi_call/acpi_call-3.17.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info linux-mod
+
+HOMEPAGE="https://github.com/teleshoes/acpi_call"
+if [ "${PV}" = "9999" ]; then
+	inherit git-r3
+	EGIT_REPO_URI="${HOMEPAGE}.git"
+	KEYWORDS=""
+else
+	inherit vcs-snapshot
+	SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A kernel module that enables you to call ACPI methods"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+CONFIG_CHECK="ACPI"
+MODULE_NAMES="acpi_call(misc:${S})"
+BUILD_TARGETS="default"
+
+PATCHES=(
+	"${FILESDIR}/${P}-linux-4.12.patch"
+	"${FILESDIR}/${P}-linux-4.14.patch"
+)
+
+src_compile(){
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
+	linux-mod_src_compile
+}
diff --git a/sys-power/acpi_call/acpi_call-9999.ebuild b/sys-power/acpi_call/acpi_call-9999.ebuild
index a2501dc4df20..5fe21ce3e3bc 100644
--- a/sys-power/acpi_call/acpi_call-9999.ebuild
+++ b/sys-power/acpi_call/acpi_call-9999.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit linux-info linux-mod
 
+HOMEPAGE="https://github.com/teleshoes/acpi_call"
 if [ "${PV}" = "9999" ]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/mkottman/acpi_call.git"
+	inherit git-r3
+	EGIT_REPO_URI="${HOMEPAGE}.git"
 	KEYWORDS=""
 else
 	inherit vcs-snapshot
-	SRC_URI="https://github.com/mkottman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="A kernel module that enables you to call ACPI methods"
-HOMEPAGE="https://github.com/mkottman/acpi_call"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-power/acpi_call/files/acpi_call-3.17-linux-4.12.patch b/sys-power/acpi_call/files/acpi_call-3.17-linux-4.12.patch
new file mode 100644
index 000000000000..ac64ba5efaf3
--- /dev/null
+++ b/sys-power/acpi_call/files/acpi_call-3.17-linux-4.12.patch
@@ -0,0 +1,12 @@
+diff --git a/acpi_call.c b/acpi_call.c
+index 35bfe12..c059511 100644
+--- a/acpi_call.c
++++ b/acpi_call.c
+@@ -7,6 +7,7 @@
+ #include <linux/proc_fs.h>
+ #include <linux/slab.h>
+ #include <asm/uaccess.h>
++#include <linux/uaccess.h>
+ 
+ MODULE_LICENSE("GPL");
+ 
diff --git a/sys-power/acpi_call/files/acpi_call-3.17-linux-4.14.patch b/sys-power/acpi_call/files/acpi_call-3.17-linux-4.14.patch
new file mode 100644
index 000000000000..ddea4fafc695
--- /dev/null
+++ b/sys-power/acpi_call/files/acpi_call-3.17-linux-4.14.patch
@@ -0,0 +1,14 @@
+diff --git a/acpi_call.c b/acpi_call.c
+index c059511..b622bf7 100644
+--- a/acpi_call.c
++++ b/acpi_call.c
+@@ -6,7 +6,9 @@
+ #include <linux/version.h>
+ #include <linux/proc_fs.h>
+ #include <linux/slab.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
+ #include <asm/uaccess.h>
++#endif
+ #include <linux/uaccess.h>
+ 
+ MODULE_LICENSE("GPL");
diff --git a/sys-power/acpi_call/metadata.xml b/sys-power/acpi_call/metadata.xml
index 3e6c789e7835..64e830cdff96 100644
--- a/sys-power/acpi_call/metadata.xml
+++ b/sys-power/acpi_call/metadata.xml
@@ -5,6 +5,6 @@
 		<email>maksbotan@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">mkottman/acpi_call</remote-id>
+		<remote-id type="github">teleshoes/acpi_call</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-power/powerstat/Manifest b/sys-power/powerstat/Manifest
index 9c96d003a3b1..f2680d2d94ca 100644
--- a/sys-power/powerstat/Manifest
+++ b/sys-power/powerstat/Manifest
@@ -1,7 +1,9 @@
 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
+EBUILD powerstat-0.02.18.ebuild 553 BLAKE2B 17bf6c3d17e60e5bf12dbc0b6803aedbeb1bbc30b154ae39dbe70c3f73b622494d409f56977cb9fd1fad8e9b0e9e46ca90ef7f736b1e0dbb34e48baa3bb066de SHA512 4496f0de0283beeffab6c6fbfb1a8ecccd5cf09e22bed6e5f1e4dba049cb22cc5efa28f7a7322e7bd5164e7e22a18f6c49c2664cfadeda946dff68b1e5bdbc27
 EBUILD powerstat-9999.ebuild 534 BLAKE2B 64f7af80b27ce9233766d6772def12720f29d0c6bef7d531e7b99e0520ddc9203c70fd38704e23ce7fac35ce3bb2bf7ff852c9b0608c03aeab7de8c98ec0d700 SHA512 bd722e97c60b9e1c15c3587b1952c311c74cf95b063dfae0a6d2bf6bc59ce4bbb0b0695c9d03d7b255f5de9d631efd4f70c467c3969eeed0155e950bcf3f5f6a
 MISC metadata.xml 858 BLAKE2B 75ca9db98e72e80d14d2f17970fe65183bca67ff52fa19e61101de1cad8bd8c5119b9cfe3286a67282c5cbdcdfe821b627dbffee7a04ceae0a158f2fb3f50462 SHA512 59311c93c878c4dd09141428ccfb72fa030b72538978ddd2b44c505c0e083a5a0dfe017c865dfaff27fdd3edf3abb9a78fd938e2e0d32ff92fa121ad27a84f1f
diff --git a/sys-power/powerstat/powerstat-0.02.18.ebuild b/sys-power/powerstat/powerstat-0.02.18.ebuild
new file mode 100644
index 000000000000..e521ed728d56
--- /dev/null
+++ b/sys-power/powerstat/powerstat-0.02.18.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Laptop power measuring tool"
+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+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Don't compress manpages
+PATCHES=( "${FILESDIR}"/"${PN}"-0.02.17-makefile.patch )
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}