tcltk -> tk, acked by Flameeyes.

Package-Manager: portage-2.1.2_pre2-r3

3 files changed, 15 insertions, 22 deletions

diff --git a/dev-lang/ruby/ChangeLog b/dev-lang/ruby/ChangeLog
index d220b30c22e9..49571fb3e437 100644
--- a/dev-lang/ruby/ChangeLog
+++ b/dev-lang/ruby/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/ruby
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.220 2006/09/28 13:03:12 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ChangeLog,v 1.221 2006/10/05 13:01:10 exg Exp $
+
+  05 Oct 2006; Emanuele Giaquinta <exg@gentoo.org> ruby-1.8.5.ebuild:
+  tcltk -> tk, acked by Flameeyes.
 
   28 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> ruby-1.8.5.ebuild:
   Stable on sparc wrt security #142038
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index 3a5f80bb7201..151ac7b55b1c 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX oniguruma-2.3.1-gentoo.patch 593 RMD160 73fb0ae1e006bbd2ad6a9b6fcdd5398207a4a21f SHA1 a512797b26b023d6fc8d38f70598d90c7b248bce SHA256 cb976a2907e29d25b23fc3e8db18b40f65fbde1f22b6c511cd6cf57f4bca08b3
 MD5 be89d4c412387337e14a1d141b90b125 files/oniguruma-2.3.1-gentoo.patch 593
 RMD160 73fb0ae1e006bbd2ad6a9b6fcdd5398207a4a21f files/oniguruma-2.3.1-gentoo.patch 593
@@ -25,14 +22,14 @@ EBUILD ruby-1.8.4-r3.ebuild 4060 RMD160 4fda296b24a17b570b1d6425cf646a037b2726b6
 MD5 93f6df13c4a0bb969eaf536ecb795aef ruby-1.8.4-r3.ebuild 4060
 RMD160 4fda296b24a17b570b1d6425cf646a037b2726b6 ruby-1.8.4-r3.ebuild 4060
 SHA256 eb5588bcb1fcefc803915c6235a8f15a7ad2d5aaa279df88542975ee81fc850a ruby-1.8.4-r3.ebuild 4060
-EBUILD ruby-1.8.5.ebuild 3951 RMD160 d6b5a83a8c05f54d453165ee55f52850bac5edf5 SHA1 17fca7e2811b2f029d36e73c0ad1ecd2a1760880 SHA256 61d280c9acfabf772144d62776d1b43f5985d98f3b6dfe7f3f61e137b5b31b66
-MD5 f148f42abde4b29eb2a5353623864ea7 ruby-1.8.5.ebuild 3951
-RMD160 d6b5a83a8c05f54d453165ee55f52850bac5edf5 ruby-1.8.5.ebuild 3951
-SHA256 61d280c9acfabf772144d62776d1b43f5985d98f3b6dfe7f3f61e137b5b31b66 ruby-1.8.5.ebuild 3951
-MISC ChangeLog 31794 RMD160 4d166c91ed8b982c9ca53d2cdfa877aa73d04205 SHA1 8b02fe6cef8890230f5d8df3f1f7ed0fc26115c2 SHA256 6b98691872ee288d4f8a90b5b8e373ce59bf4e9a569d7f988fbfd884b175b6a0
-MD5 183e49fca9d901bba3779c20d3d86ea9 ChangeLog 31794
-RMD160 4d166c91ed8b982c9ca53d2cdfa877aa73d04205 ChangeLog 31794
-SHA256 6b98691872ee288d4f8a90b5b8e373ce59bf4e9a569d7f988fbfd884b175b6a0 ChangeLog 31794
+EBUILD ruby-1.8.5.ebuild 3942 RMD160 7c9683b77f9b777aeace1a0349d3ffb39d2c7e8a SHA1 d2960cc487f4e830e3aebbe66f52dd7794288fa2 SHA256 8bf77eb4d1c7a673e7327bb545e83e2cfeddda89496b50e69f77c9bf64f595a3
+MD5 9b3fdc793fe7594ca237cd87bf4a80e3 ruby-1.8.5.ebuild 3942
+RMD160 7c9683b77f9b777aeace1a0349d3ffb39d2c7e8a ruby-1.8.5.ebuild 3942
+SHA256 8bf77eb4d1c7a673e7327bb545e83e2cfeddda89496b50e69f77c9bf64f595a3 ruby-1.8.5.ebuild 3942
+MISC ChangeLog 31895 RMD160 81de8bec380c457a4c0fd46db726f4b1d697afc1 SHA1 3cf4e3cb8e82173bc389d457ee00f7c895fbe71c SHA256 04f7e4b8522f8a2996c5be07891396b015bf4320f037d62e3a4e9ecf5f3b6733
+MD5 36135e3b069ed023a117265e734dd9ec ChangeLog 31895
+RMD160 81de8bec380c457a4c0fd46db726f4b1d697afc1 ChangeLog 31895
+SHA256 04f7e4b8522f8a2996c5be07891396b015bf4320f037d62e3a4e9ecf5f3b6733 ChangeLog 31895
 MISC metadata.xml 157 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 SHA1 8ce15dcc608eeb5616aeec610dc695cbe6f93e02 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c
 MD5 3eec9f3fe48b51f49dbc1f171a3b026f metadata.xml 157
 RMD160 5d9e2c7ecba96ffebd936d38acedf859cdea84e1 metadata.xml 157
@@ -46,10 +43,3 @@ SHA256 f9a1f94eb7aaa8da1e8ac2e65220ac6ea865b6c0b2dc0e1c8ecdfb4fca699b4a files/di
 MD5 86b5d06a5da72078a1755ad84cf57d56 files/digest-ruby-1.8.5 467
 RMD160 094acdf2c1878e06040137dd5f14a790116dccbd files/digest-ruby-1.8.5 467
 SHA256 7c362e231f229a4afbd81fc401069c1411f7833a9b56122c3b3acd9d9de71eee files/digest-ruby-1.8.5 467
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFHrzDamhnQswr0vIRAvcSAJ9XUZe/SEiNIy0fkS/cq0Scbhfy2QCggJKy
-IdFeL9u68UwZ7PA6uKRH3Cc=
-=rhOv
------END PGP SIGNATURE-----
diff --git a/dev-lang/ruby/ruby-1.8.5.ebuild b/dev-lang/ruby/ruby-1.8.5.ebuild
index 50a5fe4354f9..0386e360de3b 100644
--- a/dev-lang/ruby/ruby-1.8.5.ebuild
+++ b/dev-lang/ruby/ruby-1.8.5.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/dev-lang/ruby/ruby-1.8.5.ebuild,v 1.11 2006/09/30 18:51:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.5.ebuild,v 1.12 2006/10/05 13:01:10 exg Exp $
 
 ONIGURUMA="onigd2_5_4"
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.ruby-lang.org/pub/ruby/${P}.tar.gz
 LICENSE="Ruby"
 SLOT="1.8"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc-macos ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="debug socks5 tcltk cjk doc threads examples ipv6"
+IUSE="debug socks5 tk cjk doc threads examples ipv6"
 RESTRICT="confcache"
 
 RDEPEND="virtual/libc
@@ -22,7 +22,7 @@ RDEPEND="virtual/libc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
 	socks5? ( >=net-proxy/dante-1.1.13 )
-	tcltk? ( dev-lang/tk )
+	tk? ( dev-lang/tk )
 	>=dev-ruby/ruby-config-0.3
 	!=dev-lang/ruby-cvs-1.8*
 	!dev-ruby/rdoc