gentoo resync : 15.06.2021

8 files changed, 10 insertions, 11 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index badf2644be78..75991a96917e 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index fc08acfd5b8e..0d017c4d3a3f 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -2,5 +2,5 @@ AUX 79_mod_security.conf 729 BLAKE2B 5a415b7890a6d9553ec6e974825adad596a8f6d5c3b
 AUX mod_security-2.9.3-autoconf_lua_package_name.patch 350 BLAKE2B 272cb5f4c2fc666423b762d3ceca73f305ba7b280e4ac3e65f45111cea18b4b1edc923c56225f4a422cdeb54b381a40f5152a338d767b037bf1c7806de1bc4a5 SHA512 0abeba7b02cd0aef25f61a811b258bee6025c43ec9c2ebe98542e2e5dab2cb2060055058d4c2f2b235f7b2773ced53ab2173be6c9de3cb46c16d5bdbd7af13c8
 AUX modsecurity-2.7.conf 394 BLAKE2B c9d55e8b4419e5b54a364e03dd02e9d0e5609954d1538c77baa33e0abc46110fa8aaf3207490a80a2fedc13d42558632703ee4552ebbaa99d67d929720008dd2 SHA512 ab8c1ee6372249613f853654f115102c7951ea021f47389510bca6c5d1226e7aa9d90bb47649cf4ca62b8d8f926eba9f5c0b02321851ec2e8452de70dd4c1839
 DIST modsecurity-2.9.3.tar.gz 4307670 BLAKE2B 337ea15cc8805af7ab43aed8aecf4c72ccc586d0d7e9d9b91f036a61baa70d1ac8b4ad8045a2bb7a13515912a15fba7d3cdb9670ae6730de43b1e44ee90ded6d SHA512 4e1ea5dd8edadf8f630e4fe92a200d3a8e78963fce3128b5975a1e1ecd0e8bf9ceecd9905c95f8c508932ccd837f1d8ae8bb2ba423307718c3c6a4ae9b783ddd
-EBUILD mod_security-2.9.3-r100.ebuild 2849 BLAKE2B 25a047e91c5bcd5af99a98d3f375f04408a82b5148f515749ecac12451f05e660145787da6fc68a23c4943832fa9d7981b7308160d21232dc34e960ea6908765 SHA512 e0217d04636dd5084fd8f8b5c2bca710fd17d3d26ccba60bcf49523b10581e48046198e2cc5526882a644a5f270ca90315a4afb42088a7eaa035f522d5277a7b
+EBUILD mod_security-2.9.3-r100.ebuild 2860 BLAKE2B 3c51f2d5c9b947ca8943dc35fbbfb3683c52486d47f308637bdd05d98d0466c5522e58c4e35f654352f4cc75c4faca83be76c99130d17dbc73cd006642b0b4c9 SHA512 8856e0e1bf6ebbc1a0d415056bd42974ba6e167b2154d8a6769d413481439948d2c40f0bd3485a5cbdcfaed3c9d73c65cf35d03bcebe23553b06339709af4b81
 MISC metadata.xml 1009 BLAKE2B a3a9f32a3cebe4447b0ec621c62292f77bb988a3860f6eae63974b794a028f763a5603f35673d9cb82d3836ed24168c12e24ede6109db65dc9521617b293cec9 SHA512 98f9e6ded7565d6d0dbb50804de7fbf9079bc7f8ed2cfe1fe640d09a23fb88e9ef3242557b2418e3c12af747b7b647b29cc950702bbef57050d56d5e5012852d
diff --git a/www-apache/mod_security/mod_security-2.9.3-r100.ebuild b/www-apache/mod_security/mod_security-2.9.3-r100.ebuild
index b367e95e44be..ad8579ac88e7 100644
--- a/www-apache/mod_security/mod_security-2.9.3-r100.ebuild
+++ b/www-apache/mod_security/mod_security-2.9.3-r100.ebuild
@@ -55,7 +55,7 @@ need_apache2
 pkg_setup() {
 	_init_apache2
 	_init_apache2_late
-	lua-single_pkg_setup
+	use lua && lua-single_pkg_setup
 }
 
 src_prepare() {
diff --git a/www-apache/mod_wsgi/Manifest b/www-apache/mod_wsgi/Manifest
index 2357c7eca4a4..659bbbb574b5 100644
--- a/www-apache/mod_wsgi/Manifest
+++ b/www-apache/mod_wsgi/Manifest
@@ -1,5 +1,5 @@
 AUX 70_mod_wsgi.conf 100 BLAKE2B e0df283f4b825628cceb7538231afbba10d3dc1eaab64da22d336c1426c4f8f0379e1958b3599811b2efc3cdb16f9543ad3f72d6139da9be01897bf200c06100 SHA512 6e0310d3f5dd8da4653c8502ad297ffe73c04e04c5fdd87721c407e839ba81ba4060394bcd1f06ef26d2d98cf007b585a382eb5f566345817999cd237adfa833
 DIST mod_wsgi-4.7.1.tar.gz 696111 BLAKE2B 69fea421077f1ecbf1cef5c9eac4ba296fa676e0bfbb860ca8a7cb701701f405edb3760486b87e8d9dd93efcb4c23385197d770ca32e16a473d5d252d292fb76 SHA512 cbb5ec53d55e47a83f2b0630527c6a52b48ef21d5d2c18adcb875fc455795b39b3c93f4a86dfbf9738c0bd554d86cc4912cc9ff83c428af302ab94a61f66b5b4
-EBUILD mod_wsgi-4.7.1-r1.ebuild 1235 BLAKE2B 725ac7c62fd6f7722203940527b0d130087ef03e4f02b201d028993070046dc634526c237693f20b2b974f54b5ca137611c29160310a3c33bf81baf0fee631ee SHA512 192d2492c1f2e0f3d79a5586442e6a60e5f80dfb55f6a41b1dcc6fcebb7e8f00df76ca15a4f26bb04c3bbf40a0ac80376131b4940e88ac4a5b5c3773922a3798
+EBUILD mod_wsgi-4.7.1-r1.ebuild 1232 BLAKE2B 1d91d0f6bb3cbade51242299c240547f7fec679eb47673f93ad4e60102df7ad8e7f5fb54e847b98a11e34e1a5460788f87112548c8de403f0afe654386c2c04f SHA512 d2c54f581d2e55d70ee524163abfc19be07eaf28dc67d90f70621ef299da320db4335ce2e19acf948090b979b95cd642a1cc83dbd21111f038e69e50dc6d1bda
 EBUILD mod_wsgi-4.7.1.ebuild 1228 BLAKE2B dc5ab6545e2acfe51ee4f77dd6335f3b7ed56170f64a6fc043f57faa7b0d7d00a04d227611565da142e0a2e9bc4bfa5b315c0f54c1c9e519e0fa552030c2f98a SHA512 aaf4516e8304d1312b1ce3977281c86f866baaf9d7b1de3da3dd5b471f59e547b0b002aa966cb72dfbefd22efa26124e15ec4a377b64aa5a2f49196aeb58e1c3
 MISC metadata.xml 380 BLAKE2B 1b06e8ab30ece204c3b5926675346cca70352c9a0ffd7fef754fc25473b9e4040111da0005e24da304add76f1a56ccd0ab9247ae10faca316dca982052c6853a SHA512 b62536a8a79d3d5198b6cbd7eb51be455a8c7de53add3810120edc1beee7d0684e09e43de355c5da7a61486c8764c4619c809d9fadde9e9502cb5c0b364d7b68
diff --git a/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild b/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild
index 0bf447b96d6d..e5ae886e528e 100644
--- a/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild
+++ b/www-apache/mod_wsgi/mod_wsgi-4.7.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/GrahamDumpleton/${PN}/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 1428ee64afc3..21b844d8b662 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -2,9 +2,9 @@ AUX 30_mod_passenger-5.0.0.conf 2737 BLAKE2B 781ffa4831313356b6caa493fc94a784f6b
 AUX passenger-5.1.1-isnan.patch 1155 BLAKE2B bb11276f94f4be93a7ef089e09079d36971ca028df4f8962e4220880361b96c3640475ac537f62d5e7ad198fdfb477fe15f34dbd86db4143b24246d11278eb58 SHA512 a80a9a229f1eeb34780236d0b2418fe5d2f57b9ae8c3c4ccdec729806f4afad8979de4ab3ea0834cdb76218192825ee4bfaf02b48f3bda240c2db441bcc870d9
 AUX passenger-5.1.11-gentoo.patch 1068 BLAKE2B 635bc4c4a2313dc00a038cb9c871b5b2f0163f320d4f4d1bbd9d34ec34ec81f2fd2e7d9ea6f3d03c4a611f13095c4ad414ba7c0920064f8408837a2600d2d2e9 SHA512 c75442ac0403131e5fdbe76ec52acdcffcb6947af81ce79e003ebbb9e97d25a855651bd62c0aad66dd22d8cd4dff2221fc84b0ce74da3908f06f272c8b133c2d
 DIST passenger-6.0.6.tar.gz 7347506 BLAKE2B 16332ca5c299c366c891eef0267889d024417bacafafb9b6faed94434f16a3823fd21e9251eeefe190a682e8530b49cde4af22008b1537466ee3d685554dcbac SHA512 57a013dbbddab13862c2d5445d048aafdc5a56297c56d3d642a39fe7757d3bcbd7e9e21aca36ebeb0f54a03d26e0886031a947cb098026a516900cc5bff42f0c
-DIST passenger-6.0.7.tar.gz 7352163 BLAKE2B e002f03f761cfd1b2a79f3d518fe25fb1ead4f0431042b6bfe2ecf1b9900e6405abb4d67f9750302149f1d99990d2b42bc0fb1c855168b7003ac37eec3297b8f SHA512 6019a93ac500333098cee772b5240f6cbf3a75a8d7cdd2bccac58c28369dddca574dc7e1c239a8f21b863df4825e758bb5eae84b316842168dc875116a07bfca
 DIST passenger-6.0.8.tar.gz 7567855 BLAKE2B ea8577c07a57eaea4e3b2b236808c9e54badb35368e948132af04220026b2676a71d066625a64cd98ce35118ae613bcbca8a0a1f8e0bc2a8d321c1165dec72f5 SHA512 ad35bee4a1c855b8f5401ab44e2a9b0cf3281e7fb1d8e09c8b12c54a465545d43285301c7d0fe16914e3c0fd5407d0d5cef31bb296f850d787903e6e006b368f
+DIST passenger-6.0.9.tar.gz 8180342 BLAKE2B 41bdfe06fe3dd94cbcbe44b8a9e2945447662a00b082c94d84196c13ec597c8aa6f5b34ff7855d06a983a27673c6e5c65426dfee20bcd601cea03cc2035a9da0 SHA512 fbb7a5a9e222672ea2db13f92de0710b84cde530d67633ad31265a1e34bf8a79f006a9db35eec45200d61c1084f0846275a06b55c717cf35ccdc7a8e878d37b4
 EBUILD passenger-6.0.6.ebuild 4069 BLAKE2B f644fe935ff16ea908a7f6580d5fd12740b82ccfa26fae074d94df6f4ea46dec16ffab107ce9ef113e210f7eb90d5c9af4a92491f787271088b5c12a6811edbb SHA512 17357f9f346368021aca4acd3cb7516e7d1b340b5838c62fc7b43c3f7125d6fd2cfb5e116b3ca3ab7070c8203f6790a5c23beeea42fff0255337dab42b6df483
-EBUILD passenger-6.0.7.ebuild 4071 BLAKE2B 88556cba75e710275d64a50df6b2c9bc2721736240a0c6f2f611255093ce02d9b902fe14f33da152eba4069152c26d52b04b3962ed191fbc1bda82405c2d66f8 SHA512 e9e03814a511829b317f6c3c26ee6429f1dff106b80d4f1a088dfcc7ebdb615b93410ce1f8b7b5ed034956d2347bdb6e7582939c43de1168351e4f0fa5887dcf
-EBUILD passenger-6.0.8.ebuild 4078 BLAKE2B b1da770623dcc7a80661b881c21cf7865cf991d04202e3fd55cc672ae62ec940a5343291a4fac0c1d64fe8b1f51fc09864b4b437699b48bfd7f5759b1c2f0ae3 SHA512 c7acf738f7a4b74bce94f6826b0e8a19adb0068f526e43b68b990cbeb7c26404c26180233bfbce83c9d19e82ae720452404d3d374619fbd088b6242ba824b70c
+EBUILD passenger-6.0.8.ebuild 4076 BLAKE2B c715fd27326957b5398514c2288562ab600628cf00d37c7bd8309859587ae3d7a5da6f3d9e5ba339bd0c44c2ec67afeefa080399591eb4ae4616599bb70c8665 SHA512 ab6c553a6a1850915e70228e31f48867fe6e825089a350a7cfa30eab7bf04db3258e9848ff62012a925dc714e8fe0b2612deef577e50d0315b357a2aa9a96fc6
+EBUILD passenger-6.0.9.ebuild 4032 BLAKE2B 323cef5a46100ef17eac571e87047e2458aa5f20796f6f1f40930bb87ce8f586724ac4971759623c888106eacaedffb7a814f0a662f32534be5f481cf38b754d SHA512 4aeaa508c085c0a2478c72301f9d0da0183445864b0af6242ae889615e1ff30889488d368aac77d6cf1af4042757e17b10de1ae66a8519dda01f85994405591e
 MISC metadata.xml 330 BLAKE2B 80067f262ce3e04098eaab92ec2420a879014d624fa6c230f57daf871ac33b77fcd786868ec508236c62623f2c81dc86573875a42993604896745524d7220fc7 SHA512 5ea7e5026084dedcd363bb79076763cca7d66bb08411d5e2dc56ade23bfdbd522a8db13db9c0b8f50163f130f28c784b622d9639cb3dd33aa810dda3d2577db8
diff --git a/www-apache/passenger/passenger-6.0.8.ebuild b/www-apache/passenger/passenger-6.0.8.ebuild
index 17074fb367be..4d290110e58a 100644
--- a/www-apache/passenger/passenger-6.0.8.ebuild
+++ b/www-apache/passenger/passenger-6.0.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://s3.amazonaws.com/phusion-passenger/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="apache2 debug"
 
 ruby_add_bdepend "dev-ruby/rake"
diff --git a/www-apache/passenger/passenger-6.0.7.ebuild b/www-apache/passenger/passenger-6.0.9.ebuild
index 70b997581603..0a7a0aa829f1 100644
--- a/www-apache/passenger/passenger-6.0.7.ebuild
+++ b/www-apache/passenger/passenger-6.0.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
 
@@ -43,7 +43,6 @@ pkg_setup() {
 
 all_ruby_prepare() {
 	eapply "${FILESDIR}"/${PN}-5.1.11-gentoo.patch
-	eapply "${FILESDIR}"/${PN}-5.1.1-isnan.patch
 
 	# Change these with sed instead of a patch so that we can easily use
 	# the toolchain-funcs methods.