gentoo resync : 15.12.2019

3 files changed, 46 insertions, 17 deletions

diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 1901901216d3..c25b851baa04 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,11 +1,13 @@
-DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
+DIST llvmorg-9.0.1-rc2.tar.gz 113203311 BLAKE2B 6e426060853e1587febedb75189444a1451236b713f800a4f3401c54318e48b0f5e0c484e9e4ef261faceed9b43b445a4153b061d4dadcc617047f9320b4f56a SHA512 fececd9365645920b9afdad1e94d5e10553ad4a39d84b3ac811b86014c395d51f7e4dabe54bb095a99481400c408bee3c9a2044168724d5e094e3258587a5d2c
+DIST llvmorg-9.0.1-rc3.tar.gz 113205740 BLAKE2B 3ca81e812833ecc2ac1bacfdeb86f54609ee125ba7390ce6af0113e949496149102360f35a9a0194dff93fb5cb6ade40a68382a03a7e55771a13198abb7ca9de SHA512 ea56a4ee57aacdd00a1d6551cdc768ecce3124a0eb6a9d09fe060bb147019a5119b2a9eaca576474be42e0296293daa923edd86dadb6759df0c2d7fc7a74f9f1
 EBUILD lit-10.0.0.9999.ebuild 855 BLAKE2B 32e8b55977e5d42881f642b7d128722d2c21a59db6e32d7354aab3f105f82a27cf8edab2fc4d8e077209e35429d3091a14aa56a5799efb7a62aaa35b9d74ab43 SHA512 94e8a5836d4cce671eaf2e134c55b45fdc2c145210a099dc414a92a576859f220a9a382e59c332450470f19f519651d55b61ef8810ad04efc09de7ea83bcd6e1
-EBUILD lit-6.0.1.ebuild 997 BLAKE2B 349be0629cdc02423e53e52f6e8e7263816cbf20b0bec4d69841a692b469d6bef5b17392cfb0a7da8834ec61327b7a052c58270133be07b1c48ef2d8854aa7d9 SHA512 0a2489e5e3d775d775dceeaed033e548e812cc85e4a1dd4d285c2d4412adc9e54c6d799f162ca09e45a3a72e7eee655cd84436b300eab5d036f17448e82e35e0
 EBUILD lit-7.1.0.ebuild 999 BLAKE2B 5d7693a688e541e9fb1a3c52e167735609d437fb2d44eb786a86cbdf9ef3af04df8c4bdbab1eab5f0249df4526a104fa51cae0b0c024662351f8d628751d8faf SHA512 7793ebc3556515dc17b565676f635d5bd779efcd0dfa990d34b3dc13b985413c8849bf52ac557c54ad636aef53d6f7b96723171c45cba1231b1174bbe15bb525
 EBUILD lit-8.0.1.ebuild 1031 BLAKE2B c5816f6a860b375e39a77d5f48bc3deb816ddbafed895e18b2bdb889fcd6a167295e3592a32645cd22527bbad6a459657f5f462ef6121bc20090698364320e35 SHA512 41482666f2a13b4b98494694b262f3c93aa5779c14d8872d9b5ff3e2d3bdfd45779caed986be5e06bf5b5baf7d8b585a46273ba290493d9cae8c7430ca6cf26d
 EBUILD lit-9.0.0.ebuild 885 BLAKE2B a8b1c3602c32f580835a435425984837adf00be61f65a6c1c60a709299aab54bd338ddbf4be3e11b3488f9425efb28139eba772da2ea5f792aa3bf1de2cd97fd SHA512 bb970e0376858268c43ffb9f4ee7acd22e90b44468390b88cd090334aacf9cce81d7456003077eae178fe5f035da28480625defff1f7c5db594cbf7406977891
 EBUILD lit-9.0.1.9999.ebuild 855 BLAKE2B 32e8b55977e5d42881f642b7d128722d2c21a59db6e32d7354aab3f105f82a27cf8edab2fc4d8e077209e35429d3091a14aa56a5799efb7a62aaa35b9d74ab43 SHA512 94e8a5836d4cce671eaf2e134c55b45fdc2c145210a099dc414a92a576859f220a9a382e59c332450470f19f519651d55b61ef8810ad04efc09de7ea83bcd6e1
+EBUILD lit-9.0.1_rc2.ebuild 885 BLAKE2B a8b1c3602c32f580835a435425984837adf00be61f65a6c1c60a709299aab54bd338ddbf4be3e11b3488f9425efb28139eba772da2ea5f792aa3bf1de2cd97fd SHA512 bb970e0376858268c43ffb9f4ee7acd22e90b44468390b88cd090334aacf9cce81d7456003077eae178fe5f035da28480625defff1f7c5db594cbf7406977891
+EBUILD lit-9.0.1_rc3.ebuild 885 BLAKE2B a8b1c3602c32f580835a435425984837adf00be61f65a6c1c60a709299aab54bd338ddbf4be3e11b3488f9425efb28139eba772da2ea5f792aa3bf1de2cd97fd SHA512 bb970e0376858268c43ffb9f4ee7acd22e90b44468390b88cd090334aacf9cce81d7456003077eae178fe5f035da28480625defff1f7c5db594cbf7406977891
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-6.0.1.ebuild b/dev-python/lit/lit-9.0.1_rc2.ebuild
index 5997bff15b07..cbc3d5b9e6dd 100644
--- a/dev-python/lit/lit-6.0.1.ebuild
+++ b/dev-python/lit/lit-9.0.1_rc2.ebuild
@@ -1,26 +1,24 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit distutils-r1 multiprocessing
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1 llvm.org multiprocessing
 
-MY_P=llvm-${PV/_/}.src
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
 
-LICENSE="UoI-NCSA"
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-S=${WORKDIR}/${MY_P}/utils/lit
-
 # Tests require 'FileCheck' and 'not' utilities (from llvm)
-DEPEND="
+BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/psutil[${PYTHON_USEDEP}]
@@ -28,12 +26,8 @@ DEPEND="
 
 # TODO: move the manpage generation here (from sys-devel/llvm)
 
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/utils/lit" || die
-}
-
 python_test() {
+	local -x LIT_PRESERVES_TMP=1
 	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
 		-vv tests || die
 }
diff --git a/dev-python/lit/lit-9.0.1_rc3.ebuild b/dev-python/lit/lit-9.0.1_rc3.ebuild
new file mode 100644
index 000000000000..cbc3d5b9e6dd
--- /dev/null
+++ b/dev-python/lit/lit-9.0.1_rc3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1 llvm.org multiprocessing
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
+		-vv tests || die
+}