gentoo resync : 05.12.2021

5 files changed, 11 insertions, 17 deletions

diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 0a99d54e9e1e..e65f13f95187 100644
--- a/www-misc/Manifest.gz
+++ b/www-misc/Manifest.gz
diff --git a/www-misc/fcgiwrap/Manifest b/www-misc/fcgiwrap/Manifest
index 00e2dd1a49d2..c916db98d2a7 100644
--- a/www-misc/fcgiwrap/Manifest
+++ b/www-misc/fcgiwrap/Manifest
@@ -1,4 +1,4 @@
 DIST fcgiwrap-1.1.0.tar.gz 9924 BLAKE2B a96a87bfd1e4845be3a5018e5574edd40a800926ac531a041fae07f6810da509eecf97a19b2debe0ea318f2968f30184f4f6c1c02495777492d32826a0f759a1 SHA512 b8d35762d1d3c94a67602290b0092f0c38cffbbcd3dbc16597abf8b92172909b04450c238de2e430e841a17dd47fdd48d6a001f77539966980ef1af61e447ddc
 EBUILD fcgiwrap-1.1.0-r1.ebuild 1313 BLAKE2B b87272e5158a3ea56b573e34c31eebb75a900ac3f799a5533be65685260b4c02955fc58aa78e29b8e48f64512358646c99faffd8bb8ce3377254d9b132792dea SHA512 82c1d923eaf31578f7bd53beb1e342773dcb0d6d151f892c1e0281944c4bb91b5a9f65075b23045844f7374ac8ceb4948dfc92577060e0645355f1a7f520ae31
-EBUILD fcgiwrap-9999.ebuild 1361 BLAKE2B eee47215eb02c0b034ce4648244bfc71b8fb9a83b6e90690a8318ea4a7891cfa889129b07464cd2f7b2450e3c9307c83627c77b0167091cb356fa8b2c010a246 SHA512 0271ad94f88ec1c158f6c1e52e7037ada92f5c29f872eb8941b42d215c4465642e8ca7c8a905f4dc65fa02559f2995d42225fb048dc0a9ec0833b36d60d87e32
+EBUILD fcgiwrap-1.1.0-r2.ebuild 1205 BLAKE2B d45c7c7378394c3b1b95781c57f7bb76b16c2797359c34ccb54d5560d8d87075a469546c5c15f52c05c71145847ba65adee30bab57aa5ecc1fc95ff4d00f999e SHA512 dd8b79e7c2da1f7964bf99f598362145d06eacc17e5432485f5fb229fb91086725f9d2240af2cf4ff553cb71f7a492a5054859a1af09313bd93e9243ea0b07b0
 MISC metadata.xml 459 BLAKE2B b5e849549c0e7318e9e1fc39cc89358b5372f64a4c300c343a07d928f3eee4658593720146132cab9dbf9caf5e8aaed80c4d71a64eba449e7108bf048c68268f SHA512 fbdb6a797983a71a11a92cbef40df7745b1a2e96c102c1f41562a861547918bf290b175ec7d41d186a9972375f571afe5e24a7b99fdc086d58b9c892d68fc9b1
diff --git a/www-misc/fcgiwrap/fcgiwrap-9999.ebuild b/www-misc/fcgiwrap/fcgiwrap-1.1.0-r2.ebuild
index a51f3f4835ab..5280d34fc373 100644
--- a/www-misc/fcgiwrap/fcgiwrap-9999.ebuild
+++ b/www-misc/fcgiwrap/fcgiwrap-1.1.0-r2.ebuild
@@ -1,31 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
-[[ ${PV} = *9999* ]] && VCS_ECLASS="git-r3" || VCS_ECLASS=""
-inherit autotools systemd toolchain-funcs ${VCS_ECLASS}
+inherit autotools systemd toolchain-funcs
 
 DESCRIPTION="Simple FastCGI wrapper for CGI scripts (CGI support for nginx)"
 HOMEPAGE="https://github.com/gnosek/fcgiwrap"
+SRC_URI="https://github.com/gnosek/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~x86"
 SLOT="0"
 IUSE="systemd"
 
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/gnosek/${PN}.git"
-else
-	SRC_URI="https://github.com/gnosek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
 RDEPEND="
 	dev-libs/fcgi
 	systemd? ( sys-apps/systemd )
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 DOCS=( README.rst )
 
@@ -55,5 +49,5 @@ src_configure() {
 }
 
 pkg_postinst() {
-	einfo 'You may want to install www-servers/spawn-fcgi to use with fcgiwrap.'
+	einfo "You may want to install www-servers/spawn-fcgi to use with fcgiwrap."
 }
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 3d9cf8b5bf19..de464810db96 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -3,5 +3,5 @@ DIST urlwatch-2.23.tar.gz 137917 BLAKE2B 330c52cad62985d24b2cc4c7345156abe9d5d36
 DIST urlwatch-2.24.tar.gz 141175 BLAKE2B 7868ba757493c97ef65136d3da67ef3bb6b0d62e52ab150e169d66adea420872990527a622d305bd14923ff367041d615dcea1495871258040ec2cbb73ee7613 SHA512 ed84cb69ecd8894851c3be0165edfa1dfee92a0b49ea1383e4cfd7c31eb0604f99b1a90d9508753064b58bdd8fc4c0369d817303858d07562b37c3f2ac4cae52
 EBUILD urlwatch-2.22.ebuild 2027 BLAKE2B ab0672d343860d9f5b5127bf3462d71261a1ea32ddf1af10dc034d247d5709cdd51f935f952c55ed916301c5e2c2a6230487461cc207a317f199e11574162157 SHA512 ae6dd63fdda75ff22f5fbe288816634826378c06f9ac066a41148e08f69ee1260b62c8e60b55e8f021bf6add09516d0c650b9a50f9f5c92ea45fa9d6f90cf5de
 EBUILD urlwatch-2.23.ebuild 2226 BLAKE2B e31161870ad1cccec96f8523fc13db58e6e10e8cf3fecfaa0519026ebd4f6b108fa20469f2b603eeff277c07249571dd5a553956f95fb8678d1d6bca22484627 SHA512 6cc6fd3fe7c347b9242c21d77da9d53fac3d6e091b48a5cc7cb3212adb736a4a7ef4c6ad84112e7adfcadd9abef3e7040e6044b0ee28181c9c4c1441580d3b61
-EBUILD urlwatch-2.24.ebuild 2433 BLAKE2B 982a6e5ba8f7904961dd3daf91cbd44cc15c3dc55029dc97960c096eadf8e8613a5302605f0858412de3a50d6ac52978199d91b15a7e05c4f600b625793a2ffd SHA512 80469a5f2b8c74f4f0361a30023e8be74ef9603b002a459406dab3c5d74cfdb16c49b68a84e069c4ee78049b4a88c650a090722c7194a6dee98425041d7f3eba
+EBUILD urlwatch-2.24.ebuild 2438 BLAKE2B 82a93e7644fd56438ace4c2863812598a6b23ad0fee624caffbffdcc2c55d7cbcad706f60289cb6070472d32b905e95e7379c8cb54d5e2c69a49918e4ab8d237 SHA512 81b2868e19712cb0c8d0d12c7254b8c5f8dc4b3da185a385e8f2207090b51571352ca8704a7b440f6eb7b7811d62c8c8c6ed373e0d3bb06555d04e55f6554f61
 MISC metadata.xml 541 BLAKE2B f4518dac79cafa9a225d87e125b1fbb3e090c7d3ea1d90a307d8b881379b809112fdc0bd3da6a229daf228aa5660fd130a048fefc63c9a19743987a4c94e528d SHA512 86cf47f19a24fb11c4b1a02b1fe9490a5c171c77b4237a1d0557ce553b1b97ef05f1849f4d745aa0c86f27b2c74f646898f94484ecf75848379b3a02f4157170
diff --git a/www-misc/urlwatch/urlwatch-2.24.ebuild b/www-misc/urlwatch/urlwatch-2.24.ebuild
index ceff0e2189e5..30438fabe02d 100644
--- a/www-misc/urlwatch/urlwatch-2.24.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.24.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]