updated for testing and stablizing; fixes bugs 217873 and 219764

Package-Manager: portage-2.1.5_rc6

5 files changed, 60 insertions, 45 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index be74e99e039b..eb5f4fc2667a 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.50 2008/03/22 03:52:38 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.51 2008/05/01 05:19:47 nerdboy Exp $
+
+*grass-6.2.3 (01 May 2008)
+
+  01 May 2008; Steve Arnold <nerdboy@gentoo.org>
+  +files/grass-6.2.3-html-nonviz.patch,
+  +files/grass-6.2.3-html-nviz-fix.patch, -grass-6.2.1-r1.ebuild,
+  +grass-6.2.3.ebuild:
+  Refined and updated for testing and stablizing; fixes bugs 217873 and 
+  219764.  Thanks to Martin von Gagern <Martin.vGagern@gmx.net> for the
+  updated patches and other suggestions.
 
   22 Mar 2008; Steve Arnold <nerdboy@gentoo.org> grass-6.2.1-r1.ebuild:
   Minor cleanup of desktop stuff and adding ~ppc64 keyword back (gdal
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 0615b441b142..696fcd6c50f4 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -4,15 +4,18 @@ AUX grass-6.2.0-html-nonviz.patch 1721 RMD160 ad57109c03792e8376ccbe2ed8ff459b85
 AUX grass-6.2.1-ffmpeg-fix.patch 816 RMD160 eaefa978b965e1b66d0efec6d3ba8a07d4515307 SHA1 322b5ed2089f5b94f74ba38924cde7fe2611918c SHA256 2cbdfe11078783cf5bc95a5f4baaa05769c0921025737d8afdcf638321b4b501
 AUX grass-6.2.1-html-nonviz.patch 1742 RMD160 39103490f48abcc53f1fb8f3d9df48910866fab6 SHA1 a98486fb4b21f5ef42084d37ec0e6addc655fdc2 SHA256 73b7661832230f5ea1dadf983d6ce723b2f87bd3bafc4e939f36f7620d764270
 AUX grass-6.2.1-html-nviz-fix.patch 592 RMD160 7935449babc7dd6a07cffad66513c404a266848f SHA1 653a049d80fba93968620f7dc4e0ec2bbfb8edba SHA256 df2bfefc4aa6ddb030eb4a809a3cc885ade69e526a0ec99cd31fe1b751e05c41
+AUX grass-6.2.3-html-nonviz.patch 505 RMD160 d16ac0549244f6b30773961f0618f72013714921 SHA1 de545193d16313467ceed9bc50964ed01b94fc07 SHA256 df37c9165d637611b7909c9e8da0a4149adb0773ed09650d0bd40fc095947da5
+AUX grass-6.2.3-html-nviz-fix.patch 287 RMD160 8e9d99abaef2c0b2f02395aaf48ecb5b53b3db5e SHA1 87ba9271d1b262076db2df6cc22a28cfa6196b1b SHA256 a45c6acf88cfe947d0526c4e436f4150cdb60becde4d0c14d2e88740d7ae3689
 AUX grass_icon.png 4470 RMD160 b4a6deeb6ce859a57c6aba3c4095e2dd718f36e9 SHA1 6839c28ec1d01c486d45a245a159fced3c0d0810 SHA256 c6c873f24bb59b8ff98000b500ca3a047ca86af216b4b7b1593baef5f2fbe6a9
 DIST grass-5.4.0.tar.gz 20487737 RMD160 76821edeff55e72ffad0fa5db275dca2221660a5 SHA1 3324bf8af1861c63d9d171577ffa7fb7e87582f1 SHA256 ac4cc3f1408750d7f9d54ea2155b7e8960041337d4e4d3662bffb41cb9899537
 DIST grass-6.0.1.tar.gz 8508427 RMD160 35cc84ecb593ddc83f78d41985d1ffe9db060295 SHA1 7faa22d1ac3e2272c12a82e284d2e3a8819b31ca SHA256 53127007260bf2181e711fa0520636ff497bd0c3406c16a1002945b1c4415340
 DIST grass-6.2.0.tar.gz 12534549 RMD160 0173e1c7cd3a13af9fe0d9e77101e5e216df7dac SHA1 ace7ddcd3219550dd7068948865d96ce5f16d289 SHA256 2246008c1baadbb35398b35d8d069bee60c23c780e1573c22ae947e3f5a451a8
 DIST grass-6.2.1.tar.gz 12599109 RMD160 ff885023b926ece6545591666fdaa1189facc8bc SHA1 bbd179b9145d735873a13f40a25784b64762387b SHA256 fb7a1030a51222b586f1fd4cbd6ee2c99a0974dba72c70032d336a6a30b073f9
+DIST grass-6.2.3.tar.gz 12978605 RMD160 f0148cda0ad596807b35655466770145047274d7 SHA1 ea5301f541cd05077f55fcc65ac19568b8e6fba5 SHA256 a172d233fcbfc7f2c2de01af1f6fc7828e46867785dcaf861cf87238775e4a61
 EBUILD grass-5.4.0.ebuild 3089 RMD160 0e18c66b2410d062a756df0c436535bad39f8e89 SHA1 7eedd6b18b41c288c761a89a621bc68a06bb02d5 SHA256 229a374a9dd9575008ae1507d2d57f89b838019c2b8cbf2ece035daabe436fe5
 EBUILD grass-6.0.1.ebuild 3177 RMD160 c1a168fd9008a3490a9ca040dd0c4fd752f7d635 SHA1 a9b6209a84d7a67011d903a8f86add1fa23ef1b9 SHA256 b613f5d646f83037ab2a08e151ec1d923a23eca634c0fc636e6bc57b87422434
 EBUILD grass-6.2.0-r1.ebuild 5413 RMD160 3db6698e2ae49bbc3c6dbf466edc9703c0ae1553 SHA1 67f3dca703f52ff948dcabfdc6037132c12521b0 SHA256 af65999cacb6d177b5acedd66b5e21f28cc593b6f2e24fce0a5ae36f310dca60
-EBUILD grass-6.2.1-r1.ebuild 7574 RMD160 23761d3b88089ad03466022ba7d07079b5259a12 SHA1 758b4d8bbfa6bb35473fa3ee8be8d3afb0d89e79 SHA256 e1490db75c4beaae77fcb0c5ab0fd148ec4cb824f7a94217adb6c6c4e6ea961d
 EBUILD grass-6.2.1.ebuild 6396 RMD160 afb5f82e82a0623a0e49e5ffc6914805631f58a4 SHA1 796d2bdee1fb50de7efb0d6d19042aedb7ef8565 SHA256 0922709646befaac7d8f7cb4e4efdc3b250bc4c9ab82f0ab1cc2d7bb63124d7a
-MISC ChangeLog 10285 RMD160 20d614d3be5bac1e223e157ee5d1e3e4d6bdec0d SHA1 bc12469618ee6552bc7647683911375470d293ad SHA256 03a14499f52ce16592a9596324e0976f53ba76e29043881acb2764513be3990c
+EBUILD grass-6.2.3.ebuild 6728 RMD160 d3753efcebe6cfaa7ca8d2fb8ed644dee001d11e SHA1 d766eabdf2583c237287f88c99af04afbb11b6ab SHA256 224e1c806aa58abdef9ba74fc6f1d26028b29d18889c25fa63f414d621594e09
+MISC ChangeLog 10678 RMD160 58d070b87b332c63affc80f31de9bf4b6b72502b SHA1 5b196de3788cc8b47d2fd02d2745eb0d8f34db24 SHA256 50103c3060811f4749447ba32e47017a15a7398e8160b02dbf9b7f377a96ece4
 MISC metadata.xml 492 RMD160 03cf12a529c5443dffc366017b997d183a2bcf3b SHA1 bd8657499f8b6cb3b232684afd63c3b5d915ba5e SHA256 976d5771ed6fbabbeba026b0394186b7735135deb79c86aa9388fc5134467e8e
diff --git a/sci-geosciences/grass/files/grass-6.2.3-html-nonviz.patch b/sci-geosciences/grass/files/grass-6.2.3-html-nonviz.patch
new file mode 100644
index 000000000000..19fb4942bba3
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.2.3-html-nonviz.patch
@@ -0,0 +1,10 @@
+--- tools/build_html_index.sh.orig	2007-11-02 10:50:14.000000000 +0100
++++ tools/build_html_index.sh	2008-04-16 00:16:08.000000000 +0200
+@@ -132 +131,0 @@
+-cp -f grassdocs.css $HTMLDIR/nviz/
+@@ -135 +133,0 @@
+-cp -f grass.smlogo.gif grass_logo.png $HTMLDIR/nviz/
+@@ -166 +163,0 @@
+-echo "<tr><td>&nbsp;&nbsp;<a href=\"nviz.html\">nviz</a> </td><td>visualization suite</td></tr>" >> $FULLINDEX
+@@ -248 +244,0 @@
+-echo "<li><a href=\"nviz.html\">nviz</a> visualization and animation tool</li>" >> $FILENAME
diff --git a/sci-geosciences/grass/files/grass-6.2.3-html-nviz-fix.patch b/sci-geosciences/grass/files/grass-6.2.3-html-nviz-fix.patch
new file mode 100644
index 000000000000..e46bcc1f9e09
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.2.3-html-nviz-fix.patch
@@ -0,0 +1,10 @@
+--- tools/build_html_index.sh.orig	2007-11-02 10:50:14.000000000 +0100
++++ tools/build_html_index.sh	2008-04-16 00:12:28.000000000 +0200
+@@ -127,6 +127,7 @@
+ 
+ ################
+ 
++mkdir -p $HTMLDIR/nviz
+ #copy over CSS:
+ cp -f grassdocs.css $HTMLDIR/
+ cp -f grassdocs.css $HTMLDIR/nviz/
diff --git a/sci-geosciences/grass/grass-6.2.1-r1.ebuild b/sci-geosciences/grass/grass-6.2.3.ebuild
index cd6007a311a2..032b752c6f89 100644
--- a/sci-geosciences/grass/grass-6.2.1-r1.ebuild
+++ b/sci-geosciences/grass/grass-6.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r1.ebuild,v 1.3 2008/03/22 04:48:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.3.ebuild,v 1.1 2008/05/01 05:19:47 nerdboy Exp $
 
 inherit eutils autotools fdo-mime versionator
 
@@ -70,7 +70,7 @@ DEPEND="${RDEPEND}
 		x11-proto/xextproto
 	)"
 
-src_unpack() {
+pkg_setup() {
 	local myblas
 	if use gmath; then
 		for d in $(eselect lapack show); do myblas=${d}; done
@@ -105,25 +105,23 @@ src_unpack() {
 		ewarn "GRASS OpenGL support needs X (will also pull in Tcl/Tk)."
 		die "Please set the X useflag."
 	fi
+}
 
-	if use X && built_with_use dev-lang/tcl threads; then
-		ewarn "GRASS nviz will not work with Tcl compiled with threads!"
-		ewarn "Please disable either opengl or tcl threads."
-		die "Emerge TCL without threads."
-	fi
-
-	if use X && built_with_use dev-lang/tk threads; then
-		ewarn "GRASS nviz will not work with Tk compiled with threads!"
-		ewarn "Please disable either opengl or tk threads."
-		die "Emerge tk without threads."
-	fi
-
+src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	use ffmpeg && epatch "${FILESDIR}"/${P}-ffmpeg-fix.patch
+
 	epatch rpm/fedora/grass-readline.patch
-	elibtoolize
-	elog "Grass Home is ${MY_PM}"
+
+	if use opengl; then
+	    epatch "${FILESDIR}"/${P}-html-nviz-fix.patch
+	else
+	    epatch "${FILESDIR}"/${P}-html-nonviz.patch
+	fi
+
+	# patch missing math functions (yes, this is still needed)
+	sed -i -e "s:\$(EXTRA_LIBS):\$(EXTRA_LIBS) \$(MATHLIB):g" include/Make/Shlib.make
+	echo "MATHLIB=-lm" >> include/Make/Rules.make
 }
 
 src_compile() {
@@ -144,13 +142,11 @@ src_compile() {
 	fi
 
 	if use opengl; then
-	    epatch "${FILESDIR}"/${P}-html-nviz-fix.patch
 	    myconf="${myconf} --with-opengl --with-opengl-libs=/usr/$(get_libdir)/opengl/xorg-x11/lib"
 	    if use glw; then
 		myconf="${myconf} --with-glw"
 	    fi
 	else
-	    epatch "${FILESDIR}"/${P}-html-nonviz.patch
 	    myconf="${myconf} --without-opengl --without-glw"
 	fi
 
@@ -183,6 +179,8 @@ src_compile() {
 	econf ${myconf} --with-libs=/usr/$(get_libdir) \
 		$(use_enable amd64 64bit) \
 		$(use_with fftw) \
+		$(use_with gmath blas) \
+		$(use_with gmath lapack) \
 		$(use_with jpeg) \
 		$(use_enable largefile) \
 		$(use_with opengl motif) \
@@ -193,20 +191,18 @@ src_compile() {
 		$(use_with python) \
 		$(use_with readline) \
 		$(use_with tiff) || die "configure failed!"
-	# patch missing math functions
-	sed -i -e "s:EXTRA_LIBS=:EXTRA_LIBS=-lm :g" "${S}"/lib/gmath/Makefile
-	sed -i -e "s:EXTRA_LIBS = :EXTRA_LIBS = -lm :g" "${S}"/lib/gis/Makefile
 
 	emake -j1 || die "emake failed!"
 }
 
 src_install() {
+	elog "Grass Home is ${MY_PM}"
 	make install UNIX_BIN="${D}"usr/bin BINDIR="${D}"usr/bin \
 		PREFIX="${D}"usr INST_DIR="${D}"usr/${MY_PM} \
 		|| die "make install failed!"
 
-	# This is now generated in the function below
-	rm "${D}"usr/bin/grass62
+	# 
+	sed -i -e "s@${D}@/@" "${D}"usr/bin/${MY_PM}
 
 	# Grass Extension Manager conflicts with ruby gems
 	mv "${D}"usr/bin/gem "${D}"usr/${MY_PM}/bin/
@@ -214,7 +210,6 @@ src_install() {
 	ebegin "Adding env.d and desktop entry for Grass6..."
 	    generate_files
 	    doenvd 99grass-6
-	    dobin ${MY_PM}.sh
 	    if use X; then
 		doicon "${FILESDIR}"/grass_icon.png
 		domenu ${MY_PM}-grass.desktop
@@ -224,6 +219,9 @@ src_install() {
 
 pkg_postinst() {
 	use X && fdo-mime_desktop_database_update
+
+	elog "Note this version re-enables support for threads in Tcl and Tk."
+	elog "Enable the threads USE flag and rebuild to try it."
 }
 
 pkg_postrm() {
@@ -238,22 +236,6 @@ generate_files() {
 	GRASS_HOME="/usr/${MY_PM}"
 	EOF
 
-	cat <<-EOF > grass62.sh
-	######################################################################
-	# MODULE:       GRASS Initialization
-	# AUTHOR(S):    Justin Hickey - Thailand - jhickey@hpcc.nectec.or.th
-	# COPYRIGHT:    (C) 2000-2005 by the GRASS Development Team
-	# This program is free software under the GNU General Public License
-	# (>=v2)
-	#
-	trap "echo 'User break!' ; exit" 2 3 9 15
-	#
-	# Set the GISBASE variable; all arguments are passed to Init.sh
-	GISBASE=/usr/${MY_PM}
-	export GISBASE
-	exec "\$GISBASE/etc/Init.sh" "\$@"
-	EOF
-
 	cat <<-EOF > ${MY_PM}-grass.desktop
 	[Desktop Entry]
 	Encoding=UTF-8
@@ -261,7 +243,7 @@ generate_files() {
 	Name=Grass ${PV}
 	Type=Application
 	Comment=GRASS Open Source GIS, derived from the original US Army Corps of Engineers project.
-	Exec=${TERM} -T Grass -e /usr/bin/${MY_PM}.sh -gui
+	Exec=${TERM} -T Grass -e /usr/bin/${MY_PM} -gui
 	Path=
 	Icon=grass_icon.png
 	Categories=Science;Education;