gentoo resync : 28.04.2021

8 files changed, 4 insertions, 354 deletions

diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index 75bca601622d..ddd97f0a4afe 100644
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -1,11 +1,4 @@
-AUX tdom-0.8.2-tnc.patch 2806 BLAKE2B 69e00242eba8096a8d28fe3218e1d0b441e567185ca5d208633a4d68deeb160d5d5d108749df0fd0c1d9ea6df9d054919d5d4bf6ecd4bf9c389e94f15c5323cc SHA512 b111a75abf35dd7acf813e05295e51633d30e12d20250f21905eec021ea64194d116a9869b2eac882da49f6a9037d3b1b6e23b30091b9bc92cd2bed91d7c8177
-AUX tdom-0.8.2.patch 2036 BLAKE2B d19a9a1f7b2095d5c0ce3684ecdacc0328ba82ddf6488d7fd3bbb2d1f0f777f6f7739ca0cca50a00825ea7ea3405415c61c738d49ed092bbbe17af165356dfee SHA512 f86d07835de0274072243ff347123edba075d46e0e3da246d75f378d9dfcff3cc4e338f6d26449f15610db4bf1256b5e3890ac9b5f2b3d3c5edd24dcfd8120b5
-AUX tdom-0.8.3-expat.patch 2512 BLAKE2B a97637e5e65ac2711cb4be392e2269fd17bfd2a2ca83a92d78b9dd064b94492de626264ea67715b315c5c2326f24833d1a57173bd36120ad989cb2985bf3b969 SHA512 110c07c55b2793152819c8da486a72440096876ff871b045d1a4b1d4a0a9e62bac4ccaf02bc83786f309b85f84e9311b6af31b6f4b5e8fb4f8294e6435f6be15
-AUX tdom-0.8.3-soname.patch 963 BLAKE2B 561fbd01681f2ecb5c55325591cc9e3f796dac14ecd1e7d567454df7ed56ea8f45208fd03c611a8816a38c63147dba7c9868493616103cb03014edf32842f3a4 SHA512 ea7f689f3b979fc565947a6b5e2ef6dfd422eee83c98749c4f9f0a213f0a44f3beba211e5c8e1b251e4bc2bbd77a5e4e75476661de5ffeb9d01e8f7bbba05990
-AUX tdom-0.8.3-tcl8.6.patch 764 BLAKE2B ae8abbe0b2b5db8b75f618048ba407bbd2ad97b55a15d61803c2840a2ade88d6c5201d6bb045898ce427b2d375d468a827f5e95e5de74b3768560e28a7a20730 SHA512 4af4a3d712a9f6b57a7a9c6641c7fbef9c1ffd278c2507c067dc43d15102dc2bcc8df8eafc205973c7d7db8f7f9914f98d881877c863b32184c68c6313a466b6
 AUX tdom-0.9.1-useCC.patch 868 BLAKE2B f4d3a7a0d79d7213ead1fb29dcaca2e33202901a33f0a2f4b97313f5e4db79cd92ec79db179a1ce4d2d93813c3616c6e32c82fd6c6abdc89dac43477fdab1043 SHA512 765ba2e77c48fcb13530e92c483a48e3f57921e4b721cc9149e054c4cbb4a022ac0036c23e88f7b3a8cd7820a056240ab6e2ec2d9cf83e6fe4d8bb1dd01b1b4f
-DIST tDOM-0.8.3.tgz 990367 BLAKE2B 172c20fba9a5d66564f94b76b2a732d0ec1d281386b957b151e300c824d96dea746f355446896eda1953aab9708da8916e05083d991c9ef317f11928ec04a541 SHA512 aa5352bc9b67c45d115e52dbf2cf153a3db89f851b51c1cd574af69b02c466f643df0b5448f7d105245246d20a92f80605f16bd927cd7925c1f2007827f2dc20
 DIST tdom-0.9.1-src.tgz 1100163 BLAKE2B 25fca8ae7b2dbcfaca711df90e42479dfba57e9aaf0e616c519b6e74bafb1b5fa371c48abe0875126aa8e1979196a10f6030a0ffe8786b21f7685e8c2ddcb16c SHA512 40dd5ec942ac4cce2fd78f53caf3a2b5e2fae9fbc5617923d94f07c9f530fa936696d79abe080ade2edbc4f4a86c35898b000180f20d9320edd8bfa3fa19d863
-EBUILD tdom-0.8.3-r4.ebuild 1938 BLAKE2B 2951dfd3bcd37acb93b495f0eb960063a5c8068a3b9ec21ba63f7f50426d50539adae80a7d53e8bebf85f6eda6f224f8813c10ee81067ad46bc7e47990fba604 SHA512 4a441e27820ad303f2cc435a40ab087093a5db6c0aa08865ec7767edf1089aaa2a136bed706b6a356a9bacb739159c2b2f0b5d717ad15b093848aba8f05dfc15
-EBUILD tdom-0.9.1.ebuild 1692 BLAKE2B 9c4613a3e5ba622bbe2f99e93e1672d9bef0d134af28c173951ad8f529c563f72b3055c6c62bf66cba97060eb2511a4af4218e5338038942e8f7da80b31230a1 SHA512 0251a7bbc43906d7bb643bc1c66d5b98dd546195368d6e0fedd5ea5bfb38edd6f52b5496487dec160bb2b1f5d047b6b9e1007f716e8752b3e15014d37287215c
+EBUILD tdom-0.9.1.ebuild 1677 BLAKE2B 6f714a5d97d220dafaa63d8751ef441afe148edd7fdd956d8a2b261cbf1a3518f853399a3694d244e2dbe7eb4391910dda32ddf432db1612f1790107333fc1f1 SHA512 3e055d595f07b66fdbe411a0c8abf84b8c9f3e1d37174ae8b450b468fdb6e70de579a7b45dcd9a62e3e7b4d38a28b2df58bc70760a57d00322340fb5d9adf635
 MISC metadata.xml 609 BLAKE2B 3bc4f86bccad86ccb2cd5d69ad8f8da845454892bc4c7998fa84cc51ca0a51e2acbbe68aad546db75a8440d87c8b8fc12df1479446fb7641caae56403e846a65 SHA512 80b0290426618cae5e2798eb85af524fbe39d27b47cd4298fbc7603c6b804c8ab3ac6299a9676fdfd50ae276b523e1327f4ded935fbd9dd338e587a5f8ff3f35
diff --git a/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch b/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch
deleted file mode 100644
index 7fa200b9ee33..000000000000
--- a/dev-tcltk/tdom/files/tdom-0.8.2-tnc.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Source: http://download.opensuse.org/repositories/openSUSE:/11.0/standard/src/tdom-0.8.2-50.1.src.rpm
---- extensions/tnc/Makefile.in
-+++ extensions/tnc/Makefile.in
-@@ -355,29 +355,30 @@
- #========================================================================
- 
- install-lib-binaries: binaries
--	@mkdir -p $(DESTDIR)$(pkglibdir)
-+	@mkdir -p $(DESTDIR)$(libdir)
- 	@list='$(lib_BINARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
-+	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
- 	    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
- 	    if test "x$$stub" = "xstub"; then \
--		echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
--		$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
-+		echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
-+		$(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
- 	    else \
--		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
--		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
-+		echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
-+		$(RANLIB) $(DESTDIR)$(libdir)/$$p; \
- 	    fi; \
- 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
- 	    if test "x$$ext" = "xdll"; then \
- 		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
- 		if test -f $$lib; then \
--		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
--	            $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
-+		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
-+	            $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
- 		fi; \
- 	    fi; \
- 	  fi; \
- 	done
-+	@mkdir -p $(DESTDIR)$(pkglibdir)
- 	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
- 	  if test -f $(srcdir)/$$p; then \
- 	    destp=`basename $$p`; \
---- extensions/tnc/configure.in
-+++ extensions/tnc/configure.in
-@@ -89,7 +89,7 @@
- if test "${TEA_PLATFORM}" = "windows" -a "$GCC" != "yes" ; then
-     TEA_ADD_LIBS([\"`${CYGPATH} ${TDOM_STUB_LIB_PATH}`\"])
- else
--    TEA_ADD_LIBS([${TDOM_STUB_LIB_SPEC}])
-+    TEA_ADD_LIBS([${TDOM_BUILD_STUB_LIB_SPEC}])
- fi
- 
- #--------------------------------------------------------------------
---- extensions/tnc/pkgIndex.tcl.in
-+++ extensions/tnc/pkgIndex.tcl.in
-@@ -2,4 +2,4 @@
- 
- package ifneeded tnc @PACKAGE_VERSION@        \
-     "package require tdom; \
--     [list load [file join $dir @PKG_LIB_FILE@] tnc]"
-+     [list load @PKG_LIB_FILE@ tnc]"
---- extensions/tnc/Makefile.in
-+++ extensions/tnc/Makefile.in
-@@ -160,7 +160,7 @@ DEFS		= @DEFS@ $(PKG_CFLAGS)
- CONFIG_CLEAN_FILES = Makefile
- 
- CPPFLAGS	= @CPPFLAGS@
--LIBS		= @PKG_LIBS@ @LIBS@
-+LIBS		= @PKG_LIBS@ @LIBS@ -L../../unix/
- AR		= @AR@
- CFLAGS		= @CFLAGS@
- COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/dev-tcltk/tdom/files/tdom-0.8.2.patch b/dev-tcltk/tdom/files/tdom-0.8.2.patch
deleted file mode 100644
index 73af7c60e141..000000000000
--- a/dev-tcltk/tdom/files/tdom-0.8.2.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Source: http://download.opensuse.org/repositories/openSUSE:/11.0/standard/src/tdom-0.8.2-50.1.src.rpm
---- Makefile.in
-+++ Makefile.in
-@@ -307,7 +307,7 @@
- 
- pkgIndex.tcl-hand:
- 	@(echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_VERSION)\
--	"load [list [file join $$dir $(PKG_LIB_FILE)]];\
-+	"load $(PKG_LIB_FILE);\
-          source [list [file join $$dir tdom.tcl]]"'\
- 	) > pkgIndex.tcl
- 
-@@ -385,29 +385,30 @@
- #========================================================================
- 
- install-lib-binaries: binaries
--	@mkdir -p $(DESTDIR)$(pkglibdir)
-+	@mkdir -p $(DESTDIR)$(libdir)
- 	@list='$(lib_BINARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
-+	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
- 	    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
- 	    if test "x$$stub" = "xstub"; then \
--		echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
--		$(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
-+		echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
-+		$(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
- 	    else \
--		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
--		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
-+		echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
-+		$(RANLIB) $(DESTDIR)$(libdir)/$$p; \
- 	    fi; \
- 	    ext=`echo $$p|sed -e "s/.*\.//"`; \
- 	    if test "x$$ext" = "xdll"; then \
- 		lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
- 		if test -f $$lib; then \
--		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
--	            $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
-+		    echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
-+	            $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
- 		fi; \
- 	    fi; \
- 	  fi; \
- 	done
-+	@mkdir -p $(DESTDIR)$(pkglibdir)
- 	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
- 	  if test -f $(srcdir)/$$p; then \
- 	    destp=`basename $$p`; \
diff --git a/dev-tcltk/tdom/files/tdom-0.8.3-expat.patch b/dev-tcltk/tdom/files/tdom-0.8.3-expat.patch
deleted file mode 100644
index 818850bd8eee..000000000000
--- a/dev-tcltk/tdom/files/tdom-0.8.3-expat.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 8e634f2..d9999cf 100644
---- a/configure.in
-+++ b/configure.in
-@@ -72,6 +72,7 @@ AC_CHECK_FUNCS(memmove bcopy)
- #--------------------------------------------------------------------
- 
- TDOM_PATH_AOLSERVER
-+TDOM_PATH_EXPAT
- 
- #-----------------------------------------------------------------------
- # __CHANGE__
-@@ -83,10 +84,7 @@ TDOM_PATH_AOLSERVER
- # and PKG_TCL_SOURCES.
- #-----------------------------------------------------------------------
- 
--TEA_ADD_SOURCES([expat/xmlrole.c     \
--                 expat/xmltok.c      \
--                 expat/xmlparse.c    \
--                 generic/xmlsimple.c \
-+TEA_ADD_SOURCES([generic/xmlsimple.c \
-                  generic/utf8conv.c  \
-                  generic/dom.c       \
-                  generic/domhtml.c   \
-@@ -99,7 +97,7 @@ TEA_ADD_SOURCES([expat/xmlrole.c     \
-                  generic/tclexpat.c  \
-                  generic/tdomStubInit.c])
- TEA_ADD_HEADERS([generic/tdom.h])
--TEA_ADD_INCLUDES([-I${srcdir}/generic -I${srcdir}/expat ${AOL_INCLUDES}])
-+TEA_ADD_INCLUDES([-I${srcdir}/generic ${AOL_INCLUDES}])
- TEA_ADD_LIBS([${AOL_LIBS}])
- TEA_ADD_CFLAGS([])
- TEA_ADD_STUB_SOURCES([generic/tdomStubLib.c])
-diff --git a/tdom.m4 b/tdom.m4
-index f5ecd98..fcab883 100644
---- a/tdom.m4
-+++ b/tdom.m4
-@@ -216,6 +216,46 @@ AC_DEFUN(TDOM_PATH_AOLSERVER, [
-     fi
- ])
- 
-+
-+AC_DEFUN(TDOM_PATH_EXPAT, [
-+    AC_MSG_CHECKING([for expat])
-+    AC_ARG_WITH(expat, 
-+        AC_HELP_STRING([--with-expat],
-+            [directory with expat installation]), , [with_expat=no])
-+
-+    AC_CACHE_VAL(ac_cv_c_expat,[
-+    case $with_expat in
-+	no) ;;
-+	yes)
-+	    for f in /usr/local /usr; do
-+	        if test -f "$f/include/expat.h" ; then
-+		    ac_cv_c_expat=`(cd $f; pwd)`
-+		    break
-+		fi
-+	    done
-+	    ;;
-+	*)
-+	    if test -f "$with_expat/include/expat.h"; then
-+		ac_cv_c_expat=`(cd $with_expat; pwd)`
-+	    else
-+        	AC_MSG_ERROR([${with_expat} directory doesn't contain expat.h])
-+	    fi
-+    esac
-+    ])
-+    if test x"${ac_cv_c_expat}" = x ; then
-+        AC_MSG_RESULT([using local copy])
-+	TEA_ADD_SOURCES([expat/xmlrole.c     \
-+                 	 expat/xmltok.c      \
-+	                 expat/xmlparse.c])
-+	TEA_ADD_INCLUDES([-I${srcdir}/expat])
-+    else
-+        AC_MSG_RESULT([${ac_cv_c_expat}])
-+	TEA_ADD_INCLUDES(${ac_cv_c_expat}/include)
-+	TEA_ADD_LIBS([-lexpat])
-+    fi
-+])
-+
-+
- #------------------------------------------------------------------------
- # TDOM_PATH_CONFIG --
- #
diff --git a/dev-tcltk/tdom/files/tdom-0.8.3-soname.patch b/dev-tcltk/tdom/files/tdom-0.8.3-soname.patch
deleted file mode 100644
index f742f6e7f5a1..000000000000
--- a/dev-tcltk/tdom/files/tdom-0.8.3-soname.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index d995328..5c17e11 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -108,7 +108,7 @@ CFLAGS_DEFAULT	= @CFLAGS_DEFAULT@
- CFLAGS_WARNING	= @CFLAGS_WARNING@
- CLEANFILES	= @CLEANFILES@
- EXEEXT		= @EXEEXT@
--LDFLAGS_DEFAULT	= @LDFLAGS_DEFAULT@
-+LDFLAGS_DEFAULT	= @LDFLAGS_DEFAULT@ -Wl,-soname,libtdom$(PACKAGE_VERSION).so
- MAKE_LIB	= @MAKE_LIB@
- MAKE_SHARED_LIB	= @MAKE_SHARED_LIB@
- MAKE_STATIC_LIB	= @MAKE_STATIC_LIB@
-diff --git a/extensions/tnc/Makefile.in b/extensions/tnc/Makefile.in
-index f8a332c..01e0ef0 100644
---- a/extensions/tnc/Makefile.in
-+++ b/extensions/tnc/Makefile.in
-@@ -98,7 +98,7 @@ CFLAGS_DEFAULT	= @CFLAGS_DEFAULT@
- CFLAGS_WARNING	= @CFLAGS_WARNING@
- CLEANFILES	= @CLEANFILES@
- EXEEXT		= @EXEEXT@
--LDFLAGS_DEFAULT	= @LDFLAGS_DEFAULT@
-+LDFLAGS_DEFAULT	= @LDFLAGS_DEFAULT@ -Wl,-soname,libtnc$(PACKAGE_VERSION).so
- MAKE_LIB	= @MAKE_LIB@
- MAKE_SHARED_LIB	= @MAKE_SHARED_LIB@
- MAKE_STATIC_LIB	= @MAKE_STATIC_LIB@
diff --git a/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch b/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch
deleted file mode 100644
index 5a805931ca31..000000000000
--- a/dev-tcltk/tdom/files/tdom-0.8.3-tcl8.6.patch
+++ /dev/null
@@ -1,21 +0,0 @@
- generic/tcldom.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/generic/tcldom.c b/generic/tcldom.c
-index 91d98c9..0f024b3 100644
---- a/generic/tcldom.c
-+++ b/generic/tcldom.c
-@@ -5933,8 +5933,13 @@ int tcldom_EvalLocked (
-     ret = Tcl_EvalObj(interp, objv[2]);
-     if (ret == TCL_ERROR) {
-         char msg[64 + TCL_INTEGER_SPACE];
-+    #if TCL_MAJOR_VERSION <=8 && TCL_MINOR_VERSION < 6
-         sprintf(msg, "\n    (\"%s %s\" body line %d)", Tcl_GetString(objv[0]),
-                 Tcl_GetString(objv[1]), interp->errorLine);
-+    #else
-+        sprintf(msg, "\n    (\"%s %s\" body line %d)", Tcl_GetString(objv[0]),
-+                Tcl_GetString(objv[1]), Tcl_GetErrorLine(interp));
-+    #endif
-         Tcl_AddErrorInfo(interp, msg);
-     }
- 
diff --git a/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild b/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
deleted file mode 100644
index ed89bad9d1e5..000000000000
--- a/dev-tcltk/tdom/tdom-0.8.3-r4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
-
-MY_P="tDOM-${PV}"
-
-DESCRIPTION="A XML/DOM/XPath/XSLT Implementation for Tcl"
-HOMEPAGE="https://tdom.github.com/"
-#SRC_URI="https://cloud.github.com/downloads/tDOM/${PN}/${MY_P}.tgz"
-SRC_URI="https://github.com/downloads/tDOM/${PN}/${MY_P}.tgz"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs threads"
-
-DEPEND="
-	dev-lang/tcl:0=
-	dev-libs/expat"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/"${PN}-0.8.2.patch
-	"${FILESDIR}/"${P}-soname.patch
-	"${FILESDIR}/"${P}-expat.patch
-	"${FILESDIR}/"${PN}-0.8.2-tnc.patch
-	"${FILESDIR}/"${P}-tcl8.6.patch
-	)
-
-src_prepare() {
-	tc-export AR
-	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 {.,extensions/tnc}/configure tclconfig/tcl.m4 || die
-	epatch "${PATCHES[@]}"
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable threads)
-		--enable-shared
-		--disable-tdomalloc
-		--with-expat
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir)
-		)
-
-	cd "${S}"/unix && ECONF_SOURCE=".." econf ${myeconfargs}
-	cd "${S}"/extensions/tdomhtml &&	econf ${myeconfargs}
-	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_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
-
-	if ! use static-libs; then
-		einfo "Removing static libs ..."
-		rm -f "${ED}"/usr/$(get_libdir)/*.{a,la} || die
-	fi
-}
diff --git a/dev-tcltk/tdom/tdom-0.9.1.ebuild b/dev-tcltk/tdom/tdom-0.9.1.ebuild
index 2a2c41d9b9ff..d97f40d5074f 100644
--- a/dev-tcltk/tdom/tdom-0.9.1.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils flag-o-matic multilib toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 MY_P="tDOM-${PV}"
 
@@ -13,7 +13,7 @@ SRC_URI="http://tdom.org/downloads/${P}-src.tgz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs threads"
 
 DEPEND="