Workaround bug #462602, drop old

(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key 895192F9)

6 files changed, 9 insertions, 423 deletions

diff --git a/dev-util/nvidia-cuda-sdk/ChangeLog b/dev-util/nvidia-cuda-sdk/ChangeLog
index 1254e67f5cc2..c3297400ea0b 100644
--- a/dev-util/nvidia-cuda-sdk/ChangeLog
+++ b/dev-util/nvidia-cuda-sdk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/nvidia-cuda-sdk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.39 2013/03/09 19:42:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/ChangeLog,v 1.40 2013/06/26 16:13:04 xarthisius Exp $
+
+  26 Jun 2013; Kacper Kowalik <xarthisius@gentoo.org>
+  -nvidia-cuda-sdk-2.2-r1.ebuild, -nvidia-cuda-sdk-4.2.9-r1.ebuild,
+  -nvidia-cuda-sdk-4.2.ebuild, -nvidia-cuda-sdk-5.0.35.ebuild,
+  nvidia-cuda-sdk-5.0.35-r1.ebuild:
+  Workaround bug #462602, drop old
 
 *nvidia-cuda-sdk-5.0.35-r1 (09 Mar 2013)
 
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.2-r1.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.2-r1.ebuild
deleted file mode 100644
index 18b5677b766f..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.2-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.2-r1.ebuild,v 1.6 2012/02/05 05:48:44 vapier Exp $
-
-EAPI=2
-
-inherit unpacker toolchain-funcs
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-
-CUDA_V=${PV//./_}
-
-SRC_URI="http://developer.download.nvidia.com/compute/cuda/${CUDA_V}/sdk/cudasdk_${PV}_linux.run"
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="debug +doc emulation +examples"
-
-RDEPEND=">=dev-util/nvidia-cuda-toolkit-2.2
-	examples? ( !emulation? ( >=x11-drivers/nvidia-drivers-180.22 ) )
-	media-libs/freeglut"
-DEPEND="${RDEPEND}
-	<sys-devel/gcc-4.4"
-
-S="${WORKDIR}"
-
-RESTRICT="binchecks"
-
-pkg_setup() {
-	if [ "$(gcc-major-version)" == "4" -a $(gcc-minor-version) -ge 4 ]; then
-		eerror "This package requires <=sys-devel/gcc-4.3 to build sucessfully."
-		eerror "Please use gcc-config to switch to a compatible GCC version."
-		die "<=sys-devel/gcc-4.3 required"
-	fi
-}
-
-src_prepare() {
-	sed -i -e 's:CUDA_INSTALL_PATH ?= .*:CUDA_INSTALL_PATH ?= /opt/cuda:' sdk/common/common.mk
-}
-
-src_compile() {
-	if ! use examples; then
-		return
-	fi
-	local myopts=""
-
-	if use emulation; then
-		myopts="emu=1"
-	fi
-
-	if use debug; then
-		myopts="${myopts} dbg=1"
-	fi
-
-	cd "${S}/sdk"
-	emake cuda-install=/opt/cuda ${myopts} || die
-}
-
-src_install() {
-	cd "${S}/sdk"
-
-	if ! use doc; then
-		rm -rf doc ReleaseNotes.htm releaseNotesData
-	fi
-
-	if ! use examples; then
-		rm -rf projects bin tools
-	fi
-
-	for f in $(find .); do
-		local t="$(dirname ${f})"
-		if [[ "${t/obj\/}" != "${t}" || "${t##*.}" == "a" ]]; then
-			continue
-		fi
-
-		if [[ -x "${f}" && ! -d "${f}" ]]; then
-			exeinto "/opt/cuda/sdk/${t}"
-			doexe "${f}"
-		else
-			insinto "/opt/cuda/sdk/${t}"
-			doins "${f}"
-		fi
-	done
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r1.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r1.ebuild
deleted file mode 100644
index 92b99478c86c..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r1.ebuild,v 1.1 2013/01/14 10:19:19 jlec Exp $
-
-EAPI=4
-
-inherit cuda eutils toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/sdk/gpucomputingsdk_${PV}_linux.run"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +doc +examples opencl +cuda"
-
-RDEPEND="
-	>=dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-			>=x11-drivers/nvidia-drivers-296
-			media-libs/glew
-		)"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	sed \
-		-e 's:-O2::g' \
-		-e 's:-O3::g' \
-		-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-		-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-		-e "/LINKFLAGS/s:=:= ${LDFLAGS} :g" \
-		-e "/CC/s:gcc:$(tc-getCC):g" \
-		-e "/CXX/s:g++:$(tc-getCXX):g" \
-		-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-		-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-		-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-		-e 's:-Wimplicit::g' \
-		-e 's:GLEW_x86_64:GLEW:g' \
-		-i $(find sdk -type f -name "*.mk") || die
-
-	find sdk/shared/inc/GL -delete || die
-	find sdk -type f -name "*\.a" -delete || die
-}
-
-src_compile() {
-	use examples || return
-	local myopts verbose="verbose=1"
-	use debug && myopts+=" dbg=1"
-	cd sdk
-	use cuda && emake -C C cuda-install="${EPREFIX}/opt/cuda" ${myopts} ${verbose}
-	use opencl && emake -C OpenCL ${verbose}
-}
-
-src_install() {
-	local i j f t crap=""
-	cd sdk
-	if use doc; then
-		ebegin "Installing docs ..."
-		for i in *; do
-			if [[ -d ${i} ]]; then
-				for j in doc releaseNotesData; do
-					docinto ${i}
-					[[ -d ${i}/${j} ]] && dodoc -r ${i}/${j}
-				done
-			fi
-		done
-		dodoc -r doc
-		dohtml {.,*}/*htm*
-		eend
-	fi
-
-	crap+=" *.txt doc */doc */Samples.htm* */releaseNotesData"
-
-	if ! use examples; then
-		crap+=" */bin */tools"
-	fi
-
-	ebegin "Cleaning before installation..."
-	find ${crap} -delete || die
-	find . \( -name Makefile -o -name "*.mk" \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-	for f in $(find .); do
-		local t="$(dirname ${f})"
-		if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-			continue
-		fi
-		if [[ ! -d ${f} ]]; then
-			if [[ -x ${f} ]]; then
-				exeinto /opt/cuda/sdk/${t}
-				doexe ${f}
-			else
-				insinto /opt/cuda/sdk/${t}
-				doins ${f}
-			fi
-		fi
-	done
-	eend
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.ebuild
deleted file mode 100644
index c0b77c08adc3..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.ebuild,v 1.2 2012/08/02 05:10:47 zerochaos Exp $
-
-EAPI=4
-
-inherit unpacker toolchain-funcs
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-
-CUDA_V=${PV//_/-}
-DIR_V=${CUDA_V//./_}
-DIR_V=${DIR_V//beta/Beta}
-
-SRC_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}/rel/sdk/gpucomputingsdk_${CUDA_V}.9_linux.run"
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +doc +examples opencl +cuda"
-
-RDEPEND=">=dev-util/nvidia-cuda-toolkit-${PV}
-	examples? ( >=x11-drivers/nvidia-drivers-260.19.21 )
-	media-libs/freeglut"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"
-
-QA_EXECSTACK="opt/cuda/sdk/C/common/lib/linux/libGLEW.a:glew.o
-		opt/cuda/sdk/shared/lib/linux/libGLEW.a:glew.o
-		opt/cuda/sdk/CUDALibraries/common/lib/linux/libGLEW.a:glew.o"
-QA_FLAGS_IGNORED="opt/cuda/sdk/C/bin/linux/release/.*
-		opt/cuda/sdk/OpenCL/bin/linux/release/.*"
-
-pkg_setup() {
-	if use cuda || use opencl && [ $(gcc-major-version) -lt 4 -o $(gcc-minor-version) -lt 5 ]; then
-		eerror "This package requires >=sys-devel/gcc-4.5 to build sucessfully."
-		eerror "Please use gcc-config to switch to a compatible GCC version."
-		die ">=sys-devel/gcc-4.4 required"
-	fi
-	echo $(gcc-major-version) $(gcc-minor-version)
-}
-
-src_compile() {
-	if ! use examples; then
-		return
-	fi
-	local myopts=""
-
-	if use debug; then
-		myopts="${myopts} dbg=1"
-	fi
-
-	cd "${S}/sdk"
-
-	use cuda && emake -C C cuda-install=/opt/cuda ${myopts}
-	use opencl && emake -C OpenCL
-}
-
-src_install() {
-	cd "${S}/sdk"
-
-	if ! use doc; then
-		rm -rf *.txt doc */doc */Samples.htm */releaseNotesData || die
-	fi
-
-	if ! use examples; then
-		rm -rf bin */bin */tools || die
-	fi
-
-	for f in $(find .); do
-		local t="$(dirname ${f})"
-		if [[ "${t/obj\/}" != "${t}" || "${t##*.}" == "a" ]]; then
-			continue
-		fi
-
-		if [[ ! -d "${f}" ]]; then
-			if [[ -x "${f}" ]]; then
-				exeinto "/opt/cuda/sdk/${t}"
-				doexe "${f}"
-			else
-				insinto "/opt/cuda/sdk/${t}"
-				doins "${f}"
-			fi
-		fi
-	done
-}
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35-r1.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35-r1.ebuild
index f70cb751d695..977efd03c7d6 100644
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35-r1.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35-r1.ebuild,v 1.1 2013/03/09 19:42:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35-r1.ebuild,v 1.2 2013/06/26 16:13:04 xarthisius Exp $
 
 EAPI=4
 
@@ -91,6 +91,7 @@ src_compile() {
 	use examples || return
 	local myopts verbose="verbose=1"
 	use debug && myopts+=" dbg=1"
+	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
 	emake \
 		cuda-install="${EPREFIX}/opt/cuda" \
 		CUDA_PATH="${EPREFIX}/opt/cuda/" \
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild
deleted file mode 100644
index af019647eee5..000000000000
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild,v 1.4 2013/01/23 07:15:32 jlec Exp $
-
-EAPI=4
-
-inherit cuda eutils flag-o-matic toolchain-funcs unpacker versionator
-
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
-DISTRO=fedora16-1
-
-DESCRIPTION="NVIDIA CUDA Software Development Kit"
-HOMEPAGE="http://developer.nvidia.com/cuda"
-CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel-update-1/installers/"
-SRC_URI="
-	http://dev.gentoo.org/~jlec/distfiles/${P}-asneeded.patch.xz
-	amd64? ( ${CURI}/cuda_${PV}_linux_64_${DISTRO}.run )
-	x86? ( ${CURI}/cuda_${PV}_linux_32_${DISTRO}.run )"
-
-LICENSE="CUDPP"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug +doc +examples opencl +cuda"
-
-RDEPEND="
-	>=dev-util/nvidia-cuda-toolkit-${PV}
-	media-libs/freeglut
-	examples? (
-		media-libs/freeimage
-		media-libs/glew
-		virtual/mpi
-		>=x11-drivers/nvidia-drivers-304.54
-		)"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/sdk
-
-# nvcc doesn't support LDFLAGS
-QA_FLAGS_IGNORED=(
-	opt/cuda/sdk/0_Simple/simpleMPI/simpleMPI
-	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
-	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
-	opt/cuda/sdk/6_Advanced/cdpAdvancedQuicksort/cdpAdvancedQuicksort
-	opt/cuda/sdk/6_Advanced/cdpLUDecomposition/cdpLUDecomposition
-	opt/cuda/sdk/6_Advanced/cdpQuadtree/cdpQuadtree
-	opt/cuda/sdk/bin/linux/release/cdpLUDecomposition
-	opt/cuda/sdk/bin/linux/release/cdpSimpleQuicksort
-	opt/cuda/sdk/bin/linux/release/simpleMPI
-	opt/cuda/sdk/bin/linux/release/cdpAdvancedQuicksort
-	opt/cuda/sdk/bin/linux/release/cdpQuadtree
-	opt/cuda/sdk/bin/linux/release/cdpSimplePrint
-	)
-
-src_unpack() {
-	unpacker
-	unpacker run_files/cuda-samples*run
-}
-
-pkg_setup() {
-	if use cuda || use opencl; then
-		cuda_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-asneeded.patch
-	sed \
-		-e 's:-O2::g' \
-		-e 's:-O3::g' \
-		-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
-		-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
-		-e "/LINKFLAGS/s:=:= ${LDFLAGS} :g" \
-		-e "/CC/s:gcc:$(tc-getCC):g" \
-		-e "/GCC/s:g++:$(tc-getCXX):g" \
-		-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
-		-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
-		-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
-		-e 's:-Wimplicit::g' \
-		-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \
-		-i $(find . -type f -name "Makefile") || die
-
-	export RAWLDFLAGS="$(raw-ldflags)"
-
-	find common/inc/GL -delete || die
-	find . -type f -name "*\.a" -delete || die
-}
-
-src_compile() {
-	use examples || return
-	local myopts verbose="verbose=1"
-	use debug && myopts+=" dbg=1"
-	emake \
-		cuda-install="${EPREFIX}/opt/cuda" \
-		CUDA_PATH="${EPREFIX}/opt/cuda/" \
-		${myopts} ${verbose}
-}
-
-src_install() {
-	local i j f t crap=""
-	if use doc; then
-		ebegin "Installing docs ..."
-		dodoc -r doc releaseNotesData
-		dohtml *htm*
-		eend
-	fi
-
-	crap+=" *.txt doc Samples.htm* releaseNotesData"
-
-	ebegin "Cleaning before installation..."
-	for i in ${crap}; do
-		if [[ -e ${i} ]]; then
-			find ${i} -delete || die
-		fi
-	done
-	find . \( -name Makefile -o -name "*.mk" \) -delete || die
-	eend
-
-	ebegin "Moving files..."
-	for f in $(find .); do
-		local t="$(dirname ${f})"
-		if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
-			continue
-		fi
-		if [[ ! -d ${f} ]]; then
-			if [[ -x ${f} ]]; then
-				exeinto /opt/cuda/sdk/${t}
-				doexe ${f}
-			else
-				insinto /opt/cuda/sdk/${t}
-				doins ${f}
-			fi
-		fi
-	done
-	eend
-}