--- /usr/portage/dev-lang/ruby/ruby-1.8.6_p287-r5.ebuild	2009-02-23 18:35:28.000000000 +0000
+++ /usr/portage/dev-lang/ruby/ruby-1.8.6_p287-r6.ebuild	2009-02-24 11:52:11.000000000 +0000
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-lang/ruby/ruby-1.8.6_p287-r5.ebuild,v 1.5 2009/02/23 18:11:29 ranger Exp $
 
+EAPI="2"
+
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
@@ -28,7 +30,7 @@
 	gdbm? ( sys-libs/gdbm )
 	ssl? ( dev-libs/openssl )
 	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? ( dev-lang/tk )
+	tk? ( dev-lang/tk[threads=] )
 	>=dev-ruby/ruby-config-0.3.1
 	!=dev-lang/ruby-cvs-${SLOT}*
 	!dev-ruby/rdoc
@@ -39,19 +41,6 @@
 
 PROVIDE="virtual/ruby"
 
-pkg_setup() {
-	if use tk && ! (use threads == built_with_use dev-lang/tk threads) ; then
-		eerror
-		eerror "You have Tk support enabled."
-		eerror
-		eerror "Ruby and Tk need the same 'threads' USE flag settings."
-		eerror "Either change the USE flag on dev-lang/ruby or on dev-lang/tk"
-		eerror "and recompile tk."
-
-		die "threads USE flag mismatch"
-	fi
-}
-
 src_unpack() {
 	unpack ${A}