Updated version. Cleaned makefile.

3 files changed, 12 insertions, 92 deletions

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index 0c34fce..735dde4 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,6 +1,5 @@
-AUX Makefile 2206 RMD160 75f1ebb649aa8111e750c75b03452c7df9ffae5d SHA1 0644e3c66b2801e4cfe0663a4a81aa148d7360e8 SHA256 70ff4dbcbcd759babce9a1eb9fa355c7797116753e8f356eaaef1cea3469bf44
+AUX Makefile 2284 RMD160 88e0aa563e687c03219676b95c9f464093a7f4be SHA1 517c1088e3917f6a8f8b6358df7de2d964beb192 SHA256 2c6b248be818dc05dd0047cd92f0beaab6ac42689cce858f9d8b9dcd1fe5de3d
 DIST ati-stream-sdk-v2.3-lnx32.tgz 49912168 RMD160 07c045de3118531472672e9ef7b3763cb32f7d68 SHA1 972bdbe6942e52411a2f041720348e857f17c388 SHA256 07fd15a51a678c4378767f61466daf9da21d0bab6088a97a70136dd8c976aca6
 DIST ati-stream-sdk-v2.3-lnx64.tgz 78659015 RMD160 57af36f62e590ae54cb9d43b880735979b77466c SHA1 43c94e5126563fe3fa4cb92fb6dd20f12864a86d SHA256 f92537d1fc306af0bff1441af4669bf2fa668654b12d9fb53a3a872dc8826cad
 EBUILD ati-stream-sdk-2.3-r1.ebuild 1785 RMD160 a49779dcf7c9cc2c759edd252a8de82fb2b4731a SHA1 78f96f8730fb3da67dc6939a646567bf82174217 SHA256 b1f1607754f6ca3cb4784242dd260a9e8a6738d08fc7923dbf02ecdd9ee576aa
-EBUILD ati-stream-sdk-2.3.ebuild 1902 RMD160 3223fecbf191d822e896965ba63be3ebb2475d1e SHA1 b30d65c95630319b86c0b7a4fe5cd22323379093 SHA256 1f55cff88074875c4867fd52441fd266fbc3ab96016865f93eb21a4a07598948
 MISC metadata.xml 301 RMD160 1ef0179dbe53f24768e976ab60f6ae0e8ca9e672 SHA1 fba668cb8711ac2bcc6b7bfc113a1a513c69b0be SHA256 55f555e646e9d04c8975a736b9a5b3f1d8ea110446c18e988a3b884d0dca33b7
diff --git a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3.ebuild b/dev-util/ati-stream-sdk/ati-stream-sdk-2.3.ebuild
deleted file mode 100644
index b5fbd23..0000000
--- a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit eutils multilib
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Enable compiling code and loading it on ATI/AMD GPU"
-HOMEPAGE="http://developer.amd.com/GPU/ATISTREAMSDK/Pages/default.aspx"
-SRC_URI=" \
-	amd64? ( http://download2-developer.amd.com/amd/Stream20GA/${MY_P}-lnx64.tgz ) \
-	x86? ( http://download2-developer.amd.com/amd/Stream20GA/${MY_P}-lnx32.tgz )"
-
-LICENSE="AMD GPL-1 as-is"
-SLOT="0"
-KEYWORDS=""
-IUSE="examples doc multilib"
-RESTRICT="strip fetch"
-RDEPEND="media-libs/freeglut
-	x11-drivers/ati-drivers
-	examples? ( media-libs/glew )"
-
-QA_EXECSTACK="opt/${PN}/lib*/libatiocl??.so"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_nofetch() {
-	ewarn "Proprietary software. Download at"
-	ewarn "http://developer.amd.com/gpu/AMDAPPSDK/downloads/Pages/default.aspx"
-	ewarn "and move it to distfiles"
-}
-
-src_unpack() {
-	default_src_unpack
-
-	mv ${MY_P}-lnx* ${MY_P} || die
-}
-
-src_compile() { true; }
-
-src_install() {
-	local DEST=/opt/${PN}
-
-	rm include/GL/{glext.h,glut.h} || die
-
-	into ${DEST}
-	if use amd64; then
-		dobin bin/x86_64/* || die
-		dolib.so lib/x86_64/{libOpenCL.so,libatiocl64.so,libGLEW.so} || die
-	else
-		dobin bin/x86/* || die
-		dolib.so lib/x86/{libOpenCL.so,libatiocl32.so,libGLEW.so} || die
-	fi
-
-	insinto ${DEST}/$(get_libdir)
-	insopts -m0755
-	doins -r lib/gpu || die
-	insinto ${DEST}/include/
-	doins -r include/CL include/GL include/OVDecode include/cal*.h || die
-	use amd64 && (doins lib/x86_64/builtins-x86_64.bc || die)
-	use x86 && (doins lib/x86/builtins-x86.bc || die)
-
-	cat > "${T}/99${PN}" << EOF
-PATH=${DEST}/bin
-ROOTPATH=${DEST}/bin
-LDPATH=${DEST}/$(get_libdir)
-EOF
-	doenvd "${T}/99${PN}"
-
-	if use examples; then
-		insinto ${DEST}/exmaples
-		doins -r samples/* || die
-		insinto ${DEST}
-		doins -r make || die
-	fi
-
-	if use doc; then
-		dodoc docs/opencl/*
-	fi
-}
diff --git a/dev-util/ati-stream-sdk/files/Makefile b/dev-util/ati-stream-sdk/files/Makefile
index 1052039..9828850 100644
--- a/dev-util/ati-stream-sdk/files/Makefile
+++ b/dev-util/ati-stream-sdk/files/Makefile
@@ -24,10 +24,7 @@ DSUFX=
 SUFX=32
 endif
 
-install:
-	test -z "$(BINDIR)" || $(MKDIR) "$(BINDIR)"
-	test -z "$(LIBDIR)" || $(MKDIR) "$(LIBDIR)"
-	test -z "$(INCDIR)" || $(MKDIR) "$(INCDIR)"
+install-etc:
 	test -z "$(ETCDIR)" || $(MKDIR) "$(ETCDIR)"
 	tar -xzf icd-registration.tgz || exit 1
 	@list='$(ETCFILES)'; for f in $$list; do\
@@ -40,6 +37,9 @@ install:
 			$(INSTALLDAT) "$$f" $(ETCDIR)$$f1 || exit 1;\
 		else :; fi;\
 	done
+
+install-bin:
+	test -z "$(BINDIR)" || $(MKDIR) "$(BINDIR)"
 	@list='$(BINFILES)'; for f in $$list; do\
 		if test -f $$f; then\
 			f1=`basename $$f`;\
@@ -47,6 +47,9 @@ install:
 			$(INSTALLBIN) "$$f" "$(BINDIR)$$f1" || exit 1;\
 		else :; fi;\
 	done
+
+install-lib:
+	test -z "$(LIBDIR)" || $(MKDIR) "$(LIBDIR)"
 	@list='$(LIBFILES)'; for f in $$list; do\
 		if test -f $$f; then\
 			f1=`echo $$f | sed -e 's|lib/||g' -e 's|x86*/||g'`;\
@@ -57,6 +60,9 @@ install:
 			$(INSTALLBIN) "$$f" "$(LIBDIR)$$f1" || exit 1;\
 		else :; fi;\
 	done
+
+install-include:
+	test -z "$(INCDIR)" || $(MKDIR) "$(INCDIR)"
 	@list='$(INCFILES)'; for f in $$list; do\
 		if test -f $$f; then\
 			f1=`echo $$f | sed -e 's|include||g'`;\
@@ -68,7 +74,4 @@ install:
 		else :; fi;\
 	done
 
-install-examples:
-
-install-doc:
-
+install: install-etc install-bin install-lib install-include