gentoo resync : 17.10.2017

2 files changed, 30 insertions, 5 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 2c4a9339e935..652bbb3377fe 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
@@ -12,7 +12,7 @@ DESCRIPTION="Test.pm wrapper with helpers for testing Apache"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+IUSE="test"
 
 DEPEND="virtual/perl-ExtUtils-MakeMaker"
 
@@ -39,7 +39,27 @@ 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"
@@ -53,14 +73,12 @@ src_test() {
 		"Apache::TestConfigParrot"
 		"Apache::TestConfigParse"
 		"Apache::TestConfigPerl"
-		"Apache::TestHandler"
 		"Apache::TestHarness"
 		"Apache::TestHarnessPHP"
 		"Apache::TestMB"
 		"Apache::TestMM"
 		"Apache::TestPerlDB"
 		"Apache::TestReport"
-		"Apache::TestReportPerl"
 		"Apache::TestRequest"
 		"Apache::TestRun"
 		"Apache::TestRunPHP 1.00"
@@ -69,12 +87,16 @@ src_test() {
 		"Apache::TestSSLCA"
 		"Apache::TestServer"
 		"Apache::TestSmoke"
-		"Apache::TestSmokePerl"
 		"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}"
@@ -92,3 +114,6 @@ src_test() {
 	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 253705a97723..3c2e7716dd42 100644
--- a/dev-perl/Apache-Test/Manifest
+++ b/dev-perl/Apache-Test/Manifest
@@ -7,7 +7,7 @@ DIST Apache-Test-1.40.tar.gz 151801 SHA256 3cf537f1c81deb549d62be7fd5ee1af439283
 EBUILD Apache-Test-1.380.0-r1.ebuild 702 SHA256 2e6c510e19a290d48b4641b53b8f4e8c5d1dc344a9317442c6b0012807f2df92 SHA512 7ea1d14c691f16ae5797d0d553bddd5c45b24b74e5bd13f98f126c4cce2654989a039b3dcac18153cc68d33e44bb5a1948b38253a20b991b6ac661e70a659a37 WHIRLPOOL d20402a42075f9cb9352251aedae5c4347593cfff8a12af34d27295836fbd3674a90a7ba2ad6057406ea37e7e3140f934fa98c658dec9e75937f64374e5049e5
 EBUILD Apache-Test-1.390.0.ebuild 754 SHA256 ba6dc1311776e0361e76ef26dc6f44efc3c570a2c49e7373a50948424cbbebb5 SHA512 4d4642738553febf2b2f70f2f3d73ddd86bef2c4d3be15b919d8d84bad1d78d74f68b057ccbd51950445172808a6df015088a4563c91659a3f5a5a11f2411e45 WHIRLPOOL a0e791a1a2616daaf23d0c23b89be22d64037a69cee0696ae3cb05ddc669ef7be26d7a109e172fb6b1519d7bf3145407ae7110b64034ff2cfe61a26876029567
 EBUILD Apache-Test-1.400.0-r1.ebuild 751 SHA256 81c71a1bdc1443a3959f0919ace59246859d2d8c0f1ce97300ea535de87b58ea SHA512 98c6815e5ece4196621fcb12e4695f861c84e66adeb7860ad33b46e8653b266e96336628c0d7374d61f5b25e65d37c76073efc39d9ed9ad879f7a2bcf5db9b97 WHIRLPOOL 5794762a92d1b90b030778d360cb4b58bc50b9d112f8ff46c618342d239cde97499398745d1d54f0f23fd3b6e6b47b3e37273f0810524ca6c1127f66c66e9110
-EBUILD Apache-Test-1.400.0-r2.ebuild 2171 SHA256 ee3da8bfcbc0e1482cf3b87ac6ff043da8e81074f7cd97037942111aed40dc1f SHA512 e01b457e22c554c34ffe6b0a19babb4ff416f975d717de75886ddfbb39484988b8cc9323d285720c5682e6f8e962f693ba01775cdd30a36dccf31a8965e48b6d WHIRLPOOL 9a32f016f4b8374590623f81d62137fdafb01712148e078a9609b0b2a7edfe0733830b11bbe9f16996f0d9549fe953940b1b9ff9303bc73db3aa924add205083
+EBUILD Apache-Test-1.400.0-r2.ebuild 2917 SHA256 a51980c803c19d25d2519680d1fe8a00d7249ef3278440fd59cec7d3eb7c04ea SHA512 6cada99fa594f4665756ab75f271174e6bf68b7b1b4bdeb4e750218f56b94c90098c67669c2547b418c953aba9c17af2305812432f2ab0103e56e41ffff3c666 WHIRLPOOL 9a97e7ec57cf2b69f51357e2719186fe275b04cb2c35fce032e575e742ea91759f7a2cb0087658faf9dcdbd0df39be0f3670e8a53901c7e19d679e826b08b976
 MISC ChangeLog 3724 SHA256 93681aecac27872037067fa6e89e3d3079d5c69e6a86a80a6cbbadb3e316edb8 SHA512 ef5dec103c105545f3dd267b2ed3799bf4ca8dd9c0528240271a6c466528f5c2b912ee854397344ad78087299ebed36dd444449725f9268df92fa82609e11171 WHIRLPOOL 580471a29ee6256cca56fa7ef8de3bff07a1401df36d8e3c46cd047d06fadfd52fdb3b2a018eb1d1145170132b5728a219ca5e67d88201e18ef2d00a5613ea55
 MISC ChangeLog-2015 13033 SHA256 9e29143ecc9a3c382de7e7c14ccab43daa69d5c25f331f01daad9dbe0b076048 SHA512 96f87bd59376d6a9eb3ff965380022f42b37f7b3fbc0b74769a9009eede209474bff0626435dbe4bf571ec188443c804097db6208a42c88f7c6a0b9f40f75037 WHIRLPOOL c6d9ef3eba8f6740441086cba198343af270a5a6cb3599c3571010a02e315dbbff69c41edc0920954d82660b19c937c371ee98bb136053cae803c2cac2872b7e
 MISC metadata.xml 2858 SHA256 87acbbe6a536ae097daa2bacd25a492762329e5fd445fb4fa348ee9b9828df58 SHA512 1db84f146dd887e3719328aba99809ac3ba8462226b9109310675b1722b2874cddd54b82900852082160bd47bf157611ba9f324d1f2964ee6912d4bff3690517 WHIRLPOOL e7872451d1ad490a62c71a4cfcc1be445f36d27cf257ba702717d54900e6289676b00fc9aa75d36bf2d96602016b2c0c269bf5b818cf4bb75a2b96feb1394d70