| 1 |
commit: b0d403ffa033acba47631a0e345ada2ae9015958 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 28 14:32:34 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 28 14:32:34 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0d403ff |
| 7 |
|
| 8 |
www-apache/mod_perl: update EAPI 5 -> 7 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/828739 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch | 4 ++-- |
| 14 |
www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch | 4 ++-- |
| 15 |
.../{mod_perl-2.0.11.ebuild => mod_perl-2.0.11-r1.ebuild} | 13 ++++++++----- |
| 16 |
3 files changed, 12 insertions(+), 9 deletions(-) |
| 17 |
|
| 18 |
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch b/www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch |
| 19 |
index 0930278aeba3..40c88c83eb87 100644 |
| 20 |
--- a/www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch |
| 21 |
+++ b/www-apache/mod_perl/files/mod_perl-2.0.1-sneak-tmpdir.patch |
| 22 |
@@ -1,5 +1,5 @@ |
| 23 |
---- t/conf/modperl_extra.pl.orig 2005-05-16 18:27:45.000000000 +1000 |
| 24 |
-+++ t/conf/modperl_extra.pl 2005-05-16 18:34:46.000000000 +1000 |
| 25 |
+--- a/t/conf/modperl_extra.pl |
| 26 |
++++ b/t/conf/modperl_extra.pl |
| 27 |
@@ -136,6 +136,8 @@ |
| 28 |
sub test_modperl_env { |
| 29 |
# see t/response/TestModperl/env.pm |
| 30 |
|
| 31 |
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch b/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch |
| 32 |
index c6c5bed4ed0c..77db5f65263d 100644 |
| 33 |
--- a/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch |
| 34 |
+++ b/www-apache/mod_perl/files/mod_perl-2.0.11-perl534.patch |
| 35 |
@@ -4,8 +4,8 @@ Fix build for perl >= 5.33.7 |
| 36 |
Patch by Leon Timmermans <fawaka@×××××.com> from https://github.com/Perl/perl5/issues/18617 |
| 37 |
|
| 38 |
|
| 39 |
---- perl/modperl/trunk/src/modules/perl/modperl_perl.c 2021/04/20 13:48:02 1889013 |
| 40 |
-+++ perl/modperl/trunk/src/modules/perl/modperl_perl.c 2021/04/20 13:55:29 1889014 |
| 41 |
+--- a/src/modules/perl/modperl_perl.c |
| 42 |
++++ b/src/modules/perl/modperl_perl.c |
| 43 |
@@ -268,7 +268,7 @@ |
| 44 |
#ifdef MP_NEED_HASH_SEED_FIXUP |
| 45 |
if (MP_init_hash_seed_set) { |
| 46 |
|
| 47 |
diff --git a/www-apache/mod_perl/mod_perl-2.0.11.ebuild b/www-apache/mod_perl/mod_perl-2.0.11-r1.ebuild |
| 48 |
similarity index 95% |
| 49 |
rename from www-apache/mod_perl/mod_perl-2.0.11.ebuild |
| 50 |
rename to www-apache/mod_perl/mod_perl-2.0.11-r1.ebuild |
| 51 |
index 77fb5135e3a3..3b0cc28a4471 100644 |
| 52 |
--- a/www-apache/mod_perl/mod_perl-2.0.11.ebuild |
| 53 |
+++ b/www-apache/mod_perl/mod_perl-2.0.11-r1.ebuild |
| 54 |
@@ -1,9 +1,9 @@ |
| 55 |
-# Copyright 1999-2021 Gentoo Authors |
| 56 |
+# Copyright 1999-2022 Gentoo Authors |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
|
| 59 |
-EAPI=5 |
| 60 |
+EAPI=7 |
| 61 |
|
| 62 |
-inherit depend.apache apache-module perl-module eutils |
| 63 |
+inherit depend.apache apache-module perl-module |
| 64 |
|
| 65 |
DESCRIPTION="An embedded Perl interpreter for Apache2" |
| 66 |
HOMEPAGE="https://perl.apache.org/ https://projects.apache.org/project.html?perl-mod_perl" |
| 67 |
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm ppc ppc64 x86" |
| 68 |
IUSE="debug ithreads test" |
| 69 |
RESTRICT="!test? ( test )" |
| 70 |
|
| 71 |
-SRC_TEST=do |
| 72 |
+DIST_TEST=do |
| 73 |
|
| 74 |
# Apache::Reload, Apache::SizeLimit, and Apache::Test are force-unbundled. |
| 75 |
# The minimum versions requested here are the bundled versions. |
| 76 |
@@ -73,6 +73,8 @@ src_prepare() { |
| 77 |
} |
| 78 |
|
| 79 |
src_configure() { |
| 80 |
+ _init_apache2_late |
| 81 |
+ |
| 82 |
local debug=$(usex debug 1 0) |
| 83 |
local nothreads=$(usex ithreads 0 1) |
| 84 |
myconf=( |
| 85 |
@@ -108,7 +110,8 @@ src_install() { |
| 86 |
default |
| 87 |
|
| 88 |
perl_delete_localpod |
| 89 |
- perl_delete_packlist |
| 90 |
+ perl_fix_packlist |
| 91 |
+ perl_delete_emptybsdir |
| 92 |
|
| 93 |
insinto "${APACHE_MODULES_CONFDIR}" |
| 94 |
doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl |
Archives