summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergiy Borodych <Sergiy.Borodych@gmail.com>2016-10-04 17:54:11 +0300
committerPatrice Clement <monsieurp@gentoo.org>2016-10-08 14:45:31 +0200
commite5d15d1bb7ddafd2a9a29fed4a4def3e62356054 (patch)
tree77b7337f0e50ab94d13f5a6648ac11786524779c /www-apache/mod_perl
parentsys-kernel/rt-sources: version bump to {3.18.42_p44,4.1.33_p37,4.4.21_p30,4.6... (diff)
downloadgentoo-e5d15d1bb7ddafd2a9a29fed4a4def3e62356054.tar.gz
gentoo-e5d15d1bb7ddafd2a9a29fed4a4def3e62356054.tar.bz2
gentoo-e5d15d1bb7ddafd2a9a29fed4a4def3e62356054.zip
www-apache/mod_perl: remove old orphan file.
Closes: https://github.com/gentoo/gentoo/pull/2473 Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'www-apache/mod_perl')
-rw-r--r--www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch134
1 files changed, 0 insertions, 134 deletions
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
deleted file mode 100644
index 478495e5d76..00000000000
--- a/www-apache/mod_perl/files/mod_perl-2.0.7-bundled-Apache-Test.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff --git a/Makefile.PL b/Makefile.PL
-index c4a0430..e85cf01 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -24,7 +24,7 @@ BEGIN {
-
- }
-
--use lib qw(lib Apache-Test/lib);
-+use lib qw(lib);
-
- use Config;
- use File::Spec::Functions;
-@@ -117,16 +117,6 @@ sub get_DEFINE {
- }
-
- sub configure {
--
-- # mod_perl test suite relies on having Apache-Test bundled with
-- # the mod_perl source, since any pre-installed version may not do
-- # the right thing
-- unless (-d "Apache-Test") {
-- error "Can't find a sub-directory Apache-Test. " .
-- "Make sure that you are using a complete source distribution";
-- exit 1;
-- }
--
- set_modperl_version();
-
- if ($old_modperl_version) {
-@@ -798,14 +788,9 @@ run_tests : test_clean
- run_subtests ::
- cd ModPerl-Registry && $(MAKE) test
-
--run_subtests ::
-- cd Apache-Reload && $(MAKE) test
--
- EOF
-
- $preamble .= <<'EOF' unless $build->mpm_is_threaded();
--run_subtests ::
-- cd Apache-SizeLimit && $(MAKE) test
-
- EOF
-
-@@ -816,36 +801,6 @@ EOF
- return $preamble;
- }
-
--sub MY::postamble {
-- my $self = shift;
--
-- my $string = $self->ModPerl::BuildMM::MY::postamble;
--
-- $string .= <<'EOF';
--mydist : Apache-Test/META.yml mod_perl.spec manifest tardist
--
--rpm: dist
-- @[ -d $(PWD)/rpm ] || mkdir $(PWD)/rpm
-- rpmbuild -ta --define "_rpmdir $(PWD)/rpm" \
-- --define "_srcrpmdir $(PWD)/rpm" \
-- $(DISTVNAME).tar.gz
-- @mv $(PWD)/rpm/*/*.rpm $(PWD)/rpm/
-- @rm -rf $(PWD)/rpm/*/
--
--mod_perl.spec: build/make_rpm_spec
-- $(PERL) build/make_rpm_spec
--
--Apache-Test/META.yml:
-- cd Apache-Test && make metafile
--
--tag :
-- 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)
-- svn copy https://svn.apache.org/repos/asf/perl/modperl/docs/trunk https://svn.apache.org/repos/asf/perl/modperl/docs/tags/$(VERSION_SYM)
--EOF
--
-- return $string;
--}
--
- # this is a workaround so that ModPerl::MM will move MY::constants
- # away, and Apache-Test/Makefile.PL which has its own MY::constants
- # won't get complaints on MY::constants redefined
-diff --git a/ModPerl-Registry/Makefile.PL b/ModPerl-Registry/Makefile.PL
-index e72e65c..8610935 100644
---- a/ModPerl-Registry/Makefile.PL
-+++ b/ModPerl-Registry/Makefile.PL
-@@ -14,7 +14,7 @@ use Apache::TestMM qw(test clean);
-
- # prerequisites
- my %require = (
-- "Apache::Test" => "", # any version will do?
-+ "Apache::Test" => 0, # any version will do?
- );
-
- my @scripts = qw(t/TEST t/SMOKE);
-diff --git a/lib/ModPerl/BuildMM.pm b/lib/ModPerl/BuildMM.pm
-index 1c729e2..8651999 100644
---- a/lib/ModPerl/BuildMM.pm
-+++ b/lib/ModPerl/BuildMM.pm
-@@ -38,12 +38,10 @@ my @methods = grep *{$stash->{$_}}{CODE}, keys %$stash;
- ModPerl::MM::override_eu_mm_mv_all_methods(@methods);
- use strict 'refs';
-
--my $apache_test_dir = catdir Cwd::getcwd(), "Apache-Test", "lib";
--
- #to override MakeMaker MOD_INSTALL macro
- sub mod_install {
- q{$(PERL) -I$(INST_LIB) -I$(PERL_LIB) \\}."\n" .
-- qq{-I$apache_test_dir -MModPerl::BuildMM \\}."\n" .
-+ qq{-MModPerl::BuildMM \\}."\n" .
- q{-e "ExtUtils::Install::install({@ARGV},'$(VERBINST)',0,'$(UNINST)');"}."\n";
- }
-
-@@ -269,7 +267,7 @@ sub ModPerl::BuildMM::MY::postamble {
-
- push @target,
- '$(FULLPERL) -I$(INST_LIB) ' .
-- "-I$apache_test_dir -MModPerl::BuildMM " .
-+ "-MModPerl::BuildMM " .
- "-e ModPerl::BuildMM::glue_pod $pm $podpath $blib";
-
- # Win32 doesn't normally install man pages
-diff --git a/lib/ModPerl/Manifest.pm b/lib/ModPerl/Manifest.pm
-index 1e856bc..9f1833c 100644
---- a/lib/ModPerl/Manifest.pm
-+++ b/lib/ModPerl/Manifest.pm
-@@ -33,7 +33,6 @@ our @EXPORT_OK = qw(mkmanifest);
- my @add_files = qw{
- MANIFEST
- mod_perl.spec
-- Apache-Test/META.yml
- };
-
- sub get_svn_files {