6 files changed, 129 insertions, 16 deletions
diff --git a/dev-tcltk/tclx/ChangeLog b/dev-tcltk/tclx/ChangeLog
index 7fe4dc314bf5..8d0b0c4275ed 100644
--- a/dev-tcltk/tclx/ChangeLog
+++ b/dev-tcltk/tclx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tclx
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/ChangeLog,v 1.29 2006/08/23 02:22:32 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/ChangeLog,v 1.30 2006/11/01 19:35:43 jokey Exp $
+
+*tclx-8.4 (01 Nov 2006)
+
+  01 Nov 2006; Markus Ullmann <jokey@gentoo.org> metadata.xml,
+  +tclx-8.4.ebuild:
+  Version bump to fix bug #95845 and bug #133099
 
   23 Aug 2006; Jason Wever <weeve@gentoo.org> tclx-8.3.5.ebuild:
   Stable on SPARC.
diff --git a/dev-tcltk/tclx/Manifest b/dev-tcltk/tclx/Manifest
index 880cec231a5a..2f2159187b43 100644
--- a/dev-tcltk/tclx/Manifest
+++ b/dev-tcltk/tclx/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tclx-8.3-argv.patch 802 RMD160 c72517d6ebe1a87de533753bbb7f6bd4b1f18a2c SHA1 45be40016f4082e32d269a28fcd30f961d765540 SHA256 97ddac1f8df238448b482d05a014946b5d6aa279336b2111fe81e9fe108d9bac
 MD5 fa76370803a64a3cf2f0d01a5d1ac3b5 files/tclx-8.3-argv.patch 802
 RMD160 c72517d6ebe1a87de533753bbb7f6bd4b1f18a2c files/tclx-8.3-argv.patch 802
@@ -18,27 +21,42 @@ DIST tcl8.4.2-src.tar.gz 3330617 RMD160 840e480c4328c3d981889ec25d29daf90ddc43d6
 DIST tcl8.4.6-src.tar.gz 3448711 RMD160 c282a1ce3b71d6b91b0b59fbc323d6ce05cba66f SHA1 d21495ca04419fc3b1594b96b19116040c33a3f0 SHA256 b34feacc62442512b8893de06f3fa05e8686a054fe684fb0b848bbdfad782f78
 DIST tclx8.3.5-src.tar.gz 434281 RMD160 b501c1c48b54950ea7fb6d3d6d27ef3e7d58c5a5 SHA1 74092449684d11dd73a4cb91fa3e1442e9e21d47 SHA256 4db028f303908b29b15cb2b97731f87a46a39cd65ab76219b9576f045d0b06ad
 DIST tclx8.3.tar.gz 450328 RMD160 729b608f346d1852c6581032d42bcd2fa6531435 SHA256 96f6e6e01fb6139f9268a06dafcbf15518300335051a5f40f64ac84a328a8bc3
+DIST tclx8.4.tar.bz2 313595 RMD160 96c10fdebfe97f4d2c59b61d1116ca0b3efddf7b SHA1 f75c0b6c77748fc0a6183e25984f8202268d1b78 SHA256 257591f9dffc21cf3ed541a9ef81a3ff5dd739dff5cebb70c4cec7010e2def66
 DIST tk8.4.2-src.tar.gz 3155987 RMD160 52d7a386fe2e06b1251f3ff6358d9ec32c04e3a1 SHA256 11b90629809cd34e5cd162264271919e2586cf53f0d7d7f773c2e2bfbf72c5a3
 DIST tk8.4.6-src.tar.gz 3230760 RMD160 e619afbe971730e94a2c180853ed1ac0166dcffa SHA1 a0b2f364be20c3e312d1ba582d3a1b4b4b1d4d88 SHA256 e93c2ce25059c355ec78b500f01ee1628d534e2f6e81bd95e39b8363c0711bb5
-EBUILD tclx-8.3-r1.ebuild 2069 RMD160 4fab3341ae85ed75c076fd133466f4a941881aea SHA1 23190a81e5ee661e6fdfd3ee2819dea579d601a4 SHA256 c10f39fa883615b6d68ec66c29dedbc0cf71312e5b2c9b8f0133d7bfab87e755
-MD5 c5435205a572201b2e9c92882ee484c2 tclx-8.3-r1.ebuild 2069
-RMD160 4fab3341ae85ed75c076fd133466f4a941881aea tclx-8.3-r1.ebuild 2069
-SHA256 c10f39fa883615b6d68ec66c29dedbc0cf71312e5b2c9b8f0133d7bfab87e755 tclx-8.3-r1.ebuild 2069
+EBUILD tclx-8.3-r1.ebuild 2066 RMD160 923638f157c8c9c43dd71a4e7f063460f231280b SHA1 20b889f683f6a7ad67d0537288281d5fc2136960 SHA256 dff4b239ab6e8e54df94436cb649eab6ed1cd33f9385f25edd86367ba042e890
+MD5 ff82d7d817aa50146140a2a5c062e690 tclx-8.3-r1.ebuild 2066
+RMD160 923638f157c8c9c43dd71a4e7f063460f231280b tclx-8.3-r1.ebuild 2066
+SHA256 dff4b239ab6e8e54df94436cb649eab6ed1cd33f9385f25edd86367ba042e890 tclx-8.3-r1.ebuild 2066
 EBUILD tclx-8.3.5.ebuild 1980 RMD160 ff3aba331bf5a66a19f4cea7ff951eee9356e845 SHA1 b43a6cd8a92666b75ba29a8f0630fad3ed197aa7 SHA256 740006de0ecf877355e6b6bc8b92ad7375fff428bef56ce71d8a3b1841dee5ce
 MD5 02161107b2e482f79f97d1414093c1a5 tclx-8.3.5.ebuild 1980
 RMD160 ff3aba331bf5a66a19f4cea7ff951eee9356e845 tclx-8.3.5.ebuild 1980
 SHA256 740006de0ecf877355e6b6bc8b92ad7375fff428bef56ce71d8a3b1841dee5ce tclx-8.3.5.ebuild 1980
-MISC ChangeLog 3996 RMD160 0cf92d8df62c0c0c1643859c75abc1835a886289 SHA1 692f7d510398151a9b1bd4d05faa02c5739b04c1 SHA256 5120517f1bd9e1680bfba5e266fffca97b5d43c98cf0436d71f17e090baf6708
-MD5 d9cf68fd17fc4a1aebab52ab0c98d86f ChangeLog 3996
-RMD160 0cf92d8df62c0c0c1643859c75abc1835a886289 ChangeLog 3996
-SHA256 5120517f1bd9e1680bfba5e266fffca97b5d43c98cf0436d71f17e090baf6708 ChangeLog 3996
-MISC metadata.xml 310 RMD160 670b51616608433db64d5a9bf9f219f8e6b57d37 SHA1 2d868bc368bbd7eb9cc84c8a786307c20bb163ee SHA256 a4377ecaedab2f9a2a969d7c1fab2a7a621e70a125c5929282e7c0c09af76381
-MD5 1e433c9ae0ffeed4f71f8c2c68e2ebad metadata.xml 310
-RMD160 670b51616608433db64d5a9bf9f219f8e6b57d37 metadata.xml 310
-SHA256 a4377ecaedab2f9a2a969d7c1fab2a7a621e70a125c5929282e7c0c09af76381 metadata.xml 310
+EBUILD tclx-8.4.ebuild 1777 RMD160 8ecb23d7f7204041e5d99a4c3e6f35a0bd2b8e62 SHA1 78425a2d6a435f6bb1bc4cc630ec5ee534812823 SHA256 9c2dc6fbe036ff45f17e2e9465417b26419c5d8293ef4f95c1b02ed55acee3a9
+MD5 b0b4a04543ff53b2c9cfc0b8c3f48f6a tclx-8.4.ebuild 1777
+RMD160 8ecb23d7f7204041e5d99a4c3e6f35a0bd2b8e62 tclx-8.4.ebuild 1777
+SHA256 9c2dc6fbe036ff45f17e2e9465417b26419c5d8293ef4f95c1b02ed55acee3a9 tclx-8.4.ebuild 1777
+MISC ChangeLog 4154 RMD160 af952b8f792033e3288afaaae39276729ef00df0 SHA1 feff061a09848e6c05d1e95219f68d03f6575828 SHA256 b6afdb465742aa880ced3abca7dc6d85b12207d966f0392763583554f2c8ec19
+MD5 0430227919c299519294035cfb7931e6 ChangeLog 4154
+RMD160 af952b8f792033e3288afaaae39276729ef00df0 ChangeLog 4154
+SHA256 b6afdb465742aa880ced3abca7dc6d85b12207d966f0392763583554f2c8ec19 ChangeLog 4154
+MISC metadata.xml 425 RMD160 e228c917c6a30690e8f8f9607036f441d6a1210c SHA1 71f9166f6262809784e926d44a78faaa99a68ea0 SHA256 869bce48c0a21c79321e1fb631b9998ddfb1b89fb9b4f5907b7b03ff0bcfed40
+MD5 f5b0ef6b661f916a64e16551d15708b6 metadata.xml 425
+RMD160 e228c917c6a30690e8f8f9607036f441d6a1210c metadata.xml 425
+SHA256 869bce48c0a21c79321e1fb631b9998ddfb1b89fb9b4f5907b7b03ff0bcfed40 metadata.xml 425
 MD5 7b9980dbdd33eac76e62ea1c76261b2d files/digest-tclx-8.3-r1 702
 RMD160 2e360a1d823235f5ea554977e8824c9fd50b893a files/digest-tclx-8.3-r1 702
 SHA256 c4ca15f0554043b6da69a458bdcfe17590891f5f3359e7eb0ea39a43412ba905 files/digest-tclx-8.3-r1 702
 MD5 c8225ec31cc33e6416206e7ac02b4723 files/digest-tclx-8.3.5 720
 RMD160 fa02fd88f468c81a4a68603e9527182e62c5bc0a files/digest-tclx-8.3.5 720
 SHA256 11530dc4745f4cc1c287dbb0d1dd3d06d0384edc880d387671e9ce38f944e93c files/digest-tclx-8.3.5 720
+MD5 e99a395ec978e100be56d825ee450b25 files/digest-tclx-8.4 705
+RMD160 7a9a81779a52be1bbdf50cde563a7f3e0b88aefb files/digest-tclx-8.4 705
+SHA256 280234a6199e50fed7fcc5d9ef6caf2774313adaf52810a5bf3518f654212eb8 files/digest-tclx-8.4 705
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFSPcdz974XjDVpbkRAqC/AJ9WzPXuNNEsLLnyT9Xrq1H6xNZCAQCguQrB
+JcVcDW/0tRmr9QbFdqNByWg=
+=+jnf
+-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tclx/files/digest-tclx-8.4 b/dev-tcltk/tclx/files/digest-tclx-8.4
new file mode 100644
index 000000000000..aec1562db7cc
--- /dev/null
+++ b/dev-tcltk/tclx/files/digest-tclx-8.4
@@ -0,0 +1,9 @@
+MD5 9009a92dc648775fb8a9b0789b995756 tcl8.4.6-src.tar.gz 3448711
+RMD160 c282a1ce3b71d6b91b0b59fbc323d6ce05cba66f tcl8.4.6-src.tar.gz 3448711
+SHA256 b34feacc62442512b8893de06f3fa05e8686a054fe684fb0b848bbdfad782f78 tcl8.4.6-src.tar.gz 3448711
+MD5 395c2fbe35e1723570b005161b9fc8f8 tclx8.4.tar.bz2 313595
+RMD160 96c10fdebfe97f4d2c59b61d1116ca0b3efddf7b tclx8.4.tar.bz2 313595
+SHA256 257591f9dffc21cf3ed541a9ef81a3ff5dd739dff5cebb70c4cec7010e2def66 tclx8.4.tar.bz2 313595
+MD5 24b7774d54c1c568cabe16f3498ddccd tk8.4.6-src.tar.gz 3230760
+RMD160 e619afbe971730e94a2c180853ed1ac0166dcffa tk8.4.6-src.tar.gz 3230760
+SHA256 e93c2ce25059c355ec78b500f01ee1628d534e2f6e81bd95e39b8363c0711bb5 tk8.4.6-src.tar.gz 3230760
diff --git a/dev-tcltk/tclx/metadata.xml b/dev-tcltk/tclx/metadata.xml
index 24c40b099615..199fdf0248f2 100644
--- a/dev-tcltk/tclx/metadata.xml
+++ b/dev-tcltk/tclx/metadata.xml
@@ -6,5 +6,9 @@
   <email>tcltk@gentoo.org</email>
   <description>TCL / TK herd</description>
 </maintainer>
+<maintainer>
+  <email>jokey@gentoo.org</email>
+  <description>Markus Ullmann (interim)</description>
+</maintainer>
 <longdescription>Extended TCL</longdescription>
 </pkgmetadata>
diff --git a/dev-tcltk/tclx/tclx-8.3-r1.ebuild b/dev-tcltk/tclx/tclx-8.3-r1.ebuild
index 7a6b6b8e25c3..3d5bb0c92b0b 100644
--- a/dev-tcltk/tclx/tclx-8.3-r1.ebuild
+++ b/dev-tcltk/tclx/tclx-8.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/tclx-8.3-r1.ebuild,v 1.14 2005/01/09 12:14:48 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/tclx-8.3-r1.ebuild,v 1.15 2006/11/01 19:35:43 jokey Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.slackware.com/pub/slackware/slackware-8.1/source/tcl/tclx/${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha amd64 ~sparc"
+KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86"
 
 DEPEND=">=dev-lang/tcl-8.4.2
 	X? ( >=dev-lang/tk-8.4.2 )"
diff --git a/dev-tcltk/tclx/tclx-8.4.ebuild b/dev-tcltk/tclx/tclx-8.4.ebuild
new file mode 100644
index 000000000000..374890e83294
--- /dev/null
+++ b/dev-tcltk/tclx/tclx-8.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/tclx-8.4.ebuild,v 1.1 2006/11/01 19:35:43 jokey Exp $
+
+inherit flag-o-matic eutils
+
+MY_P=${PN}${PV}
+DESCRIPTION="A set of extensions to TCL"
+HOMEPAGE="http://tclx.sourceforge.net"
+SRC_URI="mirror://sourceforge/tclx/${MY_P}.tar.bz2
+	ftp://ftp.scriptics.com/pub/tcl/tcl8_4/tcl8.4.6-src.tar.gz
+	ftp://ftp.scriptics.com/pub/tcl/tcl8_4/tk8.4.6-src.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="X"
+
+DEPEND=">=dev-lang/tcl-8.4.6
+	X? ( >=dev-lang/tk-8.4.6 )"
+
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+
+	# Fix bug[s] in configure script #119619
+	local d
+	local srcdirs
+	srcdirs="tcl8.4.6/unix tk8.4.6/unix tclx8.4"
+
+	for d in $srcdirs; do
+		ebegin "Fixing ${d}/configure"
+		cd ${WORKDIR}/${d}
+		sed -i -e "/relid'/s/relid'/relid/" configure || die "sed failed to fix
+		configure scripts"
+		eend $?
+	done
+}
+
+src_compile() {
+	# we have to configure and build tcl before we can do tclx
+	cd "${WORKDIR}"/tcl8.4.6/unix
+	econf
+	emake CFLAGS="${CFLAGS}" || die "emake in tcl/unix failed"
+
+	local myconf="--with-tcl=${WORKDIR}/tcl8.4.6/unix --enable-shared"
+
+	if use X ; then
+		# configure and build tk
+		cd ${WORKDIR}/tk8.4.6/unix
+		econf
+		emake CFLAGS="${CFLAGS}" || die "emake X failed"
+		myconf="${myconf} --with-tk=${WORKDIR}/tk8.4.6/unix"
+	else
+		myconf="${myconf} --enable-tk=no"
+	fi
+
+	# configure and build tclx
+	cd "${S}"
+
+	# we're only building a lib, so it's safe here
+	append-flags -fPIC
+
+	econf ${myconf}
+	emake CFLAGS="${CFLAGS}" || die "emake tclx failed"
+}
+
+src_install() {
+	cd "${S}"
+	emake DESTDIR="${D}" install || die
+	dodoc README
+	doman doc/*.[n3]
+}