gentoo resync : 16.04.2022

3 files changed, 0 insertions, 88 deletions

diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index bfd72b17abb9..5bbaf7225210 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,9 +1,6 @@
-AUX ocl-icd-2.2.12-gcc-10.patch 1551 BLAKE2B 0a2b6c66e83e67db9ba08af5311da65fc8795e36c9de1b25e53db8c593796c3f5903452bc3cc5c9e36c8fc32e286a588b942d9687c38d95133f125054cfbba48 SHA512 4d0a9168d31efe845c20623802aadc91bdf87524700708ba6ffcacd563344f4eb952eed99326ccd7d44b6ffbed145edae7d453b32a70362531d416c1b521bd4a
 AUX ocl-icd-2.3.0-new-headers.patch 4641 BLAKE2B 0013da2cfbe61cf98f98740055b54f2a3a1afacbf7d8845f0a3f53622e4a5e848d8d5d0be279e4717f29bc8e379affb3508aa2efa1c355c073ca42e883bdeead SHA512 951f1fb715031ebd6b1146b08d34fdc98154435129f8c1fb7b7b01ca33e10fdf2b8651c231fc1f47a41d3dc66c77df29786b3535099b7bbaac2e2b62fa4edc93
-DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
 DIST ocl-icd-2.3.0.tar.gz 100848 BLAKE2B b9e5b78df63f4865bb4cb3623fbc6bd336c86b4a9e1f23a29fab1cf11f848cb20d6d8d4a480ff44e442b02d606247a923798143058256ef59c2b16c9daf7098d SHA512 003f3661b7086a7364e79d1058591f12a7095aa2c3decfc4b496f00a0863a91cd81080f33b9308e3948045f8aca5856868ed2725f478654230e51a60d654e613
 DIST ocl-icd-2.3.1.tar.gz 102616 BLAKE2B f3e41d73e8cca7b42697a81f9d353341ba40ae67bb07ccbb7f6bd4fc9c8d16cbb4a9a9826ef81a381629cf1bd2c61d6ad9d7a02dcdb2871359041cfd8e9815b7 SHA512 3fa92dbcbe8ea2acf1ee967419d1b39ca7ace96e64261e3818984bd70831d62692e953c30e3e271fe74d59c634785055320f03c4d0516e2f53f7f700d3bcc76d
-EBUILD ocl-icd-2.2.12-r4.ebuild 1212 BLAKE2B 8b39938a7bc2b83e4e3b04021f2d913d1e894ef8b89b655f93b56009ae0ed05b0e66144a5089d8b38c6f9b0fb6e6fd8bc606504f9cf10ee5c090fd941d8030ac SHA512 c2b9c70e2a62d6b6bc8974813715d1e6754e716d5eef7adb314a5f334d9c7ba748d04de3c25177231b0a74e5afc4c43e549af340633646627268af46eaa9452d
 EBUILD ocl-icd-2.3.0.ebuild 1524 BLAKE2B e738dd830515e756ddcc34bbc3aee067ac118e5d88ec07bafa37229cd7f1fc798576061e72570a63b626ff8c92d652fcdd80cb78e3afa6c1dfc9aa739d72e234 SHA512 16991b86d0d3be933f226e1dffd23c3d388b6c524426fb43a12267ee19ad681a4b6911798a305420ad65c4c1df1a8c51618b6136f1dac862f8a8c553ca8db0f1
 EBUILD ocl-icd-2.3.1.ebuild 1475 BLAKE2B dd1ff1e709bbdfe7fb3b7463864b9ca7ea83bfb153e7335a91c8ef27e1400af22f796265763eb652e0a95249b8cbb0c379b751246e05a0acd1a147c1760275d7 SHA512 3d9aaa113f9b703cc8d98dce446f306189e38ec316e6cc8e6975f1f6d710317ef772871830b3c964c6d08a08a35643f07dc2cba8795e5b086ad192d568064888
 MISC metadata.xml 397 BLAKE2B 385d442979cec4852b3ca02d98413415ea62683c4bbdf33c5ace01879f8a4a4f7bedf9a0f7ba4f88dcea4267765a0635cacb4a619e6d9294c6d399e01220a1f7 SHA512 730e4cd26169de827576ac7d61a07caa08c6d78cc1561417c5e017eee58a7137436003aafac620223ae1513a100c7817a3e00463ea50f0d9e3690949f2c54614
diff --git a/dev-libs/ocl-icd/files/ocl-icd-2.2.12-gcc-10.patch b/dev-libs/ocl-icd/files/ocl-icd-2.2.12-gcc-10.patch
deleted file mode 100644
index 64948d5b05e3..000000000000
--- a/dev-libs/ocl-icd/files/ocl-icd-2.2.12-gcc-10.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugs.gentoo.org/706098
-
-From 4667bddd365bcc1dc66c483835971f0083b44b1d Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Wed, 22 Jan 2020 19:38:23 +0000
-Subject: [PATCH] icd_generator.rb: fix build failure against gcc-10
-
-On gcc-10 (and gcc-9 -fno-common) build fails as:
-
-```
-libtool: link: gcc -shared  -fPIC -DPIC  .libs/libdummy_icd.o .libs/libdummy_icd_gen.o \
-    -ldl  -g -O2   -Wl,-soname -Wl,libdummycl.so.0 -o .libs/libdummycl.so.0.0.0
-ld: .libs/libdummy_icd_gen.o:/home/slyfox/dev/git/ocl-icd/libdummy_icd_gen.h:226:
-  multiple definition of `master_dispatch'; .libs/libdummy_icd.o:/home/slyfox/dev/git/ocl-icd/libdummy_icd_gen.h:226: first defined here
-```
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The error also happens if CFLAGS=-fno-common passed explicitly.
-
-Reported-by: Anthony Parsons
-Bug: https://bugs.gentoo.org/706098
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- icd_generator.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/icd_generator.rb
-+++ b/icd_generator.rb
-@@ -207,7 +207,7 @@ def self.generate_libdummy_icd_header
-     }
-     libdummy_icd_structures += "};\n\n"
-     libdummy_icd_structures += "#pragma GCC visibility push(hidden)\n\n"
--    libdummy_icd_structures += "struct _cl_icd_dispatch master_dispatch; \n\n"
-+    libdummy_icd_structures += "extern struct _cl_icd_dispatch master_dispatch; \n\n"
-     $use_name_in_test.each { |k, f|
-       libdummy_icd_structures += "typeof(#{f}) INT#{f};\n"
-     }
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild
deleted file mode 100644
index 3cc734b6f736..000000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-inherit autotools flag-o-matic multilib-minimal ruby-single
-
-DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
-HOMEPAGE="https://github.com/OCL-dev/ocl-icd"
-SRC_URI="https://github.com/OCL-dev/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Does nothing now but by keeping it here we avoid having to have virtual/opencl
-# handle ebuilds both with and without this flag.
-IUSE="+khronos-headers"
-
-BDEPEND="${RUBY_DEPS}"
-DEPEND="~dev-util/opencl-headers-2020.06.16"
-RDEPEND="${DEPEND}
-	!app-eselect/eselect-opencl
-	!dev-libs/opencl-icd-loader"
-
-PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
-
-src_prepare() {
-	replace-flags -Os -O2 # bug 646122
-
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# dev-util/opencl-headers ARE official Khronos Group headers, what this option
-	# does is disable the use of the bundled ones
-	ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers
-}
-
-multilib_src_install() {
-	default
-
-	# Drop .la files
-	find "${ED}" -name '*.la' -delete || die
-}