updated all tcl-tk deps to point to tk (tcl-tk deprecated)

12 files changed, 9 insertions, 278 deletions

diff --git a/dev-lang/entity/entity-0.7.2.ebuild b/dev-lang/entity/entity-0.7.2.ebuild
index ddb5d1358b92..bf129f01af03 100644
--- a/dev-lang/entity/entity-0.7.2.ebuild
+++ b/dev-lang/entity/entity-0.7.2.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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/entity/entity-0.7.2.ebuild,v 1.10 2001/11/10 11:31:52 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/entity/entity-0.7.2.ebuild,v 1.11 2002/06/11 18:19:22 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="An XML Framework"
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.entity.cx"
 
 DEPEND=">=media-libs/imlib-1.9.10-r1
 	>=dev-libs/libpcre-3.2
-	tcltk? ( >=dev-lang/tcl-tk-8.1.1 )
+	tcltk? ( >=dev-lang/tk-8.1.1 )
 	perl? ( >=sys-devel/perl-5.6 )
 	python? ( >=dev-lang/python-2.0-r4 )
 	sdl? ( >=media-libs/libsdl-1.1.7 )
@@ -20,7 +20,7 @@ DEPEND=">=media-libs/imlib-1.9.10-r1
 
 RDEPEND=">=media-libs/imlib-1.9.10-r1
 	>=dev-libs/libpcre-3.2
-	tcltk? ( >=dev-lang/tcl-tk-8.1.1 )
+	tcltk? ( >=dev-lang/tk-8.1.1 )
 	perl? ( >=sys-devel/perl-5.6 )
 	python? ( >=dev-lang/python-2.0i-r4 )
 	sdl? ( >=media-libs/libsdl-1.1.7 )
diff --git a/dev-lang/python/python-2.0-r5.ebuild b/dev-lang/python/python-2.0-r5.ebuild
index c9d303c9b855..d1a8b24691f6 100644
--- a/dev-lang/python/python-2.0-r5.ebuild
+++ b/dev-lang/python/python-2.0-r5.ebuild
@@ -3,7 +3,7 @@
 # Author Daniel Robbins <drobbins@gentoo.org>
 # Modified Tod M. Neidt <tneidt@fidnet.com>
 # /home/cvsroot/gentoo-x86/dev-lang/python/python-2.0-r4.ebuild,v 1.1 2001/06/04 19:49:02 drobbins Exp
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.0-r5.ebuild,v 1.2 2002/04/07 13:32:59 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.0-r5.ebuild,v 1.3 2002/06/11 18:19:22 drobbins Exp $
 
 
 S=${WORKDIR}/Python-2.0
@@ -18,7 +18,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-2.0"
diff --git a/dev-lang/python/python-2.0-r6.ebuild b/dev-lang/python/python-2.0-r6.ebuild
index c687fba8e2ab..23edc25ed346 100644
--- a/dev-lang/python/python-2.0-r6.ebuild
+++ b/dev-lang/python/python-2.0-r6.ebuild
@@ -3,7 +3,7 @@
 # Author Daniel Robbins <drobbins@gentoo.org>
 # Modified Tod M. Neidt <tneidt@fidnet.com>
 # /home/cvsroot/gentoo-x86/dev-lang/python/python-2.0-r4.ebuild,v 1.1 2001/06/04 19:49:02 drobbins Exp
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.0-r6.ebuild,v 1.4 2002/04/07 13:32:59 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.0-r6.ebuild,v 1.5 2002/06/11 18:19:22 drobbins Exp $
 
 
 S=${WORKDIR}/Python-2.0
@@ -18,7 +18,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-2.0"
diff --git a/dev-lang/python/python-2.1.1-r3.ebuild b/dev-lang/python/python-2.1.1-r3.ebuild
index f53c464f573d..561c7b387faa 100644
--- a/dev-lang/python/python-2.1.1-r3.ebuild
+++ b/dev-lang/python/python-2.1.1-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.1.1-r3.ebuild,v 1.2 2002/04/07 13:32:59 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.1.1-r3.ebuild,v 1.3 2002/06/11 18:19:22 drobbins Exp $
 
 S=${WORKDIR}/Python-${PV}
 FCHKSUM="python-fchksum-1.6"
@@ -14,7 +14,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-2.1"
diff --git a/dev-lang/tcl-tk/files/digest-tcl-tk-8.0.5-r2 b/dev-lang/tcl-tk/files/digest-tcl-tk-8.0.5-r2
deleted file mode 100644
index 437f9fa57c5d..000000000000
--- a/dev-lang/tcl-tk/files/digest-tcl-tk-8.0.5-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4247975c801510fb378b76237b2abaaf tcl8.0.5.tar.gz 1519970
-MD5 3ae92b86c01ec99a1872697294839e64 tk8.0.5.tar.gz 2033223
diff --git a/dev-lang/tcl-tk/files/digest-tcl-tk-8.1.1-r1 b/dev-lang/tcl-tk/files/digest-tcl-tk-8.1.1-r1
deleted file mode 100644
index 66032a13f5ad..000000000000
--- a/dev-lang/tcl-tk/files/digest-tcl-tk-8.1.1-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fd85414ffca58be880a40f1e699653b2 tcl8.1.1.tar.gz 2355046
-MD5 0677449e344e7720cfa37660d070de8c tk8.1.1.tar.gz 2241318
diff --git a/dev-lang/tcl-tk/files/digest-tcl-tk-8.3.3 b/dev-lang/tcl-tk/files/digest-tcl-tk-8.3.3
deleted file mode 100644
index 0ced98985f0e..000000000000
--- a/dev-lang/tcl-tk/files/digest-tcl-tk-8.3.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e94397490adb2c1c2b1990052b1a92b2 tcl8.3.3.tar.gz 2589894
-MD5 72eb2d4a84f32fc1608e2333f92a2661 tk8.3.3.tar.gz 2537686
diff --git a/dev-lang/tcl-tk/files/digest-tcl-tk-8.4.2 b/dev-lang/tcl-tk/files/digest-tcl-tk-8.4.2
deleted file mode 100644
index 90d90f31c344..000000000000
--- a/dev-lang/tcl-tk/files/digest-tcl-tk-8.4.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1e944d8f1de7546f2bdc52e045399ca2 tcl8.4a2.tar.gz 2642641
-MD5 99270ff87849033933868709b8f8561a tk8.4a2.tar.gz 2600375
diff --git a/dev-lang/tcl-tk/tcl-tk-8.0.5-r2.ebuild b/dev-lang/tcl-tk/tcl-tk-8.0.5-r2.ebuild
deleted file mode 100644
index 161270f32873..000000000000
--- a/dev-lang/tcl-tk/tcl-tk-8.0.5-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2002 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/dev-lang/tcl-tk/tcl-tk-8.0.5-r2.ebuild,v 1.4 2002/04/27 10:25:35 seemant Exp $
-
-
-R1=tcl${PV}
-A1=${R1}.tar.gz
-S1=${WORKDIR}/${R1}
-SRC_URI1="ftp://ftp.scriptics.com/pub/tcl/tcl8_0/tcl${PV}.tar.gz"
-
-R2=tk${PV}
-A2=${R2}.tar.gz
-S2=${WORKDIR}/${R2}
-
-SRC_URI2="ftp://ftp.scriptics.com/pub/tcl/tcl8_0/tk${PV}.tar.gz"
-
-SRC_URI="${SRC_URI1} ${SRC_URI2}"
-HOMEPAGE="http:/dev.scriptics.com/software/tcltk/"
-
-DESCRIPTION="Tool Command Language"
-
-DEPEND="virtual/glibc virtual/x11"
-
-# hyper-optimizations untested...
-#
-src_unpack() {
-	unpack ${A1}
-        unpack ${A2}
-	cp ${S1}/unix/configure ${S1}/unix/configure.orig
-	sed -e "s/^CFLAGS_OPTIMIZE=-O$/CFLAGS_OPTIMIZE=\$CFLAGS/" \
-	       ${S1}/unix/configure.orig > ${S1}/unix/configure 
-}
-
-src_compile() {
-	cd ${S1}/unix
-	try ./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man --enable-threads
-	try make
-	cd ${S2}/unix
-	try ./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man --with-tcl=${S1}/unix --enable-threads
-	try make
-}
-
-src_install() {
-	cd ${S1}/unix
-	try make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install
-	cd ${S2}/unix
-	try make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install
-#	ln -sf wish8.0 ${D}/usr/bin/wish
-#	ln -sf tclsh8.0 ${D}/usr/bin/tclsh
-	cd ${S1}
-	dodoc README changes license.terms
-
-}
-
diff --git a/dev-lang/tcl-tk/tcl-tk-8.1.1-r1.ebuild b/dev-lang/tcl-tk/tcl-tk-8.1.1-r1.ebuild
deleted file mode 100644
index 467710516cfc..000000000000
--- a/dev-lang/tcl-tk/tcl-tk-8.1.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2002 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/dev-lang/tcl-tk/tcl-tk-8.1.1-r1.ebuild,v 1.5 2002/04/27 10:25:35 seemant Exp $
-
-R1=tcl8.1.1
-A1=${R1}.tar.gz
-S1=${WORKDIR}/${R1}
-SRC_URI1="ftp://ftp.scriptics.com/pub/tcl/tcl8_1/tcl8.1.1.tar.gz"
-
-R2=tk8.1.1
-A2=${R2}.tar.gz
-S2=${WORKDIR}/${R2}
-
-SRC_URI2="ftp://ftp.scriptics.com/pub/tcl/tcl8_1/tk8.1.1.tar.gz"
-
-SRC_URI="${SRC_URI1} ${SRC_URI2}"
-HOMEPAGE="http:/dev.scriptics.com/software/tcltk/"
-
-DESCRIPTION="Tool Command Language"
-
-DEPEND="virtual/glibc virtual/x11"
-
-# hyper-optimizations untested...
-#
-src_unpack() {
-	unpack ${A1}
-        unpack ${A2}
-	cp ${S1}/unix/configure ${S1}/unix/configure.orig
-	sed -e "s/^CFLAGS_OPTIMIZE=-O$/CFLAGS_OPTIMIZE=\$CFLAGS/" \
-	       ${S1}/unix/configure.orig > ${S1}/unix/configure 
-}
-
-src_compile() {
-	cd ${S1}/unix
-	try ./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man --enable-threads
-	try make
-	cd ${S2}/unix
-	try ./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man --with-tcl=${S1}/unix --enable-threads
-	try make
-}
-
-src_install() {
-	cd ${S1}/unix
-	try make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install
-	cd ${S2}/unix
-	try make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install
-	ln -sf wish8.1 ${D}/usr/bin/wish
-	ln -sf tclsh8.1 ${D}/usr/bin/tclsh
-	cd ${S1}
-	dodoc README changes license.terms
-
-}
-
diff --git a/dev-lang/tcl-tk/tcl-tk-8.3.3.ebuild b/dev-lang/tcl-tk/tcl-tk-8.3.3.ebuild
deleted file mode 100644
index 05852bbfb0d2..000000000000
--- a/dev-lang/tcl-tk/tcl-tk-8.3.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2002 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/dev-lang/tcl-tk/tcl-tk-8.3.3.ebuild,v 1.6 2002/04/27 10:25:35 seemant Exp $
-
-
-R1=tcl8.3.3
-A1=${R1}.tar.gz
-S1=${WORKDIR}/${R1}
-SRC_URI1="ftp://ftp.scriptics.com/pub/tcl/tcl8_3/tcl8.3.3.tar.gz"
-
-R2=tk8.3.3
-A2=${R2}.tar.gz
-S2=${WORKDIR}/${R2}
-
-SRC_URI2="ftp://ftp.scriptics.com/pub/tcl/tcl8_3/tk8.3.3.tar.gz"
-
-SRC_URI="${SRC_URI1} ${SRC_URI2}"
-HOMEPAGE="http:/dev.scriptics.com/software/tcltk/"
-
-DESCRIPTION="Tool Command Language"
-
-DEPEND="virtual/glibc virtual/x11"
-
-# hyper-optimizations untested...
-#
-src_unpack() {
-	unpack ${A1}
-        unpack ${A2}
-	cp ${S1}/unix/configure ${S1}/unix/configure.orig
-	sed -e "s/^CFLAGS_OPTIMIZE=-O$/CFLAGS_OPTIMIZE=\$CFLAGS/" \
-	       ${S1}/unix/configure.orig > ${S1}/unix/configure 
-}
-
-src_compile() {
-	cd ${S1}/unix
-	try ./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man --enable-threads
-	try make
-	cd ${S2}/unix
-	try ./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man --with-tcl=${S1}/unix --enable-threads
-	try make
-}
-
-src_install() {
-	cd ${S1}/unix
-	try make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install
-	cd ${S2}/unix
-	try make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install
-	ln -sf wish8.3 ${D}/usr/bin/wish
-	ln -sf tclsh8.3 ${D}/usr/bin/tclsh
-	cd ${S1}
-	dodoc README changes license.terms
-
-}
-
diff --git a/dev-lang/tcl-tk/tcl-tk-8.4.2.ebuild b/dev-lang/tcl-tk/tcl-tk-8.4.2.ebuild
deleted file mode 100644
index 32b481bd3280..000000000000
--- a/dev-lang/tcl-tk/tcl-tk-8.4.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2002 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/dev-lang/tcl-tk/tcl-tk-8.4.2.ebuild,v 1.8 2002/04/27 10:25:35 seemant Exp $
-
-
-R1=tcl8.4a2
-V1=8.4
-A1=${R1}.tar.gz
-S1=${WORKDIR}/${R1}
-SRC_URI1="ftp://ftp.scriptics.com/pub/tcl/tcl8_4/${A1}"
-
-R2=tk8.4a2
-V2=8.4
-A2=${R2}.tar.gz
-S2=${WORKDIR}/${R2}
-SRC_URI2="ftp://ftp.scriptics.com/pub/tcl/tcl8_4/${A2}"
-
-SRC_URI="${SRC_URI1} ${SRC_URI2}"
-HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
-
-DESCRIPTION="Tool Command Language/Tk Widget Set"
-
-DEPEND="virtual/glibc virtual/x11"
-
-# hyper-optimizations untested...
-#
-src_unpack() {
-	unpack ${A1}
-        unpack ${A2}
-}
-
-src_compile() {
-	cd ${S1}/unix
-	try ./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man --enable-threads
-	try make CFLAGS="${CFLAGS}"
-	cd ${S2}/unix
-	try ./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man --with-tcl=${S1}/unix --enable-threads
-	try make CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	cd ${S1}/unix
-	try make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install
-	
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	sed -e "s,^TCL_BUILD_LIB_SPEC='-L${S1}/unix,TCL_BUILD_LIB_SPEC='-L/usr/lib," \
-	    -e "s,^TCL_SRC_DIR='${S1}',TCL_SRC_DIR='/usr/lib/tcl${V1}/include'," \
-	    -e "s,^TCL_BUILD_STUB_LIB_SPEC='-L${S1}/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/lib," \
-	    -e "s,^TCL_BUILD_STUB_LIB_PATH='${S1}/unix,TCL_BUILD_STUB_LIB_PATH='/usr/lib," \
-	    ${D}/usr/lib/tclConfig.sh > ${D}/usr/lib/tclConfig.sh.new
-	mv ${D}/usr/lib/tclConfig.sh.new ${D}/usr/lib/tclConfig.sh
-	
-	# install private headers
-	dodir /usr/lib/tcl${V1}/include/unix
-	install -c -m0644 ${S1}/unix/*.h ${D}/usr/lib/tcl${V1}/include/unix
-	dodir /usr/lib/tcl${V1}/include/generic
-	install -c -m0644 ${S1}/generic/*.h ${D}/usr/lib/tcl${V1}/include/generic
-	rm -f ${D}/usr/lib/tcl${V1}/include/generic/tcl.h
-	rm -f ${D}/usr/lib/tcl${V1}/include/generic/tclDecls.h
-	rm -f ${D}/usr/lib/tcl${V1}/include/generic/tclPlatDecls.h	
-
-	# install symlink for libraries
-	dosym /usr/lib/libtcl${V1}.a /usr/lib/libtcl.a
-	dosym /usr/lib/libtclstub${V1}.a /usr/lib/libtclstub.a
-	
-	cd ${S2}/unix
-	try make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install
-	
-	# fix the tclConfig.sh to eliminate refs to the build directory
-	sed -e "s,^TK_BUILD_LIB_SPEC='-L${S2}/unix,TCL_BUILD_LIB_SPEC='-L/usr/lib," \
-	    -e "s,^TK_SRC_DIR='${S2}',TCL_SRC_DIR='/usr/lib/tk${V2}/include'," \
-	    -e "s,^TK_BUILD_STUB_LIB_SPEC='-L${S2}/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/lib," \
-	    -e "s,^TK_BUILD_STUB_LIB_PATH='${S2}/unix,TCL_BUILD_STUB_LIB_PATH='/usr/lib," \
-	    ${D}/usr/lib/tkConfig.sh > ${D}/usr/lib/tkConfig.sh.new
-	mv ${D}/usr/lib/tkConfig.sh.new ${D}/usr/lib/tkConfig.sh
-	
-	# install private headers
-	dodir /usr/lib/tk${V2}/include/unix
-	install -c -m0644 ${S1}/unix/*.h ${D}/usr/lib/tk${V2}/include/unix
-	dodir /usr/lib/tk${V2}/include/generic
-	install -c -m0644 ${S1}/generic/*.h ${D}/usr/lib/tk${V2}/include/generic
-	rm -f ${D}/usr/lib/tk${V2}/include/generic/tk.h
-	rm -f ${D}/usr/lib/tk${V2}/include/generic/tkDecls.h
-	rm -f ${D}/usr/lib/tk${V2}/include/generic/tkPlatDecls.h	
-
-	# install symlink for libraries
-	dosym /usr/lib/libtk${V2}.a /usr/lib/libtk.a
-	dosym /usr/lib/libtkstub${V2}.a /usr/lib/libtkstub.a
-	
-	ln -sf tclsh${V1} ${D}/usr/bin/tclsh
-	ln -sf wish${V2} ${D}/usr/bin/wish
-	
-	cd ${S1}
-	dodoc README changes license.terms
-
-}