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

[Justin Lecher]

commit:     171a83acc6180827dcc5912b1d42404a81433c54
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Mon Feb  2 08:09:06 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Feb  2 08:09:06 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=171a83ac

dev-util/amdap: Fix 32bit build, add link to download archive

---
 dev-util/amdapp/ChangeLog         |  4 ++++
 dev-util/amdapp/amdapp-2.8.ebuild | 22 ++++++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/dev-util/amdapp/ChangeLog b/dev-util/amdapp/ChangeLog
index 6b46c97..1bf218e 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: $
 
+  02 Feb 2015; Marius Brehler <marbre@××××××××××××××.de>
+  amdapp-2.8.ebuild:
+  Fix 32bit build, add link to download archive
+
 *amdapp-2.9 (01 Feb 2015)
 
   01 Feb 2015; Marius Brehler <marbre@××××××××××××××.de>

diff --git a/dev-util/amdapp/amdapp-2.8.ebuild b/dev-util/amdapp/amdapp-2.8.ebuild
index 53a239e..1d921bb 100644
--- a/dev-util/amdapp/amdapp-2.8.ebuild
+++ b/dev-util/amdapp/amdapp-2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -9,11 +9,15 @@ inherit multilib
 X86_AT="AMD-APP-SDK-v${PV}-lnx32.tgz"
 AMD64_AT="AMD-APP-SDK-v${PV}-lnx64.tgz"
 
-MY_P="AMD-APP-SDK-v2.8-RC-lnx64"
+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} )"
@@ -44,12 +48,22 @@ S="${WORKDIR}/${MY_P}"
 
 pkg_nofetch() {
 	einfo "AMD doesn't provide direct download links. Please download"
-	einfo "${ARCHIVE} from ${HOMEPAGE}"
+	einfo "${ARCHIVE} from ${CURI}"
 }
 
 src_unpack() {
 	default
-	unpack ./${MY_P}.tgz
+
+	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
 }