7 files changed, 47 insertions, 15 deletions
diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index d9b391de5eed..8faf7a3e49ee 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.17 2006/05/16 00:19:32 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.18 2006/05/27 21:33:38 nerdboy Exp $
+
+  27 May 2006; Steve Arnold <nerdboy@gentoo.org> grass-5.4.0.ebuild,
+  grass-6.0.1.ebuild, grass-6.0.2.ebuild:
+  Fixed bash configure error, made modular X compliant (5.4.0), and
+  cleaned up some loose ends (also stable bump for amd64).
 
   16 May 2006; Mark Loeser <halcy0n@gentoo.org> grass-5.4.0.ebuild:
   Fix depend syntax; bug #133006
diff --git a/sci-geosciences/grass/files/digest-grass-5.0.2 b/sci-geosciences/grass/files/digest-grass-5.0.2
index e9d51e8aeddb..23877e197e41 100644
--- a/sci-geosciences/grass/files/digest-grass-5.0.2
+++ b/sci-geosciences/grass/files/digest-grass-5.0.2
@@ -1 +1,3 @@
 MD5 20b2dc4eff13b2d0abca1b44d2b22310 grass-5.0.2_src.tar.gz 24511826
+RMD160 1e31439de8972e7fe6741b8017524714ac6183aa grass-5.0.2_src.tar.gz 24511826
+SHA256 3a198311fef40693bb63aca03ca23c76c197acc8abc5c8bdaa74d5cafa0f6b93 grass-5.0.2_src.tar.gz 24511826
diff --git a/sci-geosciences/grass/files/digest-grass-5.4.0 b/sci-geosciences/grass/files/digest-grass-5.4.0
index c17d35eec691..5daf9d722f98 100644
--- a/sci-geosciences/grass/files/digest-grass-5.4.0
+++ b/sci-geosciences/grass/files/digest-grass-5.4.0
@@ -1 +1,3 @@
 MD5 4faeb8cd6d9070f78a03fd5aed95f9a0 grass-5.4.0.tar.gz 20487737
+RMD160 76821edeff55e72ffad0fa5db275dca2221660a5 grass-5.4.0.tar.gz 20487737
+SHA256 ac4cc3f1408750d7f9d54ea2155b7e8960041337d4e4d3662bffb41cb9899537 grass-5.4.0.tar.gz 20487737
diff --git a/sci-geosciences/grass/files/digest-grass-6.0.1 b/sci-geosciences/grass/files/digest-grass-6.0.1
index 893dc107212c..e758d2ca0d34 100644
--- a/sci-geosciences/grass/files/digest-grass-6.0.1
+++ b/sci-geosciences/grass/files/digest-grass-6.0.1
@@ -1 +1,3 @@
 MD5 5225e816895d5e6b28bca623f76acaad grass-6.0.1.tar.gz 8508427
+RMD160 35cc84ecb593ddc83f78d41985d1ffe9db060295 grass-6.0.1.tar.gz 8508427
+SHA256 53127007260bf2181e711fa0520636ff497bd0c3406c16a1002945b1c4415340 grass-6.0.1.tar.gz 8508427
diff --git a/sci-geosciences/grass/grass-5.4.0.ebuild b/sci-geosciences/grass/grass-5.4.0.ebuild
index 5cdce59a6e50..a8b0126ba554 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
 # 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.4 2006/05/16 00:19:32 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-5.4.0.ebuild,v 1.5 2006/05/27 21:33:38 nerdboy Exp $
 
 inherit eutils toolchain-funcs
 
@@ -12,10 +12,10 @@ SRC_URI="http://grass.itc.it/grass54/source/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~amd64 sparc"
+KEYWORDS="x86 amd64 sparc"
 IUSE="tcltk png jpeg tiff postgres odbc motif gdal mysql blas lapack X fftw truetype nls opengl"
 
-DEPEND=">=sys-devel/make-3.80
+RDEPEND=">=sys-devel/make-3.80
 	>=sys-libs/zlib-1.1.4
 	>=sys-devel/flex-2.5.4a
 	>=sys-devel/bison-1.35
@@ -34,12 +34,37 @@ DEPEND=">=sys-devel/make-3.80
 	mysql? ( dev-db/mysql )
 	odbc? ( >=dev-db/unixODBC-2.0.6 )
 	postgres? ( >=dev-db/postgresql-7.3 )
+	nls? ( x11-terms/mlterm )
 	tcltk? ( >=dev-lang/tcl-8.3.4
 		>=dev-lang/tk-8.3.4 )
 	truetype? ( >=media-libs/freetype-2.0.0 )
 	motif? ( x11-libs/openmotif )
-	X? ( || ( x11-libs/libX11 virtual/x11 ) )
-	nls? ( x11-terms/mlterm )"
+	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 )
+	virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	X? ( || (
+	    ( x11-proto/xproto x11-proto/xextproto )
+	        virtual/x11
+	    )
+	)"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	einfo "Patching configure..."
+	sed -i -e "s:relid':relid:g" configure || die "sed blew chunks"
+}
 
 src_compile() {
 	MYCONF="--prefix=${D}usr --host=${CHOST} --infodir=${D}usr/share/info \
diff --git a/sci-geosciences/grass/grass-6.0.1.ebuild b/sci-geosciences/grass/grass-6.0.1.ebuild
index 67f4f9c84168..b7786385e21a 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
 # 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.3 2006/03/18 22:28:45 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.0.1.ebuild,v 1.4 2006/05/27 21:33:38 nerdboy Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://grass.itc.it/grass60/source/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="6"
-KEYWORDS="~amd64 ~ppc sparc x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 # To-do: get ppc64 gdal deps fixed up
 
 # add gdal back to use flags once grass is fixed
@@ -58,13 +58,11 @@ RDEPEND=">=sys-devel/make-3.80
 	)"
 
 DEPEND="${RDEPEND}
-	X? ( || (
+	|| (
 	    ( x11-proto/xproto x11-proto/xextproto )
 	        virtual/x11
-	    )
 	)"
 
-
 src_unpack() {
 	unpack ${A}
 
diff --git a/sci-geosciences/grass/grass-6.0.2.ebuild b/sci-geosciences/grass/grass-6.0.2.ebuild
index 8f04585c82ac..6725c56e9b24 100644
--- a/sci-geosciences/grass/grass-6.0.2.ebuild
+++ b/sci-geosciences/grass/grass-6.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.0.2.ebuild,v 1.2 2006/03/19 18:34:07 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.0.2.ebuild,v 1.3 2006/05/27 21:33:38 nerdboy Exp $
 
 inherit eutils
 
@@ -58,13 +58,11 @@ RDEPEND=">=sys-devel/make-3.80
 	)"
 
 DEPEND="${RDEPEND}
-	X? ( || (
+	|| (
 	    ( x11-proto/xproto x11-proto/xextproto )
 	        virtual/x11
-	    )
 	)"
 
-
 src_unpack() {
 	unpack ${A}