Pull broken version.

5 files changed, 6 insertions, 229 deletions

diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index a7ba588dadf1..ae830c84c9c0 100644
--- a/x11-base/opengl-update/ChangeLog
+++ b/x11-base/opengl-update/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/opengl-update
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.27 2004/06/24 08:02:16 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.28 2004/06/24 08:05:27 spyderous Exp $
+
+  24 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  -files/opengl-update-1.7, -opengl-update-1.7.ebuild:
+  Pull broken version.
 
   24 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>;
   opengl-update-1.7.1.ebuild:
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest
index 882cd6510779..ec7603669a06 100644
--- a/x11-base/opengl-update/Manifest
+++ b/x11-base/opengl-update/Manifest
@@ -1,11 +1,8 @@
-MD5 11ce37365afc6164663047b845c9bf83 ChangeLog 4561
+MD5 f428c7c0335cdc165244ad0a2d4b81c8 ChangeLog 4695
 MD5 15888db563d723a724ef6cdd2818893d metadata.xml 284
 MD5 b380084c3d3182a59b8fd3ab59d685ca opengl-update-1.5.ebuild 530
-MD5 3426a32c68c57497d18d0d42f9e40b95 opengl-update-1.7.ebuild 546
 MD5 e85c9489084369d0de111917595a84bd opengl-update-1.7.1.ebuild 553
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.5 0
 MD5 a7b7eafaa3ea0cd277c66b0d13674307 files/opengl-update-1.5 3781
 MD5 07db4d781825de8448a4988dab1ce6b0 files/opengl-update-1.7.1 4931
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7 0
-MD5 99db80c5644ef4f25086112eb364e661 files/opengl-update-1.7 4930
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7.1 0
diff --git a/x11-base/opengl-update/files/digest-opengl-update-1.7 b/x11-base/opengl-update/files/digest-opengl-update-1.7
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/x11-base/opengl-update/files/digest-opengl-update-1.7
+++ /dev/null
diff --git a/x11-base/opengl-update/files/opengl-update-1.7 b/x11-base/opengl-update/files/opengl-update-1.7
deleted file mode 100644
index c517e4ee676a..000000000000
--- a/x11-base/opengl-update/files/opengl-update-1.7
+++ /dev/null
@@ -1,206 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-1.7,v 1.2 2004/05/31 07:22:32 spyderous Exp $
-# Author:  Martin Schlemmer <azarah@gentoo.org>
-# Further modifications by Donnie Berkholz <spyderous@gentoo.org>
-
-. /etc/init.d/functions.sh
-
-if [ `id -u` -ne 0 ]
-then
-	eerror "${0}: must be root."
-	exit 1
-fi
-
-usage() {
-# In addition to the below function, there are two extra uses for this.
-#
-# They aren't in the printed help message because they're intended
-# 	for developer use.
-# 1) --use-old $NEW_IMPLEM will switch to the new implementation only if
-# 	no old setup existed (i.e., X has never been installed)
-# 2) --get-implementation will return the implementation
-
-cat << FOO
-usage: ${0##*/} <GL implementation>
-
-note:  
-       This utility switches between OpenGL implementations.  Currently there
-       are five supported implementations, "xorg-x11" "xfree" "nvidia" "ati"
-       and "mtx", the implementations for X.org, XFree86, nVidia, ATi
-       and Matrox drivers respectively.
-
-examples:
-       ${0##*/} xorg-x11
-       This will setup things to use libGL.so from X.org.
-
-       ${0##*/} nvidia
-       This will setup things to use libGL.so from the nVidia drivers.
-	   
-FOO
-	exit 1
-}
-
-if [ "$#" -ne 1 -a "$#" -ne 2 ] || \
-	[ "$#" -eq 2 -a "$1" != "--use-old" ]
-then
-	usage
-fi
-
-GL_IMPLEM=""
-
-# Discover GL implementation if it exists
-get_implem() {
-	if [ -f /etc/env.d/09opengl ]
-	then
-		source /etc/env.d/09opengl
-		if [ -n "${LDPATH}" ]
-		then
-			GL_IMPLEM="${LDPATH/\/usr\/lib\/opengl\/}"
-			GL_IMPLEM="${GL_IMPLEM/\/lib}"
-			unset LDPATH
-		fi
-	fi
-}
-
-# Return current GL implementation
-if [ "$1" = "--get-implementation" ]
-then
-	get_implem
-	
-	if [ -n "${GL_IMPLEM}" ]
-	then
-		echo "${GL_IMPLEM}"
-	fi
-
-	if [ -z "${GL_IMPLEM}" ]
-	then
-		exit 2
-	fi
-
-	exit 1
-fi
-
-# Only use specified implementation if it is not already selected.
-if [ "$1" = "--use-old" ]
-then
-	shift
-
-	get_implem
-	
-	if [ -z "${GL_IMPLEM}" ]
-	then
-		GL_IMPLEM="$1"
-	fi
-else
-	GL_IMPLEM="$1"
-fi
-
-if [ ! -d /usr/lib/opengl/${GL_IMPLEM} ]
-then
-	usage
-else
-	ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
-
-	#setup the $LDPATH
-	echo "LDPATH=/usr/lib/opengl/${GL_IMPLEM}/lib" >/etc/env.d/09opengl
-	/usr/sbin/env-update &>/dev/null
-
-	#setup the /usr/lib/libGL.so symlink
-	if [ -e /usr/lib/libGL.so ]
-	then
-		rm -f /usr/lib/libGL.so
-	fi
-	if [ -e /usr/lib/libGL.so.1 ]
-	then
-		rm -f /usr/lib/libGL.so.1
-	fi
-	realname="$(readlink /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.so)"
-	ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \
-		/usr/lib/libGL.so
-	ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \
-		/usr/lib/libGL.so.1
-
-	#setup the /usr/X11R6/lib/libMesaGL.so symlink
-	if [ -e /usr/X11R6/lib/libMesaGL.so ]
-	then
-		rm -f /usr/X11R6/lib/libMesaGL.so
-	fi
-	realname="$(readlink /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.so)"
-	ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \
-		/usr/X11R6/lib/libMesaGL.so
-
-	#setup the /usr/lib/libGLcore.so symlink
-	if [ -e /usr/lib/libGLcore.so ]
-	then
-		rm -f /usr/lib/libGLcore.so
-	fi
-	if [ -e /usr/lib/libGLcore.so.1 ]
-	then
-		rm -f /usr/lib/libGLcore.so.1
-	fi
-	if [ -e /usr/lib/opengl/${GL_IMPLEM}/lib/libGLcore.so ]
-	then
-		realname="$(readlink /usr/lib/opengl/${GL_IMPLEM}/lib/libGLcore.so)"
-		ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \
-			/usr/lib/libGLcore.so
-		ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/${realname} \
-			/usr/lib/libGLcore.so.1
-	fi
-
-	#setup the /usr/lib/libGL.la symlink
-	if [ -e /usr/lib/libGL.la ]
-	then
-		rm -f /usr/lib/libGL.la
-	fi
-	if [ -e /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.la ]
-	then
-		ln -sf /usr/lib/opengl/${GL_IMPLEM}/lib/libGL.la \
-			/usr/lib/libGL.la
-	fi
-
-	#fix libtool archives (#48297)
-	CURDIR="$(pwd)"
-	cd /usr/lib
-	sed -i 's:/usr/lib/opengl/[^/]*/lib/libGL\.la:/usr/lib/libGL.la:' \
-		`grep -l /usr/lib/opengl *.la`
-	cd ${CURDIR}
-
-	#setup the /usr/X11R6/lib/modules/extensions/libglx.so symlink
-	if [ -e /usr/X11R6/lib/modules/extensions/libglx.so ]
-	then
-		rm -f /usr/X11R6/lib/modules/extensions/libglx.so
-	fi
-	if [ -e /usr/lib/opengl/${GL_IMPLEM}/extensions/libglx.so ]
-	then
-		ln -sf /usr/lib/opengl/${GL_IMPLEM}/extensions/libglx.so \
-			/usr/X11R6/lib/modules/extensions/libglx.so
-	fi
-	#setup the /usr/X11R6/lib/modules/extensions/libglx.a symlink
-	if [ -e /usr/X11R6/lib/modules/extensions/libglx.a ]
-	then
-		rm -f /usr/X11R6/lib/modules/extensions/libglx.a
-	fi
-	if [ -e /usr/lib/opengl/${GL_IMPLEM}/extensions/libglx.a ]
-	then
-		ln -sf /usr/lib/opengl/${GL_IMPLEM}/extensions/libglx.a \
-			/usr/X11R6/lib/modules/extensions/libglx.a
-	fi
-
-	#setup the includes
-	for x in gl.h glx.h glxtokens.h
-	do
-		if [ -e /usr/X11R6/include/GL/${x} ]
-		then
-			rm -f /usr/X11R6/include/GL/${x}
-		fi
-		ln -sf /usr/lib/opengl/${GL_IMPLEM}/include/${x} \
-			/usr/X11R6/include/GL/${x}
-	done
-
-	eend 0
-fi
-
-
-# vim:ts=4
diff --git a/x11-base/opengl-update/opengl-update-1.7.ebuild b/x11-base/opengl-update/opengl-update-1.7.ebuild
deleted file mode 100644
index 60ae87cfb3b5..000000000000
--- a/x11-base/opengl-update/opengl-update-1.7.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-1.7.ebuild,v 1.5 2004/06/11 20:19:35 kloeri Exp $
-
-DESCRIPTION="Utility to change the OpenGL interface being used"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ppc sparc ~mips alpha arm ~hppa amd64 ~ia64"
-IUSE=""
-
-DEPEND="virtual/glibc"
-
-src_install() {
-	newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die
-}