public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2022-07-24  1:04 Sam James
  0 siblings, 0 replies; 35+ messages in thread
From: Sam James @ 2022-07-24  1:04 UTC (permalink / raw
  To: gentoo-commits

commit:     5bc4855c77b3ed9285b3bfb382b1ad9ed9e0b7e0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 24 01:04:01 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 01:04:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bc4855c

dev-libs/ocl-icd: Keyword 2.3.1 ppc64, #860288

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
index c991dc0798f9..75f550fd07a8 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 # Does nothing now but by keeping it here we avoid having to have virtual/opencl
 # handle ebuilds both with and without this flag.


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2022-07-26  4:46 Sam James
  0 siblings, 0 replies; 35+ messages in thread
From: Sam James @ 2022-07-26  4:46 UTC (permalink / raw
  To: gentoo-commits

commit:     bb8776688a03dbfd4c5d56a8df96b5c81087618e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 26 04:45:35 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 04:45:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb877668

dev-libs/ocl-icd: keyword 2.3.0 for ~ppc64

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
index 84890c9fc9b8..e4d106dd1969 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~ppc64 x86"
 
 # Does nothing now but by keeping it here we avoid having to have virtual/opencl
 # handle ebuilds both with and without this flag.


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2022-06-21  8:39 Benda XU
  0 siblings, 0 replies; 35+ messages in thread
From: Benda XU @ 2022-06-21  8:39 UTC (permalink / raw
  To: gentoo-commits

commit:     22d02ac13564e69c4235cc7a2e85b3c957e2e23c
Author:     Yiyang Wu <xgreenlandforwyy <AT> gmail <DOT> com>
AuthorDate: Tue Jun  7 06:10:38 2022 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 08:38:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22d02ac1

dev-libs/ocl-icd: change the vendors dir when use prefix

Closes: https://github.com/gentoo/gentoo/pull/25785
Signed-off-by: Yiyang Wu <xgreenlandforwyy <AT> gmail.com>
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild | 5 +++--
 dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
index 341d58d9a219..84890c9fc9b8 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,7 +37,8 @@ src_prepare() {
 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
+	ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers \
+		--enable-custom-vendordir="${EPREFIX}/etc/OpenCL/vendors"
 }
 
 multilib_src_compile() {

diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
index 332354cf47a6..c991dc0798f9 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
@@ -33,7 +33,8 @@ src_prepare() {
 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
+	ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers \
+		--enable-custom-vendordir="${EPREFIX}/etc/OpenCL/vendors"
 }
 
 multilib_src_compile() {


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2022-05-20 20:21 James Le Cuirot
  0 siblings, 0 replies; 35+ messages in thread
From: James Le Cuirot @ 2022-05-20 20:21 UTC (permalink / raw
  To: gentoo-commits

commit:     9be69f4dcab16601530ab1b672a0fcb07fca5ef7
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 20:18:46 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri May 20 20:20:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9be69f4d

dev-libs/ocl-icd: Add ruby31 to 2.3.1

Closes: https://bugs.gentoo.org/836589
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
index 4e769ccf921e..332354cf47a6 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30 ruby31"
 inherit autotools flag-o-matic multilib-minimal ruby-single
 
 DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2022-03-27  8:20 罗百科
  0 siblings, 0 replies; 35+ messages in thread
From: 罗百科 @ 2022-03-27  8:20 UTC (permalink / raw
  To: gentoo-commits

commit:     f74694ca5927248397aa4dd5782fe821bc9b55e6
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 08:19:53 2022 +0000
Commit:     罗百科 <patrick <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 08:20:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f74694ca

dev-libs/ocl-icd: Bump to 2.3.1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>

 dev-libs/ocl-icd/Manifest             |  1 +
 dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild | 57 +++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index d56cb7163168..ab140542f1be 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
new file mode 100644
index 000000000000..4e769ccf921e
--- /dev/null
+++ b/dev-libs/ocl-icd/ocl-icd-2.3.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+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-2021.04.29"
+RDEPEND="${DEPEND}
+	!app-eselect/eselect-opencl
+	!dev-libs/opencl-icd-loader"
+
+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_compile() {
+	local candidates=(${USE_RUBY})
+	local ruby=
+	for (( idx=${#candidates[@]}-1 ; idx>=0 ; idx-- )) ; do
+		if ${candidates[idx]} --version &> /dev/null; then
+			ruby=${candidates[idx]} && break
+		fi
+	done
+	[[ -z ${ruby} ]] && die "No ruby executable found"
+
+	emake RUBY=${ruby}
+}
+
+multilib_src_install() {
+	default
+
+	# Drop .la files
+	find "${ED}" -name '*.la' -delete || die
+}


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2021-10-27  6:37 Agostino Sarubbo
  0 siblings, 0 replies; 35+ messages in thread
From: Agostino Sarubbo @ 2021-10-27  6:37 UTC (permalink / raw
  To: gentoo-commits

commit:     d8b7232427abdc0aef16abc0f16bf69d1e003b23
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 27 06:36:41 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Oct 27 06:36:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b72324

dev-libs/ocl-icd: x86 stable wrt bug #810847

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
index a0023e79d65..341d58d9a21 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
@@ -11,7 +11,7 @@ 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"
+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.


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2021-10-27  6:35 Agostino Sarubbo
  0 siblings, 0 replies; 35+ messages in thread
From: Agostino Sarubbo @ 2021-10-27  6:35 UTC (permalink / raw
  To: gentoo-commits

commit:     1a654e15ce401b4c0407fd8e8305fa6dd4b1239f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 27 06:35:05 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Oct 27 06:35:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a654e15

dev-libs/ocl-icd: amd64 stable wrt bug #810847

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
index 3a274d0c168..a0023e79d65 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.3.0.ebuild
@@ -11,7 +11,7 @@ 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"
+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.


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2021-06-26  9:45 罗百科
  0 siblings, 0 replies; 35+ messages in thread
From: 罗百科 @ 2021-06-26  9:45 UTC (permalink / raw
  To: gentoo-commits

commit:     97e4d5fb445c450e33d98408648922bedb0f3919
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 26 08:01:11 2021 +0000
Commit:     罗百科 <patrick <AT> gentoo <DOT> org>
CommitDate: Sat Jun 26 09:45:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e4d5fb

dev-libs/ocl-icd: Fix dependencies

Closes: https://bugs.gentoo.org/798444
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild | 1 -
 1 file changed, 1 deletion(-)

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
index d3d2516ba6d..3cc734b6f73 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild
@@ -19,7 +19,6 @@ IUSE="+khronos-headers"
 
 BDEPEND="${RUBY_DEPS}"
 DEPEND="~dev-util/opencl-headers-2020.06.16"
-DEPEND="dev-util/opencl-headers"
 RDEPEND="${DEPEND}
 	!app-eselect/eselect-opencl
 	!dev-libs/opencl-icd-loader"


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2021-05-29 14:43 James Le Cuirot
  0 siblings, 0 replies; 35+ messages in thread
From: James Le Cuirot @ 2021-05-29 14:43 UTC (permalink / raw
  To: gentoo-commits

commit:     33470b53c126038cfb84831516172bd8ff3bbe00
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat May 29 14:42:10 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May 29 14:43:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33470b53

dev-libs/ocl-icd: Drop old and broken 2.2.14

Closes: https://bugs.gentoo.org/789558
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-libs/ocl-icd/Manifest                 |  1 -
 dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild | 57 -------------------------------
 dev-libs/ocl-icd/ocl-icd-2.2.14.ebuild    | 44 ------------------------
 3 files changed, 102 deletions(-)

diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index 50148b96627..d56cb716316 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,3 +1,2 @@
 DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
-DIST ocl-icd-2.2.14.tar.gz 100629 BLAKE2B 4862560541c979edb06d89f7f57b78a34c02e38843c02b0f125a121649cd6a33570e29c86fe7d3fd6f0fa3d489831777100daef97264e32b82854384075cbbf2 SHA512 78510b6fa4e2c6a52141a51ccf0d0ef3110b0b4902a43bb97f7622ff0ce470b108dc05c9619c28ce8758ccea1e1cf6b2e7f1a296f8b07f52532f23b2b036a5cf
 DIST ocl-icd-2.3.0.tar.gz 100848 BLAKE2B b9e5b78df63f4865bb4cb3623fbc6bd336c86b4a9e1f23a29fab1cf11f848cb20d6d8d4a480ff44e442b02d606247a923798143058256ef59c2b16c9daf7098d SHA512 003f3661b7086a7364e79d1058591f12a7095aa2c3decfc4b496f00a0863a91cd81080f33b9308e3948045f8aca5856868ed2725f478654230e51a60d654e613

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild
deleted file mode 100644
index 909ba9498ea..00000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-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.12.18"
-RDEPEND="${DEPEND}
-	!app-eselect/eselect-opencl
-	!dev-libs/opencl-icd-loader"
-
-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_compile() {
-	local candidates=(${USE_RUBY})
-	local ruby=
-	for (( idx=${#candidates[@]}-1 ; idx>=0 ; idx-- )) ; do
-		if ${candidates[idx]} --version &> /dev/null; then
-			ruby=${candidates[idx]} && break
-		fi
-	done
-	[[ -z ${ruby} ]] && die "No ruby executable found"
-
-	emake RUBY=${ruby}
-}
-
-multilib_src_install() {
-	default
-
-	# Drop .la files
-	find "${ED}" -name '*.la' -delete || die
-}

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.14.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.14.ebuild
deleted file mode 100644
index e5b4c9f2623..00000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.2.14.ebuild
+++ /dev/null
@@ -1,44 +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.12.18"
-RDEPEND="${DEPEND}
-	!app-eselect/eselect-opencl
-	!dev-libs/opencl-icd-loader"
-
-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
-}


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2021-05-29 14:43 James Le Cuirot
  0 siblings, 0 replies; 35+ messages in thread
From: James Le Cuirot @ 2021-05-29 14:43 UTC (permalink / raw
  To: gentoo-commits

commit:     108710c9a2875c0b31f78b917eaa40fbd136bd59
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sat Mar 27 08:16:37 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May 29 14:43:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=108710c9

dev-libs/ocl-icd: Remove ruby24 from USE_RUBY

dev-lang/ruby:2.4 is no longer in the gentoo tree.

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild | 44 +++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild
new file mode 100644
index 00000000000..94aa219cb56
--- /dev/null
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="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.12.18"
+RDEPEND="${DEPEND}
+	!app-eselect/eselect-opencl
+	!dev-libs/opencl-icd-loader"
+
+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
+}


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2021-05-29 14:43 James Le Cuirot
  0 siblings, 0 replies; 35+ messages in thread
From: James Le Cuirot @ 2021-05-29 14:43 UTC (permalink / raw
  To: gentoo-commits

commit:     cbf63d4ff309ea168dc40e7886f535cbd11c1bfa
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sun Mar 28 00:19:01 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May 29 14:43:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbf63d4f

dev-libs/ocl-icd: Fix ruby BDEP selection

The Makefile sets RUBY=ruby.  The active ruby interpreter set via
eselect may not correspond to one that satisfies ${RUBY_DEPS}. Test
for the existence of a versioned ruby from among USE_RUBY, moving from
right to left, and pass it to emake.

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild
index 94aa219cb56..2fe7e214b16 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild
@@ -36,6 +36,19 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf --enable-pthread-once --disable-official-khronos-headers
 }
 
+multilib_src_compile() {
+	local candidates=(${USE_RUBY})
+	local ruby=
+	for (( idx=${#candidates[@]}-1 ; idx>=0 ; idx-- )) ; do
+		if ${candidates[idx]} --version &> /dev/null; then
+			ruby=${candidates[idx]} && break
+		fi
+	done
+	[[ -z ${ruby} ]] && die "No ruby executable found"
+
+	emake RUBY=${ruby}
+}
+
 multilib_src_install() {
 	default
 


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2021-05-29 14:43 James Le Cuirot
  0 siblings, 0 replies; 35+ messages in thread
From: James Le Cuirot @ 2021-05-29 14:43 UTC (permalink / raw
  To: gentoo-commits

commit:     73a0a7475658ad73d4fae984268d106b17849379
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sun Mar 28 00:32:39 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May 29 14:43:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73a0a747

dev-libs/ocl-icd: Add support for dev-lang/ruby:3.0

Having tested ruby26, ruby27, and ruby30 with the command the build
uses to generate files (i.e., ${RUBY} "${S}"/icd_generator.rb --mode
database --database "${S}"/ocl_interface.yaml) and diffed the results,
all generated files are exactly the same.

Closes: https://bugs.gentoo.org/704056
Closes: https://bugs.gentoo.org/766261

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20156
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild
index 2fe7e214b16..909ba9498ea 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.14-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 inherit autotools flag-o-matic multilib-minimal ruby-single
 
 DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2021-05-29 14:43 James Le Cuirot
  0 siblings, 0 replies; 35+ messages in thread
From: James Le Cuirot @ 2021-05-29 14:43 UTC (permalink / raw
  To: gentoo-commits

commit:     58ccd37b4d51a90f951c827b185c6682d165c180
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat May 29 14:30:40 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat May 29 14:43:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58ccd37b

dev-libs/ocl-icd: Pin opencl-headers on 2.2.12 to compatible version

We need to ensure this version isn't removed.

Closes: https://bugs.gentoo.org/789558
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 .../ocl-icd/{ocl-icd-2.2.12-r3.ebuild => ocl-icd-2.2.12-r4.ebuild}     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild
similarity index 93%
rename from dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
rename to dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild
index 73e2edae5f4..d3d2516ba6d 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,7 @@ KEYWORDS="amd64 x86"
 IUSE="+khronos-headers"
 
 BDEPEND="${RUBY_DEPS}"
+DEPEND="~dev-util/opencl-headers-2020.06.16"
 DEPEND="dev-util/opencl-headers"
 RDEPEND="${DEPEND}
 	!app-eselect/eselect-opencl


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2021-03-20  9:02 罗百科
  0 siblings, 0 replies; 35+ messages in thread
From: 罗百科 @ 2021-03-20  9:02 UTC (permalink / raw
  To: gentoo-commits

commit:     7c8e6574b9b46191467f2e1568127c801890c250
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 20 09:01:54 2021 +0000
Commit:     罗百科 <patrick <AT> gentoo <DOT> org>
CommitDate: Sat Mar 20 09:01:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c8e6574

dev-libs/ocl-icd: Bump to 2.2.14

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>

 dev-libs/ocl-icd/Manifest              |  1 +
 dev-libs/ocl-icd/ocl-icd-2.2.14.ebuild | 44 ++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index ae9b88a9d76..8b60ba9e2d3 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1 +1,2 @@
 DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
+DIST ocl-icd-2.2.14.tar.gz 100629 BLAKE2B 4862560541c979edb06d89f7f57b78a34c02e38843c02b0f125a121649cd6a33570e29c86fe7d3fd6f0fa3d489831777100daef97264e32b82854384075cbbf2 SHA512 78510b6fa4e2c6a52141a51ccf0d0ef3110b0b4902a43bb97f7622ff0ce470b108dc05c9619c28ce8758ccea1e1cf6b2e7f1a296f8b07f52532f23b2b036a5cf

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.14.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.14.ebuild
new file mode 100644
index 00000000000..e5b4c9f2623
--- /dev/null
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.14.ebuild
@@ -0,0 +1,44 @@
+# 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.12.18"
+RDEPEND="${DEPEND}
+	!app-eselect/eselect-opencl
+	!dev-libs/opencl-icd-loader"
+
+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
+}


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2020-08-11 23:24 Matt Turner
  0 siblings, 0 replies; 35+ messages in thread
From: Matt Turner @ 2020-08-11 23:24 UTC (permalink / raw
  To: gentoo-commits

commit:     43f229b209087aea713ece50c8b9f99191763994
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 11 22:16:51 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 23:24:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43f229b2

dev-libs/ocl-icd: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild | 55 -------------------------------
 dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild    | 52 -----------------------------
 2 files changed, 107 deletions(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild
deleted file mode 100644
index 192d49e1548..00000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 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"
-
-IUSE="+khronos-headers"
-
-BDEPEND="${RUBY_DEPS}"
-RDEPEND="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() {
-	ECONF_SOURCE="${S}" econf --enable-pthread-once
-}
-
-multilib_src_install() {
-	default
-
-	# Drop .la files
-	find "${ED}" -name '*.la' -delete || die
-
-	OCL_DIR="/usr/$(get_libdir)/OpenCL/vendors/ocl-icd"
-	dodir ${OCL_DIR}/{,include}
-
-	# Install vendor library
-	mv -f "${ED}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
-
-	# Install vendor headers
-	if use khronos-headers; then
-		cp -r "${S}/khronos-headers/CL" "${ED}${OCL_DIR}/include" || die "Can't install vendor headers"
-	fi
-}
-
-pkg_postinst() {
-	eselect opencl set --use-old ${PN}
-}

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
deleted file mode 100644
index 04777289f85..00000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby23 ruby24 ruby25"
-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"
-
-IUSE="+khronos-headers"
-
-DEPEND="${RUBY_DEPS}"
-RDEPEND="app-eselect/eselect-opencl"
-
-src_prepare() {
-	replace-flags -Os -O2 # bug 646122
-
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf --enable-pthread-once
-}
-
-multilib_src_install() {
-	default
-
-	# Drop .la files
-	find "${ED}" -name '*.la' -delete || die
-
-	OCL_DIR="/usr/$(get_libdir)/OpenCL/vendors/ocl-icd"
-	dodir ${OCL_DIR}/{,include}
-
-	# Install vendor library
-	mv -f "${ED}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
-
-	# Install vendor headers
-	if use khronos-headers; then
-		cp -r "${S}/khronos-headers/CL" "${ED}${OCL_DIR}/include" || die "Can't install vendor headers"
-	fi
-}
-
-pkg_postinst() {
-	eselect opencl set --use-old ${PN}
-}


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2020-05-14 21:29 Thomas Deutschmann
  0 siblings, 0 replies; 35+ messages in thread
From: Thomas Deutschmann @ 2020-05-14 21:29 UTC (permalink / raw
  To: gentoo-commits

commit:     079678d39506a66ccbef586e0e017fd78600ad91
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu May 14 21:21:39 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu May 14 21:29:28 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=079678d3

dev-libs/ocl-icd: x86 stable (bug #721674)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
index efbc9bb4b36..73e2edae5f4 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
@@ -11,7 +11,7 @@ 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"
+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.


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2020-05-12 12:50 Mikle Kolyada
  0 siblings, 0 replies; 35+ messages in thread
From: Mikle Kolyada @ 2020-05-12 12:50 UTC (permalink / raw
  To: gentoo-commits

commit:     8a96a4c880ebce6e330cfb5ddd3f7a1e4293d820
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 12:47:15 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue May 12 12:47:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a96a4c8

dev-libs/ocl-icd: amd64 stable wrt bug #721674

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
index 4bf66a6c1ab..efbc9bb4b36 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
@@ -11,7 +11,7 @@ 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"
+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.


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2020-04-20 12:23 Marek Szuba
  0 siblings, 0 replies; 35+ messages in thread
From: Marek Szuba @ 2020-04-20 12:23 UTC (permalink / raw
  To: gentoo-commits

commit:     854b415f64b8c7b0de4a1588261b95626c20ea02
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 20 12:19:07 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Mon Apr 20 12:23:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=854b415f

dev-libs/ocl-icd: do not block x11-drivers/nvidia-drivers

There are now versions of the latter in the tree which do not depend on
eselect-opencl.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
index 980cac2e750..4bf66a6c1ab 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
@@ -19,12 +19,9 @@ IUSE="+khronos-headers"
 
 BDEPEND="${RUBY_DEPS}"
 DEPEND="dev-util/opencl-headers"
-# nvidia-drivers block is hopefully temporary, until it has ceased
-# to depend on eselect-opencl
 RDEPEND="${DEPEND}
 	!app-eselect/eselect-opencl
-	!dev-libs/opencl-icd-loader
-	!x11-drivers/nvidia-drivers"
+	!dev-libs/opencl-icd-loader"
 
 PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
 


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2020-04-10 23:27 Marek Szuba
  0 siblings, 0 replies; 35+ messages in thread
From: Marek Szuba @ 2020-04-10 23:27 UTC (permalink / raw
  To: gentoo-commits

commit:     780818b4b055f8c41d253e71cd9641322776e7a4
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 23:13:10 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 23:25:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=780818b4

dev-libs/ocl-icd: use dev-util/opencl-headers instead of bundled ones

Builds just fine against these, which is not surprising given both sets
are official Khronos Group OpenCL 2.2 headers - the only difference
being the bundled ones are legacy and the separately packaged ones are
unified. Furthermore, without having to worry about file collisions in
/usr/include/CL, it will become possible for packages depending on
unified headers (e.g. dev-libs/intel-neo, which too uses a bundled copy
for now) to use dev-util/opencl-headers regardless of which ICD loader
provides the library. Last but not least, one bundling less to worry
about!

Note that this change makes USE=khronos-headers redundant, that said we
keep it in IUSE - at least for now anyway - so that ebuilds explicitly
requesting this USE flag needn't be modified.

No revbump because the first commit introducing -r3 has at the time of
me writing this not had been pushed to Gentoo servers yet.

Committed directly due to prolonged absence of the maintainer.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
index 783021a439e..980cac2e750 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
@@ -13,10 +13,16 @@ 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}"
-RDEPEND="!app-eselect/eselect-opencl
+DEPEND="dev-util/opencl-headers"
+# nvidia-drivers block is hopefully temporary, until it has ceased
+# to depend on eselect-opencl
+RDEPEND="${DEPEND}
+	!app-eselect/eselect-opencl
 	!dev-libs/opencl-icd-loader
 	!x11-drivers/nvidia-drivers"
 
@@ -30,7 +36,9 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf --enable-pthread-once
+	# 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() {
@@ -38,10 +46,4 @@ multilib_src_install() {
 
 	# Drop .la files
 	find "${ED}" -name '*.la' -delete || die
-
-	# Install vendor headers
-	if use khronos-headers; then
-		insinto /usr/include
-		doins -r "${S}/khronos-headers/CL"
-	fi
 }


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2020-04-10 23:27 Marek Szuba
  0 siblings, 0 replies; 35+ messages in thread
From: Marek Szuba @ 2020-04-10 23:27 UTC (permalink / raw
  To: gentoo-commits

commit:     3493e5e8f40ad7b062e200b9b664876d31399777
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 22:09:37 2020 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 23:24:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3493e5e8

dev-libs/ocl-icd: install directly into /usr

This leaves x11-drivers/nvidia-drivers as the only OpenCL implementation
still requiring eselect-opencl.

Committed directly due to prolonged absence of the maintainer.

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild | 47 +++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
new file mode 100644
index 00000000000..783021a439e
--- /dev/null
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 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"
+
+IUSE="+khronos-headers"
+
+BDEPEND="${RUBY_DEPS}"
+RDEPEND="!app-eselect/eselect-opencl
+	!dev-libs/opencl-icd-loader
+	!x11-drivers/nvidia-drivers"
+
+PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
+
+src_prepare() {
+	replace-flags -Os -O2 # bug 646122
+
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf --enable-pthread-once
+}
+
+multilib_src_install() {
+	default
+
+	# Drop .la files
+	find "${ED}" -name '*.la' -delete || die
+
+	# Install vendor headers
+	if use khronos-headers; then
+		insinto /usr/include
+		doins -r "${S}/khronos-headers/CL"
+	fi
+}


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2020-04-09 21:15 Marek Szuba
  0 siblings, 0 replies; 35+ messages in thread
From: Marek Szuba @ 2020-04-09 21:15 UTC (permalink / raw
  To: gentoo-commits

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)
 


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2020-01-14 19:14 Alexey Shvetsov
  0 siblings, 0 replies; 35+ messages in thread
From: Alexey Shvetsov @ 2020-01-14 19:14 UTC (permalink / raw
  To: gentoo-commits

commit:     6de505f24f4133ffcc7b0cdcae9eefa01f74a200
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 14 19:07:53 2020 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 19:14:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6de505f2

dev-libs/ocl-icd: works with ruby27

Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
index c9d2704ee26..aebd6ac1e7e 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 inherit autotools flag-o-matic multilib-minimal ruby-single
 
 DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2020-01-02  6:43 Matt Turner
  0 siblings, 0 replies; 35+ messages in thread
From: Matt Turner @ 2020-01-02  6:43 UTC (permalink / raw
  To: gentoo-commits

commit:     253054f3e421bf47fe8839de4eb3741906c23bbd
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 06:43:23 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 06:43:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=253054f3

dev-libs/ocl-icd: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-libs/ocl-icd/Manifest              |  1 -
 dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild | 35 ----------------------------------
 2 files changed, 36 deletions(-)

diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index c9dd68dd06a..ae9b88a9d76 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,2 +1 @@
-DIST ocl-icd-2.2.11.tar.gz 455800 BLAKE2B 64da3670d3631dba06030d5f6764522fae6c868d4cf45b1a47a0e2b004831797ff7881353a34fb6fff64e4af5b9ebd475b800303ad1e37c7c11b265981ed22a3 SHA512 54d6a281f0fc04858323ef8d1764c5d2276d9a003853d5af5821a6dd24c74a744da0ff2204179a5877d0e3f156d03c83236797cd5ca88e6897457c75da6713cd
 DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild
deleted file mode 100644
index 6815b304b06..00000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
-HOMEPAGE="http://forge.imag.fr/projects/ocl-icd/"
-SRC_URI="https://forge.imag.fr/frs/download.php/814/${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE=""
-
-DEPEND="dev-lang/ruby
-	dev-ruby/rubygems"
-RDEPEND="app-eselect/eselect-opencl"
-
-src_prepare() {
-	echo "/usr/$(get_libdir)/OpenCL/vendors/ocl-icd/libOpenCL.so" > ocl-icd.icd
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors/
-	doins ocl-icd.icd
-
-	emake DESTDIR="${D}" install
-
-	OCL_DIR="${D}"/usr/"$(get_libdir)"/OpenCL/vendors/ocl-icd/
-	mkdir -p ${OCL_DIR} || die "mkdir failed"
-
-	mv "${D}/usr/$(get_libdir)"/libOpenCL* "${OCL_DIR}"
-}


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2019-08-12 12:09 Guilherme Amadio
  0 siblings, 0 replies; 35+ messages in thread
From: Guilherme Amadio @ 2019-08-12 12:09 UTC (permalink / raw
  To: gentoo-commits

commit:     f91f8bd0fee4fc9353a9ad3b7ef225de02efac9d
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 12 12:05:39 2019 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Mon Aug 12 12:06:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f91f8bd0

dev-libs/ocl-icd: fix ${D} vs ${ED} for prefix

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Guilherme Amadio <amadio <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild | 4 ++--
 dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
index 7bc7cd5195e..c9d2704ee26 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
@@ -33,13 +33,13 @@ multilib_src_install() {
 	default
 
 	# Drop .la files
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 
 	OCL_DIR="/usr/$(get_libdir)/OpenCL/vendors/ocl-icd"
 	dodir ${OCL_DIR}/{,include}
 
 	# Install vendor library
-	mv -f "${D}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
+	mv -f "${ED}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
 
 	# Install vendor headers
 	if use khronos-headers; then

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
index 38bc636d446..04777289f85 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,13 +33,13 @@ multilib_src_install() {
 	default
 
 	# Drop .la files
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 
 	OCL_DIR="/usr/$(get_libdir)/OpenCL/vendors/ocl-icd"
 	dodir ${OCL_DIR}/{,include}
 
 	# Install vendor library
-	mv -f "${D}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
+	mv -f "${ED}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
 
 	# Install vendor headers
 	if use khronos-headers; then


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2019-05-17  7:57 Alexey Shvetsov
  0 siblings, 0 replies; 35+ messages in thread
From: Alexey Shvetsov @ 2019-05-17  7:57 UTC (permalink / raw
  To: gentoo-commits

commit:     188805e992e765bb55b7ae2bb2c9b4c44f53432b
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 07:56:53 2019 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Fri May 17 07:57:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=188805e9

dev-libs/ocl-icd: Version bump drop old ruby, add new one

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild | 52 +++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
new file mode 100644
index 00000000000..7bc7cd5195e
--- /dev/null
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+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"
+
+IUSE="+khronos-headers"
+
+BDEPEND="${RUBY_DEPS}"
+RDEPEND="app-eselect/eselect-opencl"
+
+src_prepare() {
+	replace-flags -Os -O2 # bug 646122
+
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf --enable-pthread-once
+}
+
+multilib_src_install() {
+	default
+
+	# Drop .la files
+	find "${D}" -name '*.la' -delete || die
+
+	OCL_DIR="/usr/$(get_libdir)/OpenCL/vendors/ocl-icd"
+	dodir ${OCL_DIR}/{,include}
+
+	# Install vendor library
+	mv -f "${D}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
+
+	# Install vendor headers
+	if use khronos-headers; then
+		cp -r "${S}/khronos-headers/CL" "${ED}${OCL_DIR}/include" || die "Can't install vendor headers"
+	fi
+}
+
+pkg_postinst() {
+	eselect opencl set --use-old ${PN}
+}


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2018-11-03 14:36 Mikle Kolyada
  0 siblings, 0 replies; 35+ messages in thread
From: Mikle Kolyada @ 2018-11-03 14:36 UTC (permalink / raw
  To: gentoo-commits

commit:     a2278f3c62aed05c94aa9e9bf8dd584a504210d5
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  3 14:30:48 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Nov  3 14:30:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2278f3c

dev-libs/ocl-icd: amd64 stable wrt bug #668900

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
index 6d59cbc6210..e50f1f565c1 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~x86"
 
 IUSE="+khronos-headers"
 


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2018-10-19 17:47 Matt Turner
  0 siblings, 0 replies; 35+ messages in thread
From: Matt Turner @ 2018-10-19 17:47 UTC (permalink / raw
  To: gentoo-commits

commit:     9599894aef4f3cbc1ff704cc2a5a8aaa2c64baba
Author:     Jan Vesely <jano.vesely <AT> gmail <DOT> com>
AuthorDate: Wed Oct 10 06:33:25 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Oct 19 17:46:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9599894a

dev-libs/ocl-icd-2.2.12: Install headers and drop ocl-icd.icd

Add useflag to install khronos CL headers.
Don't install ocl-icd.icd to /etc/.

v2: Don't try to move docs. It's not necessary.
v3: Fixup ruby depend

Signed-off-by: Jan Vesely <jano.vesely <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10122
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-libs/ocl-icd/metadata.xml          |  5 +++++
 dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild | 29 ++++++++++++++++++-----------
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/dev-libs/ocl-icd/metadata.xml b/dev-libs/ocl-icd/metadata.xml
index f3de5f693ed..1cfa787eaf1 100644
--- a/dev-libs/ocl-icd/metadata.xml
+++ b/dev-libs/ocl-icd/metadata.xml
@@ -5,4 +5,9 @@
     <email>patrick@gentoo.org</email>
     <name>Patrick Lauer</name>
   </maintainer>
+  <use>
+    <flag name="khronos-headers" restrict="&gt;dev-libs/ocl-icd-2.2.11-r1">
+      Install Khronos OpenCL headers.
+    </flag>
+  </use>
 </pkgmetadata>

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
index f102277aa8f..6d59cbc6210 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic multilib-minimal
+USE_RUBY="ruby23 ruby24 ruby25"
+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"
@@ -12,10 +13,9 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE=""
+IUSE="+khronos-headers"
 
-DEPEND="dev-lang/ruby
-	dev-ruby/rubygems"
+DEPEND="${RUBY_DEPS}"
 RDEPEND="app-eselect/eselect-opencl"
 
 src_prepare() {
@@ -30,16 +30,23 @@ multilib_src_configure() {
 }
 
 multilib_src_install() {
+	default
+
+	# Drop .la files
 	find "${D}" -name '*.la' -delete || die
 
-	echo "/usr/$(get_libdir)/OpenCL/vendors/ocl-icd/libOpenCL.so" > "${PN}-${ABI}.icd"
-	insinto /etc/OpenCL/vendors/
-	doins "${PN}-${ABI}.icd"
+	OCL_DIR="/usr/$(get_libdir)/OpenCL/vendors/ocl-icd"
+	dodir ${OCL_DIR}/{,include}
 
-	emake DESTDIR="${D}" install
+	# Install vendor library
+	mv -f "${D}/usr/$(get_libdir)"/libOpenCL* "${ED}${OCL_DIR}" || die "Can't install vendor library"
 
-	OCL_DIR="${D}"/usr/"$(get_libdir)"/OpenCL/vendors/ocl-icd/
-	mkdir -p ${OCL_DIR} || die "mkdir failed"
+	# Install vendor headers
+	if use khronos-headers; then
+		cp -r "${S}/khronos-headers/CL" "${ED}${OCL_DIR}/include" || die "Can't install vendor headers"
+	fi
+}
 
-	mv "${D}/usr/$(get_libdir)"/libOpenCL* "${OCL_DIR}"
+pkg_postinst() {
+	eselect opencl set --use-old ${PN}
 }


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2018-10-08 15:43 Matt Turner
  0 siblings, 0 replies; 35+ messages in thread
From: Matt Turner @ 2018-10-08 15:43 UTC (permalink / raw
  To: gentoo-commits

commit:     b9fac3ab728ed3a7c0e40a69dae16681de89f5d5
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  8 13:09:05 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Oct  8 15:43:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9fac3ab

dev-libs/ocl-icd: Version bump to 2.2.12

Closes: https://bugs.gentoo.org/637964
Closes: https://bugs.gentoo.org/646122
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-libs/ocl-icd/Manifest              |  1 +
 dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild | 45 ++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index 7961347b071..e567ef17486 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,4 +1,5 @@
 DIST ocl-icd-2.1.3.tar.gz 419083 BLAKE2B 2cd12aeb199a263581c1e02babb206b5fa1747977aa6d09bca6aa15376a5c9206a57e944b50f02cb7d2bbe634ac3522659c85b40cf336d03be48bb15e874fcda SHA512 5d0704bed8a664950131c985fc32ffe5e078874945642417122df79c66bad804307192db49a561330268664ceb59756b268cf52201b809398efe58c85f823ad3
 DIST ocl-icd-2.2.11.tar.gz 455800 BLAKE2B 64da3670d3631dba06030d5f6764522fae6c868d4cf45b1a47a0e2b004831797ff7881353a34fb6fff64e4af5b9ebd475b800303ad1e37c7c11b265981ed22a3 SHA512 54d6a281f0fc04858323ef8d1764c5d2276d9a003853d5af5821a6dd24c74a744da0ff2204179a5877d0e3f156d03c83236797cd5ca88e6897457c75da6713cd
+DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
 DIST ocl-icd-2.2.3.tar.gz 446966 BLAKE2B 53a6f960370580f2ffa954089f8d31ea3c275e3f28561883b4ad3d79bee1904d991aeec00898ef6cb0080c604ffea8fcc22c1da8f812eb162cd158f4737eddf2 SHA512 da890da32cd61e42f610df472ac651d47edb1b014d98c25a778551fe6973bdb47753417b2eeab220a07f2862468845e3ac31a2e9631eac5eed05153f09da2cb9
 DIST ocl-icd-2.2.8.tar.gz 452374 BLAKE2B b204fa88f140f854d66f8f6c2ce71423b2e9b98f203350608f302f965749e190e3afd88a19306ad3e65fe267643ed37154a0f07456a987f31bd6c81d8ec6849e SHA512 4d0364616c105ec421a39cc6a38b3a835a63280188a1e19f595eff655d50581ab1af83d2aa26fec956d33b5f492789797b3a05e29897e4342d38521d8902da96

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
new file mode 100644
index 00000000000..f102277aa8f
--- /dev/null
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal
+
+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"
+
+IUSE=""
+
+DEPEND="dev-lang/ruby
+	dev-ruby/rubygems"
+RDEPEND="app-eselect/eselect-opencl"
+
+src_prepare() {
+	replace-flags -Os -O2 # bug 646122
+
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf --enable-pthread-once
+}
+
+multilib_src_install() {
+	find "${D}" -name '*.la' -delete || die
+
+	echo "/usr/$(get_libdir)/OpenCL/vendors/ocl-icd/libOpenCL.so" > "${PN}-${ABI}.icd"
+	insinto /etc/OpenCL/vendors/
+	doins "${PN}-${ABI}.icd"
+
+	emake DESTDIR="${D}" install
+
+	OCL_DIR="${D}"/usr/"$(get_libdir)"/OpenCL/vendors/ocl-icd/
+	mkdir -p ${OCL_DIR} || die "mkdir failed"
+
+	mv "${D}/usr/$(get_libdir)"/libOpenCL* "${OCL_DIR}"
+}


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2018-10-08 15:43 Matt Turner
  0 siblings, 0 replies; 35+ messages in thread
From: Matt Turner @ 2018-10-08 15:43 UTC (permalink / raw
  To: gentoo-commits

commit:     b361132307c78fa89ea761a5740c0b0e80cb8033
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  8 13:41:20 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Oct  8 15:43:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3611323

dev-libs/ocl-icd: Drop old versions

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 dev-libs/ocl-icd/Manifest             |  3 ---
 dev-libs/ocl-icd/ocl-icd-2.1.3.ebuild | 35 -----------------------------------
 dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild | 35 -----------------------------------
 dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild | 35 -----------------------------------
 4 files changed, 108 deletions(-)

diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index e567ef17486..c9dd68dd06a 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,5 +1,2 @@
-DIST ocl-icd-2.1.3.tar.gz 419083 BLAKE2B 2cd12aeb199a263581c1e02babb206b5fa1747977aa6d09bca6aa15376a5c9206a57e944b50f02cb7d2bbe634ac3522659c85b40cf336d03be48bb15e874fcda SHA512 5d0704bed8a664950131c985fc32ffe5e078874945642417122df79c66bad804307192db49a561330268664ceb59756b268cf52201b809398efe58c85f823ad3
 DIST ocl-icd-2.2.11.tar.gz 455800 BLAKE2B 64da3670d3631dba06030d5f6764522fae6c868d4cf45b1a47a0e2b004831797ff7881353a34fb6fff64e4af5b9ebd475b800303ad1e37c7c11b265981ed22a3 SHA512 54d6a281f0fc04858323ef8d1764c5d2276d9a003853d5af5821a6dd24c74a744da0ff2204179a5877d0e3f156d03c83236797cd5ca88e6897457c75da6713cd
 DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
-DIST ocl-icd-2.2.3.tar.gz 446966 BLAKE2B 53a6f960370580f2ffa954089f8d31ea3c275e3f28561883b4ad3d79bee1904d991aeec00898ef6cb0080c604ffea8fcc22c1da8f812eb162cd158f4737eddf2 SHA512 da890da32cd61e42f610df472ac651d47edb1b014d98c25a778551fe6973bdb47753417b2eeab220a07f2862468845e3ac31a2e9631eac5eed05153f09da2cb9
-DIST ocl-icd-2.2.8.tar.gz 452374 BLAKE2B b204fa88f140f854d66f8f6c2ce71423b2e9b98f203350608f302f965749e190e3afd88a19306ad3e65fe267643ed37154a0f07456a987f31bd6c81d8ec6849e SHA512 4d0364616c105ec421a39cc6a38b3a835a63280188a1e19f595eff655d50581ab1af83d2aa26fec956d33b5f492789797b3a05e29897e4342d38521d8902da96

diff --git a/dev-libs/ocl-icd/ocl-icd-2.1.3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.1.3.ebuild
deleted file mode 100644
index d66ceb609c6..00000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
-HOMEPAGE="http://forge.imag.fr/projects/ocl-icd/"
-SRC_URI="https://forge.imag.fr/frs/download.php/524/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="dev-lang/ruby"
-RDEPEND="app-eselect/eselect-opencl"
-
-src_prepare() {
-	echo "/usr/$(get_libdir)/OpenCL/vendors/ocl-icd/libOpenCL.so" > ocl-icd.icd
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors/
-	doins ocl-icd.icd
-
-	emake DESTDIR="${D}" install
-
-	OCL_DIR="${D}"/usr/"$(get_libdir)"/OpenCL/vendors/ocl-icd/
-	mkdir -p ${OCL_DIR} || die "mkdir failed"
-
-	mv "${D}/usr/$(get_libdir)"/libOpenCL* "${OCL_DIR}"
-}

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild
deleted file mode 100644
index 6bdcf99bb97..00000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
-HOMEPAGE="http://forge.imag.fr/projects/ocl-icd/"
-SRC_URI="https://forge.imag.fr/frs/download.php/598/${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="dev-lang/ruby
-	dev-ruby/rubygems"
-RDEPEND="app-eselect/eselect-opencl"
-
-src_prepare() {
-	echo "/usr/$(get_libdir)/OpenCL/vendors/ocl-icd/libOpenCL.so" > ocl-icd.icd
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors/
-	doins ocl-icd.icd
-
-	emake DESTDIR="${D}" install
-
-	OCL_DIR="${D}"/usr/"$(get_libdir)"/OpenCL/vendors/ocl-icd/
-	mkdir -p ${OCL_DIR} || die "mkdir failed"
-
-	mv "${D}/usr/$(get_libdir)"/libOpenCL* "${OCL_DIR}"
-}

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild
deleted file mode 100644
index 3ccb21b5d9b..00000000000
--- a/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
-HOMEPAGE="http://forge.imag.fr/projects/ocl-icd/"
-SRC_URI="https://forge.imag.fr/frs/download.php/698/${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND="dev-lang/ruby
-	dev-ruby/rubygems"
-RDEPEND="app-eselect/eselect-opencl"
-
-src_prepare() {
-	echo "/usr/$(get_libdir)/OpenCL/vendors/ocl-icd/libOpenCL.so" > ocl-icd.icd
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors/
-	doins ocl-icd.icd
-
-	emake DESTDIR="${D}" install
-
-	OCL_DIR="${D}"/usr/"$(get_libdir)"/OpenCL/vendors/ocl-icd/
-	mkdir -p ${OCL_DIR} || die "mkdir failed"
-
-	mv "${D}/usr/$(get_libdir)"/libOpenCL* "${OCL_DIR}"
-}


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2017-06-15  9:54 Agostino Sarubbo
  0 siblings, 0 replies; 35+ messages in thread
From: Agostino Sarubbo @ 2017-06-15  9:54 UTC (permalink / raw
  To: gentoo-commits

commit:     2a337443bc3d6b68fd230ff72f75a22d142de705
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 15 09:53:58 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 09:53:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a337443

dev-libs/ocl-icd: x86 stable wrt bug #621594

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild
index b45f7693f9b..6815b304b06 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://forge.imag.fr/projects/ocl-icd/"
 SRC_URI="https://forge.imag.fr/frs/download.php/814/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2017-06-13 10:47 Agostino Sarubbo
  0 siblings, 0 replies; 35+ messages in thread
From: Agostino Sarubbo @ 2017-06-13 10:47 UTC (permalink / raw
  To: gentoo-commits

commit:     9e1d07f8368c4488d0e939cb09f98f890d6671b9
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 10:46:41 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 10:46:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e1d07f8

dev-libs/ocl-icd: amd64 stable wrt bug #621594

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild
index ab817a1cf42..b45f7693f9b 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://forge.imag.fr/projects/ocl-icd/"
 SRC_URI="https://forge.imag.fr/frs/download.php/814/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE=""
 


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2017-01-28 21:06 Patrick Lauer
  0 siblings, 0 replies; 35+ messages in thread
From: Patrick Lauer @ 2017-01-28 21:06 UTC (permalink / raw
  To: gentoo-commits

commit:     2cd7d5d7167294c92317d3c43160e2a2831721df
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 21:05:49 2017 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 21:06:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cd7d5d7

dev-libs/ocl-icd: Bump

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-libs/ocl-icd/Manifest              |  1 +
 dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild | 36 ++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index b9ecd2c..970f930 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,3 +1,4 @@
 DIST ocl-icd-2.1.3.tar.gz 419083 SHA256 8338c6ae5cb7a9b34dfe79922f5e32c4f78c535a2217321dae842f72e0a2b175 SHA512 5d0704bed8a664950131c985fc32ffe5e078874945642417122df79c66bad804307192db49a561330268664ceb59756b268cf52201b809398efe58c85f823ad3 WHIRLPOOL f2757e00dcd9d484b1536ebb6b776bf5b54cd3e13cfa1b56fc95ef1e71f3db36bdb4ff996b2ddfb18d63082ebfdf743b9aeb41ed76910020724cfde7839e741b
+DIST ocl-icd-2.2.11.tar.gz 455800 SHA256 02fa41da98ae2807e92742196831d320e3fc2f4cb1118d0061d9f51dda867730 SHA512 54d6a281f0fc04858323ef8d1764c5d2276d9a003853d5af5821a6dd24c74a744da0ff2204179a5877d0e3f156d03c83236797cd5ca88e6897457c75da6713cd WHIRLPOOL 23ad2e481062fa1d1b40ff422554bac3f3ad8c9bb577993ed0ee501e7fca38efa0f0ea0dc08e9032b68b55a83b24dc1b44d642eb340f1aef671d4b723ed30941
 DIST ocl-icd-2.2.3.tar.gz 446966 SHA256 93a5ac3b23fb10731cc9e6406a58f7a21825562877787ed08c3a41f08b504d0c SHA512 da890da32cd61e42f610df472ac651d47edb1b014d98c25a778551fe6973bdb47753417b2eeab220a07f2862468845e3ac31a2e9631eac5eed05153f09da2cb9 WHIRLPOOL 1025d9b10d0140777d50abef5049df033b5a3f405807997eef3c3d88c7d4c1bd568316a20a40f936eb253da5b473aedbc764702bf5145c6c4203d85b6b420239
 DIST ocl-icd-2.2.8.tar.gz 452374 SHA256 25360a62a80558f3128164510b53ee00713a54db45de2faa1b6f4bd28191a184 SHA512 4d0364616c105ec421a39cc6a38b3a835a63280188a1e19f595eff655d50581ab1af83d2aa26fec956d33b5f492789797b3a05e29897e4342d38521d8902da96 WHIRLPOOL 89479c3bfcc366c67b7ff4bb04b4d4982cabd61984dab4e341b3b493c9676b0283e1d9960e0e0bd300330caf7b072d4a3d6a32fd3fbcbd8942428d5c80fe1cc5

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild
new file mode 100644
index 00000000..cbf3744
--- /dev/null
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
+HOMEPAGE="http://forge.imag.fr/projects/ocl-icd/"
+SRC_URI="https://forge.imag.fr/frs/download.php/814/${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="dev-lang/ruby
+	dev-ruby/rubygems"
+RDEPEND="app-eselect/eselect-opencl"
+
+src_prepare() {
+	echo "/usr/$(get_libdir)/OpenCL/vendors/ocl-icd/libOpenCL.so" > ocl-icd.icd
+}
+
+src_install() {
+	insinto /etc/OpenCL/vendors/
+	doins ocl-icd.icd
+
+	emake DESTDIR="${D}" install
+
+	OCL_DIR="${D}"/usr/"$(get_libdir)"/OpenCL/vendors/ocl-icd/
+	mkdir -p ${OCL_DIR} || die "mkdir failed"
+
+	mv "${D}/usr/$(get_libdir)"/libOpenCL* "${OCL_DIR}"
+}


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2016-03-22  5:19 Patrick Lauer
  0 siblings, 0 replies; 35+ messages in thread
From: Patrick Lauer @ 2016-03-22  5:19 UTC (permalink / raw
  To: gentoo-commits

commit:     2604450aafa12df3500690a94d437d6cd27879e9
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 05:18:22 2016 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 05:18:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2604450a

dev-libs/ocl-icd: Whitespace

Package-Manager: portage-2.2.28

 dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild | 2 +-
 dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild
index e8b5685..a786a5c 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-lang/ruby
-        dev-ruby/rubygems"
+	dev-ruby/rubygems"
 RDEPEND="app-eselect/eselect-opencl"
 
 src_prepare() {

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild
index d8daeee..3cdac79 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-lang/ruby
-        dev-ruby/rubygems"
+	dev-ruby/rubygems"
 RDEPEND="app-eselect/eselect-opencl"
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2016-03-21 22:04 Patrice Clement
  0 siblings, 0 replies; 35+ messages in thread
From: Patrice Clement @ 2016-03-21 22:04 UTC (permalink / raw
  To: gentoo-commits

commit:     b301b35f46b3c689db3c262dfc2c4b2baab2e76a
Author:     Abheek Ghosh <abheekghosh.ag <AT> gmail <DOT> com>
AuthorDate: Sun Mar 13 09:06:03 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 21:51:15 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b301b35f

dev-libs/ocl-icd: fix dev-lang/ruby dependency

ocl-icd requires dev-ruby/rubygems to build.
version 2.2.3 and 2.2.8 fixed.

Gentoo-Bug: https://bugs.gentoo.org/577266
Closes: https://github.com/gentoo/gentoo/pull/1038

 dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild | 3 ++-
 dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild
index 1cd0749..e8b5685 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.3.ebuild
@@ -15,7 +15,8 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
-DEPEND="dev-lang/ruby"
+DEPEND="dev-lang/ruby
+        dev-ruby/rubygems"
 RDEPEND="app-eselect/eselect-opencl"
 
 src_prepare() {

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild
index 20cd5fb..d8daeee 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild
@@ -15,7 +15,8 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
-DEPEND="dev-lang/ruby"
+DEPEND="dev-lang/ruby
+        dev-ruby/rubygems"
 RDEPEND="app-eselect/eselect-opencl"
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 35+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/
@ 2016-02-18 15:23 Patrick Lauer
  0 siblings, 0 replies; 35+ messages in thread
From: Patrick Lauer @ 2016-02-18 15:23 UTC (permalink / raw
  To: gentoo-commits

commit:     21d74f4daaa41c61b18868d3b7d82f2610d154a4
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 15:22:30 2016 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 15:22:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21d74f4d

dev-libs/ocl-icd: Bump #575020

Package-Manager: portage-2.2.27

 dev-libs/ocl-icd/Manifest             |  1 +
 dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index 42e089f..b9ecd2c 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -1,2 +1,3 @@
 DIST ocl-icd-2.1.3.tar.gz 419083 SHA256 8338c6ae5cb7a9b34dfe79922f5e32c4f78c535a2217321dae842f72e0a2b175 SHA512 5d0704bed8a664950131c985fc32ffe5e078874945642417122df79c66bad804307192db49a561330268664ceb59756b268cf52201b809398efe58c85f823ad3 WHIRLPOOL f2757e00dcd9d484b1536ebb6b776bf5b54cd3e13cfa1b56fc95ef1e71f3db36bdb4ff996b2ddfb18d63082ebfdf743b9aeb41ed76910020724cfde7839e741b
 DIST ocl-icd-2.2.3.tar.gz 446966 SHA256 93a5ac3b23fb10731cc9e6406a58f7a21825562877787ed08c3a41f08b504d0c SHA512 da890da32cd61e42f610df472ac651d47edb1b014d98c25a778551fe6973bdb47753417b2eeab220a07f2862468845e3ac31a2e9631eac5eed05153f09da2cb9 WHIRLPOOL 1025d9b10d0140777d50abef5049df033b5a3f405807997eef3c3d88c7d4c1bd568316a20a40f936eb253da5b473aedbc764702bf5145c6c4203d85b6b420239
+DIST ocl-icd-2.2.8.tar.gz 452374 SHA256 25360a62a80558f3128164510b53ee00713a54db45de2faa1b6f4bd28191a184 SHA512 4d0364616c105ec421a39cc6a38b3a835a63280188a1e19f595eff655d50581ab1af83d2aa26fec956d33b5f492789797b3a05e29897e4342d38521d8902da96 WHIRLPOOL 89479c3bfcc366c67b7ff4bb04b4d4982cabd61984dab4e341b3b493c9676b0283e1d9960e0e0bd300330caf7b072d4a3d6a32fd3fbcbd8942428d5c80fe1cc5

diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild
new file mode 100644
index 0000000..20cd5fb
--- /dev/null
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib
+
+DESCRIPTION="Alternative to vendor specific OpenCL ICD loaders"
+HOMEPAGE="http://forge.imag.fr/projects/ocl-icd/"
+SRC_URI="https://forge.imag.fr/frs/download.php/698/${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND="dev-lang/ruby"
+RDEPEND="app-eselect/eselect-opencl"
+
+src_prepare() {
+	echo "/usr/$(get_libdir)/OpenCL/vendors/ocl-icd/libOpenCL.so" > ocl-icd.icd
+}
+
+src_install() {
+	insinto /etc/OpenCL/vendors/
+	doins ocl-icd.icd
+
+	emake DESTDIR="${D}" install
+
+	OCL_DIR="${D}"/usr/"$(get_libdir)"/OpenCL/vendors/ocl-icd/
+	mkdir -p ${OCL_DIR} || die "mkdir failed"
+
+	mv "${D}/usr/$(get_libdir)"/libOpenCL* "${OCL_DIR}"
+}


^ permalink raw reply related	[flat|nested] 35+ messages in thread

end of thread, other threads:[~2022-07-26  4:47 UTC | newest]

Thread overview: 35+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-24  1:04 [gentoo-commits] repo/gentoo:master commit in: dev-libs/ocl-icd/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2022-07-26  4:46 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-04-09 21:15 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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox