| 1 |
commit: e5d15d1bb7ddafd2a9a29fed4a4def3e62356054 |
| 2 |
Author: Sergiy Borodych <Sergiy.Borodych <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Oct 4 14:54:11 2016 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Oct 8 12:45:31 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5d15d1b |
| 7 |
|
| 8 |
www-apache/mod_perl: remove old orphan file. |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/2473 |
| 11 |
|
| 12 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/mod_perl-2.0.7-bundled-Apache-Test.patch | 134 --------------------- |
| 15 |
1 file changed, 134 deletions(-) |
| 16 |
|
| 17 |
diff --git a/www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch b/www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 478495e..00000000 |
| 20 |
--- a/www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,134 +0,0 @@ |
| 23 |
-diff --git a/Makefile.PL b/Makefile.PL |
| 24 |
-index c4a0430..e85cf01 100644 |
| 25 |
---- a/Makefile.PL |
| 26 |
-+++ b/Makefile.PL |
| 27 |
-@@ -24,7 +24,7 @@ BEGIN { |
| 28 |
- |
| 29 |
- } |
| 30 |
- |
| 31 |
--use lib qw(lib Apache-Test/lib); |
| 32 |
-+use lib qw(lib); |
| 33 |
- |
| 34 |
- use Config; |
| 35 |
- use File::Spec::Functions; |
| 36 |
-@@ -117,16 +117,6 @@ sub get_DEFINE { |
| 37 |
- } |
| 38 |
- |
| 39 |
- sub configure { |
| 40 |
-- |
| 41 |
-- # mod_perl test suite relies on having Apache-Test bundled with |
| 42 |
-- # the mod_perl source, since any pre-installed version may not do |
| 43 |
-- # the right thing |
| 44 |
-- unless (-d "Apache-Test") { |
| 45 |
-- error "Can't find a sub-directory Apache-Test. " . |
| 46 |
-- "Make sure that you are using a complete source distribution"; |
| 47 |
-- exit 1; |
| 48 |
-- } |
| 49 |
-- |
| 50 |
- set_modperl_version(); |
| 51 |
- |
| 52 |
- if ($old_modperl_version) { |
| 53 |
-@@ -798,14 +788,9 @@ run_tests : test_clean |
| 54 |
- run_subtests :: |
| 55 |
- cd ModPerl-Registry && $(MAKE) test |
| 56 |
- |
| 57 |
--run_subtests :: |
| 58 |
-- cd Apache-Reload && $(MAKE) test |
| 59 |
-- |
| 60 |
- EOF |
| 61 |
- |
| 62 |
- $preamble .= <<'EOF' unless $build->mpm_is_threaded(); |
| 63 |
--run_subtests :: |
| 64 |
-- cd Apache-SizeLimit && $(MAKE) test |
| 65 |
- |
| 66 |
- EOF |
| 67 |
- |
| 68 |
-@@ -816,36 +801,6 @@ EOF |
| 69 |
- return $preamble; |
| 70 |
- } |
| 71 |
- |
| 72 |
--sub MY::postamble { |
| 73 |
-- my $self = shift; |
| 74 |
-- |
| 75 |
-- my $string = $self->ModPerl::BuildMM::MY::postamble; |
| 76 |
-- |
| 77 |
-- $string .= <<'EOF'; |
| 78 |
--mydist : Apache-Test/META.yml mod_perl.spec manifest tardist |
| 79 |
-- |
| 80 |
--rpm: dist |
| 81 |
-- @[ -d $(PWD)/rpm ] || mkdir $(PWD)/rpm |
| 82 |
-- rpmbuild -ta --define "_rpmdir $(PWD)/rpm" \ |
| 83 |
-- --define "_srcrpmdir $(PWD)/rpm" \ |
| 84 |
-- $(DISTVNAME).tar.gz |
| 85 |
-- @mv $(PWD)/rpm/*/*.rpm $(PWD)/rpm/ |
| 86 |
-- @rm -rf $(PWD)/rpm/*/ |
| 87 |
-- |
| 88 |
--mod_perl.spec: build/make_rpm_spec |
| 89 |
-- $(PERL) build/make_rpm_spec |
| 90 |
-- |
| 91 |
--Apache-Test/META.yml: |
| 92 |
-- cd Apache-Test && make metafile |
| 93 |
-- |
| 94 |
--tag : |
| 95 |
-- svn copy https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM) https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM) |
| 96 |
-- svn copy https://svn.apache.org/repos/asf/perl/modperl/docs/trunk https://svn.apache.org/repos/asf/perl/modperl/docs/tags/$(VERSION_SYM) |
| 97 |
--EOF |
| 98 |
-- |
| 99 |
-- return $string; |
| 100 |
--} |
| 101 |
-- |
| 102 |
- # this is a workaround so that ModPerl::MM will move MY::constants |
| 103 |
- # away, and Apache-Test/Makefile.PL which has its own MY::constants |
| 104 |
- # won't get complaints on MY::constants redefined |
| 105 |
-diff --git a/ModPerl-Registry/Makefile.PL b/ModPerl-Registry/Makefile.PL |
| 106 |
-index e72e65c..8610935 100644 |
| 107 |
---- a/ModPerl-Registry/Makefile.PL |
| 108 |
-+++ b/ModPerl-Registry/Makefile.PL |
| 109 |
-@@ -14,7 +14,7 @@ use Apache::TestMM qw(test clean); |
| 110 |
- |
| 111 |
- # prerequisites |
| 112 |
- my %require = ( |
| 113 |
-- "Apache::Test" => "", # any version will do? |
| 114 |
-+ "Apache::Test" => 0, # any version will do? |
| 115 |
- ); |
| 116 |
- |
| 117 |
- my @scripts = qw(t/TEST t/SMOKE); |
| 118 |
-diff --git a/lib/ModPerl/BuildMM.pm b/lib/ModPerl/BuildMM.pm |
| 119 |
-index 1c729e2..8651999 100644 |
| 120 |
---- a/lib/ModPerl/BuildMM.pm |
| 121 |
-+++ b/lib/ModPerl/BuildMM.pm |
| 122 |
-@@ -38,12 +38,10 @@ my @methods = grep *{$stash->{$_}}{CODE}, keys %$stash; |
| 123 |
- ModPerl::MM::override_eu_mm_mv_all_methods(@methods); |
| 124 |
- use strict 'refs'; |
| 125 |
- |
| 126 |
--my $apache_test_dir = catdir Cwd::getcwd(), "Apache-Test", "lib"; |
| 127 |
-- |
| 128 |
- #to override MakeMaker MOD_INSTALL macro |
| 129 |
- sub mod_install { |
| 130 |
- q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) \\}."\n" . |
| 131 |
-- qq{-I$apache_test_dir -MModPerl::BuildMM \\}."\n" . |
| 132 |
-+ qq{-MModPerl::BuildMM \\}."\n" . |
| 133 |
- q{-e "ExtUtils::Install::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n"; |
| 134 |
- } |
| 135 |
- |
| 136 |
-@@ -269,7 +267,7 @@ sub ModPerl::BuildMM::MY::postamble { |
| 137 |
- |
| 138 |
- push @target, |
| 139 |
- '$(FULLPERL) -I$(INST_LIB) ' . |
| 140 |
-- "-I$apache_test_dir -MModPerl::BuildMM " . |
| 141 |
-+ "-MModPerl::BuildMM " . |
| 142 |
- "-e ModPerl::BuildMM::glue_pod $pm $podpath $blib"; |
| 143 |
- |
| 144 |
- # Win32 doesn't normally install man pages |
| 145 |
-diff --git a/lib/ModPerl/Manifest.pm b/lib/ModPerl/Manifest.pm |
| 146 |
-index 1e856bc..9f1833c 100644 |
| 147 |
---- a/lib/ModPerl/Manifest.pm |
| 148 |
-+++ b/lib/ModPerl/Manifest.pm |
| 149 |
-@@ -33,7 +33,6 @@ our @EXPORT_OK = qw(mkmanifest); |
| 150 |
- my @add_files = qw{ |
| 151 |
- MANIFEST |
| 152 |
- mod_perl.spec |
| 153 |
-- Apache-Test/META.yml |
| 154 |
- }; |
| 155 |
- |
| 156 |
- sub get_svn_files { |
Archives