5 files changed, 12 insertions, 99 deletions
diff --git a/dev-util/amdapp/ChangeLog b/dev-util/amdapp/ChangeLog
index 1bf218e4c..8cf85ee02 100644
--- a/dev-util/amdapp/ChangeLog
+++ b/dev-util/amdapp/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Feb 2015; Justin Lecher <jlec@gentoo.org> -amdapp-2.8.ebuild,
+  amdapp-2.9.ebuild, metadata.xml:
+  dev-util/amdapp: fix SLOT operators; restrict fetch; drop old
+
   02 Feb 2015; Marius Brehler <marbre@linux.sungazer.de>
   amdapp-2.8.ebuild:
   Fix 32bit build, add link to download archive
diff --git a/dev-util/amdapp/Manifest b/dev-util/amdapp/Manifest
index 1e1e5a63a..d26fd78d0 100644
--- a/dev-util/amdapp/Manifest
+++ b/dev-util/amdapp/Manifest
@@ -1,4 +1,2 @@
-DIST AMD-APP-SDK-v2.8-lnx32.tgz 72959001 SHA256 bfd53e90430fab6ddc6e0a6e2327d36047f21616be33ba36361007ccc111396d SHA512 2d1a5a6e45902b0e0f1d979392ca2c4d57d262389cec419852266d61297bc78b8a64a44840e20066b902ff9ea483ffbc9bcdc89e81df74069ed5a0e5aac4260a WHIRLPOOL ef7fed002b1a9f558007d32939184347379a51d46d122f8a512fc6af964c81657ec4533aa99b3c0dfe4868814329aa3cd6ae4825a801c8cbab40cddb05cfb63b
-DIST AMD-APP-SDK-v2.8-lnx64.tgz 111248454 SHA256 207a971227d4492b7da4961f3fb278131c1a438f31afc535205ac956c5acd1e7 SHA512 c8893e5abf804c14d79f6529d8894fba9cfdc83e5f096273108eb55720127418b5f3f6d6000965159ac784574670bf5c82aa458deb609cdbc3ddc7499c0a0968 WHIRLPOOL 885c1584c04948393477b3f9cd97c0273732a5913bdec7570aeed547b79bda178fa15c2042cd38dba1b9e3d0166b1a5998c5939b6136c0e3370a636794d6d809
 DIST AMD-APP-SDK-v2.9-lnx32.tgz 100284370 SHA256 86c0ebfd6a9037385d83d43237d986614f05ba035f50fd8d45e27c0d3c465646 SHA512 c0490223e5d8880bedf076fc6d7518507d59827caa29507cb0962b3ca4670f2a3a1d083019600ce838385d3116574887739f505cfdc01f5077a00ae584854bd0 WHIRLPOOL e6655eeeb47588d999585249f335571e427528d1a25878d6f16e47d37e1b30db5e1a1e13603f934ee20d76e5a3d16445c348169c3b6b6cbb81e5dfd543a43674
 DIST AMD-APP-SDK-v2.9-lnx64.tgz 149825628 SHA256 6287d3d0700e563f2086188b1b2143a0e988a12c1dc22709b9a23d28b8ae83bb SHA512 b00d92b9e2ead559aa66120697a1dc15ecbc1c880eed99c2a7ed030f6cccce7434245a94aa6149e2ce2dc287cb9443700d7dbc8b3756c7420c0f54cc008065bb WHIRLPOOL b839c042a73251c0b774d1c2f6b968c166f4b74b4828a4f12709220e2c79783833979140127ec98a19b0883d7bf49d031088aeaeeb150855907f18378d5de0a9
diff --git a/dev-util/amdapp/amdapp-2.8.ebuild b/dev-util/amdapp/amdapp-2.8.ebuild
deleted file mode 100644
index 1d921bb53..000000000
--- a/dev-util/amdapp/amdapp-2.8.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit multilib
-
-X86_AT="AMD-APP-SDK-v${PV}-lnx32.tgz"
-AMD64_AT="AMD-APP-SDK-v${PV}-lnx64.tgz"
-
-MY_P_AMD64="AMD-APP-SDK-v${PV}-RC-lnx64"
-MY_P_AMD32="AMD-APP-SDK-v${PV}-RC-lnx32"
-MY_P="AMD-APP-SDK-v${PV}-RC"
-
-DESCRIPTION="AMD Accelerated Parallel Processing (APP) SDK"
-HOMEPAGE="http://developer.amd.com/tools/heterogeneous-computing/\
-amd-accelerated-parallel-processing-app-sdk"
-CURI="http://developer.amd.com/tools-and-sdks/opencl-zone/\
-amd-accelerated-parallel-processing-app-sdk/download-archive"
-SRC_URI="
-		amd64? ( ${AMD64_AT} )
-		x86? ( ${X86_AT} )"
-LICENSE="AMD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="examples"
-
-RDEPEND="
-	app-admin/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-admin/eselect-opencl"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	dev-util/patchelf
-	sys-apps/fakeroot"
-
-RESTRICT="mirror strip"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_nofetch() {
-	einfo "AMD doesn't provide direct download links. Please download"
-	einfo "${ARCHIVE} from ${CURI}"
-}
-
-src_unpack() {
-	default
-
-	cd "${WORKDIR}" || die
-
-	if use amd64 || use amd64-linux ; then
-		unpack ./${MY_P_AMD64}.tgz
-		mv -f "${MY_P_AMD64}" "${MY_P}" || die
-	else
-		unpack ./${MY_P_X86}.tgz
-		mv -f "${MY_P_X86}" "${MY_P}" || die
-	fi
-
-	unpack ./icd-registration.tgz
-}
-
-src_prepare() {
-	AMD_CL=usr/$(get_libdir)/OpenCL/vendors/amd/
-}
-
-src_compile() {
-	MAKEOPTS+=" -j1"
-	use examples && cd samples/opencl && emake
-}
-
-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-2.9.ebuild b/dev-util/amdapp/amdapp-2.9.ebuild
index d981d2c73..d5880832f 100644
--- a/dev-util/amdapp/amdapp-2.9.ebuild
+++ b/dev-util/amdapp/amdapp-2.9.ebuild
@@ -14,11 +14,11 @@ MY_P_AMD32="AMD-APP-SDK-v${PV}-RC-lnx32"
 MY_P="AMD-APP-SDK-v${PV}-RC"
 
 DESCRIPTION="AMD Accelerated Parallel Processing (APP) SDK"
-HOMEPAGE="http://developer.amd.com/tools-and-sdks/opencl-zone/\
-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"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
@@ -28,7 +28,7 @@ RDEPEND="
 	app-admin/eselect-opengl
 	!<dev-util/amdstream-2.6
 	sys-devel/llvm
-	sys-devel/gcc
+	sys-devel/gcc:*
 	media-libs/mesa
 	media-libs/freeglut
 	virtual/opencl
@@ -40,7 +40,7 @@ DEPEND="
 	dev-util/patchelf
 	sys-apps/fakeroot"
 
-RESTRICT="mirror strip"
+RESTRICT="mirror strip fetch"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/amdapp/metadata.xml b/dev-util/amdapp/metadata.xml
index 870080c35..a35dc6f10 100644
--- a/dev-util/amdapp/metadata.xml
+++ b/dev-util/amdapp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>cluster</herd>
@@ -10,6 +10,6 @@
     <email>gentryx@gmx.de</email>
   </maintainer>
   <use>
-	<flag name='examples'>Build the OpenCL example programs</flag>
+    <flag name="examples">Build the OpenCL example programs</flag>
   </use>
 </pkgmetadata>