gentoo resync : 22.12.2021

3 files changed, 2 insertions, 134 deletions

diff --git a/media-gfx/nvidia-cg-toolkit/Manifest b/media-gfx/nvidia-cg-toolkit/Manifest
index 5d3a399476c0..3a06b837aa29 100644
--- a/media-gfx/nvidia-cg-toolkit/Manifest
+++ b/media-gfx/nvidia-cg-toolkit/Manifest
@@ -4,6 +4,5 @@ AUX nvidia-cg-toolkit-gl.pc.in 278 BLAKE2B ef0bfb9b76386c078e36b700166069fd961b0
 AUX nvidia-cg-toolkit.pc.in 242 BLAKE2B 45f19a2791310975169f8a31bf65d77a86b4e4487502c40101622070a28e316ae3bb910e7bb3d8af0073ac281ab4ca0786a081e1c1ff8955c125bd3fe1b5403b SHA512 601505a228eb4f70813d3ab6346a51c1552751278549c81b7721273dd58c053639cad49cfe82982455b1399d8b494f8351a0a479efbdb33171d28c3dd0b69073
 DIST Cg-3.1_April2012_x86.tgz 23332348 BLAKE2B e8253cfd1b569e1eb083ca394ae969ca43677641763eb77c24381198914cb1508bd41489224d8cc1afefca2affb485320022bd35e7ffaa48aaadafcf42f89183 SHA512 7b2addad157e151eb42b320aea31ccddfd53ec5640cb97bc86a3d461c1b08a2dff280bfc3f7859d124c311e1710e39d40405c387e5724ebc82d95303b250837a
 DIST Cg-3.1_April2012_x86_64.tgz 24829131 BLAKE2B f1425f391022aa57fe2b23581786576ab8762a48e9ffc875853d55399d3a996ac85debb099d0b906dcce6c95989a06c3980bfb59dc69edc16d1378ba5dc89c73 SHA512 591b51195193e7e3bbb9f1c2579336d24a179b0a88b955a01f4661bda55543fbccd73cac53033912f2eea8a1068e4c1394c6d286f195963cfb33a0d8b4428e27
-EBUILD nvidia-cg-toolkit-3.1.0013-r5.ebuild 2922 BLAKE2B 5af69be5db5e7bde21b3503e0e65703c03e6473eabf7e48539fc035f917564c57c89433d5df153b46553ddb6a75db5d69f6c1c5bb4b0cfa6f86eae86cdc4244f SHA512 0d438981abc65c0e53f758488372059c12c10b466a8b23a136ef482df219452635db7fd59500d43520d05f50584ce5fdc32a4b718dd3079a84864a2f57e8514f
-EBUILD nvidia-cg-toolkit-3.1.0013-r6.ebuild 2881 BLAKE2B fe92f0c380d34697fdae0c33a4e5f16f4b66336854ca4df69edba3ff8440919cb038d5e41856b6e974cd0e227374e5561d8ad83e721fc373de5e5d6c06d86b4e SHA512 91f051a0e56a648567bd0c84e3f149a661816325ad4646bd43055981f2e9ce9e129e63a1fcd6f8b7a92691f34f0faa01a827a64c26ed81718422a831d9f2cb48
+EBUILD nvidia-cg-toolkit-3.1.0013-r6.ebuild 2879 BLAKE2B 06f54df10206181375027be9a4f2e7039c9b0e85fcf8285d7a42df2d7bf6a7723d11cf6b4492fddb3aff749d9aef82aa33b1d7c449b0b96c838dc6c43bb7dd97 SHA512 1325f44274bc39a2147d92cd6019369a7b9ba4f124225fc2b9e911c7f38cdd9f42aaebfd9e4f5da370e9ea2ca5cb03ff8473ac745ec4b42a957b06d46958ba05
 MISC metadata.xml 556 BLAKE2B a480fdc63faf7dbaf64c54fb70e033e7e32de1c149a89840e1a3a9a345b00dd3586431c3ac9e10f1a649940508ef308a7b5aff326d31f4a18c9b6c97d1d1a7eb SHA512 0ec1f9415029c86117aea79751d1e0bae7057cf6700a4d06a65d84a1a674dbdfdb91d0a7d0a66d5cedf0db033b8059ad65aa3e40d3295d9dae95d031c5179f58
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild
deleted file mode 100644
index d1edb0448661..000000000000
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r5.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
-RESTRICT="strip"
-
-RDEPEND="
-	>=media-libs/glu-9.0.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	amd64? (
-		abi_x86_32? (
-			>=media-libs/freeglut-2.8.1[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
-}
diff --git a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r6.ebuild b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r6.ebuild
index d480e93dbdbf..41568efe3593 100644
--- a/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r6.ebuild
+++ b/media-gfx/nvidia-cg-toolkit/nvidia-cg-toolkit-3.1.0013-r6.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="NVIDIA-r1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples multilib"
 
 RESTRICT="strip"