gentoo new year resync : 01.01.2021

4 files changed, 8 insertions, 8 deletions

diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index f2bd3db56e89..4dee7842016a 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -3,9 +3,9 @@ AUX apache-2.4.41-libressl.patch 1082 BLAKE2B 98428a5653f47e6dd38452809bee92ef7a
 AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3
 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48
 DIST gentoo-apache-2.4.39-20190402.tar.bz2 25491 BLAKE2B ce230b07ec156048c7d7c1eb4b0e732fa6140f55d136e317714591327bde3f85bab7780424e6eef04b7a4518cbdcfdddcbc094409f4ca19ffea1ce967bdf7cf1 SHA512 bc0ffa20cffd9a89c2ea64420fa2243d77e97d7922bcd0b387a7fcfcc3c6908a056972b499a81344f7c3e3e19b55ffc300fd034c54b287f4f32d8931bd50cde4
-DIST gentoo-apache-2.4.46-r4-20201203.tar.bz2 25752 BLAKE2B 7479209b648567438789b1c73c99160af94c639710d6255cca2bb42f91d5b4d3f5692fb691a3566078860e00d507f1b97fa2d0d1352cf8de9ae7f311e3026e8c SHA512 9a810f9dba5c493ca25d23b77cf3c1b1991e9376308ec2c55105e6adb291da46c3858fb15200b6d31ac5a45485796667a504dbf217beeabd82ac097a8cca0569
+DIST gentoo-apache-2.4.46-r4-20201230.tar.bz2 25821 BLAKE2B 3f83b48aa36fa8b9adc75a2cbeaadddad8fb0d69d1602753e0a1978cd6136b1dbf15ad06a837f36c26244e3950bae3ecdfbcdd7668a4d2fc4f0d9f58a909e5b7 SHA512 cea71f3e40ac1409206d906df36c772d7985a79a9e713a3016a9fae67dad032e24ce124789089a4b92454bc98455a70c66515106c8f3c33e05aeaf3037ffabe8
 DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615fd0483a4653ceea6f9832c9ebb111f67ba4f69827b01acd1e5552e70ac0441df49573c9da0ca26d4c2f589f0bc SHA512 5936784bb662e9d8a4f7fe38b70c043b468114d931cd10ea831bfe74461ea5856b64f88f42c567ab791fc8907640a99884ba4b6a600f86d661781812735b6f13
-EBUILD apache-2.4.46-r1.ebuild 8645 BLAKE2B 500dd93b967c7155d6b07d59f8bb18e8473c0f993f0fd5d56c3e66d4fa80e78e1c180275fee245a7377b7fee822d86b1d21371517b0d46bf9f9ff34fb2a24e5e SHA512 e54c12333cd7390e5a2c2db0ec3bd0e2ff175304a062ccad95fc2a4cebfbc77f130d61d12b0c1e25514214feaf804843323b9532d35b80ca0fa448f5ab828e25
-EBUILD apache-2.4.46-r4.ebuild 8648 BLAKE2B ed16c2f5d7ab1ea4bdffc1563afe905a9c78d51ea13685c663d517afaaec8b822ff56411b7fc76efc994d0c65d4ff7bfe46d28be6f9795efb138263528e57e6d SHA512 9154e5637db94174e4d8cda705d50042f5688a1ba5d027719a9f0d14c6075acee29fa006ba088eff4ccaf03a1fe6d1f46a9a480cbc3aaf435a0565c2bec90d5f
-EBUILD apache-2.4.46.ebuild 8572 BLAKE2B 9f3a59cee0344f620d307e3316f8a17863227b0fbb8aee4a85474c6cfd23e9897d75628e66dbf0de901b9901b20ea4ec431ba7a16d79a5ec5437bc4bbf803eac SHA512 378d004209a14a97bf7358d284d9fa9bb51f1d5340daf8988739e53ef9b8f354e074c0def44d577fb9176137f136e0704ae18e4b000601acb6c63db7caa10a76
+EBUILD apache-2.4.46-r1.ebuild 8634 BLAKE2B 4ae7aa2aa05ca0a90c4a586e98dc1562e39bec10a5e263a4db7be0f56c77daefa803659408a79e18fb0243b820c5e30b793267d5cbd85d5cd9522e5a1caba653 SHA512 c8222ad185b7ba5bf96bd2971457d2f17b411b110158bc452a2b78a5a972367b5734f50378bd5d87e48eb9d280da76e4a58b400be67ad2fcb8cf487594ebf4d6
+EBUILD apache-2.4.46-r4.ebuild 8637 BLAKE2B 472afc5306e053d07590336e4294e5b5af85520e9f1a92759f553070990803ab31ae2726772f90fea4096cbedd1ae77ebcdaf04318c88f73b42d1b6a82d64e56 SHA512 199e5a82cf2700f906ca68a93043ea7737b649e4b6301562ea85c16b22008e683e6af24951391c014e57de5995aa755bd7364c44641cf7c566a6d9d1b548e603
+EBUILD apache-2.4.46.ebuild 8562 BLAKE2B 5729038bd9b592b71aa437f40161ae3fc33180dde4d0e5676634e845095bc7339663ff2d3fa467028d26fb954c34a357db90dd675de94677688824a61db6b00e SHA512 53129105be0c959b6c427fb141fabf7e110ad9e80376cf6d394da200361c9e3889c74fedfa72c48a8506ffdc455bb6ae24944e9e5575f5d25044d457e2add176
 MISC metadata.xml 1012 BLAKE2B ca2238f428144240f64b5c9e48087a07a3f77278958efb240edeb864050ca01d1e042a37fb304fde76925fb651d7d97755d354a45aff34ac0589b7405b848d54 SHA512 a4e903bb75740c54256fa96359f6a97cd75008ffeeadfd6353648f5bfa2295fb108ec9de398956c79633bc465475f5db365d20d71caa34fc14a07c4715cc8683
diff --git a/www-servers/apache/apache-2.4.46-r1.ebuild b/www-servers/apache/apache-2.4.46-r1.ebuild
index 449b79e34862..37a3877f2022 100644
--- a/www-servers/apache/apache-2.4.46-r1.ebuild
+++ b/www-servers/apache/apache-2.4.46-r1.ebuild
@@ -138,7 +138,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
 
 # Enable http2 by default (bug #563452)
 # FIXME: Move to apache-2.eclass once this has reached stable.
diff --git a/www-servers/apache/apache-2.4.46-r4.ebuild b/www-servers/apache/apache-2.4.46-r4.ebuild
index 237f162a3af6..5a89abe1dadc 100644
--- a/www-servers/apache/apache-2.4.46-r4.ebuild
+++ b/www-servers/apache/apache-2.4.46-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # latest gentoo apache files
-GENTOO_PATCHSTAMP="20201203"
+GENTOO_PATCHSTAMP="20201230"
 GENTOO_DEVELOPER="polynomial-c"
 GENTOO_PATCHNAME="gentoo-apache-2.4.46-r4"
 
@@ -138,7 +138,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
 
 # Enable http2 by default (bug #563452)
 # FIXME: Move to apache-2.eclass once this has reached stable.
diff --git a/www-servers/apache/apache-2.4.46.ebuild b/www-servers/apache/apache-2.4.46.ebuild
index 17d6fb367b7c..1d46160335a6 100644
--- a/www-servers/apache/apache-2.4.46.ebuild
+++ b/www-servers/apache/apache-2.4.46.ebuild
@@ -136,7 +136,7 @@ HOMEPAGE="https://httpd.apache.org/"
 # some helper scripts are Apache-1.1, thus both are here
 LICENSE="Apache-2.0 Apache-1.1"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
 
 # Enable http2 by default (bug #563452)
 # FIXME: Move to apache-2.eclass once this has reached stable.