Fixes for xorg-x11 compatibility.

3 files changed, 45 insertions, 19 deletions

diff --git a/x11-libs/gtkglext/ChangeLog b/x11-libs/gtkglext/ChangeLog
index ae891249b38c..0d38308d5665 100644
--- a/x11-libs/gtkglext/ChangeLog
+++ b/x11-libs/gtkglext/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/gtkglext
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/ChangeLog,v 1.26 2004/04/04 18:06:44 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/ChangeLog,v 1.27 2004/04/11 19:06:41 spyderous Exp $
+
+  11 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; gtkglext-1.0.5.ebuild,
+  gtkglext-1.0.6.ebuild:
+  Fixes for xorg-x11 compatibility.
 
 *gtkglext-1.0.6 (04 Apr 2004)
 
diff --git a/x11-libs/gtkglext/gtkglext-1.0.5.ebuild b/x11-libs/gtkglext/gtkglext-1.0.5.ebuild
index e608618317bb..7062328b1609 100644
--- a/x11-libs/gtkglext/gtkglext-1.0.5.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/gtkglext-1.0.5.ebuild,v 1.4 2004/04/04 18:06:44 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/gtkglext-1.0.5.ebuild,v 1.5 2004/04/11 19:06:41 spyderous Exp $
 
 inherit gnome2
 
@@ -30,20 +30,31 @@ DOCS="AUTHORS COPYING* ChangeLog* INSTALL NEWS README* TODO"
 # foser <foser@gentoo.org>
 
 pkg_setup () {
-	VOID=`cat /etc/env.d/09opengl | grep xfree`
-
-	USING_NVIDIA=$?
-
-	if [ ${USING_NVIDIA} -eq 1 ]
+	if [ -e /etc/env.d/09opengl ]
 	then
-		opengl-update xfree
+		# Set up X11 implementation
+		X11_IMPLEM_P="$(portageq best_version "${ROOT}" virtual/x11)"
+		X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+		X11_IMPLEM="${X11_IMPLEM##*\/}"
+		einfo "X11 implementation is ${X11_IMPLEM}."
+
+		VOID=$(cat /etc/env.d/09opengl | grep ${X11_IMPLEM})
+
+		USING_X11=$?
+		if [ ${USING_X11} -eq 1 ]
+		then
+			GL_IMPLEM=$(cat /etc/env.d/09opengl | cut -f5 -d/)
+			opengl-update ${X11_IMPLEM}
+		fi
+	else
+		die "Could not find /etc/env.d/09opengl. Please run opengl-update."
 	fi
 }
 
 pkg_postinst () {
-	if [ ${USING_NVIDIA} -eq 1 ]
+	if [ ${USING_X11} -eq 1 ]
 	then
-		opengl-update nvidia
+		opengl-update ${GL_IMPLEM}
 	fi
 }
 
diff --git a/x11-libs/gtkglext/gtkglext-1.0.6.ebuild b/x11-libs/gtkglext/gtkglext-1.0.6.ebuild
index 84c45a4dff2e..a1dbe5d5f6d0 100644
--- a/x11-libs/gtkglext/gtkglext-1.0.6.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/gtkglext-1.0.6.ebuild,v 1.1 2004/04/04 18:06:44 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/gtkglext-1.0.6.ebuild,v 1.2 2004/04/11 19:06:41 spyderous Exp $
 
 inherit gnome2
 
@@ -30,20 +30,31 @@ DOCS="AUTHORS COPYING* ChangeLog* INSTALL NEWS README* TODO"
 # foser <foser@gentoo.org>
 
 pkg_setup () {
-	VOID=`cat /etc/env.d/09opengl | grep xfree`
-
-	USING_NVIDIA=$?
-
-	if [ ${USING_NVIDIA} -eq 1 ]
+	if [ -e /etc/env.d/09opengl ]
 	then
-		opengl-update xfree
+		# Set up X11 implementation
+		X11_IMPLEM_P="$(portageq best_version "${ROOT}" virtual/x11)"
+		X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
+		X11_IMPLEM="${X11_IMPLEM##*\/}"
+		einfo "X11 implementation is ${X11_IMPLEM}."
+
+		VOID=$(cat /etc/env.d/09opengl | grep ${X11_IMPLEM})
+
+		USING_X11=$?
+		if [ ${USING_X11} -eq 1 ]
+		then
+			GL_IMPLEM=$(cat /etc/env.d/09opengl | cut -f5 -d/)
+			opengl-update ${X11_IMPLEM}
+		fi
+	else
+		die "Could not find /etc/env.d/09opengl. Please run opengl-update."
 	fi
 }
 
 pkg_postinst () {
-	if [ ${USING_NVIDIA} -eq 1 ]
+	if [ ${USING_X11} -eq 1 ]
 	then
-		opengl-update nvidia
+		opengl-update ${GL_IMPLEM}
 	fi
 }