diff options
author | Andrew Bevitt <cyfred@gentoo.org> | 2004-08-02 10:53:55 +0000 |
---|---|---|
committer | Andrew Bevitt <cyfred@gentoo.org> | 2004-08-02 10:53:55 +0000 |
commit | 37a116ae9b2686ecbed06d97b66d4e8098b0ae3f (patch) | |
tree | 29c48bc17fe63fdb2cec755c00cf59faec8ad999 | |
parent | x11-plugins/wmmixer 2.0_beta4 stable for x86. (Manifest recommit) (diff) | |
download | gentoo-2-37a116ae9b2686ecbed06d97b66d4e8098b0ae3f.tar.gz gentoo-2-37a116ae9b2686ecbed06d97b66d4e8098b0ae3f.tar.bz2 gentoo-2-37a116ae9b2686ecbed06d97b66d4e8098b0ae3f.zip |
Fixing bug 59072 typo in description
4 files changed, 7 insertions, 131 deletions
diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog index ee198f7185ec..759b39ac2d13 100644 --- a/media-video/nvidia-kernel/ChangeLog +++ b/media-video/nvidia-kernel/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/nvidia-kernel # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.82 2004/07/26 20:32:24 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.83 2004/08/02 10:53:55 cyfred Exp $ + + 02 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; + nvidia-kernel-1.0.6106-r1.ebuild, -nvidia-kernel-1.0.6106.ebuild: + Fixing bug #59072 and removing 6106 from tree. 26 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>; nvidia-kernel-1.0.4363-r3.ebuild, nvidia-kernel-1.0.4496-r3.ebuild, diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6106 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6106 deleted file mode 100644 index a343b4b8810a..000000000000 --- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6106 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 5432f919f0211ce36b854d87108d7db0 NVIDIA-Linux-x86-1.0-6106-pkg1.run 8160802 -MD5 024f21a3fa134bee8339adac64bdc77a NVIDIA-Linux-x86_64-1.0-6106-pkg2.run 7331301 diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.6106-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.6106-r1.ebuild index 589a41c444c3..c76cac192733 100644 --- a/media-video/nvidia-kernel/nvidia-kernel-1.0.6106-r1.ebuild +++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.6106-r1.ebuild @@ -1,6 +1,6 @@ # 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.6106-r1.ebuild,v 1.1 2004/07/26 13:15:27 cyfred Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.6106-r1.ebuild,v 1.2 2004/08/02 10:53:55 cyfred Exp $ inherit eutils kmod @@ -10,7 +10,7 @@ NV_V="${PV/1.0./1.0-}" X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}" AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}" -DESCRIPTION="Linux kernel module for then NVIDIA X11 driver" +DESCRIPTION="Linux kernel module for the NVIDIA X11 driver" HOMEPAGE="http://www.nvidia.com/" SRC_URI="x86? (ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run) amd64? (http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run)" diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.6106.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.6106.ebuild deleted file mode 100644 index df570d0e946c..000000000000 --- a/media-video/nvidia-kernel/nvidia-kernel-1.0.6106.ebuild +++ /dev/null @@ -1,126 +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.6106.ebuild,v 1.4 2004/07/13 16:04:23 lv Exp $ - -inherit eutils kmod - -X86_PKG_V="pkg1" -AMD64_PKG_V="pkg2" -NV_V="${PV/1.0./1.0-}" -X86_NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}" -AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}" - -DESCRIPTION="Linux kernel module for then NVIDIA X11 driver" -HOMEPAGE="http://www.nvidia.com/" -SRC_URI="x86? (ftp://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${X86_NV_PACKAGE}-${X86_PKG_V}.run) - amd64? (http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${AMD64_NV_PACKAGE}-${AMD64_PKG_V}.run)" - -if use x86; then - PKG_V="${X86_PKG_V}" - NV_PACKAGE="${X86_NV_PACKAGE}" -elif use amd64; then - PKG_V="${AMD64_PKG_V}" - NV_PACKAGE="${AMD64_NV_PACKAGE}" -fi - -S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}/usr/src/nv" - -# The slot needs to be set to $KV to prevent unmerges of modules for other kernels. -LICENSE="NVIDIA" -SLOT="${KV}" -KEYWORDS="-* ~x86 amd64" -RESTRICT="nostrip" -IUSE="" - -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 -} - -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 - - # Add patches below, with a breif description. - # 1) SYSFS supported by nvidia - # 2) minion.de patches not released yet - - cd ${S} - - # Add koutput compile time support... this is hackish - epatch ${FILESDIR}/${PV}/NVIDIA_kernel-${NV_V}-koutput-support.patch - - # 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 - unset ARCH - fi - make IGNORE_CC_MISMATCH="yes" SYSSRC="${KERNEL_DIR}" KVOUT="${KV_OUTPUT}" \ - clean module V=1 || die "Failed to build module" -} - -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\", not \"NVdriver\"" - echo -} |