Revision bump with fixes for bugs 46565 and 58730

5 files changed, 95 insertions, 4 deletions

diff --git a/dev-tcltk/tclx/ChangeLog b/dev-tcltk/tclx/ChangeLog
index 92ae51edede5..c0f328a44f24 100644
--- a/dev-tcltk/tclx/ChangeLog
+++ b/dev-tcltk/tclx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tcltk/tclx
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/ChangeLog,v 1.14 2004/06/25 02:09:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/ChangeLog,v 1.15 2004/08/07 16:49:30 cardoe Exp $
+
+  07 Aug 2004; Doug Goldstein <cardoe@gentoo.org> tclx-8.3.5.ebuild:
+  Fixes for bug #58730 and #46565.
+  Revision bump and this one resolves some previous problems.
+  Now will emerge without having to unmerge prior version
 
   03 Jun 2004; Aron Griffis <agriffis@gentoo.org> tclx-8.3-r1.ebuild,
   tclx-8.3.ebuild:
diff --git a/dev-tcltk/tclx/Manifest b/dev-tcltk/tclx/Manifest
index c7565de56ab6..dc6a2defd320 100644
--- a/dev-tcltk/tclx/Manifest
+++ b/dev-tcltk/tclx/Manifest
@@ -1,8 +1,11 @@
+MD5 6b3b298ce6b86cb1d7bdeb6337512a8e tclx-8.3.5.ebuild 1752
 MD5 204ab8ab95a3a523d61991c826d98c26 tclx-8.3.ebuild 1649
+MD5 1e433c9ae0ffeed4f71f8c2c68e2ebad metadata.xml 310
+MD5 fa8c0775ffecd967c63f07c71e647ba8 ChangeLog 2377
 MD5 458fa931c97225e5933867a9dfcb622e tclx-8.3-r1.ebuild 1977
-MD5 842618b64c1e4895facfe68ee8e4966f ChangeLog 2152
 MD5 1d4e6ad4bf55d13d432197bc480ac445 files/digest-tclx-8.3-r1 188
-MD5 3c218afaa0edc44f1195d0c013f7d85c files/digest-tclx-8.3 180
-MD5 fa76370803a64a3cf2f0d01a5d1ac3b5 files/tclx-8.3-argv.patch 802
 MD5 92db3525521a7be527aaea89eb2aca51 files/tclx-8.3-makecfg.patch 10999
 MD5 f4af4334bd8c05af3b43ee89b4dfb03c files/tclx-8.3-varinit.patch 386
+MD5 fa76370803a64a3cf2f0d01a5d1ac3b5 files/tclx-8.3-argv.patch 802
+MD5 3c218afaa0edc44f1195d0c013f7d85c files/digest-tclx-8.3 180
+MD5 d46f93a255785ed6c5b88a1a065da82d files/digest-tclx-8.3.5 194
diff --git a/dev-tcltk/tclx/files/digest-tclx-8.3.5 b/dev-tcltk/tclx/files/digest-tclx-8.3.5
new file mode 100644
index 000000000000..488fd30b9081
--- /dev/null
+++ b/dev-tcltk/tclx/files/digest-tclx-8.3.5
@@ -0,0 +1,3 @@
+MD5 2cdd06d29f6dfbf31bf4ce192cf46918 tclx8.3.5-src.tar.gz 434281
+MD5 9009a92dc648775fb8a9b0789b995756 tcl8.4.6-src.tar.gz 3448711
+MD5 24b7774d54c1c568cabe16f3498ddccd tk8.4.6-src.tar.gz 3230760
diff --git a/dev-tcltk/tclx/metadata.xml b/dev-tcltk/tclx/metadata.xml
new file mode 100644
index 000000000000..24c40b099615
--- /dev/null
+++ b/dev-tcltk/tclx/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>tcltk</herd>
+<maintainer>
+  <email>tcltk@gentoo.org</email>
+  <description>TCL / TK herd</description>
+</maintainer>
+<longdescription>Extended TCL</longdescription>
+</pkgmetadata>
diff --git a/dev-tcltk/tclx/tclx-8.3.5.ebuild b/dev-tcltk/tclx/tclx-8.3.5.ebuild
new file mode 100644
index 000000000000..bc13b1c96953
--- /dev/null
+++ b/dev-tcltk/tclx/tclx-8.3.5.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/tclx-8.3.5.ebuild,v 1.1 2004/08/07 16:49:30 cardoe Exp $
+
+inherit flag-o-matic eutils
+
+IUSE="X"
+
+DESCRIPTION="A set of extensions to TCL"
+HOMEPAGE="http://tclx.sourceforge.net"
+SRC_URI="mirror://sourceforge/tclx/${PN}${PV}-src.tar.gz
+	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="~x86"
+
+DEPEND=">=sys-apps/sed-4
+	>=dev-lang/tcl-8.4.6
+	X? >=dev-lang/tk-8.4.6"
+
+S=${WORKDIR}/${PN}${PV}
+
+[ $ARCH = alpha ] && append-flags -fPIC
+[ "${ARCH}" = "amd64" ] && append-flags -fPIC
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	epatch ${FILESDIR}/${PN}-8.3-varinit.patch
+
+	sed -i \
+		-e "/^TCLX_INST_MAN/ s:=.*:= \$\{TCLX_PREFIX\}/share/man:" \
+		-e "" "${S}/unix/Common.mk.in" \
+			|| die "sed Makefile failed"
+}
+
+src_compile() {
+	# we have to configure and build tcl before we can do tclx
+	cd ${WORKDIR}/tcl8.4.6/unix
+	econf || die "econf failed"
+	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 || die "econf failed"
+		emake CFLAGS="${CFLAGS}" || die
+		myconf="${myconf} --with-tk=${WORKDIR}/tk8.4.6/unix"
+	else
+		myconf="${myconf} --enable-tk=no"
+	fi
+
+	# configure and build tclx
+	cd ${S}/unix
+	econf ${myconf} || die "econf failed"
+	make CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	echo "installing tclx"
+	cd ${S}/unix
+	make INSTALL_ROOT=${D} install
+	cd ${S}
+	dodoc CHANGES README TO-DO doc/CONVERSION-NOTES
+	doman doc/*.[n3]
+}
+