From 1afb3f2d15e00209fbd4488b31b3e234e4399081 Mon Sep 17 00:00:00 2001
From: Marius Brehler <marbre@linux.sungazer.de>
Date: Mon, 7 Dec 2015 09:11:49 +0100
Subject: dev-util/amdapp: Add dependency on x11-drivers/ati-drivers

Let catalyst provide libOpenCL.so* and /etc/OpenCL/vendors files.

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=544124
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=567240

Package-Manager: portage-2.2.20.1
---
 dev-util/amdapp/ChangeLog              | 11 +++++
 dev-util/amdapp/amdapp-2.9.1-r1.ebuild | 73 ++++++++++++++++++++++++++++++
 dev-util/amdapp/amdapp-2.9.1.ebuild    | 83 ----------------------------------
 dev-util/amdapp/amdapp-3.0-r1.ebuild   | 73 ++++++++++++++++++++++++++++++
 dev-util/amdapp/amdapp-3.0.ebuild      | 83 ----------------------------------
 5 files changed, 157 insertions(+), 166 deletions(-)
 create mode 100644 dev-util/amdapp/amdapp-2.9.1-r1.ebuild
 delete mode 100644 dev-util/amdapp/amdapp-2.9.1.ebuild
 create mode 100644 dev-util/amdapp/amdapp-3.0-r1.ebuild
 delete mode 100644 dev-util/amdapp/amdapp-3.0.ebuild

(limited to 'dev-util')

diff --git a/dev-util/amdapp/ChangeLog b/dev-util/amdapp/ChangeLog
index a78a3e0db..582c3402d 100644
--- a/dev-util/amdapp/ChangeLog
+++ b/dev-util/amdapp/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*amdapp-2.9.1-r1 (07 Dec 2015)
+*amdapp-3.0-r1 (07 Dec 2015)
+
+  07 Dec 2015; Marius Brehler <marbre@linux.sungazer.de>
+  +amdapp-2.9.1-r1.ebuild, +amdapp-3.0-r1.ebuild, -amdapp-2.9.1.ebuild,
+  -amdapp-3.0.ebuild:
+  dev-util/amdapp: Add dependency on x11-drivers/ati-drivers  Rely on
+  libOpenCL.so* and /etc/OpenCL/vendors files provided by catalyst.  Gentoo-Bug:
+  https://bugs.gentoo.org/show_bug.cgi?id=544124 Gentoo-Bug:
+  https://bugs.gentoo.org/show_bug.cgi?id=567240
+
   07 Dec 2015; Marius Brehler <marbre@linux.sungazer.de> -amdapp-2.9.ebuild:
   dev-util/amdapp: Drop old
 
diff --git a/dev-util/amdapp/amdapp-2.9.1-r1.ebuild b/dev-util/amdapp/amdapp-2.9.1-r1.ebuild
new file mode 100644
index 000000000..b1ac7856a
--- /dev/null
+++ b/dev-util/amdapp/amdapp-2.9.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib unpacker versionator
+
+MY_V=$(get_version_component_range 1).$(get_version_component_range 2)
+
+X86_AT="AMD-APP-SDK-linux-v${MY_V}-1.599.381-GA-x86.tar.bz2"
+AMD64_AT="AMD-APP-SDK-linux-v${MY_V}-1.599.381-GA-x64.tar.bz2"
+
+MY_P_AMD64="AMD-APP-SDK-v${MY_V}-1.599.381-GA-linux64.sh"
+MY_P_AMD32="AMD-APP-SDK-v${MY_V}-1.599.381-GA-linux32.sh"
+
+DESCRIPTION="AMD Accelerated Parallel Processing (APP) SDK"
+HOMEPAGE="http://developer.amd.com/tools-and-sdks/opencl-zone/amd-accelerated-parallel-processing-app-sdk"
+SRC_URI="
+		amd64? ( ${AMD64_AT} )
+		x86? ( ${X86_AT} )"
+LICENSE="AMD-APPSDK"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	app-eselect/eselect-opengl
+	!<dev-util/amdstream-2.6
+	sys-devel/llvm
+	sys-devel/gcc:*
+	media-libs/mesa
+	media-libs/freeglut
+	virtual/opencl
+	examples? ( media-libs/glew )
+	app-eselect/eselect-opencl
+	x11-drivers/ati-drivers"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+	dev-util/patchelf
+	sys-apps/fakeroot"
+
+RESTRICT="mirror strip"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "AMD doesn't provide direct download links. Please download"
+	einfo "${ARCHIVE} from ${HOMEPAGE}"
+}
+
+src_unpack() {
+	default
+
+	cd "${WORKDIR}" || die
+
+	if use amd64 || use amd64-linux ; then
+		unpacker ./${MY_P_AMD64}
+	else
+		unpacker ./${MY_P_X86}
+	fi
+}
+
+src_compile() {
+	MAKEOPTS+=" -j1"
+	use examples && cd samples/opencl && default
+}
+
+src_install() {
+	dodir /opt/AMDAPP
+	cp -R "${S}/"* "${ED}/opt/AMDAPP" || die "Install failed!"
+}
diff --git a/dev-util/amdapp/amdapp-2.9.1.ebuild b/dev-util/amdapp/amdapp-2.9.1.ebuild
deleted file mode 100644
index 657a36245..000000000
--- a/dev-util/amdapp/amdapp-2.9.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib unpacker versionator
-
-MY_V=$(get_version_component_range 1).$(get_version_component_range 2)
-
-X86_AT="AMD-APP-SDK-linux-v${MY_V}-1.599.381-GA-x86.tar.bz2"
-AMD64_AT="AMD-APP-SDK-linux-v${MY_V}-1.599.381-GA-x64.tar.bz2"
-
-MY_P_AMD64="AMD-APP-SDK-v${MY_V}-1.599.381-GA-linux64.sh"
-MY_P_AMD32="AMD-APP-SDK-v${MY_V}-1.599.381-GA-linux32.sh"
-
-DESCRIPTION="AMD Accelerated Parallel Processing (APP) SDK"
-HOMEPAGE="http://developer.amd.com/tools-and-sdks/opencl-zone/amd-accelerated-parallel-processing-app-sdk"
-SRC_URI="
-		amd64? ( ${AMD64_AT} )
-		x86? ( ${X86_AT} )"
-LICENSE="AMD-APPSDK"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	app-eselect/eselect-opengl
-	!<dev-util/amdstream-2.6
-	sys-devel/llvm
-	sys-devel/gcc:*
-	media-libs/mesa
-	media-libs/freeglut
-	virtual/opencl
-	examples? ( media-libs/glew )
-	app-eselect/eselect-opencl"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	dev-util/patchelf
-	sys-apps/fakeroot"
-
-RESTRICT="mirror strip"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "AMD doesn't provide direct download links. Please download"
-	einfo "${ARCHIVE} from ${HOMEPAGE}"
-}
-
-src_unpack() {
-	default
-
-	cd "${WORKDIR}" || die
-
-	if use amd64 || use amd64-linux ; then
-		unpacker ./${MY_P_AMD64}
-	else
-		unpacker ./${MY_P_X86}
-	fi
-}
-
-src_prepare() {
-	AMD_CL=usr/$(get_libdir)/OpenCL/vendors/amd/
-}
-
-src_compile() {
-	MAKEOPTS+=" -j1"
-	use examples && cd samples/opencl && default
-}
-
-src_install() {
-	dodir /opt/AMDAPP
-	cp -R "${S}/"* "${ED}/opt/AMDAPP" || die "Install failed!"
-
-	dodir "${AMD_CL}"
-	dosym "/opt/AMDAPP/lib/`arch`/libOpenCL.so"   "${AMD_CL}"
-	dosym "/opt/AMDAPP/lib/`arch`/libOpenCL.so.1" "${AMD_CL}"
-
-	#insinto /etc/OpenCL/vendors/
-	#doins ../etc/OpenCL/vendors/*
-}
diff --git a/dev-util/amdapp/amdapp-3.0-r1.ebuild b/dev-util/amdapp/amdapp-3.0-r1.ebuild
new file mode 100644
index 000000000..a9bea09b4
--- /dev/null
+++ b/dev-util/amdapp/amdapp-3.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib unpacker versionator
+
+MY_V="$(get_version_component_range 1).$(get_version_component_range 2).130.135-GA"
+
+X86_AT="AMD-APP-SDKInstaller-v${MY_V}-linux32.tar.bz2"
+AMD64_AT="AMD-APP-SDKInstaller-v${MY_V}-linux64.tar.bz2"
+
+MY_P_AMD64="AMD-APP-SDK-v${MY_V}-linux64.sh"
+MY_P_AMD32="AMD-APP-SDK-v${MY_V}-linux32.sh"
+
+DESCRIPTION="AMD Accelerated Parallel Processing (APP) SDK"
+HOMEPAGE="http://developer.amd.com/tools-and-sdks/opencl-zone/amd-accelerated-parallel-processing-app-sdk"
+SRC_URI="
+		amd64? ( ${AMD64_AT} )
+		x86? ( ${X86_AT} )"
+LICENSE="AMD-APPSDK"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	app-eselect/eselect-opengl
+	!<dev-util/amdstream-2.6
+	sys-devel/llvm
+	sys-devel/gcc:*
+	media-libs/mesa
+	media-libs/freeglut
+	virtual/opencl
+	examples? ( media-libs/glew )
+	app-eselect/eselect-opencl
+	x11-drivers/ati-drivers"
+DEPEND="
+	${RDEPEND}
+	dev-lang/perl
+	dev-util/patchelf
+	sys-apps/fakeroot"
+
+RESTRICT="mirror strip"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+	einfo "AMD doesn't provide direct download links. Please download"
+	einfo "${ARCHIVE} from ${HOMEPAGE}"
+}
+
+src_unpack() {
+	default
+
+	cd "${WORKDIR}" || die
+
+	if use amd64 || use amd64-linux ; then
+		unpacker ./${MY_P_AMD64}
+	else
+		unpacker ./${MY_P_X86}
+	fi
+}
+
+src_compile() {
+	MAKEOPTS+=" -j1"
+	use examples && cd samples/opencl && default
+}
+
+src_install() {
+	dodir /opt/AMDAPP
+	cp -R "${S}/"* "${ED}/opt/AMDAPP" || die "Install failed!"
+}
diff --git a/dev-util/amdapp/amdapp-3.0.ebuild b/dev-util/amdapp/amdapp-3.0.ebuild
deleted file mode 100644
index 7baa570b2..000000000
--- a/dev-util/amdapp/amdapp-3.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib unpacker versionator
-
-MY_V="$(get_version_component_range 1).$(get_version_component_range 2).130.135-GA"
-
-X86_AT="AMD-APP-SDKInstaller-v${MY_V}-linux32.tar.bz2"
-AMD64_AT="AMD-APP-SDKInstaller-v${MY_V}-linux64.tar.bz2"
-
-MY_P_AMD64="AMD-APP-SDK-v${MY_V}-linux64.sh"
-MY_P_AMD32="AMD-APP-SDK-v${MY_V}-linux32.sh"
-
-DESCRIPTION="AMD Accelerated Parallel Processing (APP) SDK"
-HOMEPAGE="http://developer.amd.com/tools-and-sdks/opencl-zone/amd-accelerated-parallel-processing-app-sdk"
-SRC_URI="
-		amd64? ( ${AMD64_AT} )
-		x86? ( ${X86_AT} )"
-LICENSE="AMD-APPSDK"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-RDEPEND="
-	app-eselect/eselect-opengl
-	!<dev-util/amdstream-2.6
-	sys-devel/llvm
-	sys-devel/gcc:*
-	media-libs/mesa
-	media-libs/freeglut
-	virtual/opencl
-	examples? ( media-libs/glew )
-	app-eselect/eselect-opencl"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	dev-util/patchelf
-	sys-apps/fakeroot"
-
-RESTRICT="mirror strip"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "AMD doesn't provide direct download links. Please download"
-	einfo "${ARCHIVE} from ${HOMEPAGE}"
-}
-
-src_unpack() {
-	default
-
-	cd "${WORKDIR}" || die
-
-	if use amd64 || use amd64-linux ; then
-		unpacker ./${MY_P_AMD64}
-	else
-		unpacker ./${MY_P_X86}
-	fi
-}
-
-src_prepare() {
-	AMD_CL=usr/$(get_libdir)/OpenCL/vendors/amd/
-}
-
-src_compile() {
-	MAKEOPTS+=" -j1"
-	use examples && cd samples/opencl && default
-}
-
-src_install() {
-	dodir /opt/AMDAPP
-	cp -R "${S}/"* "${ED}/opt/AMDAPP" || die "Install failed!"
-
-	dodir "${AMD_CL}"
-	dosym "/opt/AMDAPP/lib/`arch`/libOpenCL.so"   "${AMD_CL}"
-	dosym "/opt/AMDAPP/lib/`arch`/libOpenCL.so.1" "${AMD_CL}"
-
-	#insinto /etc/OpenCL/vendors/
-	#doins ../etc/OpenCL/vendors/*
-}
-- 
cgit v1.2.3-65-gdbad