dev-tcltk/tclx: Version Bump; fixes compatibility with tcl-8.6, #456190

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

5 files changed, 70 insertions, 31 deletions

diff --git a/dev-tcltk/tclx/ChangeLog b/dev-tcltk/tclx/ChangeLog
index 4a4667df300f..cf560e447e7f 100644
--- a/dev-tcltk/tclx/ChangeLog
+++ b/dev-tcltk/tclx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tcltk/tclx
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/ChangeLog,v 1.49 2012/08/01 17:53:21 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/ChangeLog,v 1.50 2013/02/10 13:32:28 jlec Exp $
+
+*tclx-8.4.1 (10 Feb 2013)
+
+  10 Feb 2013; Justin Lecher <jlec@gentoo.org>
+  -files/tclx-8.3.5-configure.patch, -files/tclx-8.3-varinit.patch,
+  +tclx-8.4.1.ebuild, metadata.xml:
+  Version Bump; fixes compatibility with tcl-8.6, #456190
 
   01 Aug 2012; Justin Lecher <jlec@gentoo.org> -tclx-8.3.5.ebuild,
   -tclx-8.4-r1.ebuild:
diff --git a/dev-tcltk/tclx/files/tclx-8.3-varinit.patch b/dev-tcltk/tclx/files/tclx-8.3-varinit.patch
deleted file mode 100644
index 3ad6d677f209..000000000000
--- a/dev-tcltk/tclx/files/tclx-8.3-varinit.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- tclx8.3/tcl/generic/tclXdup.c.varinit	Wed Aug  8 00:12:11 2001
-+++ tclx8.3/tcl/generic/tclXdup.c	Wed Aug  8 00:12:30 2001
-@@ -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/files/tclx-8.3.5-configure.patch b/dev-tcltk/tclx/files/tclx-8.3.5-configure.patch
deleted file mode 100644
index 49821f91b9bd..000000000000
--- a/dev-tcltk/tclx/files/tclx-8.3.5-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- unix/configure.orig	2006-05-12 00:08:06.000000000 -0400
-+++ unix/configure	2006-05-12 00:08:22.000000000 -0400
-@@ -5552,7 +5552,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`
diff --git a/dev-tcltk/tclx/metadata.xml b/dev-tcltk/tclx/metadata.xml
index 30ee235ee80b..013ca797cf0d 100644
--- a/dev-tcltk/tclx/metadata.xml
+++ b/dev-tcltk/tclx/metadata.xml
@@ -1,10 +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>
+  <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.4.1.ebuild b/dev-tcltk/tclx/tclx-8.4.1.ebuild
new file mode 100644
index 000000000000..4ab7f6ffde6c
--- /dev/null
+++ b/dev-tcltk/tclx/tclx-8.4.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/tclx-8.4.1.ebuild,v 1.1 2013/02/10 13:32:28 jlec Exp $
+
+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
+	tk? ( dev-lang/tk )"
+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]
+}