updated patch and configure options for minimal no-X install

(Portage version: 2.1.3_rc6)

3 files changed, 53 insertions, 8 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index ca095b3d428d..3f8a29a239fa 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,14 @@
 # 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.40 2007/06/02 15:52:51 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.41 2007/07/01 23:19:00 nerdboy Exp $
+
+  01 Jul 2007; Steve Arnold <nerdboy@gentoo.org>
+  +files/grass-6.2.1-html-nonviz.patch, grass-6.2.1.ebuild:
+  Updated patch and configure options for minimal no-X install (at least
+  it builds on a server and works in a console).
+  
+  Compile with the following USE flags turned off:
+  -opengl -glw -motif -tcl -tk -X
 
   02 Jun 2007; nixnut <nixnut@gentoo.org> grass-6.2.0-r1.ebuild:
   Stable on ppc wrt bug 179150
diff --git a/sci-geosciences/grass/files/grass-6.2.1-html-nonviz.patch b/sci-geosciences/grass/files/grass-6.2.1-html-nonviz.patch
new file mode 100644
index 000000000000..194673562a7a
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.2.1-html-nonviz.patch
@@ -0,0 +1,33 @@
+--- tools/build_html_index.sh.orig	2007-07-01 09:47:50.000000000 -0700
++++ tools/build_html_index.sh	2007-07-01 09:52:47.000000000 -0700
+@@ -129,10 +129,10 @@
+ 
+ #copy over CSS:
+ cp -f grassdocs.css $HTMLDIR/
+-cp -f grassdocs.css $HTMLDIR/nviz/
++#cp -f grassdocs.css $HTMLDIR/nviz/
+ #copy over GRASS logo:
+ cp -f grass.smlogo.gif $HTMLDIR/
+-cp -f grass.smlogo.gif $HTMLDIR/nviz/
++#cp -f grass.smlogo.gif $HTMLDIR/nviz/
+ #copy over GEM docs:
+ mkdir -p $HTMLDIR/gem
+ cp -f $GEMDIR/docs/GEM-Manual/*.html $HTMLDIR/gem/
+@@ -163,7 +163,7 @@
+ 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;<a href=\"gis.m.html\">gis.m</a> </td><td>GUI frontend to GIS menus and display</td></tr>" >> $FULLINDEX
+-echo "<tr><td>&nbsp;&nbsp;<a href=\"nviz.html\">nviz</a> </td><td>visualization suite</td></tr>" >> $FULLINDEX
++#echo "<tr><td>&nbsp;&nbsp;<a href=\"nviz.html\">nviz</a> </td><td>visualization suite</td></tr>" >> $FULLINDEX
+ echo "<tr><td>&nbsp;&nbsp;<a href=\"xganim.html\">xganim</a> </td><td>raster map slideshow</td></tr>" >> $FULLINDEX
+ echo "</table>" >> $FULLINDEX
+ echo "<p>" >> $FULLINDEX
+@@ -245,7 +245,7 @@
+ 
+ #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-6.2.1.ebuild b/sci-geosciences/grass/grass-6.2.1.ebuild
index d6e2a5433527..659b20d7a604 100644
--- a/sci-geosciences/grass/grass-6.2.1.ebuild
+++ b/sci-geosciences/grass/grass-6.2.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2007/05/19 22:13:14 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.1.ebuild,v 1.2 2007/07/01 23:19:00 nerdboy Exp $
 
 inherit eutils autotools
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 # To-do: get ppc64 gdal deps fixed up
 
 IUSE="ffmpeg fftw glw gmath jpeg largefile motif mysql nls odbc opengl png
-postgres python readline sqlite tcl tk tiff truetype"
+postgres python readline sqlite tcl tk tiff truetype X"
 
 RESTRICT="nostrip"
 
@@ -49,7 +49,7 @@ RDEPEND=">=sys-devel/make-3.80
 	tk? ( >=dev-lang/tk-8.4 )
 	tiff? ( >=media-libs/tiff-3.5.7 )
 	truetype? ( >=media-libs/freetype-2.0 )
-	|| (
+	X? ( || (
 	    ( x11-libs/libXmu
 	    x11-libs/libXext
 	    x11-libs/libXp
@@ -59,12 +59,14 @@ RDEPEND=">=sys-devel/make-3.80
 	    x11-libs/libICE
 	    x11-libs/libXpm
 	    x11-libs/libXaw )
-	virtual/x11 )"
+	virtual/x11 )
+	)"
 
 DEPEND="${RDEPEND}
-	|| (
+	X? ( || (
 	    ( x11-proto/xproto x11-proto/xextproto )
-	        virtual/x11 )"
+	        virtual/x11 )
+	)"
 
 src_unpack() {
 	if use glw && ! use opengl; then
@@ -143,6 +145,7 @@ src_compile() {
 	    fi
 	else
 	    epatch ${FILESDIR}/${P}-html-nonviz.patch
+	    myconf="${myconf} --without-opengl --without-glw"
 	fi
 
 	if use sqlite; then
@@ -153,7 +156,7 @@ src_compile() {
 	fi
 
 	export LD_LIBRARY_PATH="/${WORKDIR}/image/usr/${P}/$(get_libdir):${LD_LIBRARY_PATH}"
-	econf ${myconf} \
+	econf ${myconf} --with-libs=/usr/$(get_libdir) \
 		$(use_enable amd64 64bit) \
 		$(use_with fftw) \
 		$(use_with gmath blas) \
@@ -172,6 +175,7 @@ src_compile() {
 	# patch missing math functions
 	sed -i 's:EXTRA_LIBS=:EXTRA_LIBS=-lm :g' ${S}/lib/gmath/Makefile
 	sed -i 's:EXTRA_LIBS = :EXTRA_LIBS = -lm :g' ${S}/lib/gis/Makefile
+
 	emake -j1 || die "Error: emake failed!"
 }