[dev-util/opencl-headers] block agains cuda-toolkit, [virtual/opencl] add alternative to cuda-toolkit

7 files changed, 55 insertions, 2 deletions

diff --git a/dev-util/opencl-headers/ChangeLog b/dev-util/opencl-headers/ChangeLog
index 5e9a4d7..434bcc8 100644
--- a/dev-util/opencl-headers/ChangeLog
+++ b/dev-util/opencl-headers/ChangeLog
@@ -4,6 +4,10 @@
 
   21 Dec 2011; Kacper Kowalik <xarthisius@gentoo.org>
   opencl-headers-1.1.ebuild:
+  Add temporary bloker agains cuda-toolkit
+
+  21 Dec 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  opencl-headers-1.1.ebuild:
   Fix license, remove d10 header
 
 *opencl-headers-1.1 (20 Dec 2011)
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index 6887ebb..755fe0d 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -5,6 +5,6 @@ DIST cl_gl.h 6715 RMD160 b995246a14278bf43aa356242636bce2b5f3b962 SHA1 87d43a39a
 DIST cl_gl_ext.h 2632 RMD160 6d29edceb52f4997f9600f43c69078cb9c24825b SHA1 1cab14eebd71aa90823dbc0d1346fc736cc696df SHA256 aaa317644ec14cc68fd877ac630a93e21c37497a047396792b679ae78ba344bc
 DIST cl_platform.h 38036 RMD160 13819fc2f65f1ca028aa1ebcb96ce6a5d9948b34 SHA1 c97a6e08aca4837daf3073d7a3938457a990b251 SHA256 aedd544164012026ab69e973acc2a248d298d1e1e1fb12f4710e9d5ab0bfd4e3
 DIST opencl.h 1754 RMD160 37acc641bb24e319192384f0b2eeef225a82d0d0 SHA1 d3cc5d61d2ad077085d1c60b4bdf8c03b093f159 SHA256 a69842d53ea5b505323a6bee242cca8ddba47294f69972fe61c0371636935819
-EBUILD opencl-headers-1.1.ebuild 891 RMD160 6b1c7e06f06a712454d9e64d999d8bb28a938759 SHA1 5eea2ad4542f3f7a1d93a225adefe4eea85caef1 SHA256 5cd5b2ff7cd7023707790b2303f5bb13ad5a013c6488ce505ee4313455f31159
-MISC ChangeLog 434 RMD160 06f7b1bf74a3cb4028debe2b4d0cdccd26bd5fb1 SHA1 457de98684396b8c08051f72463c1f17d1fe0c07 SHA256 e2f442308e2a73dc4875ec6f16a9db079659bfa141387bb6f5f28d653803c202
+EBUILD opencl-headers-1.1.ebuild 951 RMD160 55aa6dbaea0f2f9d950a31e50b297c0170f82a1e SHA1 be41d45627e26009ad581023a720db563092e702 SHA256 0254346d44262cc0b91d4a1e1a5332971375750fcc3061687520a610da978d92
+MISC ChangeLog 561 RMD160 3832390edfbae70a83aa1249af100e55916c57c3 SHA1 7cadd75587edd6d25e3f9e5873ed7201ed9ffbc9 SHA256 01273f6a5aecb1eab351cbc4caa19678ead659fba9701f88ac2d133feb3bf74c
 MISC metadata.xml 237 RMD160 c1eff8035f69f2011d83fdee601d3131a88ea9bf SHA1 bbbe43f48a08f38c431e4f1aecd0210b8049798b SHA256 da0461f424a48f918d7233b1c957149d1bedcd5b81e63652176728af4e524c6f
diff --git a/dev-util/opencl-headers/opencl-headers-1.1.ebuild b/dev-util/opencl-headers/opencl-headers-1.1.ebuild
index beba0c6..b72b842 100644
--- a/dev-util/opencl-headers/opencl-headers-1.1.ebuild
+++ b/dev-util/opencl-headers/opencl-headers-1.1.ebuild
@@ -21,6 +21,9 @@ IUSE=""
 
 HEADERS=( opencl.h cl_platform.h cl.h cl_ext.h cl_gl.h cl_gl_ext.h cl.hpp )
 
+DEPEND="!dev-util/nvidia-cuda-toolkit"
+RDEPEND="${DEPEND}"
+
 src_unpack() {
 	mkdir "${S}" || die
 	for f in ${HEADERS[@]}; do
diff --git a/virtual/opencl/ChangeLog b/virtual/opencl/ChangeLog
new file mode 100644
index 0000000..7de2a68
--- /dev/null
+++ b/virtual/opencl/ChangeLog
@@ -0,0 +1,14 @@
+# ChangeLog for virtual/opencl
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/opencl/ChangeLog,v 1.2 2011/12/20 22:09:15 vapier Exp $
+
+  20 Dec 2011; Mike Frysinger <vapier@gentoo.org> opencl-0.ebuild:
+  Drop ATI from dep list for now since that only provides the libraries and not
+  the required headers #392179#2 by Emil Karlson.
+
+*opencl-0 (20 Dec 2011)
+
+  20 Dec 2011; Mike Frysinger <vapier@gentoo.org> +opencl-0.ebuild,
+  +metadata.xml:
+  Initial ebuild by me for #392179 by Michal Pytasz.
+
diff --git a/virtual/opencl/Manifest b/virtual/opencl/Manifest
new file mode 100644
index 0000000..75db4c0
--- /dev/null
+++ b/virtual/opencl/Manifest
@@ -0,0 +1,3 @@
+EBUILD opencl-0.ebuild 696 RMD160 f06efa0c5a4e7b1e5ee32b355a18a0293edb3f09 SHA1 2bd4609c043b9fd8b895aa8949191cf2148cf939 SHA256 3398e00ebba8543c93209d834b95248c84bcc5f5a2288186e0f4127629b3523a
+MISC ChangeLog 563 RMD160 aa2dd37824bca3c9e8676a43f7e4856190b82ab0 SHA1 fa77721c3e624a171d1b40ca84f6edf440e00c90 SHA256 d73326fe95e263947a3266673baa0894b270efa8e32a6b63ba44d0f53a07a9a7
+MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/virtual/opencl/metadata.xml b/virtual/opencl/metadata.xml
new file mode 100644
index 0000000..01c4c00
--- /dev/null
+++ b/virtual/opencl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/virtual/opencl/opencl-0.ebuild b/virtual/opencl/opencl-0.ebuild
new file mode 100644
index 0000000..6eca249
--- /dev/null
+++ b/virtual/opencl/opencl-0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/opencl/opencl-0.ebuild,v 1.2 2011/12/20 22:09:15 vapier Exp $
+
+# Until ATI's SDK is in the tree, nvidia is the only
+# viable provider #392179 #257626
+
+EAPI="4"
+
+DESCRIPTION="Virtual for OpenCL implementations"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+#CARDS=( fglrx nvidia )
+CARDS=( nvidia )
+IUSE="${CARDS[@]/#/video_cards_}"
+
+REQUIRED_USE="|| ( ${IUSE} )"
+
+#		video_cards_fglrx? ( x11-drivers/ati-drivers[opencl] )
+RDEPEND="|| (
+		video_cards_nvidia? ( x11-drivers/nvidia-drivers
+			|| ( dev-util/opencl-headers >=dev-util/nvidia-cuda-toolkit-3.1 ) )
+	)"