Removing all masked (deprecated) versions to match the nvidia-kernel removal.
authorAndrew Bevitt <cyfred@gentoo.org>
Tue, 30 Nov 2004 01:33:12 +0000 (01:33 +0000)
committerAndrew Bevitt <cyfred@gentoo.org>
Tue, 30 Nov 2004 01:33:12 +0000 (01:33 +0000)
30 files changed:
media-video/nvidia-glx/ChangeLog
media-video/nvidia-glx/Manifest
media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch [deleted file]
media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch [deleted file]
media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-makefile.patch [deleted file]
media-video/nvidia-glx/files/README.gentoo [deleted file]
media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4363-r1 [deleted file]
media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4496-r2 [deleted file]
media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4499-r1 [deleted file]
media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5328-r2 [deleted file]
media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5332-r2 [deleted file]
media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5336-r2 [deleted file]
media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6106-r3 [deleted file]
media-video/nvidia-glx/files/libGL.la [moved from media-video/nvidia-glx/files/libGL.la.2 with 100% similarity]
media-video/nvidia-glx/files/nvidia-glx-1.0.4363-defines.patch [deleted file]
media-video/nvidia-glx/files/nvidia-glx-1.0.4496-defines.patch [deleted file]
media-video/nvidia-glx/files/nvidia-glx-1.0.4499-defines.patch [deleted file]
media-video/nvidia-glx/files/nvidia-glx-1.0.5328-defines.patch [deleted file]
media-video/nvidia-glx/files/nvidia-glx-1.0.5328-glheader.patch [deleted file]
media-video/nvidia-glx/files/nvidia-glx-1.0.5332-glheader.patch [deleted file]
media-video/nvidia-glx/files/nvidia-glx-1.0.5336-glheader.patch [deleted file]
media-video/nvidia-glx/nvidia-glx-1.0.4363-r1.ebuild [deleted file]
media-video/nvidia-glx/nvidia-glx-1.0.4496-r2.ebuild [deleted file]
media-video/nvidia-glx/nvidia-glx-1.0.4499-r1.ebuild [deleted file]
media-video/nvidia-glx/nvidia-glx-1.0.5328-r2.ebuild [deleted file]
media-video/nvidia-glx/nvidia-glx-1.0.5332-r2.ebuild [deleted file]
media-video/nvidia-glx/nvidia-glx-1.0.5336-r2.ebuild [deleted file]
media-video/nvidia-glx/nvidia-glx-1.0.6106-r3.ebuild [deleted file]
media-video/nvidia-glx/nvidia-glx-1.0.6111.ebuild
media-video/nvidia-glx/nvidia-glx-1.0.6629.ebuild

index a62f3fc7b14e1e126921e444655ac3d6224513bc..53e6d2f373842d102233757f30cb07a6023b59a5 100644 (file)
@@ -1,6 +1,25 @@
 # 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.66 2004/11/10 01:23:54 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.67 2004/11/30 01:33:12 cyfred Exp $
+
+  30 Nov 2004; Andrew Bevitt <cyfred@gentoo.org> -files/README.gentoo,
+  +files/libGL.la, -files/libGL.la.2,
+  -files/nvidia-glx-1.0.4363-defines.patch,
+  -files/nvidia-glx-1.0.4496-defines.patch,
+  -files/nvidia-glx-1.0.4499-defines.patch,
+  -files/nvidia-glx-1.0.5328-defines.patch,
+  -files/nvidia-glx-1.0.5328-glheader.patch,
+  -files/nvidia-glx-1.0.5332-glheader.patch,
+  -files/nvidia-glx-1.0.5336-glheader.patch,
+  -files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch,
+  -files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch,
+  -files/1.0.6106/NVIDIA_glx-1.0.6106-makefile.patch,
+  -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, nvidia-glx-1.0.6111.ebuild,
+  nvidia-glx-1.0.6629.ebuild:
+  Removing all masked (deprecated) versions to match the nvidia-kernel removal.
 
   10 Nov 2004; Andrew Bevitt <cyfred@gentoo.org>
   +files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch,
index 4c73b8b01d144fca458f232ebb098464819a37c2..5fc9584c41c59dcf01e8f4a41748a3185ac32087 100644 (file)
@@ -1,39 +1,14 @@
-MD5 5025856a53112a23b3e8cade84c55c57 nvidia-glx-1.0.5336-r2.ebuild 3442
-MD5 e31c13df7b44daed03369803d775e79d nvidia-glx-1.0.5332-r2.ebuild 3686
-MD5 cdadf248426f5017991d3b50167d6487 nvidia-glx-1.0.4496-r2.ebuild 3373
-MD5 06332c2fd7e83de635550290ca857c88 nvidia-glx-1.0.6629.ebuild 5442
-MD5 53fb35c058a5a1d4f52fde2b2cef1a65 nvidia-glx-1.0.5328-r2.ebuild 3229
-MD5 1a4026ee5f4a6fbe2acb0680668e1c4c nvidia-glx-1.0.6106-r3.ebuild 5356
-MD5 ed39be4005f57c4145735f26e5e20635 nvidia-glx-1.0.6111.ebuild 5348
-MD5 851f1ad90c1849aa9f230def5f131820 nvidia-glx-1.0.4363-r1.ebuild 2985
-MD5 98fc0b231f8ca3f1645a5e9dbcf391fa nvidia-glx-1.0.4499-r1.ebuild 2714
-MD5 0d7a638808148e1cd8a81c47b2e2d70a ChangeLog 13592
+MD5 95117ca40ecd086269c2cc702b47ad80 ChangeLog 14544
 MD5 a877edb407b63894d17386ea0aaca151 metadata.xml 286
-MD5 97f35a7b23f2e60d2abc5eff121bea3f files/nvidia-glx-1.0.4499-defines.patch 437
-MD5 cea66cc5b458a313a9ac72b56e32e10b files/README.gentoo 200
-MD5 49e1d59847fbcc32cb582d9df7e1c1b3 files/libGL.la.2 751
-MD5 0cedd89265dd9ffbcc19e2b72d05569d files/nvidia-glx-1.0.5332-glheader.patch 832
-MD5 0d5c4f6eb9edce633b87a6ff09bd0c32 files/nvidia-glx-1.0.5336-glheader.patch 826
+MD5 1a05003abe899381b1e112f66ed7d42a nvidia-glx-1.0.6111.ebuild 5346
+MD5 9445adc8a9fde51817220efc0164713d nvidia-glx-1.0.6629.ebuild 5440
+MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
+MD5 49e1d59847fbcc32cb582d9df7e1c1b3 files/libGL.la 751
 MD5 ed1e098d85579c75542ef0a49ee4dd5c files/digest-nvidia-glx-1.0.6111 163
 MD5 8a4687b0fc3e7cc0b36c247697d94701 files/digest-nvidia-glx-1.0.6629 163
-MD5 170bb6132a96be6319329909ea5ef37b files/nvidia-glx-1.0.4363-defines.patch 906
-MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.4496-defines.patch 437
-MD5 ffa1654d23ef713b0d6273d4d844fd0c files/digest-nvidia-glx-1.0.4363-r1 72
-MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-glx-1.0.4496-r2 80
-MD5 e13e0b5c25d53130e1d21f13ffd0b8a6 files/digest-nvidia-glx-1.0.4499-r1 72
-MD5 70373b1b0e250ed889f9694176a73e3f files/nvidia-glx-1.0.5328-glheader.patch 941
-MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.5328-defines.patch 437
-MD5 497ffcbd6a91ed9447dfdf7b736925bd files/digest-nvidia-glx-1.0.5328-r2 80
-MD5 cf7b2bb276c568f0f66d10951b4ce3ad files/digest-nvidia-glx-1.0.5332-r2 83
-MD5 1316f73c0eecd8832bb362a3d5ca4892 files/digest-nvidia-glx-1.0.5336-r2 80
-MD5 50ffea0f5eb12d252905f379bc7be2d6 files/digest-nvidia-glx-1.0.6106-r3 163
-MD5 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
-MD5 f6c702c19de46ece719928dc99ef0ad6 files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch 419
-MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch 437
-MD5 6f55327ce020f7ed0d433ea99dacb315 files/1.0.6106/NVIDIA_glx-1.0.6106-makefile.patch 593
-MD5 6f55327ce020f7ed0d433ea99dacb315 files/1.0.6111/NVIDIA_glx-1.0.6111-makefile.patch 593
 MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6111/NVIDIA_glx-1.0.6111-defines.patch 437
 MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6111/NVIDIA_glx-1.0.6111-glheader.patch 380
-MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch 437
+MD5 6f55327ce020f7ed0d433ea99dacb315 files/1.0.6111/NVIDIA_glx-1.0.6111-makefile.patch 593
 MD5 32901fb95c4fdc6cfa6b762498240b3c files/1.0.6629/NVIDIA_glx-1.0.6629-glheader.patch 380
 MD5 f6f00d8e915e18f456ad615b4ebd8a21 files/1.0.6629/NVIDIA_glx-1.0.6629-makefile.patch 602
+MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/1.0.6629/NVIDIA_glx-1.0.6629-defines.patch 437
diff --git a/media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch b/media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-defines.patch
deleted file mode 100644 (file)
index da9933f..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h
---- NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h   2002-12-09 21:26:55.000000000 +0100
-+++ NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h       2003-01-30 18:20:23.000000000 +0100
-@@ -39,6 +39,7 @@
- typedef XID GLXPixmap;
- typedef XID GLXDrawable;
- typedef XID GLXPbuffer;
-+typedef XID GLXPbufferSGIX;
- typedef XID GLXWindow;
- typedef XID GLXFBConfigID;
- 
diff --git a/media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch b/media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch
deleted file mode 100644 (file)
index de1c496..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
---- usr/include/GL/gl.g.orig   2004-07-17 19:56:59.789410584 +1000
-+++ usr/include/GL/gl.h        2004-07-17 19:59:08.844791184 +1000
-@@ -66,6 +66,11 @@
- typedef double GLclampd;
- typedef void GLvoid;
- 
-+/* Patching for some better defines in the global system */
-+#define GL_VERSION_1_2
-+#define GL_VERSION_1_3
-+#define GL_VERSION_1_4
-+#include <GL/glext.h>
- 
- /*************************************************************/
- 
diff --git a/media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-makefile.patch b/media-video/nvidia-glx/files/1.0.6106/NVIDIA_glx-1.0.6106-makefile.patch
deleted file mode 100644 (file)
index 4f9396a..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.old       2004-07-01 15:01:21.414466112 +1000
-+++ Makefile   2004-07-01 15:01:48.486350560 +1000
-@@ -1,11 +1,5 @@
- default:
--      @ echo
--      @ echo "It is NOT recommended that you use this Makefile to install"
--      @ echo "the NVIDIA driver.  Instead, please use the nvidia-installer"
--      @ echo "utility.  However, should nvidia-installer not operate for you,"
--      @ echo "you may use this Makefile as a last resort.  To install using"
--      @ echo "this Makefile, please run 'make install'."
--      @ echo
-+      @echo "nvidia-installer not used by Gentoo"
- 
- kernel_module_install:
-       cd usr/src/nv; make install
diff --git a/media-video/nvidia-glx/files/README.gentoo b/media-video/nvidia-glx/files/README.gentoo
deleted file mode 100644 (file)
index ca3370c..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-Make sure that in your XF86Config in "Files" section you add the
-following:
-
-    ModulePath  "/opt/nvidia/modules"
-    ModulePath  "/usr/X11R6/lib/modules"
-
-For more information read the README file.
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4363-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4363-r1
deleted file mode 100644 (file)
index 9357375..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49803f02a88e31f5db0c6ffdf0ac1a1f NVIDIA_GLX-1.0-4363.tar.gz 4197816
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4496-r2 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4496-r2
deleted file mode 100644 (file)
index 5fe85cc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cc8cc9b0fda676b074869e50844c969a NVIDIA-Linux-x86-1.0-4496-pkg0.run 5125585
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4499-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4499-r1
deleted file mode 100644 (file)
index a66deab..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cdb026e476483a42bd533e0f1aebca4a NVIDIA_GLX-1.0-4499.tar.gz 2494878
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5328-r2 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5328-r2
deleted file mode 100644 (file)
index 32ab3b4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b2ae3a449837430d5f10a2ebf3d9f7d4 NVIDIA-Linux-x86-1.0-5328-pkg1.run 6855080
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5332-r2 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5332-r2
deleted file mode 100644 (file)
index 943071e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eede761ab428ff0d27e5f67e8c555972 NVIDIA-Linux-x86_64-1.0-5332-pkg0.run 5597826
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5336-r2 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5336-r2
deleted file mode 100644 (file)
index 56ddf0d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d7361347ebbef5dfdbe6bdcb560fda8 NVIDIA-Linux-x86-1.0-5336-pkg1.run 6821193
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6106-r3 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.6106-r3
deleted file mode 100644 (file)
index a343b4b..0000000
+++ /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-glx/files/nvidia-glx-1.0.4363-defines.patch b/media-video/nvidia-glx/files/nvidia-glx-1.0.4363-defines.patch
deleted file mode 100644 (file)
index 27ede39..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur NVIDIA_GLX-1.0-4363/usr/include/GL/glx.h NVIDIA_GLX-1.0-4363.new/usr/include/GL/glx.h
---- NVIDIA_GLX-1.0-4363/usr/include/GL/glx.h   2002-12-09 21:26:55.000000000 +0100
-+++ NVIDIA_GLX-1.0-4363.new/usr/include/GL/glx.h       2003-01-30 18:20:23.000000000 +0100
-@@ -39,6 +39,7 @@
- typedef XID GLXPixmap;
- typedef XID GLXDrawable;
- typedef XID GLXPbuffer;
-+typedef XID GLXPbufferSGIX;
- typedef XID GLXWindow;
- typedef XID GLXFBConfigID;
- 
-diff -ur NVIDIA_GLX-1.0-4363/usr/include/GL/glxtokens.h NVIDIA_GLX-1.0-4363.new/usr/include/GL/glxtokens.h
---- NVIDIA_GLX-1.0-4363/usr/include/GL/glxtokens.h     2002-12-09 21:26:55.000000000 +0100
-+++ NVIDIA_GLX-1.0-4363.new/usr/include/GL/glxtokens.h 2003-01-30 18:20:44.000000000 +0100
-@@ -28,6 +28,7 @@
- 
- #define GLX_VERSION_1_1         1
- #define GLX_VERSION_1_2         1
-+#define GLX_VERSION_1_3         1
- 
- /* GLX Extensions */
- #define GLX_EXT_import_context  1
diff --git a/media-video/nvidia-glx/files/nvidia-glx-1.0.4496-defines.patch b/media-video/nvidia-glx/files/nvidia-glx-1.0.4496-defines.patch
deleted file mode 100644 (file)
index da9933f..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h
---- NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h   2002-12-09 21:26:55.000000000 +0100
-+++ NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h       2003-01-30 18:20:23.000000000 +0100
-@@ -39,6 +39,7 @@
- typedef XID GLXPixmap;
- typedef XID GLXDrawable;
- typedef XID GLXPbuffer;
-+typedef XID GLXPbufferSGIX;
- typedef XID GLXWindow;
- typedef XID GLXFBConfigID;
- 
diff --git a/media-video/nvidia-glx/files/nvidia-glx-1.0.4499-defines.patch b/media-video/nvidia-glx/files/nvidia-glx-1.0.4499-defines.patch
deleted file mode 100644 (file)
index 2b3ec21..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur NVIDIA_GLX-1.0-4499/usr/include/GL/glx.h NVIDIA_GLX-1.0-4499.new/usr/include/GL/glx.h
---- NVIDIA_GLX-1.0-4499/usr/include/GL/glx.h   2002-12-09 21:26:55.000000000 +0100
-+++ NVIDIA_GLX-1.0-4499.new/usr/include/GL/glx.h       2003-01-30 18:20:23.000000000 +0100
-@@ -39,6 +39,7 @@
- typedef XID GLXPixmap;
- typedef XID GLXDrawable;
- typedef XID GLXPbuffer;
-+typedef XID GLXPbufferSGIX;
- typedef XID GLXWindow;
- typedef XID GLXFBConfigID;
- 
diff --git a/media-video/nvidia-glx/files/nvidia-glx-1.0.5328-defines.patch b/media-video/nvidia-glx/files/nvidia-glx-1.0.5328-defines.patch
deleted file mode 100644 (file)
index da9933f..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h
---- NVIDIA_GLX-1.0-4191/usr/include/GL/glx.h   2002-12-09 21:26:55.000000000 +0100
-+++ NVIDIA_GLX-1.0-4191.new/usr/include/GL/glx.h       2003-01-30 18:20:23.000000000 +0100
-@@ -39,6 +39,7 @@
- typedef XID GLXPixmap;
- typedef XID GLXDrawable;
- typedef XID GLXPbuffer;
-+typedef XID GLXPbufferSGIX;
- typedef XID GLXWindow;
- typedef XID GLXFBConfigID;
- 
diff --git a/media-video/nvidia-glx/files/nvidia-glx-1.0.5328-glheader.patch b/media-video/nvidia-glx/files/nvidia-glx-1.0.5328-glheader.patch
deleted file mode 100644 (file)
index f765bc0..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru NVIDIA-Linux-x86-1.0-5328-pkg1/usr/include/GL/gl.h NVIDIA-Linux-x86-1.0-5328-pkg1.new/usr/include/GL/gl.h
---- NVIDIA-Linux-x86-1.0-5328-pkg1/usr/include/GL/gl.h 2003-12-17 23:54:58.000000000 +0100
-+++ NVIDIA-Linux-x86-1.0-5328-pkg1.new/usr/include/GL/gl.h     2004-01-09 17:44:02.000000000 +0100
-@@ -1728,7 +1728,7 @@
- void GLAPI glFogCoordf (GLfloat fog);
- void GLAPI glFogCoordfv (const GLfloat *fog);
- void GLAPI glFogCoordPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
--void GLAPI glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-+void GLAPI glMultiDrawArrays (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
- void GLAPI glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
- void GLAPI glSecondaryColor3b (GLbyte red, GLbyte green, GLbyte blue);
- void GLAPI glSecondaryColor3bv (const GLbyte *v);
diff --git a/media-video/nvidia-glx/files/nvidia-glx-1.0.5332-glheader.patch b/media-video/nvidia-glx/files/nvidia-glx-1.0.5332-glheader.patch
deleted file mode 100644 (file)
index 026af95..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- NVIDIA-Linux-x86_64-1.0-5332-pkg0/usr/include/GL/gl.h.old  2004-05-13 02:39:48.674367048 +1000
-+++ NVIDIA-Linux-x86_64-1.0-5332-pkg0/usr/include/GL/gl.h      2004-05-13 02:41:02.101204472 +1000
-@@ -1728,7 +1728,7 @@
- void GLAPI glFogCoordf (GLfloat fog);
- void GLAPI glFogCoordfv (const GLfloat *fog);
- void GLAPI glFogCoordPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
--void GLAPI glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-+void GLAPI glMultiDrawArrays (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
- void GLAPI glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
- void GLAPI glSecondaryColor3b (GLbyte red, GLbyte green, GLbyte blue);
- void GLAPI glSecondaryColor3bv (const GLbyte *v);
diff --git a/media-video/nvidia-glx/files/nvidia-glx-1.0.5336-glheader.patch b/media-video/nvidia-glx/files/nvidia-glx-1.0.5336-glheader.patch
deleted file mode 100644 (file)
index 1da2e20..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- NVIDIA-Linux-x86-1.0-5336-pkg1/usr/include/GL/gl.h.old     2004-05-13 02:41:58.554622248 +1000
-+++ NVIDIA-Linux-x86-1.0-5336-pkg1/usr/include/GL/gl.h 2004-05-13 02:42:17.148795504 +1000
-@@ -1728,7 +1728,7 @@
- void GLAPI glFogCoordf (GLfloat fog);
- void GLAPI glFogCoordfv (const GLfloat *fog);
- void GLAPI glFogCoordPointer (GLenum type, GLsizei stride, const GLvoid *pointer);
--void GLAPI glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
-+void GLAPI glMultiDrawArrays (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount);
- void GLAPI glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount);
- void GLAPI glSecondaryColor3b (GLbyte red, GLbyte green, GLbyte blue);
- void GLAPI glSecondaryColor3bv (const GLbyte *v);
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
deleted file mode 100644 (file)
index 8c7d90a..0000000
+++ /dev/null
@@ -1,113 +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-glx/nvidia-glx-1.0.4363-r1.ebuild,v 1.2 2004/11/07 02:00:47 cyfred Exp $
-
-inherit eutils
-
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA_GLX-${NV_V}"
-S="${WORKDIR}/NVIDIA_GLX-${NV_V}"
-DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="http://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}.tar.gz"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* -x86"
-IUSE=""
-RESTRICT="nostrip"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/libc
-       >=x11-base/xfree-4.2.0-r9
-       >=x11-base/opengl-update-1.3
-       ~media-video/nvidia-kernel-${PV}"
-PROVIDE="virtual/opengl"
-export _POSIX2_VERSION="199209"
-
-src_unpack() {
-       unpack ${A}
-
-       # correct defines to make gtkglext build work
-       cd ${S}; epatch ${FILESDIR}/${P}-defines.patch
-}
-
-src_install() {
-       local NV_ROOT="/usr/lib/opengl/nvidia"
-       local TLS=
-
-       # Check if we should install TLS versions of the libraries
-       ${S}/usr/bin/tls_test 2> /dev/null
-       # Only trust this if we are merging to /
-       if [ "$?" = "0" -a "${ROOT}" = "/" ]
-       then
-               einfo "Using TLS..."
-               TLS="tls/"
-       fi
-
-       # The X module
-       exeinto /usr/X11R6/lib/modules/drivers
-       doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-       # The GLX extension
-       exeinto ${NV_ROOT}/extensions
-       newexe usr/X11R6/lib/modules/extensions/${TLS}libglx.so.${PV} libglx.so
-
-       # The GLX libraries
-       exeinto ${NV_ROOT}/lib
-       doexe usr/lib/${TLS}libGL.so.${PV} \
-             usr/lib/${TLS}libGLcore.so.${PV}
-       dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-       dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-       dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-       dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-       insinto /usr/X11R6/lib
-       doins usr/X11R6/lib/libXvMCNVIDIA.a
-       exeinto /usr/X11R6/lib
-       doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
-       # Includes
-       insinto ${NV_ROOT}/include
-       doins usr/include/GL/*.h
-
-       # Docs
-       dodoc usr/share/doc/*
-
-       # Not sure whether installing the .la file is neccessary;
-       # this is adopted from the `nvidia' ebuild
-       local ver1="`echo ${PV} |cut -d '.' -f 1`"
-       local ver2="`echo ${PV} |cut -d '.' -f 2`"
-       local ver3="`echo ${PV} |cut -d '.' -f 3`"
-       sed -e "s:\${PV}:${PV}:"     \
-               -e "s:\${ver1}:${ver1}:" \
-               -e "s:\${ver2}:${ver2}:" \
-               -e "s:\${ver3}:${ver3}:" \
-               ${FILESDIR}/libGL.la.2 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-       #clean the dinamic libGL stuff's home to ensure
-       #we dont have stale libs floating around
-       if [ -d ${ROOT}/usr/lib/opengl/nvidia ]
-       then
-               rm -rf ${ROOT}/usr/lib/opengl/nvidia/*
-       fi
-       #make sure we nuke the old nvidia-glx's env.d file
-       if [ -e ${ROOT}/etc/env.d/09nvidia ]
-       then
-               rm -f ${ROOT}/etc/env.d/09nvidia
-       fi
-}
-
-pkg_postinst() {
-       #switch to the nvidia implementation
-       if [ "${ROOT}" = "/" ]
-       then
-               /usr/sbin/opengl-update nvidia
-       fi
-
-       einfo
-       einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-       einfo
-}
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
deleted file mode 100644 (file)
index d21e96e..0000000
+++ /dev/null
@@ -1,128 +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-glx/nvidia-glx-1.0.4496-r2.ebuild,v 1.2 2004/11/07 02:00:47 cyfred Exp $
-
-inherit eutils
-
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA-Linux-x86-${NV_V}"
-S="${WORKDIR}/${NV_PACKAGE}-pkg0"
-DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="http://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-pkg0.run"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* -x86"
-IUSE=""
-RESTRICT="nostrip"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/libc
-       virtual/x11
-       >=x11-base/opengl-update-1.3
-       ~media-video/nvidia-kernel-${PV}"
-PROVIDE="virtual/opengl"
-export _POSIX2_VERSION="199209"
-
-pkg_setup() {
-       # We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-       if has_version "x11-base/xfree"
-       then
-               if has_version "<x11-base/xfree-4.2.0-r9"
-               then
-                       die "Upgrade to xfree 4.2.0-r9 or greater."
-               fi
-       fi
-}
-
-src_unpack() {
-       cd ${WORKDIR}
-       bash ${DISTDIR}/${NV_PACKAGE}-pkg0.run --extract-only
-
-       # Use the correct defines to make gtkglext build work
-       cd ${S}; epatch ${FILESDIR}/${P}-defines.patch
-}
-
-src_install() {
-       local NV_ROOT="/usr/lib/opengl/nvidia"
-       local TLS=
-
-       # Check if we should install TLS versions of the libraries
-       ${S}/usr/bin/tls_test 2> /dev/null
-       # Only trust this if we are merging to /
-       if [ "$?" = "0" -a "${ROOT}" = "/" ]
-       then
-               einfo "Using TLS..."
-               TLS="tls/"
-       fi
-
-       # The X module
-       exeinto /usr/X11R6/lib/modules/drivers
-       doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-       # The GLX extension
-       exeinto ${NV_ROOT}/extensions
-       newexe usr/X11R6/lib/modules/extensions/${TLS}libglx.so.${PV} libglx.so
-
-       # The GLX libraries
-       exeinto ${NV_ROOT}/lib
-       doexe usr/lib/${TLS}libGL.so.${PV} \
-             usr/lib/${TLS}libGLcore.so.${PV}
-       dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-       dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-       dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-       dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-       insinto /usr/X11R6/lib
-       doins usr/X11R6/lib/libXvMCNVIDIA.a
-       exeinto /usr/X11R6/lib
-       doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
-       # Closing bug #37517 by letting virtual/x11 provide system wide glext.h
-       rm -f usr/include/GL/glext.h
-
-       # Includes
-       insinto ${NV_ROOT}/include
-       doins usr/include/GL/*.h
-
-       # Docs
-       dodoc usr/share/doc/*
-
-       # Not sure whether installing the .la file is neccessary;
-       # this is adopted from the `nvidia' ebuild
-       local ver1="`echo ${PV} |cut -d '.' -f 1`"
-       local ver2="`echo ${PV} |cut -d '.' -f 2`"
-       local ver3="`echo ${PV} |cut -d '.' -f 3`"
-       sed -e "s:\${PV}:${PV}:"     \
-               -e "s:\${ver1}:${ver1}:" \
-               -e "s:\${ver2}:${ver2}:" \
-               -e "s:\${ver3}:${ver3}:" \
-               ${FILESDIR}/libGL.la.2 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-       #clean the dinamic libGL stuff's home to ensure
-       #we dont have stale libs floating around
-       if [ -d ${ROOT}/usr/lib/opengl/nvidia ]
-       then
-               rm -rf ${ROOT}/usr/lib/opengl/nvidia/*
-       fi
-       #make sure we nuke the old nvidia-glx's env.d file
-       if [ -e ${ROOT}/etc/env.d/09nvidia ]
-       then
-               rm -f ${ROOT}/etc/env.d/09nvidia
-       fi
-}
-
-pkg_postinst() {
-       #switch to the nvidia implementation
-       if [ "${ROOT}" = "/" ]
-       then
-               /usr/sbin/opengl-update nvidia
-       fi
-
-       einfo
-       einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-       einfo
-}
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
deleted file mode 100644 (file)
index 4d5b1be..0000000
+++ /dev/null
@@ -1,103 +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-glx/nvidia-glx-1.0.4499-r1.ebuild,v 1.3 2004/11/07 02:00:47 cyfred Exp $
-
-inherit eutils
-
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA_GLX-${NV_V}"
-S="${WORKDIR}/NVIDIA_GLX-${NV_V}"
-DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="http://download.nvidia.com/XFree86/linux-x86-64/${NV_V}/${NV_PACKAGE}.tar.gz"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* -amd64"
-IUSE=""
-RESTRICT="nostrip"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/libc
-       virtual/x11
-       >=x11-base/opengl-update-1.3
-       ~media-video/nvidia-kernel-${PV}"
-PROVIDE="virtual/opengl"
-export _POSIX2_VERSION="199209"
-
-src_unpack() {
-       unpack ${A}
-
-       # correct defines to make gtkglext build work
-       epatch ${FILESDIR}/${P}-defines.patch
-}
-
-src_install() {
-       local NV_ROOT="/usr/lib/opengl/nvidia"
-
-       # The X module
-       exeinto /usr/X11R6/lib/modules/drivers
-       doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-       # The GLX extension
-       exeinto ${NV_ROOT}/extensions
-       newexe usr/X11R6/lib/modules/extensions/libglx.so.${PV} libglx.so
-
-       # The GLX libraries
-       exeinto ${NV_ROOT}/lib
-       doexe usr/lib/libGL.so.${PV} \
-             usr/lib/libGLcore.so.${PV}
-       dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-       dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-       dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-       dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-       insinto /usr/X11R6/lib
-       doins usr/X11R6/lib/libXvMCNVIDIA.a
-       exeinto /usr/X11R6/lib
-       doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
-       # Includes
-       insinto ${NV_ROOT}/include
-       doins usr/include/GL/*.h
-
-       # Docs
-       dodoc usr/share/doc/*
-
-       # Not sure whether installing the .la file is neccessary;
-       # this is adopted from the `nvidia' ebuild
-       local ver1="`echo ${PV} |cut -d '.' -f 1`"
-       local ver2="`echo ${PV} |cut -d '.' -f 2`"
-       local ver3="`echo ${PV} |cut -d '.' -f 3`"
-       sed -e "s:\${PV}:${PV}:"     \
-               -e "s:\${ver1}:${ver1}:" \
-               -e "s:\${ver2}:${ver2}:" \
-               -e "s:\${ver3}:${ver3}:" \
-               ${FILESDIR}/libGL.la.2 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-       #clean the dinamic libGL stuff's home to ensure
-       #we dont have stale libs floating around
-       if [ -d ${ROOT}/usr/lib/opengl/nvidia ]
-       then
-               rm -rf ${ROOT}/usr/lib/opengl/nvidia/*
-       fi
-       #make sure we nuke the old nvidia-glx's env.d file
-       if [ -e ${ROOT}/etc/env.d/09nvidia ]
-       then
-               rm -f ${ROOT}/etc/env.d/09nvidia
-       fi
-}
-
-pkg_postinst() {
-       #switch to the nvidia implementation
-       if [ "${ROOT}" = "/" ]
-       then
-               /usr/sbin/opengl-update nvidia
-       fi
-
-       einfo
-       einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-       einfo
-}
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
deleted file mode 100644 (file)
index bf44bf5..0000000
+++ /dev/null
@@ -1,120 +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-glx/nvidia-glx-1.0.5328-r2.ebuild,v 1.3 2004/11/07 02:00:47 cyfred 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}"
-DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="http://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* -x86"
-IUSE=""
-RESTRICT="nostrip"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/libc
-       >=x11-base/xfree-4.2.0-r9
-       >=x11-base/opengl-update-1.3
-       ~media-video/nvidia-kernel-${PV}"
-PROVIDE="virtual/opengl"
-export _POSIX2_VERSION="199209"
-
-src_unpack() {
-       cd ${WORKDIR}
-       bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-       # Use the correct defines to make gtkglext build work
-       cd ${S}; epatch ${FILESDIR}/${P}-defines.patch
-       # Correct API for gl.h
-       epatch ${FILESDIR}/${P}-glheader.patch
-}
-
-src_install() {
-       local NV_ROOT="/usr/lib/opengl/nvidia"
-       local TLS=
-
-       # Check if we should install TLS versions of the libraries
-       ${S}/usr/bin/tls_test ${S}/usr/bin/tls_test_dso.so 2> /dev/null
-       # Only trust this if we are merging to /
-       if [ "$?" = "0" -a "${ROOT}" = "/" ]
-       then
-               einfo "Using TLS..."
-               TLS="tls/"
-       fi
-
-       # The X module
-       exeinto /usr/X11R6/lib/modules/drivers
-       doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-       # The GLX extension
-       exeinto ${NV_ROOT}/extensions
-       newexe usr/X11R6/lib/modules/extensions/${TLS}libglx.so.${PV} libglx.so
-
-       # The GLX libraries
-       exeinto ${NV_ROOT}/lib
-       doexe usr/lib/${TLS}libGL.so.${PV} \
-             usr/lib/${TLS}libGLcore.so.${PV}
-       dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-       dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-       dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-       dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-       insinto /usr/X11R6/lib
-       doins usr/X11R6/lib/libXvMCNVIDIA.a
-       exeinto /usr/X11R6/lib
-       doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
-       # Closing bug #37517
-       rm -f usr/include/GL/glext.h
-
-       # Includes
-       insinto ${NV_ROOT}/include
-       doins usr/include/GL/*.h
-
-       # Docs
-       dodoc usr/share/doc/*
-
-       # Not sure whether installing the .la file is neccessary;
-       # this is adopted from the `nvidia' ebuild
-       local ver1="`echo ${PV} |cut -d '.' -f 1`"
-       local ver2="`echo ${PV} |cut -d '.' -f 2`"
-       local ver3="`echo ${PV} |cut -d '.' -f 3`"
-       sed -e "s:\${PV}:${PV}:"     \
-               -e "s:\${ver1}:${ver1}:" \
-               -e "s:\${ver2}:${ver2}:" \
-               -e "s:\${ver3}:${ver3}:" \
-               ${FILESDIR}/libGL.la.2 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-       #clean the dinamic libGL stuff's home to ensure
-       #we dont have stale libs floating around
-       if [ -d ${ROOT}/usr/lib/opengl/nvidia ]
-       then
-               rm -rf ${ROOT}/usr/lib/opengl/nvidia/*
-       fi
-       #make sure we nuke the old nvidia-glx's env.d file
-       if [ -e ${ROOT}/etc/env.d/09nvidia ]
-       then
-               rm -f ${ROOT}/etc/env.d/09nvidia
-       fi
-}
-
-pkg_postinst() {
-       #switch to the nvidia implementation
-       if [ "${ROOT}" = "/" ]
-       then
-               /usr/sbin/opengl-update nvidia
-       fi
-
-       einfo
-       einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-       einfo
-}
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
deleted file mode 100644 (file)
index 6a30708..0000000
+++ /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-glx/nvidia-glx-1.0.5332-r2.ebuild,v 1.10 2004/11/07 02:00:47 cyfred Exp $
-
-inherit eutils
-
-PKG_V="pkg0"
-NV_V="${PV/1.0./1.0-}"
-NV_PACKAGE="NVIDIA-Linux-x86_64-${NV_V}"
-S="${WORKDIR}/${NV_PACKAGE}-${PKG_V}"
-DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="http://download.nvidia.com/XFree86/Linux-x86_64/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* -amd64"
-IUSE=""
-RESTRICT="nostrip"
-
-DEPEND="virtual/libc
-       virtual/x11
-       >=x11-base/opengl-update-1.3
-       ~media-video/nvidia-kernel-${PV}"
-PROVIDE="virtual/opengl"
-export _POSIX2_VERSION="199209"
-
-pkg_setup() {
-       # We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-       if has_version "x11-base/xfree"
-       then
-               if has_version "<x11-base/xfree-4.2.0-r9"
-               then
-                       die "Upgrade to xfree 4.2.0-r9 or greater."
-               fi
-       fi
-}
-
-src_unpack() {
-       cd ${WORKDIR}
-       bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-       # Use the correct defines to make gtkglext build work
-       cd ${S}; epatch ${FILESDIR}/${PN}-1.0.5328-defines.patch
-       # Use the correct glext API
-       epatch ${FILESDIR}/${P}-glheader.patch
-}
-
-src_install() {
-       local NV_ROOT="/usr/lib/opengl/nvidia"
-       local TLS=
-
-       # Check if we should install TLS versions of the libraries
-       ${S}/usr/bin/tls_test ${S}/usr/bin/tls_test_dso.so 2> /dev/null
-       # Only trust this if we are merging to /
-       if [ "$?" = "0" -a "${ROOT}" = "/" ]
-       then
-               einfo "Using TLS..."
-               TLS="tls/"
-       fi
-
-       # The X module
-       exeinto /usr/X11R6/lib/modules/drivers
-       doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-       # The GLX extension
-       exeinto ${NV_ROOT}/extensions
-       newexe usr/X11R6/lib/modules/extensions/${TLS}libglx.so.${PV} libglx.so
-
-       # The GLX libraries
-       exeinto ${NV_ROOT}/lib
-       doexe usr/lib/${TLS}libGL.so.${PV} \
-             usr/lib/${TLS}libGLcore.so.${PV}
-       dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-       dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-       dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-       dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-       insinto /usr/X11R6/lib
-       doins usr/X11R6/lib/libXvMCNVIDIA.a
-       exeinto /usr/X11R6/lib
-       doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
-       # Closing bug #37517 by letting virtual/x11 provice glext.h
-       rm -f usr/include/GL/glext.h
-
-       # Includes
-       insinto ${NV_ROOT}/include
-       doins usr/include/GL/*.h
-
-       # Docs
-       dodoc usr/share/doc/*
-
-       # Not sure whether installing the .la file is neccessary;
-       # this is adopted from the `nvidia' ebuild
-       local ver1="`echo ${PV} |cut -d '.' -f 1`"
-       local ver2="`echo ${PV} |cut -d '.' -f 2`"
-       local ver3="`echo ${PV} |cut -d '.' -f 3`"
-       sed -e "s:\${PV}:${PV}:"     \
-               -e "s:\${ver1}:${ver1}:" \
-               -e "s:\${ver2}:${ver2}:" \
-               -e "s:\${ver3}:${ver3}:" \
-               ${FILESDIR}/libGL.la.2 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-       #clean the dinamic libGL stuff's home to ensure
-       #we dont have stale libs floating around
-       if [ -d ${ROOT}/usr/lib/opengl/nvidia ]
-       then
-               rm -rf ${ROOT}/usr/lib/opengl/nvidia/*
-       fi
-       #make sure we nuke the old nvidia-glx's env.d file
-       if [ -e ${ROOT}/etc/env.d/09nvidia ]
-       then
-               rm -f ${ROOT}/etc/env.d/09nvidia
-       fi
-}
-
-pkg_postinst() {
-       #switch to the nvidia implementation
-       if [ "${ROOT}" = "/" ]
-       then
-               /usr/sbin/opengl-update nvidia
-       fi
-
-       einfo
-       einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-       einfo
-
-       if [ `has_version x11-libs/qt` ] ; then
-               einfo "You have Qt installed on your system.  Qt is linked against opengl,"
-               einfo "which means you may have problems emerging KDE programs later until"
-               einfo "you run \"opengl-update xfree\""
-       fi
-}
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
deleted file mode 100644 (file)
index ae09440..0000000
+++ /dev/null
@@ -1,130 +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-glx/nvidia-glx-1.0.5336-r2.ebuild,v 1.10 2004/11/07 02:00:47 cyfred 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}"
-DESCRIPTION="XFree86 GLX libraries for the NVIDIA's X driver"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="http://download.nvidia.com/XFree86/Linux-x86/${NV_V}/${NV_PACKAGE}-${PKG_V}.run"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* -x86"
-IUSE=""
-RESTRICT="nostrip"
-
-DEPEND="virtual/libc
-       virtual/x11
-       >=x11-base/opengl-update-1.3
-       ~media-video/nvidia-kernel-${PV}"
-PROVIDE="virtual/opengl"
-export _POSIX2_VERSION="199209"
-
-pkg_setup() {
-       # We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-       if has_version "x11-base/xfree"
-       then
-               if has_version "<x11-base/xfree-4.2.0-r9"
-               then
-                       die "Upgrade to xfree 4.2.0-r9 or greater."
-               fi
-       fi
-}
-
-src_unpack() {
-       cd ${WORKDIR}
-       bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-       # Use the correct defines to make gtkglext build work
-       cd ${S}; epatch ${FILESDIR}/${PN}-1.0.5328-defines.patch
-       # Use correct glext API
-       epatch ${FILESDIR}/${P}-glheader.patch
-}
-
-src_install() {
-       local NV_ROOT="/usr/lib/opengl/nvidia"
-       local TLS=
-
-       # Check if we should install TLS versions of the libraries
-       ${S}/usr/bin/tls_test ${S}/usr/bin/tls_test_dso.so 2> /dev/null
-       # Only trust this if we are merging to /
-       if [ "$?" = "0" -a "${ROOT}" = "/" ]
-       then
-               einfo "Using TLS..."
-               TLS="tls/"
-       fi
-
-       # The X module
-       exeinto /usr/X11R6/lib/modules/drivers
-       doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-       # The GLX extension
-       exeinto ${NV_ROOT}/extensions
-       newexe usr/X11R6/lib/modules/extensions/${TLS}libglx.so.${PV} libglx.so
-
-       # The GLX libraries
-       exeinto ${NV_ROOT}/lib
-       doexe usr/lib/${TLS}libGL.so.${PV} \
-             usr/lib/${TLS}libGLcore.so.${PV}
-       dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-       dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-       dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-       dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-
-       insinto /usr/X11R6/lib
-       doins usr/X11R6/lib/libXvMCNVIDIA.a
-       exeinto /usr/X11R6/lib
-       doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
-       # Closing bug #37517 by letting virtual/x11 provide system wide glext.h
-       rm -f usr/include/GL/glext.h
-
-       # Includes
-       insinto ${NV_ROOT}/include
-       doins usr/include/GL/*.h
-
-       # Docs
-       dodoc usr/share/doc/*
-
-       # Not sure whether installing the .la file is neccessary;
-       # this is adopted from the `nvidia' ebuild
-       local ver1="`echo ${PV} |cut -d '.' -f 1`"
-       local ver2="`echo ${PV} |cut -d '.' -f 2`"
-       local ver3="`echo ${PV} |cut -d '.' -f 3`"
-       sed -e "s:\${PV}:${PV}:"     \
-               -e "s:\${ver1}:${ver1}:" \
-               -e "s:\${ver2}:${ver2}:" \
-               -e "s:\${ver3}:${ver3}:" \
-               ${FILESDIR}/libGL.la.2 > ${D}/${NV_ROOT}/lib/libGL.la
-}
-
-pkg_preinst() {
-       #clean the dinamic libGL stuff's home to ensure
-       #we dont have stale libs floating around
-       if [ -d ${ROOT}/usr/lib/opengl/nvidia ]
-       then
-               rm -rf ${ROOT}/usr/lib/opengl/nvidia/*
-       fi
-       #make sure we nuke the old nvidia-glx's env.d file
-       if [ -e ${ROOT}/etc/env.d/09nvidia ]
-       then
-               rm -f ${ROOT}/etc/env.d/09nvidia
-       fi
-}
-
-pkg_postinst() {
-       #switch to the nvidia implementation
-       if [ "${ROOT}" = "/" ]
-       then
-               /usr/sbin/opengl-update nvidia
-       fi
-
-       einfo
-       einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-       einfo
-}
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
deleted file mode 100644 (file)
index 8a5aa9b..0000000
+++ /dev/null
@@ -1,181 +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-glx/nvidia-glx-1.0.6106-r3.ebuild,v 1.3 2004/11/07 02:00:47 cyfred Exp $
-
-inherit eutils
-
-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="NVIDIA X11 driver and GLX libraries"
-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}"
-
-LICENSE="NVIDIA"
-SLOT="0"
-KEYWORDS="-* -x86 -amd64"
-RESTRICT="nostrip"
-IUSE="multilib"
-
-DEPEND="virtual/libc
-       virtual/x11
-       >=x11-base/opengl-update-1.8.1
-       ~media-video/nvidia-kernel-${PV}"
-
-PDEPEND="amd64? ( multilib? ( >=app-emulation/emul-linux-x86-nvidia-${PV}-r1 ) )"
-
-PROVIDE="virtual/opengl"
-export _POSIX2_VERSION="199209"
-
-pkg_setup() {
-       # We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-       if has_version "x11-base/xfree"
-       then
-               if has_version "<x11-base/xfree-4.2.0-r9"
-               then
-                       die "Upgrade to xfree 4.2.0-r9 or greater."
-               fi
-       fi
-       # Provide some information to the users
-       if use amd64 ; then
-               einfo
-               einfo "This release of nvidia-glx contains 32 bit compatibility"
-               einfo "libraries. These can be installed by either"
-               einfo "  1) emerge app-emulation/emul-linux-x86-nvidia"
-               einfo "  2) USE=\"multilib\" emerge media-video/nvidia-glx"
-               einfo "     (or /etc/portage/package.use, see portage manual)"
-               einfo
-       fi
-}
-
-src_unpack() {
-       cd ${WORKDIR}
-       bash ${DISTDIR}/${NV_PACKAGE}-${PKG_V}.run --extract-only
-
-       # Patchs go below here, add breif description
-
-       cd ${S}
-
-       # nVidia wants us to use nvidia-installer, removing warning.
-       epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-makefile.patch
-       # Use the correct defines to make gtkglext build work
-       epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-defines.patch
-       # Use some more sensible gl headers and make way for new glext.h
-       epatch ${FILESDIR}/${PV}/NVIDIA_glx-${PV}-glheader.patch
-}
-
-src_install() {
-       local NV_ROOT="/usr/lib/opengl/nvidia"
-
-       # The X module
-       exeinto /usr/X11R6/lib/modules/drivers
-       doexe usr/X11R6/lib/modules/drivers/nvidia_drv.o
-
-       # The GLX extension
-       exeinto ${NV_ROOT}/extensions
-       newexe usr/X11R6/lib/modules/extensions/libglx.so.${PV} libglx.so
-
-       # The GLX libraries
-       exeinto ${NV_ROOT}/lib
-       doexe usr/lib/libGL.so.${PV} \
-             usr/lib/libGLcore.so.${PV} \
-                 usr/lib/libnvidia-tls.so.${PV}
-       dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so
-       dosym libGL.so.${PV} ${NV_ROOT}/lib/libGL.so.1
-       dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so
-       dosym libGLcore.so.${PV} ${NV_ROOT}/lib/libGLcore.so.1
-       dosym libnvidia-tls.so.${PV} ${NV_ROOT}/lib/libnvidia-tls.so
-       dosym libnvidia-tls.so.${PV} ${NV_ROOT}/lib/libnvidia-tls.so.1
-
-       local TLS_ROOT="/usr/lib/opengl/nvidia/tls"
-       dodir ${TLS_ROOT}
-       exeinto ${TLS_ROOT}
-       doexe usr/lib/tls/libnvidia-tls.so.${PV}
-       dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so
-       dosym libnvidia-tls.so.${PV} ${TLS_ROOT}/libnvidia-tls.so.1
-
-       # Install tls_test
-       dodir /usr/lib/misc
-       exeinto /usr/lib/misc
-       doexe usr/bin/tls_test
-       doexe usr/bin/tls_test_dso.so
-
-       insinto /usr/X11R6/lib
-       doins usr/X11R6/lib/libXvMCNVIDIA.a
-       exeinto /usr/X11R6/lib
-       doexe usr/X11R6/lib/libXvMCNVIDIA.so.${PV}
-
-       # Closing bug #37517 by letting virtual/x11 provide system wide glext.h
-       # 16 July 2004, opengl-update is now supplying glext.h for system wide
-       # compatibility, so we still need to remove this.
-       rm -f usr/include/GL/glext.h
-
-       # Includes
-       insinto ${NV_ROOT}/include
-       doins usr/include/GL/*.h
-
-       # Docs, remove nvidia-settings as provided by media-video/nvidia-settings
-       rm -f usr/share/doc/nvidia-settings*
-       dodoc usr/share/doc/*
-
-       # nVidia want bug reports using this script
-       exeinto /usr/bin
-       doexe usr/bin/nvidia-bug-report.sh
-
-       # Not sure whether installing the .la file is neccessary;
-       # this is adopted from the `nvidia' ebuild
-       local ver1="`echo ${PV} |cut -d '.' -f 1`"
-       local ver2="`echo ${PV} |cut -d '.' -f 2`"
-       local ver3="`echo ${PV} |cut -d '.' -f 3`"
-       sed -e "s:\${PV}:${PV}:"     \
-               -e "s:\${ver1}:${ver1}:" \
-               -e "s:\${ver2}:${ver2}:" \
-               -e "s:\${ver3}:${ver3}:" \
-               ${FILESDIR}/libGL.la.2 > ${D}/${NV_ROOT}/lib/libGL.la
-
-       # Should we install the .la for the 32bit libs on amd64? I think not.
-}
-
-pkg_preinst() {
-       # Clean the dinamic libGL stuff's home to ensure
-       # we dont have stale libs floating around
-       if [ -d ${ROOT}/usr/lib/opengl/nvidia ]
-       then
-               rm -rf ${ROOT}/usr/lib/opengl/nvidia/*
-       fi
-       # Make sure we nuke the old nvidia-glx's env.d file
-       if [ -e ${ROOT}/etc/env.d/09nvidia ]
-       then
-               rm -f ${ROOT}/etc/env.d/09nvidia
-       fi
-}
-
-pkg_postinst() {
-       #switch to the nvidia implementation
-       if [ "${ROOT}" = "/" ]
-       then
-               /usr/sbin/opengl-update nvidia
-       fi
-
-       echo
-       einfo "To use the Nvidia GLX, run \"opengl-update nvidia\""
-       echo
-       einfo "You may also be interested in media-video/nvidia-settings"
-       echo
-       einfo "nVidia have requested that any bug reports submitted have the"
-       einfo "output of /usr/bin/nvidia-bug-report.sh included."
-}
index 13897c0128feebc2722e694009be36a117056e7a..6c45d93f21dd64d2751704501b9f88003f501da9 100644 (file)
@@ -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.6111.ebuild,v 1.3 2004/11/07 01:52:37 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6111.ebuild,v 1.4 2004/11/30 01:33:12 cyfred Exp $
 
 inherit eutils
 
@@ -145,7 +145,7 @@ src_install() {
                -e "s:\${ver1}:${ver1}:" \
                -e "s:\${ver2}:${ver2}:" \
                -e "s:\${ver3}:${ver3}:" \
-               ${FILESDIR}/libGL.la.2 > ${D}/${NV_ROOT}/lib/libGL.la
+               ${FILESDIR}/libGL.la > ${D}/${NV_ROOT}/lib/libGL.la
 
        # Should we install the .la for the 32bit libs on amd64? I think not.
 }
index 067365696d726f0c36cf288d6cb32e36dc9c3306..1ab5fafe0f61fbb752ef4f5ba13119c27a875310 100644 (file)
@@ -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.6629.ebuild,v 1.3 2004/11/10 01:23:54 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.6629.ebuild,v 1.4 2004/11/30 01:33:12 cyfred Exp $
 
 inherit eutils
 
@@ -147,7 +147,7 @@ src_install() {
                -e "s:\${ver1}:${ver1}:" \
                -e "s:\${ver2}:${ver2}:" \
                -e "s:\${ver3}:${ver3}:" \
-               ${FILESDIR}/libGL.la.2 > ${D}/${NV_ROOT}/lib/libGL.la
+               ${FILESDIR}/libGL.la > ${D}/${NV_ROOT}/lib/libGL.la
 
        # Should we install the .la for the 32bit libs on amd64? I think not.
 }