Version bumped.

4 files changed, 89 insertions, 10 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index f119fd6b1bfc..c9deee7a38a5 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/tk
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.27 2004/01/04 20:14:39 tuxus Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.28 2004/03/04 19:21:26 mholzer Exp $
+
+*tk-8.4.6 (04 Mar 2004)
+
+  04 Mar 2004; Martin Holzer <mholzer@gentoo.org> tk-8.4.6.ebuild:
+  Verison bumped.
 
   04 Jan 2004; <tuxus@gentoo.org> tk-8.4.3.ebuild:
   Added mips to KEYWORDS
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 6be2feb7f96c..3abd3ce64cbd 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -1,19 +1,21 @@
-MD5 e3f270bd3fbacaaaa13fb610cf92bad8 tk-8.3.4.ebuild 2182
+MD5 240ef130e954df8d4a38cb0e2aee56c5 ChangeLog 4240
 MD5 098de096482870bc8ecffca187559dc0 tk-8.3.3-r2.ebuild 2071
-MD5 97720cf062d7a3712f1141dc2d3b740f tk-8.3.4-r1.ebuild 2003
-MD5 accb38e44818ec38b058f5fb2d3401e5 tk-8.4.4.ebuild 2014
-MD5 f7dbd8e2b7c55301ca80d9563f4219ad tk-8.3.3.ebuild 2013
 MD5 61d31eae58b26d692008b24421c03ace tk-8.3.3-r3.ebuild 2180
+MD5 f7dbd8e2b7c55301ca80d9563f4219ad tk-8.3.3.ebuild 2013
+MD5 97720cf062d7a3712f1141dc2d3b740f tk-8.3.4-r1.ebuild 2003
+MD5 e3f270bd3fbacaaaa13fb610cf92bad8 tk-8.3.4.ebuild 2182
 MD5 80b15185cab15f88b32990314cc48ef7 tk-8.4.3.ebuild 2001
-MD5 eef01a2032b416ede25256bae4da510e ChangeLog 4127
+MD5 accb38e44818ec38b058f5fb2d3401e5 tk-8.4.4.ebuild 2014
 MD5 e281a527b328aa3ab11855feae783222 tk-8.4.5.ebuild 2005
+MD5 eb71fb15bb8ea2b01a9c87bdc1174a94 tk-8.4.6.ebuild 2008
+MD5 f64532dbe89c04cefe0e16a9743f5f57 files/digest-tk-8.4.6 64
+MD5 2ba3335fd9167fef8f3f99be70675257 files/digest-tk-8.3.3 60
 MD5 2ba3335fd9167fef8f3f99be70675257 files/digest-tk-8.3.3-r2 60
 MD5 2ba3335fd9167fef8f3f99be70675257 files/digest-tk-8.3.3-r3 60
-MD5 0321d3bb5b70142a415de40ae2d5e3d4 files/digest-tk-8.3.4-r1 192
-MD5 2ba3335fd9167fef8f3f99be70675257 files/digest-tk-8.3.3 60
 MD5 36c75264a0b45c6be330ddf87572bd14 files/digest-tk-8.3.4 189
+MD5 0321d3bb5b70142a415de40ae2d5e3d4 files/digest-tk-8.3.4-r1 192
 MD5 b3e7fb189b73f361f1fa7abddd3ee14a files/digest-tk-8.4.3 64
 MD5 6c77ba125cd08c001ee834d9c2256db2 files/digest-tk-8.4.4 64
 MD5 e6c32456220f2503da65035680c4d3ca files/digest-tk-8.4.5 64
-MD5 3e8db8239fe4e68f5107a7a1d4f2f85b files/remove-control-v.diff 400
 MD5 e662e61449ea86b439ceb41463762cdc files/remove-control-v-8.4.diff 449
+MD5 3e8db8239fe4e68f5107a7a1d4f2f85b files/remove-control-v.diff 400
diff --git a/dev-lang/tk/files/digest-tk-8.4.6 b/dev-lang/tk/files/digest-tk-8.4.6
new file mode 100644
index 000000000000..e34b77208af1
--- /dev/null
+++ b/dev-lang/tk/files/digest-tk-8.4.6
@@ -0,0 +1 @@
+MD5 24b7774d54c1c568cabe16f3498ddccd tk8.4.6-src.tar.gz 3230760
diff --git a/dev-lang/tk/tk-8.4.6.ebuild b/dev-lang/tk/tk-8.4.6.ebuild
new file mode 100644
index 000000000000..ea644cd80038
--- /dev/null
+++ b/dev-lang/tk/tk-8.4.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.6.ebuild,v 1.1 2004/03/04 19:21:26 mholzer Exp $
+
+inherit eutils
+
+DESCRIPTION="Tk Widget Set"
+HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
+SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64 ~ppc64 ~ia64"
+RESTRICT="nomirror"
+
+DEPEND=">=sys-apps/sed-4.0.5
+	>=sys-apps/portage-2.0.47-r10
+	virtual/x11
+	=dev-lang/tcl-${PV}*"
+
+S=${WORKDIR}/${PN}${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/library
+	epatch ${FILESDIR}/remove-control-v-8.4.diff || die
+}
+
+src_compile() {
+	cd ${S}/unix
+	econf \
+		--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 -i \
+		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/lib," \
+		-e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/lib/tk${v1}/include'," \
+		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/lib," \
+		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/lib," \
+		${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
+}