added fix for bug 160809 and workaround for bug 159074

(Portage version: 2.1.2-r4)

7 files changed, 68 insertions, 15 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 18695aeeecdb..5e82ca789de5 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.30 2007/01/08 00:55:11 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.31 2007/01/29 01:57:03 nerdboy Exp $
+
+*grass-6.2.0-r1 (29 Jan 2007)
+
+  29 Jan 2007; Steve Arnold <nerdboy@gentoo.org> files/99grass-6.2.0,
+  +files/grass-6.2.0-html-nonviz.patch, -grass-6.2.0.ebuild,
+  +grass-6.2.0-r1.ebuild:
+  Added fix for bug 160809 and workaround for bug 159074.
 
   08 Jan 2007; Danny van Dyk <kugelfang@gentoo.org> -grass-6.1.0.ebuild:
   QA: Removed unused versions.
diff --git a/sci-geosciences/grass/files/99grass-6.2.0 b/sci-geosciences/grass/files/99grass-6.2.0
index 9bbc265198d3..464ccee6a426 100644
--- a/sci-geosciences/grass/files/99grass-6.2.0
+++ b/sci-geosciences/grass/files/99grass-6.2.0
@@ -1,2 +1,2 @@
-GRASS_LD_LIBRARY_PATH="/usr/grass-6.2.0/lib"
-LDPATH="/usr/grass-6.2.0/lib"
+GRASS_LD_LIBRARY_PATH="/usr/grass62/lib"
+LDPATH="/usr/grass62/lib"
diff --git a/sci-geosciences/grass/files/digest-grass-6.2.0 b/sci-geosciences/grass/files/digest-grass-6.2.0-r1
index f0547c06a079..f0547c06a079 100644
--- a/sci-geosciences/grass/files/digest-grass-6.2.0
+++ b/sci-geosciences/grass/files/digest-grass-6.2.0-r1
diff --git a/sci-geosciences/grass/files/grass-6.2.0-html-nonviz.patch b/sci-geosciences/grass/files/grass-6.2.0-html-nonviz.patch
new file mode 100644
index 000000000000..5ddb4d6f6282
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.2.0-html-nonviz.patch
@@ -0,0 +1,39 @@
+--- tools/build_html_index.sh.orig	2006-12-29 11:55:46.000000000 -0800
++++ tools/build_html_index.sh	2006-12-29 11:58:10.000000000 -0800
+@@ -129,10 +129,12 @@
+ 
+ #copy over CSS:
+ cp -f grassdocs.css $HTMLDIR/
+-cp -f grassdocs.css $HTMLDIR/nviz/
++# patch for no opengl 
++#cp -f grassdocs.css $HTMLDIR/nviz/
+ #copy over GRASS logo:
+ cp -f grass.smlogo.gif $HTMLDIR/
+-cp -f grass.smlogo.gif $HTMLDIR/nviz/
++# patch for no opengl
++#cp -f grass.smlogo.gif $HTMLDIR/nviz/
+ #copy over GEM docs:
+ mkdir -p $HTMLDIR/gem
+ cp -f $GEMDIR/docs/GEM-Manual/*.html $HTMLDIR/gem/
+@@ -161,7 +163,8 @@
+ echo "<tr><td>&nbsp;&nbsp;r.*  </td><td>raster commands</td></tr>" >> $FULLINDEX
+ echo "<tr><td>&nbsp;&nbsp;r3.* </td><td>raster3D commands</td></tr>" >> $FULLINDEX
+ echo "<tr><td>&nbsp;&nbsp;v.*  </td><td>vector commands</td></tr>" >> $FULLINDEX
+-echo "<tr><td>&nbsp;&nbsp;nviz </td><td>visualization command</td></tr>" >> $FULLINDEX
++# patch for no opengl
++#echo "<tr><td>&nbsp;&nbsp;nviz </td><td>visualization command</td></tr>" >> $FULLINDEX
+ echo "</table>" >> $FULLINDEX
+ echo "<p>" >> $FULLINDEX
+ 
+@@ -240,9 +243,10 @@
+   echo "<li><a href=\"$MODCLASS.html\">$MODCLASS commands</a></li>" >> $FILENAME
+ done
+ 
++# patch for no opengl (no nviz)
+ #extra stuff for 'nviz' and 'xganim' and GUIs:
+ echo "<li><a href=\"gis.m.html\">gis.m</a> and <a href=\"d.m.html\">d.m</a> GIS managers</li>" >> $FILENAME
+-echo "<li><a href=\"nviz.html\">nviz</a> visualization and animation tool</li>" >> $FILENAME
++#echo "<li><a href=\"nviz.html\">nviz</a> visualization and animation tool</li>" >> $FILENAME
+ echo "<li><a href=\"xganim.html\">xganim</a> tool  for animating a raster map series</li>" >> $FILENAME
+ 	      
+ echo "</ul>" >> $FILENAME
diff --git a/sci-geosciences/grass/grass-5.4.0.ebuild b/sci-geosciences/grass/grass-5.4.0.ebuild
index 5b9eb5495336..a798ba1d3e34 100644
--- a/sci-geosciences/grass/grass-5.4.0.ebuild
+++ b/sci-geosciences/grass/grass-5.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-5.4.0.ebuild,v 1.8 2006/11/23 16:49:13 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-5.4.0.ebuild,v 1.9 2007/01/29 01:57:03 nerdboy Exp $
 
 inherit eutils toolchain-funcs
 
diff --git a/sci-geosciences/grass/grass-6.0.1.ebuild b/sci-geosciences/grass/grass-6.0.1.ebuild
index df72ceb105e1..9b69f621e3de 100644
--- a/sci-geosciences/grass/grass-6.0.1.ebuild
+++ b/sci-geosciences/grass/grass-6.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.0.1.ebuild,v 1.10 2006/12/25 04:48:52 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.0.1.ebuild,v 1.11 2007/01/29 01:57:03 nerdboy Exp $
 
 inherit eutils
 
diff --git a/sci-geosciences/grass/grass-6.2.0.ebuild b/sci-geosciences/grass/grass-6.2.0-r1.ebuild
index 24e5cde142b6..bf5510e14715 100644
--- a/sci-geosciences/grass/grass-6.2.0.ebuild
+++ b/sci-geosciences/grass/grass-6.2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.0.ebuild,v 1.2 2006/12/24 22:01:41 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.0-r1.ebuild,v 1.1 2007/01/29 01:57:03 nerdboy Exp $
 
 inherit eutils autotools
 
@@ -69,7 +69,8 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	if use glw && ! use opengl; then
 		ewarn "You set USE='glw -opengl'. GLw support needs OpenGL."
-		die "Set 'opengl' useflag!"
+		ewarn "OpenGL support also requires Tcl and Tk support."
+		die "Set opengl, tcl, and tk useflags!"
 	fi
 	if use glw && ! built_with_use media-libs/mesa motif; then
 		ewarn "GRASS OpenGL support needs mesa with motif headers."
@@ -109,14 +110,14 @@ src_compile() {
 	myconf="--prefix=/usr --with-cxx --enable-shared \
 		--with-gdal=$(which gdal-config) --with-curses --with-proj \
 		--with-proj-includes=/usr/include --with-proj-libs=/usr/lib \
-		--with-proj-share=/usr/share/proj --with-x"
+		--with-proj-share=/usr/share/proj"
 
 	if use tcl || use tk; then
 		myconf="${myconf} --with-tcltk \
 		    --with-tcltk-includes=/usr/include \
-		    --with-tcltk-libs=/usr/$(get_libdir)/tcl8.4"
+		    --with-tcltk-libs=/usr/$(get_libdir)/tcl8.4 --with-x"
 	else
-		myconf="${myconf} --without-tcltk"
+		myconf="${myconf} --without-tcltk --without-x"
 	fi
 
 	if use ffmpeg; then
@@ -140,6 +141,8 @@ src_compile() {
 	    if use glw; then
 		myconf="${myconf} --with-glw"
 	    fi
+	else
+	    epatch ${FILESDIR}/${P}-html-nonviz.patch
 	fi
 
 	if use sqlite; then
@@ -174,11 +177,15 @@ src_compile() {
 
 src_install() {
 	make install UNIX_BIN=${D}usr/bin BINDIR=${D}usr/bin \
-		PREFIX=${D}usr INST_DIR=${D}usr/${P} \
+		PREFIX=${D}usr INST_DIR=${D}usr/grass62 \
 		|| die "Error: make install failed!"
-	sed -i "s:^GISBASE=.*$:GISBASE=/usr/${P}:" \
+
+	sed -i "s:^GISBASE=.*$:GISBASE=/usr/grass62:" \
 		${D}usr/bin/grass62 || die "Error: sed failed!"
 
+	# Grass Extension Manager conflicts with ruby gems
+	mv ${D}usr/bin/gem ${D}usr/grass62/bin/
+
 	einfo "Adding env.d entry for Grass6"
 	newenvd ${FILESDIR}/99${P} 99grass
 }