gentoo auto-resync : 27:05:2023 - 15:12:15

5 files changed, 14 insertions, 18 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index c642ce333ced..e5bc070ead1d 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libnatpmp/Manifest b/net-libs/libnatpmp/Manifest
index 0e3b73d7faa7..89759360b6f0 100644
--- a/net-libs/libnatpmp/Manifest
+++ b/net-libs/libnatpmp/Manifest
@@ -2,5 +2,5 @@ AUX libnatpmp-20150609-gentoo.patch 2811 BLAKE2B 2125f030a90a20845616d28ecbf0554
 DIST libnatpmp-20150609.tar.gz 24392 BLAKE2B 0a8df6badf222328a24ae94a97386593c42bcda58cada97d37a2cf74f6f6b5e27189753590552187ed7afce66d34d204b9d18ecd38ac0bcbadf8c8129a3b44ad SHA512 e50b1f68ce9254bb2f068ddc37417a3c417b80f7b3fb3d84e3e9af4a144d89e204ab993b54c01657335e855d0124a8fcbbf96ce78db7b9ae0b03b6eb79de2e09
 DIST libnatpmp-20230423.tar.gz 26506 BLAKE2B 01386509e410312d5063038a4a929e2c838d8e6061f693cd43144f98dc4725deff459cb476842e6fab78323fb87ac0ce0f74efe3837031d89ea846932dc4fdcf SHA512 1697a414f0ff73876c177d8e09242c8da6fd4bc9b1c3a893bfb082420bfdac30f455507b81937042caaf6b30756d2055c073ee1de1ac73f7ef31e4c68e5c4ed7
 EBUILD libnatpmp-20150609.ebuild 792 BLAKE2B fe8fcd8cd2c9339db176c34681f32482a83e990b922d7c17ce2803a4cc8cdf4f5cd5f626e63a480957e5c1a014857705d4064fccbe0428146d5b478a2bd3e87d SHA512 d67291394514570e29fa50e1ab690c511cfcdcb599a1813a4ae4d008613574d39679545815c64d89993bf0c2d9438cf8215dda3febab55e319b1f25a2014217f
-EBUILD libnatpmp-20230423-r1.ebuild 802 BLAKE2B 1fdc8d762330fa3f7bb22b3d9f461b6617bdd7a6009258e56c574f78367b63c9eb8ab68f2cf1412e85998069dd0a35dc98dc1c9427c0cb1d23d1a131fc300d44 SHA512 b9600f9a01b88ee59eb9b121ef19c1588f86e77e46af4e2d052562e7aaaa5893dc263ae371162855790ec7d29a53b66f149c98a00ec1778fe18efd79f4e3e739
+EBUILD libnatpmp-20230423-r1.ebuild 800 BLAKE2B e018a148e02ffff5ee5e956cc32c416372b4793c34b77d65bb9302dfc89ac2e6fabb8c5e416de42b5d3b180326e4d98b541f908534001ca1c88c3afbc9daac6a SHA512 c7c6acaa9f4b9a27d58c2cdf7636e455649e371ba8c57114d7a75a5e0bf10299c8f55797bff196ee0c1295f0386873fa55ecbfb0ea2304974cf26e5e39f2078e
 MISC metadata.xml 251 BLAKE2B aff27f0414b759d8b480b5ff7510ad6b4c7247587e98da4e5110a1b20067eede21609515f370ecd8ece32e7a6667bb9b3e38718e4be4d3f584858db7459d030b SHA512 0afc6591b2d966f15fd3fbece3fc4c74f3c36ac26b51884c8a21f63ce26cacae12e8b7d8b90967818c6ec3d110d33282f5635bb0b606b8a08f7a573fc9f1f8fb
diff --git a/net-libs/libnatpmp/libnatpmp-20230423-r1.ebuild b/net-libs/libnatpmp/libnatpmp-20230423-r1.ebuild
index 6bc25d26becc..a787ad6c41b2 100644
--- a/net-libs/libnatpmp/libnatpmp-20230423-r1.ebuild
+++ b/net-libs/libnatpmp/libnatpmp-20230423-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://miniupnp.tuxfamily.org/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86"
 
 PATCHES=( "${FILESDIR}"/${PN}-20150609-gentoo.patch )
 
diff --git a/net-libs/liboauth/Manifest b/net-libs/liboauth/Manifest
index b350e0871a00..84999d93ddf5 100644
--- a/net-libs/liboauth/Manifest
+++ b/net-libs/liboauth/Manifest
@@ -2,5 +2,5 @@ AUX liboauth-1.0.1-doxygen-out-of-tree.patch 2231 BLAKE2B 61523955ac500d63879dae
 AUX liboauth-1.0.3-openssl-1.1.patch 4483 BLAKE2B 4d2628448a1341cc41a676d5002c7f0f17af384fafde77687bc83235d90f4b6b853bbc9a4262fd4acaa0b04cb67d586bca308bb9c66fafbe7de1734fb39a4c1b SHA512 90ae75bbaf7296826f813df852263901ad8632579b5e5dd1e8b1edc4719d3f749ffc30e6348ffc2ddd5239de544c934382f52c4d62e90b3e655fd9630b5b4880
 AUX liboauth-1.0.3-openssl-1.1_2.patch 750 BLAKE2B cf07dc1722c41f55e1ea5d241c91bd62d4eb8c862a727cf350ea10ca11a24e195439599bf1e712158d6f0dbd113d5cce62d567b48883f23e505e1df6d077a34f SHA512 778222c9b5ff2a35447cc8c14f7868f011c3a3e938cebdd617471221e07278e82b70bc436dbcf28c4b7a558486465a0e36278d18718f48f57a2bb47e74eba957
 DIST liboauth-1.0.3.tar.gz 504950 BLAKE2B 56cf10574af58995de9bf86bb7f00becb360cc899bf1ddb23804820d63ae2c7af29aa29031f68ce79a6cc441cbce27aebf5f1c9dfa029243d7732592d03620c7 SHA512 5a13818dbb3e0df76f7a3fde451eff4f90c9bebfe2076a294921af0c07c2b0789f717f0f862ac6961562d4227e016dc198ddd7efb9c7ac599c3bfbcdb2ac33fa
-EBUILD liboauth-1.0.3-r1.ebuild 1523 BLAKE2B 7c8bbddfa62e3413a79358caebc5acc2aab6201aaabc4df09ca9eb4c3bf544de452323fe16691ac7ae88e8fc0291ecacd5c1fa27de4d81afd37de898568c6464 SHA512 7ebe8606add68cee461725c13f167c1c6e9906a91786550909a9046d22ce0e878d614010858b9398fe0e8761cd017285d18b7aafccd01933cf643d946eee2511
+EBUILD liboauth-1.0.3-r1.ebuild 1582 BLAKE2B 26e6b35b7a613fb312a1c892aef2ea5120d3a04b8362cfb3d9e318fa332141f185867d7857e4616b1a7d65b5a437303738bed61b8133cee4ac44f756788d7e6c SHA512 5ff24f36e73b49f1721c25d95387852bfbe7157f8215dfaa62551a2782b3c22117ad3737abe36ab98405f95c7981435a0de523ff050ccc47ddd0f059021660be
 MISC metadata.xml 880 BLAKE2B 7d21173fe9d5aa67de1cd75f2055bd686ca7223ad58761cc79241e88e390696fa60abb32c845e51a827720d281963258b41661c0757ba28211b7a0f9055d8cad SHA512 09d4eff65caa5df8b6b60454726cbc0725527d823d337162b06d35476d54569b5e324e920a4c658dbb6c7d0db516e587903aeb6701f01206b7fb766081f11e92
diff --git a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
index f0475e3b43d8..911945ae3847 100644
--- a/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
+++ b/net-libs/liboauth/liboauth-1.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,8 +10,8 @@ SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
 LICENSE="|| ( GPL-2 MIT )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
+# Upstream recommend NSS by default for licencing reasons (may change w/ openssl 3?)
 IUSE="bindist curl doc +nss"
-
 REQUIRED_USE="bindist? ( nss )"
 
 PATCHES=(
@@ -20,36 +20,34 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.3-openssl-1.1_2.patch
 )
 
-CDEPEND="
+RDEPEND="
 	curl? ( net-misc/curl )
-	nss? ( dev-libs/nss
+	nss? (
+		dev-libs/nss
 		curl? ( || (
 			net-misc/curl[ssl,curl_ssl_nss]
 			net-misc/curl[-ssl]
 		) )
 	)
 	!nss? (
-		dev-libs/openssl:0=
+		dev-libs/openssl:=
 		curl? ( || (
 			net-misc/curl[ssl,curl_ssl_openssl]
 			net-misc/curl[-ssl]
 		) )
 	)
 "
-
-RDEPEND="${CDEPEND}"
-
-DEPEND="
-	${CDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
 	doc? (
 		app-doc/doxygen
 		media-gfx/graphviz
 		media-fonts/freefont
 	)
 "
-BDEPEND="
-	virtual/pkgconfig
-"
+
+DOCS=( AUTHORS ChangeLog LICENSE.OpenSSL README )
 
 src_configure() {
 	local myeconfargs=(
@@ -71,8 +69,6 @@ src_compile() {
 	fi
 }
 
-DOCS=( AUTHORS ChangeLog LICENSE.OpenSSL README )
-
 src_install() {
 	use doc && HTML_DOCS=( doc/html/. )
 	default