gentoo resync : 22.12.2021

5 files changed, 2 insertions, 176 deletions

diff --git a/dev-perl/Template-Toolkit/Manifest b/dev-perl/Template-Toolkit/Manifest
index 5a7088524990..54530693f3c6 100644
--- a/dev-perl/Template-Toolkit/Manifest
+++ b/dev-perl/Template-Toolkit/Manifest
@@ -1,7 +1,3 @@
-AUX Template-Toolkit-2.27-cgipm.patch 1819 BLAKE2B 06c8fa20721a0d68576b5c8883eb2f0c85af72e84bbdd7bc2deb721576d8ee453dbb0b3ea9e9d770604fb916538b9067f3e3311b176558309160c705068aa305 SHA512 d7927a35a3d287ad2a515cedb01f9f80fa9d23293b694fb03b59b18b159f4c4584b9ce8870d8d4b9c56d9f1c28c624e918332d668c0c375167b44f783229a9e4
-AUX Template-Toolkit-2.27-no-dot-inc.patch 1987 BLAKE2B feaae674dd01ef2d7ae7c1a660c838b69d3b1fcc07b735a66dbab2bb6d27c7ea1916c3bb2855b7f8d566f3516874925ca2a23f20cf2f9258aa1a7bcec8d46f1b SHA512 e7ce9167bc2ecc648efb0e021f1481c63093cb9a8f42492c081200938e075dc272eeaef903e1cd14b4f81407037d8d5dce43f7f04d113dd01c4f24516ce93b19
-DIST Template-Toolkit-2.27.tar.gz 511172 BLAKE2B 62ffce1fe5679799afff6b3865882c91e70efeb2ec14474f3b49bdf35bd64f7ce4439d5c58ddd73bad26589816d2f24f4691a02c69405fb6b6b604d28edee4e2 SHA512 17f03a01a3d6ab0ef2247c77da15c46d9bbce3e0158172162da6abe47f53c5e7ca041a7c31506bb3a37f31c476ba747f5111c5b1b1d69614a4ce3352927fd4e6
 DIST Template-Toolkit-3.009.tar.gz 523388 BLAKE2B b33569ef066d6896861f84299c36802fac81e48ff71460ea6acc41ca39e78cd5a37fecac4c5603077395a448a872b10b8c801eee1491b3da7d00479f70c337ed SHA512 940992d7e3059a64c273c2f0441a81e095560c35f4bb9ab75afb9eeeb58d043cc5ac9785e2eb79a6635480ade12771c75c632c755977124dbe7cbfae399f9972
-EBUILD Template-Toolkit-2.270.0-r1.ebuild 1087 BLAKE2B 1ca4420ef207511b843593d7bf1e93c2ee4ac916503ca34b98db1c6adca50c96e3f55820929338424f2f2f88492ab5ec69fe44bcfa98815635227022d4293ed7 SHA512 2c8524c267ef482918672f9d1c227023efead9a5638721568f5a155f38f231c70941a849c45e7fac8e3aa1c2302ce404ff6fbf23be5f9c7b2e0a4fac2965312d
-EBUILD Template-Toolkit-3.9.0.ebuild 1052 BLAKE2B 279401a70ee9bf976fa98f26a6120edcfe4e524563c3bfdc58d0080780e7dcc5b1a602f9c6d13be94dc5bc677201d764e3d74db5185e3cbfa0c29f1875b50384 SHA512 7410fd6445201340c4ac4c3a2bae76bed5af165732d4f95159423b9442f47be0e1782c1f27ba48322d12ea11df25136e3d70ba27c5d1a6d53834a738a68263ce
+EBUILD Template-Toolkit-3.9.0.ebuild 1047 BLAKE2B d9b62bdc860a6ac00069c09206d48253e7383d63319904872246e36572927b67dc309a9600fbdbcacf79702ab3aefbc07669f99fddfe255092941c1c2426f14d SHA512 2d6a6335379b04bc34d275532ff78a824c7914cf866ffd612101b64d927afde014158733fd0dfc40ceddbb3fb1956f914d3ae09b3326977f59ea5ac9879ea4e1
 MISC metadata.xml 3835 BLAKE2B c935c76b9dd434401a096c28de95f24e252d9f327a80ff5f4ecc8fdd16bbc97fe6d365ef7df458810774cdc3a21786d68c6fa148ccea8dea890f53f200d7b69a SHA512 e8cf3c46df8dbf266bb0574aa6f1d670b7fcf3ae4e40c78f6c971ccebcf255af708698e7ffc6a69f5955a6cda8c655f3527940956923d2f5a1ba29df61b176f8
diff --git a/dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild b/dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild
deleted file mode 100644
index cceeb92e3de3..000000000000
--- a/dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=ABW
-DIST_VERSION=2.27
-inherit perl-module
-
-DESCRIPTION="The Template Toolkit"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="xml gd mysql postgres latex vim-syntax test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-perl/Text-Autoformat
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	>=dev-perl/AppConfig-1.56"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/CGI )
-"
-PDEPEND="dev-perl/Text-Autoformat
-	vim-syntax? ( app-vim/tt2-syntax )
-	xml? ( dev-perl/Template-XML )
-	gd? ( dev-perl/Template-GD )
-	mysql? ( dev-perl/Template-DBI )
-	latex? ( dev-perl/Template-Plugin-Latex )
-	postgres? ( dev-perl/Template-DBI )"
-
-myconf=(
-	TT_XS_ENABLE=y
-	TT_XS_DEFAULT=y
-	TT_QUIET=y
-	TT_ACCEPT=y
-)
-
-PERL_RM_FILES=(
-	t/zz-plugin-leak.t
-	t/zz-pmv.t
-	t/zz-pod-coverage.t
-	t/zz-pod-kwalitee.t
-	t/zz-stash-xs-leak.t
-	t/zz-url2.t
-)
-PATCHES=(
-	"${FILESDIR}/${PN}-2.27-no-dot-inc.patch"
-	"${FILESDIR}/${PN}-2.27-cgipm.patch"
-)
diff --git a/dev-perl/Template-Toolkit/Template-Toolkit-3.9.0.ebuild b/dev-perl/Template-Toolkit/Template-Toolkit-3.9.0.ebuild
index 9cf8555991d0..07001138331c 100644
--- a/dev-perl/Template-Toolkit/Template-Toolkit-3.9.0.ebuild
+++ b/dev-perl/Template-Toolkit/Template-Toolkit-3.9.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="The Template Toolkit"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="xml gd mysql postgres latex vim-syntax test"
 
 RDEPEND="
diff --git a/dev-perl/Template-Toolkit/files/Template-Toolkit-2.27-cgipm.patch b/dev-perl/Template-Toolkit/files/Template-Toolkit-2.27-cgipm.patch
deleted file mode 100644
index 422cc851838f..000000000000
--- a/dev-perl/Template-Toolkit/files/Template-Toolkit-2.27-cgipm.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From e723aeecf60ece32f6a1381f5c026ae08cae9913 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Sat, 13 Jan 2018 13:48:31 +1300
-Subject: Fix tests warning w/ CGI.pm
-
-This currently seems like an intractable problem with the syntax of
-Template::Toolkit forcing list context by default on called functions.
-
-The only real way around this is to either:
-
-A) always use Template::Plugin::Scalar to enforce scalar context
-B) abuse cgi.multi_param to simply silence the warning and being an
-   adult about the fact "yes, this returns a list, make sure you do the
-   right thing with that"
-
-Bug: https://rt.cpan.org/Ticket/Display.html?id=100503
----
- t/cgi.t | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/t/cgi.t b/t/cgi.t
-index 023ab5ab..6086e145 100644
---- a/t/cgi.t
-+++ b/t/cgi.t
-@@ -49,28 +49,32 @@ sub barf {
- 
- __END__
- -- test --
-+[% USE scalar -%]
- [% USE cgi = CGI('id=abw&name=Andy+Wardley'); global.cgi = cgi -%]
--name: [% global.cgi.param('name') %]
-+name: [% global.cgi.scalar.param('name') %]
- -- expect --
- name: Andy Wardley
- 
- -- test --
--name: [% global.cgi.param('name') %]
-+[% USE scalar -%]
-+name: [% global.cgi.scalar.param('name') %]
- 
- -- expect --
- name: Andy Wardley
- 
- -- test --
--[% FOREACH key = global.cgi.param.sort -%]
--   * [% key %] : [% global.cgi.param(key) %]
-+[% USE scalar -%]
-+[% FOREACH key = global.cgi.multi_param.sort -%]
-+   * [% key %] : [% global.cgi.scalar.param(key) %]
- [% END %]
- -- expect --
-    * id : abw
-    * name : Andy Wardley
- 
- -- test --
--[% FOREACH key = global.cgi.param().sort -%]
--   * [% key %] : [% global.cgi.param(key) %]
-+[% USE scalar -%]
-+[% FOREACH key = global.cgi.multi_param().sort -%]
-+   * [% key %] : [% global.cgi.scalar.param(key) %]
- [% END %]
- -- expect --
-    * id : abw
--- 
-2.15.1
-
diff --git a/dev-perl/Template-Toolkit/files/Template-Toolkit-2.27-no-dot-inc.patch b/dev-perl/Template-Toolkit/files/Template-Toolkit-2.27-no-dot-inc.patch
deleted file mode 100644
index 97decd75cb14..000000000000
--- a/dev-perl/Template-Toolkit/files/Template-Toolkit-2.27-no-dot-inc.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 65e7f0e980e64dd0525eda058330cea06379c332 Mon Sep 17 00:00:00 2001
-From: Kent Fredric <kentnl@gentoo.org>
-Date: Sat, 13 Jan 2018 13:05:52 +1300
-Subject: Fix relative path handling in templates on Perl 5.26+
-
-NB: It doesn't seem like the value of "$compiled" is very useful in the
-failure case, as the expectation is that'd have been a falsey value at
-best, or a literal "undef" at worst, yeilding additional warnings.
-
-Bug: https://rt.cpan.org/Ticket/Display.html?id=121171
-Bug: https://bugs.gentoo.org/615704
----
- lib/Template/Provider.pm | 20 ++++++++++++++++++--
- 1 file changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/lib/Template/Provider.pm b/lib/Template/Provider.pm
-index 6ecb2453..61c3469c 100644
---- a/lib/Template/Provider.pm
-+++ b/lib/Template/Provider.pm
-@@ -562,13 +562,29 @@ sub _compiled_filename {
- 
- sub _load_compiled {
-     my ($self, $file) = @_;
-+
-+    # Implicitly Relative paths are not supported
-+    # by "require" and invoke @INC traversal, where relative
-+    # paths only traditionally worked prior to Perl 5.26
-+    # due to the presence of '.' in @INC
-+    #
-+    # Given load_compiled never wants to traverse @INC, forcing
-+    # an absolute path for the loaded file and the INC key is
-+    # sensible.
-+    #
-+    # NB: %INC Keys are always identical to their respective
-+    # "require" invocations regardless of OS, and the only time
-+    # one needs to care about slash direction is when dealing
-+    # with Module::Name -> Module/Name.pm translation.
-+    my $fpath = File::Spec->rel2abs( $file );
-+
-     my $compiled;
- 
-     # load compiled template via require();  we zap any
-     # %INC entry to ensure it is reloaded (we don't
-     # want 1 returned by require() to say it's in memory)
--    delete $INC{ $file };
--    eval { $compiled = require $file; };
-+    delete $INC{ $fpath };
-+    eval { $compiled = require $fpath; };
-     return $@
-         ? $self->error("compiled template $compiled: $@")
-         : $compiled;
--- 
-2.15.1
-