7 files changed, 2 insertions, 122 deletions
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 089aede23bfd..63869159290a 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 6c3d9066ede4..0a28c427191b 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -8,5 +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-r5.ebuild 2201 BLAKE2B cfff8648c06dea9a774f5c31d43b9790124b04bfadf6c72a221d8d830fc9b1c293d555fac9033d431d701c1d36cfcc034d6c371e8d51dbde1a913c265b394a7a SHA512 a7e99002ad1ee7ff294fca93d470fd7d7b1308e7b5a0ac42776b3839c846eb2d042b26eb82935338f8cc326a527a17bdef7661d642bcd28c580eebd7ac36a79c
+EBUILD expect-5.45.4-r5.ebuild 2207 BLAKE2B 9e9342bbfb124d70499d17874a1c7c3bf6206aedaae6375d75007845f3efba69bcb4089c3a80b4890b91f7df8b33d127530a89a2eca7c2c4c61deea31e2f7cfe SHA512 ae32ca2250dc898bc8d125175fb5255b833793aa596b5c2d4e5043f67016fbb751fb113c2ed058ec7d41a060030be1273f00843000e639db230b09eccfeac665
 MISC metadata.xml 330 BLAKE2B 4e561b8ea0a607e2fde49595d4808e51b2df54c2d8f3d65c47a4e592e7d7897db71a6677b0330c7c32a8e5773b9571de0e4c8d33c4f8a5c3f0e0f7192082b177 SHA512 fec72aa15126bbe40bc5277bb743acf07203a6153ee52e69f1e828dfc53757b3d11a8e09175397a06bdb4f2c5e683db1ec74de254a6b36926192e5868f2e5ec6
diff --git a/dev-tcltk/expect/expect-5.45.4-r5.ebuild b/dev-tcltk/expect/expect-5.45.4-r5.ebuild
index a2aab5a54025..c57397472f44 100644
--- a/dev-tcltk/expect/expect-5.45.4-r5.ebuild
+++ b/dev-tcltk/expect/expect-5.45.4-r5.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
 
 	# fix install_name on darwin
 	[[ ${CHOST} == *-darwin* ]] && \
-		eapply "${FILESDIR}"/${P}-darwin-install_name.patch
+		eapply "${FILESDIR}"/${PN}-5.45-darwin-install_name.patch
 
 	mv configure.{in,ac} || die
 
diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index 57faf690764e..7a2db6648718 100644
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -1,9 +1,5 @@
-AUX tdom-0.9.2-clang6.patch 602 BLAKE2B ae6339e1521ba14b12fb2f495adf9f4ee186f8917584d9a87f469a8394f39588738838e04e09b7a5cc3609b89fa9f485913b2b3fb0ca31143bcafb06f8908932 SHA512 aa9ea7f7336a5e69f3d9c22f74977245c4b3749696ad51d15aa4a006a7bceda755107b86b3a5733725ee7d68028fb55bfe53ee12c0d603ab35eb15c32ad1e3f0
-AUX tdom-0.9.2-nothreads.patch 665 BLAKE2B ee5cf74d8023968fc759a7942ebae3e5e30be0df174b6d1ddf8c06d8b38d3d87a7be6057b29adac47d0670558cf7db6e56a93677fb980b2b6ef4b733fba9bdb0 SHA512 7f300fd5f930fb9ed72f83c3168c038d93266aa4e489ec6bcd90dc1109484963b4b64743b457826e5e9aa6bc27d143340af83a46f568dd59435faf831002391e
 AUX tdom-0.9.2-useCC.patch 868 BLAKE2B e5d41422bfd8336dacbd177f16b19126f3af1a2ddffaa1f8676546b4db29a5adc679ff4bccf3debe32bc656c3d8b5d9523c6d6a478a202ae739b6e2a08597624 SHA512 59388e3ffa2c21daae3770c2d337337ec28c0845286114337e23c374c310a2dc6f790d6df4ec6f8b741040936cce021197aaf76fd162aca2f391fb480d057d20
 AUX tdom-0.9.3-expat.patch 255 BLAKE2B e6d8add83b294a178aab7d23e4432e3f55f001096ee5fa6ea0620ca2336555a30bc841c88ca4e33b15abeb86159cdb6925aa5f61781dca2ff6c8260031359962 SHA512 c94e03bea0909d5cc2ec6f479fd6abf430f2d0c3c6df1186a01d1c422322d54ca7e7009ac07329eabac6432bf75cbe0db7f3b529cca89bd4b9c2589b0f57d5d3
-DIST tdom-0.9.2-src.tgz 1215099 BLAKE2B 1d720043ee4acc27d3fad138baced96b291c2e39dc1535fb1927a9968e07324d5e0e0bb0c71d8e5678b8c6f4bb69fb09ce05ac9447712422af0d91c9e06c163e SHA512 ba6611db866f3afffd112887cf6b0f250273f29ab4ed8e29de89405b997a0f7569216f86206040462aba9a4b8548c346bc72945cf7d617cf45a644fa8ded7121
 DIST tdom-0.9.3-src.tgz 1319804 BLAKE2B 8b4c50407eaf28c002ec8399d44881b91bef346dca75370c27e06266a5fa90900528a01fc8310d8a250f551e3a627d0d2965a2e85ef8a9132010f7718e5549ce SHA512 71a589465f84721f222b6312f51ee564d11d88a82000a0e5cc1dab4653bffd57347a39936590b62a580e9df59d7266ff3ae4295fe91ff4b9e58f012e80b0cb3e
-EBUILD tdom-0.9.2-r1.ebuild 1683 BLAKE2B 397a374abe49fd97ffbfb818d9a564a1955e721558081a415c66f3342c6a98bf8aadc286c1c4217b1eff50757d14a8fa7ef3749f27793ae390d504cfd4af016d SHA512 f4be8f1a7bf9c8cde10acf70f1ecd9ff783530a158e60931c2a735b66a0e6c7f621a1f509b95abf0cea2c03cc3ea20acd2380c4ccba4454bd8ab66614dd1972f
 EBUILD tdom-0.9.3.ebuild 1810 BLAKE2B 23b59fde31fc3cd6b622be0745b8e369e15861b92e62de2959f8f627f0a131d251f65999532d42f733992973a43fbc3c17be56ed5861d6c2eb296fd19c918006 SHA512 e87d31e079f650fa031c73c06855feb704310900d65d6eafdace89e79062a2a11eec19e5390af1c9b556dd4850171cc9f18d0c61f9dbe5bfc5c981489b8fc3a6
 MISC metadata.xml 622 BLAKE2B 161871f522bbaa638ba5980f62f693f4022d9a830225aa645786e4adf43f525ce0fdeae3d26136db09db45d94ac271547a1abb86e1a639e57859bd688e14627e SHA512 557c17a5eda00ec07212dfa9ef7cac6e1688839bad2a59cdd32276773de955cf068ad793a93e371e779cf3dac2b6e81b91a82946ebd4805b7b6e9754f8110ec9
diff --git a/dev-tcltk/tdom/files/tdom-0.9.2-clang6.patch b/dev-tcltk/tdom/files/tdom-0.9.2-clang6.patch
deleted file mode 100644
index 4bf5e3b2486e..000000000000
--- a/dev-tcltk/tdom/files/tdom-0.9.2-clang6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/generic/tdomDecls.h	2023-01-18 20:37:24.944545544 +0100
-+++ b/generic/tdomDecls.h	2023-01-18 20:37:36.574361814 +0100
-@@ -87,7 +87,7 @@
-     int (*xML_GetIdAttributeIndex) (XML_Parser parser); /* 15 */
-     domNode * (*tcldom_getNodeFromName) (Tcl_Interp *interp, char *nodeName, char **errMsg); /* 16 */
-     domDocument * (*tcldom_getDocumentFromName) (Tcl_Interp *interp, char *docName, char **errMsg); /* 17 */
--    SchemaData * (*tdomGetSchemadata) (void); /* 18 */
-+    SchemaData * (*tdomGetSchemadata) (Tcl_Interp *interp); /* 18 */
- } TdomStubs;
- 
- extern const TdomStubs *tdomStubsPtr;
diff --git a/dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch b/dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch
deleted file mode 100644
index a0a691fdce60..000000000000
--- a/dev-tcltk/tdom/files/tdom-0.9.2-nothreads.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/generic/tdomDecls.h	2021-12-31 20:52:18.070370435 +0100
-+++ b/generic/tdomDecls.h	2021-12-31 20:53:45.892045820 +0100
-@@ -63,7 +63,7 @@
- EXTERN domDocument *	tcldom_getDocumentFromName(Tcl_Interp *interp,
- 				char *docName, char **errMsg);
- /* 18 */
--EXTERN SchemaData *	tdomGetSchemadata(void);
-+EXTERN SchemaData *	tdomGetSchemadata(Tcl_Interp *interp);
- 
- typedef struct TdomStubs {
-     int magic;
---- a/generic/schema.c	2021-12-31 23:19:47.869682736 +0100
-+++ b/generic/schema.c	2021-12-31 23:20:14.474255669 +0100
-@@ -419,7 +419,7 @@
- }
- #else
- SchemaData *
--tdomGetSchemadata (void) 
-+tdomGetSchemadata (Tcl_Interp *interp) 
- {
-     return GETASI;
- }
diff --git a/dev-tcltk/tdom/tdom-0.9.2-r1.ebuild b/dev-tcltk/tdom/tdom-0.9.2-r1.ebuild
deleted file mode 100644
index fab0aebae09e..000000000000
--- a/dev-tcltk/tdom/tdom-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-MY_P="tDOM-${PV}"
-
-DESCRIPTION="A XML/DOM/XPath/XSLT Implementation for Tcl"
-HOMEPAGE="https://core.tcl.tk/tdom/"
-SRC_URI="http://tdom.org/downloads/${P}-src.tgz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="threads"
-
-DEPEND="
-	dev-lang/tcl:0=
-	dev-libs/expat"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${P}-src
-
-PATCHES=(
-	"${FILESDIR}"/${P}-useCC.patch
-	"${FILESDIR}"/${P}-nothreads.patch
-	"${FILESDIR}"/${P}-clang6.patch
-)
-
-src_prepare() {
-	append-libs -lm
-	sed \
-		-e 's:-O2::g' \
-		-e 's:-pipe::g' \
-		-e 's:-fomit-frame-pointer::g' \
-		-e '/SHLIB_LD_LIBS/s:\"$: ${TCL_LIB_FLAG}":g' \
-		-i tclconfig/tcl.m4 || die
-	mv extensions/tnc/configure.{in,ac} || die
-	mv extensions/example/configure.{in,ac} || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable threads)
-		--enable-shared
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir)
-		)
-
-	cd "${S}"/unix && ECONF_SOURCE=".." econf ${myeconfargs} \
-		--disable-tdomalloc --with-expat
-	cd "${S}"/extensions/tdomhtml && econf
-	cd "${S}"/extensions/tnc && econf ${myeconfargs}
-}
-
-src_compile() {
-	local dir
-
-	for dir in "${S}"/unix "${S}"/extensions/tnc; do
-		pushd ${dir} > /dev/null
-			emake
-		popd > /dev/null
-	done
-}
-
-src_test() {
-	cd unix && default
-}
-
-src_install() {
-	local dir
-
-	dodoc CHANGES ChangeLog README*
-
-	for dir in "${S}"/unix "${S}"/extensions/tdomhtml "${S}"/extensions/tnc; do
-		pushd ${dir} > /dev/null
-			emake DESTDIR="${D}" install
-		popd > /dev/null
-	done
-}