6 files changed, 124 insertions, 0 deletions
diff --git a/dev-tcltk/tclx/Manifest b/dev-tcltk/tclx/Manifest
new file mode 100644
index 000000000000..002f32afc67c
--- /dev/null
+++ b/dev-tcltk/tclx/Manifest
@@ -0,0 +1 @@
+DIST tclx8.4.1.tar.bz2 330073 SHA256 a9b41f606ec6c1268b9c78512e6e1cb533bd9ae3e786e650d111fc16ffe758ec SHA512 faad58f5d8e0e1e759da639800f354b583fb01418c94f2274924aa07beb0ee9559beb87b3386ed5ae3694700a71dfe5b8ac54ead0ec75c6963507e9d3ead7060 WHIRLPOOL fd65983cdc51935fb8e7917bb4fc77e9a9822173c644dfdb63afc9e034ce41321a2a28a736039fcb18bcfeb1cd7aa9601000879ac1171c11bdeb266d30f0de41
diff --git a/dev-tcltk/tclx/files/tclx-8.4-ldflags.patch b/dev-tcltk/tclx/files/tclx-8.4-ldflags.patch
new file mode 100644
index 000000000000..40acfda25fd9
--- /dev/null
+++ b/dev-tcltk/tclx/files/tclx-8.4-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index b812bbe..069337c 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -123,7 +123,7 @@ OBJEXT		= @OBJEXT@
+ RANLIB		= @RANLIB@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+-SHLIB_LD	= @SHLIB_LD@
++SHLIB_LD	= @SHLIB_LD@ @LDFLAGS@
+ SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
diff --git a/dev-tcltk/tclx/files/tclx-8.4-relid.patch b/dev-tcltk/tclx/files/tclx-8.4-relid.patch
new file mode 100644
index 000000000000..45fe6876050b
--- /dev/null
+++ b/dev-tcltk/tclx/files/tclx-8.4-relid.patch
@@ -0,0 +1,31 @@
+--- tclx8.4/configure.relid	2006-02-03 16:13:25.000000000 -0500
++++ tclx8.4/configure	2006-02-03 16:13:33.000000000 -0500
+@@ -6999,7 +6999,7 @@
+ 	    # results, and the version is kept in special file).
+ 
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
+--- tclx8.4/tclconfig/tcl.m4.relid	2006-02-03 16:13:43.000000000 -0500
++++ tclx8.4/tclconfig/tcl.m4	2006-02-03 16:13:57.000000000 -0500
+@@ -859,7 +859,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
++		system=MP-RAS-`awk '{print $3}' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
+@@ -2302,7 +2302,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
++		system=MP-RAS-`awk '{print $3}' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
diff --git a/dev-tcltk/tclx/files/tclx-8.4-varinit.patch b/dev-tcltk/tclx/files/tclx-8.4-varinit.patch
new file mode 100644
index 000000000000..08fe7d881191
--- /dev/null
+++ b/dev-tcltk/tclx/files/tclx-8.4-varinit.patch
@@ -0,0 +1,11 @@
+--- tclx8.4/generic/tclXdup.c.varinit	2006-02-03 15:54:38.000000000 -0500
++++ tclx8.4/generic/tclXdup.c	2006-02-03 15:54:53.000000000 -0500
+@@ -202,7 +202,7 @@
+ {
+     Tcl_Channel newChannel;
+     int bindFnum, fnum;
+-    char *srcChannelId, *targetChannelId;
++    char *srcChannelId = NULL, *targetChannelId;
+ 
+     if ((objc < 2) || (objc > 3)) {
+         return TclX_WrongArgs (interp, objv [0],
diff --git a/dev-tcltk/tclx/metadata.xml b/dev-tcltk/tclx/metadata.xml
new file mode 100644
index 000000000000..4cf3132678c5
--- /dev/null
+++ b/dev-tcltk/tclx/metadata.xml
@@ -0,0 +1,13 @@
+<?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>
+	<upstream>
+		<remote-id type="sourceforge">tclx</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-tcltk/tclx/tclx-8.4.1.ebuild b/dev-tcltk/tclx/tclx-8.4.1.ebuild
new file mode 100644
index 000000000000..33af3ceb5e5e
--- /dev/null
+++ b/dev-tcltk/tclx/tclx-8.4.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib versionator
+
+DESCRIPTION="A set of extensions to TCL"
+HOMEPAGE="http://tclx.sourceforge.net"
+SRC_URI="mirror://sourceforge/tclx/${PN}${PV}.tar.bz2"
+
+LICENSE="BSD"
+IUSE="tk threads"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+DEPEND="
+	dev-lang/tcl:0=
+	tk? ( dev-lang/tk:0= )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}$(get_version_component_range 1-2)
+
+# tests broken, bug #279283
+RESTRICT="test"
+
+src_prepare() {
+	sed \
+		-e '/CC=/s:-pipe::g' \
+		-i tclconfig/tcl.m4 configure || die
+	epatch \
+		"${FILESDIR}"/${PN}-8.4-varinit.patch \
+		"${FILESDIR}"/${PN}-8.4-ldflags.patch
+}
+
+src_configure() {
+	econf \
+		$(use_enable tk) \
+		$(use_enable threads) \
+		--enable-shared \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)/"
+
+	# adjust install_name on darwin
+	if [[ ${CHOST} == *-darwin* ]]; then
+		sed -i \
+			-e 's:^\(SHLIB_LD\W.*\)$:\1 -install_name ${pkglibdir}/$@:' \
+				"${S}"/Makefile || die 'sed failed'
+	fi
+}
+
+src_install() {
+	default
+	doman doc/*.[n3]
+}