From: Marek Szuba Date: Thu, 9 Apr 2020 21:10:31 +0000 (+0100) Subject: dev-libs/ocl-icd: block dev-libs/opencl-icd-loader X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1831b216b57f9cf9678a328c1d13d9ac3e5cbd6e;p=gentoo.git 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 --- 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 3142ef64c659..192d49e15487 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)