fixed modular X deps (one last time)

Package-Manager: portage-2.1_rc2-r3

3 files changed, 25 insertions, 21 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 8faf7a3e49ee..d7e08b02b3d8 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,9 @@
 # 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.18 2006/05/27 21:33:38 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.19 2006/05/29 00:48:47 nerdboy Exp $
+
+  29 May 2006; Steve Arnold <nerdboy@gentoo.org> grass-5.4.0.ebuild:
+  fixed modular X deps (one last time)
 
   27 May 2006; Steve Arnold <nerdboy@gentoo.org> grass-5.4.0.ebuild,
   grass-6.0.1.ebuild, grass-6.0.2.ebuild:
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 3d91447a66f7..d9c03759d840 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,32 +1,32 @@
-AUX 99grass-6 100 RMD160 e62ea08a12a22039fbe8fb396e011fd9b769ff2f SHA1 8ef4acdbb4330b64a51e7b8304f9c68fce17c438 SHA256 dce426f95d7be7f7deae328537ad8666d4ff140dc6de0bb65495f23ad1a5e8f8 size 100
+AUX 99grass-6 100 RMD160 e62ea08a12a22039fbe8fb396e011fd9b769ff2f SHA1 8ef4acdbb4330b64a51e7b8304f9c68fce17c438 SHA256 dce426f95d7be7f7deae328537ad8666d4ff140dc6de0bb65495f23ad1a5e8f8
 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 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
+DIST grass-5.0.2_src.tar.gz 24511826 RMD160 1e31439de8972e7fe6741b8017524714ac6183aa SHA1 60ab79de510e9156105f5e68903ed2517b231926 SHA256 3a198311fef40693bb63aca03ca23c76c197acc8abc5c8bdaa74d5cafa0f6b93
+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.0.2.tar.gz 8640862 RMD160 64a251c9fe9ae0920e86c0fba7e3081eb0b83fc3 SHA1 cc04474026b39d80cde6143c30de3c3adea262f9 SHA256 dabe7315be1147b40f148a93add29dd405725aca39f366f31826b17230f8437b
+EBUILD grass-5.0.2.ebuild 2666 RMD160 c1b33151a98c8ab25d955c8a029e3650b72ca92e SHA1 e1fd47036936d0137a5eef2fa0a42c2c8b564e4a SHA256 ebb95565645a88ddfb78520eca500e46f8d2d56751ba266187ad8198da845ef2
 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 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
+EBUILD grass-5.4.0.ebuild 3192 RMD160 d534f1a08108008ac6a9b697d56e25e329193182 SHA1 bb4e7f71e15f964347ec35f7bbf5226d463062ab SHA256 9d34b9cf0f6eb7069002f9206c4a1a4eedf0ab94ffa99cccf71cc069aedc1fa4
+MD5 132611c2b4f5db4347207f2b6333fa8a grass-5.4.0.ebuild 3192
+RMD160 d534f1a08108008ac6a9b697d56e25e329193182 grass-5.4.0.ebuild 3192
+SHA256 9d34b9cf0f6eb7069002f9206c4a1a4eedf0ab94ffa99cccf71cc069aedc1fa4 grass-5.4.0.ebuild 3192
+EBUILD grass-6.0.1.ebuild 3488 RMD160 afe22e145a474aabcce3bb97ea7ac97f822aa894 SHA1 788b882986aa8532a5d34b858a1e6181be7fab77 SHA256 17d369eb466a20e28e95b27cad00ddcffb0895693d9559f8be0bd1d6dff2ab3a
 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
+EBUILD grass-6.0.2.ebuild 3420 RMD160 83acbbbb9b0eeb42f3f642efa8ab35e89510cd2d SHA1 0bef366d48c8f34949584e9b54995289bb5d5786 SHA256 173f34a70e8ae0d1cf64287eaf199f3985d0677c9c966acbc9f2cba2cc36e691
 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
+MISC ChangeLog 4938 RMD160 78584cd1e00f7ad876971f43c15c27a5763ba151 SHA1 aa94e9101c3d848ed26e28fc4da01dc499ab9c49 SHA256 eaceefd7197928f5071b6a078c84afcee38173bbf42d270b2b6ebcb5858c141a
+MD5 53a52a4e055982edc4d8e67e38f7a822 ChangeLog 4938
+RMD160 78584cd1e00f7ad876971f43c15c27a5763ba151 ChangeLog 4938
+SHA256 eaceefd7197928f5071b6a078c84afcee38173bbf42d270b2b6ebcb5858c141a ChangeLog 4938
+MISC metadata.xml 480 RMD160 bbaed2145b0a160795114ae2b9b254cbdedae480 SHA1 925566bf5b1ad122a0420f668b803a137abbd272 SHA256 da3919f4adbc99a2833fbd43f3986a7a389eb469dd2a4fe03b690373e1f5e048
 MD5 e3525ea07aea3bae2424110708012cd1 metadata.xml 480
 RMD160 bbaed2145b0a160795114ae2b9b254cbdedae480 metadata.xml 480
 SHA256 da3919f4adbc99a2833fbd43f3986a7a389eb469dd2a4fe03b690373e1f5e048 metadata.xml 480
diff --git a/sci-geosciences/grass/grass-5.4.0.ebuild b/sci-geosciences/grass/grass-5.4.0.ebuild
index a8b0126ba554..12d028127dce 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.5 2006/05/27 21:33:38 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-5.4.0.ebuild,v 1.6 2006/05/29 00:48:47 nerdboy Exp $
 
 inherit eutils toolchain-funcs
 
@@ -39,7 +39,7 @@ RDEPEND=">=sys-devel/make-3.80
 		>=dev-lang/tk-8.3.4 )
 	truetype? ( >=media-libs/freetype-2.0.0 )
 	motif? ( x11-libs/openmotif )
-	X? || (
+	X? ( || (
 	    ( x11-libs/libXmu
 	    x11-libs/libXext
 	    x11-libs/libXp
@@ -49,7 +49,8 @@ RDEPEND=">=sys-devel/make-3.80
 	    x11-libs/libICE
 	    x11-libs/libXpm
 	    x11-libs/libXaw )
-	virtual/x11 )"
+	virtual/x11 )
+	)"
 
 DEPEND="${RDEPEND}
 	X? ( || (