6 files changed, 3 insertions, 214 deletions
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index e45e10f8f8f2..73380c2d9f45 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 71656d96bc47..666e1a4b8930 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -1,6 +1,6 @@
 AUX expect-5.44.1.15-ldflags.patch 360 BLAKE2B d479931cb0d8621d196b8dac3b0f7134f2998061e26f39d06165d71dc00c15895290edf552ee1258c5f988845e6a0b3c5d1df3c694433ef185689ff1d41a96d6 SHA512 36c62ec8043249ae0b9b0c4470937cc99b31c4845d5e67e37403f7e9d97be9edb37dc0a5c8abd2df50cace62b0d87303dbc62fdd2a3e87b501d2b983460ab75f
 AUX expect-5.45-darwin-install_name.patch 727 BLAKE2B fca6df8c6d01bd54f26e6a2311f61b70e4e45daaa01e7d1165f04bdba7232e36e1c5ac409faf99cb8a03f5227c829bd93cc00d248129e2ebdaccae8657cb11d1 SHA512 886d378caa8d63add7d4ac73c90b53b4b30d642a2a5cf06c80aad87f57d49a3362bf506fe12f6aade77c56b8b4c83ffe18138143cdf0fe5d7e9e2d673f2bc6d5
-AUX expect-5.45-format-security.patch 428 BLAKE2B 98e4d1da9f790bb1ab1b0b8481c5c0a747823f0998fff7993316d44cd5b29659467901c9f2e78d6b77342a9f0cb9072730a8600240fa37f240e10cc677162f63 SHA512 b85f0985b908f72d960eeb00567caab048874806c68d259835dc4564e33032524e9026e07ece3ad5f8669d67f7976019efb5dd763ba84b4cc13571ca999c7f06
+AUX expect-5.45-format-security.patch 484 BLAKE2B e62374a40012cbb8a6f0ffe74909a0e1f5ddbaa586f820e4feb725ccd2e7bc745d62b5f596ed3817f2a81a96ad452d95e40a4283c42749e90376fa7811fb3cb2 SHA512 1fe3388dc0d269c354179897ef0d560b99b1eb97be13f7eb1fb90cee759ff8eb2f8253cccb928fa07026084ce42fac54076e7b26e2e7a52fecdcae2feb114c86
 AUX expect-5.45-gfbsd.patch 996 BLAKE2B 46183afae664e2995403e36b423e0576022063d8acfb681dd98d6e98e54c86588f0e74067b929fe105bc477fedd8709b749857dcdaf5e57fa28445dad34c4139 SHA512 4fa7c4723c9ad2f5811c5762abe202f1d7584a6050c75cab277fe1b6c697809204a9adcf6f6f6c3c215c8df32f3ac9b083da907777b1ea02e1a4e64b8bf91242
 AUX expect-5.45-headers.patch 2280 BLAKE2B 6326615eee52aaa7307b32d048af21d657cb308e737995944b7e081a06a4d6b6f3409836b28835e6534ef57215542b524061cb731be3b419b23ab2ba38184079 SHA512 ac55ec9d65e87d5c64327d802fa16eab9f218f71e760090b2afc00b5fdb791859e6d1f35b0d1a5f52e7ff6ffb21e538581a1782976754fe8ae3ca5950c8db55c
 AUX expect-5.45-warnings.patch 18021 BLAKE2B 6223588f347ba4ac5c679fbe0fabc5d4a6ac72603768cef4a166f5bcd0632392d0d8d4d80d747c985b2451cee30cec84a32f219ae19b99add91988d35f3c0dd8 SHA512 5ea67f4a481e9930998297896c31daefbf663cb6a4cae0421bf1d40906e7112a4c0c46da3cfb6a05dc4efd7ddb0543c05db086b7bf59901a1dea75ab9b73fc37
@@ -8,6 +8,5 @@ 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-r4.ebuild 2166 BLAKE2B 8bdcf2ae8f279aaa6cb6bcff09f2cef7bdadc800921900275108b6fa52e8fbcfb23e247ab3bb5511d69f5220ace31875d5a582218d4523c8b31ed6e70ff07920 SHA512 51c9afecf04293298a11970bfc1ccecfb24477a3b2ce9badc6c8999875ebfc8185bccacf3a739c86b00c20ab8787c0e24f21a54623500ca43b8b8cb4d610b7c5
 EBUILD expect-5.45.4-r5.ebuild 2207 BLAKE2B cb8da15fddb32e065adcb8ed7a855e3f1757ba53ca2135bf5712fe4e35ae56cc0fe2e8de695f62fc41446e80dd729b063723552bc356c6894afab3a9708adb58 SHA512 cb6346a07845e6a1b2026a84d5cb27ae9ca06023dfb231a09511b10ba21d699279ec320dd8b4b3d263fe0e9a85311cfa15d7fede1c74f38c2e94066e7a2bbf44
 MISC metadata.xml 330 BLAKE2B 4e561b8ea0a607e2fde49595d4808e51b2df54c2d8f3d65c47a4e592e7d7897db71a6677b0330c7c32a8e5773b9571de0e4c8d33c4f8a5c3f0e0f7192082b177 SHA512 fec72aa15126bbe40bc5277bb743acf07203a6153ee52e69f1e828dfc53757b3d11a8e09175397a06bdb4f2c5e683db1ec74de254a6b36926192e5868f2e5ec6
diff --git a/dev-tcltk/expect/expect-5.45.4-r4.ebuild b/dev-tcltk/expect/expect-5.45.4-r4.ebuild
deleted file mode 100644
index ba137b0db314..000000000000
--- a/dev-tcltk/expect/expect-5.45.4-r4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools edo flag-o-matic
-
-MY_P="${PN}${PV}"
-DESCRIPTION="tool for automating interactive applications"
-HOMEPAGE="https://core.tcl-lang.org/expect/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}"/${MY_P}
-
-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 test threads"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-lang/tcl-8.2:=[threads?]"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-util/dejagnu )"
-
-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
-	eapply "${FILESDIR}"/${PN}-5.45.4-configure-clang16.patch || die
-
-	sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c || die
-
-	# fix install_name on darwin
-	[[ ${CHOST} == *-darwin* ]] && \
-		eapply "${FILESDIR}"/${P}-darwin-install_name.patch
-
-	mv configure.{in,ac} || die
-
-	eautoconf
-}
-
-src_configure() {
-	# bug #881687
-	append-flags -std=gnu89
-
-	# the 64bit flag is useless ... it only adds 64bit compiler flags
-	# (like -m64) which the target toolchain should already handle
-	econf \
-		--cache-file="${S}"/config.cache \
-		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
-		--disable-64bit \
-		--enable-shared \
-		$(use_enable threads) \
-		$(use_enable debug symbols mem)
-}
-
-expect_make_var() {
-	touch pkgIndex.tcl-hand || die
-	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
-
-		edo 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/expect/files/expect-5.45-format-security.patch b/dev-tcltk/expect/files/expect-5.45-format-security.patch
index c623264be27a..44ee6d108253 100644
--- a/dev-tcltk/expect/files/expect-5.45-format-security.patch
+++ b/dev-tcltk/expect/files/expect-5.45-format-security.patch
@@ -1,3 +1,5 @@
+https://core.tcl-lang.org/expect/info/094d670f6250f34c
+
  exp_clib.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index f6461decc005..daec15175f7f 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -11,6 +11,5 @@ AUX snack-2.2.10-test.patch 12933 BLAKE2B 05229781961d9431cb029d317918a5a267f9b2
 AUX snack2.2.10-seektell-fix.patch 496 BLAKE2B a2e4e782788054c047596bd989241b9ecea3eeb2984c050888aced8289e77f30692386bcc437679bb5cc7a46f1616cbb3f4f64de017c343bcce2241b016d0cd5 SHA512 3e472dc7603426d35b23714435b3a8bfb6d54326eb1eaa54d8b79b4710035b3fed4e1f6a85ebad632950222c5cd55ac917dcb8cf2e87d0baa36124f8a3361fa8
 AUX tcl-snack-2.2.10-python3.patch 12145 BLAKE2B eb33937789e0eab1316fdfcd472b5cf701a4072e498052cb2889e8c9e5a4502f193f386b83c96a2e98efcfca3dfeb389414e1b924b677ef68edfafe0e706048f SHA512 3480d83824e1d7e8250947d6f9d5a38704b302491980b7e8ad46a4d6790e3bdf9588b1d63048a9a5ed081c44b8f6c1dc42e79d3ad543f473b5469c711dc60394
 DIST snack2.2.10.tar.gz 1798252 BLAKE2B e27b8e7d6082cdcfc06e7eea5ab832fb78ba104de9e56a69c6c9cd688183f7d4c6bdb974e4d5d2bf5ef2bc5518a913ddf17c90db8d10cef4dbee533307cc7718 SHA512 c17ad332fa4f3ded006b97ceca85cada079e4c7cd933768b289c13dadca1b8803fccaf709ec2def5af4abe92c307f25597ebfa6f94df2d681e40815cd7eccb9b
-EBUILD snack-2.2.10-r11.ebuild 2776 BLAKE2B 5e578cff6936d409a28ccbc97c2d055536af55ae5358d491d579e38f0b8a78c1780e323eb964da4d70d2a3e4a7a1560f759f2aacc8ddcd7787a294762909c5d9 SHA512 6ae861c699449e4272aa30d46e695561829c39eeb1cfb1f62105a06de8491181e3884866a9754127b36624a5835bf5c77a311fc418734cbe22fd7943123306df
 EBUILD snack-2.2.10-r13.ebuild 2816 BLAKE2B eabe3e3add388cf0f607e5e263c5d50406bc7ceba62b5b64b5e6491b79def4fb3353202db34a00ac2751deda19d177920d5f075ee87cdf8a6fc6aaf0ff74d13b SHA512 1a5099c11e5949576e496d4f8a6fd033c6c8eca3add3781c5f669b13642de42f08a770930dbf24224d3f62365c7fb142911cef67377bed46e75ff662f05b9977
 MISC metadata.xml 260 BLAKE2B 9864f2503702b03d3ad715b3f2bd7ef7077f9ddef089de0d6a0840599d99a7f99d439ee50c12afc9ca99b0e288babf74b0bb2a6132ae6dd656b8d7c15e9b10a9 SHA512 3d1e4f14995736fb28198da21587a813a31f1330873ae3078dcd9a2452c1196d23e45983877d2e296353e1ac35cc6ff461b309585237bcc768e37e6b2728c23b
diff --git a/dev-tcltk/snack/snack-2.2.10-r11.ebuild b/dev-tcltk/snack/snack-2.2.10-r11.ebuild
deleted file mode 100644
index 1c38016a77ef..000000000000
--- a/dev-tcltk/snack/snack-2.2.10-r11.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9,10} )
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=yes
-
-inherit distutils-r1 flag-o-matic toolchain-funcs virtualx
-
-DESCRIPTION="The Snack Sound Toolkit (Tcl)"
-HOMEPAGE="http://www.speech.kth.se/snack/"
-SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz"
-
-S="${WORKDIR}/${PN}${PV}/unix"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="alsa examples python vorbis"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-lang/tcl:0=
-	dev-lang/tk:0=
-	alsa? ( media-libs/alsa-lib )
-	python? ( ${PYTHON_DEPS} )
-	vorbis? ( media-libs/libvorbis )"
-RDEPEND="${DEPEND}"
-BDEPEND="python? (
-	${PYTHON_DEPS}
-	${DISTUTILS_DEPS}
-)"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-PATCHES=(
-	"${FILESDIR}"/alsa-undef-sym.patch
-	"${FILESDIR}"/${P}-CVE-2012-6303-fix.patch
-	"${FILESDIR}"/${P}-debian-args.patch
-	"${FILESDIR}"/${P}-test.patch
-	"${FILESDIR}"/${PN}${PV}-seektell-fix.patch
-	"${FILESDIR}"/tcl-${P}-python3.patch
-	"${FILESDIR}"/${P}-lto.patch
-	"${FILESDIR}"/${P}-configure-clang16.patch
-	"${FILESDIR}"/${P}-implicit.patch
-	"${FILESDIR}"/${P}-parallelMake.patch
-)
-
-HTML_DOCS="${WORKDIR}/${PN}${PV}/doc/*"
-
-src_prepare() {
-	# adds -install_name (soname on Darwin)
-	[[ ${CHOST} == *-darwin* ]] && PATCHES+=( "${FILESDIR}"/${P}-darwin.patch )
-
-	sed \
-		-e "s:ar cr:$(tc-getAR) cr:g" \
-		-e "s|-O|${CFLAGS}|g" \
-		-i Makefile.in || die
-
-	cd ..
-
-	default
-
-	sed \
-		-e 's|^\(#define roundf(.*\)|//\1|' \
-		-i generic/jkFormatMP3.c || die
-	rm tests/{play,record}.test || die
-	if use python; then
-		cd python
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	# For Clang 16, bunch of -Wimplicit-int, etc
-	append-flags -std=gnu89
-
-	local myconf=""
-
-	use alsa && myconf+=" --enable-alsa"
-
-	if use vorbis; then
-		myconf+=" --with-ogg-include="${EPREFIX}"/usr/include"
-		myconf+=" --with-ogg-lib="${EPREFIX}"/usr/$(get_libdir)"
-	fi
-
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--includedir="${EPREFIX}"/usr/include \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
-		$myconf
-	if use python; then
-		cd ../python
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-	if use python; then
-		cd ../python
-		distutils-r1_src_compile
-	fi
-}
-
-src_test() {
-	TCLLIBPATH=${S} virtx default | tee snack.testResult
-	grep -q FAILED snack.testResult && die
-}
-
-src_install() {
-	default
-
-	if use python ; then
-		cd "${S}"/../python || die
-		distutils-r1_src_install
-	fi
-
-	cd "${S}"/.. || die
-
-	if use examples ; then
-		docinto examples
-		sed -i -e 's/wish[0-9.]+/wish/g' demos/tcl/* || die
-		dodoc -r demos/tcl
-
-		use python && dodoc -r demos/python
-	fi
-}