--- /usr/portage/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0017.ebuild	2010-09-16 19:36:01.000000000 +0200
+++ /usr/local/portage/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.0.0007-r1.ebuild	2010-10-31 19:38:39.000000000 +0100
@@ -1,15 +1,17 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2009 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.2 2010/09/16 17:09:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-2.1.0017.ebuild,v 1.1 2009/03/01 21:31:51 vapier Exp $
+
+EAPI="2"
 
 inherit versionator
 
 MY_PV="$(get_version_component_range 1-2)"
-MY_DATE="February2009"
+MY_DATE="July2010"
 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 )
-	amd64? ( http://developer.download.nvidia.com/cg/Cg_${MY_PV}/${PV}/Cg-${MY_PV}_${MY_DATE}_x86_64.tgz )"
+SRC_URI="x86? ( http://developer.download.nvidia.com/cg/Cg_${MY_PV}/Cg-${MY_PV}_${MY_DATE}_x86.tgz )
+	amd64? ( http://developer.download.nvidia.com/cg/Cg_${MY_PV}/Cg-${MY_PV}_${MY_DATE}_x86_64.tgz )"
 
 LICENSE="NVIDIA"
 SLOT="0"
@@ -17,7 +19,8 @@
 IUSE=""
 RESTRICT="strip"
 
-RDEPEND="media-libs/freeglut"
+RDEPEND="media-libs/freeglut
+	x86? ( virtual/libstdc++:3.3 )"
 
 S=${WORKDIR}
 
@@ -25,8 +28,7 @@
 
 src_install() {
 	into ${DEST}
-	dobin usr/bin/cgc || die
-	dosym ${DEST}/bin/cgc /opt/bin/cgc || die
+	dobin usr/bin/* || die
 
 	exeinto ${DEST}/lib
 	if use x86 ; then
@@ -35,8 +37,6 @@
 		doexe usr/lib64/* || die
 	fi
 
-	doenvd "${FILESDIR}"/80cgc-opt
-
 	insinto ${DEST}/include/Cg
 	doins usr/include/Cg/*
 
@@ -45,10 +45,24 @@
 
 	insinto ${DEST}
 	doins -r usr/local/Cg/{docs,examples,README}
+
+	cat > "${T}/env" << EOF
+# Configures the CG Runtime environment for Bourne shell and compatible shells
+CG_COMPILER_EXE="${DEST}/bin/cgc"
+
+# Make sure the helper files are found
+PATH="${DEST}/bin"
+LDPATH="${DEST}/lib"
+MANPATH="${DEST}/man"
+EOF
+	newenvd "${T}/env" 80cgc
 }
 
 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"
+	einfo "Starting with ${CATEGORY}/${PN}-2.2.0006, the cgc binary isn't"
+	einfo "symlinked to /opt/bin, but to ${DEST}/bin is but into "
+	einfo "\$\{PATH\} environment variable."
 }