Merge PR, thanks mm1ke for preperation, fixes #518144 & #466832; correct QA_PREBUILT for USE=examples; make exmaples executable; drop unnecessary deps

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

5 files changed, 207 insertions, 9 deletions

diff --git a/media-gfx/nvidia-cg-toolkit/ChangeLog b/media-gfx/nvidia-cg-toolkit/ChangeLog
index fb58cb565a46..149044ddd4dd 100644
--- a/media-gfx/nvidia-cg-toolkit/ChangeLog
+++ b/media-gfx/nvidia-cg-toolkit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/nvidia-cg-toolkit
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/ChangeLog,v 1.63 2014/12/28 12:11:16 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/ChangeLog,v 1.64 2015/02/19 21:44:15 jlec Exp $
+
+*nvidia-cg-toolkit-3.1.0013-r4 (19 Feb 2015)
+
+  19 Feb 2015; Justin Lecher <jlec@gentoo.org>
+  +nvidia-cg-toolkit-3.1.0013-r4.ebuild, metadata.xml,
+  nvidia-cg-toolkit-3.1.0013-r2.ebuild, nvidia-cg-toolkit-3.1.0013-r3.ebuild:
+  Merge PR, thanks mm1ke for preperation, fixes #518144 & #466832; correct
+  QA_PREBUILT for USE=examples; make exmaples executable; drop unnecessary deps
 
   28 Dec 2014; Agostino Sarubbo <ago@gentoo.org>
   nvidia-cg-toolkit-3.1.0013-r3.ebuild:
diff --git a/media-gfx/nvidia-cg-toolkit/metadata.xml b/media-gfx/nvidia-cg-toolkit/metadata.xml
index 27668c513a99..84b9190efd25 100644
--- a/media-gfx/nvidia-cg-toolkit/metadata.xml
+++ b/media-gfx/nvidia-cg-toolkit/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>graphics</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
+  </maintainer>
   <longdescription>
 The Cg Toolkit provides a compiler for the Cg language, runtime libraries for
 use with both leading graphics APIs, runtime libraries for CgFX, example
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
index c42e5c693943..fccbeed5e6fe 100644
--- 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
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.4 2014/01/26 10:54:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r2.ebuild,v 1.5 2015/02/19 21:44:15 jlec Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ 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"
+HOMEPAGE="http://developer.nvidia.com/cg_toolkit"
 X86_URI="http://developer.download.nvidia.com/cg/Cg_${MY_PV}/Cg-${MY_PV}_${MY_DATE}_x86.tgz"
 SRC_URI="
 	amd64? (
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild
index f98716d5bf91..91ab56499bc8 100644
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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-r3.ebuild,v 1.3 2014/12/28 12:11:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r3.ebuild,v 1.4 2015/02/19 21:44:15 jlec Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ 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"
+HOMEPAGE="http://developer.nvidia.com/cg_toolkit"
 SRC_URI="
 	abi_x86_32? (
 		http://developer.download.nvidia.com/cg/Cg_${MY_PV}/Cg-${MY_PV}_${MY_DATE}_x86.tgz
@@ -29,11 +29,36 @@ REQUIRED_USE="amd64? ( multilib? ( abi_x86_32 ) )"
 RESTRICT="strip"
 
 RDEPEND="
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	media-libs/glu
+	media-libs/mesa
 	media-libs/freeglut
 	amd64? ( abi_x86_32? (
 		|| (
+			(
+				>=media-libs/glu-9.0.0-r1[abi_x86_32(-)]
+				>=media-libs/mesa-9.1.6[abi_x86_32(-)]
+				>=media-libs/freeglut-2.8.1[abi_x86_32(-)]
+			)
 			app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
-			>=media-libs/freeglut-2.8.1[abi_x86_32(-)]
+		)
+		|| (
+			(
+				>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
+				>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+				>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+				>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+				>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+				>=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)]
+				>=x11-libs/libXt-1.1.4[abi_x86_32(-)]
+			)
+			app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
 		)
 	) )
 	x86? ( virtual/libstdc++:3.3 )"
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r4.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r4.ebuild
new file mode 100644
index 000000000000..aca11367407b
--- /dev/null
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r4.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2015 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-r4.ebuild,v 1.1 2015/02/19 21:44:15 jlec Exp $
+
+EAPI=5
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit eutils multilib multilib-minimal 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/cg_toolkit"
+SRC_URI="
+	abi_x86_32? (
+		http://developer.download.nvidia.com/cg/Cg_${MY_PV}/Cg-${MY_PV}_${MY_DATE}_x86.tgz
+	)
+	abi_x86_64? (
+		http://developer.download.nvidia.com/cg/Cg_${MY_PV}/Cg-${MY_PV}_${MY_DATE}_x86_64.tgz
+	)"
+
+LICENSE="NVIDIA-r1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples multilib"
+
+REQUIRED_USE="amd64? ( multilib? ( abi_x86_32 ) )"
+
+RESTRICT="strip"
+
+RDEPEND="
+	media-libs/glu
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXt
+	virtual/opengl
+	amd64? (
+		abi_x86_32? (
+			|| (
+				(
+					>=media-libs/freeglut-2.8.1[abi_x86_32(-)]
+					>=media-libs/glu-9.0.0-r1[abi_x86_32(-)]
+					>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+				)
+				app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+			)
+			|| (
+				(
+					>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)]
+					>=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)]
+					>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+					>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
+					>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
+					>=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)]
+					>=x11-libs/libXt-1.1.4[abi_x86_32(-)]
+				)
+				app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+			)
+		)
+	)"
+DEPEND=""
+
+S=${WORKDIR}
+
+DEST=/opt/${PN}
+
+QA_PREBUILT="${DEST}/.* /usr/share/.*"
+
+src_unpack() {
+	multilib_src_unpack() {
+		mkdir -p "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local i
+		for i in ${A}; do
+			if [[ ${i} == *x86_64* && ${ABI} == amd64 ]]; then
+				unpack "${i}"
+			elif [[ ${i} != *x86_64* && ${ABI} != amd64 ]]; then
+				unpack "${i}"
+			fi
+		done
+	}
+
+	multilib_foreach_abi multilib_src_unpack
+}
+
+install_pkgconfig() {
+	# One arg: .pc file
+	insinto /usr/$(get_libdir)/pkgconfig
+	sed \
+		-e "s:GENTOO_LIBDIR:$(get_libdir):g" \
+		-e "s:DESCRIPTION:${DESCRIPTION}:g" \
+		-e "s:VERSION:${PV}:g" \
+		-e "s|HOMEPAGE|${HOMEPAGE}|g" \
+		-e "s:SUFFIX::g" \
+		"${FILESDIR}/${1}.in" > "${T}/${1}" || die
+		eprefixify "${T}/${1}"
+	doins "${T}/${1}"
+}
+
+src_install() {
+	local LDPATH=()
+
+	multilib-minimal_src_install
+}
+
+multilib_src_install() {
+	LDPATH+=( "${EPREFIX}${DEST}/$(get_libdir)" )
+	into ${DEST}
+
+	if [[ ${ABI} == amd64 ]]; then
+		dolib usr/lib64/*
+	else
+		dolib usr/lib/*
+	fi
+	install_pkgconfig nvidia-cg-toolkit.pc
+	install_pkgconfig nvidia-cg-toolkit-gl.pc
+
+	insinto ${DEST}/include
+	doins -r usr/include/Cg
+
+	if multilib_is_native_abi; then
+		dobin usr/bin/{cgc,cgfxcat,cginfo}
+
+		insinto ${DEST}
+		dodoc usr/local/Cg/README
+		if use doc; then
+			DOCS=( usr/local/Cg/docs/*.{txt,pdf} )
+			HTML_DOCS=( usr/local/Cg/docs/html/. )
+			einstalldocs
+		fi
+		if use examples; then
+			dodir /usr/share/${PN}
+			mv usr/local/Cg/examples "${ED}"/usr/share/${PN}/
+		fi
+	fi
+}
+
+multilib_src_install_all() {
+	local ldpath=${LDPATH[*]}
+
+	sed \
+		-e "s|ELDPATH|${ldpath// /:}|g" \
+		"${FILESDIR}"/80cgc-opt-2 > "${T}"/80cgc-opt || die
+	eprefixify "${T}"/80cgc-opt
+	doenvd "${T}"/80cgc-opt
+}
+
+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
+}