gentoo resync : 22.05.2021

4 files changed, 21 insertions, 40 deletions

diff --git a/virtual/httpd-cgi/Manifest b/virtual/httpd-cgi/Manifest
index 0df7611cffb2..4c837649b168 100644
--- a/virtual/httpd-cgi/Manifest
+++ b/virtual/httpd-cgi/Manifest
@@ -1,3 +1,2 @@
-EBUILD httpd-cgi-0-r1.ebuild 579 BLAKE2B f3a20a1a56b39606e00d733fdb8f2a128cb407f14283bdf84a7097ab6bf0f3d4909a3435ba5259ad94fd39d1c119be46ac7a36af61ce010a12348e0f1716b15c SHA512 616465e8957cf2164dff619c4c4bd06c4070d6f31dd9f887097c5dc0c921919259d0a73dbfd2e982228a38b672fbbe12b8b515bd3e2452c14e68f8aca045575e
-EBUILD httpd-cgi-0-r2.ebuild 601 BLAKE2B dcf20bb3e480851404f7c073f72e35fe2d187e22aa837595c9e87276ed7fc0b52b5e95722365bc675cc24276409ff869eaa730c4e06404098869072809fddc94 SHA512 bd7de4242e422ce1a4284d0e5b2b7eafb0900b397fefe11d7b88862ea630757f7518bc3d3a85a333c056f2b6580390061207f3b5852e3218e9952879910be4d6
-MISC metadata.xml 250 BLAKE2B 856ff9793486ce226d86aeb43e3c5a75acf1fdd49936d52cf09e72669d2e956844d9087cf5cb67d4f04353d30be644bfc1daaa70b2ae332651f4bf71ae5c31e8 SHA512 8a7934e6db1aa1e0aba026a0438fb291819be69c134d54bb3af0638facc3e0a47bc30557c944bfaf5adbdd1dbdcbc96dec88d69ab809b1758e5701ff38fc6282
+EBUILD httpd-cgi-0-r2.ebuild 617 BLAKE2B ebe34ab8387a6e4adcdea910ccb7d004546e3dcb969afef69964b0a5a669a5cc37861a32509e852819f01bc68f612aee752977689932655a5b326522f9e5777d SHA512 96ff924f2223f85081bebad401f1f86518b2279b8355632cb49b2103d0a3e70ed515812671fa83986f43acb6dd16c6d3a177c48931a7b3086e39ab0bb0ddb31b
+MISC metadata.xml 274 BLAKE2B e90c1b6ccc1e6ec3bac07299e589bcdeb67ef1500c37d5048bc799b2871406ae6da47b15bfa7587ac17871b5b7d8e82aaa414b86eff2290b37af7fdfdc7eed4e SHA512 357b8a73346c67488139d0a38e1557d754ba326c80fd545dad4e4ef3c05ea1e8b20801656bf7865e3693a0e60fa994b9d39e699ffeec7d7731a782e0e9e3867e
diff --git a/virtual/httpd-cgi/httpd-cgi-0-r1.ebuild b/virtual/httpd-cgi/httpd-cgi-0-r1.ebuild
deleted file mode 100644
index 52a0b6503059..000000000000
--- a/virtual/httpd-cgi/httpd-cgi-0-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for CGI-enabled webservers"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="|| (
-	www-servers/apache
-	www-servers/lighttpd
-	www-servers/boa
-	www-servers/bozohttpd
-	www-servers/cherokee
-	www-servers/fnord
-	www-servers/monkeyd
-	www-servers/nginx
-	www-servers/resin
-	www-servers/thttpd
-	www-servers/tomcat
-	)"
diff --git a/virtual/httpd-cgi/httpd-cgi-0-r2.ebuild b/virtual/httpd-cgi/httpd-cgi-0-r2.ebuild
index 0098c6630efa..31a1f406c393 100644
--- a/virtual/httpd-cgi/httpd-cgi-0-r2.ebuild
+++ b/virtual/httpd-cgi/httpd-cgi-0-r2.ebuild
@@ -1,23 +1,26 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Virtual for CGI-enabled webservers"
+
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-RDEPEND="|| (
-	www-servers/apache
-	www-servers/lighttpd
-	www-servers/boa
-	www-servers/bozohttpd
-	www-servers/cherokee
-	www-servers/fnord
-	www-servers/hiawatha
-	www-servers/monkeyd
-	www-servers/nginx
-	www-servers/resin
-	www-servers/thttpd
-	www-servers/tomcat
-	)"
+RDEPEND="
+	|| (
+		www-servers/apache
+		www-servers/lighttpd
+		www-servers/boa
+		www-servers/bozohttpd
+		www-servers/cherokee
+		www-servers/fnord
+		www-servers/hiawatha
+		www-servers/monkeyd
+		www-servers/nginx
+		www-servers/resin
+		www-servers/thttpd
+		www-servers/tomcat
+	)
+"
diff --git a/virtual/httpd-cgi/metadata.xml b/virtual/httpd-cgi/metadata.xml
index 2b9b44f73497..792dc8159a09 100644
--- a/virtual/httpd-cgi/metadata.xml
+++ b/virtual/httpd-cgi/metadata.xml
@@ -5,4 +5,5 @@
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>