Keywords masking as driver/glx being deprecated.

21 files changed, 47 insertions, 303 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index d2f0b0528a98..576fcc59b483 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/nvidia-glx
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.63 2004/11/07 01:52:37 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.64 2004/11/07 02:00:47 cyfred Exp $
+
+  07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
+  nvidia-glx-1.0.4363-r1.ebuild, nvidia-glx-1.0.4496-r2.ebuild,
+  nvidia-glx-1.0.4499-r1.ebuild, nvidia-glx-1.0.5328-r2.ebuild,
+  nvidia-glx-1.0.5332-r2.ebuild, nvidia-glx-1.0.5336-r2.ebuild,
+  nvidia-glx-1.0.6106-r3.ebuild:
+  Keywords masking as driver/glx being deprecated.
 
 *nvidia-glx-1.0.6629 (07 Nov 2004)
 
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.4363-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.4363-r1.ebuild
index 48772635b767..8c7d90a07c8d 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.4363-r1.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.4363-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-glx/nvidia-glx-1.0.4363-r1.ebuild,v 1.1 2004/07/19 10:24:49 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.4363-r1.ebuild,v 1.2 2004/11/07 02:00:47 cyfred Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}.tar.
 
 LICENSE="NVIDIA"
 SLOT="0"
-KEYWORDS="-* x86"
+KEYWORDS="-* -x86"
 IUSE=""
 RESTRICT="nostrip"
 
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.4496-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.4496-r2.ebuild
index ec487845eefc..d21e96e1d945 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.4496-r2.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.4496-r2.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-glx/nvidia-glx-1.0.4496-r2.ebuild,v 1.1 2004/07/19 10:24:49 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.4496-r2.ebuild,v 1.2 2004/11/07 02:00:47 cyfred Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-pkg0
 
 LICENSE="NVIDIA"
 SLOT="0"
-KEYWORDS="-* x86"
+KEYWORDS="-* -x86"
 IUSE=""
 RESTRICT="nostrip"
 
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.4499-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.4499-r1.ebuild
index 16c84c7f038e..4d5b1be79dab 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.4499-r1.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.4499-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-glx/nvidia-glx-1.0.4499-r1.ebuild,v 1.2 2004/09/19 01:14:42 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.4499-r1.ebuild,v 1.3 2004/11/07 02:00:47 cyfred Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.nvidia.com/XFree86/linux-x86-64/${NV_V}/${NV_PACKAGE}.t
 
 LICENSE="NVIDIA"
 SLOT="0"
-KEYWORDS="-* amd64"
+KEYWORDS="-* -amd64"
 IUSE=""
 RESTRICT="nostrip"
 
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.5328-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.5328-r2.ebuild
index 78baa0d790ae..bf44bf5995c9 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.5328-r2.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.5328-r2.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-glx/nvidia-glx-1.0.5328-r2.ebuild,v 1.2 2004/08/16 12:01:24 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.5328-r2.ebuild,v 1.3 2004/11/07 02:00:47 cyfred Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-${PK
 
 LICENSE="NVIDIA"
 SLOT="0"
-KEYWORDS="-* x86"
+KEYWORDS="-* -x86"
 IUSE=""
 RESTRICT="nostrip"
 
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.5332-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.5332-r2.ebuild
index 49910eab34e4..6a3070876c51 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.5332-r2.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.5332-r2.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-glx/nvidia-glx-1.0.5332-r2.ebuild,v 1.9 2004/07/14 22:09:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.5332-r2.ebuild,v 1.10 2004/11/07 02:00:47 cyfred Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${NV_PACKAGE}-$
 
 LICENSE="NVIDIA"
 SLOT="0"
-KEYWORDS="-* amd64"
+KEYWORDS="-* -amd64"
 IUSE=""
 RESTRICT="nostrip"
 
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.5336-r2.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.5336-r2.ebuild
index 6262fc884895..ae09440d8b2e 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.5336-r2.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.5336-r2.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-glx/nvidia-glx-1.0.5336-r2.ebuild,v 1.9 2004/08/16 12:01:24 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.5336-r2.ebuild,v 1.10 2004/11/07 02:00:47 cyfred Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-${PK
 
 LICENSE="NVIDIA"
 SLOT="0"
-KEYWORDS="-* x86"
+KEYWORDS="-* -x86"
 IUSE=""
 RESTRICT="nostrip"
 
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.6106-r3.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.6106-r3.ebuild
index 6a52310078df..8a5aa9bfd026 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.6106-r3.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.6106-r3.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-glx/nvidia-glx-1.0.6106-r3.ebuild,v 1.2 2004/07/18 19:18:54 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6106-r3.ebuild,v 1.3 2004/11/07 02:00:47 cyfred Exp $
 
 inherit eutils
 
@@ -27,7 +27,7 @@ S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}"
 
 LICENSE="NVIDIA"
 SLOT="0"
-KEYWORDS="-* ~x86 amd64"
+KEYWORDS="-* -x86 -amd64"
 RESTRICT="nostrip"
 IUSE="multilib"
 
diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index ac0f880b516d..6b03072d4b11 100644
--- a/media-video/nvidia-kernel/ChangeLog
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -1,6 +1,14 @@
 # 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.93 2004/11/07 01:52:46 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.94 2004/11/07 02:01:13 cyfred Exp $
+
+  07 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
+  nvidia-kernel-1.0.4363-r3.ebuild, nvidia-kernel-1.0.4496-r3.ebuild,
+  nvidia-kernel-1.0.4499.ebuild, nvidia-kernel-1.0.5328-r1.ebuild,
+  nvidia-kernel-1.0.5332-r1.ebuild, nvidia-kernel-1.0.5336-r4.ebuild,
+  nvidia-kernel-1.0.6106-r1.ebuild, -nvidia-kernel-1.0.6111-r1.ebuild,
+  -nvidia-kernel-1.0.6111.ebuild, nvidia-kernel-1.0.6111-r2:
+  Keywords masking as driver/glx being deprecated.
 
 *nvidia-kernel-1.0.6111-r3 (07 Nov 2004)
 
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6111 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6111
deleted file mode 100644
index 891f45379b0a..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6111
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 51e83be46f83c52102ccb8995b54f4e2 NVIDIA-Linux-x86-1.0-6111-pkg1.run 8167999
-MD5 6c7b0c8b3ce5c34186e0c80042e6d046 NVIDIA-Linux-x86_64-1.0-6111-pkg2.run 7333486
diff --git a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6111-r1 b/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6111-r1
deleted file mode 100644
index 891f45379b0a..000000000000
--- a/media-video/nvidia-kernel/files/digest-nvidia-kernel-1.0.6111-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 51e83be46f83c52102ccb8995b54f4e2 NVIDIA-Linux-x86-1.0-6111-pkg1.run 8167999
-MD5 6c7b0c8b3ce5c34186e0c80042e6d046 NVIDIA-Linux-x86_64-1.0-6111-pkg2.run 7333486
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.ebuild
index 6e7626a283f4..bc3779767b5b 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.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.4363-r3.ebuild,v 1.15 2004/07/26 20:32:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4363-r3.ebuild,v 1.16 2004/11/07 02:01:13 cyfred Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ IUSE=""
 # The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
 LICENSE="NVIDIA"
 SLOT="${KV}"
-KEYWORDS="-* x86"
+KEYWORDS="-* -x86"
 RESTRICT="nostrip"
 
 DEPEND="virtual/linux-sources"
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r3.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r3.ebuild
index 820397c2b03e..4fbdbb38b82b 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r3.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r3.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.4496-r3.ebuild,v 1.12 2004/07/26 20:32:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r3.ebuild,v 1.13 2004/11/07 02:01:13 cyfred Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ IUSE=""
 # The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
 LICENSE="NVIDIA"
 SLOT="${KV}"
-KEYWORDS="-* x86"
+KEYWORDS="-* -x86"
 RESTRICT="nostrip"
 
 DEPEND="virtual/linux-sources"
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.4499.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.4499.ebuild
index 931e102c41c7..1a192fd14940 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.4499.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.4499.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.4499.ebuild,v 1.10 2004/07/26 20:32:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4499.ebuild,v 1.11 2004/11/07 02:01:13 cyfred Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ IUSE=""
 # The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
 LICENSE="NVIDIA"
 SLOT="${KV}"
-KEYWORDS="-* amd64"
+KEYWORDS="-* -amd64"
 RESTRICT="nostrip"
 
 DEPEND="virtual/linux-sources"
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.5328-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.5328-r1.ebuild
index 1a713c741341..418bfc27df5b 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.5328-r1.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.5328-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.5328-r1.ebuild,v 1.9 2004/08/16 12:06:50 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.5328-r1.ebuild,v 1.10 2004/11/07 02:01:13 cyfred Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ IUSE=""
 # The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
 LICENSE="NVIDIA"
 SLOT="${KV}"
-KEYWORDS="-* x86"
+KEYWORDS="-* -x86"
 RESTRICT="nostrip"
 
 DEPEND="virtual/linux-sources"
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.5332-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.5332-r1.ebuild
index 8c2c5f55a33b..dbe58fcc4e3e 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.5332-r1.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.5332-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.5332-r1.ebuild,v 1.5 2004/07/26 20:32:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.5332-r1.ebuild,v 1.6 2004/11/07 02:01:13 cyfred Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ IUSE=""
 # The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
 LICENSE="NVIDIA"
 SLOT="${KV}"
-KEYWORDS="-* amd64"
+KEYWORDS="-* -amd64"
 RESTRICT="nostrip"
 
 DEPEND="virtual/linux-sources"
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r4.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r4.ebuild
index 0704efac1ce5..9afc97ef422a 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r4.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r4.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.5336-r4.ebuild,v 1.4 2004/08/16 12:06:50 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.5336-r4.ebuild,v 1.5 2004/11/07 02:01:13 cyfred Exp $
 
 inherit eutils kmod
 
@@ -16,7 +16,7 @@ IUSE=""
 # The slot needs to be set to $KV to prevent unmerges of modules for other kernels.
 LICENSE="NVIDIA"
 SLOT="${KV}"
-KEYWORDS="-* x86"
+KEYWORDS="-* -x86"
 RESTRICT="nostrip"
 
 DEPEND="virtual/linux-sources"
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 c76cac192733..5c7b9c991175 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.2 2004/08/02 10:53:55 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.6106-r1.ebuild,v 1.3 2004/11/07 02:01:13 cyfred Exp $
 
 inherit eutils kmod
 
@@ -28,7 +28,7 @@ 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"
+KEYWORDS="-* -x86 -amd64"
 RESTRICT="nostrip"
 IUSE=""
 
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r1.ebuild
deleted file mode 100644
index 94269d4dcb1d..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r1.ebuild
+++ /dev/null
@@ -1,136 +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.6111-r1.ebuild,v 1.2 2004/09/21 00:09:17 azarah 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 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)"
-
-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}
-
-	# Fix up the removal of PM_SAVE_STATE in kernels > 2.6.8
-	epatch ${FILESDIR}/${PV}/power-suspend-2.6.9-changes.patch
-	# Update pci stuff to work with irqroutes being changed in kernels
-	epatch ${FILESDIR}/${PV}/nv_enable_pci.patch
-	if is_kernel 2 6 && [ "${KV_PATCH}" -ge 9 ]
-	then
-		grep -c 'pci_get_class' "${KERNEL_DIR}/include/linux/pci.h" >/dev/null && \
-			epatch ${FILESDIR}/${PV}/nv-pci_find_class.patch
-	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
-		unset ARCH
-	fi
-	make IGNORE_CC_MISMATCH="yes" SYSSRC="${KERNEL_DIR}" SYSOUT="${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
-	einfo "This module will now work correctly under udev, you do not need to"
-	einfo "manually create the devices anymore."
-	echo
-}
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r2.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r2.ebuild
index 8627d8326231..b93771646c7d 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r2.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r2.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.6111-r2.ebuild,v 1.1 2004/10/04 11:03:24 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.6111-r2.ebuild,v 1.2 2004/11/07 02:01:13 cyfred Exp $
 
 inherit eutils kmod
 
@@ -28,7 +28,7 @@ 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"
+KEYWORDS="-* -x86 -amd64"
 RESTRICT="nostrip"
 IUSE=""
 
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.6111.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.6111.ebuild
deleted file mode 100644
index 172fe6a28f7b..000000000000
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.6111.ebuild
+++ /dev/null
@@ -1,131 +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.6111.ebuild,v 1.4 2004/09/06 01:56:51 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 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)"
-
-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}
-
-	# Fix up the removal of PM_SAVE_STATE in kernels > 2.6.8
-	epatch ${FILESDIR}/${PV}/power-suspend-2.6.9-changes.patch
-	# Update pci stuff to work with irqroutes being changed in kernels
-	epatch ${FILESDIR}/${PV}/nv_enable_pci.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}" SYSOUT="${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
-	einfo "This module will now work correctly under udev, you do not need to"
-	einfo "manually create the devices anymore."
-	echo
-}