Cleaning up a little, getting ready for moving stuff out of FILESDIR

6 files changed, 0 insertions, 337 deletions

diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest
index 9f5f79e4fee6..bb97dab374a9 100644
--- a/media-video/nvidia-kernel/Manifest
+++ b/media-video/nvidia-kernel/Manifest
@@ -1,19 +1,15 @@
 MD5 8ce6e8510b5396c685ad67f806351d36 nvidia-kernel-1.0.6106-r1.ebuild 3622
 MD5 b4a7988f8e10107742f255ea291478c0 nvidia-kernel-1.0.4499.ebuild 4028
 MD5 c65724336acbdb77c80842d7a9174301 nvidia-kernel-1.0.5332-r1.ebuild 4256
-MD5 aadbfcb5df7c5f6f87d96d032623643d nvidia-kernel-1.0.5336-r3.ebuild 4629
 MD5 8a9c407431706202e44f4f6f94f37952 nvidia-kernel-1.0.6111.ebuild 3622
 MD5 3ff60fb835fc8ab36543515ff50741ef nvidia-kernel-1.0.5328-r1.ebuild 4465
 MD5 20f6ae4f9076cd8f5dd1d2383d0eaca7 nvidia-kernel-1.0.4496-r3.ebuild 4286
 MD5 d5bc3ba053815cd1b559cba6bbd36452 nvidia-kernel-1.0.4363-r3.ebuild 4071
-MD5 45245c720d6b0dc7c3f73a2ee95823a0 nvidia-kernel-1.0.5336-r2.ebuild 4673
 MD5 f3637811db3fefa9acf04ad0f9bcbd90 ChangeLog 20625
 MD5 2e350a0784b0810b89809d761e499bea metadata.xml 301
 MD5 d8008e9fd34e643ba85c473c91f40539 nvidia-kernel-1.0.5336-r4.ebuild 4783
 MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-kernel-1.0.5328-r1 80
 MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-kernel-1.0.5332-r1 83
-MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-kernel-1.0.5336-r2 80
-MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-kernel-1.0.5336-r3 80
 MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-kernel-1.0.5336-r4 80
 MD5 50ffea0f5eb12d252905f379bc7be2d6 files/digest-nvidia-kernel-1.0.6106-r1 163
 MD5 046ed3744551619863faea8c5c83db02 files/digest-nvidia-kernel-1.0.4499 74
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.5336-r2 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.5336-r2
deleted file mode 100644
index 56ddf0d273b7..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.5336-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d7361347ebbef5dfdbe6bdcb560fda8 NVIDIA-Linux-x86-1.0-5336-pkg1.run 6821193
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.5336-r3 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.5336-r3
deleted file mode 100644
index 56ddf0d273b7..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.5336-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d7361347ebbef5dfdbe6bdcb560fda8 NVIDIA-Linux-x86-1.0-5336-pkg1.run 6821193
diff --git a/media-video/nvidia-kernel/files/nvidia b/media-video/nvidia-kernel/files/nvidia
deleted file mode 100644
index cfc44a60a7d9..000000000000
--- a/media-video/nvidia-kernel/files/nvidia
+++ /dev/null
@@ -1 +0,0 @@
-alias char-major-195 NVdriver
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r2.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r2.ebuild
deleted file mode 100644
index 823efe145a5f..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r2.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r2.ebuild,v 1.5 2004/07/26 20:32:24 spyderous Exp $
-
-inherit eutils
-
-PKG_V="pkg1"
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
-IUSE=""
-
-# The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
-LICENSE="NVIDIA"
-SLOT="${KV}"
-KEYWORDS="-* ~x86"
-RESTRICT="nostrip"
-
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-
-pkg_setup() {
-	if [ ! -f /proc/mtrr ]
-	then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features -> [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-
-	check_version_h
-}
-
-check_version_h() {
-	if [ ! -f "${ROOT}/usr/src/linux/include/linux/version.h" ]
-	then
-		eerror "Please verify that your /usr/src/linux symlink is pointing"
-		eerror "to your current kernel sources, and that you did run:"
-		eerror
-		eerror "  # make dep"
-		die "/usr/src/linux symlink not setup!"
-	fi
-}
-
-get_KV_info() {
-	check_version_h
-
-	# Get the kernel version of sources in /usr/src/linux ...
-	export KV_full="$(awk '/UTS_RELEASE/ { gsub("\"", "", $3); print $3 }' \
-		"${ROOT}/usr/src/linux/include/linux/version.h")"
-	export KV_major="$(echo "${KV_full}" | cut -d. -f1)"
-	export KV_minor="$(echo "${KV_full}" | cut -d. -f2)"
-	export KV_micro="$(echo "${KV_full}" | cut -d. -f3 | sed -e 's:[^0-9].*::')"
-}
-
-is_kernel() {
-	[ -z "$1" -o -z "$2" ] && return 1
-
-	get_KV_info
-
-	if [ "${KV_major}" -eq "$1" -a "${KV_minor}" -eq "$2" ]
-	then
-		return 0
-	else
-		return 1
-	fi
-}
-
-src_unpack() {
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Next section applies patches for linux-2.5 kernel, and/or
-	# bugfixes for linux-2.4.  All these are from:
-	#
-	#   http://www.minion.de/nvidia/
-	#
-	# Many thanks to Christian Zander <zander@minion.de> for bringing
-	# these to us, and being so helpful to select which to use.
-
-	get_KV_info
-
-	cd ${S}
-	einfo "Linux kernel ${KV_major}.${KV_minor}.${KV_micro}"
-
-	if is_kernel 2 5 || is_kernel 2 6
-	then
-		EPATCH_SINGLE_MSG="Applying basic sysfs patch ..." \
-		epatch ${FILESDIR}/${PV}/NVIDIA_kernel-${NV_V}-basic-sysfs-support.patch
-
-		# Kbuild have issues currently (sandbox related).
-#		ln -snf Makefile.nvidia Makefile
-		sed -e "s:5328:${NV_V/1.0-/}:g" \
-			${FILESDIR}/${PV}/Makefile > ${S}/makefile
-
-		# Makefile is now makefile so we will do sed here instead.
-		[ ! -z "${USE_CRAZY_OPTS}" ] && sed -i "s:-O:${CFLAGS}:" makefile
-	else
-		# if you set this then it's your own fault when stuff breaks :)
-		[ ! -z "${USE_CRAZY_OPTS}" ] && sed -i "s:-O:${CFLAGS}:" Makefile
-	fi
-}
-
-src_compile() {
-	# Portage should determine the version of the kernel sources
-	check_KV
-
-	# IGNORE_CC_MISMATCH disables a sanity check that's needed when gcc has been
-	# updated but the running kernel is still compiled with an older gcc.  This is
-	# needed for chrooted building, where the sanity check detects the gcc of the
-	# kernel outside the chroot rather than within.
-	if is_kernel 2 5 || is_kernel 2 6
-	then
-		make IGNORE_CC_MISMATCH="yes" KERNDIR="${ROOT}/usr/src/linux" \
-			clean nvidia.o || die
-	else
-		make IGNORE_CC_MISMATCH="yes" KERNDIR="${ROOT}/usr/src/linux" \
-			clean module || die
-	fi
-}
-
-src_install() {
-	# The driver goes into the standard modules location
-	insinto /lib/modules/${KV}/video
-	if is_kernel 2 5 || is_kernel 2 6
-	then
-		newins nvidia.o nvidia.ko
-	else
-		doins nvidia.o
-	fi
-
-	# Add the aliases
-	insinto /etc/modules.d
-	newins ${FILESDIR}/nvidia-1.1 nvidia
-
-	# Docs
-	dodoc ${S}/README
-
-	# The device creation script
-	into /
-	newsbin ${S}/makedevices.sh NVmakedevices.sh
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		# Update module dependency
-		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-		if [ ! -e /dev/.devfsd ] && [ ! -e /dev/.udev ] && [ -x /sbin/NVmakedevices.sh ]
-		then
-			/sbin/NVmakedevices.sh >/dev/null 2>&1
-		fi
-	fi
-
-	echo
-	einfo "If you are not using devfs, loading the module automatically at"
-	einfo "boot up, you need to add \"nvidia\" to your /etc/modules.autoload."
-	echo
-	ewarn "Please note that the driver name changed from \"NVdriver\""
-	ewarn "to \"nvidia.o\"."
-	echo
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r3.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r3.ebuild
deleted file mode 100644
index 8674a0890a09..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r3.ebuild,v 1.5 2004/07/26 20:32:24 spyderous Exp $
-
-inherit eutils kmod
-
-PKG_V="pkg1"
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv"
-DESCRIPTION="Linux kernel module for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
-IUSE=""
-
-# The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
-LICENSE="NVIDIA"
-SLOT="${KV}"
-KEYWORDS="-* ~x86"
-RESTRICT="nostrip"
-
-DEPEND="virtual/linux-sources"
-export _POSIX2_VERSION="199209"
-
-KMOD_SOURCES="none"
-
-mtrr_check() {
-	if [ ! -f /proc/mtrr ]
-	then
-		eerror "This version needs MTRR support for most chipsets!"
-		eerror "Please enable MTRR support in your kernel config, found at:"
-		eerror
-		eerror "  Processor type and features -> [*] MTRR (Memory Type Range Register) support"
-		eerror
-		eerror "and recompile your kernel ..."
-		die "MTRR support not detected!"
-	fi
-}
-
-pkg_setup() {
-	mtrr_check
-
-	echo
-	ewarn "The new 2.6.6 Series kernels include an option for 4K Stack sizes,"
-	ewarn "this option must NOT be selected. This driver will only work with"
-	ewarn "the OLD 8K Stack size, please ensure you leave 8K stack sizes for now."
-	echo
-}
-
-ck_kern_write() {
-	if [ ! "${KV_PATCH}" -ge "6" ]
-	then
-		ewarn "You are running Linux Kernel ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}\n"
-		ewarn "Due to incompatibilities between the current nvidia drivers and"
-		ewarn "the new 2.6.6 kernel sources we need to use the koutput feature"
-		ewarn "unfortunately this means that older kernels will be omitted from"
-		ewarn "the sandbox for this build.\n"
-		ewarn "This will be over come with newer driver releases from nvidia."
-		echo
-		ewarn "THIS BUILD WILL NOT WORK WITH FEATURES=\"userpriv\""
-		echo
-		ewarn "We are working to resolve this issue, please disable userpriv"
-		ewarn "if you use it while building nvidia-kernel."
-		return 0
-	else
-		return 1
-	fi
-}
-
-src_unpack() {
-	# Let the kmod eclass set the variables for us
-	kmod_src_unpack
-
-	cd ${WORKDIR}
-	bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-	# Next section applies patches for linux-2.5 kernel, and/or
-	# bugfixes for linux-2.4.  All these are from:
-	#
-	#   http://www.minion.de/nvidia/
-	#
-	# Many thanks to Christian Zander <zander@minion.de> for bringing
-	# these to us, and being so helpful to select which to use.
-
-	cd ${S}
-
-	if is_kernel 2 5 || is_kernel 2 6
-	then
-		EPATCH_SINGLE_MSG="Applying basic sysfs patch ..." \
-		epatch ${FILESDIR}/${PV}/NVIDIA_kernel-${NV_V}-basic-sysfs-support.patch
-
-		# The 2.6 kernels support a form of kbuild now we will aswell.
-		rm makefile
-		ln -snf Makefile.kbuild Makefile
-
-	fi
-
-	# if you set this then it's your own fault when stuff breaks :)
-	[ ! -z "${USE_CRAZY_OPTS}" ] && sed -i "s:-O:${CFLAGS}:" Makefile
-}
-
-src_compile() {
-	# IGNORE_CC_MISMATCH disables a sanity check that's needed when gcc has been
-	# updated but the running kernel is still compiled with an older gcc.  This is
-	# needed for chrooted building, where the sanity check detects the gcc of the
-	# kernel outside the chroot rather than within.
-	if is_kernel 2 5 || is_kernel 2 6
-	then
-		if ck_kern_write
-		then
-			KD="`/bin/readlink -f ${KERNEL_DIR}`"
-			einfo "Adding write support to ${KD}\n"
-			addwrite "${KD}"
-		fi
-
-		unset ARCH
-		make IGNORE_CC_MISMATCH="yes" SYSSRC="${KERNEL_DIR}" \
-			M="${S}" clean module || die "Failed to build module"
-	else
-		make IGNORE_CC_MISMATCH="yes" KERNDIR="${ROOT}/usr/src/linux" \
-			clean module || die
-	fi
-}
-
-src_install() {
-	# The driver goes into the standard modules location
-	insinto /lib/modules/${KV}/video
-
-	# Insert the module 
-	doins nvidia.${KV_OBJ}
-
-	# Add the aliases
-	insinto /etc/modules.d
-	newins ${FILESDIR}/nvidia-1.1 nvidia
-
-	# Docs
-	dodoc ${S}/README
-
-	# The device creation script
-	into /
-	newsbin ${S}/makedevices.sh NVmakedevices.sh
-}
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		# Update module dependency
-		[ -x /usr/sbin/update-modules ] && /usr/sbin/update-modules
-		if [ ! -e /dev/.devfsd ] && [ ! -e /dev/.udev ] && [ -x /sbin/NVmakedevices.sh ]
-		then
-			/sbin/NVmakedevices.sh >/dev/null 2>&1
-		fi
-	fi
-
-	echo
-	einfo "If you need to load the module automatically on boot up you need"
-	einfo "to add \"nvidia\" to /etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
-	echo
-	einfo "Please note that the driver name is nvidia.${KV_OBJ}, not NVdriver"
-	echo
-}