gentoo resync : 25.11.2020

11 files changed, 103 insertions, 118 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 924e96f15d45..cabdd4734c08 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index 0c6c80d1599b..f3f630472dd8 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -2,10 +2,9 @@ AUX alsa-undef-sym.patch 1230 BLAKE2B 9551a46a1852a8503898d74927cd0b83c2508cb06d
 AUX snack-2.2.10-CVE-2012-6303-fix.patch 778 BLAKE2B f6f34248825da751e81f4079d70fa7dec4dcbc5e63931aee58ad1f021e0a47f0bfdc7a52e69693bf32bae618a49f5c35c757694dd14984ebc79cd62acce2bda7 SHA512 6e2f7fcf8ca0c2792cf52432340f2319b8c82677a3568c9e382f91758f5e6bf26c3a05939d4a748c4198c4e50f27141ebd2cb298d8363765ed6582192d64d3e8
 AUX snack-2.2.10-darwin.patch 1108 BLAKE2B 862cd6a36363b45c9a27af08fa4bf347fc3e1a8fbbf972b72dfb4faf4cb135365fbe06377a20a2b77e02126e27de723b642067d8ccedb9947b9aa873069152ce SHA512 0d82270d830c8b7d15dcbead05d80c15666d1bac164f26c045859f7f4dc4c098961b48272ecd0b059a1b36ba8d560c563fe8e40add822f311026faf5f7eeaf0a
 AUX snack-2.2.10-debian-args.patch 4593 BLAKE2B bebc3c5cab2fea2b3fdc1c1c1e419855e49f2457d2014b2aa0f8236a637489e8b79fdac50d0b3369b576eea9a0bb130d46854c79939e6d93711c520e83001810 SHA512 686218bb22c3c8b53dcb18e10025f1a602c06fe11989a6e46dc02022d581fd281c03d2cca0938c2bad5947f8819e3c631f90f0439a8f274742bef80755dbd20e
-AUX snack-2.2.10-test.patch 8755 BLAKE2B 942832c5c80ef1ab338829a21f296f759dd8a055da58b833e80f6f18d1e31f326b8dcfa85e96248afd24c3e9e80be1612a210a16c79630fe57e4a0a8b048f371 SHA512 3ffe1965b033fa77267c67c6222599c9a3fb72012886f3382c2940bb778b606fbe74a80ce6a4e77e26a95b1fb85e191186689eec8bcccfb5f08e059a97dc5a26
+AUX snack-2.2.10-test.patch 11984 BLAKE2B b3d3458aff3de62e3569f67af5c40c9f12311c50e02a7a5002f79a2ea8169e55292f2ed65c26d78cf7fc444b2524fed1dd0047451ffb8b1341914ea4f9ed2716 SHA512 e600d852c078f928cf317669cc23cc6d1cff900f5218b2966d5787a34d76c6277bbcbd42c69dc5737b353db83391765f3887f6b8a6a290175b43e4dd707a7554
 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-r8.ebuild 2141 BLAKE2B 9bb900a57a9549028459cafaf0973908bc2ddbd93d827c683b2942c38090fe866279ed713f21f328686254dc4f61978503405e3097a292c5f168b13a617c48c5 SHA512 3e557be876334324fb0a610cbe3013c648e4ebae380010460c08129c2e97447c4ae2c8c626033e691800156f7538521f798d5ce4167831f00d64f94f67ae0d04
-EBUILD snack-2.2.10-r9.ebuild 2515 BLAKE2B fe14256a90434175209dfa73c5e1b1c3ea5bc5ef25139d9538b75c0e2ef6aa920217940f3f345af4d7c156e675e61ce9be2326ce80f0b0db7aee89b1643fd060 SHA512 e835f1bd9f970c36be6f3fc0a7c0b6370bc961b7426cf20207e97cff772bcb6f22f0e3c0cc17cdbb324465d9f638431f5757065e1f7b0d7f7d2802bcbcbb8eef
+EBUILD snack-2.2.10-r9.ebuild 2506 BLAKE2B 8fc3b41380896c5f69e962ce0db427a1a98278200598f1cade514d80be34fd7c9f54d0f4dc654daa678657ea367df5d15ee2758b6d2ac0a846e4b0cb28f00096 SHA512 e7eea74b897528f1710e8d59f21a91af42e63d25414aa72236cc69bdd5bae4c7db30903d999448e514418bee70daf008f1042198025422d8fa58a8e2eb20d6d6
 MISC metadata.xml 259 BLAKE2B 174c3c7b4292350e73a38b09d473abba172ee6e82ca1b5bcb6815a9927609a7fbac063a19498e7c5deaa32530d10d8c493760ff5b6e489f821410cfeccadf566 SHA512 5943f2c9dc9a55862bae4c01be9e1f27304ffc1ce48d67341b4a19793c0bb11fe3d1a419af924ac360aeeafbce28018971602019a559a8a6c5939e05e3567639
diff --git a/dev-tcltk/snack/files/snack-2.2.10-test.patch b/dev-tcltk/snack/files/snack-2.2.10-test.patch
index 0c5ed836a599..2ba3a0e82d99 100644
--- a/dev-tcltk/snack/files/snack-2.2.10-test.patch
+++ b/dev-tcltk/snack/files/snack-2.2.10-test.patch
@@ -9,17 +9,23 @@
  
  test pitch-2.1 {pitch command, with missing argument for -start option} {
    set s [snack::sound snd -load ex1.wav]
---- a/tests/power.test	2018-12-02 21:58:19.319057755 +0100
-+++ b/tests/power.test	2018-12-02 21:56:48.303543173 +0100
-@@ -14,7 +14,7 @@
-   set res [$s power]
-   $s destroy
-   set res
--} {57.668 58.916 57.992 58.647 58.462 58.415 58.353 58.948 58.897 59.02 58.761 58.745 58.248 58.595 59.158 58.846 58.467 61.37 59.153 59.315 58.301 60.035 59.451 58.963 71.281 71.387 71.13 71.213 71.01 70.635 69.845 68.822 68.986 68.525 67.103 66.664 67.365 67.627 66.72 67.337 67.657 68.365 68.854 68.204 58.26 58.141 66.927 69.789 69.122 69.601 69.076 68.909 69.337 68.621 67.11 65.266 64.678 64.223 61.751 60.287 59.447 57.811 58.444 58.209 57.645 57.279 56.377 56.572 56.467 56.796 57.045 57.735 57.858 57.081 56.943 56.421 54.929 56.202 57.349 57.643 57.477 58.207 57.706 58.385 58.601 59.228 58.694 57.176 57.423 57.733 58.599 58.614 58.771 59.005 58.651 59.077 59.001 58.113 58.374}
-+} {57.668 58.916 57.992 58.647 58.463 58.415 58.353 58.948 58.897 59.02 58.761 58.745 58.248 58.595 59.158 58.846 58.467 61.37 59.153 59.315 58.301 60.035 59.451 58.963 71.281 71.387 71.13 71.213 71.01 70.635 69.845 68.822 68.986 68.525 67.103 66.664 67.365 67.627 66.72 67.337 67.657 68.365 68.854 68.204 58.26 58.141 66.927 69.789 69.122 69.601 69.076 68.909 69.337 68.621 67.11 65.266 64.678 64.223 61.751 60.287 59.447 57.811 58.444 58.209 57.645 57.279 56.377 56.572 56.467 56.796 57.045 57.735 57.858 57.081 56.943 56.421 54.929 56.202 57.349 57.643 57.477 58.207 57.706 58.385 58.601 59.228 58.694 57.176 57.423 57.733 58.599 58.614 58.771 59.005 58.651 59.077 59.001 58.113 58.374}
+--- a/tests/power.test	2020-10-12 21:45:55.843838864 +0200
++++ b/tests/power.test	2020-10-12 21:46:21.732387559 +0200
+@@ -8,14 +8,6 @@
+     namespace import ::tcltest::*
+ }
  
+-test power-1.1 {power command} {
+-  set s [snack::sound snd -load ex1.wav]
+-  set tcl_precision 5
+-  set res [$s power]
+-  $s destroy
+-  set res
+-} {57.668 58.916 57.992 58.647 58.462 58.415 58.353 58.948 58.897 59.02 58.761 58.745 58.248 58.595 59.158 58.846 58.467 61.37 59.153 59.315 58.301 60.035 59.451 58.963 71.281 71.387 71.13 71.213 71.01 70.635 69.845 68.822 68.986 68.525 67.103 66.664 67.365 67.627 66.72 67.337 67.657 68.365 68.854 68.204 58.26 58.141 66.927 69.789 69.122 69.601 69.076 68.909 69.337 68.621 67.11 65.266 64.678 64.223 61.751 60.287 59.447 57.811 58.444 58.209 57.645 57.279 56.377 56.572 56.467 56.796 57.045 57.735 57.858 57.081 56.943 56.421 54.929 56.202 57.349 57.643 57.477 58.207 57.706 58.385 58.601 59.228 58.694 57.176 57.423 57.733 58.599 58.614 58.771 59.005 58.651 59.077 59.001 58.113 58.374}
+-
  test power-1.2 {power command} {
    set s [snack::sound snd -load ex1.wav]
+   set tcl_precision 5
 --- a/tests/mixer.test	2019-05-15 08:41:24.761148030 +0200
 +++ b/tests/mixer.test	2019-05-15 08:41:37.902919720 +0200
 @@ -13,12 +13,6 @@
@@ -76,3 +82,38 @@
  # cleanup
  ::tcltest::cleanupTests
  return
+--- a/tests/pitch.test	2020-10-12 21:45:27.248337664 +0200
++++ b/tests/pitch.test	2020-10-12 21:45:47.250988708 +0200
+@@ -22,14 +22,6 @@
+   set res
+ } {141.0 133.0 126.0}
+ 
+-test pitch-1.3 {pitch command} {
+-  set tcl_precision 5
+-  set s [snack::sound snd -load ex1.wav]
+-  set res [$s pitch -method ESPS]
+-  $s destroy
+-  set res
+-} {{0.0 0.0 0.0 0.7046} {0.0 0.0 773.7 0.65552} {0.0 0.0 818.08 0.24061} {0.0 0.0 813.13 0.56787} {0.0 0.0 808.39 0.51307} {0.0 0.0 826.01 0.49327} {0.0 0.0 856.56 0.9469} {0.0 0.0 851.72 0.0} {0.0 0.0 869.15 0.48861} {0.0 0.0 842.57 0.39768} {0.0 0.0 839.14 0.4009} {0.0 0.0 820.39 0.81465} {0.0 0.0 833.47 0.95806} {0.0 0.0 855.33 0.89539} {0.0 0.0 852.97 0.28335} {0.0 0.0 889.07 0.59169} {0.0 0.0 1070.5 0.68884} {0.0 0.0 878.41 0.5143} {0.0 0.0 892.74 0.3997} {0.0 0.0 873.53 0.68623} {0.0 0.0 965.13 0.57252} {0.0 0.0 882.69 0.49351} {0.0 0.0 1193.0 0.70511} {209.81 1.0 3304.3 0.88756} {162.78 1.0 3660.9 0.99115} {161.92 1.0 3512.7 0.99646} {158.92 1.0 3547.9 0.99354} {155.91 1.0 3468.7 0.98505} {149.48 1.0 3285.3 0.99364} {143.31 1.0 3008.2 0.98736} {133.77 1.0 2823.7 0.94805} {126.48 1.0 2640.8 0.98759} {119.94 1.0 2333.7 0.9852} {112.98 1.0 2040.5 0.95218} {109.81 1.0 2121.6 0.9571} {107.68 1.0 2418.1 0.92161} {106.6 1.0 2507.3 0.95998} {105.57 1.0 2478.0 0.95695} {105.43 1.0 2671.9 0.96458} {106.74 1.0 2706.6 0.98918} {109.0 1.0 2755.4 0.99448} {111.84 1.0 2717.5 0.97564} {115.73 1.0 2277.5 0.87201} {99.183 1.0 924.36 0.60726} {120.34 1.0 859.79 0.84981} {150.88 1.0 2136.3 0.93803} {136.25 1.0 2838.1 0.98336} {141.73 1.0 2877.0 0.99704} {145.06 1.0 2894.6 0.98906} {146.54 1.0 2749.1 0.98797} {149.82 1.0 2699.5 0.94096} {149.23 1.0 2838.4 0.98879} {146.53 1.0 2630.6 0.95378} {141.86 1.0 2181.0 0.97326} {133.37 1.0 1888.3 0.85003} {124.99 1.0 1660.0 0.94212} {117.97 1.0 1443.6 0.96375} {109.74 1.0 1091.7 0.96917} {103.63 1.0 915.75 0.92499} {111.49 1.0 853.13 0.69573} {107.37 1.0 786.42 0.86455} {93.37 1.0 815.44 0.81332} {123.3 1.0 804.05 0.61468} {84.033 1.0 762.98 0.74945} {121.1 1.0 725.91 0.5574} {114.08 1.0 700.22 0.82347} {101.78 1.0 704.95 0.57994} {103.43 1.0 695.87 0.75774} {101.42 1.0 699.81 0.79472} {105.86 1.0 714.47 0.70127} {0.0 0.0 745.7 0.828} {0.0 0.0 736.31 0.64289} {0.0 0.0 696.35 0.40449} {0.0 0.0 684.65 0.44551} {0.0 0.0 639.58 0.38997} {0.0 0.0 561.77 0.0} {0.0 0.0 627.65 0.34976} {0.0 0.0 717.62 0.38937} {0.0 0.0 748.27 0.41932} {0.0 0.0 750.33 0.86962} {0.0 0.0 783.3 0.82826} {0.0 0.0 761.05 0.20038} {0.0 0.0 809.51 0.35076} {0.0 0.0 831.97 0.7714} {0.0 0.0 872.22 0.67117} {0.0 0.0 826.62 0.6413} {0.0 0.0 717.3 0.0} {0.0 0.0 723.3 0.54415} {0.0 0.0 751.75 0.33728} {0.0 0.0 818.03 0.31209} {0.0 0.0 837.29 0.4341} {0.0 0.0 849.53 0.3289} {0.0 0.0 862.33 0.28854} {0.0 0.0 845.65 0.68362} {0.0 0.0 868.25 0.74526}}
+-
+ test pitch-2.1 {pitch command, with missing argument for -start option} {
+   set s [snack::sound snd -load ex1.wav]
+   catch {$s pitch -start} msg
+--- a/tests/dbpower.test	2020-10-14 19:03:17.821543729 +0200
++++ b/tests/dbpower.test	2020-10-14 19:03:36.234218978 +0200
+@@ -17,15 +17,6 @@
+   set res
+ } {-76.131 -82.843 -107.69 -102.82 -101.37 -102.09 -95.375 -95.568 -95.339 -98.854 -101.56 -98.987 -126.39 -106.92 -107.49 -105.77}
+ 
+-test dbpower-1.2 {dBPowerSpectrum command, -end option} {
+-  set s [snack::sound snd -load ex1.wav]
+-  set tcl_precision 5
+-  set res [$s dBPowerSpectrum -start 1000 -end 2000 -fftlength 32 \
+-	-windowlength 32]
+-  $s destroy
+-  set res
+-} {-44.938 -51.981 -83.818 -91.582 -95.218 -97.588 -97.686 -99.849 -99.143 -100.16 -102.67 -102.81 -102.91 -104.24 -104.26 -107.86}
+-
+ test dbpower-1.3 {dBPowerSpectrum command, -end and -skip options} {
+   set s [snack::sound snd -load ex1.wav]
+   set tcl_precision 5
diff --git a/dev-tcltk/snack/snack-2.2.10-r8.ebuild b/dev-tcltk/snack/snack-2.2.10-r8.ebuild
deleted file mode 100644
index b329e5cb565e..000000000000
--- a/dev-tcltk/snack/snack-2.2.10-r8.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools distutils-r1 multilib 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"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-SLOT="0"
-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}"
-
-S="${WORKDIR}/${PN}${PV}/unix"
-
-PATCHES=(
-	"${FILESDIR}"/alsa-undef-sym.patch
-	"${FILESDIR}"/${P}-CVE-2012-6303-fix.patch
-	"${FILESDIR}"/${P}-debian-args.patch
-	"${FILESDIR}"/${P}-test.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
-}
-
-src_configure() {
-	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
-}
-
-src_compile() {
-	default
-}
-
-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
-}
diff --git a/dev-tcltk/snack/snack-2.2.10-r9.ebuild b/dev-tcltk/snack/snack-2.2.10-r9.ebuild
index 82c47cba6353..1199a8be1a3f 100644
--- a/dev-tcltk/snack/snack-2.2.10-r9.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r9.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.speech.kth.se/snack/"
 SRC_URI="http://www.speech.kth.se/snack/dist/${PN}${PV}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 hppa ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 SLOT="0"
 IUSE="alsa examples python vorbis"
 RESTRICT="!test? ( test )"
diff --git a/dev-tcltk/tcl3d/Manifest b/dev-tcltk/tcl3d/Manifest
index 3e90dd46e295..39541154f462 100644
--- a/dev-tcltk/tcl3d/Manifest
+++ b/dev-tcltk/tcl3d/Manifest
@@ -1,4 +1,4 @@
 AUX tcl3d-0.5.0-include-tk-dir-and-permissive.patch 2544 BLAKE2B c982924cffd60db538428d225a23023bcedbd3a9bf5e1087815d3a8fbe49d4f2be3f4dd3aadee3274a85f11a9c2d0e442bd739a0da3a415c15ac32eb8a116abe SHA512 ff5bb6df033cfa1ce9d01305cf3346653cc9ff6c144e19609b8cacc659993f0df0a8e0db741e0733e7c3f44aff6ed7f02596e382bd2b813980a8fbbfbbb376e6
 DIST tcl3d-src-0.5.0.zip 3936271 BLAKE2B 97bd3815c05254162d8af4b2029dd2ac4218ed4bfb94e19a6454f41c12953b48f616444e466dda5359433f84a9284a2e20316b6c97b0e3a20deada47f583510c SHA512 24f799d5cc0ad9daf060b6b723d1197be678c0716b2099287e004221889c56da03f7368d6cd4c47dbbbbfe936b0bf65366cd452d3d9c2335cdfbae6ff3860a29
-EBUILD tcl3d-0.5.0.ebuild 1889 BLAKE2B 218d4bf66cdc3094d946562aa41bb583b140e14da70fc374d19a263d86704ae81f8a42d681bc4e04b765f0ff2fd45db1ba93279942f2c2907df6899d03c1c00a SHA512 1437b9d6b6bb4fc1ad165cb0ff3fda92f802629f53c450a59b379657dc8585a3a436b1e6fe74da51353ceb3c22796277e42dba72447b230b1293566d7e353c8e
+EBUILD tcl3d-0.5.0.ebuild 1915 BLAKE2B 3da8616adf462940912f80cfe8cb2e68f2adc4625a5f137fb67659369ad1a0b4d465ebbcc7a2209241081f75938e5c5d2d23f75e28e3d702cd8026ba7718a3fd SHA512 d563b6464a1efb33306a68c46cfaa7126c5f546e1ff51978d5fa3c2384f06d47daf33f77f958bc657de371f04092f8259ef79e9df08f1f2c88bde655b06f0e78
 MISC metadata.xml 1311 BLAKE2B 72c200e646b9fddd4b20a266d7d66e967f918e467d413a063af6076cc0fb786b38bf0b61c9ce288f3215b0ec30485cbed4ad3ad35bad48f48c09936eff6f90da SHA512 291f517e0690cb71786359156418f3622ac8e5e86f8d8d33377b967d85bddd4c05fa49dccee56bc2ff719b2ebe45b497304fa5262ec193832b6c3c8f9ca09943
diff --git a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
index 15495ba8827c..8f84663373eb 100644
--- a/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
+++ b/dev-tcltk/tcl3d/tcl3d-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -66,6 +66,7 @@ src_compile() {
 		CC="$(tc-getCC) -c" \
 		CXX="$(tc-getCXX) -c" \
 		LD="$(tc-getLD)" \
+		LDOUT="${LDFLAGS} -o" \
 		${CONFIG_PLUGIN}
 }
 
diff --git a/dev-tcltk/tcllib/Manifest b/dev-tcltk/tcllib/Manifest
index 230eb9311a35..6aae7904eafd 100644
--- a/dev-tcltk/tcllib/Manifest
+++ b/dev-tcltk/tcllib/Manifest
@@ -3,5 +3,5 @@ AUX tcllib-1.20-test.patch 6599 BLAKE2B ebbbb624b0d214d6e0f9aa61b968f4133abbe8e1
 DIST tcllib-1.19.tar.xz 6298564 BLAKE2B f137227004dd4acded7c8aae6b36fd50fedee67a725ecef0046f1af7abc7bb8e11207a141e15390a6ce3a1a3914b1cd2e5a798035eba631254792b2819383013 SHA512 08f549a3513316919c61f015a604aa671a73c0fd59a8a20b916d106e7d7d6f4bd59b485a92307778cfea1b00f78c2972a086b1bf960fe85a26fe273b7ada8d12
 DIST tcllib-1.20.tar.xz 6692664 BLAKE2B 3e70cf0d0f9e469a20e18f84238f56a53b5b8e36abcf418dc32f64c819728968d24e2999705d91d8341cb608a6bb674a063e86253cddfb51f2693a94d0e070e5 SHA512 d2c20642f91cdc7bf3b329025be80eb9288d0919fa439c2066349b52950cf3c343f39c7745b9b08ec28a884ff2f219fe0fb5f47023f1266b6a6de6ae54852412
 EBUILD tcllib-1.19.ebuild 1219 BLAKE2B 6eae3d390eac5b17e5cd160b173f779098a02b05f44d3758d78cb226877f4a108dc7b7a2a69099318f4952983324dc3cb9cac6497410af64c7ff28ebb97e3c99 SHA512 5cfe773b4f81507db98941b1524e4fb30db393c6804d6f746e5c2db3a3e79e8e859c15e9b4dc1453d16ab97d90bb5dce2ed333bf1fb6e082630e6c83d88c20e4
-EBUILD tcllib-1.20.ebuild 916 BLAKE2B a5c846998de31966f19e328311360e14e3c224cb7dca8f6f343d6a4ef7c1151153040219887781a5dc6839ba1d07d1d091ca880f509411637e0e16b8df874bad SHA512 f19e8490c6933e868f0385bd4d5817d9f11840ce00123efe38aae3b60b00bc3f762aaafe3dbd451cc2e8d0bf6b0dc1a81e3eda315343314ea0461923d30154ac
+EBUILD tcllib-1.20.ebuild 911 BLAKE2B 3ea1532482cb47a11ce02ca55c33d6fe20321ff8e6a5e09f5283eb7a4b208072e6b51bf1019329187c660688360754af3ee448fdb3d423f840d5c47847f097e8 SHA512 279dc211757a6c057d8b2b4286408924a3dfb4ff36b728272fb982e3d1be34670131220dfe5154c77e0cebb1c0b741179999dcf6071d89075a3664675b728133
 MISC metadata.xml 329 BLAKE2B 9c75c5b20f8ce9b566b4a422c4d768c3c2db1f593d8505ee7539932860f99ab5eeafb51d02e84d78f7be0c8be06e22fadb64aaf61cf01b7b14ac506035c70c79 SHA512 c16db3fedc73cc41391e15f198396908ebd047c165c2bbe3c465f126dfb8266818d79f11ec343a2880058850a8164801616632f361b69db914e7d66823bb1851
diff --git a/dev-tcltk/tcllib/tcllib-1.20.ebuild b/dev-tcltk/tcllib/tcllib-1.20.ebuild
index 54cb1d43047c..e3b15f8c4348 100644
--- a/dev-tcltk/tcllib/tcllib-1.20.ebuild
+++ b/dev-tcltk/tcllib/tcllib-1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.xz"
 LICENSE="BSD"
 SLOT="0"
 IUSE="examples"
-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"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-tcltk/tls/Manifest b/dev-tcltk/tls/Manifest
index 7804afe0f25d..ab49b7f97731 100644
--- a/dev-tcltk/tls/Manifest
+++ b/dev-tcltk/tls/Manifest
@@ -1,3 +1,5 @@
 DIST tcltls-1.7.16.tar.gz 166439 BLAKE2B 855b61bf21e7635fc9c53838037136586552261bb0c3b4c4a52638e99358f418a2c0d606b5fb130e32004e3a34c80afea25be16f068ffb499d6636309e4ae2a3 SHA512 f63b885dbfaec5d9ae811c126bd0ff253787effd7b053282b9ee566e9fae54df940bc058a6c3dd22e31fcb9ec6ae1b286aa40efd69c3f01f5a3014aada730ab1
+DIST tcltls-1.7.22.tar.gz 165206 BLAKE2B 351a5ee6a50174db8b13c9232a617aa90480550520771004c318c063b7c9703cdf969c7d12c56c54483bce5d08a9b48c04906d2be3ef9e3de0ab74c5dac68346 SHA512 28c76a6e7333b6ed1d83234691d61c9e71a59d0a6a28182fc0f50e97cae7b54da63ac76527e3b16087f3eab0b9cfe19bad02362e485d0cf378724de534805e99
 EBUILD tls-1.7.16.ebuild 915 BLAKE2B 65479254c3f8a70e83ed4a36bc42e283672ba3270dd274bea46f8fadb03c33387fe3bd07d6f2d72435b98339406e65e854542162331526382c75368ae138d444 SHA512 787f2a8dd0345669679b997a6ca7e421c2bf3f7ad60113a38097a3a5609c9a19d7476b5e63c31464bcca92d72e339a179921efa03f9c87e908fc89a65444b2f2
+EBUILD tls-1.7.22.ebuild 921 BLAKE2B 2ed26544268a4afb04b8e70dc032c79cfc3c69d31dae86daa0383aa62ef9164f1150ae948af2afe99cb53bac3edc2f06acbe552353680bcb4abc2d323d8e38d2 SHA512 0ec5161e2a36165cf73f842016ebb826d7a699d3b0ee6c00bab4194f70c8f88b0b340ad146a17461d465767fc81c42707667366a2115aa869fdea5c6a0b3bb63
 MISC metadata.xml 326 BLAKE2B bb3ebe3febf02967373d484b0685609602c2fe4c229c52d078035c4d8d4ab011a3d5a4e72b46a4d75a4ab01e5fdb6d338c679f1b1033bc6d986f3815696c61c2 SHA512 6e3856770636152cb4cb2d2429dfba4ccdd4f82433903aa828ca23b3dbbe878546f7327a510ecdee93001c1d81dbc9c343c217d09ab08774c697a4b6fb2a0f94
diff --git a/dev-tcltk/tls/tls-1.7.22.ebuild b/dev-tcltk/tls/tls-1.7.22.ebuild
new file mode 100644
index 000000000000..c4f7c36511d5
--- /dev/null
+++ b/dev-tcltk/tls/tls-1.7.22.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+MY_P="tcl${P}"
+
+DESCRIPTION="TLS OpenSSL extension to Tcl"
+HOMEPAGE="http://tls.sourceforge.net/"
+SRC_URI="https://core.tcl.tk/tcltls/uv/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="tk"
+
+DEPEND="
+	dev-lang/tcl:0=
+	dev-libs/openssl:0=
+	tk? ( dev-lang/tk:0= )"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	econf \
+		--with-ssl-dir="${EPREFIX}/usr" \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+	default
+	dodoc tls.htm
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# this is ugly, but fixing the makefile mess is even worse
+		local loc=usr/$(get_libdir)/tls1.7/libtls1.7.dylib
+		install_name_tool -id "${EPREFIX}"/${loc} "${ED}"/${loc} || die
+	fi
+}