gentoo resync : 22.10.2018

5 files changed, 6 insertions, 12 deletions

diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 7535e20273e7..cb1a48924247 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,4 +1,4 @@
-AUX 9999/0001-python-tests-Update-test_code_completion.patch 1807 BLAKE2B 4c1dbeb485af50ed09453c3c19a2efe45e866dc53efe9fe7332b6fe2d8e885dc2af95ececeebb9f3c8aeb6ae95f360ef4b76bd767b5e4988e16a664445f11263 SHA512 c58e860bc4a7d60491db5d25102c645e8b9d9ba1347d131f6dc1ac721d8cbf70b7999709ccbb889232eca5ea59f638c4e3b6cae2bd829754d5d7d87c6e5facbc
+AUX 7.0.0/0001-python-tests-Update-test_code_completion.patch 1807 BLAKE2B 4c1dbeb485af50ed09453c3c19a2efe45e866dc53efe9fe7332b6fe2d8e885dc2af95ececeebb9f3c8aeb6ae95f360ef4b76bd767b5e4988e16a664445f11263 SHA512 c58e860bc4a7d60491db5d25102c645e8b9d9ba1347d131f6dc1ac721d8cbf70b7999709ccbb889232eca5ea59f638c4e3b6cae2bd829754d5d7d87c6e5facbc
 DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d6ad24ff439a983f629711b4513b9c4bee4070f8df13b6b2a52d673b0706733a4c151ce5021a0233147debff14ac SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964
 DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252e6175c9da55a0519c4f9b8192e32e215110d7d3808225786e2c7f906f2dfbe11dd09bdf21574e99709ae237ed0b SHA512 9931afceb5569ad6caec85d506180c810f7fea94af8c997143b0a37cbf413fcea0d92520478610627eeee1efb65fde684066ace0dfcbbf7b61ecd709d22dd0b1
 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
@@ -6,7 +6,7 @@ DIST cfe-7.0.0.src.tar.xz 12541904 BLAKE2B 92ecfcb37e7efb4f3dde275e7a087a52f1ddc
 EBUILD clang-python-4.0.1.ebuild 864 BLAKE2B 40d3452c9f28d5c154a51258a764bc380addf20f8fb71e8f5e3d9a0fb60822d805df009f58f24457b834870a07abe365bcb6d3ed6557713282129992c1ae1d84 SHA512 d2900dfa55a69965e146800f097f8be256d022aca8d85f54db205f75b30cf72015d27c4e8f4981725d50c7a1c2a14c15454f009b2d8a3636103d6d133b0a2324
 EBUILD clang-python-5.0.2.ebuild 1079 BLAKE2B deb802fba226c098e138775a71fb5a492625ddb681b920b4ecc0aec30306087136ea5ab2f8d7bc36cc4c8474f44e67bfd637f90cd78ae7e1c85719f1a14be5aa SHA512 bf34b1c9b9b43fcda7d3a350e8d664355056b634b65f7741538d8f1eabe7556a46063df7340706f4fe2e0708b0cb4a34c85ce609149ab4f15d64478964622176
 EBUILD clang-python-6.0.1.ebuild 1097 BLAKE2B c1af92b85dbe2d5060fea49d3352c8151058b8f86c478c347842a1e46255f313a4ad0985b13543e34bba2214f0b17fde35a449779cccf41367a2b1776b6ed130 SHA512 d88877fc98ee9c631d7139e734a87d0a3f998963951602d5e1717b6158b2caaf79fcac4fa699a35131aa58885c3d01a8eb9106183118fc9a4783164e3be1be49
-EBUILD clang-python-7.0.0.ebuild 1277 BLAKE2B dfb603b473855cc6ac4ac0f8edd0a689a8d8f10d5131fa286f24100cd483043f4bbcf72ed2b2d3d8364fbb94f45758c3401d0468eda150370064c6b8a6034662 SHA512 0e261d1d3cb6a683e9ec254f4c95b47afcd34c9499d0922e581dc7707d6beb63ff76e075e9ea1eaffd51aa3dbf6e1a8da742fe9e256de834a34792a98b3f561c
-EBUILD clang-python-7.0.9999.ebuild 1235 BLAKE2B 7d203e547693c00763be1542721f005d4bd5ca70a0cc1345509e3112b4a3fde2aa17aa250bd256e68f38c5657b2a060ed8606c42203dba500e6d43fb58fa00d1 SHA512 46fbf754690b5aaa8b56ae2a00191681104bd66c45f062b5744fa6eeeb5624c4341d91d256f370339f25ff25c075c3eea737d8b4c163af9b691712e762b09e37
-EBUILD clang-python-9999.ebuild 1210 BLAKE2B 4e9d11a29d220b74ed4526ad72af2524084a0d7c237e1daa403e2236ee2efe2c96484d7d664e159de6fc394b4a477b1208715e3a398ddaca8fbede6997061fcb SHA512 7717ef6fecad0b31cb9c1656e4945dfb8167e679c899d78283c32ab0bd005ef6b54492776d5447937c64f406c10d54a91fb59a6ee19f6d418e00fb9c8797ec4c
+EBUILD clang-python-7.0.0.ebuild 1278 BLAKE2B 0a2585c72ea4677a34886063d389fe11b89c27ca458e7b0814e5f181bb716e1385057e7a4a2b01ff337d98d421c64a04f5aaef805c80f1d0e7f36aa3ff29868c SHA512 7c6158ff08a0f46e3b5bf3aa968be8336c28040e51d1f4d88d68ff05bf8941088f5154595b2e889b668f7060643cd2b98d4e25169ed909e59a9e40007985f5a4
+EBUILD clang-python-7.0.9999.ebuild 1236 BLAKE2B 7ef1a49beda02ec169fb0d85606a91cc422485b06b52f4b63599b9b55303749ace19a5b25e1b95e4afc3f15d44c02b211a805077d20cca102cd76ebfad4858ea SHA512 091742af56e14d2ddb284a1d3fdc126c66fa2f309121be5927bd266e185f840ad19e2e07ca077a10c981e1ca3e342f33d9751386e410ae2951e2c8bdad5b7a5a
+EBUILD clang-python-9999.ebuild 1030 BLAKE2B 4152729630f6822b4a22e1ec754bf99833951c49e94eb55583ea8d3b2dedd957b435dfc3e24bd8adbd9f12a02161fcd5a16962165f9ec592469a4716820332af SHA512 5889e98300f26a540c93017e72b76232b2c9c871be3bb39c248d30a88316d44114fd1d7545acc0963ccdb4d15dc55f70fa8f30825cccfba69b33ef90e3d73401
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-7.0.0.ebuild b/dev-python/clang-python/clang-python-7.0.0.ebuild
index 6587ca010e17..cb4c02ae7491 100644
--- a/dev-python/clang-python/clang-python-7.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-7.0.0.ebuild
@@ -32,7 +32,7 @@ S=${WORKDIR}/${MY_P}/bindings/python
 PATCHES=(
 	# update completion test results due to completion changes
 	# https://reviews.llvm.org/D50171
-	"${FILESDIR}"/9999/0001-python-tests-Update-test_code_completion.patch
+	"${FILESDIR}"/7.0.0/0001-python-tests-Update-test_code_completion.patch
 )
 
 src_unpack() {
diff --git a/dev-python/clang-python/clang-python-7.0.9999.ebuild b/dev-python/clang-python/clang-python-7.0.9999.ebuild
index 56917d10ff17..ff42c58b9e72 100644
--- a/dev-python/clang-python/clang-python-7.0.9999.ebuild
+++ b/dev-python/clang-python/clang-python-7.0.9999.ebuild
@@ -34,7 +34,7 @@ S=${WORKDIR}/${P}/bindings/python
 PATCHES=(
 	# update completion test results due to completion changes
 	# https://reviews.llvm.org/D50171
-	"${FILESDIR}"/9999/0001-python-tests-Update-test_code_completion.patch
+	"${FILESDIR}"/7.0.0/0001-python-tests-Update-test_code_completion.patch
 )
 
 src_unpack() {
diff --git a/dev-python/clang-python/clang-python-9999.ebuild b/dev-python/clang-python/clang-python-9999.ebuild
index b3138a01e172..cf488945799b 100644
--- a/dev-python/clang-python/clang-python-9999.ebuild
+++ b/dev-python/clang-python/clang-python-9999.ebuild
@@ -30,12 +30,6 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${P}/bindings/python
 
-PATCHES=(
-	# update completion test results due to completion changes
-	# https://reviews.llvm.org/D50171
-	"${FILESDIR}"/9999/0001-python-tests-Update-test_code_completion.patch
-)
-
 src_unpack() {
 	git-r3_fetch
 	git-r3_checkout '' '' '' bindings/python
diff --git a/dev-python/clang-python/files/9999/0001-python-tests-Update-test_code_completion.patch b/dev-python/clang-python/files/7.0.0/0001-python-tests-Update-test_code_completion.patch
index 824da55ca416..824da55ca416 100644
--- a/dev-python/clang-python/files/9999/0001-python-tests-Update-test_code_completion.patch
+++ b/dev-python/clang-python/files/7.0.0/0001-python-tests-Update-test_code_completion.patch