fixed bash configure error, made modular X compliant, stable bump for amd64

Package-Manager: portage-2.1_rc1-r3

8 files changed, 75 insertions, 53 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/Manifest b/sci-geosciences/grass/Manifest
index 0c08148e8d54..3d91447a66f7 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,54 +1,44 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 99grass-6 100 RMD160 e62ea08a12a22039fbe8fb396e011fd9b769ff2f SHA1 8ef4acdbb4330b64a51e7b8304f9c68fce17c438 SHA256 dce426f95d7be7f7deae328537ad8666d4ff140dc6de0bb65495f23ad1a5e8f8 size 100
 MD5 f41ae1ddcca30e1eeea2a74100f36ba4 files/99grass-6 100
 RMD160 e62ea08a12a22039fbe8fb396e011fd9b769ff2f files/99grass-6 100
 SHA256 dce426f95d7be7f7deae328537ad8666d4ff140dc6de0bb65495f23ad1a5e8f8 files/99grass-6 100
-DIST grass-5.0.2_src.tar.gz 24511826 size 24511826
-DIST grass-5.4.0.tar.gz 20487737 size 20487737
-DIST grass-6.0.1.tar.gz 8508427 size 8508427
+DIST grass-5.0.2_src.tar.gz 24511826 RMD160 1e31439de8972e7fe6741b8017524714ac6183aa SHA256 3a198311fef40693bb63aca03ca23c76c197acc8abc5c8bdaa74d5cafa0f6b93 size 24511826
+DIST grass-5.4.0.tar.gz 20487737 RMD160 76821edeff55e72ffad0fa5db275dca2221660a5 SHA256 ac4cc3f1408750d7f9d54ea2155b7e8960041337d4e4d3662bffb41cb9899537 size 20487737
+DIST grass-6.0.1.tar.gz 8508427 RMD160 35cc84ecb593ddc83f78d41985d1ffe9db060295 SHA256 53127007260bf2181e711fa0520636ff497bd0c3406c16a1002945b1c4415340 size 8508427
 DIST grass-6.0.2.tar.gz 8640862 RMD160 64a251c9fe9ae0920e86c0fba7e3081eb0b83fc3 SHA256 dabe7315be1147b40f148a93add29dd405725aca39f366f31826b17230f8437b size 8640862
 EBUILD grass-5.0.2.ebuild 2666 RMD160 c1b33151a98c8ab25d955c8a029e3650b72ca92e SHA1 e1fd47036936d0137a5eef2fa0a42c2c8b564e4a SHA256 ebb95565645a88ddfb78520eca500e46f8d2d56751ba266187ad8198da845ef2 size 2666
 MD5 cafde681f19fe6665a059a58a29e6d11 grass-5.0.2.ebuild 2666
 RMD160 c1b33151a98c8ab25d955c8a029e3650b72ca92e grass-5.0.2.ebuild 2666
 SHA256 ebb95565645a88ddfb78520eca500e46f8d2d56751ba266187ad8198da845ef2 grass-5.0.2.ebuild 2666
-EBUILD grass-5.4.0.ebuild 2769 RMD160 9a05326a801e49d70e07c73a84b7a7c9a2479a9b SHA1 d880440c669c13ab6a8858cd1f1a2079679ee041 SHA256 dbf4b16b24e44a8954026a8d93de2a9468c39657d753d71dd9f1f66a0e6f158e size 2769
-MD5 daad53b4bfe4d462e81874c4c3254ba1 grass-5.4.0.ebuild 2769
-RMD160 9a05326a801e49d70e07c73a84b7a7c9a2479a9b grass-5.4.0.ebuild 2769
-SHA256 dbf4b16b24e44a8954026a8d93de2a9468c39657d753d71dd9f1f66a0e6f158e grass-5.4.0.ebuild 2769
-EBUILD grass-6.0.1.ebuild 3502 RMD160 d9dc7375e335ee3cec584c6900a31bf2fed0f10a SHA1 21b00f1f65745ac0d132c2275cfbc170a8c61c6d SHA256 9acad8e6caa62d4acc6974a9773c8a4e2b426b17b20f97c07a25c2e89b0cd5a1 size 3502
-MD5 6f6feedc890aac848470c3a3445947f6 grass-6.0.1.ebuild 3502
-RMD160 d9dc7375e335ee3cec584c6900a31bf2fed0f10a grass-6.0.1.ebuild 3502
-SHA256 9acad8e6caa62d4acc6974a9773c8a4e2b426b17b20f97c07a25c2e89b0cd5a1 grass-6.0.1.ebuild 3502
-EBUILD grass-6.0.2.ebuild 3433 RMD160 887028a10bfa918d74d84d97e60109b5f3e66399 SHA1 a10483c67710648b92f07b758ee85d3b3d1de80a SHA256 4f970ec58dad12077e9c44fc7d4e4906f9199c4ac561d7f5c0f98a8a1c042b3b size 3433
-MD5 3c539098850dd8f2872e4d027c4b63f5 grass-6.0.2.ebuild 3433
-RMD160 887028a10bfa918d74d84d97e60109b5f3e66399 grass-6.0.2.ebuild 3433
-SHA256 4f970ec58dad12077e9c44fc7d4e4906f9199c4ac561d7f5c0f98a8a1c042b3b grass-6.0.2.ebuild 3433
-MISC ChangeLog 4590 RMD160 2282d7b689551b5719fefd54959da5f7788ce8c5 SHA1 20d94fda29c951690da0056f388f66e431a64ab0 SHA256 0484f5c25e65842d98f6838181f572286a859c5d41799d99d80184a840b3a2d1 size 4590
-MD5 bee05367fca8433c9c874bf97f04dd48 ChangeLog 4590
-RMD160 2282d7b689551b5719fefd54959da5f7788ce8c5 ChangeLog 4590
-SHA256 0484f5c25e65842d98f6838181f572286a859c5d41799d99d80184a840b3a2d1 ChangeLog 4590
+EBUILD grass-5.4.0.ebuild 3187 RMD160 6a02ef2437c142b45965379dd4a3d9907430e7ef SHA1 4ed91fa7300c369cbadb1267ce020f8cddbe40f2 SHA256 b5e9bc4896c5ded92d8b4ec9c4076243f5b41bdb4ee3525ed22b5b3176da19da size 3187
+MD5 98b0beffc9a92233afd2a6e06f3980eb grass-5.4.0.ebuild 3187
+RMD160 6a02ef2437c142b45965379dd4a3d9907430e7ef grass-5.4.0.ebuild 3187
+SHA256 b5e9bc4896c5ded92d8b4ec9c4076243f5b41bdb4ee3525ed22b5b3176da19da grass-5.4.0.ebuild 3187
+EBUILD grass-6.0.1.ebuild 3488 RMD160 afe22e145a474aabcce3bb97ea7ac97f822aa894 SHA1 788b882986aa8532a5d34b858a1e6181be7fab77 SHA256 17d369eb466a20e28e95b27cad00ddcffb0895693d9559f8be0bd1d6dff2ab3a size 3488
+MD5 8fa3bd0a973a655a9aedb1f5c7ee8c79 grass-6.0.1.ebuild 3488
+RMD160 afe22e145a474aabcce3bb97ea7ac97f822aa894 grass-6.0.1.ebuild 3488
+SHA256 17d369eb466a20e28e95b27cad00ddcffb0895693d9559f8be0bd1d6dff2ab3a grass-6.0.1.ebuild 3488
+EBUILD grass-6.0.2.ebuild 3420 RMD160 83acbbbb9b0eeb42f3f642efa8ab35e89510cd2d SHA1 0bef366d48c8f34949584e9b54995289bb5d5786 SHA256 173f34a70e8ae0d1cf64287eaf199f3985d0677c9c966acbc9f2cba2cc36e691 size 3420
+MD5 6762280ef0a33e4a7897940c13754dd2 grass-6.0.2.ebuild 3420
+RMD160 83acbbbb9b0eeb42f3f642efa8ab35e89510cd2d grass-6.0.2.ebuild 3420
+SHA256 173f34a70e8ae0d1cf64287eaf199f3985d0677c9c966acbc9f2cba2cc36e691 grass-6.0.2.ebuild 3420
+MISC ChangeLog 4829 RMD160 6593c9d1c0cebb13e1398a157314ef0ec8edb51d SHA1 a943bb64afcfb1ebe97dece1b2a6ce4779c43b50 SHA256 6ef456e8ab9631ac1e6bf2c4048a290bd10511e0682e40cdbb93d64bd24de6b1 size 4829
+MD5 f28609e898fe52be66fe347fa2523daa ChangeLog 4829
+RMD160 6593c9d1c0cebb13e1398a157314ef0ec8edb51d ChangeLog 4829
+SHA256 6ef456e8ab9631ac1e6bf2c4048a290bd10511e0682e40cdbb93d64bd24de6b1 ChangeLog 4829
 MISC metadata.xml 480 RMD160 bbaed2145b0a160795114ae2b9b254cbdedae480 SHA1 925566bf5b1ad122a0420f668b803a137abbd272 SHA256 da3919f4adbc99a2833fbd43f3986a7a389eb469dd2a4fe03b690373e1f5e048 size 480
 MD5 e3525ea07aea3bae2424110708012cd1 metadata.xml 480
 RMD160 bbaed2145b0a160795114ae2b9b254cbdedae480 metadata.xml 480
 SHA256 da3919f4adbc99a2833fbd43f3986a7a389eb469dd2a4fe03b690373e1f5e048 metadata.xml 480
-MD5 bdf9112abfe51ff3b2cd0547318640df files/digest-grass-5.0.2 69
-RMD160 f611ce7fe84cba829ad5a44e51bfeaaf1304d19a files/digest-grass-5.0.2 69
-SHA256 fae4faae61b0e9a8b1c4d3bea57b36a8a25ff16501c0b770841a4a0f2a0f882a files/digest-grass-5.0.2 69
-MD5 3856d089c392313ea91a67cb000a90a9 files/digest-grass-5.4.0 65
-RMD160 78106b2a53336a74eda55cb43f05bd5f1ec57ffe files/digest-grass-5.4.0 65
-SHA256 635cd0b0f4ca4d3c6cd455a9acd50b49e438bf58d0a292d0e46a5bda370f2983 files/digest-grass-5.4.0 65
-MD5 1c66247c142863956c87662a927bf828 files/digest-grass-6.0.1 64
-RMD160 fa76b80c704923cb5de5a7fe50f1627cbd615a2c files/digest-grass-6.0.1 64
-SHA256 a6f0cc573230f918e9f384c64711e2cece48aa737a847c765175c11c51908bf8 files/digest-grass-6.0.1 64
+MD5 fe21ca362f7c715fc0866cbb555bb799 files/digest-grass-5.0.2 253
+RMD160 99bed2ee500e8f5414af9194f8deb0177f401f22 files/digest-grass-5.0.2 253
+SHA256 41dd49630ea62bc5b3e08cedefd639963dfe0c205fbfd8657bceeeeb19d84059 files/digest-grass-5.0.2 253
+MD5 9afc7067ee42af39d149c5614b18dfee files/digest-grass-5.4.0 241
+RMD160 db217fb6e54054be59916e7b35b27ab8a07cff5a files/digest-grass-5.4.0 241
+SHA256 2a33429a8c21883ad4eebce6548896ff304d292d1e0b66b863c936978fdbce9f files/digest-grass-5.4.0 241
+MD5 2a6b8167e8ead329a2dc3f2371d5ca90 files/digest-grass-6.0.1 238
+RMD160 e3423f590b4400168daff513e2b42c1403ec0265 files/digest-grass-6.0.1 238
+SHA256 50f9fc1916ee615d2490f1a84ed0321970f39c3664820724950a718becf63fa4 files/digest-grass-6.0.1 238
 MD5 e66c229df06d3688329f85a424c1e1ff files/digest-grass-6.0.2 238
 RMD160 bf3ba19f561ae1797a385f9aac5f729f833e2fb0 files/digest-grass-6.0.2 238
 SHA256 9ca2a9fab8f3a80cbcb6bd4fa6fe6b8dfc22ea9e0270303bacf0fddc3d3babec files/digest-grass-6.0.2 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEaRqfCRZPokWLroQRAql3AKCtKFgZl35ywP+AklClSog9ONJqKwCfUkc3
-BTREz4Us035lxTgn9rnRyms=
-=s1EY
------END PGP SIGNATURE-----
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}