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

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

6 files changed, 78 insertions, 40 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/Manifest b/dev-tcltk/tclx/Manifest
index d94ef8d7f3df..c049aa755011 100644
--- a/dev-tcltk/tclx/Manifest
+++ b/dev-tcltk/tclx/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX tclx-8.3-varinit.patch 386 SHA256 7415da5026eab39fa272bd2e0b145cc6030f3a32a95fefc72d0ec9977f364cab SHA512 3eef30a2240afa239a5506da5ec726c8263e8dd3e960ad1eafa6e01c2babf63312320f876d7ac40d11d06423ebe5d4465e2db1db9e70a247e74de4b457a7eaa8 WHIRLPOOL f5adb5eb9eac577868e4876688e9253fa52932c340f6341bbf7e8b8c8617facbadf217611e0d36e7e9d170dc9367df391c52f9b34af6d6aca508ade9e898b0a0
-AUX tclx-8.3.5-configure.patch 448 SHA256 01ef10236ee23aaf868c5cd92416ca9e7db1fda103400f63acda0073f56b3dc2 SHA512 20ff2e2610b4ed59476709e789328d5724d94866fb0f872ceca601331cc11932f91b621ed0ae98782a8d6c4ffbf3bcfe86dec7e16ccba96fcd6c6aab615f6caa WHIRLPOOL df850a6d5c4d3c3e35520243cf686251b9f8e4db7b48745cd96fc0f24bdd1e0042c3a9fdad67574031a4606530b1cde5ccd31cea4cc541b7e207c20fe4060634
 AUX tclx-8.4-ldflags.patch 359 SHA256 f5efa346f10c8d8ecb1f650d0f9d4fd32c2cea9e24aaf49e8db54913ef04ce36 SHA512 a7fdd81a615222b805ab1dcb85a619b2621a187a39602f5d64dcf36027a1ee6e616328a7463f4cb9b6fe60169c887c925d133dc1df1cb20f9cb419ba13c870f1 WHIRLPOOL b839b1bb459c0ab6ef62b2bbe71a26c6557210eac83ddd4e35231240f53bcca4fedfa1a1ce4451e41869b0b2d7372de46b441f23c1bfa2386f3c329c81e92607
 AUX tclx-8.4-relid.patch 1262 SHA256 5c3af1c3e2842516049d1b639469c92f621f6ea97821c06b0ad097eb2fdb1e01 SHA512 bd0a9d3c5da80fa6fe4c98f3eb72b8523bfaa3932743e5c54404173b174e08bf32b5db64f62df593c8ff48371c0611100e01d7d4f9c1a6bfa6a7aff646da5ec3 WHIRLPOOL 5c4e17cf5ed5dbfef234e9c2d37a1aa94c4f6217f07a7212288eccd306814e2defa97304012128179a4f6bdf1b22ad2731ac21c4907a882e78301fa1928d43c3
 AUX tclx-8.4-varinit.patch 399 SHA256 3770fea219c9639c53f6380453850e3191b52cc2ff48896aff8658d737df0624 SHA512 68f4e8a1bd1be1f98e286cf4ccba0a97aca2613c13059f8e06e446e376c4ebb8e66d16bbe5e5972e761a58417bb67fcc34b000ef0c95b740a4ad6801f8b43353 WHIRLPOOL 74ed1c52800f872a5fae77928b6cac7d8671f680c4a76c1e56f92cc42bf1ec83f085c13dbc8879d25a546c3003e8adaf6f0bbea02b730a9fa017838c424f92d3
+DIST tclx8.4.1.tar.bz2 330073 SHA256 a9b41f606ec6c1268b9c78512e6e1cb533bd9ae3e786e650d111fc16ffe758ec SHA512 faad58f5d8e0e1e759da639800f354b583fb01418c94f2274924aa07beb0ee9559beb87b3386ed5ae3694700a71dfe5b8ac54ead0ec75c6963507e9d3ead7060 WHIRLPOOL fd65983cdc51935fb8e7917bb4fc77e9a9822173c644dfdb63afc9e034ce41321a2a28a736039fcb18bcfeb1cd7aa9601000879ac1171c11bdeb266d30f0de41
 DIST tclx8.4.tar.bz2 313595 SHA256 257591f9dffc21cf3ed541a9ef81a3ff5dd739dff5cebb70c4cec7010e2def66 SHA512 f74e7e30e7a73caffbdd47c793c97e1d4dc3687e206c9254d0cc5024b0deeb702f0c1d4b794e1193a87fa1069ac507a53a81d1232abebaba6e75b6720b1ebd57 WHIRLPOOL a6f4beac9d05338a16107d6293b01b242d73a82e7450fd21c0d63dfde52999c5e2a284c8380784f8d6cc1fd9e06d5bd20f5d57fad90151276ee7daa5fae53997
 EBUILD tclx-8.4-r2.ebuild 1157 SHA256 faa87bf9660bbf1146aac7d8570116475630181547d5aa211531f73582662a9c SHA512 40ab90e759939f50a5cacb97665563269f117d918fbefe66cab8ebaa95fbb096c62e8157128b24746dbc10c9e355ed07a538dd116efbe0c16f1df0a873be775d WHIRLPOOL 476785bbf35a166aafb042c94f7e8586f34085d3eab56a57dfe12452d5c4c419706984003e9e8601e8b16acd1cfd852ec2231173bb931044fb4ab23725a29c32
-MISC ChangeLog 6598 SHA256 fd6809136edfcad81aa8e8b2b667a08f9216de388a8b21f8c3e964307238f2cb SHA512 dbecd5f0220d47d1881fcdf58f12fd3a4e109f13834b0caa82412e8f94507dd315afb4360e602a4c48f83958f5a7bea84f94f5dd005f087eee8ac6cd2cab7896 WHIRLPOOL 8e0738b62854bc301492671e2b042b053ca1102e525839cb5046cf37514e4d0ca8c953e4c72005e1b54ca34adfd8f7418f35d5a18d7b04bed545e0f41b14dba4
-MISC metadata.xml 314 SHA256 8b76ffc6d3c0a3f72c3fa0845b6937b620bcebe0dc27878a73528dd09d8243d7 SHA512 24e1e1feced6d7d8e9799c4d61d4e5e5967ba4183be5a8a04f25c47720c47ba8e77ecee38230aac3c9ee71115c6bba40d362fc0df1993b0d37429f13c4e09103 WHIRLPOOL 3e068477719ef04c9bfbff435898795bfe0111f9b2f53ebc008fa67ad4d28000b56696301e10f8ed9516d3993dca76bb40c05071895209dc033ddb19b48eb8fb
+EBUILD tclx-8.4.1.ebuild 1227 SHA256 8d6db0e73ce2412aed8ef276e49c1270ca2655f60da4d2a56b3e5e12b800dd5e SHA512 658d658f0d574af96ce29c7777d5a9776dbda7f6b718342c0b5a6fe2b931d829298cfbb2b3234bb3f15e07902aaffd716ad7abc6f36abcb6e5c2e786937f9ed5 WHIRLPOOL d5bf07f3934739c93c4f6224e3666e4c4b126735b3c2bcd934dcb6a7d52fb8edbce1b671f879823835bcb8d1d426570c04041195825f919eee95de6cfece64b0
+MISC ChangeLog 6835 SHA256 c5fbc211a733c63270c021cbb3497cf3bcfbcf65bda1718e78562d9cab40e23b SHA512 95601c8638775d8dcdabd14d9153893c8487580aeb8b85dece0950fc12a0371f28f62c72e01c182b3d94485e6145301200859eb879a35213061c82330e5c9da5 WHIRLPOOL 45cbbb00b98b2de2d9d68960f8d33f0c1b5aa2ab80ca3930572c0429fdb167ee3f47c45a22fbdd6efec1e8d39dc552ca5bd20deab520a9869004a6fd29964496
+MISC metadata.xml 322 SHA256 2151424074accf8f72a1382674eceb6487ce89e1546d14b481f329c6406662f5 SHA512 b18316a90df9c5f505367d496691f93c5f29ba90399083c18c3340478d645100fa2511153fb75789224ea7d8790e6b4215cc99b8483dec368f0a264b4297f0ae WHIRLPOOL 66e84bed79195d1675fb41053311ceb1e283873cc9a16e7a1dd432dc25601ee8aedd86f6db994ee8353ae7d05cb14baa9af249bd4dccd11c7f02745b88059a3d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlAZbRYACgkQgAnW8HDreRan0ACgvyRb3xLzZVrLw+qSoRyqqe7T
-UmIAoJt4KhqOLlzyzsDA6eloV+qpHQZT
-=ou46
+iEYEAREKAAYFAlEXoaQACgkQgAnW8HDreRZFIgCeIZqLN9uu+TcpeM1cDcvWu6q9
+SFcAmgIH0sGqCHwZ3d73mAexzqDToxYT
+=lGEy
 -----END PGP SIGNATURE-----
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]
+}