gentoo auto-resync : 23:11:2022 - 13:08:35

14 files changed, 360 insertions, 13 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 47b82b4453a3..b856bfb6eee4 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 4c8e19d3b48d..62a080b43a31 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -21,11 +21,11 @@ DIST python-gentoo-patches-3.12.0a1_p2-r1.tar.xz 9168 BLAKE2B c2f1018c7890518c66
 DIST python-gentoo-patches-3.12.0a2.tar.xz 6164 BLAKE2B 734068ed87dae1bb30b61f42436664936f27c2507e89fde6da0ce10f791d444b54e8298810717e461b60b7fe572a8fbf2cc9c787e59f01aa0eb5fd1360b212bd SHA512 96e060dc6f2cf412cb1a1be251a6cdd2c30cd2706bfc669dfb920815bcc768b712ed53cc43ee6a1606504a19fdcd9492e7d88bf7e334e1dde2769aa7f1e6ed2d
 DIST python-gentoo-patches-3.8.15_p3-r1.tar.xz 30604 BLAKE2B 68ddeff291a70dfe22e8a0276b30db5a37d7e53dfc5d52c311573136f6fc322cddc65478684ed6339cd8156170588fe8ea3a454a5ec18e0bb91a898dc7c99f1e SHA512 ce9c73cd2b53c5c7f8bb27c65d5ea02bb7c38bfc1b25c972203fcea52bd1ffe4afcb65eedc8556b026a2faf0fc402f566c38b91ee54d6580bc958c0322e90e0a
 DIST python-gentoo-patches-3.9.15_p3-r1.tar.xz 26400 BLAKE2B 27198acf3e9087b96ef15328b9da6d80837a459c62b21c9785fde77dc6f4a5c8c4ccbc3cb48e5af684a253a978c5562fb1a342e6a554d2247aa968fd5890d6f5 SHA512 d658dc89ca29070de2a39d643cc9585ae7f66232dececfd7007cb57a6c6ededd30ae030dbe9226686b8517c48fdb5ed7e681decb64b207e41173a0993f461aea
-EBUILD python-2.7.18_p16.ebuild 8307 BLAKE2B 4be343c831fc645acc31432978f0ddb6da538abadc55238b5907a7b7c822c2e308455d1bb0d27d53c887be89fca742088932c2d4ba570293097113f6b5c0c2a6 SHA512 5fb05c1a8f045fd3eb3e24fafef2063fc51db7cfd13fcb3475a1c0e54c458db76c5667f9e164bd9ec084ba9965b7745bbf3c6bc7070db228b32c934a19722ecf
-EBUILD python-3.10.8_p3.ebuild 12904 BLAKE2B a315705cf5d6090791a8f3ebd5498c31e0c0cbdda4a0b69e9f775700d34030db47da02a6263708888aea7dde111c04970eaafafad3b51d86b5390227dc01e797 SHA512 df7f75ffac6b2ea3b3dd1123ed9a89c87d2774a1071080f0e0c0c03e6e50467c09e2265aeaa458d159cc2ee7255d59bb4868e6f558b2927b64e245518ea9d6d1
-EBUILD python-3.11.0_p2.ebuild 13803 BLAKE2B 82568fdd418e76dd25c9cf943b3ed4954eaf17c2a69d18c1821f0bac7d0e83f01d8fb3d193841f291130677c252fb915a0c734e4cdc8259d65dcedd080dffca9 SHA512 1e388e7e84cf0e48e5a61b96743a6b15301de8953e9210134e0c6ef8e087c65e8d0367752f5a23e8c02dac74c7e721d380a8d00dd9b4097d2c9f3dd6ad62fba7
+EBUILD python-2.7.18_p16.ebuild 8389 BLAKE2B b0188ed0f9d5e09c8b23ed6e8da7960d3ab1e5cfbc67451e5d5fdd3ab6dc416755f10a351e51a3b7512710c1cea080f13508f894de6dea97e0b5426c6fc88e3f SHA512 e3db6ec32828fa89ba77bfe0a2ac466991069985698cb029971141eb3eb528fcfec588a4c5e9f5281f210aacfe96b9c6a3d417d14cdec76ee26ac1fe93f2c484
+EBUILD python-3.10.8_p3.ebuild 12969 BLAKE2B 9cacda2586dd20690cc69be9f82f7f74e053f682e289a0ce0f2dcb03766be3baa85502cf6d008ad9b8582de174fa627ca36a4ed8f42c41c51eaae7b09d59b649 SHA512 52d4dac4e28c15933df38f47f366f0ad9b85ba87aaf30fb5117b39996e3ab869b8c62eddf29d9744f4cfab205af255d6a3760f75669a992ef75157ee57bfebd8
+EBUILD python-3.11.0_p2.ebuild 13868 BLAKE2B 3284ab0242a7d1a06401222c209b985c54d445fb684065fa31eb76fdda253ae2452bff9ebb50ab08dd0b9e05120d0264e56258b9677fd7f7bb41451e148e0896 SHA512 f6254890368b33f5983b6795326c7d5d7ce203aa9b168f3e19be910d3d4d7c2338e043d3d0320143ead3716f67c4556a9aed85e4c97b8773fc7721ed235a69e7
 EBUILD python-3.12.0_alpha1_p2.ebuild 13697 BLAKE2B 40bf6c2ab7a475b8d430dc63989c50b8ea9a75813329f06efe4835a45ab90bb6358e22846eedc8794a791ab15004a90fd3314859ce186093d8c692eef66b58ce SHA512 5eec79eb25429604b17f3ceabcf5e9bc123168d050f1c368308ccc1306fcb29952edc6aeba9782930b75feed3676fac9514438bce380b1cb5588ed03030285e7
-EBUILD python-3.12.0_alpha2.ebuild 13570 BLAKE2B 30bee0a8270c960ab09047e5be0a3d647a3fd25e6204e02c9359ef63d9849bdce1808210cf089aec130c78b32e0cd69c0bb0f1cf6ca83ec2ffdfa6ec931ec1b0 SHA512 f29a1182b930d9b267c3c986ce6b61953f0b3096f2f53738a35d79d0295d7f03e07cf1c94dd0fa8a4214fa6b89f6b5309af00dee085936ef2feeebf2d6c7a4b6
-EBUILD python-3.8.15_p3.ebuild 11442 BLAKE2B 437d3e82f23f0f543437f834c5911bf4ca47a30b37ac6c07d9d7532d21cc73182fcba85c3294f3a6491e996bc96330ff8b9f417bf3bed7d189e795ccecff7e44 SHA512 1b3703410dc85bb4e915de71804b7fad680d2f5786d302f1fb6db8d3e091aea3caa45a76d2e6a40d5e8a565d07d4725085f44c92bb0333bef04a64c12bcd5ef1
-EBUILD python-3.9.15_p3.ebuild 12702 BLAKE2B 3a57a413b7b9bea8c346528585ce53bc557b8261fc05686c7f2f45158cc7781c5c4fb62059e1c70ad3b0fc965bf38622fc0711ecaf6f26a0e97d99ade69cbcbd SHA512 affd28ab1f63958aa44a43e92bec10854a20481017b270af6230630ca144ae28ab5a51c5c8baeaf3dec81f1b25a7fd288a706285543ab14bbc1da92566d747a3
-MISC metadata.xml 1125 BLAKE2B 5302c84538eb30fe86c91d15faa2f6de0eaa4ee38c26a0f6845b4a95bda94ad0006a509bedf9f71288332a593d245191c0f358f0515d96c8aec8693eca22fd2a SHA512 2280aa3f309e1338d7e41c8cfa50cde4d0441bee7d98a86ce7bf4969560b34dfab8ef6171cbbe0d6a19f56c676e9c9dd63c65340ac7145317d2eab0fe618ae0d
+EBUILD python-3.12.0_alpha2.ebuild 13635 BLAKE2B a24c6a835abba75791a04f05a69d89cba3fb51072f075c1f4e2f979623bd6c7939d014b572c4b3c8f2e22c1d42d21b5160cc42dbf046a504008fb3761764966e SHA512 9c5baa017defbcaf5ea3394c029f341296d90564b6bcee64bd71e205d2affa7b63f1e9bdf99af3d4f44a39c3a4106f27072c3f97ab93746325bef31992286096
+EBUILD python-3.8.15_p3.ebuild 11508 BLAKE2B 126cc766eb701bb3d142aaf79ea77e9793a556aee3850ab792764dd7eb780e2459759dc6107b0ba657e79b9d1014b4167c81589f5262ec4d0b2e60e0434c30fa SHA512 9047dcc24bb1f83539a6237333e423f20950d9afa6d3552d346a03408f22cbc3e8533b62d6a026b886930b0a330b4f64aa15bd67d66cab51580bf581a34d167b
+EBUILD python-3.9.15_p3.ebuild 12767 BLAKE2B 85e426cd40df49e92c9de0545354c29959c53c060723fdb1fbf8f5bcaaf0c7a23b73cf8209598b9d38edbcbb34055864f9bddc8b89f2e83af81b6003ce266eb1 SHA512 0e7273348db533359b329913a11b2612a5f618fa411e24444af7a2c61f95c8e3630f142577d44e16f9e621f9df6696c55a9032c5ec50fc774a559d0c4a65af40
+MISC metadata.xml 1315 BLAKE2B eb468cc22ed763d197ee9292e5531bfad6d05123a68466fb9a1f3c3f790d3ee7e16e2fb74ce652a1dde33ed38d089fc442b629395f711f056dcda34d3058feaa SHA512 9c38f152b3ee3bb9d9f0d5640ccbb28032c9e770d0aaad266fb2758218259c28ca3f6c76542a5b79f6c20ca09ad284772ecc6c7e484d77e995ad51f418f616ec
diff --git a/dev-lang/python/metadata.xml b/dev-lang/python/metadata.xml
index c123a9ef4e61..648562ff2106 100644
--- a/dev-lang/python/metadata.xml
+++ b/dev-lang/python/metadata.xml
@@ -24,6 +24,11 @@
 		<flag name="lto">
 			Optimize the build using Link Time Optimization (LTO)
 		</flag>
+		<flag name="valgrind">
+			Disable pymalloc when running under
+			<pkg>dev-util/valgrind</pkg> is detected (may incur minor
+			performance penalty even when valgrind is not used)
+		</flag>
 		<flag name="wininst">
 			Install Windows executables required to create an executable
 			installer for MS Windows
diff --git a/dev-lang/python/python-2.7.18_p16.ebuild b/dev-lang/python/python-2.7.18_p16.ebuild
index 051f660f8f9b..ee49cd0dfcda 100644
--- a/dev-lang/python/python-2.7.18_p16.ebuild
+++ b/dev-lang/python/python-2.7.18_p16.ebuild
@@ -30,8 +30,9 @@ SLOT="${PYVER}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	berkdb bluetooth build examples gdbm hardened +ncurses +readline
-	+sqlite +ssl tk wininst +xml
+	+sqlite +ssl tk valgrind wininst +xml
 "
+RESTRICT="test"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
 # If you need to apply a patch which requires python for bootstrapping, please
@@ -65,6 +66,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
+	valgrind? ( dev-util/valgrind )
 "
 BDEPEND="
 	virtual/awk
@@ -196,6 +198,8 @@ src_configure() {
 		--without-ensurepip
 		--with-system-expat
 		--with-system-ffi
+
+		$(use_with valgrind)
 	)
 
 	# disable implicit optimization/debugging flags
diff --git a/dev-lang/python/python-3.10.8_p3.ebuild b/dev-lang/python/python-3.10.8_p3.ebuild
index f7df03edfe54..ca2055bc531c 100644
--- a/dev-lang/python/python-3.10.8_p3.ebuild
+++ b/dev-lang/python/python-3.10.8_p3.ebuild
@@ -31,7 +31,7 @@ SLOT="${PYVER}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened libedit lto
-	+ncurses pgo +readline +sqlite +ssl test tk +xml
+	+ncurses pgo +readline +sqlite +ssl test tk valgrind +xml
 "
 RESTRICT="!test? ( test )"
 
@@ -71,6 +71,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
+	valgrind? ( dev-util/valgrind )
 	test? ( app-arch/xz-utils[extra-filters(+)] )
 "
 # autoconf-archive needed to eautoreconf
@@ -222,6 +223,7 @@ src_configure() {
 		$(use_with lto)
 		$(use_enable pgo optimizations)
 		$(use_with readline readline "$(usex libedit editline readline)")
+		$(use_with valgrind)
 	)
 
 	# disable implicit optimization/debugging flags
diff --git a/dev-lang/python/python-3.11.0_p2.ebuild b/dev-lang/python/python-3.11.0_p2.ebuild
index 34cae611b846..eedf9c768a85 100644
--- a/dev-lang/python/python-3.11.0_p2.ebuild
+++ b/dev-lang/python/python-3.11.0_p2.ebuild
@@ -31,7 +31,7 @@ SLOT="${PYVER}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened libedit lto
-	+ncurses pgo +readline +sqlite +ssl test tk
+	+ncurses pgo +readline +sqlite +ssl test tk valgrind
 "
 RESTRICT="!test? ( test )"
 
@@ -72,6 +72,7 @@ DEPEND="
 	${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
 	test? ( app-arch/xz-utils[extra-filters(+)] )
+	valgrind? ( dev-util/valgrind )
 "
 # autoconf-archive needed to eautoreconf
 BDEPEND="
@@ -211,6 +212,7 @@ src_configure() {
 		$(use_with lto)
 		$(use_enable pgo optimizations)
 		$(use_with readline readline "$(usex libedit editline readline)")
+		$(use_with valgrind)
 	)
 
 	# disable implicit optimization/debugging flags
diff --git a/dev-lang/python/python-3.12.0_alpha2.ebuild b/dev-lang/python/python-3.12.0_alpha2.ebuild
index e10b1c493b27..9d0d10adab0b 100644
--- a/dev-lang/python/python-3.12.0_alpha2.ebuild
+++ b/dev-lang/python/python-3.12.0_alpha2.ebuild
@@ -31,7 +31,7 @@ SLOT="${PYVER}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened libedit lto
-	+ncurses pgo +readline +sqlite +ssl test tk
+	+ncurses pgo +readline +sqlite +ssl test tk valgrind
 "
 RESTRICT="!test? ( test )"
 
@@ -72,6 +72,7 @@ DEPEND="
 	${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
 	test? ( app-arch/xz-utils[extra-filters(+)] )
+	valgrind? ( dev-util/valgrind )
 "
 # autoconf-archive needed to eautoreconf
 BDEPEND="
@@ -207,6 +208,7 @@ src_configure() {
 		$(use_with lto)
 		$(use_enable pgo optimizations)
 		$(use_with readline readline "$(usex libedit editline readline)")
+		$(use_with valgrind)
 	)
 
 	# disable implicit optimization/debugging flags
diff --git a/dev-lang/python/python-3.8.15_p3.ebuild b/dev-lang/python/python-3.8.15_p3.ebuild
index d2a1816f893b..1c522eb3b332 100644
--- a/dev-lang/python/python-3.8.15_p3.ebuild
+++ b/dev-lang/python/python-3.8.15_p3.ebuild
@@ -31,7 +31,7 @@ SLOT="${PYVER}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
-	+readline +sqlite +ssl test tk wininst +xml
+	+readline +sqlite +ssl test tk valgrind wininst +xml
 "
 RESTRICT="!test? ( test )"
 
@@ -68,6 +68,7 @@ DEPEND="
 	${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
 	test? ( app-arch/xz-utils[extra-filters(+)] )
+	valgrind? ( dev-util/valgrind )
 "
 # autoconf-archive needed to eautoreconf
 BDEPEND="
@@ -175,6 +176,8 @@ src_configure() {
 		--with-system-expat
 		--with-system-ffi
 		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
+
+		$(use_with valgrind)
 	)
 
 	# disable implicit optimization/debugging flags
diff --git a/dev-lang/python/python-3.9.15_p3.ebuild b/dev-lang/python/python-3.9.15_p3.ebuild
index 7b5a4be382ea..65e32a706fd5 100644
--- a/dev-lang/python/python-3.9.15_p3.ebuild
+++ b/dev-lang/python/python-3.9.15_p3.ebuild
@@ -31,7 +31,7 @@ SLOT="${PYVER}"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
-	+readline +sqlite +ssl test tk +xml
+	+readline +sqlite +ssl test tk valgrind +xml
 "
 RESTRICT="!test? ( test )"
 
@@ -68,6 +68,7 @@ DEPEND="
 	${RDEPEND}
 	bluetooth? ( net-wireless/bluez )
 	test? ( app-arch/xz-utils[extra-filters(+)] )
+	valgrind? ( dev-util/valgrind )
 "
 # autoconf-archive needed to eautoreconf
 BDEPEND="
@@ -216,6 +217,7 @@ src_configure() {
 
 		$(use_with lto)
 		$(use_enable pgo optimizations)
+		$(use_with valgrind)
 	)
 
 	# disable implicit optimization/debugging flags
diff --git a/dev-lang/tcl/Manifest b/dev-lang/tcl/Manifest
index 23e5aac2adfd..626f57f44833 100644
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@@ -4,6 +4,8 @@ AUX tcl-8.6.8-conf.patch 401 BLAKE2B 278502e983b8c831a2bfe5e61c31d32181558aaebcc
 AUX tcl-8.6.9-include-spec.patch 488 BLAKE2B 06aa49163e8316b409238055d4b2ef67a3b37bdad69a190d39ce46a32dbd38320397b206036428c81e4a001ee0c01ee70f5970f584f919d0e5348000c7f93711 SHA512 ca4fc3ca2b3963d9c1b9b1c716e9c508d8c7aeaaad4b39c502472f3592c60907dbcda656369af371ec6c21f06a6dbc50fa02994a15284bedbdb22616ca9340ba
 DIST tcl-core8.6.11-src.tar.gz 6041050 BLAKE2B 9c41d5ae5d22627b903d18c5ca607d4a2647d7af65d3029a463cf571d3fbe0bd48e15fef643e81de94296777985a36530a83718d4eb7befca4bc107ab860cc0d SHA512 fe3556c37305e3856743e9a202a320d44b1b3cbc926a1b7a4449ae5baf2f8df92214a9aa06f0a87645d032857fb71458fc864ff007fd73da60463ae5001f2d3f
 DIST tcl-core8.6.12-src.tar.gz 6064625 BLAKE2B 30dc780562aa6955e2c417798cc96fabd23e947cee81146dc192156598e3c43f588864aab4392d62901b8964cf59bedb6cad1f064e32b03dd9733b3a0a7b5c8a SHA512 7144a50d19d3855edbda14b538cc94fe26c0dd357b979676c3fe02d599dab61ba777bf14f6aaebb63e238aeff1d0bad25ea7b0ff31b2398468f67fc0a305b9f3
+DIST tcl-core8.6.13-src.tar.gz 6370805 BLAKE2B f5af3c0fa2d52c09ab16578c9147cb5ac4a06b81882c49f1ef23642bed32adccbe2a5acbddc5d18bd1757e1991daf864707d842e675f92c6de70be6f4275b95e SHA512 c1c953ac0f9a530d8256514c0cb78f166d0063db725b87fa19272716a955cd390ff8f1c5f17e791cf463284d88bb136d61194779a913a6a78f46146d485c71ee
 EBUILD tcl-8.6.11.ebuild 4016 BLAKE2B 761335036c4f86499dea605a7659b5b4d7d95d1c8ab78bc0aab0edc2bf23e42eea316251b6a6a92e1ec504955b19fafaeb4722230f7e1dc9ec04ef6b3ccb7684 SHA512 0e8bbf84e92819348121919dc625d410b5be4d921230ec11d4bdf14d1debc6e2f39517a2c53c02fbc95127b1347e0e53ab6fe3f0efdbe9cdad5c7b5bd4eebb48
 EBUILD tcl-8.6.12-r1.ebuild 3582 BLAKE2B 0707ddc347ec31ad3dd191819ffe5c39a20b49119faf545ab844d84c736279d23b52aef2828caa696f8972b356dea8d767edf52cc1aabf931f88fd47f106f59f SHA512 592504326ec61ccdac6a712c66e5a9d5137ffba1fce2f49dba798fc6e67acf441dbcafe3f455f96c7bf6ce951f4641e6740b36a4563ec58ccc36404ad07c18dd
+EBUILD tcl-8.6.13.ebuild 3546 BLAKE2B 9c6c47faee89c8a6d53803a407261d52d82cab7e09f739b307e322179d96fc8b90b15ff417a8ec619ee9bdc100859bd102a9402ec4580a5fc4a382d2753ff72f SHA512 59bd2ae319f6eaec6a03157a3528797c404a6fdb2ed9d08d87df1d74d6fe632103a4d903c7389bf0d80521736d70479d64dac7c12354e453821c24d8dd2ada17
 MISC metadata.xml 421 BLAKE2B c056a7ae8f2deaddda9bb329d46ec4f322548f4d031479ba522f5d93add46bd47cc783e9876b398579898af2cbdedb053c6328433eacfd02df4bb6dcf0185766 SHA512 0e77b876a127d68c7b193db874b9d3ab38f8475abafec1d866f2a4158ea4334ae04fbd6cb1d9acc23c81e13e584fe667503e4d9352873e1880a2d6acf7dec59c
diff --git a/dev-lang/tcl/tcl-8.6.13.ebuild b/dev-lang/tcl/tcl-8.6.13.ebuild
new file mode 100644
index 000000000000..ace21039b42b
--- /dev/null
+++ b/dev-lang/tcl/tcl-8.6.13.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with dev-lang/tk!
+
+inherit autotools flag-o-matic multilib-minimal multilib toolchain-funcs
+
+MY_P="${PN}${PV}"
+
+DESCRIPTION="Tool Command Language"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0/8.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug +threads"
+
+RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+SPARENT="${WORKDIR}/${MY_P}"
+S="${SPARENT}"/unix
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.6.10-multilib.patch
+	"${FILESDIR}"/${PN}-8.6.8-conf.patch # Bug 125971
+	"${FILESDIR}"/${PN}-8.6.9-include-spec.patch # Bug 731120
+)
+
+src_prepare() {
+	find \
+		"${SPARENT}"/compat/* \
+		"${SPARENT}"/doc/try.n \
+		-delete || die
+
+	pushd "${SPARENT}" &>/dev/null || die
+	default
+	popd &>/dev/null || die
+
+	# httpold tests require netowk
+	rm ../tests/httpold.test \
+		../tests/env.test \
+		../tests/http.test \
+		|| die
+
+	# workaround stack check issues, bug #280934
+	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
+
+	tc-export CC
+
+	sed \
+		-e '/chmod/s:555:755:g' \
+		-i Makefile.in || die
+
+	sed \
+		-e 's:-O[2s]\?::g' \
+		-i tcl.m4 || die
+
+	mv configure.{in,ac} || die
+
+	eautoconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# We went ahead and deleted the whole compat/ subdir which means
+	# the configure tests to detect broken versions need to pass (else
+	# we'll fail to build).  This comes up when cross-compiling, but
+	# might as well get a minor configure speed up normally.
+	export ac_cv_func_memcmp_working="yes"
+	export tcl_cv_str{str,toul,tod}_unbroken="ok"
+	export tcl_cv_strtod_buggy="no"
+
+	econf \
+		$(use_enable threads) \
+		$(use_enable debug symbols)
+}
+
+multilib_src_install() {
+	#short version number
+	local v1=$(ver_cut 1-2)
+	local mylibdir=$(get_libdir)
+
+	S= default
+	# fix the tclConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
+		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \
+		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TCL_LIBW_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
+		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* ]] ; then
+		sed \
+			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tcl${v1}/include/unix
+	doins *.h
+	insinto /usr/${mylibdir}/tcl${v1}/include/generic
+	doins "${SPARENT}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
+
+	# install symlink for libraries
+	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
+	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
+
+	if multilib_is_native_abi; then
+		dosym tclsh${v1} /usr/bin/tclsh
+		dodoc "${SPARENT}"/{ChangeLog*,README.md,changes}
+	fi
+}
diff --git a/dev-lang/tk/Manifest b/dev-lang/tk/Manifest
index 697f6be68e69..b10c64e18824 100644
--- a/dev-lang/tk/Manifest
+++ b/dev-lang/tk/Manifest
@@ -2,9 +2,12 @@ AUX tk-8.4.15-aqua.patch 303 BLAKE2B 9030e6d84d769a2e2daadb4ed76de2b9ad8474016e8
 AUX tk-8.6.10-multilib.patch 404 BLAKE2B 64bead51acb308eb88147797288895cda5ea0f5165ccde7a4bb87eae18eb119a81acdea776f107dd6e6c7884a01485aeab897334d07c91d5a52c10257e9fb9cc SHA512 cb62e986bd98a0b8d9f780afc9906d6ee290e3e2381919364709161d90403e95937bc83e11d1e88b7826812ea60b41b54a0c8daa10cb17f1236cdd782a152beb
 AUX tk-8.6.11-test.patch 2589 BLAKE2B 8917d71ef1072dfd10f35d009323f3787479104d53071fc094d762d66b260b7d72584b8bf330cc76a09fd45b471b19982edbb62603471d0c4f3ce056240b1ab1 SHA512 08648d57f3e27e574f94ff15821514fd53b85554f7e182a20685f3d6f6c5c2ef7557088c49e5689cbc88c5117e452ed512dd748b8524b5a7af60f084344ab897
 AUX tk-8.6.12-test.patch 1394 BLAKE2B 08cb947cb2ce6cc86543c0e025656726ac0469964eadcd594f92035e1f58efe57c150455f5b74391048dc06c47186f7c5d5125fb505f17c5b8daac720d02c8b7 SHA512 1dfe6a615208cdc9ec51bc59ce0fb0076902f2469fd7ea12501b6fcf60deb818f072a5c053caf6ea2e06505054d8838fdfe2fafb8cf1bb3a040a859c259b6102
+AUX tk-8.6.13-test.patch 1625 BLAKE2B 46f06da92c10da68736e809b24f52a01d71e832f2a284678416e17a6bef76fe891ee67e731115c8b6a3d0e35455ef8409f730b741ca5c1c60e11bba2929d1e63 SHA512 9110606e4e8786d5aaab3902ac33bfe611f2933de688cb7f62af3fa5d62c9ec1c05a8fc285f1161c868fc6f71999e00665d91f6ac41c9c6e1b5fdd63ddce1430
 AUX tk-8.6.9-conf.patch 407 BLAKE2B 13662318b4c5029802f74551a6a194e27ddb6dbf2e5ceeecc45c98b27a5386a9b9443af7c329fc422c5249c3da6308552d5c879b5629ae47b705c0d2ddac5534 SHA512 10447a13d597c0917d15089dcfab64165927589ea0fbec7073699788f5ba003e561a6af6562b2ee3e3b40df2f9dc0719c2ca4209a927e506710a390c7a67eb70
 DIST tk8.6.11.1-src.tar.gz 4496008 BLAKE2B d7bae2fa535411ad8620ec81cdc0b34a1206fed82f50dbd98d3977af46ac43f794166cb7029f274f7903228c62ce83dfbd56cea06669ff1e382b185d733b0792 SHA512 e2a1d27ba63601731d43c4c4e2b658771a14afd97ef8231f8bc7854e762b83a42f23b8db600e4b4a4a14ae6fc97378d0b9a9a180ae09308b9d12436ec2b176c4
 DIST tk8.6.12-src.tar.gz 4515393 BLAKE2B 328522b7e1b4d291863db01ac93e18630f3984459d145a11d742f912a40d5634ffe4608760ce45f444903d45fb707bb48ecc3586913f0c2fde4664a402f6b862 SHA512 afe51eb3e2071640ebc57f9ee6979fe91ee7856df8d3c9d55ae70c470cdae2306d2feeb791f46258f529a5c4a07b53974a7574cf3594818cd4e99077b30c697b
+DIST tk8.6.13-src.tar.gz 4546848 BLAKE2B 5f00cf64feb7c7eb6739303c857dfabff4cbf4148c65462c2a5cc49cc8010fba950ffa7043101e98ded543a6c6e9b925dc1ee0e6e9031a240ae29b918f81060a SHA512 719aa6776bfdc814f817919a265d3f9d847782c9f0a5fc5c2ab139beeba921e6fde8c66e7e836d78f86f53c98a7df0e587f0b2f4b08cc5ce12eecbb7f1ab71a5
 EBUILD tk-8.6.11.1.ebuild 4070 BLAKE2B 4f216c2ac2bf57b756053300d3398e7e042c98a75d30f9f997e0db1196e225e91bc6e472a4c43771496ef1de5acca16f792636d593283f066dfcf57970deba44 SHA512 a3a9d201294c175831f2a46eca2846e2e42ed32f2c595b53e8cb18bff7919ccf425d4ee27041d8a3ebd37d40979cb8ce5770fb1bea09287061cc82b8646c15c2
 EBUILD tk-8.6.12.ebuild 4104 BLAKE2B eb96d7a443543c64f63a777ba987374d33d3fd466f7ad611173ee6963079e9b7347ef707a4db30f908644235806957e06abd26ba10240b225682a3ab729611e2 SHA512 4192b19aa50fcf753bfb8c003dae709f308e7aed107d24d439a4421b544ea6c7834e4b5e55cc53a17bab0a1e8413dc461224d6ec500a9b49a8b9f6ea909db749
+EBUILD tk-8.6.13.ebuild 4150 BLAKE2B 49838608fe4d9a1bd3ac987fcb51625054216bb4748e9aff7159e594765a8e282933108239dae047847d724895f25dbaf9e2cceef89ec087a1cd39429a8017c2 SHA512 f6b52d42f21a5a48e9d4092520c5e978c9dd302920499a2ab8d40b88e379f6712baa69070a837c2f56ddb5d8a4f9f6d3ea7ae65a1e87a6ca60bda9f4b2ddb51e
 MISC metadata.xml 375 BLAKE2B bb3f40f5b72544625f38a6b5b17d4435d3b0bb1aef8f668f3a1e1ea7f84bf7a25651b7894abbadd66f554f68eae113c74d348b5c821f686ea78e3c1f72709ead SHA512 3e175a0631c7add79e33cf4bd1254d5f1d82da26aa26ff072d5295bbca7a9d81c760145c2cbd853e854b06e08fcadcc55ea5ef2cbd016aec73c55b97507afef9
diff --git a/dev-lang/tk/files/tk-8.6.13-test.patch b/dev-lang/tk/files/tk-8.6.13-test.patch
new file mode 100644
index 000000000000..c239ba79ef2f
--- /dev/null
+++ b/dev-lang/tk/files/tk-8.6.13-test.patch
@@ -0,0 +1,50 @@
+--- a/tests/textDisp.test	2022-11-23 08:26:53.070121316 +0100
++++ b/tests/textDisp.test	2022-11-23 08:35:58.527988892 +0100
+@@ -2303,10 +2303,10 @@
+     }
+     lequal [.t index @0,0] $expected
+ } {1}
+-test textDisp-16.17 {TkTextYviewCmd procedure, "moveto" option} {
++test textDisp-16.17 {TkTextYviewCmd procedure, "moveto" option} -constraints {knownBug} -body {
+     .t yview moveto .755
+     .t index @0,0
+-} {151.80}
++} -result {151.80}
+ test textDisp-16.18 {TkTextYviewCmd procedure, "moveto" roundoff} {
+     catch {destroy .top1}
+     toplevel .top1
+--- a/tests/ttk/entry.test	2022-11-23 08:44:49.647148945 +0100
++++ b/tests/ttk/entry.test	2022-11-23 08:51:48.524180822 +0100
+@@ -127,28 +127,28 @@
+     set result [.e xview]
+ } -result {0.0 0.5}
+ 
+-test entry-3.3 "xview" -body {
++test entry-3.3 "xview" -constraints knownBug -body {
+     .e delete 0 end;
+     .e insert end abcdefghijklmnopqrstuvwxyz
+     .e xview end
+     set result [.e index @0]
+ } -result 7
+ 
+-test entry-3.4 "xview" -body {
++test entry-3.4 "xview" -constraints knownBug -body {
+     .e delete 0 end;
+     .e insert end abcdefghijklmnopqrstuvwxyz
+     .e xview moveto 1.0
+     set result [.e index @0]
+ } -result 7
+ 
+-test entry-3.5 "xview" -body {
++test entry-3.5 "xview" -constraints knownBug -body {
+     .e delete 0 end;
+     .e insert end abcdefghijklmnopqrstuvwxyz
+     .e xview scroll 5 units
+     set result [.e index @0]
+ } -result 5
+ 
+-test entry-3.6 "xview" -body {
++test entry-3.6 "xview" -constraints knownBug -body {
+     .e delete 0 end;
+     .e insert end [string repeat abcdefghijklmnopqrstuvwxyz 5]
+     .e xview scroll 2 pages
diff --git a/dev-lang/tk/tk-8.6.13.ebuild b/dev-lang/tk/tk-8.6.13.ebuild
new file mode 100644
index 000000000000..8409057c78b4
--- /dev/null
+++ b/dev-lang/tk/tk-8.6.13.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with dev-lang/tcl!
+
+inherit autotools multilib-minimal multilib prefix toolchain-funcs virtualx
+
+MY_P="${PN}${PV/_beta/b}"
+
+DESCRIPTION="Tk Widget Set"
+HOMEPAGE="https://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
+
+LICENSE="tcltk"
+SLOT="0/8.6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug +threads truetype aqua xscreensaver"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!aqua? (
+		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+		truetype? ( >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] )
+		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	)
+	~dev-lang/tcl-$(ver_cut 1-3):0=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	!aqua? ( x11-base/xorg-proto )"
+BDEPEND="virtual/pkgconfig"
+# Not bumped to 8.6
+#RESTRICT=test
+
+SPARENT="${WORKDIR}/${PN}$(ver_cut 1-3 ${PV})"
+S="${SPARENT}"/unix
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.6.10-multilib.patch
+	"${FILESDIR}"/${PN}-8.4.15-aqua.patch
+	"${FILESDIR}"/${PN}-8.6.9-conf.patch # Bug 125971
+	"${FILESDIR}"/${PN}-8.6.12-test.patch
+	"${FILESDIR}"/${PN}-8.6.13-test.patch
+)
+
+src_prepare() {
+	find \
+		"${SPARENT}"/compat/* \
+		-delete || die
+
+	pushd "${SPARENT}" &>/dev/null || die
+	default
+	popd &>/dev/null || die
+	eprefixify Makefile.in
+
+	# Make sure we use the right pkg-config, and link against fontconfig
+	# (since the code base uses Fc* functions).
+	sed \
+		-e 's/FT_New_Face/XftFontOpen/g' \
+		-e "s:\<pkg-config\>:$(tc-getPKG_CONFIG):" \
+		-e 's:xft freetype2:xft freetype2 fontconfig:' \
+		-i configure.in || die
+	rm configure || die
+
+	tc-export CC
+
+	sed \
+		-e '/chmod/s:555:755:g' \
+		-i Makefile.in || die
+
+	sed \
+		-e 's:-O[2s]\?::g' \
+		-i tcl.m4 || die
+
+	mv configure.{in,ac} || die
+
+	eautoconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	if tc-is-cross-compiler ; then
+		export ac_cv_func_strtod=yes
+		export tcl_cv_strtod_buggy=1
+	fi
+
+	local mylibdir=$(get_libdir)
+
+	econf \
+		--with-tcl="${EPREFIX}/usr/${mylibdir}" \
+		$(use_enable threads) \
+		$(use_enable aqua) \
+		$(use_enable truetype xft) \
+		$(use_enable xscreensaver xss) \
+		$(use_enable debug symbols)
+}
+
+multilib_src_test() {
+	CI=1 virtx emake test
+}
+
+multilib_src_install() {
+	#short version number
+	local v1=$(ver_cut 1-2)
+	local mylibdir=$(get_libdir)
+
+	S= default
+
+	# normalize $S path, bug #280766 (pkgcore)
+	local nS="$(cd "${S}"; pwd)"
+
+	# fix the tkConfig.sh to eliminate refs to the build directory
+	# and drop unnecessary -L inclusion to default system libdir
+
+	sed \
+		-e "/^TK_BUILD_LIB_SPEC=/s:-L${S}-\w*\.\w* ::g" \
+		-e "/^TK_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TK_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tk${v1}/include:g" \
+		-e "/^TK_BUILD_STUB_LIB_SPEC=/s:-L${S}-\w*\.\w* *::g" \
+		-e "/^TK_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
+		-e "/^TK_BUILD_STUB_LIB_PATH=/s:${S}-\w*\.\w*:${EPREFIX}/usr/${mylibdir}:g" \
+		-e "/^TK_LIB_FILE=/s:'libtk${v1}..TK_DBGX..so':\"libk${v1}\$\{TK_DBGX\}.so\":g" \
+		-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+	if use prefix && [[ ${CHOST} != *-darwin* ]] ; then
+		sed \
+			-e "/^TK_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
+			-e "/^TK_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
+			-i "${ED}"/usr/${mylibdir}/tkConfig.sh || die
+	fi
+
+	# install private headers
+	insinto /usr/${mylibdir}/tk${v1}/include/unix
+	doins "${S}"/*.h
+	insinto /usr/${mylibdir}/tk${v1}/include/generic
+	doins "${SPARENT}"/generic/*.h
+	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/{tk,tkDecls,tkPlatDecls}.h || die
+
+	# install symlink for libraries
+	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
+	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
+
+	if multilib_is_native_abi; then
+		dosym wish${v1} /usr/bin/wish
+		dodoc "${SPARENT}"/{ChangeLog*,README.md,changes}
+	fi
+}