Moving all versions over to use the proper libGL.la file which will resolve the pygtk problems with stable ebuilds.

13 files changed, 33 insertions, 171 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index 1145c73a0979..a4b24faa7ba4 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,18 @@
 # 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.56 2004/07/18 19:18:54 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.57 2004/07/19 10:24:49 cyfred Exp $
+
+*nvidia-glx-1.0.4499-r1 (19 Jul 2004)
+
+  19 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>; -files/libGL.la.1,
+  +nvidia-glx-1.0.4363-r1.ebuild, -nvidia-glx-1.0.4363.ebuild,
+  -nvidia-glx-1.0.4496-r1.ebuild, +nvidia-glx-1.0.4496-r2.ebuild,
+  -nvidia-glx-1.0.4496.ebuild, +nvidia-glx-1.0.4499-r1.ebuild,
+  -nvidia-glx-1.0.4499.ebuild, -nvidia-glx-1.0.5328-r1.ebuild,
+  +nvidia-glx-1.0.5328-r2.ebuild:
+  Moving all versions over to use proper libGL.la file, removing all versions
+  that do not use the correct file, and removing the incorrect file; this should
+  fix pygtk et al bugs.
 
   18 Jul 2004; Travis Tilley <lv@gentoo.org> nvidia-glx-1.0.6106-r3.ebuild:
   marking stable since our last stable nvidia-glx was just deleted
diff --git a/media-video/nvidia-glx/Manifest b/media-video/nvidia-glx/Manifest
index 16a224597e37..9034811541eb 100644
--- a/media-video/nvidia-glx/Manifest
+++ b/media-video/nvidia-glx/Manifest
@@ -1,32 +1,29 @@
 MD5 30625d4053cb03c505077141edf94976 nvidia-glx-1.0.5336-r2.ebuild 3443
 MD5 c79e7c8a94dd542020eec47fcc960e9b nvidia-glx-1.0.5332-r2.ebuild 3686
-MD5 d40244500cd750887c4c2074678b91df nvidia-glx-1.0.4499.ebuild 2726
-MD5 65ab1b807374ee2f065e75be6ce4c587 nvidia-glx-1.0.4496.ebuild 3056
-MD5 5eb20c5294063f5553d246f3c97bf8cd nvidia-glx-1.0.4496-r1.ebuild 3376
-MD5 01ed7d4ae6ca52293e63a39723d83eb6 nvidia-glx-1.0.4363.ebuild 2984
-MD5 ec76697170ba0841f10a3f4b2901a1bb nvidia-glx-1.0.5328-r1.ebuild 3231
+MD5 9d617f8a42e558d5c7d5ebe9459cce6f nvidia-glx-1.0.4496-r2.ebuild 3375
+MD5 502cc2abb23b61aa5a3f0182ffdd62d7 nvidia-glx-1.0.5328-r2.ebuild 3231
+MD5 3be2c966884ee6dd95c2bff44780b636 nvidia-glx-1.0.6106-r3.ebuild 5351
+MD5 11375d01b660b044750dd5e813c4f187 nvidia-glx-1.0.4363-r1.ebuild 2984
+MD5 a6cbaa496228a78d7e20813ecc8341d0 nvidia-glx-1.0.4499-r1.ebuild 2726
 MD5 3a97993855a4c8b72ba58bf1071c4b31 ChangeLog 11073
 MD5 cf991042be5789d00fe389f31166412a metadata.xml 290
-MD5 3be2c966884ee6dd95c2bff44780b636 nvidia-glx-1.0.6106-r3.ebuild 5351
 MD5 97f35a7b23f2e60d2abc5eff121bea3f files/nvidia-glx-1.0.4499-defines.patch 437
 MD5 cea66cc5b458a313a9ac72b56e32e10b files/README.gentoo 200
-MD5 fda10e01c37b4518535e3b258be78fa5 files/libGL.la.1 747
 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 ffa1654d23ef713b0d6273d4d844fd0c files/digest-nvidia-glx-1.0.4363 72
-MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-glx-1.0.4496 80
-MD5 e13e0b5c25d53130e1d21f13ffd0b8a6 files/digest-nvidia-glx-1.0.4499 72
 MD5 170bb6132a96be6319329909ea5ef37b files/nvidia-glx-1.0.4363-defines.patch 906
 MD5 3d8b3ecb3827e2e3a9a45ac6c3210a0a files/nvidia-glx-1.0.4496-defines.patch 437
-MD5 a88479c177f936b6ef19fc73bb39d149 files/digest-nvidia-glx-1.0.4496-r1 80
+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-r1 80
+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 c3afc69f917a783ebd53cf2de38065dc files/09nvidia 61
 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 f6c702c19de46ece719928dc99ef0ad6 files/1.0.6106/NVIDIA_glx-1.0.6106-glheader.patch 419
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4363 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4363-r1
index 93573750677d..93573750677d 100644
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4363
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4363-r1
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4496-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4496-r1
deleted file mode 100644
index 5fe85ccc3da6..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4496-r1
+++ /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.4496 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4496-r2
index 5fe85ccc3da6..5fe85ccc3da6 100644
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4496
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4496-r2
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4499 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4499-r1
index a66deabb46d0..a66deabb46d0 100644
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4499
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.4499-r1
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5328-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5328-r2
index 32ab3b45d935..32ab3b45d935 100644
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5328-r1
+++ b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5328-r2
diff --git a/media-video/nvidia-glx/files/libGL.la.1 b/media-video/nvidia-glx/files/libGL.la.1
deleted file mode 100644
index 2fec0306a3dc..000000000000
--- a/media-video/nvidia-glx/files/libGL.la.1
+++ /dev/null
@@ -1,32 +0,0 @@
-# libGL.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libGL.so.1'
-
-# Names of this library.
-library_names='libGL.so.${PV} libGL.so.1 libGL.so'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/usr/X11R6/lib -lm -lX11 -lXext -ldl     '
-
-# Version information for libGL.
-current=${ver1}
-age=${ver2}
-revision=${ver3}
-
-# Is this an already installed library?
-installed=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/lib/opengl/nvidia'
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.4363.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.4363-r1.ebuild
index 121c1706c8b1..48772635b767 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.4363.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.ebuild,v 1.10 2004/07/14 22:09:53 agriffis Exp $
+# $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 $
 
 inherit eutils
 
@@ -83,7 +83,7 @@ src_install() {
 		-e "s:\${ver1}:${ver1}:" \
 		-e "s:\${ver2}:${ver2}:" \
 		-e "s:\${ver3}:${ver3}:" \
-		${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la
+		${FILESDIR}/libGL.la.2 > ${D}/${NV_ROOT}/lib/libGL.la
 }
 
 pkg_preinst() {
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.4496-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.4496-r2.ebuild
index 143a0dedb076..ec487845eefc 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.4496-r1.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-r1.ebuild,v 1.10 2004/07/14 22:09:53 agriffis Exp $
+# $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 $
 
 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"
 
@@ -98,7 +98,7 @@ src_install() {
 		-e "s:\${ver1}:${ver1}:" \
 		-e "s:\${ver2}:${ver2}:" \
 		-e "s:\${ver3}:${ver3}:" \
-		${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la
+		${FILESDIR}/libGL.la.2 > ${D}/${NV_ROOT}/lib/libGL.la
 }
 
 pkg_preinst() {
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.4496.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.4496.ebuild
deleted file mode 100644
index 643e1089d0b1..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.4496.ebuild
+++ /dev/null
@@ -1,114 +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.ebuild,v 1.9 2004/07/14 22:09:53 agriffis 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
-	>=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}-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}
-
-	# 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.1 > ${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.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.4499-r1.ebuild
index 7112289df8b8..666b3c1193c5 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.4499.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.ebuild,v 1.7 2004/07/14 22:09:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.4499-r1.ebuild,v 1.1 2004/07/19 10:24:49 cyfred Exp $
 
 inherit eutils
 
@@ -73,7 +73,7 @@ src_install() {
 		-e "s:\${ver1}:${ver1}:" \
 		-e "s:\${ver2}:${ver2}:" \
 		-e "s:\${ver3}:${ver3}:" \
-		${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la
+		${FILESDIR}/libGL.la.2 > ${D}/${NV_ROOT}/lib/libGL.la
 }
 
 pkg_preinst() {
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.5328-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.5328-r2.ebuild
index dcd6c41cf68e..1f3f6abd0fed 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.5328-r1.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-r1.ebuild,v 1.8 2004/07/14 22:09:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.5328-r2.ebuild,v 1.1 2004/07/19 10:24:49 cyfred Exp $
 
 inherit eutils
 
@@ -90,7 +90,7 @@ src_install() {
 		-e "s:\${ver1}:${ver1}:" \
 		-e "s:\${ver2}:${ver2}:" \
 		-e "s:\${ver3}:${ver3}:" \
-		${FILESDIR}/libGL.la.1 > ${D}/${NV_ROOT}/lib/libGL.la
+		${FILESDIR}/libGL.la.2 > ${D}/${NV_ROOT}/lib/libGL.la
 }
 
 pkg_preinst() {