gentoo resync : 28.07.2021

3 files changed, 0 insertions, 113 deletions

diff --git a/dev-perl/PDL-Graphics-Gnuplot/Manifest b/dev-perl/PDL-Graphics-Gnuplot/Manifest
index a5b1c89032d0..f80636034af2 100644
--- a/dev-perl/PDL-Graphics-Gnuplot/Manifest
+++ b/dev-perl/PDL-Graphics-Gnuplot/Manifest
@@ -1,5 +1,3 @@
-AUX PDL-Graphics-Gnuplot-2.13.0-components.patch 3302 BLAKE2B ab21bfbbe94e5a21c26a6ca10df4d09da6fdeb02e51067b83de1fcd4cceba8bc25c8e2ad5bc6e1adb78c55da018c2eaec4e56d0d387ad9730a0d3c4fbcac9832 SHA512 2060348e3361fa0c7ef9a1f3b3f5bed9b3f5e0e5da4bac70599d9b8601ea3bf033060c993fa7b15b804230894be62319d81451a667539f1c852b9970d581665e
-AUX PDL-Graphics-Gnuplot-2.13.0-titletest.patch 1010 BLAKE2B ad3e266a4de85b6046cd6b6c62c2b053f1dbb3045940adaaf0a256c943df427bdb724cc6f95827733e912c88a3786827e86559a0886ef6b5bfbb391d57358908 SHA512 75c3c05dbbc63d3dfbe7dd72ae3832fef4871ef75b46dae5bbf0ed3f61658767c39b9e2ad92300c92ffd6c67c674b3cc2d5c80db87c0ed95c5fbd92ce66ebd3f
 DIST PDL-Graphics-Gnuplot-2.016.tar.gz 149882 BLAKE2B 2c2359d65643f72fac1249650be8343786415a72fd074ab426211e1fc933ce6a02ce789b93820c2a41a687d429b264ff743a3aa39e3df12c1a66de47115167f7 SHA512 3e82a8a10b7b48567e0746238c4b718e491f39afb53b965ae72a4e2aa0567914856bf6343ba3d571fdb240d284fc95570c51c4042d9bbc0e5de8aa6f7aaa21f2
 DIST PDL-Graphics-Gnuplot-2.017.tar.gz 150197 BLAKE2B 22903f3d08a4d7268f3c024880ede8650f4e101c2ebab162ab0e2241f3a64b713fa740c212043332f981417686acd5478cd06b1bfdd6c6ac301372bdc8333407 SHA512 41aa5b5c6dcd77b6e6109971173f5c25d69b72fd01ef4d72f7c2d86c248a69ee63bb6f20420e766778b29124a5a0ebd1d964d49c4d802d502b4a0bbb1765b8f9
 EBUILD PDL-Graphics-Gnuplot-2.16.0.ebuild 673 BLAKE2B cbf1c84ebd58dde59768d082898b998193d95534cea96c00d87f1e0da1f3e3f00db035b23555055ee851659661d06bac3a2ead1801d9fb23934cc7a523da74f5 SHA512 ef3449d5ad520a9acfcbae52474d1e1a30a3dd4649da75efeac4b70a99ad2d50f35a02f8a60276c2a5ed6e1902a90aa6080bf74a9d4d765bb6f62a55123faaf0
diff --git a/dev-perl/PDL-Graphics-Gnuplot/files/PDL-Graphics-Gnuplot-2.13.0-components.patch b/dev-perl/PDL-Graphics-Gnuplot/files/PDL-Graphics-Gnuplot-2.13.0-components.patch
deleted file mode 100644
index 16b5f0c37883..000000000000
--- a/dev-perl/PDL-Graphics-Gnuplot/files/PDL-Graphics-Gnuplot-2.13.0-components.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 1a1910fbe5ba97963b40e8b7731f49e08cf46f59 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
-Date: Thu, 8 Apr 2021 14:57:34 +0200
-Subject: [PATCH 1/2] Allow a Gnuplot version with three components
-
----
- lib/PDL/Graphics/Gnuplot.pm | 21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/lib/PDL/Graphics/Gnuplot.pm b/lib/PDL/Graphics/Gnuplot.pm
-index 39fef00..45c8f5c 100644
---- a/lib/PDL/Graphics/Gnuplot.pm
-+++ b/lib/PDL/Graphics/Gnuplot.pm
-@@ -2009,8 +2009,8 @@ if($Alien::Gnuplot::VERSION < 1.031) {
-     die "PDL::Graphics::Gnuplot requires Alien::Gnuplot version 1.031 or higher\n (v$Alien::Gnuplot::VERSION found). You can pull the latest from CPAN.\n";
- }
- 
--our $gnuplot_dep_v = 4.6; # Versions below this are deprecated.
--our $gnuplot_req_v = 4.4; # Versions below this are not supported.
-+our $gnuplot_dep_v = 4.006; # Versions below this are deprecated.
-+our $gnuplot_req_v = 4.004; # Versions below this are not supported.
- 
- # Compile time config flags...
- our $check_syntax = 0;
-@@ -2022,7 +2022,8 @@ our $debug_echo = 0;                              # If set, mock up Losedows hal
- our $VERSION = '2.013';
- $VERSION = eval $VERSION;
- 
--our $gp_version = undef;   # eventually gets the extracted gnuplot(1) version number.
-+our $gp_version = undef;    # eventually gets the extracted gnuplot(1) version number.
-+our $gp_numversion = undef; # which is here converted to a float
- 
- my $did_warn_non_numeric_patchlevel; # whether we already warned about this
- 
-@@ -6217,7 +6218,7 @@ our $_OptionEmitters = {
- 	#### This is because some "withs" (e.g. "lines") must have dt specifiers for the correct behavior,
- 	#### but other "withs" (e.g. "labels") barf if dt is specified.
-     'dt' => sub { my($k,$v,$h, $w) = @_;
--		  return "" unless($gp_version >= 5.0);
-+		  return "" unless($gp_numversion >= 5.0);
- 		  return "" if(($v//"") eq 'INVALID');
- 		  unless($v) {
- 		      if($w->{options}->{terminal} =~ m/dashed/) {
-@@ -7489,11 +7490,13 @@ EOM
- ##############################
- # Parse version number.  If the version or pl changed, try reloading Alien::Gnuplot
- # to get them in sync.
--	if( $s =~ m/Version (\d+\.\d+) (patchlevel (\w+))?/i ) {
-+	if( $s =~ m/Version ((\d+)\.(\d+)(\.(\d+))?) (patchlevel (\w+))?/i ) {
- 	    $gp_version = $1;
--	    $gp_pl = $3;
-+            $gp_numversion = $2 + 0.001*$3 + 0.000001*$5;
-+	    $gp_pl = $7;
- 	    $this->{gp_version} = $1;
--	    $this->{gp_pl} = $3;
-+            $this->{gp_numversion} = $gp_numversion;
-+	    $this->{gp_pl} = $7;
- 	} else {
- 
- 	    # Something went wrong with i/o.  See if the process still exists.
-@@ -7546,12 +7549,12 @@ EOM
- 	    }
-             
-             # On windows, gnuplot versions 4.6.5 and older echo back commands.
--            if ( $gp_version <= '4.6' && $gp_pl <= 5 ) {
-+            if ( $gp_numversion <= '4.006' && $gp_pl <= 5 ) {
-                 $echo_eating = 1;
-             }
- 	}
- 
--	if( $gp_version < $gnuplot_dep_v  and  !$PDL::Graphics::Gnuplot::deprecated_this_session ) {
-+	if( $gp_numversion < $gnuplot_dep_v  and  !$PDL::Graphics::Gnuplot::deprecated_this_session ) {
-             $PDL::Graphics::Gnuplot::deprecated_this_session = 1;
- 	    unless($ENV{GNUPLOT_DEPRECATED}){
- 	    carp <<"EOM";
--- 
-2.26.3
-
diff --git a/dev-perl/PDL-Graphics-Gnuplot/files/PDL-Graphics-Gnuplot-2.13.0-titletest.patch b/dev-perl/PDL-Graphics-Gnuplot/files/PDL-Graphics-Gnuplot-2.13.0-titletest.patch
deleted file mode 100644
index 101ffb5a6cf6..000000000000
--- a/dev-perl/PDL-Graphics-Gnuplot/files/PDL-Graphics-Gnuplot-2.13.0-titletest.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 73764d7180d998fb5a435e0fc73a76b00466009e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
-Date: Thu, 8 Apr 2021 15:11:09 +0200
-Subject: [PATCH 2/2] Disable failing title test
-
----
- t/plot.t | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/t/plot.t b/t/plot.t
-index d3b5eb9..5138207 100644
---- a/t/plot.t
-+++ b/t/plot.t
-@@ -1,6 +1,6 @@
- #!perl
- 
--use Test::More tests => 185;
-+use Test::More tests => 184;
- 
- BEGIN {
-     use_ok( 'PDL::Graphics::Gnuplot', qw(plot) ) || print "Bail out!\n";
-@@ -853,7 +853,7 @@ SKIP:{
-     skip "Skipping title tests due to obsolete version of gnuplot (BSD uses 4.2, which fails these)",3 
- 	if($w->{gp_version} < $PDL::Graphics::Gnuplot::gnuplot_req_v);
- 
--    ok($lines[1] =~ m/This is a plot title/, "Plot title gets placed on plot");
-+#   ok($lines[1] =~ m/This is a plot title/, "Plot title gets placed on plot");
-     
-     
-     eval { $w->plot({title=>""},with=>'points',xvals(5));};
--- 
-2.26.3
-