gentoo resync : 10.11.2019

5 files changed, 2 insertions, 123 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 3ccac11b08a7..89e51b03cd10 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index 76d42ac110a2..5891cdccb9b3 100644
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -3,10 +3,8 @@ AUX tdom-0.8.2.patch 2036 BLAKE2B d19a9a1f7b2095d5c0ce3684ecdacc0328ba82ddf6488d
 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-tnc.patch 2429 BLAKE2B 5ceb9f3a28df5436019f2ee8fb542eda7e4d93c79c41d39ec6f0e505d69837bf615ddcaa799aafefb8ccbe65c341f6fbfbda2901d23c351f80a5390ee02774e9 SHA512 25bdbf557f4233afc317f7cc3f09871cec3f1d4d458ecf8c17e49fdad3a015c17aac330f29a0d1e7275411a46fc8bc467e0f8a2d32904a5a0563b15aecea89e0
-AUX tdom-0.9.1.patch 2328 BLAKE2B df4952d6c660426e24f8bcbde225f42fb005dcaccc9ee456fa00588e00eba523bff20de4fb78fa5f5168561803e52c020d9379c041f0ebcd78b0ea231da14048 SHA512 e39e0c7d2285a325423cf1da268cbc66ab5e1ead67a0b5d8fb8311e6eb02dc905fc87a54b101396c69bad8dbca58fb0c1ee4d91fd7db825eff32c6fef6efa559
 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 1937 BLAKE2B 5b95a705b4fa6308299cf8154b3d60a6cd192b1ce7f2b361dc84b590286922068404568a6bef72070f63e3988bf5929a98b3e11d29361da1b810108aff1afb3d SHA512 05174c0e1e0679415324721b469bfae70e8fdda138f0a6dbd0e57cc449f5a46d000e25bfbc36b03d0dbb46f01cfbc489460dad62485a4f294bd73b851dc818d0
-EBUILD tdom-0.9.1.ebuild 1753 BLAKE2B 1f48744ff0d124b1829bd392094668ad34bb8f9cf6f9c5c9c3e67b7cb22569fcfac8a1d44929dbbd75050798a592b3c3d6963285c3952838d6f48cd563197b2b SHA512 80084d850ab5a696317f850a14671a7385c93e664e2cdd0ab334f2d77274c6d11d7a54013cf1479b2a67985b8d80dcaa20a6893731cf265e39d95a0741a970b6
+EBUILD tdom-0.9.1.ebuild 1643 BLAKE2B e8cb148f106708923fe12517eb397d85d8ec37cce87773c0b9816827f3a93d62f97b9490fb264c03438400359f6e5ff50b1cb3734cd6d640f364018f1a7c2d77 SHA512 ce86c7812a62d6a021510bc205352fd18c9a5db713e70270ded2e13f1b5523b1c9f8711cb80fdd71f0b39a765dc4e5586e3edef3a6b5b68d0bb56e4ed72ff805
 MISC metadata.xml 609 BLAKE2B 3bc4f86bccad86ccb2cd5d69ad8f8da845454892bc4c7998fa84cc51ca0a51e2acbbe68aad546db75a8440d87c8b8fc12df1479446fb7641caae56403e846a65 SHA512 80b0290426618cae5e2798eb85af524fbe39d27b47cd4298fbc7603c6b804c8ab3ac6299a9676fdfd50ae276b523e1327f4ded935fbd9dd338e587a5f8ff3f35
diff --git a/dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch b/dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch
deleted file mode 100644
index 36d844d74cbf..000000000000
--- a/dev-tcltk/tdom/files/tdom-0.9.1-tnc.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/extensions/tnc/Makefile.in	2018-10-31 21:18:18.701695694 +0100
-+++ b/extensions/tnc/Makefile.in	2018-10-31 21:19:25.621555122 +0100
-@@ -372,25 +372,25 @@
- #========================================================================
- 
- install-lib-binaries: binaries
--	@$(INSTALL_DATA_DIR) $(DESTDIR)$(pkglibdir)
-+	@$(INSTALL_DATA_DIR) $(DESTDIR)$(libdir)
- 	@list='$(lib_BINARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p"; \
-+	    $(INSTALL_LIBRARY) $$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; \
-@@ -398,13 +398,13 @@
- 	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
- 	  if test -f $(srcdir)/$$p; then \
- 	    destp=`basename $$p`; \
--	    echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
-+	    echo " Install $$destp $(DESTDIR)$(libdir)/$$destp"; \
-+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(libdir)/$$destp; \
- 	  fi; \
- 	done
- 	@if test "x$(SHARED_BUILD)" = "x1"; then \
--	    echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \
--	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
-+	    echo " Install pkgIndex.tcl $(DESTDIR)$(libdir)"; \
-+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(libdir); \
- 	fi
- 
- #========================================================================
diff --git a/dev-tcltk/tdom/files/tdom-0.9.1.patch b/dev-tcltk/tdom/files/tdom-0.9.1.patch
deleted file mode 100644
index 00d3df2a3068..000000000000
--- a/dev-tcltk/tdom/files/tdom-0.9.1.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/Makefile.in	2018-10-31 21:12:16.856861967 +0100
-+++ b/Makefile.in	2018-10-31 21:15:26.611628532 +0100
-@@ -326,7 +326,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
- 
-@@ -422,7 +422,7 @@
- #========================================================================
- 
- install-lib-binaries: binaries
--	@$(INSTALL_DATA_DIR) $(DESTDIR)$(pkglibdir)
-+	@$(INSTALL_DATA_DIR) $(DESTDIR)$(libdir)
- 	@list='$(lib_BINARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    if test "x$$stub" = "xstub"; then \
-@@ -432,15 +432,15 @@
- 		echo " $(RANLIB) $$p"; \
- 		$(RANLIB) $$p; \
- 	    fi; \
--	    echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
--	    $(INSTALL_LIBRARY) $$p $(DESTDIR)$(pkglibdir)/$$p; \
-+	    echo " $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p"; \
-+	    $(INSTALL_LIBRARY) $$p $(DESTDIR)$(libdir)/$$p; \
- 	    stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
- 	    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; \
-@@ -450,13 +450,13 @@
- 	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
- 	  if test -f $(srcdir)/$$p; then \
- 	    destp=`basename $$p`; \
--	    echo " Install $$destp $(DESTDIR)$(pkglibdir)/$$destp"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
-+	    echo " Install $$destp $(DESTDIR)$(libdir)/$$destp"; \
-+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(libdir)/$$destp; \
- 	  fi; \
- 	done
- 	@if test "x$(SHARED_BUILD)" = "x1"; then \
--	    echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \
--	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
-+	    echo " Install pkgIndex.tcl $(DESTDIR)$(libdir)"; \
-+	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(libdir); \
- 	fi
- 
- #========================================================================
diff --git a/dev-tcltk/tdom/tdom-0.9.1.ebuild b/dev-tcltk/tdom/tdom-0.9.1.ebuild
index 9f39b4442662..e3d3dc7f8df8 100644
--- a/dev-tcltk/tdom/tdom-0.9.1.ebuild
+++ b/dev-tcltk/tdom/tdom-0.9.1.ebuild
@@ -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 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs threads"
 
 DEPEND="
@@ -21,12 +21,6 @@ DEPEND="
 	dev-libs/expat"
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/"${P}.patch
-	"${FILESDIR}/"${P}-tnc.patch
-	"${FILESDIR}/"${PN}-0.8.3-soname.patch
-)
-
 src_prepare() {
 	append-libs -lm
 	sed \