New version

6 files changed, 59 insertions, 43 deletions

diff --git a/x11-libs/gtkglext/ChangeLog b/x11-libs/gtkglext/ChangeLog
index af258737aa9e..e3fe99974102 100644
--- a/x11-libs/gtkglext/ChangeLog
+++ b/x11-libs/gtkglext/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gtkglext
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/ChangeLog,v 1.11 2003/02/12 09:23:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/ChangeLog,v 1.12 2003/03/21 15:03:44 foser Exp $
+
+*gtkglext-0.7.1 (21 Mar 2003)
+
+  21 Mar 2003; foser <foser@gentoo.org> gtkglext-0.7.1.ebuild :
+  New version
+  Added some extra logic to get around possible build problems with nvidia headers
 
 *gtkglext-0.7.0 (31 Jan 2003)
 
diff --git a/x11-libs/gtkglext/files/digest-gtkglext-0.5.0 b/x11-libs/gtkglext/files/digest-gtkglext-0.5.0
deleted file mode 100644
index 21898165ca17..000000000000
--- a/x11-libs/gtkglext/files/digest-gtkglext-0.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a982a733928986acc4b1865e8d22a5b5 gtkglext-0.5.0.tar.bz2 280084
diff --git a/x11-libs/gtkglext/files/digest-gtkglext-0.7.1 b/x11-libs/gtkglext/files/digest-gtkglext-0.7.1
new file mode 100644
index 000000000000..064f30be5717
--- /dev/null
+++ b/x11-libs/gtkglext/files/digest-gtkglext-0.7.1
@@ -0,0 +1 @@
+MD5 6b3a04d41318baef44fdb7d9fb3745db gtkglext-0.7.1.tar.bz2 530781
diff --git a/x11-libs/gtkglext/gtkglext-0.5.0.ebuild b/x11-libs/gtkglext/gtkglext-0.5.0.ebuild
deleted file mode 100644
index 66970cdfeca3..000000000000
--- a/x11-libs/gtkglext/gtkglext-0.5.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/gtkglext-0.5.0.ebuild,v 1.5 2003/02/13 16:57:32 vapier Exp $
-
-IUSE="doc"
-
-DESCRIPTION="GL extentions for Gtk+ 2.0"
-HOMEPAGE="http://http://gtkglext.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gtkglext/${P}.tar.bz2"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 sparc "
-
-RDEPEND=">=dev-libs/glib-2.0.6-r1
-	>=x11-libs/gtk+-2.0.6-r1
-	virtual/glu
-	virtual/opengl"
-
-DEPEND="${DEPEND} 
-	 doc? ( >=dev-util/gtk-doc-0.9 )"
-
-S=${WORKDIR}/${P}
-
-src_compile() {
-	local myconf
-	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
-	./configure \
-		${myconf} \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
-	make || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING* ChangeLog* INSTALL NEWS* README* TODO
-}
diff --git a/x11-libs/gtkglext/gtkglext-0.7.0.ebuild b/x11-libs/gtkglext/gtkglext-0.7.0.ebuild
index 1ee0a66a71b9..679e0dca7b74 100644
--- a/x11-libs/gtkglext/gtkglext-0.7.0.ebuild
+++ b/x11-libs/gtkglext/gtkglext-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/gtkglext-0.7.0.ebuild,v 1.2 2003/02/13 16:57:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/gtkglext-0.7.0.ebuild,v 1.3 2003/03/21 15:03:44 foser Exp $
 
 inherit gnome2
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://gtkglext.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gtkglext/${P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 
 RDEPEND=">=x11-libs/gtk+-2
 	>=x11-libs/pango-1
diff --git a/x11-libs/gtkglext/gtkglext-0.7.1.ebuild b/x11-libs/gtkglext/gtkglext-0.7.1.ebuild
new file mode 100644
index 000000000000..04e765495478
--- /dev/null
+++ b/x11-libs/gtkglext/gtkglext-0.7.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkglext/gtkglext-0.7.1.ebuild,v 1.1 2003/03/21 15:03:44 foser Exp $
+
+inherit gnome2
+
+IUSE="doc"
+
+DESCRIPTION="GL extentions for Gtk+ 2.0"
+HOMEPAGE="http://gtkglext.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~sparc"
+
+RDEPEND=">=x11-libs/gtk+-2
+	>=x11-libs/pango-1
+	virtual/glu
+	virtual/opengl"
+
+DEPEND="${DEPEND}
+	doc? ( >=dev-util/gtk-doc-0.10 )"
+
+DOCS="AUTHORS COPYING* ChangeLog* INSTALL NEWS* README* TODO"
+
+
+# gtkglext doesn't build with some (faulty) nvidia drivers headers
+# this makes it always switch to xfree during install
+# foser <foser@gentoo.org>
+
+pkg_setup () {
+	VOID=`cat /etc/env.d/09opengl | grep xfree`
+
+	USING_NVIDIA=$?
+
+	echo ${USING_NVIDIA}
+
+	if [ ${USING_NVIDIA} -eq 1 ]
+	then
+		opengl-update xfree
+	fi
+}
+
+pkg_postinst () {
+	if [ ${USING_NVIDIA} -eq 1 ]
+	then
+		opengl-update nvidia
+	fi
+}