8 files changed, 90 insertions, 181 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 823c03d7311f..90b2302357c1 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index c3dfa224845e..0ae04f880ba0 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -8,6 +8,7 @@ DIST llvm-project-17.0.0rc1.src.tar.xz 127805900 BLAKE2B ab6e3b7e7af10bbb086bdd2
 DIST llvm-project-17.0.0rc1.src.tar.xz.sig 438 BLAKE2B 976098c616d7f01c08c5be1d76dd395950184d2c6750f3f2c14235cdf446f1d876d842b3591f827cf1157fa25c707862a374e34d61fb73afe5a7b08d6041ee4a SHA512 272e92dec1fd43819f6fafdaa7f55a975e60a1c3000a69875209b89b7f3e2d2851e32ec0f2725242479203068349aaeff8da261d998a2325a9c52733bc5d7697
 DIST llvm-project-17.0.0rc2.src.tar.xz 127795160 BLAKE2B 58ed818f61e1cd179288d578e89460782617a3791a65dbc3e1f207629004f0d61225e87b78fdc0eeb3647912e5056ab68ce35ea2639a34ded1d8bdf0452e31f8 SHA512 7eb5c5172b5e9af65c940c876779f90e20a02659bf1489cedd06c67eea205aa1f4bdc5a8134a120db98cb80ca54673902b530c3315c9b53384c091200d9162c0
 DIST llvm-project-17.0.0rc2.src.tar.xz.sig 438 BLAKE2B 55788eacc592729839dad581b507794f279d84cafcaa49785ae34e02931ee9d4f64caf9e251e280dbc8676f3cacdca52a22f36cf7282655a3fc0721a61c9f003 SHA512 141e1ba7eb9870c21b91060ca484316cc8a402d4e61c8312688023850070b255b0eebe2d10ef63925f7269ee1b347074440e1a9a18d37cb7e1b6c82a7d1a1710
+DIST llvm-project-7d259b36d2e8148d13087844e6494ad3a5c63edf.tar.gz 195942450 BLAKE2B 3221cc070295edf4f70e5b24ed06cda29e8dd98d3d28ba5ac38b821fc313f7f7dfdc7ad500537c2244af0fa3d750174dfa1699db7f72a44df67e5fa255a3d0aa SHA512 9279290ab482f29af4a2205270038f1817608a63872e03340d43c31fcf5da36191269838912a1460455a8661295e664891d6d123018b12ddc80c2641790d0640
 DIST llvm-project-c4bb3e073548cf436d5fa0406e3ae75e94684dec.tar.gz 195462091 BLAKE2B 982f1105db6cf63575916a20432df4c8623bdff236ce3bd95e63ffd931bc8e1f0e9ea9ad673b09d749c35c1bfe68a48f5b4080118f25040498db09a580db3a7e SHA512 1c591175f44da85eb5ee831220c0387a3d9a0604beaf7abd89fbc6d1e0e9c4f80dac73de1dc22375a45115dd4c1d764fed0a0f628993ca780eb6991682aa0b5b
 EBUILD libclc-14.0.6.ebuild 1390 BLAKE2B b355a93d63ee4beb5f3782cda8514aa02f16e71563f66bac6fc7a5e3beae40efa1bdbe098f3d83ce775d0458118f19fceb7225f2b5511823c8e56cabdae4f2d8 SHA512 488e5c278fe4b48ec8ce6ccd76d489cf08251ce6e8f8bd417048a80a10e4a5cf72f20462aa8115f72afe1a40dbee02d936680d516dd1c940fd52fe6f55402e69
 EBUILD libclc-15.0.7.ebuild 1668 BLAKE2B ac2bd589fb3c29662799f97b1f649fd22b1b7ce5701879815bc01a05ae88421a830a6a3507b4dead181f24eb4e45c451e8ea1ebbdac2a2de51ddbc3cd9f53c66 SHA512 a3e39fbaddb322360f6362ef21713f375d04e02b2b9a3d43a3d47b26d5d43643a8c654181aef9518aee5f9805d09c446bbbf13342b74f09622e5e1b0c59470b1
@@ -17,4 +18,5 @@ EBUILD libclc-17.0.0_rc1.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b8
 EBUILD libclc-17.0.0_rc2.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a
 EBUILD libclc-18.0.0.9999.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a
 EBUILD libclc-18.0.0_pre20230803.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a
+EBUILD libclc-18.0.0_pre20230810.ebuild 1727 BLAKE2B 575b735b8bd9a7975b2f672399458a069b840d68b04d4083218e7ea01c65e68bcc6995406a16372b86233c793fe0cbeedc95228bcc9093f1321ac46b5945d3bb SHA512 c5d66b77fd5bfc6e8a8ba672ed9403d048766492143cf41db07abbc2aa57770167f2ed9b935a6c498d6f44fcde666aa35ceaa0f397cba14ad74742dcab81914a
 MISC metadata.xml 362 BLAKE2B 768f93d0058e4da4b420569f3f1771dfa7385ad89540bbc18cf53b5a71e3f060a8afa1112ff37570d7fc9dc3e71619fa3fd8d0cf7b5d3954f5110b19e146df30 SHA512 e6335424da09f668953acd39dcd9b03a30e3b509b34b1de5c72644a3740a5b6b287f10e08405b79bafc8104cc4dc1324b7b9d7990c3b560b0235ae82da8c68a5
diff --git a/dev-libs/libclc/libclc-18.0.0_pre20230810.ebuild b/dev-libs/libclc/libclc-18.0.0_pre20230810.ebuild
new file mode 100644
index 000000000000..117d489acdec
--- /dev/null
+++ b/dev-libs/libclc/libclc-18.0.0_pre20230810.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS=""
+IUSE="+spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+
+LLVM_MAX_SLOT=17
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		(
+			sys-devel/clang:17
+			spirv? ( dev-util/spirv-llvm-translator:17 )
+		)
+		(
+			sys-devel/clang:16
+			spirv? ( dev-util/spirv-llvm-translator:16 )
+		)
+		(
+			sys-devel/clang:15
+			spirv? ( dev-util/spirv-llvm-translator:15 )
+		)
+		(
+			sys-devel/clang:14
+			spirv? ( dev-util/spirv-llvm-translator:14 )
+		)
+		(
+			sys-devel/clang:13
+			spirv? ( dev-util/spirv-llvm-translator:13 )
+		)
+	)
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+llvm_check_deps() {
+	if use spirv; then
+		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
+			return 1
+	fi
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use spirv && libclc_targets+=(
+		"spirv-mesa3d-"
+		"spirv64-mesa3d-"
+	)
+	use video_cards_nvidia && libclc_targets+=(
+		"nvptx--"
+		"nvptx64--"
+		"nvptx--nvidiacl"
+		"nvptx64--nvidiacl"
+	)
+	use video_cards_r600 && libclc_targets+=(
+		"r600--"
+	)
+	use video_cards_radeonsi && libclc_targets+=(
+		"amdgcn--"
+		"amdgcn-mesa-mesa3d"
+		"amdgcn--amdhsa"
+	)
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/openpace/Manifest b/dev-libs/openpace/Manifest
index c34003e0c4ce..5472acf5e994 100644
--- a/dev-libs/openpace/Manifest
+++ b/dev-libs/openpace/Manifest
@@ -1,8 +1,3 @@
-AUX openpace-1.1.2-openssl-3.0-1.patch 630 BLAKE2B abe24552c9a8fb48b20636c7c63b5a9df11536cceadccd73f668daa55522c5dbe6ab3243db3e8d0244ac68bc8ba0482a1716a4ecf9fe5cd20cd9a90133223a1d SHA512 88e36ab11921a44546905dceab5fc8cd500e953f931443c1f645e77446c66d748e03f4758c8077d0644c5a5e6e69ce1ae7be38d2f50c8642fb87b602e43f94a1
-AUX openpace-1.1.2-openssl-3.0-2.patch 2175 BLAKE2B faba644f0c755c265dd0ee6f3aaa1174822bb5d096d8622c7bcd6efce36b850dcd8bff73907b9f9d0fab9b600420fc385f76b3ba957ae9cb869bb7ccecae87f3 SHA512 1e6a9607540c8d20612552c82ba87e72251294196f24b52a1ec1ab8f8b05504486260563d68b8875f731db4eb58f75bf8e511bec473daaf49a43001c6e4fa06d
-AUX openpace-1.1.2-openssl-3.0-3.patch 589 BLAKE2B 7274798a790a266efca33b3c804e8944669974b3216631c0d9b5ea9c142c55b9e1cce56248994e11d3b0fe61765f7c8ef6755550f0cf437d47d6e3f4e5dde30d SHA512 2dce1b61dfdb22947cb64521f61820a4de064e3f143e0fc0b7d1059ec3595e0d674a6fb02234e1856c5a3a29722a52820d8709e7a2b23fd1682d18954e6836da
-DIST openpace-1.1.2.tar.gz 3040254 BLAKE2B 4320b0ec01e80379f8c6b1812af6e7b09a8305a448caf432735554d05380b2f29133e92bffab62ad31077c410eceb5d0c68d65343394ebc24aa92dbefe321549 SHA512 812852300cee2ba021809b6c1caa686ecb7fe3eb23bcc7f4c0ce34258460f685bd70027f62f046643710bc549c0037af80d26d7089dd71341818ec7ec1db8d94
 DIST openpace-1.1.3.tar.gz 3472674 BLAKE2B 1b3785935d51c987f2cdc27126de632296690601d7cd5bce6cbc157e7161d0eff0885081d5da81df5a0cfb0616050bda01b7895d9069f4c2a61871f261b1fd4f SHA512 ae6cde02e49f13070cff83393972a3433303f1372acfde295f86e7049d9e8da9e8e9b74a85374ff99d0c15d9c68d3670fd8badc963232712c5cc27c863eb385f
-EBUILD openpace-1.1.2.ebuild 999 BLAKE2B 06f60f324eea2acb6a4f0027ee6bc4dc214182eac834737d119efe625a57c750a1029a90aa4539475819a3c7b586548737305481cf6d825c068dabdbdce2964d SHA512 35ac92134405a8dec6bbd6caa3e4e8a50cb51fcabd7ad554ae9946b94f8289c840748b49bf77c26ef222fa80c05ff62d1ac626fa8bd1f58eb565a65751e9ccfe
 EBUILD openpace-1.1.3.ebuild 902 BLAKE2B 11cecf46ec65462aa592f77fceda6e003d41b0929e2baf44cc50801aac58ccc43363e1d4a59ca98cf60302ad79155696b774fec44afa91c117743e7df6b19cad SHA512 6cde19cddc9900ccdfd4403301f73ad033653a67d1acd5b7a70e589ae562c90ce9b80c9ba1b4009b1ee73e686e4e57e434dc2442b469b9954cef0cbba9b79b77
 MISC metadata.xml 331 BLAKE2B 4152c2350a69f9d5907917ef5d385da95cedcade149594c682724de55c823da8667a14880342142024a511a3f9aac9dc56d672e7c44888756e742c560b906cf5 SHA512 80bb084ebf352a333c438a6a7cac48387d5a0e285ad7859dc76111d85950cb8ecf6fc80e07befde77c02a44bde8f19f375b48147e76749e602e3bf58a4d3f46b
diff --git a/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-1.patch b/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-1.patch
deleted file mode 100644
index 8802c2528f18..000000000000
--- a/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8b2c8a76873da4862dbf4240c901f3e6d4bc040a Mon Sep 17 00:00:00 2001
-From: Frank Morgner <frankmorgner@gmail.com>
-Date: Sat, 18 Dec 2021 00:15:39 +0100
-Subject: [PATCH] fixed outdated API usage of BN_zero
-
-returns void since 0.9.8
----
- src/eac.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/eac.c b/src/eac.c
-index ea84253..9dccd79 100644
---- a/src/eac.c
-+++ b/src/eac.c
-@@ -105,7 +105,9 @@ int EAC_reset_ssc(const EAC_CTX *ctx)
-     if (!ctx)
-         return 0;
- 
--    return BN_zero(ctx->ssc);
-+    BN_zero(ctx->ssc);
-+
-+    return 1;
- }
- 
- int EAC_set_ssc(const EAC_CTX *ctx, unsigned long ssc)
diff --git a/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-2.patch b/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-2.patch
deleted file mode 100644
index d2ac244a1a7d..000000000000
--- a/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-2.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 2d94a152dd36543d2a713f1abe20717fdaafae0a Mon Sep 17 00:00:00 2001
-From: Frank Morgner <frankmorgner@gmail.com>
-Date: Sat, 18 Dec 2021 00:15:04 +0100
-Subject: [PATCH] added basic compatibility with OpenSSL 3.0
-
-deprecated warnings are not handled for now
-
-fixes https://github.com/frankmorgner/openpace/issues/53
----
- src/eac/cv_cert.h |  6 +++++-
- src/eac_util.c    | 14 ++++++++++++++
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/src/eac/cv_cert.h b/src/eac/cv_cert.h
-index f8c6565..595eb9c 100644
---- a/src/eac/cv_cert.h
-+++ b/src/eac/cv_cert.h
-@@ -341,7 +341,11 @@ CVC_CERT *CVC_d2i_CVC_CERT(CVC_CERT **cert, const unsigned char **in, long len);
-  * @return Number of bytes successfully encoded or a negative value if an
-  * error occured.
-  */
--int i2d_CVC_CERT(CVC_CERT *a, unsigned char **out);
-+int i2d_CVC_CERT(
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-+  const
-+#endif
-+  CVC_CERT *a, unsigned char **out);
- 
- /**
-  * @brief Duplicate a CV certificate
-diff --git a/src/eac_util.c b/src/eac_util.c
-index e87293c..6e518e0 100644
---- a/src/eac_util.c
-+++ b/src/eac_util.c
-@@ -321,6 +321,8 @@ randb(int numbytes)
-     return NULL;
- }
- 
-+#include <openssl/provider.h>
-+
- BUF_MEM *
- retail_mac_des(const BUF_MEM * key, const BUF_MEM * in)
- {
-@@ -331,6 +333,11 @@ retail_mac_des(const BUF_MEM * key, const BUF_MEM * in)
- 
-     check(key, "Invalid arguments");
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-+    OSSL_PROVIDER *legacy;
-+    legacy = OSSL_PROVIDER_load(NULL, "legacy");
-+#endif
-+
-     len = EVP_CIPHER_block_size(EVP_des_cbc());
-     check(key->length >= 2*len, "Key too short");
- 
-@@ -369,6 +376,9 @@ retail_mac_des(const BUF_MEM * key, const BUF_MEM * in)
-     BUF_MEM_free(c_tmp);
-     BUF_MEM_free(d_tmp);
-     EVP_CIPHER_CTX_free(ctx);
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-+    OSSL_PROVIDER_unload(legacy);
-+#endif
- 
-     return mac;
- 
-@@ -381,6 +391,10 @@ retail_mac_des(const BUF_MEM * key, const BUF_MEM * in)
-         BUF_MEM_free(d_tmp);
-     if (ctx)
-         EVP_CIPHER_CTX_free(ctx);
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
-+    if (legacy)
-+        OSSL_PROVIDER_unload(legacy);
-+#endif
- 
-     return NULL;
- }
diff --git a/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-3.patch b/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-3.patch
deleted file mode 100644
index 9ae0221adb7b..000000000000
--- a/dev-libs/openpace/files/openpace-1.1.2-openssl-3.0-3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 4c22789d264bd249cfff1c3e69466991e58a76cf Mon Sep 17 00:00:00 2001
-From: Frank Morgner <frankmorgner@gmail.com>
-Date: Mon, 20 Dec 2021 02:32:58 +0100
-Subject: [PATCH] fixed openssl 3 include
-
----
- src/eac_util.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/eac_util.c b/src/eac_util.c
-index 6e518e0..c9196fd 100644
---- a/src/eac_util.c
-+++ b/src/eac_util.c
-@@ -321,7 +321,9 @@ randb(int numbytes)
-     return NULL;
- }
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
- #include <openssl/provider.h>
-+#endif
- 
- BUF_MEM *
- retail_mac_des(const BUF_MEM * key, const BUF_MEM * in)
diff --git a/dev-libs/openpace/openpace-1.1.2.ebuild b/dev-libs/openpace/openpace-1.1.2.ebuild
deleted file mode 100644
index 566a4b1c635d..000000000000
--- a/dev-libs/openpace/openpace-1.1.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Cryptographic library for EAC version 2"
-HOMEPAGE="https://frankmorgner.github.io/openpace"
-SRC_URI="https://github.com/frankmorgner/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/3"
-KEYWORDS="amd64 ppc64 x86"
-
-BDEPEND="
-	dev-util/gengetopt
-	sys-apps/help2man
-	virtual/pkgconfig"
-DEPEND="dev-libs/openssl:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-openssl-3.0-1.patch
-	"${FILESDIR}"/${P}-openssl-3.0-2.patch
-	"${FILESDIR}"/${P}-openssl-3.0-3.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-openssl-install \
-		--disable-go \
-		--disable-java \
-		--disable-python \
-		--disable-ruby
-}
-
-src_compile() {
-	# not running just 1 job causes a race condition that causes a linking error
-	emake -j1
-}
-
-src_install() {
-	default
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}