Removing a duplicate build

3 files changed, 5 insertions, 122 deletions

diff --git a/media-video/nvidia-glx/ChangeLog b/media-video/nvidia-glx/ChangeLog
index e0210217ea73..c5538c5b7d76 100644
--- a/media-video/nvidia-glx/ChangeLog
+++ b/media-video/nvidia-glx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/nvidia-glx 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.47 2004/05/05 23:29:22 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/ChangeLog,v 1.48 2004/05/10 03:38:25 cyfred Exp $
+
+  10 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  -nvidia-glx-1.0.5332-r1.ebuild:
+  Removing a duplicate build version
 
   06 May 2004; Andrew Bevitt <cyfred@gentoo.org>;
   +files/nvidia-glx-1.0.4363-defines.patch, nvidia-glx-1.0.4363.ebuild:
diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5332-r1 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5332-r1
deleted file mode 100644
index 943071e25292..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.5332-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eede761ab428ff0d27e5f67e8c555972 NVIDIA-Linux-x86_64-1.0-5332-pkg0.run 5597826
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.5332-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.5332-r1.ebuild
deleted file mode 100644
index 3443df289206..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.5332-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# 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-r1.ebuild,v 1.3 2004/04/27 21:01:01 agriffis 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"
-RESTRICT="nostrip"
-
-# We need xfree-4.2.0-r9 to support the dynamic libGL* stuff
-DEPEND="virtual/glibc
-	>=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}/${PN}-1.0.5328-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 ${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}
-
-	# 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
-}