gentoo auto-resync : 30:09:2022 - 15:24:40

7 files changed, 4 insertions, 142 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 403fbb852661..85eb4e149402 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 1d2d641b7c51..2fe3e57dcda7 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,7 +1,4 @@
-AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
 DIST libssh-0.10.4.tar.xz 554920 BLAKE2B 9349a688bdbd7c0d3bc93d6d0d6d55122ae9f918b922baeae8a7c6d4ae3ec340e6607afdd8a47055176f31531aefa94b6cc2bda25d59625fe1a7f83823dd75f9 SHA512 01ee52d480201d9886c15e81137c185334b404d1c8e8b743ddf58e95fe8619c8c013616a49807bd1111fde72fa177cd35f3c22b66cbf5d720b5abfacdf7601ed
-DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d SHA512 4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1
-EBUILD libssh-0.10.4.ebuild 3497 BLAKE2B 5ff3dd8eedef01574a3c915f0e9cb4a3b78a323059fd59895f777b03776bbfd5b1a9e7bc4a6e5152b21c18c90a8d283de975cd04024d7b2f7ec370088c0c4b5d SHA512 21c04ac227bdbe8e96da78fb8e8ec8748cb58405da202254156bc94b5b559d27b7a007bf40d1577b13405e75e57688c8c7c494a2f4bf28cde2cb5b7bb392616f
-EBUILD libssh-0.9.6.ebuild 3249 BLAKE2B 262c8a347a8f2f22fbd8f64d592666b6f41272709ced4caa7f7b8642bfa0047e208494938073acc22c35251aa5742b4391ad863bd57438661368328c5635ea7b SHA512 f6cc5499261f82c457740bdfe2665f380d62a23447857d0ee9eb5c7c4dc28b064bb49ccb86265921eb9ff47d366f298f84caa9751cb175a9f7b963442833e513
+EBUILD libssh-0.10.4.ebuild 3494 BLAKE2B 37f0ae216b8a3410f59562ad4764c4ddb53d44aca2b760b9e48f552003324725943480c4ce093ceb8f9ada33e57f79a256cabd43a9e9058b98c774d7a8cabc54 SHA512 a4c91679393d00467a7cf6b8aace1d755e30189d0e4e47ba946d5b74588c0ecb2f14e7e35b1a4aa6d9ed87d129e2a7c35492a9d36217484dd336dc59dfbcea93
 EBUILD libssh-9999.ebuild 3502 BLAKE2B 610cc25ac1e65176f7480905017cfb1a945b49bd72903ce6f694f254d278173df285e4db5574eaf9c505ea9ae031cb6adbc7cf40918975719f250b2f6fa0f6fd SHA512 158df4438cfa23b01d76860fe185d01f20c9283ce18974cf98cabda01b5d1e7e00ec9170d8638770f6eac0e80dc2640be31ad472a5aeb93858b8d5bff6851317
 MISC metadata.xml 726 BLAKE2B 351703a7c13b7f66c152121dac43d09b53f3d141d9a37e0dfcd8601f6f30943698c66cf6e51cb6053d1891313b1bc46fbf4071aca39bf3d07d218f8d47ed1e83 SHA512 8f639e4c5ee39a54778e9948e347551372b2f83ca30fe360a1281a52c681563c5dd2d2e053c2263b24440fc1a11c6d3cf866eaa46e39610cbd01c76c29fde7bc
diff --git a/net-libs/libssh/files/libssh-0.8.0-tests.patch b/net-libs/libssh/files/libssh-0.8.0-tests.patch
deleted file mode 100644
index 7ce84f89983b..000000000000
--- a/net-libs/libssh/files/libssh-0.8.0-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libssh-0.8.0/tests/unittests/torture_misc.c
-+++ libssh-0.8.0/tests/unittests/torture_misc.c
-@@ -361,7 +361,7 @@
- #ifdef _WIN32
-         cmocka_unit_test(torture_path_expand_tilde_win),
- #else
--        cmocka_unit_test(torture_path_expand_tilde_unix),
-+        //cmocka_unit_test(torture_path_expand_tilde_unix),
- #endif
-         cmocka_unit_test_setup_teardown(torture_path_expand_escape, setup, teardown),
-         cmocka_unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown),
diff --git a/net-libs/libssh/libssh-0.10.4.ebuild b/net-libs/libssh/libssh-0.10.4.ebuild
index 33a83a595668..a9eb0f3c9971 100644
--- a/net-libs/libssh/libssh-0.10.4.ebuild
+++ b/net-libs/libssh/libssh-0.10.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
 else
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libssh/libssh-0.9.6.ebuild b/net-libs/libssh/libssh-0.9.6.ebuild
deleted file mode 100644
index e90e4d2cfed3..000000000000
--- a/net-libs/libssh/libssh-0.9.6.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
-else
-	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi mbedtls pcap server +sftp static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-REQUIRED_USE="?? ( gcrypt mbedtls )"
-
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-RDEPEND="
-	!gcrypt? (
-		!mbedtls? (
-			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-		)
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	test? (
-		>=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}]
-		elibc_musl? ( sys-libs/argp-standalone ) )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" )
-
-RESTRICT+=" !test? ( test )"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# just install the examples, do not compile them
-	cmake_comment_add_subdirectory examples
-
-	# keyfile torture test is currently broken
-	sed -e "/torture_keyfiles/d" \
-		-i tests/unittests/CMakeLists.txt || die
-
-	# disable tests that take too long (bug #677006)
-	if use sparc; then
-		sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \
-			-i tests/unittests/CMakeLists.txt || die
-	fi
-
-	sed -e "/^check_include_file.*HAVE_VALGRIND_VALGRIND_H/s/^/#DONT /" \
-		-i ConfigureChecks.cmake || die
-
-	if use test && use elibc_musl; then
-		sed -e "/SOLARIS/d" \
-			-i tests/CMakeLists.txt || die
-	fi
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_NACL=OFF
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STACK_PROTECTOR_STRONG=OFF
-		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
-		-DWITH_DEBUG_CRYPTO="$(usex debug)"
-		-DWITH_GCRYPT="$(usex gcrypt)"
-		-DWITH_GSSAPI="$(usex gssapi)"
-		-DWITH_MBEDTLS="$(usex mbedtls)"
-		-DWITH_PCAP="$(usex pcap)"
-		-DWITH_SERVER="$(usex server)"
-		-DWITH_SFTP="$(usex sftp)"
-		-DBUILD_STATIC_LIB="$(usex static-libs)"
-		-DUNIT_TESTING="$(usex test)"
-		-DWITH_ZLIB="$(usex zlib)"
-	)
-
-	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	multilib_is_native_abi && use doc && cmake_src_compile docs
-}
-
-multilib_src_install() {
-	cmake_src_install
-	multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-
-	use static-libs && dolib.a src/libssh.a
-
-	# compatibility symlink until all consumers have been updated
-	# to no longer use libssh_threads.so
-	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
-}
-
-multilib_src_install_all() {
-	use mbedtls && DOCS+=( README.mbedtls )
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
index e1ecfa3e1919..2f5a8e567bd8 100644
--- a/net-libs/libvncserver/Manifest
+++ b/net-libs/libvncserver/Manifest
@@ -2,6 +2,6 @@ AUX libvncserver-0.9.13-CVE-2020-29260.patch 822 BLAKE2B 04a21cb1834fbc1917a9b7b
 AUX libvncserver-0.9.13-test-fix-includetest.patch 1626 BLAKE2B 1a2bab37cc2716a0c3912a2d1b76329c81bc8c3c6b9a881a0813ab035e05a06683a908cb0ca55af94d8682ef6e0153c25d93dd09381ef1079c93808a0f7d529c SHA512 7cb35e32245152e0fdc10fd6ca80221bfe1d5a75ed9407e9d69a3082bba24cbf8868db5dc36390943e09f0beeb3a366f994ecde62c6f9d7e7688ba749249bf3d
 AUX libvncserver-0.9.13-test-fix-tjunittest.patch 989 BLAKE2B 2ebe6a5bf1f04bdb188ed9a3ca965a697e995268f2e65fb7de37da663cef91672111ba0eaa1d25c4309e3f600240042e773d342996168b8b9f2dac808004b140 SHA512 6ccee0741778ae7d504acf250bffdc2231556dbc1357fd08bf54fd769e73159c3c27714c512775266f0e1cdd145a61e029645a6676b198dbc8aa6bf7ad0ca04d
 DIST LibVNCServer-0.9.13.tar.gz 567491 BLAKE2B 138c7ca63f8cd30a21dc1b58aafa744e12a1a9eca503ffec18a63d18791d7a5df4eef176d7e4e797a2aadda1dd04d1b051abfd76bf5c6806d558c09ffee78cce SHA512 18b0a1698d32bbdbfe6f65f76130b2a95860e3cc76e8adb904269663698c7c0ae982f451fda1f25e5461f096045d40a89d9014258f439366d5b4feaa4999d643
-EBUILD libvncserver-0.9.13-r1.ebuild 2129 BLAKE2B 2d08c6a7ac9ca5c278ff611a8ab249440e3a9d445b065150253dfb6b8b981379acebcd516004def4354919987aea2dc78451da176f60ef664a5c61b5ef7d9f00 SHA512 9036f1d2e54556d00bc9c926b029be3b81628fd71a2739a980d1879716d37d16d57c456f13fd63699f43bd0d5d0a90478ca0f1dae8c990b0279fc9278059e5d8
+EBUILD libvncserver-0.9.13-r1.ebuild 2126 BLAKE2B 78fc25c244eb87115f31d0129a0ef5e7f842878428b65173ce61c3625b0357d231d2e1b35eb16740ea997e1a7e06f8502cc4d83571c5af243ae4a714c9b953d0 SHA512 7f281754cd0a3c67c5d76244498eb0fbebe7cb31fe0f55ac24fb819571ca548c3ac877bc220e4ea1a7ac094d39b586b390da13e7bc7c6cde8bb7828237ca0216
 EBUILD libvncserver-0.9.13.ebuild 2080 BLAKE2B ece08bc97161240f55bfc76bb3709c5bcf4f9e0be117c3565f5ca4e33a9699b7067ff6d13ec66c06fad3ce2f7df847bfd29c1f7be216b6ddde684d6034c6687c SHA512 1734f760558d2e438dd37d821b50b255a8fe6d9ea8e345e41a665868ec7c08a5e3feb9d1025aad5abacb4642ffbb64466949427bef409f9bdf3fe80b3fc54b59
 MISC metadata.xml 1078 BLAKE2B c1977b60d1c6943a3b6636c24e29d2b029dbb088c59defb8f4cd820aac317b6a207ffd3669e3da567270161392425b8a30be4bd544d91e6262f258449b71261c SHA512 d774527b02965a951ae5eba13a4865ee874aa0c969c32a4bc3643313ffefeb933700901dbeca6511048140d311b380e7e2035adfea4542b455b608d25eb47efe
diff --git a/net-libs/libvncserver/libvncserver-0.9.13-r1.ebuild b/net-libs/libvncserver/libvncserver-0.9.13-r1.ebuild
index 4b3ae4640064..af204e2ea41f 100644
--- a/net-libs/libvncserver/libvncserver-0.9.13-r1.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.9.13-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 LICENSE="GPL-2 GPL-2+ LGPL-2.1+ BSD MIT"
 # no sub slot wanted (yet), see #578958
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+24bpp +filetransfer gcrypt gnutls ipv6 +jpeg lzo +png sasl ssl systemd +threads +zlib"
 # https://bugs.gentoo.org/690202
 # https://bugs.gentoo.org/435326