From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
Date: Thu, 9 Apr 2020 21:15:29 +0000 (UTC) [thread overview]
Message-ID: <1586466922.1831b216b57f9cf9678a328c1d13d9ac3e5cbd6e.marecki@gentoo> (raw)
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)
next reply other threads:[~2020-04-09 21:15 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-09 21:15 Marek Szuba [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-26 4:46 [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/ Sam James
2022-07-24 1:04 Sam James
2022-06-21 8:39 Benda XU
2022-05-20 20:21 James Le Cuirot
2022-03-27 8:20 罗百科
2021-10-27 6:37 Agostino Sarubbo
2021-10-27 6:35 Agostino Sarubbo
2021-06-26 9:45 罗百科
2021-05-29 14:43 James Le Cuirot
2021-05-29 14:43 James Le Cuirot
2021-05-29 14:43 James Le Cuirot
2021-05-29 14:43 James Le Cuirot
2021-05-29 14:43 James Le Cuirot
2021-03-20 9:02 罗百科
2020-08-11 23:24 Matt Turner
2020-05-14 21:29 Thomas Deutschmann
2020-05-12 12:50 Mikle Kolyada
2020-04-20 12:23 Marek Szuba
2020-04-10 23:27 Marek Szuba
2020-04-10 23:27 Marek Szuba
2020-01-14 19:14 Alexey Shvetsov
2020-01-02 6:43 Matt Turner
2019-08-12 12:09 Guilherme Amadio
2019-05-17 7:57 Alexey Shvetsov
2018-11-03 14:36 Mikle Kolyada
2018-10-19 17:47 Matt Turner
2018-10-08 15:43 Matt Turner
2018-10-08 15:43 Matt Turner
2017-06-15 9:54 Agostino Sarubbo
2017-06-13 10:47 Agostino Sarubbo
2017-01-28 21:06 Patrick Lauer
2016-03-22 5:19 Patrick Lauer
2016-03-21 22:04 Patrice Clement
2016-02-18 15:23 Patrick Lauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1586466922.1831b216b57f9cf9678a328c1d13d9ac3e5cbd6e.marecki@gentoo \
--to=marecki@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox