gentoo resync : 13.11.2021

11 files changed, 53 insertions, 39 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index e97fa7cb67a4..68415869681b 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/itcl/Manifest b/dev-tcltk/itcl/Manifest
index abea552bea77..29b082a07b1d 100644
--- a/dev-tcltk/itcl/Manifest
+++ b/dev-tcltk/itcl/Manifest
@@ -2,6 +2,6 @@ DIST itcl-4-2-1.tar.gz 516035 BLAKE2B 795641559aa2c9039ecabaf0a25214360a379740dc
 DIST itcl4.1.1.tar.gz 436718 BLAKE2B 50f5518460dc6569edcd0229b71439cb10a724b50c31387ebd1ffa85f9fbf58d5bd5163847a1d7ffa791d5acd5d72b08188f01f0e5c4730ba9060fc531071cd4 SHA512 1e08dbefe33e5464320c62e32d153b3e473462cded2d715ba1c504deacf190062672fbece40a021f25798440e2fbed4ecda763db5789fc6afb5eb2052bdf66e2
 DIST itcl4.2.0.tar.gz 428635 BLAKE2B 38898f3377583115eed3b4d5a8a610e0d0a515a1e4852fe3cea04eea68fe64f158bc79d7d5f3041831f97e5e28cee5a67721a187ed5cfbaa33c69e4668b55f31 SHA512 42d13d7f4f841bff49c508fe5d17c12e81b7e381db470d7db658c925b6e609a0821953aa8344764633a3b996eb5757aaae7014df13f4e38ade2dd7aa068ba385
 EBUILD itcl-4.1.1.ebuild 1448 BLAKE2B c16ab644f52d6e284a5d802c0bdbd4afe7939c7ea37c615b6dde0cbe6989bc31862aeba37e60da576e42671f4a2b16d0539d5325e609c9c17e5c8ad0f55fabc5 SHA512 d79dc61dd9a398e92bd393c219b73dddde85383439bf1e2109b78ec1f01dc25e8b4256d8c44466424e93e74a7f7f7b8ae9cecdfc4f110690f74bcabf01765bc4
-EBUILD itcl-4.2.0.ebuild 1459 BLAKE2B a33a51849728c19d5c21d08aa2bb6ba9a7d764dd2016b510523f8f989d3e40c0b2d5e8822ec24f4da3f664385ca6255190e256d531ffff0d3238a977cbe90594 SHA512 ead62902ce4d5f82c139aa65953b410d190603ba0d0cecbee0802a8a41e16c18bbbd66410edc20a8eccbaef66d2a4077ecf8d0ac3a88b892cc73ce1b6b7eb011
+EBUILD itcl-4.2.0.ebuild 1454 BLAKE2B 21aafc38fcacb2a504e7c42b9077dcf078521e96035d3e1355427e6d8c92d083fb3367af1332db30e490bcda6d64aeff31f844c2ac9f96dd710fb2b02f468159 SHA512 8c029cf6a22cc2ec108f6b2c9ee4f6de32d9a21de0a52b9299e4b578121e9a440e64aaffdba0cbaf0eb55f1f67a6ff65e1ea3214bff784f327ed192f42eec8f9
 EBUILD itcl-4.2.1.ebuild 1538 BLAKE2B ce708d738449847b3d40a189a4c357a1063de6de8c4e729aa92dd555209b99fdad360bf9fab33e19a270ece9b8249e52da9583652e3cc989524a815d2d761e2e SHA512 07fc92ad190f95c7fa9e42d6c8ddba17b8ef4ac7472e9287ee3ffc2c1208c7f722e9f1e0afa7e366bd6e7f49c91e6e90e98d3ec19b1c2733a89b29b9194351aa
 MISC metadata.xml 381 BLAKE2B 10be715b2d7375efe50d58e9fa2ac732553271e077bdebed3a0422b0a3f0932aa6d2ccb15f4c1db1aca8d619b20efc593d417b5adbec6c1dfb41ddda409e98b5 SHA512 6343f2deffd5ac471db9b2ebfa6ed602a4ce2beed9aa47e58e3bf49c040f847d12f209549151ca4947f6690f001effa8e8ab60172e8b2a182c59b77938761417
diff --git a/dev-tcltk/itcl/itcl-4.2.0.ebuild b/dev-tcltk/itcl/itcl-4.2.0.ebuild
index 804fc5d58d25..4e580a9a8695 100644
--- a/dev-tcltk/itcl/itcl-4.2.0.ebuild
+++ b/dev-tcltk/itcl/itcl-4.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/project/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itcl%
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-lang/tcl-8.6:0="
diff --git a/dev-tcltk/tablelist/Manifest b/dev-tcltk/tablelist/Manifest
index 7bf02d0c891e..d021c2a2b8ed 100644
--- a/dev-tcltk/tablelist/Manifest
+++ b/dev-tcltk/tablelist/Manifest
@@ -1,5 +1,3 @@
-DIST tablelist6.13.tar.gz 608900 BLAKE2B 3c124ce7581e4d32f7cc1a8048f37b6bc8a5c5b474c1cdf30d6e31f36e65cc3f59f111ac0f0af2a22cf9bca77b1f03036c9a84e91e926b72042f26c873391692 SHA512 bbf5529ba744208a668cdfcfd42f27c469eed8522c6f7e9d9c5ace29daa0c5e822559df6a67f3018a341363914ec33fae31ed94f042334781b0e23286b515994
 DIST tablelist6.15.1.tar.gz 620701 BLAKE2B 09cf2e33f01db8fac1c5aaf11274eb61f945efe87a36787e4a52ea31cdf916893c6846b512dca26dc0153b975e89ec7d7d64307757aef7e9739885406f5aa77e SHA512 0464adf26feda2fac23f7b7a757031367545edc1e1a5c5d568e377f1f4bd05f41338954c5c9df5f75b5c3708024679e93190be3b8a469fc75ca3882666ef132e
-EBUILD tablelist-6.13.ebuild 617 BLAKE2B 85271e4d1fb8de04f3203f4d995c3b1e03586981046a3d120757675508de4f5b6991573a01afec3cdaa52c216f3671da55d5990a7e7799ddbed1291b63703540 SHA512 9734f78b378cb81661414e565c91fbf502e333587cbb29d2c058e3e4f5f9474a34ee062bd23cbcc54e5e2888f860f0e3727721b315bdbf04e3e6f3f77027ce2c
-EBUILD tablelist-6.15.1.ebuild 619 BLAKE2B 2d0c4fca40d343ad0b46dca5e5a073d99d86c8c2324a76505669ccf654946347d4b54b601b70654d15bab0c61731b1d8b49937be7b706cdef92a970af63f5a9d SHA512 556cb8b5c1f5a298cdf9b3c67df9cb066bc07cec0c30d005756c9b1a83c9b7af22f17061d52158fe8f35bbda391484800c21b91e7d33deda89cd0062e82c7d83
+EBUILD tablelist-6.15.1.ebuild 617 BLAKE2B ac1bae2d1fbf65d7654875f03a7ca440a995cf8129e82c97829dba37c6993ead3a387070d301fb7edef43785408f8fddc77046af9efbbd5aca2e0c6947d3f534 SHA512 42ff9c1b2e75c54129d77f0c6d639e8cab07f07a84fe64daab26def2d85df7880dd0721dc3ce5f6d34bb88d7f45a5339c0fb3330f248e53146f09cada0d817e4
 MISC metadata.xml 254 BLAKE2B b855316ec6a32691e84730979c9a077765d46802f09c19f3a06f2cddf677674c9a2ea24c9b57a0fc6344d7f70276ca507a68f5fa690555360665ac494fca54c2 SHA512 5f6faacd216c7ece09e847c09115add5261e7a899e0b0c9304f2ee72e2d0ad208338939e4e37946008bdc81fbbacf415fb220c5c1f9832b17f18c6778d0c0368
diff --git a/dev-tcltk/tablelist/tablelist-6.13.ebuild b/dev-tcltk/tablelist/tablelist-6.13.ebuild
deleted file mode 100644
index 5d7ee53b53f0..000000000000
--- a/dev-tcltk/tablelist/tablelist-6.13.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}${PV}"
-
-DESCRIPTION="Multi-Column Listbox Package"
-HOMEPAGE="http://www.nemethi.de/tablelist/index.html"
-SRC_URI="http://www.nemethi.de/tablelist/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="tablelist"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE="examples doc"
-
-RDEPEND="dev-lang/tcl:0"
-
-src_install() {
-	insinto /usr/$(get_libdir)/${MY_P}
-	doins -r ${PN}* pkgIndex.tcl scripts
-	use examples && dodoc -r demos
-	use doc && docinto html && dodoc -r doc/.
-	einstalldocs
-}
diff --git a/dev-tcltk/tablelist/tablelist-6.15.1.ebuild b/dev-tcltk/tablelist/tablelist-6.15.1.ebuild
index 2c7a0a09ae1c..238621e5bb3b 100644
--- a/dev-tcltk/tablelist/tablelist-6.15.1.ebuild
+++ b/dev-tcltk/tablelist/tablelist-6.15.1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="tablelist"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="examples doc"
 
 RDEPEND="dev-lang/tcl:0"
diff --git a/dev-tcltk/tclreadline/Manifest b/dev-tcltk/tclreadline/Manifest
index 423e79306046..0988a90a26a4 100644
--- a/dev-tcltk/tclreadline/Manifest
+++ b/dev-tcltk/tclreadline/Manifest
@@ -7,5 +7,5 @@ DIST tclreadline-2.1.0.tar.gz 160541 BLAKE2B 44dfd7626b969d03343cfa768d0ad72b932
 DIST tclreadline-2.3.8.tar.gz 393167 BLAKE2B e6a8d35904a0ed22fac01d7f6b6ecc9eef99acea149253ec9a0f7a3463a163ef17daa052bd4801fb9e365b056ab58d69fe2ec9884a9279881638c7b99c12f6a7 SHA512 0c5ce53a8f4cc222de013932698e442c63b36e3f07d10b962d127444f75c28b2caf7f06b5958150748f7a1d535c577c825b9a0dd525e077a348c3ff899a74e61
 DIST tclreadline_2.1.0-12.debian.tar.gz 9636 BLAKE2B b84487e2e05649c899f705ee4c4ea80a7b05c99440e9b905587300342ce54d48a7d32b750ec2c2a3a12f1aa991f2a47167243ec962f539e02383aac62530a3d9 SHA512 293e9ad14a469891f68b25caa78a99874de87df4c44af4ada7528cf74e898be42b7846fbb6eeabb2dec34995a9ccd9707c61f406b90b90dbca2c24df05f451eb
 EBUILD tclreadline-2.1.0-r5.ebuild 1849 BLAKE2B b7fa4bf1db26f914acd559e6b30cfd8515f379d48dcc67b13f8be2e9a1ca8452fd802c59d5a31c34eb2e533c4996cb804fa75133cc309e87583dc3309e355199 SHA512 e07faa38e34fdab0c78673b3a824ae5f8fc9734e7477ae2a19aba437d0a90e1af0a8057a2d58f8dd7af6538ed6181336830402a0e3551c72046100b3fdbc1db6
-EBUILD tclreadline-2.3.8-r1.ebuild 832 BLAKE2B 277598921a3d320fa225b3b70f965313cc3a025bdc07ca55fda7a432e07ac65543a435105d6895a5f7880297bcffce306a1b99763fe1ae8498a9c7904d1ab073 SHA512 e30d220c7656972da47cbf7bedcbebe53bdb447bcd176dbd7e7dc3508deff68385c6ad0c064b8edab76d51ff628371ddf92c50038187ba4ab7436c7394365fe1
+EBUILD tclreadline-2.3.8-r1.ebuild 900 BLAKE2B 6073d170c209f1e9ce4cfa31d52c640121df7d7b612761e03c8f3d049ce99a5db54050bacaf7157b863a47c250acfb34e265d711df870a028de786dff1055612 SHA512 e10249b1c81860089102df4a6e8511abac85357740bd340a678aa47947c0f3cecbfabfae7b054d3b5d8ed3638197fdf14a67a9622dc900ab479e48668ae51d54
 MISC metadata.xml 335 BLAKE2B f2e384f23701b4b38e74dc51d1199b70e65544f9006bb257b39f6b316e44107343aae8a4e5aecab960101f019835fad8f899e7ecf5b6cf9b2d4a3e983f4a5b0d SHA512 64b4aab780a660f84aa545c7c437163ebf035fbd8f1d8c49bf8e46a3a7f75c3062379cd4ff4a4128b47397d499492f5a154ecbd08a018beb38833df5c4f09378
diff --git a/dev-tcltk/tclreadline/tclreadline-2.3.8-r1.ebuild b/dev-tcltk/tclreadline/tclreadline-2.3.8-r1.ebuild
index bf5c09d73760..ff8d8154a93b 100644
--- a/dev-tcltk/tclreadline/tclreadline-2.3.8-r1.ebuild
+++ b/dev-tcltk/tclreadline/tclreadline-2.3.8-r1.ebuild
@@ -27,14 +27,16 @@ src_prepare() {
 }
 
 src_configure() {
-	local myConf=--with-tcl="${EPREFIX}/usr/$(get_libdir)"
+	local myConf=(
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)"
+		--with-readline-includes="${EPREFIX}/usr/include/readline"
+	)
 	if ! use tk; then
-		myConf="$myConf --without-tk"
+		myConf+=(--without-tk)
 	fi
-	econf $myConf
+	econf "${myConf[@]}"
 }
-
 src_install() {
 	default
-	find "${D}" -name \*.la -delete
+	find "${ED}" -name \*.la -delete
 }
diff --git a/dev-tcltk/tkcon/Manifest b/dev-tcltk/tkcon/Manifest
index a74de65eac98..8e1477dfd382 100644
--- a/dev-tcltk/tkcon/Manifest
+++ b/dev-tcltk/tkcon/Manifest
@@ -1,5 +1,7 @@
 DIST tkcon-2.5.tar.gz 139834 BLAKE2B 95d0d0fe856b9ed287d1b2af6132845e047d269991fda8fd0ac88b06b200e1e75d9ac5b3ad4bac7daf08d52ebd2a4ec5697c841565cf290980288b0ecf0449a6 SHA512 f53d21dbf281112b761970b05aa643d598819789644445a0e01f6eddcf98709c4b7ef635bc69ec40fc14b5c78397b240b86d8b6ed63aac48f656242c19fd7851
+DIST tkcon-2.7.10.tar.gz 277788 BLAKE2B 7894947c5ca062f2b905550e88c34a414d4b665b6fff0c5bf22a54e2600050b62eecbdfbde179206571cf74d39e3a9d9e33b93356bf5b81aa9cbf79dcdfcf118 SHA512 a580e06d0c86613b3c9e9daa7863fde6fd11b4e2243764c0b016f0db9d9ba0a9cf839ae26efc37e843f5da87f6304a6d0fcab7667ff6c25246a44e1630851634
 DIST tkcon-2.7.3.tar.gz 278421 BLAKE2B 67e4f2d441808f26f46a08423e278fbd219cd02ad63e05de2608521066e75a041cba055296628a5b800fec516e6f26994fec413a9baf10c34aa309e04a2a9477 SHA512 2cad55d861059bd615a2084a796e99c7654ad40e50bdb209b4e4bcb36a6051dc9ac101fbd09cc29f9582ef02254c1730297eefc8e8d426c25dd25f4590e6aa25
 EBUILD tkcon-2.5-r1.ebuild 716 BLAKE2B 259c85d6e36f31b587865588364f3c80dc405283538a201021560251f37254cdce0054797285c0767bac86c77c2a9cc49080055fdbeda07ef7b500c6c42b22c6 SHA512 d76dcdf27aa8b07d90046e421854750cdebaa8cdc6f6e866b41f1a69a04aa30f30d133ab31d006e710df95c7acc61e77a99d48bca08a708e93d3f59cdf8162af
+EBUILD tkcon-2.7.10.ebuild 774 BLAKE2B 9c41e0bad397d7526e97a353db780b24a45c39920a89dbe0c13d22aeb3806c6618524116d5e369f17f0622f262c8f7ec1a57c7a6933061be4d6ce81c8de1a31f SHA512 9a9cd1e83f36e71e22294461e9b4f922cb6e5b18b6b52af2daaeb2e66da42e2fd216c8160bb0574d9f1ec5be6e882c3bd44613c15514a8df105103201c117cb4
 EBUILD tkcon-2.7.3.ebuild 774 BLAKE2B 9c41e0bad397d7526e97a353db780b24a45c39920a89dbe0c13d22aeb3806c6618524116d5e369f17f0622f262c8f7ec1a57c7a6933061be4d6ce81c8de1a31f SHA512 9a9cd1e83f36e71e22294461e9b4f922cb6e5b18b6b52af2daaeb2e66da42e2fd216c8160bb0574d9f1ec5be6e882c3bd44613c15514a8df105103201c117cb4
-MISC metadata.xml 696 BLAKE2B 92504ff83a22bdd305089bc83ff244fbccf22309646cd7e0b1875d602335530b506fe41c3b8a8b0ab90dd7e157d71c7dcd12d78ee847b08f725c0b1298144fd1 SHA512 96983820d028f464b41182485298f4eba2cce4a916bf6f227fecf037f9242d065fa3b71acbb6df0ceae4dc4fde293cdb04b99b4a0ef5fc22aaeab231a1bf00bb
+MISC metadata.xml 747 BLAKE2B 44a8f26c91ac83bbe20963cd2e1b07346b2b92b6a46969098547dae1161266c2ca445b425aa0c701766aee50655036f14d9f339f0f251b5f65a53fb5e36e69e6 SHA512 6a2cd080e46db84103720b20b7c06403b09f52c0a632826c5ac11d6fbf7058556e5002d1bcb2f5c851fdfb5d28609dc62d171e55f85f62793430f55bfa5673d0
diff --git a/dev-tcltk/tkcon/metadata.xml b/dev-tcltk/tkcon/metadata.xml
index c1ea84cf5bbb..e62ce8abea35 100644
--- a/dev-tcltk/tkcon/metadata.xml
+++ b/dev-tcltk/tkcon/metadata.xml
@@ -14,5 +14,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">tkcon</remote-id>
+		<remote-id type="github">wjoye/tkcon</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-tcltk/tkcon/tkcon-2.7.10.ebuild b/dev-tcltk/tkcon/tkcon-2.7.10.ebuild
new file mode 100644
index 000000000000..d0d15951af1d
--- /dev/null
+++ b/dev-tcltk/tkcon/tkcon-2.7.10.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tk GUI console"
+HOMEPAGE="http://tkcon.sourceforge.net/"
+SRC_URI="https://github.com/wjoye/${PN}/archive/v${PV}.tar.gz ->
+	${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE="doc"
+
+DEPEND="dev-lang/tk:*"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+	mv docs/changes.txt CHANGES
+}
+
+src_install() {
+	local tclver="$(echo 'puts $tcl_version' | tclsh)"
+	local instdir=/usr/$(get_libdir)/tcl${tclver}/${PN}$(ver_cut 1-2)
+	dodir ${instdir}
+	cp -pP pkgIndex.tcl tkcon.tcl "${D}"${instdir} || die
+	dodir /usr/bin
+	dosym ${instdir}/tkcon.tcl /usr/bin/tkcon
+	if use doc; then
+		HTML_DOCS=( docs/* )
+	fi
+	einstalldocs
+}