Gentoo Archives: gentoo-commits

From: Kent Fredric <kentnl@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-perl/PGPLOT/, dev-perl/PGPLOT/files/
Date: Wed, 27 Dec 2017 08:10:34
Message-Id: 1514362192.6302ee6cf776016c21e331233e4614d4c1b9062a.kentnl@gentoo
1 commit: 6302ee6cf776016c21e331233e4614d4c1b9062a
2 Author: Kent Fredric <kentnl <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 27 00:38:56 2017 +0000
4 Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 27 08:09:52 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6302ee6c
7
8 dev-perl/PGPLOT: EAPI6 + Tests
9
10 - EAPI6ify
11 - Enable tests
12 - Fix test failures due to '.' in @INC
13 - Ensure tests render to NULL device instead of XSERVER
14
15 Package-Manager: Portage-2.3.18, Repoman-2.3.6
16
17 dev-perl/PGPLOT/PGPLOT-2.210.0-r1.ebuild | 23 +++++++++++++++++
18 dev-perl/PGPLOT/files/PGPLOT-2.21-no-dot-inc.patch | 25 ++++++++++++++++++
19 .../PGPLOT/files/PGPLOT-2.21-null-render.patch | 30 ++++++++++++++++++++++
20 3 files changed, 78 insertions(+)
21
22 diff --git a/dev-perl/PGPLOT/PGPLOT-2.210.0-r1.ebuild b/dev-perl/PGPLOT/PGPLOT-2.210.0-r1.ebuild
23 new file mode 100644
24 index 00000000000..482486e167f
25 --- /dev/null
26 +++ b/dev-perl/PGPLOT/PGPLOT-2.210.0-r1.ebuild
27 @@ -0,0 +1,23 @@
28 +# Copyright 1999-2017 Gentoo Foundation
29 +# Distributed under the terms of the GNU General Public License v2
30 +
31 +EAPI=6
32 +
33 +DIST_AUTHOR=KGB
34 +DIST_VERSION=2.21
35 +inherit perl-module
36 +
37 +DESCRIPTION="allow subroutines in the PGPLOT graphics library to be called from Perl"
38 +
39 +SLOT="0"
40 +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux"
41 +IUSE=""
42 +
43 +RDEPEND="sci-libs/pgplot
44 + >=dev-perl/ExtUtils-F77-1.13"
45 +DEPEND="${RDEPEND}"
46 +
47 +PATCHES=(
48 + "${FILESDIR}/${PN}-2.21-no-dot-inc.patch"
49 + "${FILESDIR}/${PN}-2.21-null-render.patch"
50 +)
51
52 diff --git a/dev-perl/PGPLOT/files/PGPLOT-2.21-no-dot-inc.patch b/dev-perl/PGPLOT/files/PGPLOT-2.21-no-dot-inc.patch
53 new file mode 100644
54 index 00000000000..b05067deeee
55 --- /dev/null
56 +++ b/dev-perl/PGPLOT/files/PGPLOT-2.21-no-dot-inc.patch
57 @@ -0,0 +1,25 @@
58 +From 6d7ee026a19e889cbadbdaf9134588edf52e22c2 Mon Sep 17 00:00:00 2001
59 +From: Kent Fredric <kentnl@g.o>
60 +Date: Wed, 27 Dec 2017 13:23:26 +1300
61 +Subject: Fix test skips without '.' in @INC on Perl 5.25.7+
62 +
63 +---
64 + test.pl | 2 +-
65 + 1 file changed, 1 insertion(+), 1 deletion(-)
66 +
67 +diff --git a/test.pl b/test.pl
68 +index d9a787c..d1b75ca 100755
69 +--- a/test.pl
70 ++++ b/test.pl
71 +@@ -35,7 +35,7 @@ foreach $jjj (1..12) {
72 +
73 + print "============== Running test$jjj.p ==============\n";
74 + %@ = (); # Clear error status
75 +- do "test$jjj.p";
76 ++ do "./test$jjj.p";
77 + warn $@ if $@; # Report any error detected
78 + if($dev eq '/PNG' && $^O =~ /mswin32/i) {
79 + system("ren pgplot.png pgplot_$jjj.png");
80 +--
81 +2.15.1
82 +
83
84 diff --git a/dev-perl/PGPLOT/files/PGPLOT-2.21-null-render.patch b/dev-perl/PGPLOT/files/PGPLOT-2.21-null-render.patch
85 new file mode 100644
86 index 00000000000..b5db1d53cf8
87 --- /dev/null
88 +++ b/dev-perl/PGPLOT/files/PGPLOT-2.21-null-render.patch
89 @@ -0,0 +1,30 @@
90 +From 39201312abf108ad5af4ff304484379154a237f1 Mon Sep 17 00:00:00 2001
91 +From: Kent Fredric <kentnl@g.o>
92 +Date: Wed, 27 Dec 2017 13:32:01 +1300
93 +Subject: Use NULL render device
94 +
95 +This absolves us from needing X11 for testing, while allowing
96 +explitly testing via X11 possible, including interactively if need be
97 +---
98 + test.pl | 4 ++--
99 + 1 file changed, 2 insertions(+), 2 deletions(-)
100 +
101 +diff --git a/test.pl b/test.pl
102 +index d1b75ca..95f7c25 100755
103 +--- a/test.pl
104 ++++ b/test.pl
105 +@@ -22,9 +22,9 @@ else {$note = ''}
106 + if ($ENV{'PGPLOT_DEV'}) {
107 + $dev = $ENV{'PGPLOT_DEV'};
108 + } else {
109 +-print "Default Device for plot tests [recommend /XSERVE] ? $note ";
110 ++print "Default Device for plot tests [recommend /NULL] ? $note ";
111 + $dev = <STDIN>; chomp $dev;
112 +-$dev = "/XSERVE" unless $dev=~/\w/;
113 ++$dev = "/NULL" unless $dev=~/\w/;
114 + }
115 +
116 + if($dev eq '/PNG' && $^O =~ /mswin32/i) {system "del /F /Q *.png"};
117 +--
118 +2.15.1
119 +