moved from USE flag tcltk to tk, see bug 17808

Package-Manager: portage-2.1.2.2

3 files changed, 31 insertions, 29 deletions

diff --git a/sci-geosciences/grass/ChangeLog b/sci-geosciences/grass/ChangeLog
index 63ed4c104fe5..ee9e18015bab 100644
--- a/sci-geosciences/grass/ChangeLog
+++ b/sci-geosciences/grass/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-geosciences/grass
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.33 2007/03/13 00:32:26 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.34 2007/04/15 22:43:39 opfer Exp $
+
+  15 Apr 2007; Christian Faulhammer <opfer@gentoo.org> grass-5.4.0.ebuild:
+  moved from USE flag tcltk to tk, see bug 17808
 
   13 Mar 2007; Danny van Dyk <kugelfang@gentoo.org> grass-6.2.0-r1.ebuild:
   QA: which -> type -P
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index be5aa6631109..6080bf98f121 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -20,10 +20,10 @@ SHA256 492475975bb08f5b24f6c043a8bdfce32a1b22b5432127223dfe36e1ba66057c files/gr
 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
-EBUILD grass-5.4.0.ebuild 3192 RMD160 08dac7c025c92c4a7eeae3a3e7f7f2f7a6ca50a9 SHA1 3afce67353e8c597eacbc16e7ef4c3016befc267 SHA256 d21ac808cf821a4f4bd7580429e003386fc6f02a304d36b9706ac2c2d9168630
-MD5 119bb03a015ee0166a60fa6cb7e4b0c9 grass-5.4.0.ebuild 3192
-RMD160 08dac7c025c92c4a7eeae3a3e7f7f2f7a6ca50a9 grass-5.4.0.ebuild 3192
-SHA256 d21ac808cf821a4f4bd7580429e003386fc6f02a304d36b9706ac2c2d9168630 grass-5.4.0.ebuild 3192
+EBUILD grass-5.4.0.ebuild 3129 RMD160 e7a3abd231c1661838823092d9c8423f2c5d12d1 SHA1 7b1434922f5593b7285546585dc8e826a7f2c539 SHA256 92074a1fa92de18b3cc303f59ccd19f41565b38256831d4343eb8dc7c0a9c2ba
+MD5 aa8ae4a2ebb20bdb195b2c6baf0d5418 grass-5.4.0.ebuild 3129
+RMD160 e7a3abd231c1661838823092d9c8423f2c5d12d1 grass-5.4.0.ebuild 3129
+SHA256 92074a1fa92de18b3cc303f59ccd19f41565b38256831d4343eb8dc7c0a9c2ba grass-5.4.0.ebuild 3129
 EBUILD grass-6.0.1.ebuild 3413 RMD160 af2b7e41630ad14d87b435c1b4bcab476f0f3a19 SHA1 355f70428f9eed7113b96ff33e89a9e33e4b074c SHA256 d2785eac93d52501d4842fef3fdbd6a3cf8ef427eb8dc06c5cc2f5f90b117286
 MD5 800daabbb4546fbda5c6552e74c83dd6 grass-6.0.1.ebuild 3413
 RMD160 af2b7e41630ad14d87b435c1b4bcab476f0f3a19 grass-6.0.1.ebuild 3413
@@ -32,10 +32,10 @@ EBUILD grass-6.2.0-r1.ebuild 5486 RMD160 34a84424a0c53c435b56469a2221cc86abb2cf9
 MD5 8b8dabf3c3b1d0169288c02518ac0964 grass-6.2.0-r1.ebuild 5486
 RMD160 34a84424a0c53c435b56469a2221cc86abb2cf9d grass-6.2.0-r1.ebuild 5486
 SHA256 aaaf1691be91c672af6f163667d4306f992ff54efd78df2eb657a6cd4586afde grass-6.2.0-r1.ebuild 5486
-MISC ChangeLog 7162 RMD160 fca20d2ebdc4f7b4e4a6a15df0158ee9755eafac SHA1 3ab0b0c7717d73753baa039d78dc3b965197dcd6 SHA256 cff6cbef7bfeb4f5985d44273bd03f4578e1064f0df38f950ef1cc9a9aae2205
-MD5 589915287bab69d2ed9e1279a4263488 ChangeLog 7162
-RMD160 fca20d2ebdc4f7b4e4a6a15df0158ee9755eafac ChangeLog 7162
-SHA256 cff6cbef7bfeb4f5985d44273bd03f4578e1064f0df38f950ef1cc9a9aae2205 ChangeLog 7162
+MISC ChangeLog 7283 RMD160 2cbbbe48e21adf869eb6aee792d20f99cfa41b57 SHA1 da6b4bc4e2d4daf6cde5c5c81cd3e4b9d805a295 SHA256 a34d4b3388a1a582c5ecdb00285ba53cde0fb1b4c03cd8c5093c5c5852c04902
+MD5 d0a030642c88001f0052690311223484 ChangeLog 7283
+RMD160 2cbbbe48e21adf869eb6aee792d20f99cfa41b57 ChangeLog 7283
+SHA256 a34d4b3388a1a582c5ecdb00285ba53cde0fb1b4c03cd8c5093c5c5852c04902 ChangeLog 7283
 MISC metadata.xml 492 RMD160 03cf12a529c5443dffc366017b997d183a2bcf3b SHA1 bd8657499f8b6cb3b232684afd63c3b5d915ba5e SHA256 976d5771ed6fbabbeba026b0394186b7735135deb79c86aa9388fc5134467e8e
 MD5 efddef8657f71e6240e2d838ebf178d1 metadata.xml 492
 RMD160 03cf12a529c5443dffc366017b997d183a2bcf3b metadata.xml 492
@@ -50,9 +50,9 @@ MD5 74a5fc63e9fc9b7b327e0858baa19367 files/digest-grass-6.2.0-r1 241
 RMD160 a64da970229d571841614cb1097bd6c7dcc608aa files/digest-grass-6.2.0-r1 241
 SHA256 1e1ab91d1ef68251fd0784aa3e9ada0962ed1123bb11fe0dc931aa924ad4c045 files/digest-grass-6.2.0-r1 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFF9fE55mJXAu5GbtIRAgytAJ0dHomcYqlGfxhUpLY9uheHWNILKACdGUzb
-U62zMEvqFnO9cd1t87HUPnI=
-=YC6k
+iD8DBQFGIqqhNQqtfCuFneMRAme/AJ9r3DE6fbHzzzLkKRbgghIorOUWtwCdGHH4
+8SYiyMUNdYZUKWDSLpXKg2E=
+=ZcN4
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/grass/grass-5.4.0.ebuild b/sci-geosciences/grass/grass-5.4.0.ebuild
index a798ba1d3e34..d4cb4319669f 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-2007 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.9 2007/01/29 01:57:03 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-5.4.0.ebuild,v 1.10 2007/04/15 22:43:39 opfer Exp $
 
 inherit eutils toolchain-funcs
 
@@ -35,28 +35,27 @@ RDEPEND=">=sys-devel/make-3.80
 	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 )
+	tk? ( >=dev-lang/tk-8.3.4 )
 	truetype? ( >=media-libs/freetype-2.0.0 )
 	motif? ( x11-libs/openmotif )
 	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 )
+		( 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
-	    )
+		( x11-proto/xproto x11-proto/xextproto )
+			virtual/x11
+		)
 	)"
 
 src_unpack() {
@@ -93,7 +92,7 @@ src_compile() {
 	../configure ${MYCONF} \
 		`use_with X` \
 		`use_with readline` \
-		`use_with tcltk` \
+		`use_with tk tcltk` \
 		`use_with postgres` \
 		`use_with motif` \
 		`use_with blas` \