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@gentoo.org>

3 files changed, 14 insertions, 88 deletions

diff --git a/dev-util/amdapp/Manifest b/dev-util/amdapp/Manifest
index a7a444f5d..86cd92e8a 100644
--- a/dev-util/amdapp/Manifest
+++ b/dev-util/amdapp/Manifest
@@ -1,4 +1,2 @@
-DIST AMD-APP-SDK-linux-v2.9-1.599.381-GA-x64.tar.bz2 126276109 SHA256 05337de10a4731a4f6b602849e8f0d2d0eec7bdd3637e94a8ea04aa332d26036 SHA512 41267cc5f020c6ddb6e60e6ed7141584aba4728c7f471d1b1244747fadfa175c811f7a0a273d95ddc07ac1b4fde8b64ad514a5eeee771e375b2d68f86eefcb50 WHIRLPOOL 172f3c9081569cbf5781a460b3a4ffcd9a2851cc0f47554fc9a1da5dcfd970fb774de46e8846c08331a166cac56687f13a661c2b74912e092b36d3b1d8829bc5
-DIST AMD-APP-SDK-linux-v2.9-1.599.381-GA-x86.tar.bz2 100512787 SHA256 a66bd935dfe871ecb0e940a4b5bc3bde310fca59a61bf9669f6b580d845c2db5 SHA512 59b3a12b51b22437fe0e743e7e0429455853f11c2a1b65fc91a63d6250dce1230460702287b1dc16a4672114d097a9e002ec93ed8c5063be2b070c242299aa5e WHIRLPOOL 56442f1a6bf03757b3a637f69c4083391540d523a74091318686da9ac8e342ff876285ce05ed3b6d21ce6e50072cdd6f0c239bee3550adafaff0cf2ae2065c6f
 DIST AMD-APP-SDKInstaller-v3.0.130.135-GA-linux32.tar.bz2 175232929 SHA256 8e1ad82b4cd2fcf58649daf4e43574d9d5c654cd2e07fcbb4bae7cc6d2f3daf6 SHA512 8f62ec26bf6655e71948418113553f39bfcff8588a857cb8706c2538c4742ab0e95d3843e1084acd7a8d0e8b26593a140677316b8aa285aca454828e545402a6 WHIRLPOOL 54001052fa9e8903a21916ec6265c5882d7e0d69180d2041ddde6d9ce9412a4188f7bf39d67f51792505b9a4e75b9dada2c78fcdc5e3ecadf522a8b5bda68091
 DIST AMD-APP-SDKInstaller-v3.0.130.135-GA-linux64.tar.bz2 175434609 SHA256 27a6145a73910d2320fd017159cf72f16601c375c2b304644c31566f45cc26a6 SHA512 c73ea4b4fa3f383e63755233d78203f1f5d387de1202875b40ed8e9a8b1e5a3bd6e9731244aac1086cdc1a764974ff95daca34261295a2746ddd478d0774460b WHIRLPOOL a11c878347e713b57343a7734acac505055154678cfb453cd1da84279f3e4100685d89151fb3be8ff16155f6459fa05fa9b12b5a634e28b86945023505fac810
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 b1ac7856a..000000000
--- 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 a9bea09b4..9d4baac86 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"