dev-lang/tcl: Version Bump, #444296; Cleaned old

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

4 files changed, 45 insertions, 58 deletions

diff --git a/dev-lang/tcl/files/tcl-8.4.11-multilib.patch b/dev-lang/tcl/files/tcl-8.4.11-multilib.patch
deleted file mode 100644
index 8ada22d8f93e..000000000000
--- a/dev-lang/tcl/files/tcl-8.4.11-multilib.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur tcl8.4.11.orig/unix/configure tcl8.4.11/unix/configure
---- tcl8.4.11.orig/unix/configure	2005-06-30 01:40:33.000000000 +0900
-+++ tcl8.4.11/unix/configure	2005-07-02 20:23:23.000000000 +0900
-@@ -7664,7 +7664,7 @@
- DBGX='${TCL_DBGX}'
- 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'
- 
-@@ -7788,7 +7788,7 @@
- 
- if test "$FRAMEWORK_BUILD" = "1" ; then
-     TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
--elif test "$prefix" != "$exec_prefix"; then
-+elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then
-     TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
- else
-     TCL_PACKAGE_PATH="${prefix}/lib"
-diff -Naur tcl8.4.11.orig/unix/configure.in tcl8.4.11/unix/configure.in
---- tcl8.4.11.orig/unix/configure.in	2005-06-30 01:40:33.000000000 +0900
-+++ tcl8.4.11/unix/configure.in	2005-07-02 20:23:12.000000000 +0900
-@@ -459,7 +459,7 @@
- DBGX='${TCL_DBGX}'
- 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'
- 
-@@ -552,7 +552,7 @@
- 
- if test "$FRAMEWORK_BUILD" = "1" ; then
-     TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
--elif test "$prefix" != "$exec_prefix"; then
-+elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then
-     TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
- else
-     TCL_PACKAGE_PATH="${prefix}/lib"
diff --git a/dev-lang/tcl/files/tcl-8.5.10-conf.patch b/dev-lang/tcl/files/tcl-8.5.10-conf.patch
new file mode 100644
index 000000000000..dd90b06a6e55
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.5.10-conf.patch
@@ -0,0 +1,26 @@
+--- 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,12 +1427,12 @@ 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"
+ 	    AS_IF([test $doRpath = yes], [
+-		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
++		CC_SEARCH_FLAGS=''])
+ 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ 	    AS_IF([test "`uname -m`" = "alpha"], [CFLAGS="$CFLAGS -mieee"])
+ 	    AS_IF([test $do64bit = yes], [
+@@ -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-autopath.patch b/dev-lang/tcl/files/tcl-8.5.13-autopath.patch
new file mode 100644
index 000000000000..77f0ca6ced0c
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.5.13-autopath.patch
@@ -0,0 +1,19 @@
+ unix/configure.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/unix/configure.in b/unix/configure.in
+index 65f712a..b606b74 100755
+--- a/unix/configure.in
++++ b/unix/configure.in
+@@ -840,9 +840,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+     test -z "$TCL_MODULE_PATH"  && \
+ 	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
+ elif test "$prefix/lib" != "$libdir"; then
+-    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
++    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}"
+ else
+-    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
++    TCL_PACKAGE_PATH="${libdir}/tcl8.5 ${prefix}/share/tcl8.5 ${libdir}/tk8.5 ${prefix}/share/tk8.5 ${TCL_PACKAGE_PATH}"
+ fi
+ 
+ #--------------------------------------------------------------------
diff --git a/dev-lang/tcl/files/tcl-8.5.8-fortify.patch b/dev-lang/tcl/files/tcl-8.5.8-fortify.patch
deleted file mode 100644
index 0cfce74f0cc0..000000000000
--- a/dev-lang/tcl/files/tcl-8.5.8-fortify.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix buffer overflow with GCC 4.5 -D_FORTIFY_SOURCE=2.
-https://bugs.gentoo.org/317727
-
-https://sourceforge.net/tracker/?func=detail&aid=3048354&group_id=10894&atid=310894
-
---- a/generic/tclTrace.c
-+++ b/generic/tclTrace.c
-@@ -909,7 +909,7 @@ TraceVariableObjCmd(
- 	    }
- 	    ctvarPtr->traceCmdInfo.length = length;
- 	    flags |= TCL_TRACE_UNSETS | TCL_TRACE_RESULT_OBJECT;
--	    strcpy(ctvarPtr->traceCmdInfo.command, command);
-+	    memcpy(ctvarPtr->traceCmdInfo.command, command, length + 1);
- 	    ctvarPtr->traceInfo.traceProc = TraceVarProc;
- 	    ctvarPtr->traceInfo.clientData = (ClientData)
- 		    &ctvarPtr->traceCmdInfo;