fix mistake in help

10 files changed, 11 insertions, 314 deletions

diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index b998d3b4ef33..bc491f99f7d5 100644
--- a/x11-base/opengl-update/ChangeLog
+++ b/x11-base/opengl-update/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/opengl-update
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.3 2002/05/29 01:13:52 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.4 2002/06/01 19:50:16 azarah Exp $
+
+*opengl-update-1.3 (1 June 2002)
+
+  1 June 2002; Martin Schlemmer <azarah@gentoo.org> opengl-update-1.3.ebuild :
+
+  Fix error in opengl-update's help (should be "opengl-update xfree" and not
+  "opengl-update xfree86"); bug #3166.
 
 *opengl-update-1.2 (29 May 2002)
 
diff --git a/x11-base/opengl-update/files/digest-opengl-update-1.1 b/x11-base/opengl-update/files/digest-opengl-update-1.1
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/x11-base/opengl-update/files/digest-opengl-update-1.1
+++ /dev/null
diff --git a/x11-base/opengl-update/files/digest-opengl-update-1.2 b/x11-base/opengl-update/files/digest-opengl-update-1.2
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/x11-base/opengl-update/files/digest-opengl-update-1.2
+++ /dev/null
diff --git a/x11-base/opengl-update/files/digest-opengl-update-1.0 b/x11-base/opengl-update/files/digest-opengl-update-1.3
index e69de29bb2d1..e69de29bb2d1 100644
--- a/x11-base/opengl-update/files/digest-opengl-update-1.0
+++ b/x11-base/opengl-update/files/digest-opengl-update-1.3
diff --git a/x11-base/opengl-update/files/opengl-update b/x11-base/opengl-update/files/opengl-update
deleted file mode 100644
index 8a65a4bbdcb1..000000000000
--- a/x11-base/opengl-update/files/opengl-update
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update,v 1.1 2002/05/12 18:33:22 azarah Exp $
-
-
-source /etc/init.d/functions.sh
-
-if [ `id -u` -ne 0 ]
-then
-	eerror "${0}: must be root."
-	exit 1
-fi
-
-usage() {
-cat << FOO
-usage: opengl-update <GL implementation>
-
-note:  
-       This utility switch between OpenGL implementations.  Currently there
-       are two supported implementations, namely "xfree" and "nvidia", the
-       implementations for XFree86 and the NVidia drivers respectively.
-
-examples:
-       opengl-update xfree86
-       This will setup things to use libGL.so from XFree86
-
-       opengl-update nvidia
-       This will setup things to use libGL.so from the NVidia drivers.
-	   
-FOO
-	exit 1
-}
-
-if [ "$#" -ne 1 ]
-then
-	usage
-fi
-if [ ! -d /usr/lib/opengl/${1} ]
-then
-	usage
-else
-	ebegin "Switching to ${1} OpenGL interface"
-
-	#setup the $LDPATH
-	echo "LDPATH=/usr/lib/opengl/${1}/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/${1}/lib/libGL.so)"
-	ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-		/usr/lib/libGL.so
-	ln -sf /usr/lib/opengl/${1}/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
-	ln -sf /usr/lib/opengl/${1}/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/${1}/lib/libGLcore.so ]
-	then
-		realname="$(readlink /usr/lib/opengl/${1}/lib/libGLcore.so)"
-		ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-			/usr/lib/libGLcore.so
-		ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-			/usr/lib/libGLcore.so.1
-	fi
-
-	#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/${1}/extensions/libglx.so ]
-	then
-		ln -sf /usr/lib/opengl/${1}/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/${1}/extensions/libglx.a ]
-	then
-		ln -sf /usr/lib/opengl/${1}/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/${1}/include/${x} \
-			/usr/X11R6/include/GL/${x}
-	done
-
-	eend 0
-fi
-
-
-# vim:ts=4
diff --git a/x11-base/opengl-update/files/opengl-update-1.1 b/x11-base/opengl-update/files/opengl-update-1.1
deleted file mode 100644
index 77ec62366428..000000000000
--- a/x11-base/opengl-update/files/opengl-update-1.1
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-1.1,v 1.1 2002/05/28 23:35:49 azarah Exp $
-
-
-source /etc/init.d/functions.sh
-
-if [ `id -u` -ne 0 ]
-then
-	eerror "${0}: must be root."
-	exit 1
-fi
-
-usage() {
-cat << FOO
-usage: opengl-update <GL implementation>
-
-note:  
-       This utility switch between OpenGL implementations.  Currently there
-       are two supported implementations, namely "xfree" and "nvidia", the
-       implementations for XFree86 and the NVidia drivers respectively.
-
-examples:
-       opengl-update xfree86
-       This will setup things to use libGL.so from XFree86
-
-       opengl-update nvidia
-       This will setup things to use libGL.so from the NVidia drivers.
-	   
-FOO
-	exit 1
-}
-
-if [ "$#" -ne 1 ]
-then
-	usage
-fi
-if [ ! -d /usr/lib/opengl/${1} ]
-then
-	usage
-else
-	ebegin "Switching to ${1} OpenGL interface"
-
-	#setup the $LDPATH
-	echo "LDPATH=/usr/lib/opengl/${1}/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/${1}/lib/libGL.so)"
-	ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-		/usr/lib/libGL.so
-	ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-		/usr/lib/libGL.so.1
-
-	#setup the /usr/lib/libGLU.so symlink
-	if [ -e /usr/lib/libGLU.so ]
-	then
-		rm -f /usr/lib/libGLU.so
-	fi
-	if [ -e /usr/lib/libGLU.so.1 ]
-	then
-		rm -f /usr/lib/libGLU.so.1
-	fi
-	if [ -e /usr/lib/opengl/${1}/lib/libGLU.so ]
-	then
-		realname="$(readlink /usr/lib/opengl/${1}/lib/libGLU.so)"
-		ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-			/usr/lib/libGLU.so
-		ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-			/usr/lib/libGLU.so.1
-	fi
-	
-	#setup the /usr/X11R6/lib/libMesaGL.so symlink
-	if [ -e /usr/X11R6/lib/libMesaGL.so ]
-	then
-		rm -f /usr/X11R6/lib/libMesaGL.so
-	fi
-	ln -sf /usr/lib/opengl/${1}/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/${1}/lib/libGLcore.so ]
-	then
-		realname="$(readlink /usr/lib/opengl/${1}/lib/libGLcore.so)"
-		ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-			/usr/lib/libGLcore.so
-		ln -sf /usr/lib/opengl/${1}/lib/${realname} \
-			/usr/lib/libGLcore.so.1
-	fi
-
-	#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/${1}/extensions/libglx.so ]
-	then
-		ln -sf /usr/lib/opengl/${1}/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/${1}/extensions/libglx.a ]
-	then
-		ln -sf /usr/lib/opengl/${1}/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/${1}/include/${x} \
-			/usr/X11R6/include/GL/${x}
-	done
-
-	eend 0
-fi
-
-
-# vim:ts=4
diff --git a/x11-base/opengl-update/files/opengl-update-1.2 b/x11-base/opengl-update/files/opengl-update-1.3
index 6a6a303a331e..75aceaee53de 100644
--- a/x11-base/opengl-update/files/opengl-update-1.2
+++ b/x11-base/opengl-update/files/opengl-update-1.3
@@ -2,7 +2,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-1.2,v 1.1 2002/05/29 01:13:52 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-1.3,v 1.1 2002/06/01 19:50:17 azarah Exp $
 
 
 source /etc/init.d/functions.sh
@@ -23,7 +23,7 @@ note:
        implementations for XFree86 and the NVidia drivers respectively.
 
 examples:
-       opengl-update xfree86
+       opengl-update xfree
        This will setup things to use libGL.so from XFree86
 
        opengl-update nvidia
diff --git a/x11-base/opengl-update/opengl-update-1.0.ebuild b/x11-base/opengl-update/opengl-update-1.0.ebuild
deleted file mode 100644
index 24ebe66f2a9f..000000000000
--- a/x11-base/opengl-update/opengl-update-1.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-1.0.ebuild,v 1.1 2002/05/12 18:33:22 azarah Exp $
-
-S=${WORKDIR}/${P}
-SLOT="0"
-DESCRIPTION="Utility to change the OpenGL interface being used."
-SRC_URI=""
-HOMEPAGE="http://"
-
-DEPEND=""
-
-
-src_install() {
-
-	dosbin ${FILESDIR}/opengl-update
-}
-
diff --git a/x11-base/opengl-update/opengl-update-1.2.ebuild b/x11-base/opengl-update/opengl-update-1.2.ebuild
deleted file mode 100644
index 10325efe24fc..000000000000
--- a/x11-base/opengl-update/opengl-update-1.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-1.2.ebuild,v 1.1 2002/05/29 01:13:52 azarah Exp $
-
-S=${WORKDIR}/${P}
-SLOT="0"
-DESCRIPTION="Utility to change the OpenGL interface being used."
-SRC_URI=""
-HOMEPAGE="http://"
-
-DEPEND=""
-
-
-src_install() {
-
-	newsbin ${FILESDIR}/opengl-update-${PV} opengl-update
-}
-
diff --git a/x11-base/opengl-update/opengl-update-1.1.ebuild b/x11-base/opengl-update/opengl-update-1.3.ebuild
index 6d1b885444e6..ae7077dbb313 100644
--- a/x11-base/opengl-update/opengl-update-1.1.ebuild
+++ b/x11-base/opengl-update/opengl-update-1.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-1.1.ebuild,v 1.1 2002/05/28 23:35:49 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/opengl-update-1.3.ebuild,v 1.1 2002/06/01 19:50:16 azarah Exp $
 
 S=${WORKDIR}/${P}
 SLOT="0"