dev-lang/tcl: Sync with Gentoo

It's from Gentoo commit 794061a3298b5716db015defa7b3e2c583b73980.
2025-09-26 16:11:56 +02:00 · 2024-08-02 16:45:54 +02:00 · 2024-08-02 16:45:54 +02:00 · 9f0b63aaf2
commit 9f0b63aaf2
parent 674a9ceeda
8 changed files with 325 additions and 7 deletions
--- a/sdk_container/src/third_party/portage-stable/dev-lang/tcl/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/tcl/Manifest
@ -1,2 +1,4 @@
 DIST tcl-core8.6.11-src.tar.gz 6041050 BLAKE2B 9c41d5ae5d22627b903d18c5ca607d4a2647d7af65d3029a463cf571d3fbe0bd48e15fef643e81de94296777985a36530a83718d4eb7befca4bc107ab860cc0d SHA512 fe3556c37305e3856743e9a202a320d44b1b3cbc926a1b7a4449ae5baf2f8df92214a9aa06f0a87645d032857fb71458fc864ff007fd73da60463ae5001f2d3f
 DIST tcl-core8.6.12-src.tar.gz 6064625 BLAKE2B 30dc780562aa6955e2c417798cc96fabd23e947cee81146dc192156598e3c43f588864aab4392d62901b8964cf59bedb6cad1f064e32b03dd9733b3a0a7b5c8a SHA512 7144a50d19d3855edbda14b538cc94fe26c0dd357b979676c3fe02d599dab61ba777bf14f6aaebb63e238aeff1d0bad25ea7b0ff31b2398468f67fc0a305b9f3
+DIST tcl-core8.6.13-src.tar.gz 6370805 BLAKE2B f5af3c0fa2d52c09ab16578c9147cb5ac4a06b81882c49f1ef23642bed32adccbe2a5acbddc5d18bd1757e1991daf864707d842e675f92c6de70be6f4275b95e SHA512 c1c953ac0f9a530d8256514c0cb78f166d0063db725b87fa19272716a955cd390ff8f1c5f17e791cf463284d88bb136d61194779a913a6a78f46146d485c71ee
+DIST tcl-core8.6.14-src.tar.gz 7081644 BLAKE2B 7148c889954d78774c4352ceae5d814498a1670423a2b3ed288786dce97b87d42395b817ef92fc6561358d84736619ef03d1c2e2c502433c4b3f5eb7c80a62e8 SHA512 495b13af817c68d81533c45345d003efd711ddbc5c1a3d1fbbdb10452fa62d91e649f77835239e547355ade84abfea6ae843d2e76de6108532054170a672ddc0
--- a/sdk_container/src/third_party/portage-stable/dev-lang/tcl/files/tcl-8.6.12-configure-clang16.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/tcl/files/tcl-8.6.12-configure-clang16.patch
@ -0,0 +1,31 @@
+https://github.com/tcltk/tcl/commit/5eb33c5c7e9d6b703275b680f337691ecfe38f2a
+
+From 5eb33c5c7e9d6b703275b680f337691ecfe38f2a Mon Sep 17 00:00:00 2001
+From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
+Date: Sun, 7 Nov 2021 21:34:08 +0000
+Subject: [PATCH] Fix [15845d9fd8]: unix/tcl.m4: implicit declaration of exit()
+ in timezone variable checks
+
+--- a/unix/tcl.m4
+++ b/unix/tcl.m4
+@@ -2349,7 +2349,8 @@ AC_DEFUN([SC_TIME_HANDLER], [
+     # (like convex) have timezone functions, etc.
+     #
+     AC_CACHE_CHECK([long timezone variable], tcl_cv_timezone_long, [
+-	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]],
+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>
+#include <stdlib.h>]],
+ 	[[extern long timezone;
+ 	    timezone += 1;
+ 	    exit (0);]])],
+@@ -2361,7 +2362,8 @@ AC_DEFUN([SC_TIME_HANDLER], [
+ 	# On some systems (eg IRIX 6.2), timezone is a time_t and not a long.
+ 	#
+ 	AC_CACHE_CHECK([time_t timezone variable], tcl_cv_timezone_time, [
+-	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]],
+	    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>
+#include <stdlib.h>]],
+ 	    [[extern time_t timezone;
+ 		timezone += 1;
+ 		exit (0);]])],
+
--- a/sdk_container/src/third_party/portage-stable/dev-lang/tcl/files/tcl-8.6.13-tclConfig-TCL_PACKAGE_PATH-braces.patch
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/tcl/files/tcl-8.6.13-tclConfig-TCL_PACKAGE_PATH-braces.patch
@ -0,0 +1,16 @@
+https://bugs.gentoo.org/892029
+https://core.tcl-lang.org/tcltls/tktview?name=37bbdb9fb2
+--- a/unix/configure.in
+++ b/unix/configure.in
+@@ -866,9 +866,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+     test -z "$TCL_MODULE_PATH"  && \
+ 	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl"
+ elif test "$prefix/lib" != "$libdir"; then
+-    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${libdir}} {${prefix}/lib} ${TCL_PACKAGE_PATH}"
+    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
+ else
+-    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${prefix}/lib} ${TCL_PACKAGE_PATH}"
+    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
+ fi
+ 
+ #--------------------------------------------------------------------
--- a/sdk_container/src/third_party/portage-stable/dev-lang/tcl/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/tcl/metadata.xml
@ -3,9 +3,11 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>tcltk@gentoo.org</email>
-		<name>TCL/TK Herd.</name>
+		<name>TCL/TK project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="cpe">cpe:/a:tcl:tcl</remote-id>
 		<remote-id type="sourceforge">tcl</remote-id>
+		<remote-id type="github">tcltk/tcl</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/sdk_container/src/third_party/portage-stable/dev-lang/tcl/tcl-8.6.11.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/tcl/tcl-8.6.11.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -9,11 +9,11 @@ MY_P="${PN}${PV}"

 DESCRIPTION="Tool Command Language"
 HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/tcl/${PN}-core${PV}-src.tar.gz"

 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="debug +threads"

 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
--- a/sdk_container/src/third_party/portage-stable/dev-lang/tcl/tcl-8.6.12-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/tcl/tcl-8.6.12-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -11,11 +11,11 @@ MY_P="${PN}${PV}"

 DESCRIPTION="Tool Command Language"
 HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/tcl/${PN}-core${PV}-src.tar.gz"

 LICENSE="tcltk"
 SLOT="0/8.6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="debug +threads"

 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
@ -28,6 +28,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-8.6.10-multilib.patch
 	"${FILESDIR}"/${PN}-8.6.8-conf.patch # Bug 125971
 	"${FILESDIR}"/${PN}-8.6.9-include-spec.patch # Bug 731120
+	"${FILESDIR}"/${P}-configure-clang16.patch
 )

 src_prepare() {
--- a/sdk_container/src/third_party/portage-stable/dev-lang/tcl/tcl-8.6.13-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/tcl/tcl-8.6.13-r1.ebuild
@ -0,0 +1,130 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with dev-lang/tk!
+
+inherit autotools flag-o-matic multilib-minimal multilib toolchain-funcs
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Tool Command Language"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="https://downloads.sourceforge.net/tcl/${PN}-core${PV}-src.tar.gz"
+
+LICENSE="tcltk Spencer-99"
+SLOT="0/8.6"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="debug +threads"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.6.10-multilib.patch
+	"${FILESDIR}"/${PN}-8.6.8-conf.patch # Bug 125971
+	"${FILESDIR}"/${PN}-8.6.9-include-spec.patch # Bug 731120
+	"${FILESDIR}"/${PN}-8.6.13-tclConfig-TCL_PACKAGE_PATH-braces.patch # Bug 892029
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	stat64 opendir64 rewinddir64 closedir64 # used to test for Large File Support
+)
+
+src_prepare() {
+	# By dropping the compat directory a lot of licensing and attribution burden
+	# (BSD-3, zlib,...) is lifted from the user
+	find \
+		"${SPARENT}"/compat/* \
+		"${SPARENT}"/doc/try.n \
+		-delete || die
+
+	pushd "${SPARENT}" &>/dev/null || die
+	default
+	popd &>/dev/null || die
+
+	# httpold tests require netowk
+	rm ../tests/httpold.test \
+		../tests/env.test \
+		../tests/http.test \
+		|| die
+
+	# workaround stack check issues, bug #280934
+	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
+
+	tc-export CC
+
+	sed \
+		-e '/chmod/s:555:755:g' \
+		-i Makefile.in || die
+
+	sed \
+		-e 's:-O[2s]\?::g' \
+		-i tcl.m4 || die
+
+	mv configure.{in,ac} || die
+
+	eautoconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# We went ahead and deleted the whole compat/ subdir which means
+	# the configure tests to detect broken versions need to pass (else
+	# we'll fail to build).  This comes up when cross-compiling, but
+	# might as well get a minor configure speed up normally.
+	export ac_cv_func_memcmp_working="yes"
+	export tcl_cv_str{str,toul,tod}_unbroken="ok"
+	export tcl_cv_strtod_buggy="no"
+
+	econf \
+		$(use_enable threads) \
+		$(use_enable debug symbols)
+}
+
+multilib_src_install() {
+	#short version number
+	local v1=$(ver_cut 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$(pwd) *::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$(pwd) *::g" \
+		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TCL_LIBW_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* ]] ; 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 *.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
+
+	if multilib_is_native_abi; then
+		dosym tclsh${v1} /usr/bin/tclsh
+		dodoc "${SPARENT}"/{ChangeLog*,README.md,changes}
+	fi
+}
--- a/sdk_container/src/third_party/portage-stable/dev-lang/tcl/tcl-8.6.14.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-lang/tcl/tcl-8.6.14.ebuild
@ -0,0 +1,136 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with dev-lang/tk!
+
+inherit autotools flag-o-matic multilib-minimal multilib toolchain-funcs
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Tool Command Language"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="https://downloads.sourceforge.net/tcl/${PN}-core${PV}-src.tar.gz"
+
+LICENSE="tcltk Spencer-99"
+SLOT="0/8.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="debug +threads"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.6.10-multilib.patch
+	"${FILESDIR}"/${PN}-8.6.8-conf.patch # Bug 125971
+	"${FILESDIR}"/${PN}-8.6.9-include-spec.patch # Bug 731120
+	"${FILESDIR}"/${PN}-8.6.13-tclConfig-TCL_PACKAGE_PATH-braces.patch # Bug 892029
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	stat64 opendir64 rewinddir64 closedir64 # used to test for Large File Support
+)
+
+src_prepare() {
+	# By dropping the compat directory a lot of licensing and attribution burden
+	# (BSD-3, zlib,...) is lifted from the user
+	find \
+		"${SPARENT}"/compat/* \
+		"${SPARENT}"/doc/try.n \
+		-delete || die
+
+	# Drop -Werror
+	sed -i \
+		-e "s: -Werror::g" \
+		dltest/Makefile.in \
+		|| die
+
+	pushd "${SPARENT}" &>/dev/null || die
+	default
+	popd &>/dev/null || die
+
+	# httpold tests require netowk
+	rm ../tests/httpold.test \
+		../tests/env.test \
+		../tests/http.test \
+		|| die
+
+	# workaround stack check issues, bug #280934
+	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
+
+	tc-export CC
+
+	sed \
+		-e '/chmod/s:555:755:g' \
+		-i Makefile.in || die
+
+	sed \
+		-e 's:-O[2s]\?::g' \
+		-i tcl.m4 || die
+
+	mv configure.{in,ac} || die
+
+	eautoconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# We went ahead and deleted the whole compat/ subdir which means
+	# the configure tests to detect broken versions need to pass (else
+	# we'll fail to build).  This comes up when cross-compiling, but
+	# might as well get a minor configure speed up normally.
+	export ac_cv_func_memcmp_working="yes"
+	export tcl_cv_str{str,toul,tod}_unbroken="ok"
+	export tcl_cv_strtod_buggy="no"
+
+	econf \
+		$(use_enable threads) \
+		$(use_enable debug symbols)
+}
+
+multilib_src_install() {
+	#short version number
+	local v1=$(ver_cut 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$(pwd) *::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$(pwd) *::g" \
+		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TCL_LIBW_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* ]] ; 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 *.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
+
+	if multilib_is_native_abi; then
+		dosym tclsh${v1} /usr/bin/tclsh
+		dodoc "${SPARENT}"/{ChangeLog*,README.md,changes}
+	fi
+}