gentoo resync : 29.12.2022

4 files changed, 15 insertions, 12 deletions

diff --git a/www-apache/mod_perl/Manifest b/www-apache/mod_perl/Manifest
index 85adff652468..408c031cee7c 100644
--- a/www-apache/mod_perl/Manifest
+++ b/www-apache/mod_perl/Manifest
@@ -1,12 +1,12 @@
 AUX 2.0.3/75_mod_perl.2.2.conf 1221 BLAKE2B 6887e97fe210b9656e4a0b50ff3f536df1cc2125adbded32654917b3c3e6e3d65502d0f49aa9091ebeca7eef9d9ac326937636832e6ba7e00fa63d7105070a6e SHA512 caaf66604e385f24ddebf282c42b880362fa19f9195fca105171b3d3edfa5b995d7bda9899be60f78341e20e2fad75fbb097740ea43781a44a60a4a5b7f650b7
 AUX 2.0.3/75_mod_perl.conf 1295 BLAKE2B be75ef503b400660aa24f72d7c8aa0592a7e1cfe277b508ebd158c9c3d6d4adea676fd4b0934929f05ea4613f3a871ca28bd6435203a913501bc4fdfd99686b7 SHA512 f6842055bf41b457e77f25de4fccb4981456669e269a01faf606f5de31050fe41c2741c2591bc89a46914c876bfebb914e7d3a07108db8220ec0b8218781c22e
 AUX 2.0.3/apache2-mod_perl-startup.pl 478 BLAKE2B ec1bf3eb1119561396756706e501b904a2910f6ffec2db62aa08c10af0a79bc8dacc1455524818a46c54906096efd26f89f6114d932aeac30c036f9dd7ab6823 SHA512 3af399b3aa0bf5421ddef581b1042cbd71fa3fc9d27aa87feafb4754cc8e7bf9659eb70082f0c73f0022b31e8870ff68021af692e41b391dec6c5e7608589e29
-AUX mod_perl-2.0.1-sneak-tmpdir.patch 337 BLAKE2B 029f4be8c295b83031454dc53511293d7e034947ae9f591008235a8a16dc322df9c144c106d0392709aeaeb2080ba2534e4f34aa571c7e78bd726823b8f7d6da SHA512 8e41d94db8cdd181393be8b4922a9e9760576cb051f93d652cf3f324671a464bfc2741bf18661ac4509db257cb5975b408f33799aea76a2e46ad15af08a68792
+AUX mod_perl-2.0.1-sneak-tmpdir.patch 264 BLAKE2B 2ed1802516d3ce68f43154e63c9a222e10e53bf4c90e87ea6a4c9c5a7df902d4ed9c9df3b39070e0c618281b245c47b81fecd40a37c2d2397feb03bf4d6645c9 SHA512 523aa45c616473062841b0bbf11c43a4dcb0729a9a5e380a1da1857409169fc2a6036ece1a33e52762eed6853cb068264802701d7b89be2d247948a65ef4fc0c
 AUX mod_perl-2.0.10_rc1-Gentoo-not-Unix.patch 1517 BLAKE2B 4546fd0ae82a99c335140c223b830321dd340393700e74d18130063b952d8249e0b1610b86ba93782d5798dcb66689cc2d30247a5f3e3866c34387dba4b0f6dc SHA512 4ac22d4e8942d2fb4d07f10897c7670acd77d28a7b47049e95dffe026d335c26681a0fa4a43c67b53fafa8c5bdba7991bad150e3bc00a8e3c40a7d7e59938c63
 AUX mod_perl-2.0.10_rc1-bundled-Apache-Test.patch 2777 BLAKE2B b59cb23545dfa26af1181b5c4fa7f2d2ca5e049d6ec4056f6cac68389cc9fe6cb7ab010b8aa6c210aeaab1e98afb65ab3051a341856823debbb2fded47c63320 SHA512 ebb583607d4a8587d340384bb5c8deb50a3001beaaf9a536f4731baa3664a6d2667de309d1549175bf721643ad3f107988de4d2c9e213429888044dd726447ee
-AUX mod_perl-2.0.11-perl534.patch 711 BLAKE2B f036118d4b7d6b34969453cbf0b15b832a1973ae541275fdf70327918b5f52e724c63a3e99fc1baa2d088a086adb44bf0b5d0b4cb8d396a697a0f3f0752403a6 SHA512 a3c649b8a96f5d4a1989eb8aa1d32ab5da5dfeebd3d26975f9f95517bb80a1181d6e09c08ae4f577edbb3e05557a5206653205183a9d3167cc4c768467519dd9
+AUX mod_perl-2.0.11-perl534.patch 621 BLAKE2B 44def80ff70bd7a2416df46c8dd84429d4452fea6ac72b5f51a7e5935db38bb90cdef41904ce6828bc1942f1be602f1d63c1922acf5f29e867797f9047e51c1b SHA512 1cc1b79ddd258d37463e80f52bbf2a9414cc57b5b38e491085f2600e5ddd15d5941450d5990d7a50964c26e9e35890b724f48353f5e54dead7427a6899952f29
 AUX mod_perl-2.0.11-ranlib.patch 341 BLAKE2B 72cd8bab80a2c435c54311c41f1433f462647a8bf2fe68dd41ea7ce73571b45a57627ca575d75af48f22559ea132d0e22af24bb204df8e317366f665fddf4157 SHA512 7fbdc274780033b704758d3e303d05c1d05e059f79eea72797201027610f9f7218ba13b398c0d885dda86b1f88a192b3dff06059b93c89a6c4de4a5089b64bc5
 AUX mod_perl-2.0.4-inline.patch 678 BLAKE2B 67da89c49904537df88e09fb4a171c03096993439d56d6fdd9e12b83d4cbca2cc1a734357ae6ee93ca20fd9906e1a0e74743d6d826f80763fda9387b42151597 SHA512 5669230db6e70b31b087851fd792004c4a292975e507f248b8dc7ce195559ab9b0579db8bea84d823f7d53e351990ecda057d7fe63273d486b5f12204d7160a5
 DIST mod_perl-2.0.11.tar.gz 3848147 BLAKE2B 8eeef6d1fadbf9d2e3bcff33c5114e588f032c2497f5191b1edd30da8bce72eadf5ea62482ec8ece7d7fde308c8c41d6682d1a325760c627bee75c3ce8cf6272 SHA512 f232b215ccb9217f69ccced8a037470e5975900b9a6fcc5a2e4674e6559d21f026547c1b97c48109352043946dc22539dd38004759be16ad5cfcb3a96973dfdf
-EBUILD mod_perl-2.0.11.ebuild 3861 BLAKE2B 59d26881b9bd7efde6667d2002e3349732fdb19cfb39b81749ed694a0e598995dc30c60bac0669d09d601f024495da257e421ada2f6e947de101869a5ea66449 SHA512 c6d408b9f4283744ea3f2f0ebe86df5d2cc53325b94548334be9e4ce11f048d824fe845c6cec5c88a28b90ee579824ea10f23638fd3debc0b89f38eb25907904
+EBUILD mod_perl-2.0.11-r1.ebuild 3897 BLAKE2B 466a090bf3397f3dc7aa3eb77a1b5b0a947f31c1253d08cfaaf921ece7b8b81b6906937299aad8c325d31aec65470d528452d19bc129583ae769a82c83f5a147 SHA512 a8ddcec6ef14777d26e9bf5ae4ccb7f960916e7fc7e08b4901720047220a00716cbe199c2588c0563c4be85259717215fa196003a06fd049d3f6338360bd41a6
 MISC metadata.xml 377 BLAKE2B aa13bbb99008022c839bafd6c4efcf8535d67d7ef572a54c1e48c061484bb6ee2925095b3cb5f54a68c63f4c4ec0ffd6f017a2b2eb579abcb2df985921f2d151 SHA512 165fc6b30620139d17ee48826521373e4a58110ea89e996bad83ea72e96c364d896398a61af0664573e35d29be5deb336c98baaefcb3022bd04882fba0272b33
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
index 0930278aeba3..40c88c83eb87 100644
--- 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
@@ -1,5 +1,5 @@
---- t/conf/modperl_extra.pl.orig	2005-05-16 18:27:45.000000000 +1000
-+++ t/conf/modperl_extra.pl	2005-05-16 18:34:46.000000000 +1000
+--- a/t/conf/modperl_extra.pl
++++ b/t/conf/modperl_extra.pl
 @@ -136,6 +136,8 @@
  sub test_modperl_env {
      # see t/response/TestModperl/env.pm
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
index c6c5bed4ed0c..77db5f65263d 100644
--- 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
@@ -4,8 +4,8 @@ Fix build for perl >= 5.33.7
 Patch by Leon Timmermans <fawaka@gmail.com> from https://github.com/Perl/perl5/issues/18617
 
 
---- perl/modperl/trunk/src/modules/perl/modperl_perl.c	2021/04/20 13:48:02	1889013
-+++ perl/modperl/trunk/src/modules/perl/modperl_perl.c	2021/04/20 13:55:29	1889014
+--- a/src/modules/perl/modperl_perl.c
++++ b/src/modules/perl/modperl_perl.c
 @@ -268,7 +268,7 @@
  #ifdef MP_NEED_HASH_SEED_FIXUP
      if (MP_init_hash_seed_set) {
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
index 77fb5135e3a3..3b0cc28a4471 100644
--- a/www-apache/mod_perl/mod_perl-2.0.11.ebuild
+++ b/www-apache/mod_perl/mod_perl-2.0.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit depend.apache apache-module perl-module eutils
+inherit depend.apache apache-module perl-module
 
 DESCRIPTION="An embedded Perl interpreter for Apache2"
 HOMEPAGE="https://perl.apache.org/ https://projects.apache.org/project.html?perl-mod_perl"
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="debug ithreads test"
 RESTRICT="!test? ( test )"
 
-SRC_TEST=do
+DIST_TEST=do
 
 # Apache::Reload, Apache::SizeLimit, and Apache::Test are force-unbundled.
 # The minimum versions requested here are the bundled versions.
@@ -73,6 +73,8 @@ src_prepare() {
 }
 
 src_configure() {
+	_init_apache2_late
+
 	local debug=$(usex debug 1 0)
 	local nothreads=$(usex ithreads 0 1)
 	myconf=(
@@ -108,7 +110,8 @@ src_install() {
 	default
 
 	perl_delete_localpod
-	perl_delete_packlist
+	perl_fix_packlist
+	perl_delete_emptybsdir
 
 	insinto "${APACHE_MODULES_CONFDIR}"
 	doins "${FILESDIR}"/2.0.3/apache2-mod_perl-startup.pl