gentoo resync : 25.04.2020

9 files changed, 167 insertions, 4 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 2ee85161a0ad..08623cf02168 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/bwidget/Manifest b/dev-tcltk/bwidget/Manifest
index dc4a56fa4023..f61d396f5b5a 100644
--- a/dev-tcltk/bwidget/Manifest
+++ b/dev-tcltk/bwidget/Manifest
@@ -2,5 +2,5 @@ AUX bwidget-1.9.8-test.patch 499 BLAKE2B 186ea474d9efbebe4e710ab67a9fb675d3a9d3c
 DIST bwidget-1.9.12.tar.gz 254905 BLAKE2B 02b206b9d19ec9580003a8549aa14d2bce230f8dc9834fcd2ba327bee2cf1f90c324f1804e175b89055d5f5f8727253132d186e9230efdc8b29e390e3cf2bf6b SHA512 0e01725ec65041a47a32625f2687e22bc42ccd581a26b3ca7be5a969b0b901c07fd5887a47ff846cc1111767a72cfc6e31f4aa99a1c9040a6f08705d97a5970f
 DIST bwidget-1.9.14.tar.gz 261654 BLAKE2B 2c0e8ed33624f6304e775da3be02975aced85c8eeb8ca7fd736858a9323f7bd6aad96bb3697db1c9c571d5dc72ff21d3c161d4f2a8ada83f9ec615391c0f1890 SHA512 7db9c69ae423e97356ff3e54ffc77a450fb967907b32356f343aa4321faceb3e807e63babb2edf0e2c6ab086af570dbd6a02a85e4ca2c1f020ae4df78c8f0fe8
 EBUILD bwidget-1.9.12.ebuild 801 BLAKE2B 912846162e8da0319ad189a0fa645b1ce23f287b66dd6f5405116734f5f1bcd1016ba3ff803551023a724793fc529f3ec4b1b244abc4297b9778a4e343323a1f SHA512 fa5e0e9555266290a58f0bc771727d9e0628ee013977423842a17325ac9b92d5ee039102cfdbd883d3402e866ceb51bba8d3e274289ecf3eac7dfea8d40a730a
-EBUILD bwidget-1.9.14.ebuild 808 BLAKE2B 3065e752e92963d6ca203359ad6659f8cc0d52bc1778395bfca5f1e7398094a74ccfdbb8971a2995cbcf55c4b0456b22738e104ca5fbfb81aefa37718cbb945c SHA512 70a03ff912c72261c215ae0b1148da98b49ea632cbd60585b08b29101dd70e25d5ca8ad3e581a86c4c5b524e31d2a11d227d35939c630f7452698073e479b918
+EBUILD bwidget-1.9.14.ebuild 801 BLAKE2B 7bb48415b26cce083e66556533c3fa5d44c834d7e6f11f573bad893604082e1a11cc72286b3c6651e2a43561b48ae427a999ce972f19e9d320214595d98a4924 SHA512 f890d5767a53d734eff8b50a42b51eec4a3439980f3b46f21a43c7637d0a90afb7ce20201ee3ba43e9305c271a5b8fb10529ef786d52323382fe78446bb6dff1
 MISC metadata.xml 329 BLAKE2B 9c75c5b20f8ce9b566b4a422c4d768c3c2db1f593d8505ee7539932860f99ab5eeafb51d02e84d78f7be0c8be06e22fadb64aaf61cf01b7b14ac506035c70c79 SHA512 c16db3fedc73cc41391e15f198396908ebd047c165c2bbe3c465f126dfb8266818d79f11ec343a2880058850a8164801616632f361b69db914e7d66823bb1851
diff --git a/dev-tcltk/bwidget/bwidget-1.9.14.ebuild b/dev-tcltk/bwidget/bwidget-1.9.14.ebuild
index 663c258b9db7..95c4e533b78c 100644
--- a/dev-tcltk/bwidget/bwidget-1.9.14.ebuild
+++ b/dev-tcltk/bwidget/bwidget-1.9.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/tcllib/${MY_PN}/${PV}/${P}.tar.gz"
 
 LICENSE="tcltk"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-tcltk/tcllib/Manifest b/dev-tcltk/tcllib/Manifest
index 92109e60b4bd..afb694c4d291 100644
--- a/dev-tcltk/tcllib/Manifest
+++ b/dev-tcltk/tcllib/Manifest
@@ -1,4 +1,7 @@
 AUX tcllib-1.19-test.patch 501 BLAKE2B 141beca1582b3fef5a632ff807b86a437883de236ed54b6cbfa38a85b7a5e84b520502689d7b7f04aa4f32fedc3bdb8148162f98a53ea4f15668a69c26658a4d SHA512 b0b10dfade925201a4ea67f1da0c14fb8fa9f7fbad852f38e8263dfd323d3125d807fec10d02d4fced4d07997463a1815475707259a19f32380c7cb31cbdc614
+AUX tcllib-1.20-test.patch 5515 BLAKE2B 8048f7568d6651014c9153f4e5a26a1580f10ce510ce0eead2960bba732f9424faaeec4392af5b7647633d3946a8e290c5f33ea0b60f754358d7ef3eb07be1cc SHA512 494e60644baccb516c8b4847cf300b53630e222f34899d9d620e84d1573be0d0b3df69f9be5534416ae360460cd7ea3cd5e0f24d2124c00702449caa66752e69
 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
 MISC metadata.xml 329 BLAKE2B 9c75c5b20f8ce9b566b4a422c4d768c3c2db1f593d8505ee7539932860f99ab5eeafb51d02e84d78f7be0c8be06e22fadb64aaf61cf01b7b14ac506035c70c79 SHA512 c16db3fedc73cc41391e15f198396908ebd047c165c2bbe3c465f126dfb8266818d79f11ec343a2880058850a8164801616632f361b69db914e7d66823bb1851
diff --git a/dev-tcltk/tcllib/files/tcllib-1.20-test.patch b/dev-tcltk/tcllib/files/tcllib-1.20-test.patch
new file mode 100644
index 000000000000..80371c98115c
--- /dev/null
+++ b/dev-tcltk/tcllib/files/tcllib-1.20-test.patch
@@ -0,0 +1,101 @@
+--- a/modules/devtools/testutilities.tcl	2020-04-16 21:57:11.915653960 +0200
++++ b/modules/devtools/testutilities.tcl	2020-04-16 22:11:05.621829465 +0200
+@@ -229,6 +229,10 @@
+     ::tcltest::testConstraint tcl8.6plus \
+ 	[expr {[package vsatisfies [package provide Tcl] 8.6]}]
+ 
++    ::tcltest::testConstraint tcl8.6.8 \
++	[expr { [package vsatisfies [package provide Tcl] 8.6.8] &&
++	       ![package vsatisfies [package provide Tcl] 8.6.9]}]
++
+     ::tcltest::testConstraint tcl8.6not10 \
+ 	[expr { [package vsatisfies [package provide Tcl] 8.6] &&
+ 	       ![package vsatisfies [package provide Tcl] 8.6.10]}]
+--- a/modules/hook/hook.test	2020-04-16 21:59:22.708326030 +0200
++++ b/modules/hook/hook.test	2020-04-16 22:09:18.055740312 +0200
+@@ -436,6 +436,7 @@
+ } -cleanup {
+     cleanup
+ } -result [tcltest::byConstraint {
++    tcl8.6.8 {{{S1 <H1> {} O1} {simulated error} {-code 1 -level 0 -errorstack {INNER {error {simulated error}} UP 1 CALL {::hook::call S1 <H1>}} -errorcode NONE}}}
+     tcl8.6.10plus {{{S1 <H1> {} O1} {simulated error} {-code 1 -level 0 -errorstack {INNER {error {simulated error}} UP 1 CALL {::hook::call S1 <H1>}} -errorcode NONE}}}
+     tcl8.6not10   {{{S1 <H1> {} O1} {simulated error} {-code 1 -level 0 -errorstack {INNER {error {simulated error}} UP 1 CALL {call S1 <H1>}} -errorcode NONE}}}
+     tcl8.5minus   {{{S1 <H1> {} O1} {simulated error} {-code 1 -level 0 -errorcode NONE}}}
+@@ -452,6 +453,7 @@
+ } -cleanup {
+     cleanup
+ } -result [tcltest::byConstraint {
++    tcl8.6.8 {{{S1 <H1> O1 {}} {S1 <H1> O3 {}}} {{{S1 <H1> {} O2} {simulated error} {-code 1 -level 0 -errorstack {INNER {error {simulated error}} UP 1 CALL {::hook::call S1 <H1>}} -errorcode NONE}}}}
+     tcl8.6.10plus {{{S1 <H1> O1 {}} {S1 <H1> O3 {}}} {{{S1 <H1> {} O2} {simulated error} {-code 1 -level 0 -errorstack {INNER {error {simulated error}} UP 1 CALL {::hook::call S1 <H1>}} -errorcode NONE}}}}
+     tcl8.6not10   {{{S1 <H1> O1 {}} {S1 <H1> O3 {}}} {{{S1 <H1> {} O2} {simulated error} {-code 1 -level 0 -errorstack {INNER {error {simulated error}} UP 1 CALL {call S1 <H1>}} -errorcode NONE}}}}
+     tcl8.5minus   {{{S1 <H1> O1 {}} {S1 <H1> O3 {}}} {{{S1 <H1> {} O2} {simulated error} {-code 1 -level 0 -errorcode NONE}}}}
+--- a/modules/http/autoproxy.test	2020-04-16 22:48:04.645153193 +0200
++++ b/modules/http/autoproxy.test	2020-04-16 22:48:30.710701582 +0200
+@@ -179,20 +179,6 @@
+     autoproxy::configure -tls_package dummy
+ } -result "Invalid TLS package option 'dummy'. Must be 'tls' or 'twapi'" -returnCodes error
+ 
+-test autoproxy-2.0.0 "autoproxy::tls_socket (tls) with proxy" -constraints {
+-    have_tls
+-} -setup {
+-    packageReset
+-    package require http
+-    autoproxy::configure -proxy_host $proxy_host -proxy_port $proxy_port
+-} -body {
+-    http::register https 443 autoproxy::tls_socket
+-    set tok [http::geturl https://www.example.com]
+-    http::status $tok
+-} -cleanup {
+-    http::cleanup $tok
+-} -result ok
+-
+ test autoproxy-2.0.1 "autoproxy::tls_socket (twapi) with proxy" -constraints {
+     have_twapi
+ } -setup {
+@@ -202,20 +188,6 @@
+ } -body {
+     http::register https 443 autoproxy::tls_socket
+     set tok [http::geturl https://www.example.com]
+-    http::status $tok
+-} -cleanup {
+-    http::cleanup $tok
+-} -result ok
+-
+-test autoproxy-2.1.0 "autoproxy::tls_socket (tls) without proxy" -constraints {
+-    have_tls
+-} -setup {
+-    packageReset
+-    package require http
+-    autoproxy::configure -proxy_host "" -proxy_port $proxy_port
+-} -body {
+-    http::register https 443 autoproxy::tls_socket
+-    set tok [http::geturl https://www.example.com]
+     http::status $tok
+ } -cleanup {
+     http::cleanup $tok
+--- a/modules/string/token_shell.test	2020-04-17 08:40:44.813030086 +0200
++++ b/modules/string/token_shell.test	2020-04-17 08:44:03.066752545 +0200
+@@ -26,6 +26,7 @@
+ test string-token-shell-1.0 "string token shell, wrong#args, not enough" -body {
+     string token shell
+ } -returnCodes error -result [tcltest::byConstraint {
++    tcl8.6.8 {wrong # args: should be "::string::token::shell ?-indices? ?-partial? ?--? text"}
+     tcl8.6.10plus {wrong # args: should be "::string::token::shell ?-indices? ?-partial? ?--? text"}
+     tcl8.6not10   {wrong # args: should be "shell ?-indices? ?-partial? ?--? text"}
+     tcl8.5minus   {wrong # args: should be "::string::token::shell ?-indices? ?-partial? ?--? text"}
+@@ -34,6 +35,7 @@
+ test string-token-shell-1.1 "string token shell, wrong#args, too many" -body {
+     string token shell T X
+ } -returnCodes error -result [tcltest::byConstraint {
++    tcl8.6.8 {wrong # args: should be "::string::token::shell ?-indices? ?-partial? ?--? text"}
+     tcl8.6.10plus {wrong # args: should be "::string::token::shell ?-indices? ?-partial? ?--? text"}
+     tcl8.6not10   {wrong # args: should be "shell ?-indices? ?-partial? ?--? text"}
+     tcl8.5minus   {wrong # args: should be "::string::token::shell ?-indices? ?-partial? ?--? text"}
+@@ -46,6 +48,7 @@
+ test string-token-shell-1.3 "string token shell, wrong#args, too many" -body {
+     string token shell -- T X
+ } -returnCodes error -result [tcltest::byConstraint {
++    tcl8.6.8 {wrong # args: should be "::string::token::shell ?-indices? ?-partial? ?--? text"}
+     tcl8.6.10plus {wrong # args: should be "::string::token::shell ?-indices? ?-partial? ?--? text"}
+     tcl8.6not10   {wrong # args: should be "shell ?-indices? ?-partial? ?--? text"}
+     tcl8.5minus   {wrong # args: should be "::string::token::shell ?-indices? ?-partial? ?--? text"}
diff --git a/dev-tcltk/tcllib/tcllib-1.20.ebuild b/dev-tcltk/tcllib/tcllib-1.20.ebuild
new file mode 100644
index 000000000000..54cb1d43047c
--- /dev/null
+++ b/dev-tcltk/tcllib/tcllib-1.20.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit virtualx
+
+DESCRIPTION="Tcl Standard Library"
+HOMEPAGE="http://www.tcl.tk/software/tcllib/"
+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"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-lang/tcl:0=
+	dev-tcltk/tdom
+	"
+DEPEND="${RDEPEND}"
+
+DOCS=(
+	ChangeLog DESCRIPTION.txt README.md devdoc/README.developer
+	devdoc/critcl-tcllib.txt devdoc/dirlayout_install.txt
+	devdoc/indexing.txt
+)
+HTML_DOCS=( idoc/www )
+
+PATCHES=( "${FILESDIR}"/${P}-test.patch )
+
+src_test() {
+	USER= virtx emake test_batch
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		for f in $(find examples -type f); do
+			docinto $(dirname $f)
+			dodoc $f
+		done
+	fi
+}
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index 77ef1a9b24c1..fbf8300c8756 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,7 +1,8 @@
 AUX tkimg-1.4-jpeg-9.patch 364 BLAKE2B bc9b3e4e404b49a9909d7198929033ebee4ab839f1f2ec71aea9435637bdcb6a3f0dd9c2ed379d9e0f7215853b0e693337876ac0842a37b32533151ef4d9b739 SHA512 4bb6cf0b7774700d607bccfb1590660344754749c40acefcba23046333b1029006acede784177473c629ab63247402bbbc4ab172946485af950c5e8ec6abb8c9
+AUX tkimg-1.4.9-fno-common.patch 274 BLAKE2B b3b3ac5c7e849195fe7dbd6a86ad085825799144ddd05b445abe96577e41a52b50665aaf04fc08cf43a3b5d3d3b1a3a5494a59f8297f68036df4c7948d83dc90 SHA512 8599751f097914fa2757fed9599f3df08f6941c3693d4216f5dcb60a4be8bf603c4869b3f55cf12bea2752d77114c7c1cd2890de1b5635a0665a12053117712f
 DIST Img-1.4.9-Source.tar.gz 7702460 BLAKE2B 958956e786cea208f24a30532fa65914439d8289a4fce7dfa149e8202d1abe680bd8cb1cc5d8b3fb3e31d48bf5302db14977997f92ebaa786503138be872fa0b SHA512 c749a567de4eb2b9acc4d84344141ed8ba3703e4e22895d3fe0b292fe10bb0c09920cd765952fa1b95bfe8c0cb5e2955421c29bedaa07b7f3b36e7697a8f36c9
 DIST Img-Source-1.4.7.tar.gz 7259144 BLAKE2B 48794a21564864c5b20953d1504acde5512be4aaa8db0834f63b15431af0bfa8bb2050f241e7b2d9b383480b59e17567f26f45c91e9f9a7fc58600cfe6ef6595 SHA512 6a395d6263e2f46151d0d3f5c6044d87a933617981200d2663328b8c7993b8a3aacba45568cee7aa2f5d8c8d020cb63956179aab5147d25d91b8834c0dfa4b9d
 DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5 SHA512 596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8
 EBUILD tkimg-1.4.7.ebuild 1904 BLAKE2B faba72f6a1b921eb47c64bb6d630838a2a23e7c615ae6dd28860307382fa9dd91c65b580132765534d501a6ecee3b10975ba7a683c0eec62c73dc36b21635dbc SHA512 c6ca2c1dc26c7c986d4126521c52aa0ed8ec6129fb11ec723e6b2c982270c410e4e019ea313bcd7565d096acd97dbfcee93b27de2b8614048511811d5f78366d
-EBUILD tkimg-1.4.9.ebuild 2250 BLAKE2B 6ac28172b78427829477ff65b3a227519fee5e3d165d224a6b2b81c3ddf1cfc83f22d71334e291852d2d1ae2774856512764dbef451f76783c9acc52d433e110 SHA512 c5d92f64424eaa68b0777cfe8c5e75c68b833b8ce088d652ff0996b72702de9c17f0fa0d6c7829d55f7363efaba9d3d9832564b6ecb954176ce3806135448c4c
+EBUILD tkimg-1.4.9.ebuild 2287 BLAKE2B 3995fe0c111a740a5cb48153b29ca4225373da502fa7276d077ccd949f9c8ed6a510c7ca576fea9399a26d79e4528f2dbea2fea014e347732a84f6dfa1c0a933 SHA512 14d0890aea67e8803cae59949366eaaeb2a48ead561bd5e66b3b2dbbeae034abfc139bc23d68a2c8cc7440ec4d62d75322c0421ae4957eef8e9defe20063dec7
 MISC metadata.xml 328 BLAKE2B 1c2b4dff486d257a50839ff54238b77348694269a1ddd0e24f80a83ea1bbb7661dba26981d24fa299c9252ae4544c438fab85f28f13fe98a66b97d70c784c1e0 SHA512 8c91b67342dfb72a4e464e51213b04064cac7862f9d78283985096aa1a83135ce50647813599591a46b5ea79eecc52238af0d5d7f223bc61bb58b94e0da54089
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch b/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch
new file mode 100644
index 000000000000..307dfe314375
--- /dev/null
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.9-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/libpng/pngtclDecls.h	2020-04-13 20:16:18.542559383 +0200
++++ b/libpng/pngtclDecls.h	2020-04-13 20:16:33.921314336 +0200
+@@ -1369,6 +1369,8 @@
+ 
+ #ifdef __cplusplus
+ extern "C" {
++#else
++extern
+ #endif
+ PNG_IMPEXP const PngtclStubs *pngtclStubsPtr;
+ #ifdef __cplusplus
diff --git a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild b/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
index d2c7d256208b..e5bccdee84c1 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.9.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.9.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=7
@@ -42,6 +42,7 @@ PATCHES=(
 	"${WORKDIR}"/${PN}-1.4.7-png.patch
 	"${WORKDIR}"/${PN}-1.4.7-tiff.patch
 	"${FILESDIR}"/${PN}-1.4-jpeg-9.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {