[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/, x11-drivers/ati-drivers/files/

["Enrico Tagliavini" <enrico.tagliavini@gmail.com>]

commit:     7cd6566fe9f639a760409a2a331d53b5343247ff
Author:     Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
AuthorDate: Sat Oct 15 14:39:01 2011 +0000
Commit:     Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
CommitDate: Sat Oct 15 14:39:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=7cd6566f

[ati-drivers] revision bump, fix comment #9 and #10 in bug #366397

---
 ...vers-11.9.ebuild => ati-drivers-11.9-r1.ebuild} |    6 +-
 x11-drivers/ati-drivers/files/switchlibGL          |   43 ++++++++++---------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/x11-drivers/ati-drivers/ati-drivers-11.9.ebuild b/x11-drivers/ati-drivers/ati-drivers-11.9-r1.ebuild
similarity index 99%
rename from x11-drivers/ati-drivers/ati-drivers-11.9.ebuild
rename to x11-drivers/ati-drivers/ati-drivers-11.9-r1.ebuild
index ec6093e..fef0878 100644
--- a/x11-drivers/ati-drivers/ati-drivers-11.9.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-11.9-r1.ebuild
@@ -474,9 +474,9 @@ src_install() {
 
 	# PowerXpress stuff
 	exeinto /usr/$(get_libdir)/fglrx
-	doexe "${FILESDIR}"/switchlibGL || die "newexe switchlibGL failed"
-	dosym ./switchlibGL /usr/$(get_libdir)/fglrx/switchlibglx || die \
-	"dosym switchlibglx failed"
+	doexe "${FILESDIR}"/switchlibGL || die "doexe switchlibGL failed"
+	cp "${FILESDIR}"/switchlibGL "${T}"/switchlibglx
+	doexe "${T}"/switchlibglx || die "doexe switchlibglx failed"
 }
 
 src_install-libs() {

diff --git a/x11-drivers/ati-drivers/files/switchlibGL b/x11-drivers/ati-drivers/files/switchlibGL
index e8fac1e..a6aa4fc 100644
--- a/x11-drivers/ati-drivers/files/switchlibGL
+++ b/x11-drivers/ati-drivers/files/switchlibGL
@@ -30,28 +30,31 @@ if [ $# -ne 1 ]; then
   exit $E_ERR
 fi
 
-
+current=$(eselect opengl show)
 # Switch to right mode
 case "$1" in
-  "amd" )
-        eselect opengl set ati
-  ;;
-  "intel" )
-        eselect opengl set xorg-x11
-  ;;
-  "query" )
-        current=`eselect opengl show`
-        case "$current" in
-          "ati" )
-             echo "amd"
-          ;;
-          "xorg-x11" )
-             echo "intel"
-          ;;
-        esac
-  ;;
-  * ) echo "Usage: `basename $0` amd|intel|query" 1>&2; exit $E_ERR;;
-  # other than amd|intel|query parameter report an error
+	"amd" )
+		if [ $current != ati ] ; then
+			eselect opengl set ati || return 1
+		fi
+	;;
+	"intel" )
+		if [ $current != xorg-x11 ] ; then
+			eselect opengl set xorg-x11 || return 1
+		fi
+	;;
+	"query" )
+		case "$current" in
+			"ati" )
+				echo "amd"
+			;;
+			"xorg-x11" )
+				echo "intel"
+			;;
+		esac
+	;;
+	* ) echo "Usage: `basename $0` amd|intel|query" 1>&2; exit $E_ERR;;
+	# other than amd|intel|query parameter report an error
 esac
 
 #  A zero return value from the script upon exit indicates success.