dev-lang/tcl: Fix build system so that autoconf will always be executed and sanitize sed so that tclConfig.sh will be sane, #449134

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

6 files changed, 167 insertions, 22 deletions

diff --git a/dev-lang/tcl/ChangeLog b/dev-lang/tcl/ChangeLog
index 059522727e9f..b9637c0cbca2 100644
--- a/dev-lang/tcl/ChangeLog
+++ b/dev-lang/tcl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/tcl
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.162 2012/12/05 08:51:01 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/ChangeLog,v 1.163 2013/01/09 16:11:29 jlec Exp $
+
+*tcl-8.5.13-r1 (09 Jan 2013)
+
+  09 Jan 2013; Justin Lecher <jlec@gentoo.org> +tcl-8.5.13-r1.ebuild,
+  +files/tcl-8.5.13-conf.patch, +files/tcl-8.5.13-multilib.patch, metadata.xml:
+  Fix build system so that autoconf will always be executed and sanitize sed so
+  that tclConfig.sh will be sane, #449134
 
   05 Dec 2012; Ulrich Müller <ulm@gentoo.org> tcl-8.4.19.ebuild,
   tcl-8.5.10-r1.ebuild, tcl-8.5.11-r1.ebuild, tcl-8.5.13.ebuild:
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 98966c9b4a59..68cfeb534452 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -6,6 +6,8 @@ AUX tcl-8.4.16-multilib.patch 988 SHA256 6df0027ee02c1f458e8ae5f07538e0838317d72
 AUX tcl-8.4.9-strtod.patch 362 SHA256 93fad4cd880492430d5d55730b96a12697a58e951d8145b2b66025bceca10386 SHA512 add67c1b818c045c25202cb59424788824c68925a376ff89dfeaf2beb1cd1c459b392a8dc83bf9277effe454cc6a4a06dd3fb0cdc25e42dfd02e38408612ce0d WHIRLPOOL 8ea1a92f8a0842f8b5fc0ffb728ae41ebe8a2fabad82f181344fa7a1d3fda3fb6ed39af89eef784d22f844d0d3b3c5e73dc7b32903dbd315030f7c12d41bcb9e
 AUX tcl-8.5.10-conf.patch 1046 SHA256 8e2d45102bf125a1d263030032610e153219dc8a709fb115a09f1b6468ac3623 SHA512 e4936ee8162c675afdd4ac2f633bf65a895f2ad6171b3d34d11283363b117951ca5b8a741c8db00c81e34d8eeb4b7a92d06b8285e386e1578b9226fb4364a14d WHIRLPOOL 107343389e76761b54dda20e0a32a25e345ed1449885989a2ee95186cd8c476384b39a2ef5ac1a06f6afa8621ec3501c3d02cf607f89944ad49f26f703410251
 AUX tcl-8.5.13-autopath.patch 869 SHA256 5b57c1581ae495a2348059f61fbc3dda5e8428432e6c3c4223165297ac6fb3c5 SHA512 e28f5a3e9718c294b7df7055b8a51281c1c0f8382018500f7779379d74a4b15d3e9615f32a1d0a2ee3a826559c98092fdfc37be76bc0da867b1bae4f8c1e7dc0 WHIRLPOOL 7b2d681878832db263ffe558bce7586a1290618def7886c9c8e4fa3a3b2a982988aa58e62352a0779b70b6efb639233409ed891e750d0a420617413d08f998f7
+AUX tcl-8.5.13-conf.patch 782 SHA256 21d935dfb65474e3d3211419e3fbf81645a575f433ff0f12cbd72d51f7d0a47f SHA512 d0e354398f729cc9fda233197f99ed639d11b101a3a5a8e32376e2a3936a71752e42fd1cfcb49f20657e6a5389018119a3fa8afe84b7718cb47eb94ce3193ccf WHIRLPOOL 84c8c55ea533d3c7b40e1d9d242f3b142cd222c55c40ef83f872f048b70420deddfc66d3fd6711298077e149098f9807634779c9e937d9984b3752ace85954b0
+AUX tcl-8.5.13-multilib.patch 419 SHA256 c4f48ee5e162635de90db5d0bcd123982fc0df2da01ab74cbfd97e0d30b5cddb SHA512 946a0274facb0dcefb2129beea14dd8b874558803f8da612c6c00d844270cd9c797089f8e5b21d4f11d206dcfb7bea92ab00b96ce7db4217efc18b82f197347c WHIRLPOOL edd7065d687a011f8eac0a4faaa76f44dd40522e901716c9521a3236b502312699d549a4b4b69c6a7cbf793dab4ef3292fcca9e125462fb150df31ec9a30e13b
 AUX tcl-8.5.9-gentoo-fbsd.patch 475 SHA256 5f7c415260c124f7515b8621535ba277add91b584149283543a92f5f2613dc75 SHA512 4cab5fefca03337a9f74e0df330d055ff9ebb930a3a84ef84aa45399faf9685f4a7c5c9f86b1bc71dd8a13b7ed7b42ac4485081f358f5fd28892e6ff277a2a63 WHIRLPOOL 02454a19ac2c1a25306676306b4c13fb882463c577545b65a3e3aaf93f6b3e0eb5b91c6e2c86fae601c5a7b1dc2bf6ec99be75aa4b335a16008a55427cd27d4d
 AUX tcl-8.5_alpha6-multilib.patch 830 SHA256 5686025ce4e685afcf06cafac591a91a5ccd10f952c422cf01b4f72263023d55 SHA512 1a999bd61f8ce4f07c3e985380aa38de36e336e4fcb58170a02f198fcb61416eb57f1b2bf611c4dbb76cee4f617903edb46fb9241d86910d5765ae1cd564f635 WHIRLPOOL 7771c42a89c65e1adf3bd2b95f89fa3d1700a37847b77da0ac961886406aa1842ec4e85f70f0042ea3389df635dc2555d2cf4c820aa241c0c3497a866ac877f4
 AUX tcl-8.5_alpha6-tclm4-soname.patch 486 SHA256 af3c3ea0b0d6c37c666d2fb54cd9891c273c90ebaea4a4707583076faffb2925 SHA512 6d884f34672a523c17c55b770bb4c94e360f56109908aa59c4a0721edbff1ab443dbc97a7ce0f2f3b0f7e290de23ace70b337c8b9aea719be4fa8e4d4d698f3e WHIRLPOOL cc651da9d5e10dfe969612c3e25b0e4452da0867348f13fc8c8d61e18bc6c34b855ac789aecc65a0bf9e2438aa59ec9078ec858cf5562a2cffdf34a308a1dbcb
@@ -17,23 +19,14 @@ DIST tcl8.5.13-src.tar.gz 4513204 SHA256 9b868dd563e65671a26fcf518b6b86c1bb1b675
 EBUILD tcl-8.4.19.ebuild 3598 SHA256 60b9183da3ba9c3a24864f602596b65efd400dcf966587ee68f7b3428e25b4f8 SHA512 ae91890a772eebbbc8ee53312519286a18579af22e2599a4aa12f13e04e6a37d209a353191a04ddb6e48e891316c2cddb1bd315cc365028e5c46d34fc85466a7 WHIRLPOOL 258d4dc667abcfc1da6d654311d1b773b4721c02ea37ff0c782692b35c6e9d2b22a2ec0dbd45be65c5656fb6b101d50d3c1d45763a821d55717e3cf5b79956de
 EBUILD tcl-8.5.10-r1.ebuild 3800 SHA256 37ec81ebf34952645df4d4b758abbdd09c45bfe71c08bfe97618a4de69660468 SHA512 2653d93056717bc55772a1299b105c9f3ca2431eb4fa86e2353cfca36055c71e33a50fc16b1b4651edca12d9251801e3559e0f401a8dd9e467967bc7e910a044 WHIRLPOOL 66f517091e8585f3b3816e08cc927fb9c07769e7841da784a1d43f12d7d2ac2d14dbbca36cdb9e0f8f817a0f2cd5d2463c48a66b8f3bce6073c0e83c10116fcd
 EBUILD tcl-8.5.11-r1.ebuild 3986 SHA256 1c8566d27d217d9364e4b305b61bf10e29d53c14045684812b4551bd329deb9b SHA512 979e7c3b81b46ca82830913b5dad46b75c8b4933590614e343ab8431938254c3b91776034ee974c1f91438542ab7c8f737f2306782a278725a03997b090ac96d WHIRLPOOL 030184177f715a8966b277641b6e980405837bab7fea60cbfc617c6af242ba77565993e5b2d707f78d908b7559b1afb0b464254cc6817514229f4460cc9d5cd7
+EBUILD tcl-8.5.13-r1.ebuild 3611 SHA256 8a52104ec94ea3c6c6db9cbd3fffe0c4e6190ceffdaee1f1cc589f8d56934457 SHA512 c58abe55d4cdc8e313ce09f343b464ab2dda165e7c269d3038423b0ba316abb901a0b2e185519c0d32d452b68dfe585ffd044832a261a35085b88a21c3543d63 WHIRLPOOL e1b36567f0345323502aecc6c1f9da81ae0bdb22b83ce2d23af908b5bdbba4a4973bf76b55fe8153af9c9e195d12fafb8aee1cd8366ca026841f98bf7abd7869
 EBUILD tcl-8.5.13.ebuild 4060 SHA256 dcb37fa88d342f7f5221fc8eaa3cc8ccaf5efffd83810c12f042a41f52623480 SHA512 32362c83c9733da355f240cc9e280a5a8f4edda5c6609a811852254c8646a9f450d8a7fc684e586f9a0219c2f4b0087b01879c1896301e1147fc234fc04e218f WHIRLPOOL b9c6b6130f63c20f8be360493c1259635d083a401b07a0e5904548dc85bb20c561be6998e7074e511c52daa2d7f4e207e732d07b4412dec2722f0f335dff2bba
-MISC ChangeLog 20981 SHA256 75646bf4127857702c0725beb0443468b5a8aa45ef8241556342ebb5f92939c6 SHA512 3a95f32351ed89ffa58d27800b941287094e67715219b4f46f560c856d7462e23535d0ebc9a76f8d10cb1b4fe7b98b8a77b81ab69eeccfc68b275dfd75bc6d6c WHIRLPOOL f15cc8f8edd06ffe368695337631ab73c3e025437f379213f21016fdaf44a26ffda0e2c2ee15d8fb8a3495bed58f895e9c7c8e289ab8c88622f2d8bc954e2a5a
-MISC metadata.xml 264 SHA256 01ce19dabf2e53a73d86e4b16f653c6cd2b6c9aca1b79ec095f353315c8b84ee SHA512 cc2af42208bde17fcf6c9e6c92d7e61b476b0885a87dff97827a47f411d7d3fe8fae0432a3aef3308bbdfe6c57e3eb3f436d5eb4b61f22168032f7a04e491d5c WHIRLPOOL e305bf9fd49aae01d76aa91347fcad9641b7a1d8c4697d9000d79a18a8100e94c6520869b131cfc97b2d782fe8603ac1e8ae66448541399529487fb321c15d46
+MISC ChangeLog 21285 SHA256 910b2c9dd7ff5f8f34ca6a32044f0431b1eab5659edf53d483669bc78a37d180 SHA512 5a1b137382d50060fdb20ae1dd84da9ed231f03a99c5fefd8f74427dd57c90a823356e0cd2c32ac808308012934b22c32111549f5088581547f436c4f75ea7b8 WHIRLPOOL 2c661b4c8f008f85c278c1b7776dd0bfe92e8cda50278825b2e8bb76eaddf3b1a60fe079952c235c0d44a627df3ac63884682542dcf6914b5bc12cacfed0e3e4
+MISC metadata.xml 271 SHA256 55e82636b02ffc7d7c033812851e6bf197a6e2b797fb8b5ee13c59c31246a0ba SHA512 f667a280785dbd69bfb4a0d78cc197e40196a2017f6f9c7fc3e4ed8846dda9608b2e9c9b01b94ab0d57b445fb3080d5fdcfc48d40def19bf90a5edaf188c5372 WHIRLPOOL 1447b7739ba725f572bb5c713d56867e3c5fc2dbad4bfd708d5b2ca8d50e74ff24bda238a3d30aaebb50457a87a8e9528c573fc3a443b6ee12e85a2b24514eeb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQvwtQAAoJEDxpGckxwJCBjuMP/3EO5vegzPaQFjhfJ0+0OlKU
-eDHdFDffckFrcmDH3Jh1hKBjYUqWxLPSsG/L7tVowucLjBQ9iBqyD75KAW2kGofv
-IadYAf6tiuDMdHZEsvSV1/qjF72/3VU1Dti7Rm1aBJmuVC/xFezmd7dZp3WkSm0G
-zJpTHMryGTzWzmI+nZaoEyJR4VkOtIOYEslMYs8YirnQXqlYAhhAue/Sw22Lh6aw
-HYCX4v5Gd7aVgBP/mqXV+5qc4IOtYp+rjMtnx+6I2T5RfJ9DJCOFlHkQj/3rVl4G
-0vM5jIYZP3UMZHS9sVa6uvBWn+C2dnE1sBhGIjmikhuyDFiCNHGKcxKMQv9Kr3FC
-BnUk2B5zyy0a8telE0dfDwh+fe2jzOv0ZgQwxyj5Duu3307kuesuqm2GSs9vw5Ml
-m5r7QB9tiAkN5NOgMf3F0CCodCd6O49NfZeNJfOYnIlkGgyAftsaljrnS25JrbsR
-4XMsGbNl9ikGMiIAzcVK0hnnnWgkgwxu7xUbOxASxOSjvnKkqq/oNHmiOCvqswGH
-gpdWa4Ks+PWz0nTbaXd04TGX7TTjBcWr3ZOTa4caTapoWBVX2cSyGWRqFlcGTJZE
-VxX2u4DZj332noTSsuVm7Jft1VFSPDbjTTqRPvNsJ6Yvu1zEiCzWwlm96Rw7KIs0
-5hSiQG+T7OisoDplCFZM
-=Ka/V
+iEYEAREIAAYFAlDtlrIACgkQgAnW8HDreRbPaQCcCI1AAQsjvpA5SF8pqCrXZExz
+ZPQAoLKgFv2wkLKAn+7ctzSrT+ghM8S3
+=eR4Y
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/tcl/files/tcl-8.5.13-conf.patch b/dev-lang/tcl/files/tcl-8.5.13-conf.patch
new file mode 100644
index 000000000000..2d7493c3b3d6
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.5.13-conf.patch
@@ -0,0 +1,20 @@
+--- tcl8.5.0/unix/tcl.m4.conf	2007-12-20 10:48:05.000000000 +0100
++++ tcl8.5.0/unix/tcl.m4	2007-12-20 10:48:52.000000000 +0100
+@@ -1427,7 +1427,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    # get rid of the warnings.
+ 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
+ 
+-	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
++	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS} -fPIC -Wl,-soname,${@}'
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+@@ -1464,7 +1464,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_SUFFIX=".so"
+ 
+-	    SHLIB_LD='${CC} -shared'
++	    SHLIB_LD='${CC} ${CFLAGS} -shared -fPIC'
+ 	    DL_OBJS=""
+ 	    DL_LIBS="-ldl"
+ 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
diff --git a/dev-lang/tcl/files/tcl-8.5.13-multilib.patch b/dev-lang/tcl/files/tcl-8.5.13-multilib.patch
new file mode 100644
index 000000000000..de1580ce55bd
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.5.13-multilib.patch
@@ -0,0 +1,12 @@
+diff -Naur tcl8.5a6.orig/unix/configure.in tcl8.5a6/unix/configure.in
+--- tcl8.5a6.orig/unix/configure.in	2007-04-27 02:33:51.000000000 +0900
++++ tcl8.5a6/unix/configure.in	2007-05-16 10:27:25.000000000 +0900
+@@ -645,7 +645,7 @@
+ 
+ eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
+ 
+-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
++TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ 
diff --git a/dev-lang/tcl/metadata.xml b/dev-lang/tcl/metadata.xml
index 49d2ef532cf7..37454548c87c 100644
--- a/dev-lang/tcl/metadata.xml
+++ b/dev-lang/tcl/metadata.xml
@@ -1,9 +1,9 @@
 <?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>
+  <herd>tcltk</herd>
+  <maintainer>
+    <email>tcltk@gentoo.org</email>
+    <description>TCL/TK Herd.</description>
+  </maintainer>
 </pkgmetadata>
diff --git a/dev-lang/tcl/tcl-8.5.13-r1.ebuild b/dev-lang/tcl/tcl-8.5.13-r1.ebuild
new file mode 100644
index 000000000000..0797a508e816
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.5.13-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tcl/tcl-8.5.13-r1.ebuild,v 1.1 2013/01/09 16:11:29 jlec Exp $
+
+EAPI=4
+
+inherit autotools eutils flag-o-matic multilib toolchain-funcs versionator
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tool Command Language"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="debug threads"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+pkg_setup() {
+	if use threads ; then
+		echo
+		ewarn "PLEASE NOTE: You are compiling ${P} with"
+		ewarn "threading enabled."
+		ewarn "Threading is not supported by all applications"
+		ewarn "that compile against tcl. You use threading at"
+		ewarn "your own discretion."
+		echo
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-multilib.patch
+
+	# Bug 125971
+	epatch "${FILESDIR}"/${P}-conf.patch
+
+	# Bug 354067
+	epatch "${FILESDIR}"/${PN}-8.5.9-gentoo-fbsd.patch
+
+	# workaround stack check issues, bug #280934
+	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
+
+	tc-export CC
+
+	eautoconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable threads) \
+		$(use_enable debug symbols)
+}
+
+src_install() {
+	#short version number
+	local v1=$(get_version_component_range 1-2)
+	local mylibdir=$(get_libdir)
+
+	S= default
+
+	# fix the tclConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TCL_BUILD_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
+		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
+		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L${SPARENT}.*unix *::g" \
+		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:${SPARENT}.*unix:${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TCL_LIB_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
+		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
+		sed \
+			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tcl${v1}/include/unix
+	doins "${S}"/*.h
+	insinto /usr/${mylibdir}/tcl${v1}/include/generic
+	doins "${SPARENT}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
+
+	# install symlink for libraries
+	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
+	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
+
+	dosym tclsh${v1} /usr/bin/tclsh
+
+	dodoc "${SPARENT}"/{ChangeLog*,README,changes}
+}
+
+pkg_postinst() {
+	for version in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 8.5 ${version}; then
+			echo
+			ewarn "You're upgrading from <dev-lang/tcl-8.5, you must recompile the other"
+			ewarn "packages on your system that link with tcl after the upgrade"
+			ewarn "completes. To perform this action, please run revdep-rebuild"
+			ewarn "in package app-portage/gentoolkit."
+			ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
+			ewarn "upgrade them before this recompilation, too,"
+			echo
+		fi
+	done
+}