Integrated the new tcl-tk scheme. This hasn't been tested much, so people

using these applications, please try it out. I've done this to advance
the new scheme and start the testing of it. It's a good thing that tcl and
tk are seperated, and the earlier the better.

21 files changed, 24 insertions, 447 deletions

diff --git a/app-editors/vim/vim-6.0-r3.ebuild b/app-editors/vim/vim-6.0-r3.ebuild
index 5b8f499bb038..3d416ab7428b 100644
--- a/app-editors/vim/vim-6.0-r3.ebuild
+++ b/app-editors/vim/vim-6.0-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Authors Ben Beuchler <insyte@mazer.squad51.net> 
 #	  and Aron Griffis <agriffis@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.0-r3.ebuild,v 1.1 2002/01/06 22:32:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-6.0-r3.ebuild,v 1.2 2002/01/15 00:32:54 gbevin Exp $
 
 # Please name the ebuild as follows.  If this is followed, there
 # should be no need to modify this ebuild when the Vim version is
@@ -95,7 +95,7 @@ DEPEND="virtual/glibc
 		perl?	( sys-devel/perl )
 		python? ( dev-lang/python )
 		ruby?	( >=dev-lang/ruby-1.6.4 )"
-#		tcltk?	( dev-lang/tcl-tk )"
+#		tcltk?	( dev-lang/tcl )"
 # It appears that the tclinterp stuff in Vim is broken right now.
 # When you --enable-tclinterp flag, then the following command never
 # returns:
diff --git a/app-emulation/wine/wine-20010418.ebuild b/app-emulation/wine/wine-20010418.ebuild
index edb70fd9caed..b2749f88b29b 100644
--- a/app-emulation/wine/wine-20010418.ebuild
+++ b/app-emulation/wine/wine-20010418.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20010418.ebuild,v 1.5 2001/11/10 02:58:38 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20010418.ebuild,v 1.6 2002/01/15 00:32:54 gbevin Exp $
 
 WSV=0.5.1b
 S=${WORKDIR}/${P}
@@ -17,7 +17,7 @@ DEPEND="virtual/glibc
         opengl? ( virtual/opengl )"
 
 RDEPEND="${DEPEND}
-	 >=dev-lang/tcl-tk-8.4.2
+	 >=dev-lang/tk-8.4.2
 	 >=dev-tcltk/itcl-3.2"
 
 src_compile() {
diff --git a/dev-db/sqlite/sqlite-2.1.3-r1.ebuild b/dev-db/sqlite/sqlite-2.1.3-r1.ebuild
deleted file mode 100644
index c26789fcd15b..000000000000
--- a/dev-db/sqlite/sqlite-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.1.3-r1.ebuild,v 1.2 2002/01/13 23:50:19 azarah Exp $
-
-S=${WORKDIR}/sqlite
-DESCRIPTION="SQLite: An SQL Database Engine in a C Library."
-SRC_URI="http://www.hwaci.com/sw/sqlite/${P}.tar.gz"
-HOMEPAGE="http://www.hwaci.com/sw/sqlite/"
-
-DEPEND="virtual/glibc
-	dev-lang/tcl-tk"
-
-src_compile() {
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc || die
-		
-	emake || die
-	make doc || die
-}
-
-src_install () {
-	
-	dodir /usr/{bin,include,lib}
-	
-	make prefix=${D}/usr \
-	     mandir=${D}/usr/share/man \
-	     infodir=${D}/usr/share/info \
-	     sysconfdir=${D}/etc \
-	     install || die
-
-	dobin lemon
-
-	dodoc README VERSION 
-	docinto html
-	dodoc doc/*.html doc/*.txt doc/*.png
-}
diff --git a/dev-db/sqlite/sqlite-2.2.1.ebuild b/dev-db/sqlite/sqlite-2.2.1.ebuild
index 88dc9ec9fa2b..7b22661c05a6 100644
--- a/dev-db/sqlite/sqlite-2.2.1.ebuild
+++ b/dev-db/sqlite/sqlite-2.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.2.1.ebuild,v 1.2 2002/01/13 23:50:19 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.2.1.ebuild,v 1.3 2002/01/15 00:32:54 gbevin Exp $
 
 S=${WORKDIR}/sqlite
 DESCRIPTION="SQLite: An SQL Database Engine in a C Library."
@@ -9,8 +9,7 @@ SRC_URI="http://www.hwaci.com/sw/sqlite/${P}.tar.gz"
 HOMEPAGE="http://www.hwaci.com/sw/sqlite/"
 
 DEPEND="virtual/glibc
-	dev-lang/tcl-tk"
-#should be: dev-lan/tcl
+	dev-lang/tcl"
 
 src_compile() {
 
diff --git a/dev-lang/python/files/digest-python-2.2 b/dev-lang/python/files/digest-python-2.2
deleted file mode 100644
index 0d73e1a12a91..000000000000
--- a/dev-lang/python/files/digest-python-2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 87febf0780c8e18454022d34b2ca70a0 Python-2.2.tgz 6557696
-MD5 03be17baafacc3508224d9542c0a61b3 python-fchksum-1.6.tar.gz 36864
-MD5 3f79a00b72d7282ecbbadc4effb00683 python-fchksum_1.6-2.diff.gz 24576
diff --git a/dev-lang/python/files/digest-python-2.2-r1 b/dev-lang/python/files/digest-python-2.2-r1
deleted file mode 100644
index 79484978b348..000000000000
--- a/dev-lang/python/files/digest-python-2.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 87febf0780c8e18454022d34b2ca70a0 Python-2.2.tgz 6545408
-MD5 03be17baafacc3508224d9542c0a61b3 python-fchksum-1.6.tar.gz 36864
-MD5 3f79a00b72d7282ecbbadc4effb00683 python-fchksum_1.6-2.diff.gz 24576
diff --git a/dev-lang/python/files/digest-python-2.2-r2 b/dev-lang/python/files/digest-python-2.2-r2
deleted file mode 100644
index 79484978b348..000000000000
--- a/dev-lang/python/files/digest-python-2.2-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 87febf0780c8e18454022d34b2ca70a0 Python-2.2.tgz 6545408
-MD5 03be17baafacc3508224d9542c0a61b3 python-fchksum-1.6.tar.gz 36864
-MD5 3f79a00b72d7282ecbbadc4effb00683 python-fchksum_1.6-2.diff.gz 24576
diff --git a/dev-lang/python/python-2.2-r1.ebuild b/dev-lang/python/python-2.2-r1.ebuild
deleted file mode 100644
index c632f236e76a..000000000000
--- a/dev-lang/python/python-2.2-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2-r1.ebuild,v 1.1 2002/01/03 16:41:37 drobbins Exp $
-
-S=${WORKDIR}/Python-${PV}
-FCHKSUM="python-fchksum-1.6"
-FCHKSUMP="python-fchksum_1.6-2"
-DESCRIPTION="A really great language"
-SRC_URI="http://www.python.org/ftp/python/${PV}/Python-${PV}.tgz
-	http://www.azstarnet.com/~donut/programs/fchksum/${FCHKSUM}.tar.gz
-	http://www.azstarnet.com/~donut/programs/fchksum/${FCHKSUMP}.diff.gz"
-
-HOMEPAGE="http://www.python.org http://www.azstarnet.com/~donut/programs/fchksum/"
-
-DEPEND="virtual/glibc >=sys-libs/zlib-1.1.3
-	readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )
-	berkdb? ( >=sys-libs/db-3 )
-	tcltk? ( >=dev-lang/tcl-tk-8.0 )"
-
-RDEPEND="$DEPEND"
-PROVIDE="virtual/python-2.2"
-
-src_unpack() {
-	# unpack python
-	unpack Python-${PV}.tgz
-	# unpack fchksum and move pieces into Modules subdir
-	cd ${S}/Modules
-	unpack ${FCHKSUM}.tar.gz
-	zcat ${DISTDIR}/${FCHKSUMP}.diff.gz | patch -p0
-	cd ${FCHKSUM}
-	cp md5.h ../md5_2.h
-	cp cksum.[ch] sum.[ch] fchksum.h ..
-	sed 's:"md5.h":"md5_2.h":' md5.c > ../md5_2.c
-	sed 's:"md5.h":"md5_2.h":' fchksum.c > ../fchksum.c
-	# add fchksum configuration to Setup
-	cd ${S}
-	echo "fchksum fchksum.c md5_2.c cksum.c sum.c" >> Modules/Setup.dist
-
-	# adjust makefile to install pydoc into ${D} correctly
-	t=${S}/Makefile.pre.in
-	cp $t $t.orig || die
-	sed 's:install-platlib.*:& --install-scripts=$(BINDIR):' $t.orig > $t
-}
-
-src_compile() {
-	# python's config seems to ignore CFLAGS
-	export OPT=$CFLAGS 
-
-	# configure fchksum
-	cd ${S}/Modules/${FCHKSUM}
-	./configure
-	cp pfconfig.h ..
-
-	# adjust Setup to include the various modules we need
-	cd ${S}
-	scmd=""
-	# adjust for USE readline
-	if use readline; then
-		scmd="$scmd  s:#\(readline .*\) -ltermcap:\1:;"
-		scmd="$scmd  s:#\(_curses .*\) -lcurses -ltermcap:\1 -lncurses:;"
-	fi
-	# adjust for USE tcltk
-	if use tcltk; then
-		# Find the version of tcl/tk that has headers installed.
-		# This will be the most recently merged, not necessarily the highest
-		# version number.
-		tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
-		tkv=$( grep  TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
-		# adjust Setup to match
-		scmd="$scmd  s:# \(_tkinter \):\1:;"
-		scmd="$scmd  s:#\(\t-ltk[0-9.]* -ltcl[0-9.]*\):\t-ltk$tkv -ltcl$tclv:;"
-		scmd="$scmd  s:#\(\t-L/usr/X11R6/lib\):\1:;"
-		scmd="$scmd  s:#\(\t-lX11.*\):\1:;"
-	fi
-	# adjust for USE berkdb
-	if use berkdb; then
-		# patch the dbmmodule to use db3's dbm compatibility code.  That way,
-		# we're depending on db3 rather than old db1.
-		t=Modules/dbmmodule.c
-		cp $t $t.orig || die
-		sed \
-			-e '10,25d' \
-			-e '26i\' \
-			-e '#define DB_DBM_HSEARCH 1\' \
-			-e 'static char *which_dbm = "BSD db";\' \
-			-e '#include <db3/db.h>' \
-			$t.orig > $t
-		# now fix Setup
-		scmd="$scmd  s:#dbm.*:dbm dbmmodule.c -I/usr/include/db3 -ldb-3.2:;"
-	fi
-	# no USE vars to switch off these adjustments:
-	scmd="$scmd  s:#\(_locale .*\):\1:;"  # access to ISO C locale support
-	scmd="$scmd  s:#\(syslog .*\):\1:;"   # syslog daemon interface
-	scmd="$scmd  s:#\(zlib .*\):\1:;"     # This require zlib 1.1.3 (or later).
-	scmd="$scmd  s:#\(termios .*\):\1:;"  # Steen Lumholt's termios module
-	scmd="$scmd  s:#\(resource .*\):\1:;" # Jeremy Hylton's rlimit interface
-	sed "$scmd" Modules/Setup.dist > Modules/Setup
-	
-	./configure \
-		--prefix=/usr \
-		--without-libdb \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man
-	assert "Configure failed"
-	# kill the -DHAVE_CONFIG_H flag
-	mv Makefile Makefile.orig
-	sed -e 's/-DHAVE_CONFIG_H//' Makefile.orig > Makefile
-	#emake || die "Parallel make failed"
-	make || die "Parallel make failed"
-}
-
-src_install() {
-	dodir /usr
-	make install prefix=${D}/usr || die
-	rm "${D}/usr/bin/python"
-	dosym python2.2 /usr/bin/python
-	dodoc README
-
-	# install our own custom python-config
-	exeinto /usr/bin
-	newexe ${FILESDIR}/python-config-2.2 python-config
-
-	# If USE tcltk lets install idle
-	# Need to script the python version in the path
-	if use tcltk; then
-		mkdir "${D}/usr/lib/python2.2/tools"
-		mv "${S}/Tools/idle" "${D}/usr/lib/python2.2/tools/"
-		dosym /usr/lib/python2.2/tools/idle/idle.py /usr/bin/idle.py
-	fi
-}
diff --git a/dev-lang/python/python-2.2-r2.ebuild b/dev-lang/python/python-2.2-r2.ebuild
deleted file mode 100644
index cd8cb230dc00..000000000000
--- a/dev-lang/python/python-2.2-r2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2-r2.ebuild,v 1.1 2002/01/05 22:17:02 g2boojum Exp $
-
-S=${WORKDIR}/Python-${PV}
-FCHKSUM="python-fchksum-1.6"
-FCHKSUMP="python-fchksum_1.6-2"
-DESCRIPTION="A really great language"
-SRC_URI="http://www.python.org/ftp/python/${PV}/Python-${PV}.tgz
-	http://www.azstarnet.com/~donut/programs/fchksum/${FCHKSUM}.tar.gz
-	http://www.azstarnet.com/~donut/programs/fchksum/${FCHKSUMP}.diff.gz"
-
-HOMEPAGE="http://www.python.org http://www.azstarnet.com/~donut/programs/fchksum/"
-
-DEPEND="virtual/glibc >=sys-libs/zlib-1.1.3
-	readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )
-	berkdb? ( >=sys-libs/db-3 )
-	tcltk? ( >=dev-lang/tcl-tk-8.0 )"
-
-RDEPEND="$DEPEND"
-PROVIDE="virtual/python-2.2"
-
-src_unpack() {
-	# unpack python
-	unpack Python-${PV}.tgz
-	# unpack fchksum and move pieces into Modules subdir
-	cd ${S}/Modules
-	unpack ${FCHKSUM}.tar.gz
-	zcat ${DISTDIR}/${FCHKSUMP}.diff.gz | patch -p0
-	cd ${FCHKSUM}
-	cp md5.h ../md5_2.h
-	cp cksum.[ch] sum.[ch] fchksum.h ..
-	sed 's:"md5.h":"md5_2.h":' md5.c > ../md5_2.c
-	sed 's:"md5.h":"md5_2.h":' fchksum.c > ../fchksum.c
-	# add fchksum configuration to Setup
-	cd ${S}
-	echo "fchksum fchksum.c md5_2.c cksum.c sum.c" >> Modules/Setup.dist
-
-	# adjust makefile to install pydoc into ${D} correctly
-	t=${S}/Makefile.pre.in
-	cp $t $t.orig || die
-	sed 's:install-platlib.*:& --install-scripts=$(BINDIR):' $t.orig > $t
-}
-
-src_compile() {
-	# python's config seems to ignore CFLAGS
-	export OPT=$CFLAGS 
-
-	# configure fchksum
-	cd ${S}/Modules/${FCHKSUM}
-	./configure
-	cp pfconfig.h ..
-
-	# adjust Setup to include the various modules we need
-	cd ${S}
-	scmd=""
-	# adjust for USE readline
-	if use readline; then
-		scmd="$scmd  s:#\(readline .*\) -ltermcap:\1:;"
-		scmd="$scmd  s:#\(_curses .*\) -lcurses -ltermcap:\1 -lncurses:;"
-	fi
-	# adjust for USE tcltk
-	if use tcltk; then
-		# Find the version of tcl/tk that has headers installed.
-		# This will be the most recently merged, not necessarily the highest
-		# version number.
-		tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
-		tkv=$( grep  TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
-		# adjust Setup to match
-		scmd="$scmd  s:# \(_tkinter \):\1:;"
-		scmd="$scmd  s:#\(\t-ltk[0-9.]* -ltcl[0-9.]*\):\t-ltk$tkv -ltcl$tclv:;"
-		scmd="$scmd  s:#\(\t-L/usr/X11R6/lib\):\1:;"
-		scmd="$scmd  s:#\(\t-lX11.*\):\1:;"
-	fi
-	# adjust for USE berkdb
-	if use berkdb; then
-		# patch the dbmmodule to use db3's dbm compatibility code.  That way,
-		# we're depending on db3 rather than old db1.
-		t=Modules/dbmmodule.c
-		cp $t $t.orig || die
-		sed \
-			-e '10,25d' \
-			-e '26i\' \
-			-e '#define DB_DBM_HSEARCH 1\' \
-			-e 'static char *which_dbm = "BSD db";\' \
-			-e '#include <db3/db.h>' \
-			$t.orig > $t
-		# now fix Setup
-		scmd="$scmd  s:#dbm.*:dbm dbmmodule.c -I/usr/include/db3 -ldb-3.2:;"
-	fi
-	# no USE vars to switch off these adjustments:
-	scmd="$scmd  s:#\(_locale .*\):\1:;"  # access to ISO C locale support
-	scmd="$scmd  s:#\(syslog .*\):\1:;"   # syslog daemon interface
-	scmd="$scmd  s:#\(zlib .*\):\1:;"     # This require zlib 1.1.3 (or later).
-	scmd="$scmd  s:#\(termios .*\):\1:;"  # Steen Lumholt's termios module
-	scmd="$scmd  s:#\(resource .*\):\1:;" # Jeremy Hylton's rlimit interface
-	sed "$scmd" Modules/Setup.dist > Modules/Setup
-	
-	./configure \
-		--prefix=/usr \
-		--without-libdb \
-		--infodir='${prefix}'/share/info \
-		--mandir='${prefix}'/share/man
-	assert "Configure failed"
-	# kill the -DHAVE_CONFIG_H flag
-	mv Makefile Makefile.orig
-	sed -e 's/-DHAVE_CONFIG_H//' Makefile.orig > Makefile
-	#emake || die "Parallel make failed"
-	make || die "Parallel make failed"
-}
-
-src_install() {
-	dodir /usr
-	make install prefix=${D}/usr || die
-	rm "${D}/usr/bin/python"
-	dosym python2.2 /usr/bin/python
-	dodoc README
-
-	# install our own custom python-config
-	exeinto /usr/bin
-	newexe ${FILESDIR}/python-config-2.2 python-config
-
-	# If USE tcltk lets install idle
-	# Need to script the python version in the path
-	if use tcltk; then
-		mkdir "${D}/usr/lib/python2.2/tools"
-		mv "${S}/Tools/idle" "${D}/usr/lib/python2.2/tools/"
-		dosym /usr/lib/python2.2/tools/idle/idle.py /usr/bin/idle.py
-	fi
-}
diff --git a/dev-lang/python/python-2.2-r3.ebuild b/dev-lang/python/python-2.2-r3.ebuild
index 2ebafa965f41..cf09963e7d85 100644
--- a/dev-lang/python/python-2.2-r3.ebuild
+++ b/dev-lang/python/python-2.2-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2-r3.ebuild,v 1.1 2002/01/14 22:06:05 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.2-r3.ebuild,v 1.2 2002/01/15 00:32:54 gbevin Exp $
 
 PYVER="`echo ${PV} | cut -d '.' -f 1,2`"
 S=${WORKDIR}/Python-${PV}
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.python.org http://www.azstarnet.com/~donut/programs/fchksum
 DEPEND="virtual/glibc >=sys-libs/zlib-1.1.3
 	readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )
 	berkdb? ( >=sys-libs/db-3 )
-	tcltk? ( >=dev-lang/tcl-tk-8.0 )"
+	tcltk? ( >=dev-lang/tk-8.0 )"
 
 RDEPEND="$DEPEND"
 PROVIDE="virtual/python-${PYVER}"
diff --git a/dev-lang/swig/swig-1.3.10.ebuild b/dev-lang/swig/swig-1.3.10.ebuild
index 0abd54f1a919..3bbfb7c54bf9 100644
--- a/dev-lang/swig/swig-1.3.10.ebuild
+++ b/dev-lang/swig/swig-1.3.10.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Tools Team <tools@gentoo.org>
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-1.3.10.ebuild,v 1.1 2002/01/14 10:42:37 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-1.3.10.ebuild,v 1.2 2002/01/15 00:32:54 gbevin Exp $
 
 S=${WORKDIR}/SWIG-${PV}
 DESCRIPTION="Simplied Wrapper and Interface Generator"
@@ -15,7 +15,7 @@ DEPEND="virtual/glibc
 	java? ( virtual/jdk )
 	ruby? ( >=dev-lang/ruby-1.6.1 )
 	guile? ( >=dev-util/guile-1.4 )
-	tcltk? ( >=dev-lang/tcl-tk-8.3 )
+	tcltk? ( >=dev-lang/tk-8.3 )
 	perl? ( >=sys-devel/perl-5.6.1 )"
 	
 RDEPEND=""
diff --git a/dev-python/Imaging/Imaging-1.1.2-r1.ebuild b/dev-python/Imaging/Imaging-1.1.2-r1.ebuild
index 77edb81d5c30..880f44c42436 100644
--- a/dev-python/Imaging/Imaging-1.1.2-r1.ebuild
+++ b/dev-python/Imaging/Imaging-1.1.2-r1.ebuild
@@ -14,11 +14,8 @@ HOMEPAGE="http://www.pythonware.com/downloads/#pil"
 DEPEND=">=dev-lang/python-2.0
 	>=media-libs/jpeg-6a
 	>=sys-libs/zlib-0.95
-	tcltk? ( dev-lang/tcl-tk )"
+	tcltk? ( dev-lang/tk )"
 	
-#Change tcltk dependency to: tcltk? ( dev-tcltk/tk ),
-#if my separated tcl and tk ebuilds ever make it in portage tree.
-
 RDEPEND="${DEPEND}"
 
 src_compile() {
diff --git a/dev-python/Imaging/Imaging-1.1.2.ebuild b/dev-python/Imaging/Imaging-1.1.2.ebuild
deleted file mode 100644
index 5c95572672a2..000000000000
--- a/dev-python/Imaging/Imaging-1.1.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Tod Neidt <tneidt@fidnet.com>
-# /home/cvsroot/gentoo-x86/skel.build,v 1.7 2001/08/25 21:15:08 chadh Exp
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="Python Imaging Library (PIL)."
-
-SRC_URI="http://www.pythonware.com/downloads/${P}.tar.gz"
-
-HOMEPAGE="http://www.pythonware.com/downloads/#pil"
-
-DEPEND=">=dev-lang/python-2.0
-	>=media-libs/jpeg-6a
-	>=sys-libs/zlib-0.95
-	tcltk? ( dev-lang/tcl-tk )"
-	
-#Change tcltk dependency to: tcltk? ( dev-tcltk/tk ),
-#if my separated tcl and tk ebuilds ever make it in portage tree.
-
-RDEPEND="${DEPEND}"
-
-src_compile() {
- 
-	#This is a goofy build.
- 
-	#Build the core imaging library (libImaging.a)
-	cd ${S}/libImaging
-	
-	./configure --prefix=/usr \
-		--host=${CHOST} || die
-	cp Makefile Makefile.orig
-
-	#Not configured by configure
-	sed \
-    	-e "s:\(JPEGINCLUDE=[[:blank:]]*/usr/\)local/\(include\).*:\1\2:" \
-		-e "s:\(OPT=[[:blank:]]*\).*:\1${CFLAGS}:" \
-	Makefile.orig > Makefile
-	
-	emake || die
-	
-	#Build loadable python modules	
-	cd ${S}
-	
-	local scmd=""
-
-	#First change all the "/usr/local" to "/usr" 
-	scmd="$scmd s:/usr/local:/usr:g;"
-		
-	# adjust for USE tcltk
-	if use tcltk; then
-		# Find the version of tcl/tk that has headers installed.
-		# This will be the most recently merged, not necessarily the highest
-		# version number.
-		tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
-		tkv=$( grep  TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
-		# adjust Setup to match
-		scmd="$scmd s/-ltcl[0-9.]* -ltk[0-9.]*/-ltcl$tclv -ltk$tkv/;" 
-	else
-		scmd="$scmd s:\(^_imagingtk\):#\1:;"
-	fi
-	
-	sed "$scmd" Setup.in > Setup
-
-	#No configure (#$%@!%%)
-	scmd=""
-	cp Makefile.pre.in Makefile.pre.in.orig
-	#change all the "/usr/local" to "/usr" (haven't we been here before)
-	scmd="$scmd s:/usr/local:/usr:g;"
-	#fix man paths
-	scmd="$scmd "'s:^\(MANDIR=.*/\)\(man\):\1share/\2:;'
-	#Insert make.conf CFLAGS settings
-	scmd="$scmd "'s:$(OPT)'":${CFLAGS}:;"
-
-	sed "$scmd" Makefile.pre.in.orig > Makefile.pre.in
-	
-	#Now generate a top level Makefile
-	make -f Makefile.pre.in boot || die
-
-	emake || die
-
-}
-
-src_install () {
-
-	#grab python verision so ebuild doesn't depend on it
-	local pv
-	pv=$(python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:')
-	
-	
-	insinto /usr/lib/python$pv/site-packages
-	doins PIL.pth
-	
-	insinto /usr/lib/python$pv/site-packages/PIL
-	doins _imaging.so PIL/*
-	use tcltk && doins _imagingtk.so
-	
-	dodoc CHANGES CONTENTS FORMATS README
-
-}
-
diff --git a/dev-python/anygui/anygui-0.1_beta1.ebuild b/dev-python/anygui/anygui-0.1_beta1.ebuild
index 694266196b08..7cbd0856acf7 100644
--- a/dev-python/anygui/anygui-0.1_beta1.ebuild
+++ b/dev-python/anygui/anygui-0.1_beta1.ebuild
@@ -13,8 +13,7 @@ DEPEND=">=dev-lang/python-2.0
 	sys-libs/ncurses
         qt? ( dev-python/PyQt ) 
         gtk? ( dev-python/pygtk )
-        tcltk? ( dev-lang/tcl-tk-8.3.3 )"
-        #tcltk? ( dev-tcltk/tk-8.3.3 ) if my tcl and tk ebuilds are commited
+        tcltk? ( dev-lang/tk-8.3.3 )"
 #future: 
 #       might need a wxw use variable for wxGTK for wxw? ( dev-python/wxPython )
 #       also use variable fltk for fltk? ( dev-python/PyFLTK ) no ebuild for PyFLTK yet
diff --git a/kde-base/kdemultimedia/kdemultimedia-2.2.2.ebuild b/kde-base/kdemultimedia/kdemultimedia-2.2.2.ebuild
index e042c227ebb1..62dab69f85c4 100644
--- a/kde-base/kdemultimedia/kdemultimedia-2.2.2.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-2.2.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-2.2.2.ebuild,v 1.6 2002/01/04 16:02:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-2.2.2.ebuild,v 1.7 2002/01/15 00:32:54 gbevin Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-dist || die
 
@@ -17,7 +17,6 @@ newdepend ">=sys-libs/ncurses-5.2
 	motif? ( >=x11-libs/openmotif-2.1.30 )
 	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )
 	slang? ( >=sys-libs/slang-1.4.4 )"
-#	tcltk? ( =dev-lang/tcl-tk.8.0.5-r2 )
 
 src_unpack() {
 
@@ -40,7 +39,7 @@ src_compile() {
 	use motif	&& myinterface="$myinterface,motif"
 	use gtk		&& myinterface="$myinterface,gtk"
 	use slang	&& myinterface="$myinterface,slang"
-# tcl tk does not work: use tcltk	&& myinterface="$myinterface,tcltk"
+# tcl tk does not work
 
 	myconf="$myconf $myaudio $myinterface"
 
diff --git a/media-gfx/gqview/files/digest-gqview-1.0 b/media-gfx/gqview/files/digest-gqview-1.0
deleted file mode 100644
index a996a3d8039a..000000000000
--- a/media-gfx/gqview/files/digest-gqview-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 10db973fbe1f97aa1e3f89ea33d73bcd gqview-1.0.tar.gz 598016
diff --git a/media-gfx/graphviz/graphviz-1.7.15.ebuild b/media-gfx/graphviz/graphviz-1.7.15.ebuild
index 8978f0972415..f2619b828a0d 100644
--- a/media-gfx/graphviz/graphviz-1.7.15.ebuild
+++ b/media-gfx/graphviz/graphviz-1.7.15.ebuild
@@ -13,8 +13,7 @@ DEPEND=">=sys-libs/zlib-1.1.3
 	>=media-libs/libpng-1.0.6
 	>=media-libs/jpeg-6b
 	media-libs/freetype
-	tcltk? ( =dev-lang/tcltk-8.3* )"
-#	tcltk? ( =dev-tcltk/tk-8.3* )" If my tcltk fixes are accepted.
+	tcltk? ( =dev-lang/tk-8.3* )"
 
 src_compile() {
 
diff --git a/media-gfx/sketch/sketch-0.6.12.ebuild b/media-gfx/sketch/sketch-0.6.12.ebuild
index 1923b95c149c..25ce9ed83c84 100644
--- a/media-gfx/sketch/sketch-0.6.12.ebuild
+++ b/media-gfx/sketch/sketch-0.6.12.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Chouser <chouser@gentoo.com> 
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sketch/sketch-0.6.12.ebuild,v 1.2 2002/01/11 23:01:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sketch/sketch-0.6.12.ebuild,v 1.3 2002/01/15 00:32:54 gbevin Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="interactive X11 vector drawing program"
@@ -9,7 +9,7 @@ SRC_URI="http://prdownloads.sourceforge.net/${PN}/${P}.tar.gz"
 HOMEPAGE="http://sketch.sourceforge.net/"
 
 DEPEND=">=dev-python/Imaging-1.1.2-r1
-	dev-lang/tcl-tk
+	dev-lang/tk
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
diff --git a/media-libs/pdflib/pdflib-4.0.1-r1.ebuild b/media-libs/pdflib/pdflib-4.0.1-r1.ebuild
index 5a8a6cc25030..fe79bd95184d 100644
--- a/media-libs/pdflib/pdflib-4.0.1-r1.ebuild
+++ b/media-libs/pdflib/pdflib-4.0.1-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Grant Goodyear <g2boojum@hotmail.com>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/pdflib-4.0.1-r1.ebuild,v 1.2 2002/01/14 01:07:22 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/pdflib-4.0.1-r1.ebuild,v 1.3 2002/01/15 00:32:54 gbevin Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A library for generating PDF on the fly"
 SRC_URI="http://www.pdflib.com/pdflib/download/${P}.tar.gz"
 HOMEPAGE="http://www.pdflib.com"
 
-DEPEND="tcltk? ( >=dev-lang/tcl-tk-8.2 )
+DEPEND="tcltk? ( =dev-lang/tk-8.2 )
 	perl? ( >=sys-devel/perl-5.1 )
 	python? ( >=dev-lang/python-2.0 )
 	java? ( >=virtual/jdk-1.3 )"
diff --git a/media-sound/timidity++/timidity++-2.11.1.ebuild b/media-sound/timidity++/timidity++-2.11.1.ebuild
index 33253f4868fb..71ba9250bfaa 100644
--- a/media-sound/timidity++/timidity++-2.11.1.ebuild
+++ b/media-sound/timidity++/timidity++-2.11.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.11.1.ebuild,v 1.1 2002/01/13 20:22:48 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.11.1.ebuild,v 1.2 2002/01/15 00:32:54 gbevin Exp $
 
 PN=TiMidity++-${PV}
 S=${WORKDIR}/${PN}
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.goice.co.jp/member/mo/timidity/"
 DEPEND=">=sys-libs/ncurses-5.0
 	X? ( >=x11-base/xfree-4.0 )
 	motif? ( >=x11-libs/openmotif-2.1 )
-	tcltk? ( >=dev-lang/tcl-tk-8.1 )
+	tcltk? ( >=dev-lang/tk-8.1 )
 	nas? ( >=media-libs/nas-1.4 )
 	alsa? ( >=media-libs/alsa-lib-0.5.10 )
 	esd? ( >=media-sound/esound-0.2.22 )
diff --git a/profiles/package.mask b/profiles/package.mask
index 93480c245244..483d1de44a78 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -303,10 +303,9 @@ net-misc/gkrellmwireless
 # Needs to be tested under KDE env. with sandbox
 dev-util/poedit
 
-# packages dependent on dev-lang/tcl-tk should be updated for the new scheme
-# and then tcl-tk should be removed, have two schemes present is too confusing
-dev-lang/tcl
-dev-lang/tk
+# the packages dependent on tcl-tk have been updated to
+# support the seperation of both
+dev-lang/tcl-tk
 
 # seems to be incompatible with autoconf 2.13, / Hallski
 >=sys-devel/libtool-1.4.2