media-gfx/nvidia-cg-toolkit: Version BUmp, #270480, thanks Myckel Habets, Piotr Szymaniak and Jean-Marc Hengen working on the ebuild; add multilib support, #262477, thanks Russell Harmon and Dennis Schridde working on this; Add additional variables to enviroment to find headers and libs, #344603

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

8 files changed, 190 insertions, 114 deletions

diff --git a/media-gfx/nvidia-cg-toolkit/ChangeLog b/media-gfx/nvidia-cg-toolkit/ChangeLog
index da102305e4d5..8214099f961c 100644
--- a/media-gfx/nvidia-cg-toolkit/ChangeLog
+++ b/media-gfx/nvidia-cg-toolkit/ChangeLog
@@ -1,6 +1,17 @@
 # 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.47 2012/11/15 21:12:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/ChangeLog,v 1.48 2012/11/15 22:07:12 jlec Exp $
+
+*nvidia-cg-toolkit-3.1.0013 (15 Nov 2012)
+
+  15 Nov 2012; Justin Lecher <jlec@gentoo.org> files/80cgc-opt-2,
+  nvidia-cg-toolkit-2.1.0012.ebuild, -nvidia-cg-toolkit-2.1.0016.ebuild,
+  nvidia-cg-toolkit-2.1.0017.ebuild, nvidia-cg-toolkit-2.1.0017-r1.ebuild,
+  +nvidia-cg-toolkit-3.1.0013.ebuild:
+  Version BUmp, #270480, thanks Myckel Habets, Piotr Szymaniak and Jean-Marc
+  Hengen working on the ebuild; add multilib support, #262477, thanks Russell
+  Harmon and Dennis Schridde working on this; Add additional variables to
+  enviroment to find headers and libs, #344603
 
 *nvidia-cg-toolkit-2.1.0017-r1 (15 Nov 2012)
 
diff --git a/media-gfx/nvidia-cg-toolkit/Manifest b/media-gfx/nvidia-cg-toolkit/Manifest
index 3188983ec462..390cff266c8b 100644
--- a/media-gfx/nvidia-cg-toolkit/Manifest
+++ b/media-gfx/nvidia-cg-toolkit/Manifest
@@ -3,23 +3,23 @@ Hash: SHA512
 
 AUX 80cgc 251 SHA256 89f976c536d4bb658821cabb402f7cfa15def6410599928ad737cf4b741d3a06 SHA512 f93845dab92d825f41598ab4514f056674ddfbe29a47f298c286a188274a6d1c39cbbd3ab3c2fd3d0b91383fe5b10e126cbc5974f5f791e15684f14c60be20d9 WHIRLPOOL 62e355d20401441263c3e3bbd4f80c133778a9b0fca5ad8aee7b0e0b0a8bc7c03ea54f7ecbd4c27344a242c4f451d90539092c6c42d4b9d0b41ed0dc2379d2b3
 AUX 80cgc-opt 221 SHA256 eb93be46a61060b66f35ba2596d3826e2cf51194e05cb716885b5f315a068a8c SHA512 9036933bac477e42c2d0092ea414e061865a9f2498345fe5a824df80194ba73f7ac2fb5a4a8aca827ec99a3f31e4ae772fa31eeab4b3b390189178d523289cda WHIRLPOOL 6c9cf823880971fc9bee4dd54cbd9eddfdaaf18d3bca28c3f45dc4f2b097b8ae61f02dff3d4207200ccf8b978d50412c00f7a13c68f7e4c35a42435458604fea
-AUX 80cgc-opt-2 327 SHA256 047a1dd2c984fe51aa54c06d076cf55d061d1717f1ddfb575f8f5d175cb4ebb7 SHA512 2d3dcaf539ba8ec13050ab4d96064138a6e449e64308c0795e39a1c282c2535cd46b3c32ebd1f7f5d556e5c376708186d8e2b262033b150201ee8b37ed459168 WHIRLPOOL add2a9793652e531a3c0f4e749b05bb8682dc991c851bf68d14a4b10cd874d5dad5b8ae1eb9cf16d69cb91bfb7a7559f5e42af584f58a0d7543bf1be3447ad2a
+AUX 80cgc-opt-2 479 SHA256 4aa44bbcced3fc80233c16f37d9a00e8fc51783e036b9908bac45753b8200a88 SHA512 09782d40323aa90db5d96ff70074e098637bbf4d0736a83102c4aeb23c5a53508610d65335a08ac4727229f27af32c4453632574b77fc64a035c6770fd0b035c WHIRLPOOL 1a3c7cadb3db4fb59a46a21fb50e34edd4daf758b499e4a53565f4810fc3d7cad048cf1a0463ec97dd5b2e61523c1389876395412d5a5166e33e590c0015c64a
 DIST Cg-2.1_February2009_x86.tgz 13731609 SHA256 c3ecc3aaab517413ab10486b6b8725bac9c33ec09e6707c005e434aa93c29601
 DIST Cg-2.1_February2009_x86_64.tgz 14339051 SHA256 dac226f138ebe768e37953c61a346772b85d10dc0221b152bdabd92d9e841e04 SHA512 1239d029a5461047adb2e7403d8e0324d6d7e8311ddca718602c30eef763b5ee122f3b506ef1962e0d76430fb7acb2512a71a2c000fb334c322d6a487956af9e WHIRLPOOL a43853a569a0ca189cfaad7170fcb71fe9ba1d0417cc69444cf5da54442d38b3d15f58df7d46a3cbcc2c050f50e097ec7d52d47503e9bf1ce8cf9dbc963add8e
-DIST Cg-2.1_November2008_x86.tgz 13736057 SHA256 1d3538522e5457b1b97378c04f28ffa3235a6c60d583847187e0e0d9a699f718
-DIST Cg-2.1_November2008_x86_64.tgz 14337851 SHA256 8291f7bc27d788e5bd4daa04deeb53eef5a1778f902e26f382d6745198cce9e2
 DIST Cg-2.1_October2008_x86.tgz 13733234 SHA256 033ab5efb39617de65788e10d8e3a07c7ba2a3b97c59175061d4f298dfe293dd
-DIST Cg-2.1_October2008_x86_64.tgz 14337305 SHA256 a43b0d009ad653d6f6b35b75488fe1dfa62d75ca4a2d87e147721a3411b783b7
-EBUILD nvidia-cg-toolkit-2.1.0012.ebuild 1551 SHA256 9e1cd0caa0d3e5eca0a2b880e041a6085b93ed4a4d6b39ebf8e4c16fe2680011 SHA512 30a0487c020efb3ca282dadc55d4f2a9438c28c58dc34bb933aed49d343449a220f9822192c901cde00f7e9d1c72e40183a3fecc924afbd89e569a379c6ff723 WHIRLPOOL d90bb63f794dd60b759104ae602efcb679fcf5c5ff779150983bf22456cf8a1a095a3faac7cc67879a1913d0ab89d2b0553a012aa78f59ba128e675168683d82
-EBUILD nvidia-cg-toolkit-2.1.0016.ebuild 1364 SHA256 5d4f92b03d9b5e663b602f515269ea0b6510d598f41313f0de6e26f4f4d1cf67 SHA512 52b068818868e4665093723fc850c70bb8a69053e4ff4413522da1689c0cfa9637fca4eaf65d4e061cbf1878f7216dc50e70d594a744b382ef4e273e26f1e6d1 WHIRLPOOL d52f866b3c960995f122dcea42e8f87d49bf6373b95408c5d35595ae68620242d8ab25a38e928e8edd57380f240229dff27977198f4aef891d8a01fafeba4f18
-EBUILD nvidia-cg-toolkit-2.1.0017-r1.ebuild 1724 SHA256 995427cb8142c4837945d8f3a2a760dd8fb304c6b2331b1c5fee3573b2845b4f SHA512 ce08e663eea0ba05477524223d1ade68c649ab1e131ba30cbb36b62fff32f9ab14d95eed4249d4d5aab03a586b6d8489343dd17938873b6585174bca4741a9f9 WHIRLPOOL f670bdc7619372b32ac4b8f4802259f1a569c67f8e7c46667388b54f71da8240a2db1e430cf492cfc6bc4a98aa046f235ac9f1653bf85d11fd58611651d891de
-EBUILD nvidia-cg-toolkit-2.1.0017.ebuild 1469 SHA256 8faa64b40972fa768b8410e652e9a42cf7434e536725479253a6b2d583e84849 SHA512 1414f7734e07f100adcf7670c8e45e73ff1310db2213b67a76abf3bbf9adf00a38e7e4d3ed091a58d2cc894716667534970310c593fcbbb446f2ce2282493942 WHIRLPOOL 94b9b715c62c8e80217cc79d3ab421e54a855b6fe3945b6b90bf8b7fced0d4e7759aa533509cc7737dd13d5414ddb4fb424e01bc1a0badf2d84d8817657a2a2b
-MISC ChangeLog 7618 SHA256 a8ee7564129d52288b6c997ccdf0152388a70b76f475e82f69e2558b68e42cd4 SHA512 94a784a7af5ea8757ab425c751ab67413ac2e2e30bb5a15baa54e4312944e665972536f78aea8e036189954908ab712933955428a60de6d6c7071d34ce6f4762 WHIRLPOOL 80b00d77b076ee68233ed0cd99e082d2c4bdb8bb20d4020fb6e64129543d3d865c986a8133bb1718b923c4382e15d2db76f36c408a7f46918c58fdd37dbb4888
+DIST Cg-2.1_October2008_x86_64.tgz 14337305 SHA256 a43b0d009ad653d6f6b35b75488fe1dfa62d75ca4a2d87e147721a3411b783b7 SHA512 a376e33eec3221ee3a3870e119a0378284fb08fe4792a1961aabb139a87c196f31c63efe7a05526e5d249dc756319d76c87b73589931966dd3fe895ae864ddb6 WHIRLPOOL bac23c5ff3c413db24886f41cb2250d4ddf517481fcaeb9f345943c9f4f616b2045c99f87798c770bbc274b6a83b101a087b3c640526ae6fcb76ef79af24f6ef
+DIST Cg-3.1_April2012_x86.tgz 23332348 SHA256 cef3591e436f528852db0e8c145d3842f920e0c89bcfb219c466797cb7b18879 SHA512 7b2addad157e151eb42b320aea31ccddfd53ec5640cb97bc86a3d461c1b08a2dff280bfc3f7859d124c311e1710e39d40405c387e5724ebc82d95303b250837a WHIRLPOOL f15f3e8f65310a47661a0473cdf7dc1ef195aff8422ad8a0ec26a2302a52d73f9f22922180482cb2724197037eb619cb9389f9732718a08dca8889d2be5dff1d
+DIST Cg-3.1_April2012_x86_64.tgz 24829131 SHA256 e8ff01e6cc38d1b3fd56a083f5860737dbd2f319a39037528fb1a74a89ae9878 SHA512 591b51195193e7e3bbb9f1c2579336d24a179b0a88b955a01f4661bda55543fbccd73cac53033912f2eea8a1068e4c1394c6d286f195963cfb33a0d8b4428e27 WHIRLPOOL c4295473b82d67f6cf370e725a36189fbdbc3bfd02369e4afc0f510b6ab06a160a7de5e47931689dccc5ff52f95f0e10ebd03b32c8c30881d6d2f02183cad2a9
+EBUILD nvidia-cg-toolkit-2.1.0012.ebuild 1590 SHA256 b8bf9868db1d8431c74b63406d2de8809fd8313989de1b9b0540fa3644953d1d SHA512 876b79438fc55a2e286747e2b340bf2f7cb5df289fbbd2aa95efa21fd3bf125b1d608a34b4793d443790769761c8fe259b43d75b294f71bed79ebb9db2a61578 WHIRLPOOL 5cb0f75bee2a630a879974f86fec111f38feac8ad1e4b05109c069e3c3a2f3120da0c600202b39d3b99a3ada7d1f539971d58098fc2202369f194e6d7051fe8b
+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.ebuild 2542 SHA256 c886e0c8f26e04bbc5cb569394723c3279d4a88374c1893a913e22dfe56bbbd7 SHA512 2677253f8bfae61523d744919289946401a2fbe070f9e59920704d2c1de6c5aa60a7d5d533d8ea9d27a10c26d4da11293e57ca83f962204be68542fb675911bc WHIRLPOOL 0e49acf82eda523547a03d88a4cbe3c5b1a7e93a8f74d9fc8efbf93f72dfaaa84cc2e9207e8037739b2b3f501f14e85c53ac7f417df79be38f91cf4441ce9dba
+MISC ChangeLog 8190 SHA256 2beb5a6e22c1416d5cf6e847385e0f90bf967e43c219cdfb18acec5a9bb2bcf2 SHA512 6732a7c24971166a38ffb1225c761d026c4108967c272d1253641185dad319626b8ba5a04c77c9da8944b747e4b665ba3d06ca841b603afc56b4ae9c8e2290c1 WHIRLPOOL 825b57fb52fe5cd9988c04c1fd1f336c13d02e7be756ebf997865f4cc7aa5460d75485ab708ce2c87deac2e19d58ca191d3d835088edbd776b0ea4f73d1666bf
 MISC metadata.xml 548 SHA256 e8d885e2930ecb07a05efac4def6086f2d5f6b9bd3f211a31a45fb8ab51ab70b SHA512 891f13d22a7e1b436a0a964ad4f7afbf0e3379900455e9780b85e2f316f337b442ac04472881ac6a3a93e02b7d507e28691a0fbbd2868e1c24b19891df152799 WHIRLPOOL db7b5b64f13cb7bb9fd2d704d06bde76d5cfdc2fc2e1d0b9370ac5d5660eb22adfa5e7183230b1de1555b4b031a19c29a1d76c06899a35e1b1c9c961f89a3340
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlClWtgACgkQgAnW8HDreRZAAQCgy5ARFiDbN+fk3/V6sNmEKapB
-JnMAnRwnlN771HX7D/gZ23nqpP9E5tzI
-=A6XC
+iEYEAREKAAYFAlClZ5IACgkQgAnW8HDreRYgSQCfdoCUC0nfVkBJU+b70aEueJ/x
+K2wAoLtNHUreFzsaunrPMmskQaOPW1eb
+=TOv1
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/nvidia-cg-toolkit/files/80cgc-opt-2 b/media-gfx/nvidia-cg-toolkit/files/80cgc-opt-2
index 76c65274042e..5bf391c699ae 100644
--- a/media-gfx/nvidia-cg-toolkit/files/80cgc-opt-2
+++ b/media-gfx/nvidia-cg-toolkit/files/80cgc-opt-2
@@ -1,7 +1,11 @@
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/files/80cgc-opt-2,v 1.1 2012/11/15 21:12:55 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/files/80cgc-opt-2,v 1.2 2012/11/15 22:07:13 jlec Exp $
 
 # Configures the CG Runtime environment for Bourne shell and compatible shells
 CG_COMPILER_EXE=@GENTOO_PORTAGE_EPREFIX@/opt/bin/cgc
+CG_INC_PATH=@GENTOO_PORTAGE_EPREFIX@/opt/nvidia-cg-toolkit/include
+CG_LIB_PATH="ELDPATH"
 
-# Make sure the helper files are found
-LDPATH="/opt/nvidia-cg-toolkit/lib"
+PATH="@GENTOO_PORTAGE_EPREFIX@/opt/nvidia-cg-toolkit/bin"
+ROOTPATH="@GENTOO_PORTAGE_EPREFIX@/opt/nvidia-cg-toolkit/bin"
+
+LDPATH="ELDPATH"
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0012.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0012.ebuild
index b79f7c495d98..9ee8e5af208e 100644
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0012.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0012.ebuild
@@ -1,66 +1,64 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-2.1.0012.ebuild,v 1.4 2010/09/16 17:09:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0012.ebuild,v 1.5 2012/11/15 22:07:12 jlec Exp $
 
 inherit versionator
 
 MY_PV="$(get_version_component_range 1-2)"
 MY_DATE="October2008"
+
 DESCRIPTION="nvidia's c graphics compiler toolkit"
 HOMEPAGE="http://developer.nvidia.com/object/cg_toolkit.html"
-SRC_URI="x86? (
-	http://developer.download.nvidia.com/cg/Cg_2.0/${PV}/Cg-${MY_PV}_${MY_DATE}_x86.tgz )
-	amd64? (
-	http://developer.download.nvidia.com/cg/Cg_2.0/${PV}/Cg-${MY_PV}_${MY_DATE}_x86_64.tgz )"
+SRC_URI="
+	x86? ( http://developer.download.nvidia.com/cg/Cg_2.0/${PV}/Cg-${MY_PV}_${MY_DATE}_x86.tgz )
+	amd64? ( http://developer.download.nvidia.com/cg/Cg_2.0/${PV}/Cg-${MY_PV}_${MY_DATE}_x86_64.tgz )"
 
-LICENSE="NVIDIA"
 SLOT="0"
+LICENSE="NVIDIA"
 KEYWORDS="amd64 x86"
 IUSE=""
+
 RESTRICT="strip"
 
-DEPEND="media-libs/freeglut"
+RDEPEND="media-libs/freeglut"
+DEPEND=""
 
 S="${WORKDIR}"
 
-src_compile() {
-	einfo "Nothing to compile."
-}
-
 src_install() {
-	dobin usr/bin/cgc
+	dobin usr/bin/cgc || die
 
 	if use x86; then
-		dolib usr/lib/*
+		dolib usr/lib/* || die
 	elif use amd64; then
-		dolib usr/lib64/*
+		dolib usr/lib64/* || die
 	fi
 
-	doenvd "${FILESDIR}"/80cgc
+	doenvd "${FILESDIR}"/80cgc || die
 
 	insinto /usr/include/Cg
-	doins usr/include/Cg/*
+	doins usr/include/Cg/* || die
 
-	doman 	usr/share/man/man3/*
+	doman usr/share/man/man3/* || die
 
 	dodoc usr/local/Cg/MANIFEST usr/local/Cg/README \
-	      usr/local/Cg/docs/*.pdf usr/local/Cg/docs/CgReferenceManual.chm
+	      usr/local/Cg/docs/*.pdf usr/local/Cg/docs/CgReferenceManual.chm || die
 
 	docinto html
-	dohtml	usr/local/Cg/docs/html/*
+	dohtml usr/local/Cg/docs/html/* || die
 
 	docinto examples
-	dodoc   usr/local/Cg/examples/README
+	dodoc usr/local/Cg/examples/README || die
 
 	docinto include/GL
-	dodoc   usr/local/Cg/include/GL/*
+	dodoc usr/local/Cg/include/GL/* || die
 
 	# Copy all the example code.
 	cd usr/local/Cg/examples
 	insinto /usr/share/doc/${PF}/examples
-	doins Makefile
+	doins Makefile || die
 	for dir in $(find * -type d) ; do
 		insinto usr/share/doc/${PF}/examples/"${dir}"
-		doins "${dir}"/*
+		doins "${dir}"/* || die
 	done
 }
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0016.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0016.ebuild
deleted file mode 100644
index 987e4d8d4847..000000000000
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0016.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 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-2.1.0016.ebuild,v 1.3 2010/09/16 17:09:13 scarabeus Exp $
-
-inherit versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-MY_DATE="November2008"
-DESCRIPTION="nvidia's c graphics compiler toolkit"
-HOMEPAGE="http://developer.nvidia.com/object/cg_toolkit.html"
-SRC_URI="x86? (
-	http://developer.download.nvidia.com/cg/Cg_2.0/${PV}/Cg-${MY_PV}_${MY_DATE}_x86.tgz )
-	amd64? (
-	http://developer.download.nvidia.com/cg/Cg_2.0/${PV}/Cg-${MY_PV}_${MY_DATE}_x86_64.tgz )"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND="media-libs/freeglut"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	local DEST=/opt/${PN}
-
-	into ${DEST}
-	dobin usr/bin/cgc || die
-	dosym ${DEST}/bin/cgc /opt/bin/cgc || die
-
-	if use x86; then
-		dolib usr/lib/* || die
-	elif use amd64; then
-		dolib usr/lib64/* || die
-	fi
-
-	doenvd "${FILESDIR}"/80cgc-opt
-
-	insinto ${DEST}/include/Cg
-	doins usr/include/Cg/*
-
-	insinto ${DEST}/man/man3
-	doins usr/share/man/man3/*
-
-	insinto ${DEST}/Cg
-	doins -r usr/local/Cg/*
-}
-
-pkg_postinst() {
-	einfo "Starting with ${CATEGORY}/${PN}-2.1.0016, ${PN}"
-	einfo "is installed in /opt/${PN}."
-}
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0017-r1.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0017-r1.ebuild
index bad85a405192..369692e30b2b 100644
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0017-r1.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0017-r1.ebuild
@@ -1,10 +1,10 @@
 # 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-2.1.0017-r1.ebuild,v 1.1 2012/11/15 21:12:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0017-r1.ebuild,v 1.2 2012/11/15 22:07:12 jlec Exp $
 
 EAPI=5
 
-inherit prefix versionator
+inherit multilib prefix versionator
 
 MY_PV="$(get_version_component_range 1-2)"
 MY_DATE="February2009"
@@ -32,6 +32,8 @@ DEST=/opt/${PN}
 QA_PREBUILT="${DEST}/*"
 
 src_install() {
+	local ldpath=${DEST}/lib
+
 	into ${DEST}
 	dobin usr/bin/cgc
 	dosym ${DEST}/bin/cgc /opt/bin/cgc
@@ -43,11 +45,14 @@ src_install() {
 		doexe usr/lib64/*
 	fi
 
-	newenvd "${FILESDIR}"/80cgc-opt-2 80cgc-opt
-	eprefixify "${ED}"/etc/env.d/80cgc-opt
+	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/Cg
-	doins usr/include/Cg/*
+	insinto ${DEST}/include
+	doins -r usr/include/Cg
 
 	doman usr/share/man/man3/*
 
@@ -65,7 +70,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	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"
+	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
 }
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0017.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0017.ebuild
index c02f6af71f4b..b4e1d0827c62 100644
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0017.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0017.ebuild
@@ -1,6 +1,6 @@
 # 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-2.1.0017.ebuild,v 1.5 2012/11/15 21:12:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0017.ebuild,v 1.6 2012/11/15 22:07:12 jlec Exp $
 
 inherit versionator
 
@@ -9,17 +9,19 @@ MY_DATE="February2009"
 
 DESCRIPTION="NVIDIA's C graphics compiler toolkit"
 HOMEPAGE="http://developer.nvidia.com/object/cg_toolkit.html"
-SRC_URI="x86? ( http://developer.download.nvidia.com/cg/Cg_${MY_PV}/${PV}/Cg-${MY_PV}_${MY_DATE}_x86.tgz )
+SRC_URI="
+	x86? ( http://developer.download.nvidia.com/cg/Cg_${MY_PV}/${PV}/Cg-${MY_PV}_${MY_DATE}_x86.tgz )
 	amd64? ( http://developer.download.nvidia.com/cg/Cg_${MY_PV}/${PV}/Cg-${MY_PV}_${MY_DATE}_x86_64.tgz )"
 
-LICENSE="NVIDIA"
 SLOT="0"
+LICENSE="NVIDIA"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RESTRICT="strip"
 
 RDEPEND="media-libs/freeglut"
+DEPEND=""
 
 S=${WORKDIR}
 
@@ -42,13 +44,13 @@ src_install() {
 	doenvd "${FILESDIR}"/80cgc-opt
 
 	insinto ${DEST}/include/Cg
-	doins usr/include/Cg/*
+	doins usr/include/Cg/* || die
 
 	insinto ${DEST}/man/man3
-	doins usr/share/man/man3/*
+	doins usr/share/man/man3/* || die
 
 	insinto ${DEST}
-	doins -r usr/local/Cg/{docs,examples,README}
+	doins -r usr/local/Cg/{docs,examples,README} || die
 }
 
 pkg_postinst() {
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.ebuild
new file mode 100644
index 000000000000..466b97a4bb5c
--- /dev/null
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013.ebuild
@@ -0,0 +1,113 @@
+# 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.ebuild,v 1.1 2012/11/15 22:07:12 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
+}
+
+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)"
+	elif use amd64; then
+		dolib usr/lib64/*
+		ldpath="${EPREFIX}${DEST}/$(get_libdir)"
+		if use multilib && use amd64; then
+			ldpath+=":${EPREFIX}${DEST}/lib32"
+			pushd ../32bit > /dev/null
+			ABI="x86" dolib usr/lib/*
+			popd > /dev/null
+		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
+}