gentoo auto-resync : 11:03:2024 - 12:45:51

7 files changed, 31 insertions, 92 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 327265d5e508..520dba606740 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index fb14e0f6a9ce..7c157d8e9956 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -8,7 +8,6 @@ AUX expect-5.45.4-configure-clang16.patch 5377 BLAKE2B dd8a65e98e269f3b3ca086099
 AUX expect-5.45.4-configure-in.patch 2408 BLAKE2B d198b599eeff18833e9532945aaf921779229ddecfbe478f985f2d742a39875e68cdca97fbca6aa5ca572f4c31c3a2491c8ddf473042952213232d3bfd070eee SHA512 7b60a268c6e4c0875978a619a451eb669a519f74623fbcecd90299b22e0ba73f6884177a16367e5ee94828c55636dba2f70c324576c1cc077d389912f4d7409d
 AUX expect-5.45.4-examples.patch 935 BLAKE2B df87d211f6693b836e2e8ca2b63c56a9dd073a8e2ab3f71b38523d4797da0c54411d51bd38e5568c0b850b30ce89d7c984945e704486eb61ca5077709de514fc SHA512 0cad9007f82d2e9fb1994e7b8a84858603cca471f34dbbaddadc30b4594c5cb31cb29749629bcea47b1da4abe3526ddc1c5ea36fb816571bc9c6ffadc120667c
 DIST expect5.45.4.tar.gz 632363 BLAKE2B a3a936e7644c922fdd474fa08c45926396ccce9a63e5f65f4d5e157f5160cfe4de47688734b39d13281d9548aac492810f19236e06563903d3d8081e4661048d SHA512 a8dc25e8175f67e029e15cbcfca1705165c1c4cb2dd37eaaaebffb61e3ba132d9519cd73ca5add4c3358a2b0b7a91e878279e8d0b72143ff2c287fce07e4659a
-EBUILD expect-5.45.4-r3.ebuild 2338 BLAKE2B 4ef237c10d7619323dabc86f100ed340a93d7a8de8c202e7a6b4a473f7d2b03ac9aff2dcc9916019a367777464d1eae42765e0f380e97b0d7ad1c0bed451a358 SHA512 0056240387a1b491d0b6723150ccc607bb679d7546865f40ff753bb2a95c70dd7eeb39c1c0bc4c86c1307315ad222d6fce00e6a30fde0568f7c453859c91ff8b
 EBUILD expect-5.45.4-r4.ebuild 2153 BLAKE2B fc8b22a4a98f18a81a7c441d8919c6d6cd3643c9ec74594a3e88d52aaae581341d9f2b91aba24ef52aee3a231e775fcf6f9f264f02f3855a5d9d87ba2264b939 SHA512 8ce792ca6c6b3d49f58217cd44c555456d3f49991ea30782f279b5d76c53fce5c694361096f416a9d1b44bf40b89adba22307de25ea12830691ab603c3c4c0b2
 EBUILD expect-5.45.4-r5.ebuild 2202 BLAKE2B 8451f06a2b945cb4080d475e6eb205b0f1cbd88a143a87d830334137f23e59c820efd376226286f169c35cc7040ff60108438d87e2564001cc0b927bec101629 SHA512 6a4ee9ee88543ba3f45351d810cbd4d91c66db3472e5270bab36a22b00a53c112c179c46430ac4e1c6ec8f15c20c91da733ce33091d1292e098283b60e2f17cc
 MISC metadata.xml 330 BLAKE2B 4e561b8ea0a607e2fde49595d4808e51b2df54c2d8f3d65c47a4e592e7d7897db71a6677b0330c7c32a8e5773b9571de0e4c8d33c4f8a5c3f0e0f7192082b177 SHA512 fec72aa15126bbe40bc5277bb743acf07203a6153ee52e69f1e828dfc53757b3d11a8e09175397a06bdb4f2c5e683db1ec74de254a6b36926192e5868f2e5ec6
diff --git a/dev-tcltk/expect/expect-5.45.4-r3.ebuild b/dev-tcltk/expect/expect-5.45.4-r3.ebuild
deleted file mode 100644
index 28c3598bdbbb..000000000000
--- a/dev-tcltk/expect/expect-5.45.4-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${PN}${PV}"
-DESCRIPTION="tool for automating interactive applications"
-HOMEPAGE="https://core.tcl-lang.org/expect/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE="debug doc threads"
-
-# We need dejagnu for src_test, but dejagnu needs expect
-# to compile/run, so we cant add dejagnu to DEPEND :/
-DEPEND=">=dev-lang/tcl-8.2:=[threads?]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-examples.patch )
-
-src_prepare() {
-	default
-	sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" expect.man || die
-
-	eapply "${FILESDIR}"/${PN}-5.45-gfbsd.patch
-	eapply "${FILESDIR}"/${PN}-5.44.1.15-ldflags.patch
-	eapply "${FILESDIR}"/${PN}-5.45-headers.patch #337943
-	eapply "${FILESDIR}"/${PN}-5.45-format-security.patch
-	eapply "${FILESDIR}"/${PN}-5.45.4-configure-in.patch
-	sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c
-
-	# fix install_name on darwin
-	[[ ${CHOST} == *-darwin* ]] && \
-		eapply "${FILESDIR}"/${P}-darwin-install_name.patch
-
-	mv configure.{in,ac} || die
-
-	eautoconf
-}
-
-src_configure() {
-	# the 64bit flag is useless ... it only adds 64bit compiler flags
-	# (like -m64) which the target toolchain should already handle
-	econf \
-		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
-		--disable-64bit \
-		--enable-shared \
-		$(use_enable threads) \
-		$(use_enable debug symbols mem)
-}
-
-src_test() {
-	# we need dejagnu to do tests ... but dejagnu needs
-	# expect ... so don't do tests unless we have dejagnu
-	type -p runtest || return 0
-	emake test
-}
-
-expect_make_var() {
-	touch pkgIndex.tcl-hand
-	printf 'all:;echo $('$1')\ninclude Makefile' | emake --no-print-directory -s -f -
-	rm -f pkgIndex.tcl-hand || die
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		docinto examples
-		echo dodoc \
-			example/README \
-			$(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
-			$(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES))
-		dodoc \
-			example/README \
-			$(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
-			$(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES))
-	fi
-}
diff --git a/dev-tcltk/itk/Manifest b/dev-tcltk/itk/Manifest
index 14154fd43b95..b698d00069ce 100644
--- a/dev-tcltk/itk/Manifest
+++ b/dev-tcltk/itk/Manifest
@@ -1,7 +1,8 @@
 AUX itk-4.2.3-install.patch 370 BLAKE2B b9fab6657f70b79d09adbd28848b4f26a3d5673de52306702b5560f24fe51340816ec4bc56042a1e228cb54f547b821c79fe6b92a231bbff6eacf2b594460c35 SHA512 9162c60170f0ef2767bfc90b12e296b66565c1ca4322513b3f252b0cb1849d727c9e096ce69ebf6b0823264d9e0df85aca427f11a43cf85e6f395b923578ea39
 DIST itk-4-2-3.tar.gz 168217 BLAKE2B 450c9f3393228b93a716cf338ad322ecc8934aca08a1f7c4a81dab07a38ac6729ab2ae43b7197130e3cda1bc03ed61c81f9d63cac542d8dcbb199764d47ae4d7 SHA512 0c5c70119b0d0dd950a8e3a52f5a508935bad920f647c38193980a414f617589711a65f4eac3ec67c4bef72f787205cae12513d4d3d35c3b8a795b1bb763fac4
 DIST itk4.1.0.tar.gz 253796 BLAKE2B 7d51689d41871f39fbdf940f1aede2c89ee0165cc6be989f7da65df85a0d15e5db037722a5e30a284e51129b7bfff20dfde0fbc78d2d72d8acb9031f328a5d16 SHA512 1deed09daf66ae1d0cc88550be13814edff650f3ef2ecb5ae8d28daf92e37550b0e46921eb161da8ccc3886aaf62a4a3087df0f13610839b7c2d6f4b39c9f07e
+DIST tclconfig-2023.12.11.tar.gz 49691 BLAKE2B 53bb91d125fd080b79ac83af1053d8bb981a8e917b7c8e4db71da89c43263d75a9604623a85d560bcbf3d686f61ccf21bffd794d333aa6cb35c959ab3042991d SHA512 c4eaa31ca1ec585536cd6d31a548b347dae3167197433674d2f3912ce85bad00dda55b0c60eebf26cb5f9d651c8437688e1829f7d3996a22bba2d93e4538946c
 EBUILD itk-4.1.0-r1.ebuild 1570 BLAKE2B 991bd6d672c6febac27280e9fab6b39746563821142f8214ee025e7852d9c2dbbb79430acbb595fa2d468e562add9024764a1107ce5294dbac6e93213748d453 SHA512 e50b3b7295404fe994c5c9c00fbb72c2fd816302bea6ac77fca6b28514e152c48c29e84662e5b7d04312e20206d310c447f1e8e04500a973d88145df03a2578a
 EBUILD itk-4.1.0.ebuild 1508 BLAKE2B 2b64143fa0af0484031ad5da27bd7c1daccaa27a4ea22de84cb3acd1a75498dc16b9e7caea18596f6e61fd11bd01e2cd4f8a7f1dc136c893eb4a8c89f1b47050 SHA512 1fad28a9ca4cf3e4f9fcbe484044ca496c39f9ed45e6acbe8e2c5c8da01b20d9dfeea029aa0c578cd7a062f6d0914850b714c4a4e615f8d39fd92a98d4584ec8
-EBUILD itk-4.2.3-r1.ebuild 1620 BLAKE2B ffdf5227e9bcc54c148bc3ace6306f04d8b87b0c0f33465226ddfb6d887dd6a9033ef4945bb7966f6a3b71fc0efabc3c3d8ac251e61d7c18e2930ec2f54e098e SHA512 768c0eb16ff8dd853e9408ff39a10657df40c3618e71a346bc60b6fd391eb9f25dc694ae348d58ba7eebc690c7623b5f58eed0f1b751d82056da44cab2987f40
+EBUILD itk-4.2.3-r1.ebuild 1781 BLAKE2B d60c9bb2ddf719d620ef66333a639f677dab1d1f4604882d599d0f8e24d8a2986e1d5125eb1ad1d84028945ee36df229df760121aa494cc1071295505beddc8b SHA512 01d3087eaa74f278bc323352d86127910814e6e3085df85867533c5df4f2ca376a56f39b9741f41f06fc468288cd0fd7b3770e9c0212bdc9dc58aceba91ae542
 MISC metadata.xml 380 BLAKE2B 58b7f0df2fbd1b84dd204da1753511c344cd7965dd25dbb45d23ca994f79ada51896b4456376522e6788511c0af17f1bd30d637f1018b82ecaa2c9054b5b234a SHA512 301bffb1e92da1f6693eb92003d6e7cc83a4c293fc994a65668273f25d41326cdffe1c45c5f3954185b404d89c88591349a48a31f3f2b179f1acac72b6fa994e
diff --git a/dev-tcltk/itk/itk-4.2.3-r1.ebuild b/dev-tcltk/itk/itk-4.2.3-r1.ebuild
index 39ad57561d67..2b9a5bcac2fe 100644
--- a/dev-tcltk/itk/itk-4.2.3-r1.ebuild
+++ b/dev-tcltk/itk/itk-4.2.3-r1.ebuild
@@ -6,10 +6,15 @@ EAPI=8
 inherit virtualx
 
 MY_PV=${PN}-$(ver_rs 1- '-')
+TCLCONFIGId=4a924db4fb37fa0c7cc2ae987b294dbaa97bc713
 
 DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
 HOMEPAGE="http://incrtcl.sourceforge.net/"
-SRC_URI="https://github.com/tcltk/${PN}/archive/refs/tags/${MY_PV}.tar.gz"
+SRC_URI="
+	https://github.com/tcltk/${PN}/archive/refs/tags/${MY_PV}.tar.gz
+	https://github.com/tcltk/tclconfig/archive/${TCLCONFIGId}.tar.gz
+		-> tclconfig-2023.12.11.tar.gz
+"
 
 SLOT="0"
 LICENSE="BSD"
@@ -27,11 +32,10 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 	opendir64 readdir64 rewinddir64 closedir64 stat64 # used on AIX
 )
 
-PATCHES=( "${FILESDIR}"/${P}-install.patch )
-
 UNINSTALL_IGNORE='/usr/lib.*/itk.*/library'
 
 src_prepare() {
+	ln -s ../tclconfig-${TCLCONFIGId} tclconfig || die
 	sed 's:-pipe::g' -i configure || die
 	default
 	echo "unknown" > manifest.uuid
diff --git a/dev-tcltk/thread/Manifest b/dev-tcltk/thread/Manifest
index 05680d802a8f..39d9f4d78caf 100644
--- a/dev-tcltk/thread/Manifest
+++ b/dev-tcltk/thread/Manifest
@@ -1,8 +1,9 @@
 AUX thread-2.8.5-musl.patch 621 BLAKE2B bbaf972b18eae3f5e9c53ef525a69892e284ea3b08a8bc6b5c1cc1c41e6dbdaea525feed214e568ed9ee33bc62d454ff01ae85eb8060f2daa6e74eb0216aa11e SHA512 d627cfa29000272ba686436bad273e0fa3bc8ea0f5415bea0b7b41aca88fb6f13ff16f3fe393bf1bea94502fbef59a8b998e3ca8145b5efe9989c11ef4e83408
+DIST tclconfig-2023.12.11.tar.gz 49691 BLAKE2B 53bb91d125fd080b79ac83af1053d8bb981a8e917b7c8e4db71da89c43263d75a9604623a85d560bcbf3d686f61ccf21bffd794d333aa6cb35c959ab3042991d SHA512 c4eaa31ca1ec585536cd6d31a548b347dae3167197433674d2f3912ce85bad00dda55b0c60eebf26cb5f9d651c8437688e1829f7d3996a22bba2d93e4538946c
 DIST thread-2-8-9.tar.gz 322166 BLAKE2B d7b1f61048ff7ef2276ab0ed2e72054267f75cf32cc705b2de6e27fd80ffde08e55a7386976d1c6159c5085686f1b534434c9a7cae504feedb91a9bc8bcff69f SHA512 b3f781b2b522a1c184e071c003a2b20ef0615668c56ffd2f6680890f36b106ded051d411547cb6b1afd7e9389e09b5cc67e68bfd79cc95ea06a0e2ee71c2e433
 DIST thread2.8.5.tar.gz 338776 BLAKE2B b6500ba59f87150d3d4479cae9a55b591a41768c6a74520933157d8fe2ec5374a79cf258fad1f08c775b190c17667dc529605f21a4fdd562320778be94b294a2 SHA512 b1cd049605f44ea5e85a121ff864d9e531491b24579654159dd5f3850b0aa4192ea79844324be3e9c6b395b14e6f765474c792bfd3271c7100b49f0ff22832d0
 DIST thread2.8.8.tar.gz 343099 BLAKE2B 3551bdbc4cab78c6ea0ea7eac43c53a65a1f55f9eae302ddd7030c33b40b76317ecc651d731411396cf4f51f11c852bab0c60642d36a312f23e22f96019df427 SHA512 249ddf689ee20536280e3b3d220c0faa3a8a2821bcd31a3f6188ef838d31e5cacefa7fd737b8e29b73a6b30e0a946d2eeb0805dd851c9f8aefc5c5bc5f50de0e
 EBUILD thread-2.8.5.ebuild 962 BLAKE2B 803ce6051952e29175d67fc0026134c9d0ae01a149c0e18afed5663e877e2a4e6193f1763f873fbd0ff69c83dbf2fef3ed495fe1696a33ce4d4dc1fb1398da18 SHA512 32bccc56fea95d4512e4131d0edfd65b9ff2e1008fd530424f4f67a57b0b3728745ef1c7f7c0f1a39792e388135b1d29568c0e900fa0d802433a0154f49f222e
 EBUILD thread-2.8.8.ebuild 1014 BLAKE2B 6177df6166d0919ecb550f192b650651b8b78eb4be15d66ff6e56a04ae3619f5e834381fcf859fd2b29d9da75a1782c992c3cfe788449fcb4e1440c5e50da0c8 SHA512 bfde6d1ebd3b2337aa45001f20c8d05daea37d1008deac3fa9e134a4392802053435b54bc63af69dde8525b2ce6ef246a98f2f7964e34627173be6a4bed998c6
-EBUILD thread-2.8.9.ebuild 773 BLAKE2B 591bb1ad64dbb46eaf2016a8d8cad01d439a26b45da6ae48752250a53c3aa559fa69b4637e07683931e9399c95a39d974f5259a4bc831d8b738cdce6f6e6e8d6 SHA512 bb3b5693d2cbcfe0b3403b100b14c6fd151b84ee6bca022dfbecb5acf4c3f585cbacb8a747f757fbca4dab51e5d7f3ea4b0ca77dcf3d6eea8505b61b12b34dc1
+EBUILD thread-2.8.9.ebuild 1215 BLAKE2B ed37da07b0bb096989c26a8e238d7696aeeb77b9cb53f98de75e75718c8dc6a6f390744b5ba84de977c7fd50a1ecb8224e84f8f1eb391732d52402d0ac29530d SHA512 ade4397d2a89ac4a470af734711b38a592b352d71f686cb48a2e061a2aff54a3e0a15ec06f3c05c4d9357d53419b79557b9e36b3f02063d2b5e05b435c08f4ee
 MISC metadata.xml 379 BLAKE2B 0a7908539dab596605acf7d50fecfd56efca032253438c230f3c75d017f816d058fe0a9da15c07f4f5799c9aaebf79361a71a00b9fe84cc0262cee006f226342 SHA512 914d8528631b994b0000eaf3c0824cc010a4272edb8db1b825d6c6114ac102731939ea39f3574a49a71695a5f4e5f9d77668082b759a5bda4f00b34a57ab5b4c
diff --git a/dev-tcltk/thread/thread-2.8.9.ebuild b/dev-tcltk/thread/thread-2.8.9.ebuild
index d17e1037fa84..ab64d0048cc7 100644
--- a/dev-tcltk/thread/thread-2.8.9.ebuild
+++ b/dev-tcltk/thread/thread-2.8.9.ebuild
@@ -3,11 +3,18 @@
 
 EAPI=8
 
+inherit autotools
+
 MY_P="${PN}-$(ver_rs 0- '-')"
+TCLCONFIGId=4a924db4fb37fa0c7cc2ae987b294dbaa97bc713
 
 DESCRIPTION="Tcl Thread extension"
 HOMEPAGE="http://www.tcl.tk/"
-SRC_URI="https://github.com/tcltk/${PN}/archive/refs/tags/${MY_P}.tar.gz"
+SRC_URI="
+	https://github.com/tcltk/${PN}/archive/refs/tags/${MY_P}.tar.gz
+	https://github.com/tcltk/tclconfig/archive/${TCLCONFIGId}.tar.gz
+		-> tclconfig-2023.12.11.tar.gz
+"
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,6 +31,18 @@ S="${WORKDIR}"/${PN}-${MY_P}
 
 PATCHES=( "${FILESDIR}"/${PN}-2.8.5-musl.patch )
 
+src_prepare() {
+	ln -s ../tclconfig-${TCLCONFIGId} tclconfig || die
+	echo "unknown" > manifest.uuid || die
+	default
+
+	# Search for libs in libdir not just exec_prefix/lib
+	sed -i -e 's:${exec_prefix}/lib:${libdir}:' \
+		aclocal.m4 || die "sed failed"
+
+	eautoreconf
+}
+
 src_configure() {
 	econf --with-tclinclude="${EPREFIX}/usr/include" \
 		--with-tcl="${EPREFIX}/usr/$(get_libdir)"