Fixing glext.h problems, xfree can now use 1.8 aswell.

4 files changed, 60 insertions, 1 deletions

diff --git a/x11-base/opengl-update/ChangeLog b/x11-base/opengl-update/ChangeLog
index b3fa5f867797..066a60d72288 100644
--- a/x11-base/opengl-update/ChangeLog
+++ b/x11-base/opengl-update/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/opengl-update
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.33 2004/07/17 03:25:31 cyfred Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/opengl-update/ChangeLog,v 1.34 2004/07/17 12:04:03 cyfred Exp $
+
+*opengl-update-1.8-r1 (17 Jul 2004)
+
+  17 Jul 2004; Andrew Bevitt <cyfred@gentoo.org>;
+  +opengl-update-1.8-r1.ebuild:
+  OK Making userspace fix the xfree problem which allows everyone to use
+  opengl-update-1.8
 
 *opengl-update-1.8 (17 Jul 2004)
 
diff --git a/x11-base/opengl-update/Manifest b/x11-base/opengl-update/Manifest
index 2beab75879d6..7d580937a052 100644
--- a/x11-base/opengl-update/Manifest
+++ b/x11-base/opengl-update/Manifest
@@ -1,3 +1,4 @@
+MD5 4039c342746a28624f62eaf7ca536dc9 opengl-update-1.8-r1.ebuild 1460
 MD5 fe9d5a762b674e506e1f518d2ab5a777 opengl-update-1.7.2.ebuild 543
 MD5 de8b9a1c44a6df2c85bb94621c424240 opengl-update-1.8.ebuild 1162
 MD5 536a92bce64cc5d0a58d862ac613749e ChangeLog 5633
@@ -13,3 +14,4 @@ MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.8 0
 MD5 8318429d1d44e5439b53280cac4ff461 files/glext.h-20040714 304594
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7.1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.7.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-opengl-update-1.8-r1 0
diff --git a/x11-base/opengl-update/files/digest-opengl-update-1.8-r1 b/x11-base/opengl-update/files/digest-opengl-update-1.8-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/x11-base/opengl-update/files/digest-opengl-update-1.8-r1
diff --git a/x11-base/opengl-update/opengl-update-1.8-r1.ebuild b/x11-base/opengl-update/opengl-update-1.8-r1.ebuild
new file mode 100644
index 000000000000..efe8d1315f71
--- /dev/null
+++ b/x11-base/opengl-update/opengl-update-1.8-r1.ebuild
@@ -0,0 +1,50 @@
+# 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/opengl-update-1.8-r1.ebuild,v 1.1 2004/07/17 12:04:03 cyfred Exp $
+
+DESCRIPTION="Utility to change the OpenGL interface being used"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+GLEXT="20040714"
+
+DEPEND="virtual/libc"
+
+pkg_setup() {
+	# xfree has glext.h somewhere out of place so lets make the user move it
+	if ( has_version "x11-base/xfree" || [ ! -h /usr/X11R6/include/GL/glext.h ] )
+#	if ( has_version "x11-base/xfree" || has_version "<x11-base/xorg-x11-6.7.0-r2" )
+	then
+		# Just make it simpler on the user by giving verbose instructions
+		if [ -d /usr/lib/opengl/xfree ]
+		then
+			GL_IM="xfree"
+		else
+			GL_IM="xorg-x11"
+		fi
+
+		echo
+		ewarn "Due to inconsistencies in xorg-x11 vs xfree handling of glext.h a userspace"
+		ewarn "is necessary for you to use opengl-update-1.8; Please do the following"
+		echo
+		ewarn "mv /usr/X11R6/include/GL/glext.h /usr/lib/opengl/${GL_IM}/include"
+		echo
+		ewarn "You may then remerge opengl-update-1.8 successfully"
+		echo
+
+		die "Userspace problem needs fixing"
+	fi
+}
+
+src_install() {
+	newsbin ${FILESDIR}/opengl-update-${PV} opengl-update || die
+
+	# Install default glext.h
+	dodir /usr/lib/opengl/global/include
+	insinto /usr/lib/opengl/global/include
+	newins ${FILESDIR}/glext.h-${GLEXT} glext.h || die
+}