From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Psh3j-0007CJ-4V for garchives@archives.gentoo.org; Thu, 24 Feb 2011 19:41:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC0D61C003; Thu, 24 Feb 2011 19:40:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AE86B1C003 for ; Thu, 24 Feb 2011 19:40:59 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2AF4E1B4059 for ; Thu, 24 Feb 2011 19:40:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 479F08006A for ; Thu, 24 Feb 2011 19:40:58 +0000 (UTC) From: "Dane Smith" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Dane Smith" Message-ID: <5b2504aac91614f2035f8422becd1c24707b8a1a.c1pher@gentoo> Subject: [gentoo-commits] dev/c1pher:master commit in: dev-util/ati-stream-sdk/ X-VCS-Repository: dev/c1pher X-VCS-Files: dev-util/ati-stream-sdk/Manifest dev-util/ati-stream-sdk/ati-stream-sdk-2.1.ebuild X-VCS-Directories: dev-util/ati-stream-sdk/ X-VCS-Committer: c1pher X-VCS-Committer-Name: Dane Smith X-VCS-Revision: 5b2504aac91614f2035f8422becd1c24707b8a1a Date: Thu, 24 Feb 2011 19:40:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 91750cb0a9353623e613487ca6bd6983 commit: 5b2504aac91614f2035f8422becd1c24707b8a1a Author: Dane Smith gentoo org> AuthorDate: Thu Feb 24 19:30:05 2011 +0000 Commit: Dane Smith gentoo org> CommitDate: Thu Feb 24 19:30:05 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/c1pher.git;a=3D= commit;h=3D5b2504aa Fix binary location issues that are only present in 2.1 --- dev-util/ati-stream-sdk/Manifest | 2 +- dev-util/ati-stream-sdk/ati-stream-sdk-2.1.ebuild | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dev-util/ati-stream-sdk/Manifest b/dev-util/ati-stream-sdk/M= anifest index 36900fa..cf9373b 100644 --- a/dev-util/ati-stream-sdk/Manifest +++ b/dev-util/ati-stream-sdk/Manifest @@ -5,6 +5,6 @@ DIST ati-stream-sdk-v2.1-lnx32.tgz 51590733 RMD160 fa3bf3= cc628e1db2e38133ae9d6b8 DIST ati-stream-sdk-v2.1-lnx64.tgz 82901409 RMD160 778f0d46e96f77b345a96= 3b1720fce43c0eb96ef SHA1 dbf468d73b19462cf359a0b7248c20cc3bf4ae93 SHA256 = 46f6e47172a412d5ee3b3aea60fc869ebd26fbccf7fadc9ec5e4146c38f4a7ff DIST ati-stream-sdk-v2.3-lnx32.tgz 49912168 RMD160 07c045de3118531472672= e9ef7b3763cb32f7d68 SHA1 972bdbe6942e52411a2f041720348e857f17c388 SHA256 = 07fd15a51a678c4378767f61466daf9da21d0bab6088a97a70136dd8c976aca6 DIST ati-stream-sdk-v2.3-lnx64.tgz 78659015 RMD160 57af36f62e590ae54cb9d= 43b880735979b77466c SHA1 43c94e5126563fe3fa4cb92fb6dd20f12864a86d SHA256 = f92537d1fc306af0bff1441af4669bf2fa668654b12d9fb53a3a872dc8826cad -EBUILD ati-stream-sdk-2.1.ebuild 2576 RMD160 df51af30f626a22aef29f19fdd4= ef6e5bd2e19fe SHA1 4e8aa5b13c7cc3cca9490adcf32ffbae937d6ebd SHA256 c9c6d4= 5aa277da4c66206b8326a657ca5f9f1ce1164c4548c4336e84ec52ee08 +EBUILD ati-stream-sdk-2.1.ebuild 2682 RMD160 1fcd5246734cbe1bc4491edce3e= edc69f642f1ac SHA1 fc1352e719e3c27f77850e2e814a39186f6cd50b SHA256 19f820= 7346ffe4b75d6d647d27f4980506314f267ac67869c393810b659008bb EBUILD ati-stream-sdk-2.3-r1.ebuild 2481 RMD160 65d85bb24c69626330d61dbd= c2d76d59a80824d5 SHA1 a0480685805eeba1702bb0fa3d6e4f7c9b791c90 SHA256 6e9= 29ddee6519e47ca186b266245a8b99d194350bdfef499f1b3ab9be17234f1 MISC metadata.xml 301 RMD160 1ef0179dbe53f24768e976ab60f6ae0e8ca9e672 SH= A1 fba668cb8711ac2bcc6b7bfc113a1a513c69b0be SHA256 55f555e646e9d04c8975a7= 36b9a5b3f1d8ea110446c18e988a3b884d0dca33b7 diff --git a/dev-util/ati-stream-sdk/ati-stream-sdk-2.1.ebuild b/dev-util= /ati-stream-sdk/ati-stream-sdk-2.1.ebuild index f044ec9..4a1ded9 100644 --- a/dev-util/ati-stream-sdk/ati-stream-sdk-2.1.ebuild +++ b/dev-util/ati-stream-sdk/ati-stream-sdk-2.1.ebuild @@ -54,12 +54,12 @@ src_compile(){ true; } =20 src_install(){ local DEST=3D/opt/${PN} - local LIBDIR=3D + local SUBDIR=3D =20 rm include/GL/{glext.h,glut.h} || die =20 if use amd64; then - LIBDIR=3Dx86_64 + SUBDIR=3Dx86_64 emake DESTDIR=3D"${D}" ARCH=3D"amd64" install || die "Install failed"; if use multilib; then emake DESTDIR=3D"${D}" ARCH=3D"x86" install-lib \ @@ -68,7 +68,7 @@ src_install(){ insinto /etc/OpenCL/vendors doins "${FILESDIR}"/atiocl64.icd || die else - LIBDIR=3Dx86 + SUBDIR=3Dx86 emake DESTDIR=3D"${D}" ARCH=3D"x86" install || die "Install failed"; insinto /etc/OpenCL/vendors doins "${FILESDIR}"/atiocl32.icd || die @@ -77,9 +77,11 @@ src_install(){ cat > "${T}/99${PN}" << EOF PATH=3D${DEST}/bin ROOTPATH=3D${DEST}/bin -LDPATH=3D${DEST}/lib/${LIBDIR} +LDPATH=3D${DEST}/lib/${SUBDIR} EOF doenvd "${T}/99${PN}" || die + #Fix binary location issues that are only present in 2.1 + dosym ${DEST}/bin ${DEST}/bin/${SUBDIR} || die =20 if use examples; then insinto ${DEST}/examples