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

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

7 files changed, 178 insertions, 102 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/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
+}