Make --use-old fix the current implementation if it's broken rather than exiting by doing nothing. Cleaned up --help output.

(Portage version: 2.0.51.20-r4)

3 files changed, 19 insertions, 20 deletions

diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index 767c0159d4d4..1e9b424dfe8a 100644
--- a/x11-base/opengl-update/ChangeLog
+++ b/x11-base/opengl-update/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/opengl-update
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.86 2005/04/26 02:31:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.87 2005/04/26 19:57:46 eradicator Exp $
+
+  26 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  files/opengl-update-2.2.0:
+  Make --use-old fix the current implementation if it's broken rather than
+  exiting by doing nothing. Cleaned up --help output.
 
 *opengl-update-2.2.0 (26 Apr 2005)
 
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest
index d05739c815ae..93c4b2e5a489 100644
--- a/x11-base/opengl-update/Manifest
+++ b/x11-base/opengl-update/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 68f0d484f931a75d6b84139bc275ca91 ChangeLog 16366
+MD5 ef3923cf03d3b01caeee1dd524cbfc05 ChangeLog 16582
 MD5 f4a810bc95a74e27b27973e4e948a937 metadata.xml 358
 MD5 1d0a088f9ab53e874cd541221d43cb92 opengl-update-2.2.0.ebuild 2851
 MD5 7acbfac090d4bdc3b7ec492bc35b917d opengl-update-2.1.1-r1.ebuild 2420
 MD5 219a292f64caeaa46b333eecde2197f2 files/digest-opengl-update-2.2.0 116
-MD5 d52698bb4f88165617816cb56b45e993 files/opengl-update-2.2.0 9426
+MD5 64fe221af2a4a232c8a11bf2f2f84778 files/opengl-update-2.2.0 9549
 MD5 91d9c17541be018d065a7838d7149c86 files/opengl-update-2.1.1 9110
 MD5 bbec0e16e4f45a464cec5b4feeecaa9b files/digest-opengl-update-2.1.1-r1 116
 MD5 ca73e0f8c9b114553216930eb0eb601a files/glxext.h-inttypes.patch 677
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCbat2ArHZZzCEUG0RAupfAJ9R52x5nMX3Z+ykLpA7vWvAbyRpEgCeOuzW
-kQcXw8IkcDSeIebrVVjZrdA=
-=Gl5I
------END PGP SIGNATURE-----
diff --git a/x11-base/opengl-update/files/opengl-update-2.2.0 b/x11-base/opengl-update/files/opengl-update-2.2.0
index 11dbb2eb133e..b7a390eed3ec 100644
--- a/x11-base/opengl-update/files/opengl-update-2.2.0
+++ b/x11-base/opengl-update/files/opengl-update-2.2.0
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.2.0,v 1.1 2005/04/26 02:31:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/files/opengl-update-2.2.0,v 1.2 2005/04/26 19:57:46 eradicator Exp $
 # Author:  Martin Schlemmer <azarah@gentoo.org>
 # Further modifications by Donnie Berkholz <spyderous@gentoo.org>
 # Further modifications based off submissions to bug #54984 <cyfred@gentoo.org>
@@ -84,11 +84,11 @@ print_usage() {
 Usage: ${0##*/} [<options>] <GL implementation>
        Set the opengl implementation.
        Valid options:
-       --use-old: only change the implementation if isn't already set.
-       --prefix: set the source prefix (default: /usr)
-       --dst-prefix: set the destination prefix (default: /usr)
-       --impl-headers: Use headers provided by this implementation to
-                       override golbal ones provided by opengl-update.
+       --use-old:          If an implementation is already set, use that one.
+       --prefix=<val>:     Set the source prefix (default: /usr)
+       --dst-prefix=<val>: Set the destination prefix (default: /usr)
+       --impl-headers:     Use headers provided by this implementation to
+                           override golbal ones provided by opengl-update.
 
 Usage: ${0##*/} --get-implementation
        Print the current implementaion
@@ -122,7 +122,7 @@ parse_options() {
 					eerror "Invalid usage."
 				else
 					if [[ -n "${CURRENT_GL_IMPLEM}" ]] && hasq ${CURRENT_GL_IMPLEM} ${AVAIL_IMPLEMS}; then
-						ACTION="nothing"
+						ACTION="old-implementation"
 					fi
 				fi				
 			;;
@@ -333,6 +333,10 @@ case ${ACTION} in
 			exit 2
 		fi
 	;;
+	old-implementation)
+		set-new-implementation ${CURRENT_GL_IMPLEM}
+		exit $?
+	;;
 	set-implementation)
 		if [[ -n "${NEW_GL_IMPLEM}" ]]; then
 			set-new-implementation ${NEW_GL_IMPLEM}