[gentoo-commits] proj/x11:master commit in: virtual/opencl/

[gentoo-commits] proj/x11:master commit in: virtual/opencl/

[Chi-Thanh Christopher Nguyen]

commit:     81cae9c992a5492ce362ff338dce1dd7d2c5e539
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 19 17:23:53 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Wed Jun 19 17:23:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=81cae9c9

virtual/opencl: relax dependencies

---
 virtual/opencl/{opencl-0-r3.ebuild => opencl-0-r4.ebuild} | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/virtual/opencl/opencl-0-r3.ebuild b/virtual/opencl/opencl-0-r4.ebuild
similarity index 69%
rename from virtual/opencl/opencl-0-r3.ebuild
rename to virtual/opencl/opencl-0-r4.ebuild
index 90faa1a..16c0da4 100644
--- a/virtual/opencl/opencl-0-r3.ebuild
+++ b/virtual/opencl/opencl-0-r4.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/virtual/opencl/opencl-0-r2.ebuild,v 1.2 2012/03/24 11:56:44 ago Exp $
 
-EAPI="4"
+EAPI=5
 
 DESCRIPTION="Virtual for OpenCL implementations"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-CARDS=( fglrx nvidia radeon nouveau )
+CARDS=( fglrx intel nvidia radeon nouveau )
 IUSE="${CARDS[@]/#/video_cards_}"
 
 DEPEND=""
@@ -16,7 +16,8 @@ RDEPEND="app-admin/eselect-opencl
 	|| (
 		video_cards_fglrx? ( >=x11-drivers/ati-drivers-12.1-r1 )
 		video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-290.10-r2 )
-		video_cards_radeon? ( >=media-libs/mesa-8.1[video_cards_radeon,opencl] )
-		video_cards_nouveau? ( >=media-libs/mesa-8.1[video_cards_nouveau,opencl] )
-		dev-util/intel-ocl-sdk
+		video_cards_intel? (
+			|| ( dev-util/intel-ocl-sdk dev-libs/beignet )
+		)
+		!video_cards_intel? ( media-libs/mesa[opencl,video_cards_nouveau?,video_cards_radeon?] )
 	)"

[gentoo-commits] proj/x11:master commit in: virtual/opencl/

[Chi-Thanh Christopher Nguyen]

commit:     4ca0f173de50721359956e674c1861bbd14d3efa
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  5 14:56:04 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Tue Nov  5 14:56:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=4ca0f173

virtual/opencl: drop

---
 virtual/opencl/metadata.xml       |  9 ---------
 virtual/opencl/opencl-0-r4.ebuild | 23 -----------------------
 2 files changed, 32 deletions(-)

diff --git a/virtual/opencl/metadata.xml b/virtual/opencl/metadata.xml
deleted file mode 100644
index 81cbff6..0000000
--- a/virtual/opencl/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>x11</herd>
-<maintainer>
-	<email>xarthisius@gentoo.org</email>
-	<name>Kacper Kowalik</name>
-</maintainer>
-</pkgmetadata>

diff --git a/virtual/opencl/opencl-0-r4.ebuild b/virtual/opencl/opencl-0-r4.ebuild
deleted file mode 100644
index 16c0da4..0000000
--- a/virtual/opencl/opencl-0-r4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/opencl/opencl-0-r2.ebuild,v 1.2 2012/03/24 11:56:44 ago Exp $
-
-EAPI=5
-
-DESCRIPTION="Virtual for OpenCL implementations"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-CARDS=( fglrx intel nvidia radeon nouveau )
-IUSE="${CARDS[@]/#/video_cards_}"
-
-DEPEND=""
-RDEPEND="app-admin/eselect-opencl
-	|| (
-		video_cards_fglrx? ( >=x11-drivers/ati-drivers-12.1-r1 )
-		video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-290.10-r2 )
-		video_cards_intel? (
-			|| ( dev-util/intel-ocl-sdk dev-libs/beignet )
-		)
-		!video_cards_intel? ( media-libs/mesa[opencl,video_cards_nouveau?,video_cards_radeon?] )
-	)"