gentoo resync : 18.12.2020

8 files changed, 6 insertions, 23 deletions

diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 9e6c0088b837..bc067df5cc18 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/cdrtools/Manifest b/virtual/cdrtools/Manifest
deleted file mode 100644
index eeb5a5dd2ef9..000000000000
--- a/virtual/cdrtools/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD cdrtools-0.ebuild 369 BLAKE2B 0e7726f4f8a12c008de4ffb89693323c98c3141c7b5ecf7bda5f1daf8ce54d3a23944c4cd94689ad5f1aeecd52d1893b63880444e941b1bb8343243ba81bcc91 SHA512 1618f9414d2d5c934e894b6b59ee3147ec69e31cc620b51c8dcb85d827ddfa13262f6aa90e1b8cd286745a244d4cee03434216d8a01b9eb0cf538c96c3fadb2a
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/virtual/cdrtools/cdrtools-0.ebuild b/virtual/cdrtools/cdrtools-0.ebuild
deleted file mode 100644
index ad0079f86fe9..000000000000
--- a/virtual/cdrtools/cdrtools-0.ebuild
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for command-line recorders cdrtools and cdrkit"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="|| ( app-cdr/cdrtools app-cdr/cdrkit )"
diff --git a/virtual/cdrtools/metadata.xml b/virtual/cdrtools/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/virtual/cdrtools/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/virtual/httpd-php/Manifest b/virtual/httpd-php/Manifest
index 1f5ab3adcf84..ad4b044d0549 100644
--- a/virtual/httpd-php/Manifest
+++ b/virtual/httpd-php/Manifest
@@ -1,5 +1,5 @@
-EBUILD httpd-php-7.2.ebuild 428 BLAKE2B d803708909ddda3e6c7bf03bc856f6a7325466604c77bbc428c4a5bfbcebd77ab70f45cb8ade6a090d87c9f329ba96e4caeb555c9b3ef97ea8a0b98c5cb106b2 SHA512 84c4c53ad6698f64d67bd206d6c8c1cc5cc6d7a76ff087359632bb0486a27641613d8e9a2afb945e4be32c0c446ef832289645107be94018ae575060f47fe018
-EBUILD httpd-php-7.3.ebuild 428 BLAKE2B d803708909ddda3e6c7bf03bc856f6a7325466604c77bbc428c4a5bfbcebd77ab70f45cb8ade6a090d87c9f329ba96e4caeb555c9b3ef97ea8a0b98c5cb106b2 SHA512 84c4c53ad6698f64d67bd206d6c8c1cc5cc6d7a76ff087359632bb0486a27641613d8e9a2afb945e4be32c0c446ef832289645107be94018ae575060f47fe018
-EBUILD httpd-php-7.4.ebuild 428 BLAKE2B fb6a361271d70fe34fab6f1565130fe18120fc7d00074b5bf80557e0b387f7e9e81f729f531584b04b38f17ce89495a30e49fa001f289c131add9f1b0b2f434f SHA512 99e207a495a3f90f690d83205727602097f6d267a4a060ef469e08637d744b916913bc32af1e60b030d3d188f36fa60bbc0588801bdf66b3f711533af55b8f87
+EBUILD httpd-php-7.2.ebuild 429 BLAKE2B 7f88f5979e692d5841f795391abd2ed4c9cfaf06f571d0254c050cdbbf4d1831d246775aabf869cf91272148bfd18a608cccc0083413edca44f2f438de3efbba SHA512 b7e656b7a0629b9d02bc1647e53889bb272b7cc9745832a70f2699bc51a91dce5d700ce0394093c4fdcfda05cc875035c3dbd825e2ce4e43aaf48d6b585d48e2
+EBUILD httpd-php-7.3.ebuild 429 BLAKE2B 7f88f5979e692d5841f795391abd2ed4c9cfaf06f571d0254c050cdbbf4d1831d246775aabf869cf91272148bfd18a608cccc0083413edca44f2f438de3efbba SHA512 b7e656b7a0629b9d02bc1647e53889bb272b7cc9745832a70f2699bc51a91dce5d700ce0394093c4fdcfda05cc875035c3dbd825e2ce4e43aaf48d6b585d48e2
+EBUILD httpd-php-7.4.ebuild 429 BLAKE2B f03af367eac8a36545a01ca984a8747f2e6223ae321cfe51ec31beddac7ffc07dc16f212b8e1170481f354cdce5446f0c9ef9ce87b16b197dcc10ff2975ea012 SHA512 1b2b24dee7a66e70d904171a0f64928e726c6acd54041e30a32ac8338703e6e0abba6b77f8330a52ea44aa814983cf60dfc8c48fb85e769a2391fc3d55fd0c8c
 EBUILD httpd-php-8.0.ebuild 436 BLAKE2B 0c678092aec5b657102eabc4faa6d7878348362683a3d634b68d2e871d72fc7e08eb4cdd5ffd3a8d0d8e01e1b7589fc53a828b7812ae4fccf9d63cc98aea9b10 SHA512 f5f563af1647aaeb885ace68039769c7d51753b78e6d334f9ae9a175cd2e51973bcb358bae3754a2a5862fbc346a89734818b945f82dd853b2ab97d6e72d7e3a
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/virtual/httpd-php/httpd-php-7.2.ebuild b/virtual/httpd-php/httpd-php-7.2.ebuild
index e521d711ceba..53f85af7a6d1 100644
--- a/virtual/httpd-php/httpd-php-7.2.ebuild
+++ b/virtual/httpd-php/httpd-php-7.2.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
 			  dev-lang/php:${SLOT}[apache2]
diff --git a/virtual/httpd-php/httpd-php-7.3.ebuild b/virtual/httpd-php/httpd-php-7.3.ebuild
index e521d711ceba..53f85af7a6d1 100644
--- a/virtual/httpd-php/httpd-php-7.3.ebuild
+++ b/virtual/httpd-php/httpd-php-7.3.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
 			  dev-lang/php:${SLOT}[apache2]
diff --git a/virtual/httpd-php/httpd-php-7.4.ebuild b/virtual/httpd-php/httpd-php-7.4.ebuild
index 9cebbd935b14..9d36c62a591f 100644
--- a/virtual/httpd-php/httpd-php-7.4.ebuild
+++ b/virtual/httpd-php/httpd-php-7.4.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
 			  dev-lang/php:${SLOT}[apache2]