Merge updates from master

17 files changed, 43 insertions, 12 deletions

diff --git a/app-accessibility/freetts/freetts-1.2.2-r2.ebuild b/app-accessibility/freetts/freetts-1.2.2-r2.ebuild
index 4322b03c1b15..38b75456e0e4 100644
--- a/app-accessibility/freetts/freetts-1.2.2-r2.ebuild
+++ b/app-accessibility/freetts/freetts-1.2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc examples source"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="A speech synthesis system written entirely in Java"
-HOMEPAGE="https://freetts.sourceforge.net/"
+HOMEPAGE="https://freetts.sourceforge.io/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
 
 LICENSE="jsapi? ( sun-bcla-jsapi ) freetts"
diff --git a/app-accessibility/sound-icons/sound-icons-0.1.ebuild b/app-accessibility/sound-icons/sound-icons-0.1.ebuild
index 2582afeca261..294d6b7afb58 100644
--- a/app-accessibility/sound-icons/sound-icons-0.1.ebuild
+++ b/app-accessibility/sound-icons/sound-icons-0.1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-DESCRIPTION="a collection of Sound Icons for speech-dispatcher"
-HOMEPAGE="http://www.freebsoft.org"
-SRC_URI="http://www.freebsoft.org/pub/projects/${PN}/${P}.tar.gz"
+DESCRIPTION="Collection of Sound Icons for speech-dispatcher"
+HOMEPAGE="https://www.freebsoft.org"
+SRC_URI="https://www.freebsoft.org/pub/projects/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild
index 5e3d29432faa..c2d113a7a6c6 100644
--- a/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.5.0-r1.ebuild
@@ -9,7 +9,7 @@ MY_P=${P/speech-/speech_}
 PATCHSET="r3"
 
 DESCRIPTION="Speech tools for Festival Text to Speech engine"
-HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
+HOMEPAGE="https://www.cstr.ed.ac.uk/projects/speech_tools/"
 SRC_URI="http://www.festvox.org/packed/festival/$(ver_cut 1-2)/${MY_P}-release.tar.gz
 	https://dev.gentoo.org/~neurogeek/${PN}/speech_tools-2.1-${PATCHSET}-patches.tar.gz"
 S="${WORKDIR}/speech_tools"
diff --git a/app-admin/bastille/bastille-3.0.9-r3.ebuild b/app-admin/bastille/bastille-3.0.9-r3.ebuild
index 365b97b97bad..4a1ca299446d 100644
--- a/app-admin/bastille/bastille-3.0.9-r3.ebuild
+++ b/app-admin/bastille/bastille-3.0.9-r3.ebuild
@@ -9,7 +9,7 @@ PATCHVER=0.2
 MY_PN=${PN/b/B}
 MY_P=${MY_PN}-${PV}
 DESCRIPTION="Bastille-Linux is a security hardening tool"
-HOMEPAGE="http://bastille-linux.sourceforge.net/"
+HOMEPAGE="https://bastille-linux.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
 	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
 S="${WORKDIR}"/${MY_PN}
diff --git a/app-containers/skopeo/metadata.xml b/app-containers/skopeo/metadata.xml
index 18cbb63e9295..21cb782a75cf 100644
--- a/app-containers/skopeo/metadata.xml
+++ b/app-containers/skopeo/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="btrfs">Enables dependencies for the "btrfs" graph driver.</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">containers/skopeo</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-containers/syft/metadata.xml b/app-containers/syft/metadata.xml
index 3b2a9c591010..08a781acd85a 100644
--- a/app-containers/syft/metadata.xml
+++ b/app-containers/syft/metadata.xml
@@ -5,4 +5,7 @@
 <email>williamh@gentoo.org</email>
 <name>William Hubbs</name>
 </maintainer>
+<upstream>
+<remote-id type="github">anchore/syft</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-containers/umoci/metadata.xml b/app-containers/umoci/metadata.xml
index db463f3eeb66..7cc282ba772a 100644
--- a/app-containers/umoci/metadata.xml
+++ b/app-containers/umoci/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">opencontainers/umoci</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/adcli/metadata.xml b/app-crypt/adcli/metadata.xml
index 9d60dd89cfd7..99303bacc412 100644
--- a/app-crypt/adcli/metadata.xml
+++ b/app-crypt/adcli/metadata.xml
@@ -9,4 +9,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <upstream>
+    <remote-id type="freedesktop-gitlab">realmd/adcli</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-crypt/hashcat-utils/metadata.xml b/app-crypt/hashcat-utils/metadata.xml
index a0fddf470150..160cda032966 100644
--- a/app-crypt/hashcat-utils/metadata.xml
+++ b/app-crypt/hashcat-utils/metadata.xml
@@ -5,4 +5,7 @@
 		<name>Rick Farina</name>
 		<email>zerochaos@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">hashcat/hashcat-utils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/sequoia-sq/metadata.xml b/app-crypt/sequoia-sq/metadata.xml
index a7fa285c7476..3c72ac7546b9 100644
--- a/app-crypt/sequoia-sq/metadata.xml
+++ b/app-crypt/sequoia-sq/metadata.xml
@@ -5,4 +5,7 @@
 		<name>Florian Schmaus</name>
 		<email>flow@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">sequoia-pgp/sequoia</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/sequoia-sqv/metadata.xml b/app-crypt/sequoia-sqv/metadata.xml
index a7fa285c7476..3c72ac7546b9 100644
--- a/app-crypt/sequoia-sqv/metadata.xml
+++ b/app-crypt/sequoia-sqv/metadata.xml
@@ -5,4 +5,7 @@
 		<name>Florian Schmaus</name>
 		<email>flow@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">sequoia-pgp/sequoia</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/swtpm/metadata.xml b/app-crypt/swtpm/metadata.xml
index 1ad716fc5197..3187cf4dce7f 100644
--- a/app-crypt/swtpm/metadata.xml
+++ b/app-crypt/swtpm/metadata.xml
@@ -16,4 +16,7 @@
 	<use>
 		<flag name="fuse">Support <pkg>sys-fs/fuse</pkg> based /dev/tpm interface</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">stefanberger/swtpm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/tpm-emulator/metadata.xml b/app-crypt/tpm-emulator/metadata.xml
index 51fbbfdd110b..fdd2723e0b5e 100644
--- a/app-crypt/tpm-emulator/metadata.xml
+++ b/app-crypt/tpm-emulator/metadata.xml
@@ -2,10 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">tpm-emulator</remote-id>
-	</upstream>
 	<use>
 		<flag name="mtm-emulator">Build the MTM emulator</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">tpm-emulator</remote-id>
+		<remote-id type="github">PeterHuewe/tpm-emulator</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/tpm2-pkcs11/metadata.xml b/app-crypt/tpm2-pkcs11/metadata.xml
index 12ab3f529d15..4b7a498cda7f 100644
--- a/app-crypt/tpm2-pkcs11/metadata.xml
+++ b/app-crypt/tpm2-pkcs11/metadata.xml
@@ -12,4 +12,7 @@
 	<use>
 		<flag name="fapi">Enable feature API backend</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">tpm2-software/tpm2-pkcs11</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-dicts/libydpdict/metadata.xml b/app-dicts/libydpdict/metadata.xml
index 85e4ed814fa2..cc6d8743c599 100644
--- a/app-dicts/libydpdict/metadata.xml
+++ b/app-dicts/libydpdict/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">wojtekka/libydpdict</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/lean/Manifest b/sci-mathematics/lean/Manifest
index 4394832e7ba6..02c8c71ff07b 100644
--- a/sci-mathematics/lean/Manifest
+++ b/sci-mathematics/lean/Manifest
@@ -1,4 +1,4 @@
 DIST lean-3.49.0.tar.gz 1918154 BLAKE2B 9f9973d00d2d5d5b7d26d50117c27754feb5132e88decd55859432a384dac2897184dcf8d841ad0034854657ac25e462dc69cdbe1cf2040787d108bb7e1370f4 SHA512 b4672843c2e923da8d56b91c14966fc2ec66c573564d68db9c52f9b40f2c97d82497f2ef6424b023c4ae50f6f0c11674e2d79053844ea669d226d0fe24077ade
-DIST lean-3.49.1.tar.gz 1918165 BLAKE2B bebb29023f7d8979dae19d7c5ef6503be03012366c8a4f21a69244a1daadf90c73e8a8754656d7b1a6eccb1123f0905f3dcaa15885b0307399979024d2c5a051 SHA512 6648ab84840099495df5bec9432c75c40fc0920ac2a18297b42c35de593ec4eaee8bcf807cb6e273c2715090e5d1ab6c59652f482016af68d758e7e6e55dd87f
 DIST lean-3.50.0.tar.gz 1918549 BLAKE2B 79827ffb9f825dff040e41e9bcbd8306e2f3a116b74fc6e0831450765d5b896fad2a86ec5dd9e63bf0f8777b575d4ab7ae8d158c233364fad6d4437bc0767452 SHA512 2b8d730ef9d808a24a9708f2b33409510bd6b7350f515679ba0395a45fc2dea2125639cdeb867bec4ac9c8114e448fb9777a69f8859e172f6e694ecacbb07f56
 DIST lean-3.50.1.tar.gz 1918323 BLAKE2B 3a26a6481a8472941a928a7b33b24231239e553cd4a4af5671f6a05f1fa68a54657518c4775b641239aa55401100e44c2797d7ae572405225657f1f7da8e193c SHA512 df2e5915e8a7f7e278e2d3472afe6cc23fec5de808b0cc1b20365ad41cfd03b1efda80523059a96c6b3d9b8b0ccab311700ee6a5d6c9751454ebe3b2f168cf77
+DIST lean-3.50.2.tar.gz 1918353 BLAKE2B 2a8c41eef0cc3c2d3e1b45ccd2383279a1a91c0de772c5fe3f1ffafc808db4b6e7342f2f72bd4c4120ed4248d60359c6e331f4adc1d26c6328b284549861c4de SHA512 58d085deb0354db0067e86e6097dad7f1543f356d4e50607b8cc049a19d867aa7ea03553bab3799c6ad18d0ef4fa468b0f966512d8bf0076526f90e93195a407
diff --git a/sci-mathematics/lean/lean-3.49.1.ebuild b/sci-mathematics/lean/lean-3.50.2.ebuild
index e008b81cf582..e008b81cf582 100644
--- a/sci-mathematics/lean/lean-3.49.1.ebuild
+++ b/sci-mathematics/lean/lean-3.50.2.ebuild