gentoo resync : 21.06.2020

3 files changed, 12 insertions, 45 deletions

diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index e2d356e9bbbb..bc5ec177e1b2 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -1,10 +1,8 @@
 AUX opencl-clang-8.0.0-clang_library_dir.patch 468 BLAKE2B 09315ce9250920caf8c84853a5cf08506b01d91f7c993273be910b38f9c97f1f31e1042d75a111734eaa86fad771bed5b09c6c9001e253c71f26bd7c1e668dcd SHA512 c5a715c05c7bc7b904a46cac8d6a10f161da6d978401c5c60853a19dfb63c65690994bdc57fe327ee36bb5b6151a0018d6931c38553917f2dc82e9cef44e0b0d
+DIST opencl-clang-10.0.0.1.tar.gz 23549 BLAKE2B 8663da4525507862835ebc14fb4666d9f2f3cca0a2c08aadfc2875bc285e604e81b21ccc7476976eea2e3eb1ce88ae7b187c2d0ce085fc3ede1a2dbfea0789eb SHA512 406e27d90ae26a2f8ade04172bf680f8786011c7e8357a40b15c8bbfd933d0f1c5e0c114e371036318439fcab999ec5f141dab2df4b498eb9d2548bf175f8502
 DIST opencl-clang-8.0.1.1.tar.gz 42534 BLAKE2B e0dc6a4cc6f738f0f5cecfa9ef5b2c219dc1f1714cb5ff2dbf0d7a9ff9efe4cdd4ce0b3780f0ca53f9582b0b73b2cbfad28a9ddec76ef8f6978ee31fa3ee111c SHA512 8456a99668f7709d601ab49c6f8219a1de74363f270e606b5832cb13f196d65b6fe6cb961430b3f45875fec49a2f06c178e935cf3d1b118d033583d90611df15
-DIST opencl-clang-8.0.1_p20191001.tar.gz 41402 BLAKE2B 0ab3cc4f84a9e3e599d4e0995f219b94761b882a6290d9c1e399bf820074b72daab935a9d48d09d3e02d1b46659fc8c00613f35e88f0231234e31f93ca6e4d7a SHA512 87f3855bd2cc9a416f317afc98ad7cd1cfcb5bf4b2ebf7401837c1734b1c8d10e07843aab78735bf48888523b231db1911014a6468c0b4c461c43a5434a31ada
-DIST opencl-clang-9.0.0.tar.gz 23345 BLAKE2B adbce64efb2c1e4e96d4aff585c0f18bd06036a60b35164681b9f5b4a6c89933e5428e9959ddd3cec89b93a5c350e6b0f9b15b8be2be42cd520ca55852352df5 SHA512 126974d816e7f2a90ddb2faa4e8e95841d8ae15f24e77013ca8894ce75ad5079ffe942fb40731030363a10e470e66f2ad1794c2fe31aee6f8608304b492b30eb
 DIST opencl-clang-9.0.1.tar.gz 24574 BLAKE2B 2e3b69c10b572678f91e92fa0ca885dd9332d172c483c394f4c1b140a5fd926b26eff4d4ab722733e1e164ff99a6eb397b8bc9e30a0b7e289506432fd1291b2b SHA512 01c5011dc1ea66288f3e425f85c921142fd3bc5a3d79eeafe5c14b5741b8281f17727cbffa7ed31869f7704be957d2fed5e5e8a57ab31e7b8c3a9688f048cced
+EBUILD opencl-clang-10.0.0.1.ebuild 925 BLAKE2B f6e350c58f52b4c2a007d83f6471c6b36d7a2a9886ad35c4363b97f7fe6f8e637b82950240f99220b81ee88816c5568e06350598a6cea51f297625370b452a8a SHA512 9113a60cb3f1ee68381d9f3257115f0b285c6c378903c7c16320db38831ed6deaad960ae79f61f80bda6a7be6e9f36f27b23cf0f65edc3fc535cd3159a85b6df
 EBUILD opencl-clang-8.0.1.1.ebuild 921 BLAKE2B 8b2cf2b0c8bfe1b61bf1ffa4be24b19a136379e84243123239b2b701da9d3c65790cc331e979e64e8dddaa81b79cd25b701d23f6db6d8d1df9986b176e52df8b SHA512 bbf66ab48750c3f3bc6f4ed3209dd4e11d1fc7f6d45ff5b67a55e5670ea91420e19b02420b86e08a20162c826a2b613613df3311bf95591c438089156adf1f98
-EBUILD opencl-clang-8.0.1_p20191001-r1.ebuild 913 BLAKE2B 812cdfd7ca1d00e2fe0e6456260723ba6a242abc84c3bfc737f56961c94ebdd805091503e21efe05cf00d3e6d3de58744ca2fb52a4205a0e56085423b209b349 SHA512 123e5cafa2491543016f850e941da71c7a0b8e3d75c6371ba4707f7a2f81abd7bdf230613538ba5acc94105d5647a6e44207060230775732ba03bb8f9b78c444
-EBUILD opencl-clang-9.0.0.ebuild 849 BLAKE2B ff47beb350350bae14ebcc1ead16831bed53855064681f3c43ff946cce77cd14117a97637f3bb7c18e9e3b3d6f91f7c9665eb9ea7927befa2cf01bdda3e6f667 SHA512 6176a5dfbd614ac9466b618ca50e4a4385097d2bb8520b85809327cc7caff722509c587532ac969883bb1deee24bdad96b1e07cb17131cd34ce4070eaff6a9ac
 EBUILD opencl-clang-9.0.1.ebuild 849 BLAKE2B ff47beb350350bae14ebcc1ead16831bed53855064681f3c43ff946cce77cd14117a97637f3bb7c18e9e3b3d6f91f7c9665eb9ea7927befa2cf01bdda3e6f667 SHA512 6176a5dfbd614ac9466b618ca50e4a4385097d2bb8520b85809327cc7caff722509c587532ac969883bb1deee24bdad96b1e07cb17131cd34ce4070eaff6a9ac
 MISC metadata.xml 329 BLAKE2B d50cf1fac225c2240bd4af19962089d9b7446549d9cc7067d860218e76013acfbc65f40abfffded01c098b06dd4c8a5688c94e40710ecdf6e7db71e05816498d SHA512 de4a3177f7091c00cd54f5eb52d8d88ae88d207ca72acd71c824220593d27ebdbf3673459ab48440373af19eb88603a5fcdd5956597d816927c9663be177eccb
diff --git a/dev-libs/opencl-clang/opencl-clang-9.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild
index 076afad8c68a..d09e936af38b 100644
--- a/dev-libs/opencl-clang/opencl-clang-9.0.0.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-10.0.0.1.ebuild
@@ -6,21 +6,26 @@ EAPI=7
 CMAKE_ECLASS=cmake
 inherit cmake-multilib llvm
 
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
 DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
 HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/intel/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="UoI-NCSA"
-SLOT="9"
+SLOT="10"
 KEYWORDS="~amd64"
 
+S="${WORKDIR}/${MY_P}"
+
 BDEPEND="dev-vcs/git"
-COMMON="sys-devel/clang:9=[static-analyzer,${MULTILIB_USEDEP}]"
+COMMON="sys-devel/clang:10=[static-analyzer,${MULTILIB_USEDEP}]"
 DEPEND="${COMMON}
-	dev-util/spirv-llvm-translator:9=[${MULTILIB_USEDEP}]"
+	dev-util/spirv-llvm-translator:10=[${MULTILIB_USEDEP}]"
 RDEPEND="${COMMON}"
 
-LLVM_MAX_SLOT=9
+LLVM_MAX_SLOT=10
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
diff --git a/dev-libs/opencl-clang/opencl-clang-8.0.1_p20191001-r1.ebuild b/dev-libs/opencl-clang/opencl-clang-8.0.1_p20191001-r1.ebuild
deleted file mode 100644
index 616cb77c650d..000000000000
--- a/dev-libs/opencl-clang/opencl-clang-8.0.1_p20191001-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib llvm vcs-snapshot
-
-EGIT_COMMIT="94af090661d7c953c516c97a25ed053c744a0737"
-
-DESCRIPTION="OpenCL-oriented thin wrapper library around clang"
-HOMEPAGE="https://github.com/intel/opencl-clang"
-SRC_URI="https://github.com/intel/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="8"
-KEYWORDS="~amd64"
-
-BDEPEND="dev-vcs/git"
-COMMON="sys-devel/clang:8=[static-analyzer,${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}
-	dev-util/spirv-llvm-translator:8=[${MULTILIB_USEDEP}]"
-RDEPEND="${COMMON}"
-
-LLVM_MAX_SLOT=8
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang
-	)
-	cmake-utils_src_configure
-}