added latest release with wxpython gui support, QA fixes, etc

Package-Manager: portage-2.1.5.5

9 files changed, 361 insertions, 38 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 7c8ded134a43..8edfbd84d1b6 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,18 @@
 # 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.57 2008/05/21 19:01:32 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.58 2008/06/24 07:45:51 nerdboy Exp $
+
+*grass-6.3.0 (24 Jun 2008)
+
+  24 Jun 2008; Steve Arnold <nerdboy@gentoo.org>
+  +files/grass-6.3.0-html-nonviz.patch, grass-5.4.0.ebuild,
+  grass-6.0.1.ebuild, grass-6.2.0-r1.ebuild, grass-6.2.1.ebuild,
+  grass-6.2.3.ebuild, +grass-6.3.0.ebuild:
+  Added latest release with wxpython gui support and tested with gcc 4.3.1
+  (see bugs #223639 and #217917).  Now includes multiple ffmpeg dirctories
+  so sing out if you know of a better way...  Also fixed more QA warnings
+  in older versions.
+
 
   21 May 2008; Tiziano Müller <dev-zero@gentoo.org> grass-5.4.0.ebuild,
   grass-6.0.1.ebuild, grass-6.2.0-r1.ebuild, grass-6.2.1.ebuild,
@@ -24,7 +36,7 @@
   04 May 2008; Steve Arnold <nerdboy@gentoo.org> grass-6.2.3.ebuild:
   Updated for changed include path in latest ffmpeg.  Still needs testing,
   but it builds and runs; so far I've only found avcodec included in the
-  source.
+  source for Grass 6.2.3.
 
 *grass-6.2.3 (01 May 2008)
 
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 297cb09b7e29..46109f5bc1f0 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -6,16 +6,19 @@ AUX grass-6.2.1-html-nonviz.patch 1742 RMD160 39103490f48abcc53f1fb8f3d9df489108
 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-6.3.0-html-nonviz.patch 763 RMD160 054b336fcc47d64e56a40d2dda955732047ceb08 SHA1 e8f10078f8cccc5a47d2f2c8bed1d9ace7ed2598 SHA256 e870d724170a9d629a5d0bb8897a2e2f5d1b25eed204a7450061f26d48192981
 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 3098 RMD160 430307beb5622058e45b41de0c3571a5e2f520fb SHA1 8367c803536e0da06583a75e530e928423140222 SHA256 e7879a6400a443dabd121a711cf316bc3423068872f51805916bdcbc8809648b
-EBUILD grass-6.0.1.ebuild 3186 RMD160 697241bab9648cbdd1211830a7c390a9c7346b99 SHA1 b20962d4cc31c97a521c1fe32eabd11c900ed376 SHA256 b1fcadf5e98bc8dd52e2aa643e9514bb1eb58d4bd6136782e568eff231a2b3be
-EBUILD grass-6.2.0-r1.ebuild 5422 RMD160 01e132a6cc7b1d712d7d52a15069bb7ab37bf540 SHA1 33e4e15f8fa91206648e85fd1738897b4e3bb707 SHA256 1afe7be667f3d18ecc753ce9b827f91a4274bf9fbcccbf1c851340c7137d067e
-EBUILD grass-6.2.1.ebuild 6423 RMD160 f9efca733c0981e527f9fa1f97236c5a21f968e0 SHA1 b0103e88e66eec19dec1de0d34f5e90425758a1d SHA256 bffd2a8dec0753f920a1ad4bf16b43b01e992a234f35442d29b3144e3fb287fa
-EBUILD grass-6.2.3.ebuild 7095 RMD160 094caca283699289090d987771376057bf743c4f SHA1 80c4a6fce0f21f93b941a04363a8f4937115f827 SHA256 8addbe3b5ee7cdc7130508139fc899ca6c70f8b61e0d49785c1e5d59d61eef43
-MISC ChangeLog 11747 RMD160 4932c2adb6250bff9bb94a668813a181e2ec3521 SHA1 9be48804b12589ffb9fbed15e39c2151d4b6a6b8 SHA256 886344779c8a6bb538f81f396d9b228b7cb9d374ae9b0ea6212d7ff589825a2f
+DIST grass-6.3.0.tar.gz 17688547 RMD160 66db4223fc0d5172371903f71d68f1dd024ad2d2 SHA1 c4b0b1407655f8ed1e16e911df191323fe00eb9e SHA256 a84658a7065a3ece09d3d18a3b601515484d1e5dbb3a92b8fbac3c37e368acf4
+EBUILD grass-5.4.0.ebuild 3097 RMD160 885b7eabdad5fa912b7120b8a571d5b59c9f3971 SHA1 72b35ffc88f218afb14055e94eb8573713d67bb9 SHA256 d93cbad8dea7f99c74979abfc5a86292dffa76e8e3477c5cbc8a7cdf7cf33d21
+EBUILD grass-6.0.1.ebuild 3185 RMD160 9861427db9a4a846941eacd6d8f35cb057460d1b SHA1 79ef31f94dcb9bf8d7a3a89563867b291509173b SHA256 8ce6c6abd8359c2d736d491998d2d93720c89834a7e5f935c954b26af31781be
+EBUILD grass-6.2.0-r1.ebuild 5419 RMD160 7a9792d9d38a52d78b3bab5ff4211d8bb210eee1 SHA1 e986e71631714428b3fd612dd1d5e70d5a0d9099 SHA256 5f78e8e6d19c4799b164d042c2ece9b526cfbd3f5625634cf712b91a0865e7d1
+EBUILD grass-6.2.1.ebuild 6420 RMD160 0fbcae5f446155b505e930ac4758a2add499612e SHA1 b18c248cac64dfbce9989dbb96f0213b89c54bd8 SHA256 9c83ac4e7547017357eb1847bc84bc5fcd4878c58a1d53093c3c3ace3de8806c
+EBUILD grass-6.2.3.ebuild 7038 RMD160 eebcb453c8a431301cdf38c5d66d6c6a7404aec4 SHA1 013334b4273588de4f5a48bee14de9ca402ce49e SHA256 355fc4e430fd528ae22a13323d476e76733ead35b353ed398f1b67de99cbde7b
+EBUILD grass-6.3.0.ebuild 8297 RMD160 5c3da2c6aa5b5dacbcc3cd091c70958c1ef6bcd5 SHA1 55017a394f9e1d8db6b08bf64b0c97cb394a1716 SHA256 5266b57fa706ec527de0d9049e087fcdee5b62768d65640d29bb9cacdab93d08
+MISC ChangeLog 12254 RMD160 07ce3467fb4b167bec695d9d13649f81ed3c98f5 SHA1 810fba504196debe306af31fb6f2a47791900ce0 SHA256 8270411ed61e544d7fde6548fff5c4ca049dc2a3c7485260422c23c6502b800b
 MISC metadata.xml 492 RMD160 03cf12a529c5443dffc366017b997d183a2bcf3b SHA1 bd8657499f8b6cb3b232684afd63c3b5d915ba5e SHA256 976d5771ed6fbabbeba026b0394186b7735135deb79c86aa9388fc5134467e8e
diff --git a/sci-geosciences/grass/files/grass-6.3.0-html-nonviz.patch b/sci-geosciences/grass/files/grass-6.3.0-html-nonviz.patch
new file mode 100644
index 000000000000..47c2633a657e
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-6.3.0-html-nonviz.patch
@@ -0,0 +1,14 @@
+--- tools/build_html_index.sh.orig	2008-04-16 10:21:15.000000000 +0200
++++ tools/build_html_index.sh	2008-04-16 10:23:52.000000000 +0200
+@@ -141 +141 @@
+-cp -f grassdocs.css $HTMLDIR/nviz/
++#cp -f grassdocs.css $HTMLDIR/nviz/
+@@ -145 +145 @@
+-cp -f grass_logo.png $HTMLDIR/nviz/
++#cp -f grass_logo.png $HTMLDIR/nviz/
+@@ -182 +182 @@
+-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
+@@ -262 +262 @@
+-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
diff --git a/sci-geosciences/grass/grass-5.4.0.ebuild b/sci-geosciences/grass/grass-5.4.0.ebuild
index 5fb0d35fb63f..fcba86174e20 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-2008 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.14 2008/05/21 19:01:32 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-5.4.0.ebuild,v 1.15 2008/06/24 07:45:51 nerdboy Exp $
 
 inherit eutils toolchain-funcs
 
@@ -15,13 +15,9 @@ SLOT="0"
 KEYWORDS="amd64 sparc x86"
 IUSE="tk png jpeg tiff postgres odbc motif gdal mysql blas lapack X fftw truetype nls opengl"
 
-RDEPEND=">=sys-devel/make-3.80
-	>=sys-libs/zlib-1.1.4
-	>=sys-devel/flex-2.5.4a
-	>=sys-devel/bison-1.35
+RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-libs/ncurses-5.3
 	>=sys-libs/gdbm-1.8.0
-	>=sys-devel/gcc-3.2.2
 	virtual/man
 	>=sci-libs/proj-4.4.7
 	blas? ( virtual/blas )
@@ -51,6 +47,10 @@ RDEPEND=">=sys-devel/make-3.80
 	)"
 
 DEPEND="${RDEPEND}
+	>=sys-devel/make-3.80
+	>=sys-devel/flex-2.5.4a
+	>=sys-devel/bison-1.35
+	>=sys-devel/gcc-3.2.2
 	X? (
 		x11-proto/xproto
 		x11-proto/xextproto
diff --git a/sci-geosciences/grass/grass-6.0.1.ebuild b/sci-geosciences/grass/grass-6.0.1.ebuild
index 9894a8c39622..0807f7b2dc28 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-2008 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.17 2008/05/21 19:01:32 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.0.1.ebuild,v 1.18 2008/06/24 07:45:51 nerdboy Exp $
 
 inherit eutils
 
@@ -20,13 +20,9 @@ IUSE="fftw jpeg motif mysql nls odbc opengl png postgres readline tk tiff truety
 
 RESTRICT="strip"
 
-RDEPEND=">=sys-devel/make-3.80
-	>=sys-libs/zlib-1.1.4
-	>=sys-devel/flex-2.5.4a
-	>=sys-devel/bison-1.35
+RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-libs/ncurses-5.3
 	>=sys-libs/gdbm-1.8.0
-	>=sys-devel/gcc-3.2.2
 	virtual/man
 	>=sci-libs/proj-4.4.7
 	sci-libs/gdal
@@ -54,6 +50,10 @@ RDEPEND=">=sys-devel/make-3.80
 	x11-libs/libXaw"
 
 DEPEND="${RDEPEND}
+	>=sys-devel/make-3.80
+	>=sys-devel/flex-2.5.4a
+	>=sys-devel/bison-1.35
+	>=sys-devel/gcc-3.2.2
 	x11-proto/xproto
 	x11-proto/xextproto"
 
diff --git a/sci-geosciences/grass/grass-6.2.0-r1.ebuild b/sci-geosciences/grass/grass-6.2.0-r1.ebuild
index 12699e65802b..0ddf1871ee2a 100644
--- a/sci-geosciences/grass/grass-6.2.0-r1.ebuild
+++ b/sci-geosciences/grass/grass-6.2.0-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.0-r1.ebuild,v 1.11 2008/05/21 19:01:32 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.0-r1.ebuild,v 1.12 2008/06/24 07:45:51 nerdboy Exp $
 
-inherit eutils autotools
+inherit eutils libtool
 
 DESCRIPTION="An open-source GIS with raster and vector functionality"
 HOMEPAGE="http://grass.itc.it/"
@@ -18,13 +18,9 @@ postgres python readline sqlite tcl tk tiff truetype"
 
 RESTRICT="strip"
 
-RDEPEND=">=sys-devel/make-3.80
-	>=sys-libs/zlib-1.1.4
-	>=sys-devel/flex-2.5.4a
-	>=sys-devel/bison-1.35
+RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-libs/ncurses-5.3
 	>=sys-libs/gdbm-1.8.0
-	>=sys-devel/gcc-3.2.2
 	|| (
 	    sys-apps/man
 	    sys-apps/man-db )
@@ -60,6 +56,10 @@ RDEPEND=">=sys-devel/make-3.80
 	x11-libs/libXaw"
 
 DEPEND="${RDEPEND}
+	>=sys-devel/make-3.80
+	>=sys-devel/flex-2.5.4a
+	>=sys-devel/bison-1.35
+	>=sys-devel/gcc-3.2.2
 	x11-proto/xproto
 	x11-proto/xextproto"
 
diff --git a/sci-geosciences/grass/grass-6.2.1.ebuild b/sci-geosciences/grass/grass-6.2.1.ebuild
index fa0c34ff1704..0bfd518099f5 100644
--- a/sci-geosciences/grass/grass-6.2.1.ebuild
+++ b/sci-geosciences/grass/grass-6.2.1.ebuild
@@ -1,8 +1,8 @@
 # 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.ebuild,v 1.11 2008/05/21 19:01:32 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.1.ebuild,v 1.12 2008/06/24 07:45:50 nerdboy Exp $
 
-inherit eutils autotools
+inherit eutils libtool
 
 DESCRIPTION="An open-source GIS with raster and vector functionality, as well as 3D vizualization."
 HOMEPAGE="http://grass.itc.it/"
@@ -18,13 +18,9 @@ postgres python readline sqlite tcl tk tiff truetype X"
 
 RESTRICT="strip"
 
-RDEPEND=">=sys-devel/make-3.80
-	>=sys-libs/zlib-1.1.4
-	>=sys-devel/flex-2.5.4a
-	>=sys-devel/bison-1.35
+RDEPEND=">=sys-libs/zlib-1.1.4
 	>=sys-libs/ncurses-5.3
 	>=sys-libs/gdbm-1.8.0
-	>=sys-devel/gcc-3.2.2
 	|| (
 	    sys-apps/man
 	    sys-apps/man-db )
@@ -62,6 +58,10 @@ RDEPEND=">=sys-devel/make-3.80
 	)"
 
 DEPEND="${RDEPEND}
+	>=sys-devel/make-3.80
+	>=sys-devel/flex-2.5.4a
+	>=sys-devel/bison-1.35
+	>=sys-devel/gcc-3.2.2
 	X? (
 		x11-proto/xproto
 		x11-proto/xextproto
diff --git a/sci-geosciences/grass/grass-6.2.3.ebuild b/sci-geosciences/grass/grass-6.2.3.ebuild
index 33dce87a5d7d..90f34aca7b90 100644
--- a/sci-geosciences/grass/grass-6.2.3.ebuild
+++ b/sci-geosciences/grass/grass-6.2.3.ebuild
@@ -1,8 +1,8 @@
 # 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.3.ebuild,v 1.7 2008/05/21 19:01:32 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.3.ebuild,v 1.8 2008/06/24 07:45:51 nerdboy Exp $
 
-inherit eutils autotools fdo-mime versionator
+inherit eutils fdo-mime versionator
 
 MY_PV=$(get_version_component_range 1-2 ${PV})
 MY_PVM=$(delete_all_version_separators ${MY_PV})
@@ -61,10 +61,8 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	)"
 
 DEPEND="${RDEPEND}
-	>=sys-devel/make-3.80
 	>=sys-devel/flex-2.5.4a
 	>=sys-devel/bison-1.35
-	>=sys-devel/gcc-3.2.2
 	X? (
 		x11-proto/xproto
 		x11-proto/xextproto
diff --git a/sci-geosciences/grass/grass-6.3.0.ebuild b/sci-geosciences/grass/grass-6.3.0.ebuild
new file mode 100644
index 000000000000..d073cb9fd910
--- /dev/null
+++ b/sci-geosciences/grass/grass-6.3.0.ebuild
@@ -0,0 +1,296 @@
+# 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.3.0.ebuild,v 1.1 2008/06/24 07:45:51 nerdboy Exp $
+
+inherit eutils distutils fdo-mime versionator wxwidgets
+
+MY_PV=$(get_version_component_range 1-2 ${PV})
+MY_PVM=$(delete_all_version_separators ${MY_PV})
+MY_PM=${PN}${MY_PVM}
+
+DESCRIPTION="An open-source GIS with raster and vector functionality, as well as 3D vizualization."
+HOMEPAGE="http://grass.itc.it/"
+SRC_URI="http://grass.itc.it/${MY_PM}/source/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="ffmpeg fftw glw gmath jpeg largefile mysql nls odbc opengl png \
+postgres python readline sqlite tiff truetype wxwindows X"
+
+RESTRICT="strip"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	>=sys-libs/ncurses-5.3
+	>=sys-libs/gdbm-1.8.0
+	|| (
+	    sys-apps/man
+	    sys-apps/man-db )
+	sci-libs/gdal
+	>=sci-libs/proj-4.4.7
+	ffmpeg? ( media-video/ffmpeg )
+	fftw? ( sci-libs/fftw )
+	gmath? ( virtual/blas
+	    virtual/lapack )
+	jpeg? ( media-libs/jpeg )
+	mysql? ( dev-db/mysql )
+	odbc? ( >=dev-db/unixODBC-2.0.6 )
+	opengl? ( ( virtual/opengl )
+	    ( x11-libs/openmotif )
+	    glw? ( media-libs/mesa ) )
+	png? ( >=media-libs/libpng-1.2.2 )
+	postgres? ( >=dev-db/postgresql-7.3 )
+	python? ( dev-lang/python )
+	readline? ( sys-libs/readline )
+	sqlite? ( dev-db/sqlite )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	truetype? ( >=media-libs/freetype-2.0 )
+	wxwindows? (
+		>=dev-python/wxpython-2.8.1.1
+		>=dev-lang/python-2.4
+	)
+	X? (
+		x11-libs/libXmu
+		x11-libs/libXext
+		x11-libs/libXp
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libSM
+		x11-libs/libICE
+		x11-libs/libXpm
+		x11-libs/libXaw
+		>=dev-lang/tcl-8.4
+		>=dev-lang/tk-8.4
+	)"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.4a
+	>=sys-devel/bison-1.35
+	wxwindows? ( >=dev-lang/swig-1.3.31 )
+	X? (
+		x11-proto/xproto
+		x11-proto/xextproto
+	)"
+
+pkg_setup() {
+	local myblas
+	elog ""
+	elog "This version enables the experimental wxpython interface, which"
+	elog "you may want to try, since the legacy GUI seems a little wonky"
+	elog "in this version; just enable the wxwindows USE flag and build."
+	elog ""
+	if use gmath; then
+		for d in $(eselect lapack show); do myblas=${d}; done
+		if [[ -z "${myblas/reference/}" ]] && [[ -z "${myblas/atlas/}" ]]; then
+			ewarn "You need to set lapack to atlas or reference. Do:"
+			ewarn "   eselect lapack set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+		for d in $(eselect blas show); do myblas=${d}; done
+		if [[ -z "${myblas/reference/}" ]] && [[ -z "${myblas/atlas/}" ]]; then
+			ewarn "You need to set blas to atlas or reference. Do:"
+			ewarn "   eselect blas set <impl>"
+			ewarn "where <impl> is atlas, threaded-atlas or reference"
+			die "setup failed"
+		fi
+	fi
+
+	if use glw && ! use opengl; then
+		ewarn "You set USE='glw -opengl'. GLw support needs OpenGL."
+		ewarn "OpenGL support also requires X."
+		die "Set opengl and X useflags."
+	fi
+
+	if use glw && ! built_with_use media-libs/mesa motif; then
+		ewarn "GRASS GLw/OpenGL support needs mesa with motif headers."
+		ewarn "Please rebuild mesa with motif support."
+		die "Re-emerge mesa with motif."
+	fi
+
+	if use opengl && ! use X; then
+		ewarn "GRASS OpenGL support needs X (will also pull in Tcl/Tk)."
+		die "Please set the X useflag."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch rpm/fedora/grass-readline.patch
+
+	if use opengl; then
+	    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() {
+	local myconf
+	use python || use wxindows && distutils_python_version
+
+	myconf="--prefix=/usr --with-cxx --enable-shared \
+		--with-gdal=$(type -P gdal-config) --with-curses --with-proj \
+		--with-includes=/usr/include --with-libs=/usr/$(get_libdir) \
+		--with-proj-includes=/usr/include \
+		--with-proj-libs=/usr/$(get_libdir) \
+		--with-proj-share=/usr/share/proj"
+
+	if use X; then
+	    if has_version ">=dev-lang/tcl-8.5"; then
+		TCL_LIBDIR="/usr/$(get_libdir)/tcl8.5"
+	    else
+		TCL_LIBDIR="/usr/$(get_libdir)/tcl8.4"
+	    fi
+	    myconf="${myconf} --with-tcltk --with-x \
+	        --with-tcltk-includes=/usr/include \
+		--with-tcltk-libs=${TCL_LIBDIR}"
+	    if use wxwindows; then
+		WX_GTK_VER=2.8
+		need-wxwidgets gtk2
+		LIBGDI="/usr/$(get_libdir)/python${PYVER}/site-packages/wx-2.8-gtk2-unicode/wx/_gdi_.so"
+		myconf="${myconf} --with-python --with-wxwidgets=${WX_CONFIG}"
+	    fi
+	else
+		myconf="${myconf} --without-tcltk --without-x"
+	fi
+
+	if use opengl; then
+	    myconf="${myconf} --with-opengl --with-opengl-libs=/usr/$(get_libdir)/opengl/xorg-x11/lib"
+	    if use glw; then
+		myconf="${myconf} --with-glw"
+	    fi
+	else
+	    myconf="${myconf} --without-opengl --without-glw"
+	fi
+
+	# Should handle either older or latest without intervention;
+	# this won't work forever, but it should be okay for a while...
+	if use ffmpeg; then
+	    myconf="${myconf} --with-ffmpeg \
+	        --with-ffmpeg-libs=/usr/$(get_libdir)"
+	    if has_version ">=media-video/ffmpeg-0.4.9_p20080326" ; then
+		# must pass multiple include dirs now; if you have a better
+		# way to do this, please speak up and file a bug :)
+	        myconf="${myconf} --with-ffmpeg-includes=/usr/include/libav*"
+	    else
+		myconf="${myconf} --with-ffmpeg-includes=/usr/include/ffmpeg"
+	    fi
+	else
+		myconf="${myconf} --without-ffmpeg"
+	fi
+
+	if use truetype; then
+		myconf="${myconf} --with-freetype \
+		    --with-freetype-includes=/usr/include/freetype2"
+	fi
+
+	if use mysql; then
+		myconf="${myconf} --with-mysql --with-mysql-includes=/usr/include/mysql \
+		    --with-mysql-libs=/usr/$(get_libdir)/mysql"
+	else
+		myconf="${myconf} --without-mysql"
+	fi
+
+	if use sqlite; then
+		myconf="${myconf} --with-sqlite --with-sqlite-includes=/usr/include \
+		    --with-sqlite-libs=/usr/$(get_libdir)"
+	else
+		myconf="${myconf} --without-sqlite"
+	fi
+
+	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) \
+		$(use_with nls) \
+		$(use_with odbc) \
+		$(use_with png) \
+		$(use_with postgres) \
+		$(use_with python) \
+		$(use_with readline) \
+		$(use_with tiff) || die "configure failed!"
+
+	if use wxwindows; then
+	    emake -j1
+	    ln -sf "${LIBGDI}" dist.x86_64-pc-linux-gnu/lib/libgdi.so \
+		|| die "making libgdi link failed"
+	    cd gui/wxpython/vdigit
+	    make default -j1 || die "make vdigit failed!"
+	else
+	    emake -j1 || die "make failed!"
+	fi
+}
+
+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!"
+
+	if use wxwindows; then
+	    ln -sf "${LIBGDI}" "${D}"usr/${MY_PM}/lib/libgdi.so \
+		|| die "failed to find wx library"
+	fi
+
+	# get rid of DESTDIR in script path
+	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/
+
+	ebegin "Adding env.d and desktop entry for Grass6..."
+	    generate_files
+	    doenvd 99grass-6
+	    if use X; then
+		doicon "${FILESDIR}"/grass_icon.png
+		domenu ${MY_PM}-grass.desktop
+	    fi
+	eend ${?}
+}
+
+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() {
+	use X && fdo-mime_desktop_database_update
+}
+
+generate_files() {
+	local GUI="-gui"
+	use wxwindows && GUI="-wxpython"
+
+	cat <<-EOF > 99grass-6
+	GRASS_LD_LIBRARY_PATH="/usr/${MY_PM}/lib"
+	LDPATH="/usr/${MY_PM}/lib"
+	MANPATH="/usr/${MY_PM}/man"
+	GRASS_HOME="/usr/${MY_PM}"
+	EOF
+
+	cat <<-EOF > ${MY_PM}-grass.desktop
+	[Desktop Entry]
+	Encoding=UTF-8
+	Version=1.0
+	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} ${GUI}
+	Path=
+	Icon=grass_icon.png
+	Categories=Science;Education;
+	Terminal=true
+	EOF
+}