commit: e3cb618bc36bce45928960cd22b5bb5e60cb234a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Mar 8 20:05:19 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Mar 9 21:05:23 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3cb618b
dev-tcltk/tcllib: drop 1.20 Bug: https://bugs.gentoo.org/970407 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-tcltk/tcllib/Manifest | 1 - dev-tcltk/tcllib/files/tcllib-1.20-test.patch | 132 -------------------------- dev-tcltk/tcllib/tcllib-1.20.ebuild | 51 ---------- 3 files changed, 184 deletions(-) diff --git a/dev-tcltk/tcllib/Manifest b/dev-tcltk/tcllib/Manifest index 7627de90ecce..2a2acf942af7 100644 --- a/dev-tcltk/tcllib/Manifest +++ b/dev-tcltk/tcllib/Manifest @@ -1,3 +1,2 @@ -DIST tcllib-1.20.tar.xz 6692664 BLAKE2B 3e70cf0d0f9e469a20e18f84238f56a53b5b8e36abcf418dc32f64c819728968d24e2999705d91d8341cb608a6bb674a063e86253cddfb51f2693a94d0e070e5 SHA512 d2c20642f91cdc7bf3b329025be80eb9288d0919fa439c2066349b52950cf3c343f39c7745b9b08ec28a884ff2f219fe0fb5f47023f1266b6a6de6ae54852412 DIST tcllib-1.21.tar.xz 6467488 BLAKE2B 1faad78a263d9ef02d8d178bd329510a76db7b13d8ae636389877b25e1f1d125a6018ee9238cf3d8dbc04957d2e589669dc743c1f9e5823f28976ef73f8ce2e5 SHA512 0c8c333e1fd30237dbe40842082fd2da5141c50fc29c1a82960ce32b6780247b412ddfd1fe1e4414513dc77d6833611a46e07ca4137f13a51c7fea9fb81cef5b DIST tcllib-2.0.tar.xz 14872556 BLAKE2B 804775438d69b569f59c8da842d51c74deecec0ec8591989a8094fd332585c833ddffb33f636c134207a231192088c09b431864b6d52449066d5997377e63ae3 SHA512 b637548359475368135ce68ed39a0c75c276bf91412c68f357e45f833d52a070d8e952edecfa1c94aa927f92c88c586086fce517d201eb72746751d146e30103 diff --git a/dev-tcltk/tcllib/files/tcllib-1.20-test.patch b/dev-tcltk/tcllib/files/tcllib-1.20-test.patch deleted file mode 100644 index 326edcdbc39b..000000000000 --- a/dev-tcltk/tcllib/files/tcllib-1.20-test.patch +++ /dev/null @@ -1,132 +0,0 @@ ---- 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"} ---- a/modules/pki/pki.test 2020-08-25 10:17:32.102420666 +0200 -+++ b/modules/pki/pki.test 2020-08-25 10:18:02.445984702 +0200 -@@ -123,28 +123,6 @@ - unset privkey cakey cacert ca_arr ca password csr - } -result [asset-get result/cert-b] - --test rsa-verify-certv1-1.0 {verify_cert} -setup { -- set pubcert [asset-get test-v1.crt] -- set cacert [asset-get CA.crt] -- set pubcert [::pki::x509::parse_cert $pubcert] -- set cacert [::pki::x509::parse_cert $cacert] --} -body { -- ::pki::x509::verify_cert $pubcert [list $cacert] --} -cleanup { -- unset pubcert cacert --} -result {true} -- --test rsa-verify-certv3-1.0 {verify_cert} -setup { -- set pubcert [asset-get test-v3.crt] -- set cacert [asset-get CA.crt] -- set pubcert [::pki::x509::parse_cert $pubcert] -- set cacert [::pki::x509::parse_cert $cacert] --} -body { -- ::pki::x509::verify_cert $pubcert [list $cacert] --} -cleanup { -- unset pubcert cacert --} -result {true} -- - test rsa-verify-badcertv1-1.0 {verify_cert} -setup { - set pubcert [asset-get test-v1.crt] - set cacert [asset-get test-v1.crt] diff --git a/dev-tcltk/tcllib/tcllib-1.20.ebuild b/dev-tcltk/tcllib/tcllib-1.20.ebuild deleted file mode 100644 index 10f9d47bebf5..000000000000 --- a/dev-tcltk/tcllib/tcllib-1.20.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2025 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="https://downloads.sourceforge.net/${PN}/${PN}/${PV}/${P}.tar.xz"; - -LICENSE="BSD" -SLOT="0" -IUSE="examples" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 ~sparc x86" -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_prepare() { - default - rm modules/httpd/httpd.test || die -} - -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 -}
