media-gfx/nvidia-cg-toolkit: Readding LDPATH into env as binary only apps use dl-open to load

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

3 files changed, 148 insertions, 7 deletions

diff --git a/media-gfx/nvidia-cg-toolkit/ChangeLog b/media-gfx/nvidia-cg-toolkit/ChangeLog
index 96486f877543..7ce2385f04b5 100644
--- a/media-gfx/nvidia-cg-toolkit/ChangeLog
+++ b/media-gfx/nvidia-cg-toolkit/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for media-gfx/nvidia-cg-toolkit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/ChangeLog,v 1.50 2012/11/16 09:57:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/ChangeLog,v 1.51 2012/11/19 11:33:23 jlec Exp $
+
+*nvidia-cg-toolkit-3.1.0013-r2 (19 Nov 2012)
+
+  19 Nov 2012; Justin Lecher <jlec@gentoo.org>
+  +nvidia-cg-toolkit-3.1.0013-r2.ebuild:
+  Readding LDPATH into env as binary only apps use dl-open to load
 
   16 Nov 2012; Justin Lecher <jlec@gentoo.org>
   nvidia-cg-toolkit-3.1.0013-r1.ebuild, files/nvidia-cg-toolkit-gl.pc.in:
-  Don't mix ABIs in pkd-config deps
+  Don't mix ABIs in pkg-config deps
 
 *nvidia-cg-toolkit-3.1.0013-r1 (16 Nov 2012)
 
diff --git a/media-gfx/nvidia-cg-toolkit/Manifest b/media-gfx/nvidia-cg-toolkit/Manifest
index 19d586d40515..1d504f794018 100644
--- a/media-gfx/nvidia-cg-toolkit/Manifest
+++ b/media-gfx/nvidia-cg-toolkit/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 80cgc 251 SHA256 89f976c536d4bb658821cabb402f7cfa15def6410599928ad737cf4b741d3a06 SHA512 f93845dab92d825f41598ab4514f056674ddfbe29a47f298c286a188274a6d1c39cbbd3ab3c2fd3d0b91383fe5b10e126cbc5974f5f791e15684f14c60be20d9 WHIRLPOOL 62e355d20401441263c3e3bbd4f80c133778a9b0fca5ad8aee7b0e0b0a8bc7c03ea54f7ecbd4c27344a242c4f451d90539092c6c42d4b9d0b41ed0dc2379d2b3
 AUX 80cgc-opt 221 SHA256 eb93be46a61060b66f35ba2596d3826e2cf51194e05cb716885b5f315a068a8c SHA512 9036933bac477e42c2d0092ea414e061865a9f2498345fe5a824df80194ba73f7ac2fb5a4a8aca827ec99a3f31e4ae772fa31eeab4b3b390189178d523289cda WHIRLPOOL 6c9cf823880971fc9bee4dd54cbd9eddfdaaf18d3bca28c3f45dc4f2b097b8ae61f02dff3d4207200ccf8b978d50412c00f7a13c68f7e4c35a42435458604fea
@@ -17,13 +17,14 @@ EBUILD nvidia-cg-toolkit-2.1.0012.ebuild 1590 SHA256 b8bf9868db1d8431c74b63406d2
 EBUILD nvidia-cg-toolkit-2.1.0017-r1.ebuild 1875 SHA256 b859b12dba0a0651ce3b523a6c708f32855e0bf81e19e34b3146f1d926ce506d SHA512 ee2c985a39f9e09d31dacc1ece9eb298ed513c8f92793f3f7117b48bac6ec07ad08891ce8632d19383f92389d4554490fa8d5d9830775c9d3e703d2544527f2d WHIRLPOOL 241b3a1e5e5c05da3714363abc1ff3674e8ca7407648796dc55f1d6863e8412dbf9a3ba24ea730ee3933f2cb4c52e7af215c39eb194eb4a2087140926b6824a6
 EBUILD nvidia-cg-toolkit-2.1.0017.ebuild 1502 SHA256 61e3d5e6c2f6d482f178eef4e010195f951938155cfa7ad5efa2828d0c6157f8 SHA512 09c5074942ecbf13421a4d48297d4ceaddcb71143a2ff9680e2901cf2afecbfa4d670dbb7312f41f933158c89b0b12824eb9b80d2aae8038e6768099f97c9b5d WHIRLPOOL db2ac09750c2375ed15bdfd990e7d9dade9db8efb2b57895c2e401d60cacdd87544014a4a26f314a885592a6e0ee170cf4b1143b1c8e3fa4df7f2c57b3ba37f3
 EBUILD nvidia-cg-toolkit-3.1.0013-r1.ebuild 3309 SHA256 06cf67dfaf7eb1d151390cf98a020ad25d930e5fed147a47081cc2e92eaceb47 SHA512 2cfc7dd4ef230d5d9134923eb937d54743a17138205ac92f812e3a205bd5bd825ee8cc2f4990c77c0eaddaad986c49712d2d8ffc5213106296e1337b018f37c7 WHIRLPOOL 304eebc1e0c9433e958bca840149d7249836eac14cba7f6aab4351ff5ada159b47c075a51e9c65427470160a99b5f733aca5b6fa48fa669b958649cf77a90b43
+EBUILD nvidia-cg-toolkit-3.1.0013-r2.ebuild 3309 SHA256 e347bb59fa6c328517854f7e4cbd467bd67d413a02a8077c9da6fae0004759da SHA512 dd502a219e70fa358bfe0a1c656ac886210aecc3e705430a7b89f63e45772a30bb0513d2088dc9a539d6fe42fb5a8a32dc278b4f855396d5e0360736a673937c WHIRLPOOL 92cd914fde42f6fa64b082e4c67b774c5d7b4b7d0624c044cc9675ca8f71322788ecdcc1f21721a0f31f856f8cc74d8ca86b61dea5c511bb111ea44767584c15
 EBUILD nvidia-cg-toolkit-3.1.0013.ebuild 2542 SHA256 c886e0c8f26e04bbc5cb569394723c3279d4a88374c1893a913e22dfe56bbbd7 SHA512 2677253f8bfae61523d744919289946401a2fbe070f9e59920704d2c1de6c5aa60a7d5d533d8ea9d27a10c26d4da11293e57ca83f962204be68542fb675911bc WHIRLPOOL 0e49acf82eda523547a03d88a4cbe3c5b1a7e93a8f74d9fc8efbf93f72dfaaa84cc2e9207e8037739b2b3f501f14e85c53ac7f417df79be38f91cf4441ce9dba
-MISC ChangeLog 8693 SHA256 2812cbd1c7236c9c5bb31ba6127f28e0ec503807c1cc32b8fc425a0342036ac1 SHA512 523d3379f8f0320320b148b1cf0838159f36372d0667f76c9f7f8b4d9ef8ca66ea9fe0b321ee4dd28f96e57369d411731a999be6b576e49ce7cc029f67971e8c WHIRLPOOL b947b0dfbf8e46d6a462957b8b1ec70bd4a71346e64af01e99d0d0629499be4eafa703c55188bd08b46d952ba3344184b0db9d3f6906f74d80429eef9bd8580b
+MISC ChangeLog 8895 SHA256 5329a1e8f6883585af919873152f934a1f2549589bc969ca26587aa046809579 SHA512 8ddc2a777f7b13b3bf28b06fc5ea52b66a959bde8b3cf12f52b786fb334bd6ad335004b4aeea64062cfddbb4ad3bac3d3ff38643e181946e81051f195d9dae56 WHIRLPOOL 9dc3173675acdf90ed8fa2302971921929cb51a51a590fd67831fcc45179b1cd8a4d75c766414d1a6d1fd2777af84f9a727601692589aa2ffd0a6a200328e244
 MISC metadata.xml 548 SHA256 e8d885e2930ecb07a05efac4def6086f2d5f6b9bd3f211a31a45fb8ab51ab70b SHA512 891f13d22a7e1b436a0a964ad4f7afbf0e3379900455e9780b85e2f316f337b442ac04472881ac6a3a93e02b7d507e28691a0fbbd2868e1c24b19891df152799 WHIRLPOOL db7b5b64f13cb7bb9fd2d704d06bde76d5cfdc2fc2e1d0b9370ac5d5660eb22adfa5e7183230b1de1555b4b031a19c29a1d76c06899a35e1b1c9c961f89a3340
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCmDgYACgkQgAnW8HDreRbnSACfZUQ2YQj5sB/OnxKJWyWMaVLX
-WYMAniDesRfC/pNgnipdT1+1jqOBlwcN
-=s/oi
+iEYEAREKAAYFAlCqGQQACgkQgAnW8HDreRa74QCfbM0qMXoxlwtytxscja/uHkqc
+PyUAoKDf6X6JRMg9o8qAueDBvl47ceTD
+=jgJ+
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r2.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r2.ebuild
new file mode 100644
index 000000000000..c55b57c6af94
--- /dev/null
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r2.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r2.ebuild,v 1.1 2012/11/19 11:33:23 jlec Exp $
+
+EAPI=5
+
+inherit multilib prefix versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+MY_DATE="April2012"
+
+DESCRIPTION="NVIDIA's C graphics compiler toolkit"
+HOMEPAGE="http://developer.nvidia.com/object/cg_toolkit.html"
+X86_URI="http://developer.download.nvidia.com/cg/Cg_${MY_PV}/Cg-${MY_PV}_${MY_DATE}_x86.tgz"
+SRC_URI="
+	amd64? (
+		http://developer.download.nvidia.com/cg/Cg_${MY_PV}/Cg-${MY_PV}_${MY_DATE}_x86_64.tgz
+		multilib? ( ${X86_URI} )
+		)
+	x86? ( ${X86_URI} )"
+
+LICENSE="NVIDIA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples multilib"
+
+RESTRICT="strip"
+
+RDEPEND="
+	media-libs/freeglut
+	multilib? ( amd64? ( app-emulation/emul-linux-x86-xlibs ) )
+	x86? ( virtual/libstdc++:3.3 )"
+DEPEND=""
+
+S=${WORKDIR}
+
+DEST=/opt/${PN}
+
+QA_PREBUILT="${DEST}/*"
+
+src_unpack() {
+	local i
+	if use multilib && use amd64; then
+		mkdir {32,64}bit || die
+		for i in $A; do
+			if [[ "$i" =~ .*x86_64.* ]]; then
+				pushd 64bit > /dev/null
+				unpack "$i"
+				popd > /dev/null
+			else
+				pushd 32bit > /dev/null
+				unpack "$i"
+				popd > /dev/null
+			fi
+		done
+	else
+		default
+	fi
+}
+
+install_pkgconfig() {
+	# Two args: .pc file + abi
+	local suffix
+	use amd64 && use multilib && [[ $2 == x86 ]] && suffix="-32"
+	insinto /usr/$(get_libdir)/pkgconfig
+	sed \
+		-e "s:GENTOO_LIBDIR:$(ABI=$2 get_libdir):g" \
+		-e "s:DESCRIPTION:${DESCRIPTION}:g" \
+		-e "s:VERSION:${PV}:g" \
+		-e "s|HOMEPAGE|${HOMEPAGE}|g" \
+		-e "s:SUFFIX:${suffix}:g" \
+		"${FILESDIR}/${1}.in" > "${T}/${1/.pc/${suffix}.pc}" || die
+		eprefixify "${T}/${1/.pc/${suffix}.pc}"
+	doins "${T}/${1/.pc/${suffix}.pc}"
+}
+
+src_install() {
+	local ldpath
+	into ${DEST}
+	if use multilib && use amd64; then
+		cd 64bit
+	fi
+
+	dobin usr/bin/{cgc,cgfxcat,cginfo}
+
+	if use x86; then
+		dolib usr/lib/*
+		ldpath="${EPREFIX}${DEST}/$(get_libdir)"
+		install_pkgconfig nvidia-cg-toolkit.pc x86
+		install_pkgconfig nvidia-cg-toolkit-gl.pc x86
+	elif use amd64; then
+		dolib usr/lib64/*
+		ldpath="${EPREFIX}${DEST}/$(get_libdir)"
+		install_pkgconfig nvidia-cg-toolkit.pc amd64
+		install_pkgconfig nvidia-cg-toolkit-gl.pc amd64
+		if use multilib; then
+			ldpath+=":${EPREFIX}${DEST}/lib32"
+			pushd ../32bit > /dev/null
+			ABI="x86" dolib usr/lib/*
+			popd > /dev/null
+			install_pkgconfig nvidia-cg-toolkit.pc x86
+			install_pkgconfig nvidia-cg-toolkit-gl.pc x86
+		fi
+	fi
+
+	sed \
+		-e "s|ELDPATH|${ldpath}|g" \
+		"${FILESDIR}"/80cgc-opt-2 > "${T}"/80cgc-opt || die
+	eprefixify "${T}"/80cgc-opt
+	doenvd "${T}"/80cgc-opt
+
+	insinto ${DEST}/include
+	doins -r usr/include/Cg
+
+	insinto ${DEST}
+	dodoc usr/local/Cg/README
+	if use doc; then
+		dodoc usr/local/Cg/docs/*.{txt,pdf}
+		dohtml -r usr/local/Cg/docs/html/*
+	fi
+	if use examples; then
+		insinto /usr/share/${PN}
+		doins -r usr/local/Cg/examples
+	fi
+	find usr/local/Cg/{docs,examples,README} -delete
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} < 2.1.0016 ]]; then
+		einfo "Starting with ${CATEGORY}/${PN}-2.1.0016, ${PN} is installed in"
+		einfo "${DEST}. Packages might have to add something like:"
+		einfo "  append-cppflags -I${DEST}/include"
+	fi
+}