gentoo resync : 17.07.2021

5 files changed, 8 insertions, 9 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 032f02faae73..ef50a92b1cb8 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_qos/Manifest b/www-apache/mod_qos/Manifest
index 1ddcfc3538db..56c260fbfbd8 100644
--- a/www-apache/mod_qos/Manifest
+++ b/www-apache/mod_qos/Manifest
@@ -4,5 +4,5 @@ DIST mod_qos-11.65.tar.gz 1247087 BLAKE2B 145af39814f974855520415c3bf114aa11ac90
 DIST mod_qos-11.66.tar.gz 1247819 BLAKE2B a835722363a816637411b434eba60bc91f04fe48efd1dd5a3b63f046feb2fb60d776a64d0a4e889c8f827f6a3002fa731743d079b5f3ebd3bde3edf2023c983c SHA512 19541c72d72cd9c4f055f6c0908e1ddbfa0b27f33e13edbecf9abcf61c2fe334ef797e3ad44c7d8343d5d2df714744b4f1a3f0f96a6de02ff7d7999385393db6
 EBUILD mod_qos-11.61.ebuild 1018 BLAKE2B a767c7a386589ba71393c8f7c9b6cf1086d02dc70b9b2349230cf91628bae7ee4633eef70d932ac34a780156fe12deab23c8782653e4bf9e444e200b7e7ee78e SHA512 880a9b2920d2604630d0f9a813bfc38a1a469f4de9a3c731bef61dbe122f094e4b681d783228aaa71b0229d08e95d9362d23adccc8556985eb193a5b0dacfd51
 EBUILD mod_qos-11.65.ebuild 1165 BLAKE2B 3e289624c4779988e86e9f5814929aab89f09f20c37909375f2d2084c10a691f65899349556562e1030b89eb207b3bb25b6e168e5e3c6d4bd28312674e59b126 SHA512 d7e2a30f9021da10dee0c0961c064d9649a74354406d8741f815163ca40c391e35f6509fac8453c450c94b4982eb5c3dd780ff824478c19c9466860e77f21d35
-EBUILD mod_qos-11.66.ebuild 1142 BLAKE2B 8b9f5e9626719ec8390b401df2b9f17a00231cad9135c5a107f9e965a24f6823c60d99faec0a6dcaecd18a957ac1930078f9937d3694fa66edede3fd960e34ca SHA512 aea1e1ffaddbb25679e7815e1ad48f76cc8ab59606c20beaf8dcfe54640c9a939f2dd864550911d0257554ad39f529fa9a09bead62e2ab04d029fefc8fbe9887
+EBUILD mod_qos-11.66.ebuild 1141 BLAKE2B 4c08f022489736efcf3833b70c6ae90663ccb34bbed965e14b55e4c028c039e1e438618ebd153eca1e22c2b0f1a541a68c2383d4b80d8cbb7bd549a766bb6f06 SHA512 54ab558430ec323df724e4f4d2a2c0019c94f97d656b1d75107b0e1ac0a905fe4cce2422f28d79342aae2b41f7466461fd6480518a0d6d89c3396f26dedfab4e
 MISC metadata.xml 325 BLAKE2B 322d2ee01e15bccbfc982530d0d51a66646a30d3c937d514dd5967ad5501325ecb6d2ead18b63f6255532fbcd80208b29fa325d90cfe8d65414fa7013c2af7e0 SHA512 392b5e28cca1b7b253349524117b22242a465f5413ed06ad844f51873f0c8b2c1d90d6b6b79c7dd6ebc2004be5d0b1757cd24ddcfb56ee12d0e1be325a460be5
diff --git a/www-apache/mod_qos/mod_qos-11.66.ebuild b/www-apache/mod_qos/mod_qos-11.66.ebuild
index 412c8e3c8eb5..58b9e562e955 100644
--- a/www-apache/mod_qos/mod_qos-11.66.ebuild
+++ b/www-apache/mod_qos/mod_qos-11.66.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mod-qos/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-libs/libpcre:3
diff --git a/www-apache/passenger/Manifest b/www-apache/passenger/Manifest
index 21b844d8b662..62f59d054015 100644
--- a/www-apache/passenger/Manifest
+++ b/www-apache/passenger/Manifest
@@ -1,10 +1,10 @@
 AUX 30_mod_passenger-5.0.0.conf 2737 BLAKE2B 781ffa4831313356b6caa493fc94a784f6b0245c2c37c27cc69eeba9be62c8b626b8fdf26c18ddffe0a06743abf1d529318f46c0091f64370f2a9d82f1b54116 SHA512 847aa6d0ebb2e4ceaa744fdddf72f22613aeb76df38a36fb3c8b16803222cec116e6d5c23d2173beffd5889ebb8ba0247ffd3b9e900a70d78c2236f00c1a5d4d
 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.10.tar.gz 8178910 BLAKE2B 9c7b8e05130e7242cb13986b97582786d77c2d5341620bd3594f428ecf26bf983262ad92b7b8a21666bfa262de0f4d148cef56de2015c0e2b42a3d7d87db2b43 SHA512 5ef2170cb9e55de37cc2b561f2f5c6a6406c71d70b248078ac5086d9d6e9ba90efcf223f1ed6b14774c8eb008d7cb6e98f3d5f8a088126ea697638a8dce6741c
 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.10.ebuild 4025 BLAKE2B 0689d1e5588c8de1de39522b958e7504b45a7d250e76a4343594cafbe3509f63c74827c5dbfab5e1c908ce1374cab25054ff68ab1acbc1d868bd07fe54412936 SHA512 415c10f66957e2a12a720b8f3672278d128491a1f4b7b93b69482ea4d8bb6044b5ce713dbadae4ed3f6b389f75cd527ba2a5cff811aa72a93573fb0c56435f9d
 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.6.ebuild b/www-apache/passenger/passenger-6.0.10.ebuild
index 66e88d824559..52d626c53cbf 100644
--- a/www-apache/passenger/passenger-6.0.6.ebuild
+++ b/www-apache/passenger/passenger-6.0.10.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"
+EAPI=7
+USE_RUBY="ruby26 ruby27 ruby30"
 
 inherit apache-module flag-o-matic multilib ruby-ng toolchain-funcs
 
@@ -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"
@@ -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.