[gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/

["Dane Smith" <c1pher@gentoo.org>]

commit:     4bf35f14376b8485f230be4610b0cadd4ee8a15b
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 19:28:24 2011 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 19:28:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=4bf35f14

Stupid. binaries.

---
 dev-util/ati-stream-sdk/Manifest                   |    2 +-
 .../ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild    |   27 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/Manifest
index ee7f077..49375c5 100644
--- a/dev-util/ati-stream-sdk/Manifest
+++ b/dev-util/ati-stream-sdk/Manifest
@@ -1,5 +1,5 @@
 AUX Makefile 2303 RMD160 60c8f2756550189262ee24714124a40f6369be8e SHA1 c4ae39fc81dfde80b62b876efe6b3540ff7422d9 SHA256 cdf4365663d68c898646c5544e280372214fcabf91115254342af432c3aac857
 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 2279 RMD160 f5d567963a6986e119485b458c7de5930cb08fb0 SHA1 b667b53a78dc0c4f25e5568dbc48e3da6f4276ef SHA256 b3cfad52669fea036d372331c7aa4134a42aa5357afcf7811b517ef3bdcaf4e3
+EBUILD ati-stream-sdk-2.3-r1.ebuild 2222 RMD160 ee532977f6928a7461d110e00c17b14013b47a07 SHA1 41e33a670ee63024cf00110eeea44dc5a4ec7c0d SHA256 b73e2f6b8c074785a1d3fac859a532b494b05f73a27569342825b64df549eb92
 MISC metadata.xml 301 RMD160 1ef0179dbe53f24768e976ab60f6ae0e8ca9e672 SHA1 fba668cb8711ac2bcc6b7bfc113a1a513c69b0be SHA256 55f555e646e9d04c8975a736b9a5b3f1d8ea110446c18e988a3b884d0dca33b7

diff --git a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild b/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
index 2fed6ce..1d114b3 100644
--- a/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
+++ b/dev-util/ati-stream-sdk/ati-stream-sdk-2.3-r1.ebuild
@@ -43,11 +43,13 @@ src_prepare(){
 	if use examples; then
 		sed -i -e 's/samples/examples/g'  make/openclsdkrules.mk make/openclsdkdefs.mk \
 			|| die "Sed failed"
-#		sed -i \
-#			-e "/OPENCL_LIBDIRS/{s|lib/\$(CPU_ARCH)|$(get_libdir)|}" \
-#			-e "s|\$(DEPTH)/lib/\$(CPU_ARCH)|\$(DEPTH)/$(get_libdir)|" \
-#			-e "/CAL_LIBDIRS/{s|lib|$(get_libdir)|}" \
-#			make/openclsdkdefs.mk || die "Sed failed"
+		sed -i \
+			-e "/OPENCL_LIBDIRS/{s|lib/\$(CPU_ARCH)|$(get_libdir)|}" \
+			-e "s|\$(DEPTH)/lib/\$(CPU_ARCH)|\$(DEPTH)/$(get_libdir)|" \
+			-e "/CAL_LIBDIRS/{s|lib|$(get_libdir)|}" \
+			make/openclsdkdefs.mk || die "Sed failed"
+
+
 	fi
 }
 
@@ -59,12 +61,11 @@ src_install() {
 	rm include/GL/{glext.h,glut.h} || die
 
 	if use amd64; then
-		#emake DESTDIR="${D}" ARCH="amd64" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
-		emake DESTDIR="${D}" ARCH="amd64" install || die "Install failed";
-		#if use multilib; then
-		#	emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/lib32' \
-		#		install-lib || die "Install multilib failed"
-		#fi
+		emake DESTDIR="${D}" ARCH="amd64" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
+		if use multilib; then
+			emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/lib32' \
+				install-lib || die "Install multilib failed"
+		fi
 	else
 		emake DESTDIR="${D}" ARCH="x86" LIBDIR='$(PREFIX)/'$(get_libdir) install || die "Install failed";
 	fi
@@ -72,8 +73,8 @@ src_install() {
 	cat > "${T}/99${PN}" << EOF
 PATH=${DEST}/bin
 ROOTPATH=${DEST}/bin
-LDPATH=${DEST}/lib
-LD_LIBRARY_PATH=${DEST}/lib
+LDPATH=${DEST}/$(get_libdir)
+LD_LIBRARY_PATH=${DEST}/$(get_libdir)
 EOF
 	doenvd "${T}/99${PN}"