[gentoo-commits] proj/sci:master commit in: dev-util/amdapp/

["Justin Lecher" <jlec@gentoo.org>]

commit:     14a2831191dd4ed3c55adb49ec386404a378df05
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 29 11:29:20 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Jan 29 11:59:22 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=14a28311

dev-util/amdapp: Drop dependency on x11-drivers/ati-drivers

Bump EAPI to 6
sort deps
Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-util/amdapp/amdapp-2.9.1-r1.ebuild | 73 ----------------------------------
 dev-util/amdapp/amdapp-3.0-r1.ebuild   | 27 +++++++------
 2 files changed, 14 insertions(+), 86 deletions(-)

diff --git a/dev-util/amdapp/amdapp-2.9.1-r1.ebuild b/dev-util/amdapp/amdapp-2.9.1-r1.ebuild
deleted file mode 100644
index b1ac785..0000000
--- a/dev-util/amdapp/amdapp-2.9.1-r1.ebuild
+++ /dev/null
@@ -1,73 +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
-	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-r1.ebuild b/dev-util/amdapp/amdapp-3.0-r1.ebuild
index a9bea09..9d4baac 100644
--- a/dev-util/amdapp/amdapp-3.0-r1.ebuild
+++ b/dev-util/amdapp/amdapp-3.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit multilib unpacker versionator
 
@@ -17,29 +17,30 @@ 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} )"
+	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
+	app-eselect/eselect-opencl
+	app-eselect/eselect-opengl
 	media-libs/freeglut
+	media-libs/mesa[video_cards_radeonsi]
+	sys-devel/gcc:*
+	sys-devel/llvm
 	virtual/opencl
-	examples? ( media-libs/glew )
-	app-eselect/eselect-opencl
-	x11-drivers/ati-drivers"
+	examples? ( media-libs/glew:0= )"
 DEPEND="
 	${RDEPEND}
-	dev-lang/perl
 	dev-util/patchelf
-	sys-apps/fakeroot"
+	dev-lang/perl
+	sys-apps/fakeroot
+"
 
 RESTRICT="mirror strip"