gentoo resync : 30.09.2018

4 files changed, 22 insertions, 160 deletions

diff --git a/sys-power/iasl/Manifest b/sys-power/iasl/Manifest
index 8eb2c4121655..ec5c66e37dc8 100644
--- a/sys-power/iasl/Manifest
+++ b/sys-power/iasl/Manifest
@@ -1,19 +1,15 @@
-AUX iasl-20120816-locale.patch 503 BLAKE2B 1fa9d0cb764087d97ecbc6c8c88d93c6b97dc90e0075d8b5742e5724403aba29f1a5bf43bec1268642dfd563c310c736f56e9c020c184691f59010fd66e0c560 SHA512 88012cf788d3ceb319f75834c96a0dbad7cf3db20229616ed7cd19f04903561085086a81adc02eab99aba5d22e215373b5302edc77313e8684a3ec8d4f9ea3a7
 AUX iasl-20140214-nostrip.patch 253 BLAKE2B 744ae94cdf798b4d0b593de3e69d408c61b720aebfd385aa2e22929530a8ef84aba92b4484fd2c35cb5c51e15e75e4d8bafcf3c9339b63ca54746db1c30835ad SHA512 1379fa71c03d880b53ed1ed34ec925d5e94fe6f636f86cfdbb5a1e65a1c6a82fb99a42b991be154c018da9eaaa70c7443fa4b5ca38eb03fe5cec4f0de1dd6364
 AUX iasl-20140828-locale.patch 349 BLAKE2B b435e40f257103acfaa8f74c8dd5ed66850ce53e3c7577ce59e1773b738dfaff89c58dbdb4517a0213b9b8c1ab4cbdcdf78e2dbe3c0a4857cf4f91b437b23cb9 SHA512 311c20b7d5cdc7e3ce5e2a84e508eb898cd506efa720d1e4bb017ff0b34d786ffed30168b7dcf16b4bee988702d00258289e5e320e0a3bb3cf630a1a71145640
-DIST acpica-unix-20121018.tar.gz 1272523 BLAKE2B 882d540bbfabc790dbdf13af819d8389a6b19de9d88686afb9093723c6cc99ed138e1379531df1a6cca1f7a11746bb8a4da7e3a4bf4dce1d6474c85ea59ba761 SHA512 32824579dccb9d5ba39a895a7905d746d61e2b0d19dcb215aba28e7d976e090d798af2361d474ee0b103a47776d00a6f44128a75a13b1bafb02e86364255523a
-DIST acpica-unix-20140828.tar.gz 1423788 BLAKE2B b694daafe34832ca8d14710b8c92066b9e29006d71b2789854714d9bfe60850349156c711746583cfedb8408b67e42accc6330d0896f66eab636244351eebbf1 SHA512 ab4cb8ba74c5abf05913b6ef39955698f2bb5c243f723d660bd8f9c397fcf2a959d5ec10326a699c53e05319a428e721f1d65a07249574200af3227676725398
 DIST acpica-unix-20160729.tar.gz 1556095 BLAKE2B 2785d343d7aa0e3cce83d762bb70f8a7e76221da5d0e803eac3253b4a26dcaf852e114eadf811f387c7c040aeeb794de8cae37c47d8c29968f8cd0a0d76ed4b6 SHA512 37b0439b03e8d811c8b14d0c7c89471989227fb78b462f585c6290431afecc5b258073e568dde8dc982fa959ebce4b4d51589ea997f0066e66d4785ce185ccf2
 DIST acpica-unix-20161222.tar.gz 1580428 BLAKE2B dcf44d1a19b51e43ad1a74b2ba5b4bfadeb83eca584ff5a5062aff9cc4b0a65153b1590d993b7bca602e35da747683d230ea56c380afbec3308fb83fdb03908a SHA512 ff733d210b3b013970d3f3a0bea45f346ca5cf78dd61b583d30114a69c80e8272af304d14248aa34e775e19bca1c2ddbbed1b4ba5e8ba660b28621a8ca45ae31
 DIST acpica-unix-20171215.tar.gz 1769116 BLAKE2B f15c1202244ce5f489d80240e6c89f7fda38a3c74cf0773c4530e265876f931502571e3086aabae0082654a2085f3d6e5eeed324fd892c199a91a8837fdb19e2 SHA512 4cd3755fe28344de3259dad5209a58c9548216ecaf50a830165a0ee8993af57d4b63836904faafd5f97b1651051ee2f17a908395e0a048bab20b13395fe0d3ff
-DIST acpitests-unix-20121018.tar.gz 1978548 BLAKE2B 9a2d0c8cacffb509400bf272608c2f4adc9dd7f884f59d6b43927cc3f67d996a789eae2a34215c4b9608498b193b82422ed144723fde2a9c101f73a6e3c68e9c SHA512 4c565b9c3af3122f5acfd802e6467124071f45987db0e5d5b9bf87a2d82e433cd6bd1b6faed71dbe6b01694c0f79b390f220515cf287519588ccae71ebafe798
-DIST acpitests-unix-20140828.tar.gz 2008060 BLAKE2B 9bde05aeec61db9d89ac29cb361e5cbf0f6b71501e6f3fd2a7f138be1f8936858d86cdfd9df4d8c3f08efe2e593791f58f1a8a79538f66c23ec599199bb204d9 SHA512 7c3d36c9c1054a56f9b473cd0204062d7ac93b66e1f4d448575182ac3fb0a819506701306be406dd7b8385d37c6f77d7bc4dadc57f6743203ac1bee36a975be5
+DIST acpica-unix-20180810.tar.gz 1797634 BLAKE2B 66b1c53874a7fa898fb042d0aac6001e623bb056ef17de46fc5a8e3ee5667178c47b5d8ecec194ebd8d2b0bdf947b5c85a1874c5d11a9ba3307a85418856ebdb SHA512 f37d8e0f1393b87cbfd9c6607104b05f85386583e4e5a5bcdbd2f049c122592a53e7cd56fe7da75e93bf3a424921fbc9291e7a39e06de80e6403abe042f869cd
 DIST acpitests-unix-20160729.tar.gz 1829061 BLAKE2B 8dacb39c477ff8ba8b68a3f061b74e90a128a90eb287b9febd57d6871ff0878dfe2eaf616d9881af2b0bca6c8db57d48711ad9009c6ceb1ceba321bed182a51c SHA512 bf6073092a0dfb208f1d4b13ff3a3c5335be8e1326b1e58acd41def1a402ab0d843600f616019d1dde6593db8c53c6876bd9d489360fe98c6a7bee95d9215600
 DIST acpitests-unix-20161222.tar.gz 1759278 BLAKE2B cb1b3ea882135e9ee87c4337df4710ac2e613b89f2606306c3ce68af049735f999ae6a37b1f75c112f0fb5f8bc5af6897bf18715f657c8dcac82a37637da2a57 SHA512 ff0435f40564a94ceb3bc6cfc11ac859a5467b650004238092d7f3e2f7d596e7eb2fb9d3c56f0860c8324d38fcbedf3c6f4bc3f0569f1148462b824c7c025408
 DIST acpitests-unix-20171215.tar.gz 2034932 BLAKE2B c36aaf6a8a7aadf54651f95486af918926b664069ed961993c3ee8a062a646a7bd4e40adeebe82a101a5997080b90762fa016724ed4be31af56086eb3c3b3ab9 SHA512 b405e87f18b15bd01540d32c021a7b900139abd7e698b55786ccbaf8536c5068087a8ba1e7adbb69e0954cdc6b347e9a88428f1e8f889e0e9eb3a472c11235f9
-EBUILD iasl-20121018.ebuild 3546 BLAKE2B 916c263b5e3e1f931658b22340662b05fe667dbd543f47e7474b73f4b3888724744ea2023cc84fa1314041fad8ca0b2c23fd48a794e87c458e17206c42d67521 SHA512 2063c817ffd03a7e884738fb93e0860a83a43b1ceedc321bf2257f02d5638e444e49f8b77f2a64c545ff01972daeea9195d33f02e2b409dfae511dbacc8ae057
-EBUILD iasl-20140828.ebuild 3361 BLAKE2B c444493ee3a168fb1f182183f7d81fbe9a430020048052aa5fbb98d25410e5a487dcc06012730e6a93276835b2e42bac4e8ee8b113af4a7470fd542ea89a2f99 SHA512 2e81b1cec125ca70777b514702f2f3ca4a6246b758404dccc3b999e91c4f7054b5a25be76280245320c662213a58387a09ce2c6ea06d8db00ed3f44a768f1dd5
+DIST acpitests-unix-20180810.tar.gz 2093850 BLAKE2B 519ce7807026dc11617ed9c34f294600ddae77a57a1fb76220da50da1bee56975373d583d51dfcdd81c8ccba3d5e735167b831bdb4669ab9cb2a1d9753d9261d SHA512 36c2527e8d670ccfb9a537b4944cfb8432c9638c1427e3c59f614c2ca43a66089228ecb74392301a07f266870e2d79bf0e2c671c6c7af06a4683bf97ac01ba54
 EBUILD iasl-20160729.ebuild 3387 BLAKE2B 3caecded7550e0240e4a1ba5936f41475aad9221579bf2abb4e5a12088b3452aea512a718048015b820b5e4d4ac05bf4fab5b1ce0b81db34472e906364cda9a8 SHA512 5ec2719cf0f45344613cb0b5d5fee9e551ada4d44c8e65ef5bc7b241fa49bf910fe711abbf5e1f6a8d136f3aeb182430e8362e519091eac2acc520fc1c93c0ba
 EBUILD iasl-20161222.ebuild 3397 BLAKE2B 26d33dc795ac4c8c72b2bfcb4156ed42ae558f0599993de169a6a814a509e5c59fb7ff10cb95e5874f70e057b35588e639dd46bac6eb25a2097d426cced797e1 SHA512 a4c870fe8f286888c18642889d02873c90b966519902a29036fec7b1b772c0ca5e947317eae9a659d0fcfd50c457ae87bb32d04c8c35077efc573a7c58634430
 EBUILD iasl-20171215.ebuild 3397 BLAKE2B 26d33dc795ac4c8c72b2bfcb4156ed42ae558f0599993de169a6a814a509e5c59fb7ff10cb95e5874f70e057b35588e639dd46bac6eb25a2097d426cced797e1 SHA512 a4c870fe8f286888c18642889d02873c90b966519902a29036fec7b1b772c0ca5e947317eae9a659d0fcfd50c457ae87bb32d04c8c35077efc573a7c58634430
+EBUILD iasl-20180810.ebuild 3381 BLAKE2B ec55712dba0ce5e8d7b16a8bf23fe74e7f5fbcd155beae88464fddd8f7101651bf054c871640d817bd7b91dcfd8584f47dae4d2ba8b0f78ed2133716147ef732 SHA512 81fab08f17bf94e647f4f0758991ba17327910590dac721bb0d6f25926c346f6650e22b0946ad99523df16955e0b22fcbd0e0510e96ce90142ad6be8c2a63beb
 MISC metadata.xml 330 BLAKE2B 4c0218788685cc36fddf5d759c091898a71c01bf22e9e7995d1f5da37cd0508c961895b4265bda462062676f3e722205f0a6b10f64db718110f7afe8f088d136 SHA512 4d7760ec82f64ce49478c359b32aa100ca9778471033741b7fd89905d075b3a067fda413c6dcc5115d7755d0ab6cd9d30a848ff674f1c83ef6205c51ec501a65
diff --git a/sys-power/iasl/files/iasl-20120816-locale.patch b/sys-power/iasl/files/iasl-20120816-locale.patch
deleted file mode 100644
index 425513342105..000000000000
--- a/sys-power/iasl/files/iasl-20120816-locale.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nuar acpica-unix-20120816.orig/generate/unix/Makefile.config acpica-unix-20120816/generate/unix/Makefile.config
---- acpica-unix-20120816.orig/generate/unix/Makefile.config	2012-08-16 15:51:15.000000000 +0000
-+++ acpica-unix-20120816/generate/unix/Makefile.config	2012-09-07 18:31:41.887229126 +0000
-@@ -161,9 +161,9 @@
- #YACC=      byacc
- #YFLAGS +=  -v -d
- #
--YACC=       bison
-+YACC=       LC_ALL=C bison
- YFLAGS +=   -v -d -y
- 
--LEX=        flex
-+LEX=        LC_ALL=C flex
- LFLAGS +=   -i -s
- 
diff --git a/sys-power/iasl/iasl-20121018.ebuild b/sys-power/iasl/iasl-20121018.ebuild
deleted file mode 100644
index 0f20cc66bf6c..000000000000
--- a/sys-power/iasl/iasl-20121018.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs flag-o-matic eutils
-
-MY_PN=acpica-unix
-MY_P=${MY_PN}-${PV}
-MY_TESTS_P=${MY_PN/ca/tests}-${PV}
-DESCRIPTION="Intel ACPI Source Language (ASL) compiler"
-HOMEPAGE="https://www.acpica.org/downloads/"
-SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
-	test? ( http://www.acpica.org/sites/acpica/files/${MY_TESTS_P}.tar.gz )"
-
-LICENSE="iASL"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="test"
-
-DEPEND="sys-devel/bison
-	sys-devel/flex"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	if use test && has test ${FEATURES}; then
-		ewarn 'You have selected USE="test". This will install the test results'
-		ewarn "into /usr/share/${PF}/, compressed as a tarball."
-		ewarn 'The tests themselves will only rarely die, but the test results'
-		ewarn 'are interesting for arch testing. The tests may take quite some'
-		ewarn 'time to complete.'
-	fi
-}
-
-src_prepare() {
-	#epatch "${FILESDIR}/${PN}-20110922-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-20120816-locale.patch"
-	# Upstream has changed the buildsystem a lot, not sure if these are still
-	# needed
-	#epatch "${FILESDIR}/${PN}-20120816-parallelmake-001.patch"
-	#epatch "${FILESDIR}/${PN}-20110922-parallelmake-002.patch"
-	#epatch "${FILESDIR}/${PN}-20110922-parallelmake-003.patch"
-
-	find "${S}" -type f -name 'Makefile*' -print0 | \
-		xargs -0 -I '{}' \
-		sed -r -e 's:-\<Werror\>::g' -i '{}' \
-		|| die
-
-	export BITS=64
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	cd acpica/generate/unix
-	emake BITS=${BITS}
-}
-
-src_test() {
-	aslts_test
-	#aapits_test
-	#The aapits test currently fails, missing include probably.
-}
-
-src_install() {
-	cd acpica/generate/unix
-	emake install DESTDIR="${D}" BITS=${BITS}
-	default_src_install
-	#local bin
-	#for bin in $(<"${T}"/binlist) ; do
-	#	dobin "${T}"/${bin}
-	#done
-	dodoc "${S}"/changes.txt
-	newdoc "${S}"/source/compiler/readme.txt compiler-readme.txt
-	newdoc "${S}"/generate/unix/readme.txt unix-readme.txt
-	newdoc "${S}"/generate/lint/readme.txt lint-readme.txt
-	newdoc "${S}"/source/compiler/new_table.txt compiler-new_table.txt
-
-	if use test && has test ${FEATURES}; then
-		tb="${T}"/testresults.tar.bz2
-		export ASLTSDIR="$(<"${T}"/asltdir)"
-		ebegin "Creating Test Tarball"
-		tar -cjf "${tb}" -C "${ASLTSDIR}"/tmp/RESULTS .  || die "tar failed"
-		eend $?
-		dodir /usr/share/${PF}
-		insinto /usr/share/${PF}
-		doins ${tb} || die "doins testresults.tar.bz2 failed"
-	fi
-
-}
-
-aslts_test() {
-	export	ASL="${S}"/generate/unix/bin${BITS}/iasl \
-		acpiexec="${S}"/generate/unix/bin${BITS}/acpiexec \
-		ASLTSDIR="${WORKDIR}/${MY_TESTS_P}"/tests/aslts
-	export	PATH="${PATH}:${ASLTSDIR}/bin"
-	echo "$ASLTSDIR" >"${T}"/asltdir
-	cd "${ASLTSDIR}"
-	edos2unix $(find . -type 'f')
-	make install || die "make install aslts test failed"
-	chmod +x $(find bin/ ! -regex 'ERROR_OPCODES|HOW_TO_USE|README' ) || die "chmod bin +x failed"
-
-	#The below Do commands runs the tests twice and then dies if the results aren't
-	#Identical.
-	Do 1 || die "failed Do 1"
-	Do 2 || die "failed Do 2"
-}
-
-aapits_test() {
-	mv "${WORKDIR}/${MY_TESTS_P}/tests/aapits" "${S}/tools/" || die "mv failed"
-	cd "${S}/tools/aapits" || die "cannot find ${S}/tools/aapits"
-	edos2unix $(find . -type 'f')
-	chmod +x $(find bin/ | sed  -r -e '/\/[A-Z_]+$/d') || die "chmod bin +x failed"
-	make || die "make in aapits failed"
-	cd asl || die "cd asl failed"
-	make || die "make in asl failed"
-	cd ../bin
-	./aapitsrun || die "aapitsrun failed"
-}
diff --git a/sys-power/iasl/iasl-20140828.ebuild b/sys-power/iasl/iasl-20180810.ebuild
index d3b1c1eb1a09..b96e7473a7a7 100644
--- a/sys-power/iasl/iasl-20140828.ebuild
+++ b/sys-power/iasl/iasl-20180810.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit toolchain-funcs flag-o-matic eutils
+inherit toolchain-funcs flag-o-matic
 
 MY_PN=acpica-unix
-MY_P=${MY_PN}-${PV}
-MY_TESTS_P=${MY_PN/ca/tests}-${PV}
+MY_P="${MY_PN}-${PV}"
+MY_TESTS_P="${MY_PN/ca/tests}-${PV}"
 DESCRIPTION="Intel ACPI Source Language (ASL) compiler"
 HOMEPAGE="https://www.acpica.org/downloads/"
 SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
@@ -15,14 +15,14 @@ SRC_URI="http://www.acpica.org/sites/acpica/files/${MY_P}.tar.gz
 
 LICENSE="iASL"
 SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="test"
 
 DEPEND="sys-devel/bison
 	sys-devel/flex"
 RDEPEND=""
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	if use test && has test ${FEATURES}; then
@@ -34,9 +34,13 @@ pkg_setup() {
 	fi
 }
 
+PATCHES=(
+	"${FILESDIR}/${PN}-20140828-locale.patch"
+	"${FILESDIR}/${PN}-20140214-nostrip.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-20140828-locale.patch" \
-		"${FILESDIR}/${PN}-20140214-nostrip.patch"
+	default
 
 	find "${S}" -type f -name 'Makefile*' -print0 | \
 		xargs -0 -I '{}' \
@@ -56,20 +60,20 @@ src_configure() {
 }
 
 src_compile() {
-	cd acpica/generate/unix
+	cd generate/unix || die
 	emake BITS=${BITS}
 }
 
 src_test() {
 	aslts_test
-	#aapits_test
 	#The aapits test currently fails, missing include probably.
+	#aapits_test
 }
 
 src_install() {
-	cd acpica/generate/unix
+	cd generate/unix || die
 	emake install DESTDIR="${D}" BITS=${BITS}
-	default_src_install
+	default
 	#local bin
 	#for bin in $(<"${T}"/binlist) ; do
 	#	dobin "${T}"/${bin}
@@ -99,7 +103,7 @@ aslts_test() {
 		ASLTSDIR="${WORKDIR}/${MY_TESTS_P}"/tests/aslts
 	export	PATH="${PATH}:${ASLTSDIR}/bin"
 	echo "$ASLTSDIR" >"${T}"/asltdir
-	cd "${ASLTSDIR}"
+	cd "${ASLTSDIR}" || die
 	edos2unix $(find . -type 'f')
 	make install || die "make install aslts test failed"
 	chmod +x $(find bin/ ! -regex 'ERROR_OPCODES|HOW_TO_USE|README' ) || die "chmod bin +x failed"
@@ -118,6 +122,6 @@ aapits_test() {
 	make || die "make in aapits failed"
 	cd asl || die "cd asl failed"
 	make || die "make in asl failed"
-	cd ../bin
+	cd ../bin || die
 	./aapitsrun || die "aapitsrun failed"
 }