gentoo auto-resync : 31:05:2023 - 09:23:01

6 files changed, 23 insertions, 7 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index f13e2411a9c7..c6ca4c312c6f 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index fa8d0c952634..78d71b41b605 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -4,6 +4,6 @@ AUX libssh2-1.8.0-mansyntax_sh.patch 367 BLAKE2B 26d83db9af4f1c50cb29a1c560c8768
 DIST libssh2-1.10.0.tar.gz 965044 BLAKE2B 0e6f571cc723e0050bf7ba7492f361ef222547dcbc311019cb6762f01405b4906e0418207a7d484c5170bee5e6f666827a7ea0d0cf233f684f999f896ce0b415 SHA512 e064ee1089eb8e6cd5fa2617f4fd8ff56c2721c5476775a98bdb68c6c4ee4d05c706c3bb0eb479a27a8ec0b17a8a5ef43e1d028ad3f134519aa582d3981a3a30
 DIST libssh2-1.11.0.tar.xz 686796 BLAKE2B 36903798c72f7261d9e997254169c10a4e69166017445276de8b0066fff15cd4dae4119a8d6cbbab8859d765b2d7f34f2911bbaf83c8d6ac5d1feead6b5de64e SHA512 6d50c71b778ca0f769fcc9d2cc257ab669cd0b6c35e8b0e047b6b38aea10638974cc591ba27c25bb7dd523020b4a8a62e2c1ae368287d9dc254d5e24d4a7cee7
 EBUILD libssh2-1.10.0.ebuild 1345 BLAKE2B 4c2fac289235288aaab718a78cf75113e1e7141e5ca58eb98b22a1f67722ad1f2266f31d8040005da35a3dedac68312898e7d466e7ddbc0f3d804893eec66bd2 SHA512 ffdbb9393595a75b2db0f551989fa2713fe19893798c2ad73efc86be17b9de13210a600830ba7e769048b0cb69294881754e9e5118b8570c6f7349b321cca328
-EBUILD libssh2-1.11.0.ebuild 1378 BLAKE2B 82c75c5db56d439964dcfd9e3743616ba77ae377f8b7f7a559b6a2fccf850cca89a0d0d1cdc96020f6c0edadc3b727fc5f93dc65c1d7e69096586898de002f4c SHA512 e3e0b314d75b4d66f7048f03c2f51db65efcce4792fd594bcf7911c94c298b1a7ea2de8800a26c5de3cfee8c2a50551442a5d7c8b5c1fcab39b3f4f6336715fa
-EBUILD libssh2-9999.ebuild 1246 BLAKE2B c8ae8a57ffa96d31b035f5637a0f381ad61db03908c47da7b5cea44532b06f1993b8d3fe7722d4b9202895d98980edcad75fe41998c020ae446c1030a3dddfef SHA512 476f7ba945787520358351c2c0ea47022a4cbaae42dabb90432a62e9212c0dfa2bb6da5050bfefc76fbe30b1967d2fedb79da60a91a60a063f9c8f881858502e
+EBUILD libssh2-1.11.0.ebuild 1489 BLAKE2B c5baf6e5be59f17ab202fdfb99e8222eb453c7ec73aa75ae87802075054a307cb69d2d215622a049cae0775a79f9566814a43993fc631c6243b292697b438b2c SHA512 371e3ae24373949f6c49c48982ac5eef64a486b7d1b333eddc8850f8a61392ad77ab2ece742dd115b3d76193079bd56016f2d618eb90ef267e04398fa1435201
+EBUILD libssh2-9999.ebuild 1404 BLAKE2B c8722abf72bdf141067b8bc5b8c9c09d8fcd27b8a62be95d7ec4ab8cc9e51775cec3bd8144fb285dc2ce75b6d2b2e6b208dc9bf467056cfbae6f5834ca81f88e SHA512 189d0b54c101adc2eaa0973992194cdefa3aae8433e7d92b82742f95af4375ea788a8a6ec2858bcb8ce3603791de71537cb1404256d6f0165189891e2acdf260
 MISC metadata.xml 625 BLAKE2B 5b2b547a4378190e5fd38b0e4047556da2eb827db4b311aab8fd9456f15a711948bad53951d5b6f1f00620292f938ae097ea43044ab9cc926db941245de22887 SHA512 2ec081036258736ae097981cc5a997c81b09d235ac7f79500128675c0d9df0d8d83d3f570d6dfccac3340d1018f0ad3511f7a8df7e67e8bf9b0a17d4c7332d10
diff --git a/net-libs/libssh2/libssh2-1.11.0.ebuild b/net-libs/libssh2/libssh2-1.11.0.ebuild
index 2f60c46c3928..30a399914f72 100644
--- a/net-libs/libssh2/libssh2-1.11.0.ebuild
+++ b/net-libs/libssh2/libssh2-1.11.0.ebuild
@@ -47,9 +47,16 @@ multilib_src_configure() {
 		-DBUILD_TESTING=$(usex test)
 		-DCRYPTO_BACKEND=${crypto_backend}
 		-DENABLE_ZLIB_COMPRESSION=$(usex zlib)
-		-DRUN_SSHD_TESTS=OFF
-		-DRUN_DOCKER_TESTS=OFF
 	)
+
+	if use test ; then
+		# Pass separately to avoid unused var warnings w/ USE=-test
+		mycmakeargs+=(
+			-DRUN_SSHD_TESTS=OFF
+			-DRUN_DOCKER_TESTS=OFF
+		)
+	fi
+
 	cmake_src_configure
 }
 
diff --git a/net-libs/libssh2/libssh2-9999.ebuild b/net-libs/libssh2/libssh2-9999.ebuild
index 290d28ce2558..1c3811f85a82 100644
--- a/net-libs/libssh2/libssh2-9999.ebuild
+++ b/net-libs/libssh2/libssh2-9999.ebuild
@@ -48,10 +48,19 @@ multilib_src_configure() {
 		-DRUN_SSHD_TESTS=OFF
 		-DRUN_DOCKER_TESTS=OFF
 	)
+
+	if use test ; then
+		# Pass separately to avoid unused var warnings w/ USE=-test
+		mycmakeargs+=(
+			-DRUN_SSHD_TESTS=OFF
+			-DRUN_DOCKER_TESTS=OFF
+		)
+	fi
+
 	cmake_src_configure
 }
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -name '*.a' -delete || die
 }
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index c1ddaf22fbdc..cfb358c00f93 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -6,6 +6,6 @@ DIST node-v18.16.0.tar.xz 40467860 BLAKE2B b16749c0212f3aa196ec9fc0f999a023adeb9
 DIST node-v20.2.0.tar.xz 41778040 BLAKE2B 362b0ee89fe822722caeeb4b918550637bfb10791de75d872da334cb1123b744c351b5822b05abf4d36a0449badc5232ab1d73896dd5ce7755d10b226f0b9f52 SHA512 bf780e79bf6c7f766beb7734c7af45edc62094aba4c608f5519b130ff263e52ece925f85a4ee5740e962d16020070ef00933f6c74e771d948f23525c223da48e
 EBUILD nodejs-16.20.0.ebuild 6528 BLAKE2B 4d3ec05d91f5e72b8a663f9060e365c11db04903fc4e6eed2aee7cd77393d3088f8f43e94a551120e682cee3d0b54565b9d6b3520c42eb284889d3d5308e41e4 SHA512 cde12ca5e781397d259d19bffaa0c32126560d85eca314b370d80cd4bb9ff81dd981f74938826c5f190458a274fd20c4fd8e37c0acf6b7437b6152e70cfec2e6
 EBUILD nodejs-18.16.0.ebuild 7339 BLAKE2B fee49ebd361629b6972908c22dd3e9fda4a5d02d1682d320954c0711736976514d82d500a76ed8bef4a4e461df5f4c5877924ce5238ed4053f23f3ae111cf8ad SHA512 32cb0fe89eedfc5a611ceae2a61f0c921f129d3ecfebfcea5f83d3174e66624effc99727fbcbfd10ee0b5644a6d0cc625958de7f417e3ff61346ddafdd1d80fe
-EBUILD nodejs-20.2.0.ebuild 7151 BLAKE2B 3fe49dfe5889986c1f1c9ff432a6ade5259433ec6cae61db03e1100cf585664d913f86884910cd637992dfd19e62e03d214f4627a923cc6adcd50dc9f3156068 SHA512 340f198cca932837be7dee17c420e52584073334db6399ad2bf41f300ebf8476c57f11b0272af54bdbabeeaa8791b9a648e3ca4a8c7cb6bff2ca4275a8c2fa28
+EBUILD nodejs-20.2.0.ebuild 7150 BLAKE2B 040de165333ddf7a652f90e30218e5a1e822a91ecedc78baca3c2fe71c1ff264b13ab40b6ff6f9b9585a640c2042c5c164e1fe252f842b04ad28fff2d03b8053 SHA512 3cd741087760eb8b4c85f0cba9dee8841b8d560715f48dfea69d48dea1edbd062d457413fa99370d0aeaf35af3e51c11c7430ccfaa8e13cc6ea02bedad51a3b2
 EBUILD nodejs-99999999.ebuild 7153 BLAKE2B fcf751d78de2653872bded8099c53f45f6ffe6a03486ce54f655158d07b8bdec7093bb96790a56c895711e21ae91ed24d0db5167d0320abed240e22127bbd9b9 SHA512 a19dd18a95bf2f75ef03c5402be98c7786d0b05c08c4484204abea89c57a073e30981f90365206d9451baaa6f8ba92bf87458b14a3d5143fc2847a6820ac94da
 MISC metadata.xml 898 BLAKE2B a67e85ea95c272b8d18746254894b058433267a74b5bad66bac7d78c7db4cec297e06bc87fad3ee836fc91749aaee2c11c88b48b6ba033c36fa79132552faa81 SHA512 d498b288058e7282c5e9a28d4ba192a2ac5ef796eb1edf644aea41cab2d0eb6036426b188dd9af7eeb2eaf04b84011460cb3c3695ca8dde5667add21d9963c97
diff --git a/net-libs/nodejs/nodejs-20.2.0.ebuild b/net-libs/nodejs/nodejs-20.2.0.ebuild
index d03acc2fb2b5..333525b28001 100644
--- a/net-libs/nodejs/nodejs-20.2.0.ebuild
+++ b/net-libs/nodejs/nodejs-20.2.0.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 	SLOT="0/$(ver_cut 1)"
-	KEYWORDS="amd64 arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+	KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 	S="${WORKDIR}/node-v${PV}"
 fi