gentoo Easter resync : 12.04.2020

3 files changed, 123 insertions, 2 deletions

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
index 13653c062975..f498b7ec2911 100644
--- a/dev-perl/Apache-Test/Apache-Test-1.400.0-r2.ebuild
+++ b/dev-perl/Apache-Test/Apache-Test-1.400.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Test.pm wrapper with helpers for testing Apache"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/Apache-Test/Apache-Test-1.420.0.ebuild b/dev-perl/Apache-Test/Apache-Test-1.420.0.ebuild
new file mode 100644
index 000000000000..14d91f4adb16
--- /dev/null
+++ b/dev-perl/Apache-Test/Apache-Test-1.420.0.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=SHAY
+DIST_VERSION=1.42
+inherit depend.apache perl-module
+
+DESCRIPTION="Test.pm wrapper with helpers for testing Apache"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
+
+need_apache
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.400.0-catfile-import.patch"
+	"${FILESDIR}/${PN}-1.400.0-phpclient.patch"
+)
+
+pkg_setup() {
+	perl_set_version
+}
+
+src_install() {
+	# This is to avoid conflicts with a deprecated Apache::Test stepping
+	# in and causing problems/install errors
+	if [ -f  "${S}"/.mypacklist ];
+	then
+		rm -f "${S}"/.mypacklist
+	fi
+	perl-module_src_install
+}
+# Parallel tests seem to be bad.
+DIST_TEST="do"
+
+optdep_notice() {
+	local i
+	elog "This package has several modules which may require additional dependencies"
+	elog "to use. However, it is up to you to install them separately if you need this"
+	elog "optional functionality:"
+	elog
+	i="$(if has_version 'www-apache/mod_perl'; then echo '[I]'; else echo '[ ]'; fi)"
+	elog " $i www-apache/mod_perl"
+	elog "     - Running Perl code natively in Apache via"
+	elog "       Apache::TestHandler, Apache::TestReportPerl, or Apache::TestSmokePerl"
+
+	if use test; then
+		elog
+		elog "This module will perform additional tests if these dependencies are"
+		elog "pre-installed"
+	fi
+}
+src_test() {
+	optdep_notice
+	echo
+	local MODULES=(
+		"Apache::Test ${DIST_VERSION}"
+		"Apache::Test5005compat 0.01"
+		"Apache::TestBuild"
+		"Apache::TestClient"
+		"Apache::TestCommon"
+		"Apache::TestCommonPost"
+		"Apache::TestConfig"
+		"Apache::TestConfigC"
+		"Apache::TestConfigPHP"
+		"Apache::TestConfigParrot"
+		"Apache::TestConfigParse"
+		"Apache::TestConfigPerl"
+		"Apache::TestHarness"
+		"Apache::TestHarnessPHP"
+		"Apache::TestMB"
+		"Apache::TestMM"
+		"Apache::TestPerlDB"
+		"Apache::TestReport"
+		"Apache::TestRequest"
+		"Apache::TestRun"
+		"Apache::TestRunPHP 1.00"
+		"Apache::TestRunParrot 1.00"
+		"Apache::TestRunPerl 1.00"
+		"Apache::TestSSLCA"
+		"Apache::TestServer"
+		"Apache::TestSmoke"
+		"Apache::TestSort"
+		"Apache::TestTrace 0.01"
+		"Apache::TestUtil 0.02"
+		"Bundle::ApacheTest ${DISTVERSION}"
+	)
+	has_version "www-apache/mod_perl" && MODULES+=(
+		"Apache::TestHandler"
+		"Apache::TestReportPerl"
+		"Apache::TestSmokePerl"
+	)
+	local failed=()
+	for dep in "${MODULES[@]}"; do
+		ebegin "Compile testing ${dep}"
+			perl -Mblib="${S}" -M"${dep} ()" -e1
+		eend $? || failed+=( "$dep" )
+	done
+	if [[ ${failed[@]} ]]; then
+		echo
+		eerror "One or more modules failed compile:";
+		for dep in "${failed[@]}"; do
+			eerror "  ${dep}"
+		done
+		die "Failing due to module compilation errors";
+	fi
+	perl_rm_files t/more/02testmore.t t/more/04testmore.t
+	perl-module_src_test
+}
+pkg_postinst() {
+	use test || optdep_notice
+}
diff --git a/dev-perl/Apache-Test/Manifest b/dev-perl/Apache-Test/Manifest
index c89f31269cdb..02cd68b092b6 100644
--- a/dev-perl/Apache-Test/Manifest
+++ b/dev-perl/Apache-Test/Manifest
@@ -2,5 +2,7 @@ AUX Apache-Test-1.400.0-catfile-import.patch 813 BLAKE2B eda9f0dcfae5025d94f3c12
 AUX Apache-Test-1.400.0-fix-missing-semicolon.patch 761 BLAKE2B 9dada5195ba8312078fa8d83cd808ea770e573b963c4b43f577efa61e3bf52f8961ed5e2ddc7772c267c639d8b74324c6a145cd21606f59344516973adc8c06b SHA512 eb5a66ce55fb4186cf6b5145872cbddc166882568da0cb397315d69b0ff3c986dd59daf8f6ba8cad831fe4b471efa64ec81515e59f6bb28f9d5bfcb26b80999e
 AUX Apache-Test-1.400.0-phpclient.patch 909 BLAKE2B f109642536a1253245e55332e084b9c82fe4b72368cc34b4097889cd31358de4b29374d1c930de543ca5515f49ec69f950472923425064b30e677b1a3ff04b9b SHA512 45eb984222177a2d63402378db9641d1abebcd7c1a1207687330e71c6f0717278bd3a15e35c988c4846f19ae0eaf1c88cdaf0b74a9f78a35f6826b396420a101
 DIST Apache-Test-1.40.tar.gz 151801 BLAKE2B 0ec57b0a8a0fafc8d10409a3cd02308da67bd6766caa71bfb525ef49832545c811281a987a5237be236a3a581fcf8311785d0bff8d283db2c52f08d11cd2bda1 SHA512 f48a1b93c4d61181670ec59bb8bb2231122b22ec9725d8899a3b2f82d2918fdc48a09494c2f45b0e6a603546481892a948eac3494e06c8eb219a9213e1faadb8
-EBUILD Apache-Test-1.400.0-r2.ebuild 2929 BLAKE2B 7769b62ba36383b23c23432b7b7e52becad206c8aefd0420e7119482291e5001d4f72edefdc35d923c8b482d86327c3268e490c378e0a2b12bc6de73ebea57ee SHA512 4547a32c5e7aa1b8d94f1a51c5857c5eee4f13a90ebc60fa005f3c7b1ad9254776bb66c422260035d199a4a2fdacdabce6262e74753f600c0df3f4e9a0235d7a
+DIST Apache-Test-1.42.tar.gz 153621 BLAKE2B 570c61e4b5f17c97376ba9f4ab3cde0b14df367f06b665e31dba9c6675972ad4d1bebe46b08416b0f4749d723a6b909430c9bdd1e5d3b1c6b21d209635f1236a SHA512 ecd78dde1b0db562d591990bcd50fe880d724dce9bfb20dceea3a51b81abd89d40889857e5e7714b586a093ad6f101dfd79c6aa33d63c906c41c532305b6584c
+EBUILD Apache-Test-1.400.0-r2.ebuild 2930 BLAKE2B b67aac387e993f3aa552a337eda65b57efe3967f37d3a3ac491dfabceae6302c6a1ffcd5377900d8c676d182ce3860240bc0714af01128d87e14bfccb9ce0058 SHA512 2e3317a4c64b7e0b97269c77ec17affe4d26b890702f80cfb32119e8f991a5398376a0b542f684c5cec24ff1b8aac46372180f06f4db6911ae263b28de9039a9
+EBUILD Apache-Test-1.420.0.ebuild 2905 BLAKE2B 844bd25034f3be08848b82c8e3709893a3a1413a051cef316f3b70823e9aacd24d32a9f1ccf8c7e3d429ea17229c2b6aa2fea9c2d39fa38d4a64669facf66d09 SHA512 9b716c3dcac8ac4db7728cc89c42e4940144fe185da04acb03b9dc28ad2f2676af79a28a933712a373bcd4403686cda44d653d3efde6bf6ce65d3172c211196b
 MISC metadata.xml 2858 BLAKE2B 11f5085f6e904752d042347bdb966364c063c33d1e3b1cfb0f9c47db6e5020f3cd113c24d118cdc75bd0d3c70f82ec1e906b148d9119fce815ed6e0703efeba6 SHA512 1db84f146dd887e3719328aba99809ac3ba8462226b9109310675b1722b2874cddd54b82900852082160bd47bf157611ba9f324d1f2964ee6912d4bff3690517