Fixes for xorg-x11 compatibility.

4 files changed, 49 insertions, 23 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/Manifest b/x11-libs/gtkglext/Manifest
index 61e05daab42b..960e4cfd091d 100644
--- a/x11-libs/gtkglext/Manifest
+++ b/x11-libs/gtkglext/Manifest
@@ -1,10 +1,10 @@
+MD5 7d5aa12d4247d80d00f38447071e7d41 ChangeLog 3544
+MD5 76cdd5b90f4b003cbbf4488ea3af6ebf gtkglext-1.0.5.ebuild 1486
 MD5 6ef48455ed416fd83bfa160d8fd492f4 gtkglext-1.0.3.ebuild 1063
 MD5 5e043cd5b99577c8674c1d2ac19cf8a8 gtkglext-1.0.4.ebuild 1070
-MD5 66dd123f553c42238c44077172072229 gtkglext-1.0.5.ebuild 1079
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 84f9f77698e422c02c3d3153c3f4c89f gtkglext-1.0.6.ebuild 1082
-MD5 cf63daa490253f254081f912f67bf2e8 ChangeLog 3402
+MD5 5dccf611b653ba5fa4d593713e2f42ec gtkglext-1.0.6.ebuild 1489
+MD5 a7c68f59946312c5054bd66ddeaa8cd1 files/digest-gtkglext-1.0.5 67
 MD5 6ea907d4bcb5ddbb40fb762c6113ebee files/digest-gtkglext-1.0.3 67
 MD5 70192bf7a64990c43b9c1b3f6c95c2a5 files/digest-gtkglext-1.0.4 67
-MD5 a7c68f59946312c5054bd66ddeaa8cd1 files/digest-gtkglext-1.0.5 67
 MD5 526fbcdd193a45e6d4bd2af6bfca4952 files/digest-gtkglext-1.0.6 67
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
 }