Bump x86 to -r1 as well and cleanup the old.

(Portage version: 2.0.51.19)

3 files changed, 2 insertions, 226 deletions

diff --git a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7167 b/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7167
deleted file mode 100644
index 691dc4a42ce3..000000000000
--- a/media-video/nvidia-glx/files/digest-nvidia-glx-1.0.7167
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d88d606873be255e8c4926961a1f09bf NVIDIA-Linux-x86-1.0-7167-pkg1.run 9427444
-MD5 a0433d841c41862af266300b589c12a7 NVIDIA-Linux-x86_64-1.0-7167-pkg2.run 8709382
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7167-r1.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7167-r1.ebuild
index 8fa67b94758c..153bc438cac3 100644
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7167-r1.ebuild
+++ b/media-video/nvidia-glx/nvidia-glx-1.0.7167-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.7167-r1.ebuild,v 1.1 2005/03/12 01:55:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-glx/nvidia-glx-1.0.7167-r1.ebuild,v 1.2 2005/03/12 02:50:19 azarah Exp $
 
 inherit eutils multilib versionator
 
@@ -19,7 +19,7 @@ LICENSE="NVIDIA"
 SLOT="0"
 
 # Just amd64 2005.0 fixes in this revbump
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* ~x86 ~amd64"
 
 RESTRICT="nostrip multilib-pkg-force"
 IUSE=""
diff --git a/media-video/nvidia-glx/nvidia-glx-1.0.7167.ebuild b/media-video/nvidia-glx/nvidia-glx-1.0.7167.ebuild
deleted file mode 100644
index 832660cbbb50..000000000000
--- a/media-video/nvidia-glx/nvidia-glx-1.0.7167.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2005 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.7167.ebuild,v 1.2 2005/03/12 01:55:58 eradicator Exp $
-
-inherit eutils multilib versionator
-
-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)"
-
-LICENSE="NVIDIA"
-SLOT="0"
-
-KEYWORDS="-* -amd64 ~x86"
-
-RESTRICT="nostrip multilib-pkg-force"
-IUSE=""
-
-DEPEND="virtual/libc
-	virtual/x11
-	>=x11-base/opengl-update-2.1.0
-	~media-video/nvidia-kernel-${PV}
-	!app-emulation/emul-linux-x86-nvidia"
-
-PROVIDE="virtual/opengl"
-export _POSIX2_VERSION="199209"
-
-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}"
-
-check_xfree() {
-	# This isn't necessary, true. But its about time people got the idea.
-	if has_version "x11-base/xfree"; then
-		eerror "Support for x11-base/xfree is deprecated. Upgrade to x11-base/xorg-x11."
-	fi
-}
-
-pkg_setup() {
-	check_xfree
-
-	if use amd64 && has_multilib_profile && [ "${DEFAULT_ABI}" != "amd64" ]; then
-		eerror "This ebuild doesn't currently support changing your defualt abi."
-		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
-	fi
-}
-
-src_unpack() {
-	local NV_PATCH_PREFIX="${FILESDIR}/${PV}/NVIDIA_glx-${PV}"
-
-	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 ${NV_PATCH_PREFIX//7167/6629}-makefile.patch
-	# Use the correct defines to make gtkglext build work
-	epatch ${NV_PATCH_PREFIX//7167/6629}-defines.patch
-	# Use some more sensible gl headers and make way for new glext.h
-	epatch ${NV_PATCH_PREFIX//7167/6629}-glheader.patch
-
-	# 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.
-	# 7 November 2004, Keeping this around for 6629 to see what happens.
-	#rm -f usr/include/GL/glext.h
-}
-
-src_install() {
-	local MLTEST=$(type dyn_unpack)
-
-	if [[ ${MLTEST/set_abi} == ${MLTEST} ]] && has_multilib_profile ; then
-		local OABI=${ABI}
-		for ABI in $(get_install_abis) ; do
-			src_install-libs
-		done
-		ABI=${OABI}
-		unset OABI
-	elif use amd64 ; then
-		src_install-libs lib32 $(get_multilibdir)
-		src_install-libs lib $(get_libdir)
-
-		rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/include
-		rm -rf ${D}/usr/$(get_multilibdir)/opengl/nvidia/extensions
-	else
-		src_install-libs
-	fi
-
-	is_final_abi || return 0
-
-	# Install tls_test
-	dodir /usr/libexec/misc
-	exeinto /usr/libexec/misc
-	doexe usr/bin/tls_test
-	doexe usr/bin/tls_test_dso.so
-
-	# 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
-}
-
-src_install-libs() {
-	local pkglibdir=lib
-	local inslibdir=$(get_libdir)
-
-	if [[ ${#} -eq 2 ]] ; then
-		pkglibdir=${1}
-		inslibdir=${2}
-	elif has_multilib_profile && [[ ${ABI} == "x86" ]] ; then
-		pkglibdir=lib32
-	fi
-
-	local NV_ROOT="/usr/${inslibdir}/opengl/nvidia"
-
-	# The GLX libraries
-	exeinto ${NV_ROOT}/lib
-	doexe usr/${pkglibdir}/libGL.so.${PV} \
-	      usr/${pkglibdir}/libGLcore.so.${PV} \
-		  usr/${pkglibdir}/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/${inslibdir}/opengl/nvidia/tls"
-	dodir ${TLS_ROOT}
-	exeinto ${TLS_ROOT}
-	doexe usr/${pkglibdir}/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
-
-	# Old opengl-updates don't always make this
-	keepdir /usr/${inslibdir}/tls
-
-	# Not sure whether installing the .la file is neccessary;
-	# this is adopted from the `nvidia' ebuild
-	local ver1=$(get_version_component_range 1)
-	local ver2=$(get_version_component_range 2)
-	local ver3=$(get_version_component_range 3)
-	sed -e "s:\${PV}:${PV}:"     \
-	    -e "s:\${ver1}:${ver1}:" \
-	    -e "s:\${ver2}:${ver2}:" \
-	    -e "s:\${ver3}:${ver3}:" \
-	    -e "s:\${libdir}:${inslibdir}:" \
-	    ${FILESDIR}/libGL.la-r2 > ${D}/${NV_ROOT}/lib/libGL.la
-
-	# The X module
-	# Since we moved away from libs in /usr/X11R6 need to check this
-	if has_version ">=x11-base/xorg-x11-6.8.0-r4" ; then
-		local X11_LIB_DIR="/usr/$(get_libdir)"
-	else
-		local X11_LIB_DIR="/usr/X11R6/$(get_libdir)"
-	fi
-
-	exeinto ${X11_LIB_DIR}/modules/drivers
-	[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o ]] && \
-		doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.o
-	[[ -f usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so ]] && \
-		doexe usr/X11R6/${pkglibdir}/modules/drivers/nvidia_drv.so
-
-	insinto ${X11_LIB_DIR}
-	[[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a ]] && \
-		doins usr/X11R6/${pkglibdir}/libXvMCNVIDIA.a
-	exeinto ${X11_LIB_DIR}
-	[[ -f usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV} ]] && \
-		doexe usr/X11R6/${pkglibdir}/libXvMCNVIDIA.so.${PV}
-
-	exeinto ${NV_ROOT}/extensions
-	[[ -f usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} ]] && \
-		newexe usr/X11R6/${pkglibdir}/modules/extensions/libglx.so.${PV} libglx.so
-
-	# Includes
-	insinto ${NV_ROOT}/include
-	doins usr/include/GL/*.h
-}
-
-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."
-}