diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-perl/PDL-Graphics-Gnuplot | |
parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) |
gentoo resync : 28.04.2021
Diffstat (limited to 'dev-perl/PDL-Graphics-Gnuplot')
4 files changed, 151 insertions, 0 deletions
diff --git a/dev-perl/PDL-Graphics-Gnuplot/Manifest b/dev-perl/PDL-Graphics-Gnuplot/Manifest index 1b2df222a104..f326a02509bb 100644 --- a/dev-perl/PDL-Graphics-Gnuplot/Manifest +++ b/dev-perl/PDL-Graphics-Gnuplot/Manifest @@ -1,6 +1,9 @@ AUX PDL-Graphics-Gnuplot-2.11.0-outputfile.patch 780 BLAKE2B 5e9480506a8ef34c74ff4bdca29134cbbbb4fa25c39fdb058b2b23aa5489406f897162d84f0a51678d69482020cf2de83d24166bba8555a82c6cc60751298f89 SHA512 99c4af87cf5fa1bd7defff8aa9ede1f482de9a9eb6549f5a2cc9a2a9ec2bf2b242da4cf6f36dc4078ce20a7493ae8090ab91e89a58382b42eca8251f3c0178dd +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.011.tar.gz 146990 BLAKE2B 6a11d49a897d1e937e63939885b3c7d5a4a00cf0e9c4ec86d4435ef317dab6dec43f374dfe1bd54f7ea19859da0086b7a2f792da49fa5ffc661d75c059ca3636 SHA512 09bd38beaacf914241d2bddf9c159bd6db3a60ed0d15f001faec4c5da2e22cb8313b47ed71b8e6006159b4a0d74cea6ebbaf257fa9774eac7f8a5622cfade0e7 DIST PDL-Graphics-Gnuplot-2.013.tar.gz 149855 BLAKE2B f5ebe0ed1da97c4811b6d6fd52f9c5148efb0c8cb2fa3954134160221c074842c24e92460686b39011f245ca2bec27f4feee822d6f33a383bbff671445816682 SHA512 1cf184f0e4df1f3e42880f24acecdcc95e99bf9340851e0b6c258dd89d759c49852a7db5f83aea8a3714d85ac659d03b0f68e6853d58c7eb2efde6da6423f1f6 EBUILD PDL-Graphics-Gnuplot-2.11.0-r1.ebuild 720 BLAKE2B e803d1cbbd762cf63697cbb258a332e181884255f07fa9f2597a8d823524f74ecf7d1247e1de8a054b2ea7d24c16fe95460691da1f3d1fa173869d244e43570a SHA512 a65315fd87eba70495f915857d9f340d44aa1f75629d7a1508923ff266f99cd54d66b5ce82d80a887dd5b7de67c8936961b12b394752a6070fcc791e51ceb7ac EBUILD PDL-Graphics-Gnuplot-2.13.0-r1.ebuild 672 BLAKE2B ab8a446b9e415ba5388cb498a0d3eb2fc9ac7807ca7bdd1fa0b1af00f508756518004d2f4adc06e98777cd6099a69c77fbc4d57953b4ca265fb4e9ed3f82623d SHA512 aa6f9542e58a4fcb1ab9c1df51ceda5b5ad03c877f5305dc94571cdb4b4a056fdab16d8932c40844fe09020ee6be5aa2b0778e6c7e7302a93240862b5c28f63d +EBUILD PDL-Graphics-Gnuplot-2.13.0-r2.ebuild 758 BLAKE2B e20a31c6899518c8b076db63a61e9d40bb1beeb9c4cc93a6796ae6709c8164530d56e1510d8a1251173d0ebb9d261afcd362b294dd49c98838675e79ea7d6a29 SHA512 259b87fc8a894500a272ca6cb3cf28e98811e8e85f63b3f2a27476a4c752376b20a4adbf9661e8e6e474b0905fe43ff01d0f555c56ce5a0e460d0f229c738580 MISC metadata.xml 485 BLAKE2B 15f0bef37016030b3116f19f5bb637e9da8c7d86144bb0d1806fc1fc1969a3e5126fb864d8b4193bc64810e5e3385d64b2e3296c5cad56778820709b78197257 SHA512 8ed658238efaa82d1e5b3249bd3368446bd826cafeb362c068291cb8325efeb266d37efb7d76820081f1bd00367491260f373097be4d1639b781bfee9428e3ef diff --git a/dev-perl/PDL-Graphics-Gnuplot/PDL-Graphics-Gnuplot-2.13.0-r2.ebuild b/dev-perl/PDL-Graphics-Gnuplot/PDL-Graphics-Gnuplot-2.13.0-r2.ebuild new file mode 100644 index 000000000000..0eaa42ebeb4c --- /dev/null +++ b/dev-perl/PDL-Graphics-Gnuplot/PDL-Graphics-Gnuplot-2.13.0-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DIST_VERSION=2.013 +DIST_AUTHOR=ETJ +inherit perl-module + +DESCRIPTION="Gnuplot-based plotting for PDL" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-perl/Alien-Gnuplot + virtual/perl-IO + dev-perl/IPC-Run + virtual/perl-Scalar-List-Utils + dev-perl/PDL + dev-perl/PDL-Transform-Color + dev-perl/Safe-Isa + virtual/perl-Storable + virtual/perl-Time-HiRes + || ( sci-visualization/gnuplot[X] sci-visualization/gnuplot[qt4(-)] ) +" +DEPEND="${RDEPEND} + >=virtual/perl-ExtUtils-MakeMaker-6.480.0 + test? ( virtual/perl-Test-Simple ) +" + +PATCHES=( + "${FILESDIR}/${P}"-components.patch + "${FILESDIR}/${P}"-titletest.patch +) 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 new file mode 100644 index 000000000000..16b5f0c37883 --- /dev/null +++ b/dev-perl/PDL-Graphics-Gnuplot/files/PDL-Graphics-Gnuplot-2.13.0-components.patch @@ -0,0 +1,78 @@ +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 new file mode 100644 index 000000000000..101ffb5a6cf6 --- /dev/null +++ b/dev-perl/PDL-Graphics-Gnuplot/files/PDL-Graphics-Gnuplot-2.13.0-titletest.patch @@ -0,0 +1,33 @@ +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 + |