gentoo resync : 15.12.2019

3 files changed, 52 insertions, 17 deletions

diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index ad73064e1ed8..d935068509a3 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,11 +1,13 @@
-DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
 DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
 DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
 DIST cfe-9.0.0.src.tar.xz 13533024 BLAKE2B 61fa57245d54930d09c2ff6024cdefb35592f7d1c644657b0aec9e7cc2dca29b45f08b8a2b716812025a438841e83ac3e30bb6f051498aa860533995ef7757b1 SHA512 83fcca5499102b375e620cdac97d75e6111ebed4ef10240859ddd8a88bc5b022703739d2eae0d8693c91892ad11fc6b531c0dbee62fbce68d3be595b94f0b1fe
+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 clang-python-10.0.0.9999.ebuild 911 BLAKE2B 2be001063777b7960f8a65a96713d2e00b488c6786ff22f99d92607e2cec095d6655d969dfb035f50097044c72b445bf4ae6358fa5a0c33eb55c17f4d8fa53ab SHA512 28cf60ca9bb4b3973dae96063bfa276a56b78649667b450b20c86e1e4ec28738da150df5a2b4285396ee224028dd971fcc2e4e7d457ea3181e35a3bb3d5e3b94
-EBUILD clang-python-6.0.1.ebuild 1078 BLAKE2B 3027d387be07aa59fa005e3c78713396efad35c6c4d3f1f4ec78094b7bee22639cf15da7198be16f51077c8c09f89ca7c15500e21182bc89f106d26bb31bd28d SHA512 0aa123fa8a2dc91c5233646620e992d129c631f08064a3b57a358bfa13808ff26d922c70c84265bdb7119ef2364c17742b5ddfd424a9ee167deb0e408ffebdc5
 EBUILD clang-python-7.1.0.ebuild 1087 BLAKE2B 83371e8a63b5345c34a0ada6e669576305ada918be395a7335fac384f3ec7bed0c7087b520b96386e154625972ee303bf8349e8e4da1bc76c5c8839fc8b828a7 SHA512 d8af70530cb8caeaacae8a319474c30681398c083916970e2038bc8f2c480777f745dfea80e9480668d5d2bc480ab6a2b96dd16a2fc04a1feea75ec83f69cf59
 EBUILD clang-python-8.0.1.ebuild 1120 BLAKE2B 525bf364a9900da246a411be0027efa4cc40a8cba995f1eb9979107cfb0973115d944d3528c5e25e30425c6858960eb7cf3678494459f1120ace43b5307acaff SHA512 7861dfa4221d5c9bc676e451053712f162df04509602077756f8232429de9be9d5dd8d57136b309b73b4868b192602e86ed4ab1b7329d2d7cb83a170106ef93c
 EBUILD clang-python-9.0.0.ebuild 934 BLAKE2B cef82e98f864bda0e1ca61c477f448b10ddcd3ed15b1bc7854c81201e451b7400629684dfde3a1637961392c4dea53d7cbe769949daf1617ed25333f1f0e8d60 SHA512 cdc01e1c56bef9b6727985c7b72b8cd10188315393e494366ae49fe255033e247e962c140320d5a40736496b3a14580550b4ee3935a94a26d58256e0d1e76417
 EBUILD clang-python-9.0.1.9999.ebuild 911 BLAKE2B 2be001063777b7960f8a65a96713d2e00b488c6786ff22f99d92607e2cec095d6655d969dfb035f50097044c72b445bf4ae6358fa5a0c33eb55c17f4d8fa53ab SHA512 28cf60ca9bb4b3973dae96063bfa276a56b78649667b450b20c86e1e4ec28738da150df5a2b4285396ee224028dd971fcc2e4e7d457ea3181e35a3bb3d5e3b94
+EBUILD clang-python-9.0.1_rc2.ebuild 934 BLAKE2B cef82e98f864bda0e1ca61c477f448b10ddcd3ed15b1bc7854c81201e451b7400629684dfde3a1637961392c4dea53d7cbe769949daf1617ed25333f1f0e8d60 SHA512 cdc01e1c56bef9b6727985c7b72b8cd10188315393e494366ae49fe255033e247e962c140320d5a40736496b3a14580550b4ee3935a94a26d58256e0d1e76417
+EBUILD clang-python-9.0.1_rc3.ebuild 934 BLAKE2B cef82e98f864bda0e1ca61c477f448b10ddcd3ed15b1bc7854c81201e451b7400629684dfde3a1637961392c4dea53d7cbe769949daf1617ed25333f1f0e8d60 SHA512 cdc01e1c56bef9b6727985c7b72b8cd10188315393e494366ae49fe255033e247e962c140320d5a40736496b3a14580550b4ee3935a94a26d58256e0d1e76417
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-6.0.1.ebuild b/dev-python/clang-python/clang-python-9.0.1_rc2.ebuild
index 97dca0c2affd..6796e58d1b11 100644
--- a/dev-python/clang-python/clang-python-6.0.1.ebuild
+++ b/dev-python/clang-python/clang-python-9.0.1_rc2.ebuild
@@ -1,22 +1,22 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit python-r1
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+inherit llvm.org python-r1
 
-MY_P=cfe-${PV/_/}.src
 DESCRIPTION="Python bindings for sys-devel/clang"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz"
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
 
-LICENSE="UoI-NCSA"
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
-RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
 
 # The module is opening libclang.so directly, and doing some blasphemy
 # on top of it.
@@ -27,13 +27,6 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}/bindings/python
-
-src_unpack() {
-	einfo "Unpacking parts of ${MY_P}.tar.xz ..."
-	tar -xJf "${DISTDIR}/${MY_P}.tar.xz" "${MY_P}/bindings/python" || die
-}
-
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/clang-python/clang-python-9.0.1_rc3.ebuild b/dev-python/clang-python/clang-python-9.0.1_rc3.ebuild
new file mode 100644
index 000000000000..6796e58d1b11
--- /dev/null
+++ b/dev-python/clang-python/clang-python-9.0.1_rc3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}