commit: 1831b216b57f9cf9678a328c1d13d9ac3e5cbd6e
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 9 21:10:31 2020 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 21:15:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1831b216
dev-libs/ocl-icd: block dev-libs/opencl-icd-loader
Now, because we depend on app-eselect/eselect-opencl and opencl-icd-loader
blocks it. In the future, to avoid file collisions on $libdir/libOpenCL.so*
Committed directly due to prolonged absence of the maintainer.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
.../ocl-icd/{ocl-icd-2.2.12-r1.ebuild => ocl-icd-2.2.12-r2.ebuild} | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
b/dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild
similarity index 94%
rename from dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
rename to dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild
index 3142ef64c65..192d49e1548 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild
@@ -16,7 +16,8 @@ KEYWORDS="~amd64 ~x86"
IUSE="+khronos-headers"
BDEPEND="${RUBY_DEPS}"
-RDEPEND="app-eselect/eselect-opencl"
+RDEPEND="app-eselect/eselect-opencl
+ !dev-libs/opencl-icd-loader"
PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)