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/Apache-Test/files/, dev-perl/Apache-Test/
Date: Thu, 06 Aug 2020 16:05:05
Message-Id: 1596729773.e26ad3f4bd77498705d905b51e05b9ca163d23f5.kentnl@gentoo
1 commit: e26ad3f4bd77498705d905b51e05b9ca163d23f5
2 Author: Kent Fredric <kentnl <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 6 16:02:04 2020 +0000
4 Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 6 16:02:53 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e26ad3f4
7
8 dev-perl/Apache-Test: Cleanup old 1.400.0-r2
9
10 Package-Manager: Portage-2.3.103, Repoman-2.3.22
11 Signed-off-by: Kent Fredric <kentnl <AT> gentoo.org>
12
13 dev-perl/Apache-Test/Apache-Test-1.400.0-r2.ebuild | 120 ---------------------
14 dev-perl/Apache-Test/Manifest | 1 -
15 ...Apache-Test-1.400.0-fix-missing-semicolon.patch | 26 -----
16 3 files changed, 147 deletions(-)
17
18 diff --git a/dev-perl/Apache-Test/Apache-Test-1.400.0-r2.ebuild b/dev-perl/Apache-Test/Apache-Test-1.400.0-r2.ebuild
19 deleted file mode 100644
20 index 2322010f802..00000000000
21 --- a/dev-perl/Apache-Test/Apache-Test-1.400.0-r2.ebuild
22 +++ /dev/null
23 @@ -1,120 +0,0 @@
24 -# Copyright 1999-2020 Gentoo Authors
25 -# Distributed under the terms of the GNU General Public License v2
26 -
27 -EAPI=6
28 -
29 -DIST_AUTHOR=SHAY
30 -DIST_VERSION=1.40
31 -inherit depend.apache perl-module
32 -
33 -DESCRIPTION="Test.pm wrapper with helpers for testing Apache"
34 -
35 -LICENSE="Apache-2.0"
36 -SLOT="0"
37 -KEYWORDS="amd64 ~arm ~ia64 ~mips ppc ppc64 sparc x86"
38 -IUSE="test"
39 -RESTRICT="!test? ( test )"
40 -
41 -DEPEND="virtual/perl-ExtUtils-MakeMaker"
42 -
43 -need_apache
44 -
45 -PATCHES=(
46 - "${FILESDIR}/${P}-catfile-import.patch"
47 - "${FILESDIR}/${P}-fix-missing-semicolon.patch"
48 - "${FILESDIR}/${P}-phpclient.patch"
49 -)
50 -
51 -pkg_setup() {
52 - perl_set_version
53 -}
54 -
55 -src_install() {
56 - # This is to avoid conflicts with a deprecated Apache::Test stepping
57 - # in and causing problems/install errors
58 - if [ -f "${S}"/.mypacklist ];
59 - then
60 - rm -f "${S}"/.mypacklist
61 - fi
62 - perl-module_src_install
63 -}
64 -# Parallel tests seem to be bad.
65 -DIST_TEST="do"
66 -
67 -optdep_notice() {
68 - local i
69 - elog "This package has several modules which may require additional dependencies"
70 - elog "to use. However, it is up to you to install them separately if you need this"
71 - elog "optional functionality:"
72 - elog
73 - i="$(if has_version 'www-apache/mod_perl'; then echo '[I]'; else echo '[ ]'; fi)"
74 - elog " $i www-apache/mod_perl"
75 - elog " - Running Perl code natively in Apache via"
76 - elog " Apache::TestHandler, Apache::TestReportPerl, or Apache::TestSmokePerl"
77 -
78 - if use test; then
79 - elog
80 - elog "This module will perform additional tests if these dependencies are"
81 - elog "pre-installed"
82 - fi
83 -}
84 -src_test() {
85 - optdep_notice
86 - echo
87 - local MODULES=(
88 - "Apache::Test ${DIST_VERSION}"
89 - "Apache::Test5005compat 0.01"
90 - "Apache::TestBuild"
91 - "Apache::TestClient"
92 - "Apache::TestCommon"
93 - "Apache::TestCommonPost"
94 - "Apache::TestConfig"
95 - "Apache::TestConfigC"
96 - "Apache::TestConfigPHP"
97 - "Apache::TestConfigParrot"
98 - "Apache::TestConfigParse"
99 - "Apache::TestConfigPerl"
100 - "Apache::TestHarness"
101 - "Apache::TestHarnessPHP"
102 - "Apache::TestMB"
103 - "Apache::TestMM"
104 - "Apache::TestPerlDB"
105 - "Apache::TestReport"
106 - "Apache::TestRequest"
107 - "Apache::TestRun"
108 - "Apache::TestRunPHP 1.00"
109 - "Apache::TestRunParrot 1.00"
110 - "Apache::TestRunPerl 1.00"
111 - "Apache::TestSSLCA"
112 - "Apache::TestServer"
113 - "Apache::TestSmoke"
114 - "Apache::TestSort"
115 - "Apache::TestTrace 0.01"
116 - "Apache::TestUtil 0.02"
117 - "Bundle::ApacheTest ${DISTVERSION}"
118 - )
119 - has_version "www-apache/mod_perl" && MODULES+=(
120 - "Apache::TestHandler"
121 - "Apache::TestReportPerl"
122 - "Apache::TestSmokePerl"
123 - )
124 - local failed=()
125 - for dep in "${MODULES[@]}"; do
126 - ebegin "Compile testing ${dep}"
127 - perl -Mblib="${S}" -M"${dep} ()" -e1
128 - eend $? || failed+=( "$dep" )
129 - done
130 - if [[ ${failed[@]} ]]; then
131 - echo
132 - eerror "One or more modules failed compile:";
133 - for dep in "${failed[@]}"; do
134 - eerror " ${dep}"
135 - done
136 - die "Failing due to module compilation errors";
137 - fi
138 - perl_rm_files t/more/02testmore.t t/more/04testmore.t
139 - perl-module_src_test
140 -}
141 -pkg_postinst() {
142 - use test || optdep_notice
143 -}
144
145 diff --git a/dev-perl/Apache-Test/Manifest b/dev-perl/Apache-Test/Manifest
146 index b219cb3ffb2..cdd947b9d5e 100644
147 --- a/dev-perl/Apache-Test/Manifest
148 +++ b/dev-perl/Apache-Test/Manifest
149 @@ -1,2 +1 @@
150 -DIST Apache-Test-1.40.tar.gz 151801 BLAKE2B 0ec57b0a8a0fafc8d10409a3cd02308da67bd6766caa71bfb525ef49832545c811281a987a5237be236a3a581fcf8311785d0bff8d283db2c52f08d11cd2bda1 SHA512 f48a1b93c4d61181670ec59bb8bb2231122b22ec9725d8899a3b2f82d2918fdc48a09494c2f45b0e6a603546481892a948eac3494e06c8eb219a9213e1faadb8
151 DIST Apache-Test-1.42.tar.gz 153621 BLAKE2B 570c61e4b5f17c97376ba9f4ab3cde0b14df367f06b665e31dba9c6675972ad4d1bebe46b08416b0f4749d723a6b909430c9bdd1e5d3b1c6b21d209635f1236a SHA512 ecd78dde1b0db562d591990bcd50fe880d724dce9bfb20dceea3a51b81abd89d40889857e5e7714b586a093ad6f101dfd79c6aa33d63c906c41c532305b6584c
152
153 diff --git a/dev-perl/Apache-Test/files/Apache-Test-1.400.0-fix-missing-semicolon.patch b/dev-perl/Apache-Test/files/Apache-Test-1.400.0-fix-missing-semicolon.patch
154 deleted file mode 100644
155 index f09cd53348f..00000000000
156 --- a/dev-perl/Apache-Test/files/Apache-Test-1.400.0-fix-missing-semicolon.patch
157 +++ /dev/null
158 @@ -1,26 +0,0 @@
159 -From b2a2cdc1e9a3121ea8848ab4a2410c5dcc68d620 Mon Sep 17 00:00:00 2001
160 -From: Kent Fredric <kentnl@g.o>
161 -Date: Sun, 15 Oct 2017 06:15:47 +1300
162 -Subject: Fix missing ";"
163 -
164 -Bug: https://rt.cpan.org/Ticket/Display.html?id=123282
165 ----
166 - lib/Apache/TestConfigPHP.pm | 2 +-
167 - 1 file changed, 1 insertion(+), 1 deletion(-)
168 -
169 -diff --git a/lib/Apache/TestConfigPHP.pm b/lib/Apache/TestConfigPHP.pm
170 -index 0ddea0b..1c79865 100644
171 ---- a/lib/Apache/TestConfigPHP.pm
172 -+++ b/lib/Apache/TestConfigPHP.pm
173 -@@ -170,7 +170,7 @@ sub configure_php_ini {
174 - my $dir = catfile $self->{vars}->{serverroot}, 'conf';
175 - my $file = catfile $dir, 'php.ini';
176 -
177 -- return if -e $file
178 -+ return if -e $file;
179 -
180 - my $log = catfile $self->{vars}->{t_logs}, 'error_log';
181 -
182 ---
183 -2.14.2
184 -