Fixes #10154.

4 files changed, 96 insertions, 1 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 1a1801b1d937..45880d9acd64 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/tk
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.5 2002/09/26 15:59:00 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.6 2002/11/11 16:49:38 karltk Exp $
+
+*tk-8.3.3-r3 (11 Nov 2002)
+
+  11 Nov 2002; Karl Trygve Kalleberg <karltk@gentoo.org>
+  tk-8.3.3-r3.ebuild files/digest-tk-8.3.3-r3:
+  Some legacy code for default handling of the Control-V keypress is now
+  patched away. Fixes #10154.
 
 *tk-8.3.3-r2 (25 Sep 2002)
 
diff --git a/dev-lang/tk/files/digest-tk-8.3.3-r3 b/dev-lang/tk/files/digest-tk-8.3.3-r3
new file mode 100644
index 000000000000..068113942ff6
--- /dev/null
+++ b/dev-lang/tk/files/digest-tk-8.3.3-r3
@@ -0,0 +1 @@
+MD5 72eb2d4a84f32fc1608e2333f92a2661 tk8.3.3.tar.gz 2537686
diff --git a/dev-lang/tk/files/remove-control-v.diff b/dev-lang/tk/files/remove-control-v.diff
new file mode 100644
index 000000000000..a60fb302c51e
--- /dev/null
+++ b/dev-lang/tk/files/remove-control-v.diff
@@ -0,0 +1,17 @@
+--- library/text.tcl	Mon Nov 11 17:39:09 2002
++++ library/text.tcl	Mon Nov 11 17:39:28 2002
+@@ -338,14 +338,6 @@
+     }
+ }
+ 
+-if {[string compare $tcl_platform(platform) "windows"]} {
+-bind Text <Control-v> {
+-    if {!$tk_strictMotif} {
+-	tkTextScrollPages %W 1
+-    }
+-}
+-}
+-
+ bind Text <Meta-b> {
+     if {!$tk_strictMotif} {
+ 	tkTextSetCursor %W [tkTextPrevPos %W insert tcl_startOfPreviousWord]
diff --git a/dev-lang/tk/tk-8.3.3-r3.ebuild b/dev-lang/tk/tk-8.3.3-r3.ebuild
new file mode 100644
index 000000000000..e24a2d5a4e58
--- /dev/null
+++ b/dev-lang/tk/tk-8.3.3-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.3.3-r3.ebuild,v 1.1 2002/11/11 16:49:38 karltk Exp $
+
+S=${WORKDIR}/${PN}${PV}
+SRC_URI="ftp://ftp.scriptics.com/pub/tcl/tcl8_3/${PN}${PV}.tar.gz"
+HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
+DESCRIPTION="Tk Widget Set"
+DEPEND="virtual/glibc
+	virtual/x11
+	=dev-lang/tcl-${PV}*"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="x86 ppc sparc sparc64 alpha"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/library
+	patch -p1 < ${FILESDIR}/remove-control-v.diff
+}
+
+# hyper-optimizations untested...
+#
+src_compile() {
+	cd ${S}/unix
+	./configure --host=${CHOST} \
+				--prefix=/usr \
+				--mandir=/usr/share/man \
+				--with-tcl=/usr/lib \
+				--enable-threads || die
+					
+	emake CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	#short version number
+	local v1
+	v1=${PV%.*}
+	
+	cd ${S}/unix
+	make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install || die
+	
+	# fix the tkConfig.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${v1}/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${v1}/include/unix
+	install -c -m0644 ${S}/unix/*.h ${D}/usr/lib/tk${v1}/include/unix
+	dodir /usr/lib/tk${v1}/include/generic
+	install -c -m0644 ${S}/generic/*.h ${D}/usr/lib/tk${v1}/include/generic
+	rm -f ${D}/usr/lib/tk${v1}/include/generic/tk.h
+	rm -f ${D}/usr/lib/tk${v1}/include/generic/tkDecls.h
+	rm -f ${D}/usr/lib/tk${v1}/include/generic/tkPlatDecls.h	
+
+	# install symlink for libraries
+	#dosym /usr/lib/libtk${v1}.a /usr/lib/libtk.a
+	dosym /usr/lib/libtk${v1}.so /usr/lib/libtk.so
+	dosym /usr/lib/libtkstub${v1}.a /usr/lib/libtkstub.a
+	
+	ln -sf wish${v1} ${D}/usr/bin/wish
+	
+	cd ${S}
+	dodoc README changes license.terms
+}