fix the fix

4 files changed, 33 insertions, 2 deletions

diff --git a/x11-libs/gtkglext/ChangeLog b/x11-libs/gtkglext/ChangeLog
index 0fca1e759f5a..ff141a3be6b3 100644
--- a/x11-libs/gtkglext/ChangeLog
+++ b/x11-libs/gtkglext/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtkglext
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/ChangeLog,v 1.33 2005/01/31 22:53:21 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/ChangeLog,v 1.34 2005/02/01 11:23:23 foser Exp $
+
+*gtkglext-1.0.6-r2 (01 Feb 2005)
+
+  01 Feb 2005; foser <foser@gentoo.org> gtkglext-1.0.6-r2.ebuild :
+  Re-add altered gl switch #79693
 
 *gtkglext-1.0.6-r1 (31 Jan 2005)
 
diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
index c0d5c9a832e1..5a9f1d88c74d 100644
--- a/x11-libs/gtkglext/Manifest
+++ b/x11-libs/gtkglext/Manifest
@@ -1,4 +1,5 @@
 MD5 1b7a84ba1c88626e116d18450fef2bdb gtkglext-1.0.5.ebuild 1475
+MD5 8b3badb8911e318f614848718e690c2a gtkglext-1.0.6-r2.ebuild 1214
 MD5 17706763adce6fc344a42a7116c4c124 gtkglext-1.0.4.ebuild 1059
 MD5 53bb5c836c3a06a55c3012b624ffbe85 gtkglext-1.0.6-r1.ebuild 703
 MD5 676ed516611d5d5d5c5d34a38a75f181 gtkglext-1.0.6.ebuild 1485
@@ -6,6 +7,7 @@ MD5 d7713f3f94527afc2aa23c9eaa06c1ea ChangeLog 4291
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 7664edfd39d853d33fb89d4193555c01 gtkglext-1.0.3.ebuild 1053
 MD5 526fbcdd193a45e6d4bd2af6bfca4952 files/digest-gtkglext-1.0.6-r1 67
+MD5 526fbcdd193a45e6d4bd2af6bfca4952 files/digest-gtkglext-1.0.6-r2 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
diff --git a/x11-libs/gtkglext/files/digest-gtkglext-1.0.6-r1 b/x11-libs/gtkglext/files/digest-gtkglext-1.0.6-r2
index 6219481c06ae..6219481c06ae 100644
--- a/x11-libs/gtkglext/files/digest-gtkglext-1.0.6-r1
+++ b/x11-libs/gtkglext/files/digest-gtkglext-1.0.6-r2
diff --git a/x11-libs/gtkglext/gtkglext-1.0.6-r1.ebuild b/x11-libs/gtkglext/gtkglext-1.0.6-r2.ebuild
index a4ffd3778bce..0fa193e34a97 100644
--- a/x11-libs/gtkglext/gtkglext-1.0.6-r1.ebuild
+++ b/x11-libs/gtkglext/gtkglext-1.0.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/gtkglext-1.0.6-r1.ebuild,v 1.1 2005/01/31 22:53:21 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/gtkglext-1.0.6-r2.ebuild,v 1.1 2005/02/01 11:23:23 foser Exp $
 
 inherit gnome2
 
@@ -21,6 +21,30 @@ RDEPEND=">=dev-libs/glib-2
 
 DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-0.10 )
+	>=x11-base/opengl-update-1.5
 	dev-util/pkgconfig"
 
 DOCS="AUTHORS COPYING* ChangeLog* INSTALL NEWS README* TODO"
+
+# gtkglext doesn't build with some (faulty) nvidia drivers headers
+# this makes it always switch to x11 headers during install
+# foser <foser@gentoo.org>
+
+pkg_setup () {
+
+	# 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}."
+
+	GL_IMPLEM=$(opengl-update --get-implementation)
+	opengl-update ${X11_IMPLEM}
+
+}
+
+pkg_postinst () {
+
+	opengl-update ${GL_IMPLEM}
+
+}