--- wvstreams-4.2.2-r1.ebuild.orig	2006-05-07 13:08:06.000000000 +0200
+++ wvstreams-4.2.2-r1.ebuild	2006-05-07 14:11:57.000000000 +0200
@@ -11,7 +11,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="gtk qt qdbm pam slp doc tcltk debug"
+IUSE="qt qdbm pam slp doc debug"
 
 RDEPEND=">=sys-libs/db-3
 	>=sys-libs/zlib-1.1.4
@@ -21,8 +21,7 @@
 	qdbm? ( dev-db/qdbm )
 	pam? ( >=sys-libs/pam-0.75 )
 	slp? ( >=net-libs/openslp-1.0.9a )
-	doc? ( app-doc/doxygen )
-	tcltk? ( >=dev-lang/tcl-8.4 dev-lang/swig )"
+	doc? ( app-doc/doxygen )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -35,10 +34,7 @@
 	epatch "${FILESDIR}/${P}-linux-serial.patch"
 	epatch "${FILESDIR}/${P}-wireless-user.patch"
 	epatch "${FILESDIR}/${P}-uniconfd-ini.patch"
-
-	if use tcltk; then
-		epatch "${FILESDIR}/${P}-tcl_8_4.patch"
-	fi
+	epatch "${FILESDIR}/${P}-as-needed.patch"
 
 	epatch "${FILESDIR}/${P}-external-xplc.patch"
 	local XPLC_VER=`best_version dev-libs/xplc`
@@ -51,14 +47,16 @@
 	use qt && epatch "${FILESDIR}/${P}-MOC-fix.patch"
 
 	ht_fix_file "${S}/configure.ac"
-}
 
-src_compile() {
-	env WANT_AUTOCONF=2.59 autoconf || die "autoconf failed" #needed by xplc and tcl patch
+	#needed by xplc and as-needed patch:
+	cd "${S}"
+	env WANT_AUTOCONF=2.59 autoconf || die "autoconf failed" 
 	#without following, the makefile would remove some files and request 
 	#you to run ./configure again
 	touch include/wvautoconf.h.in configure
+}
 
+src_compile() {
 	local myconf
 	if use qt; then
 		myconf="--with-qt=/usr/qt/3/"
@@ -70,8 +68,9 @@
 		`use_with qdbm` \
 		`use_with pam` \
 		`use_with slp openslp` \
-		`use_with tcltk tcl` \
 		`use_enable debug` \
+		--without-tcl \
+		--without-swig \
 		--with-xplc \
 		--enable-verbose \
 		--with-bdb \