From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1160174-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 08554138350
for <garchives@archives.gentoo.org>; Thu, 9 Apr 2020 21:15:34 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 35B77E08DD;
Thu, 9 Apr 2020 21:15:33 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 1C1A7E08DD
for <gentoo-commits@lists.gentoo.org>; Thu, 9 Apr 2020 21:15:33 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A8C3E34EFC9
for <gentoo-commits@lists.gentoo.org>; Thu, 9 Apr 2020 21:15:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B19D4154
for <gentoo-commits@lists.gentoo.org>; Thu, 9 Apr 2020 21:15:29 +0000 (UTC)
From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" <marecki@gentoo.org>
Message-ID: <1586466922.1831b216b57f9cf9678a328c1d13d9ac3e5cbd6e.marecki@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild
X-VCS-Directories: dev-libs/ocl-icd/
X-VCS-Committer: marecki
X-VCS-Committer-Name: Marek Szuba
X-VCS-Revision: 1831b216b57f9cf9678a328c1d13d9ac3e5cbd6e
X-VCS-Branch: master
Date: Thu, 9 Apr 2020 21:15:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 15302aee-1168-4ec5-ba86-f44e1d564572
X-Archives-Hash: 3b024fd43fa1dd57de42d28390554434
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)