10 files changed, 4 insertions, 146 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 34d93093a160..799b6c23b3ee 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index dddc0f68ba59..121678c4d6b6 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -4,6 +4,6 @@ AUX libresolv-musl-fix.patch 1554 BLAKE2B 496cae4e748089c6f2fe46850a4940660bcaff
 DIST connman-1.41.tar.xz 758556 BLAKE2B 45e522d4a3a8d1a2f8eb21612d85435020f51387d4285da65da56d022df2d521f81a782af82387bdede8b71bdc591b9ffb8b79e1b1dd9d1d83ffa96eede9c1bd SHA512 b7880d908635ab9350c12e207213d20b11c1a50afcb93ae92e1fc57d4345bf792afe1a5534650e18b8cd05a3766ce9993083b2d659e49f87b867e6f2c1a83b2d
 DIST connman-363e0ed955f605fb0dc919b7ee149b6071af73ee.tar.gz 738158 BLAKE2B 05315470fe055b6b42330d3aa6e4286c551f1ce43a63e6952f0f0969d3639275eab62da0d90ff6fd756fcfca37e11d16d4ed834f0cf02e1b8cf75be742cc6a75 SHA512 e5a66134f4ee99d03aa4c77082817a4886750434e676eecb394ba1aac0475034cadec66aba27704b173151dce74e92f9e77065bcdef9576c9ed3d3cfc13a1d68
 EBUILD connman-1.41-r1.ebuild 2821 BLAKE2B 02806a41c60c37033f24562c3300a0a319f92acdd9059d738198d5b63d04309dd409718c96e45ff491f02c04bd5fd96c1580997e0549b0eec00004ab0861be21 SHA512 000ec62fbe715919f3effe2604fe70eb2caeb5bdcd9d052c9e1c79a6d5b1ebf6d3165c3f4c669c713da5a22c1e6a2cb7127034ffb377d8cbc5ddbac9859d6b8c
-EBUILD connman-1.42_pre20220801.ebuild 2938 BLAKE2B 7fcbc0007d2814b721c8d16da8b13e70481947c99e6b53b253f2650a0776e30236ed87b318507ce47bd5c7e5cb00a3c1aca1c2ba2beac84a5e580aa1e33da271 SHA512 320cf2a86f8b0ddae5b5dc337d6c63244a62d9e4c986e82b996daa0c829cb69aa003f3812c481407156e4b89b2645ad4dd2ce78cadb561ce1decaf2826de23a6
+EBUILD connman-1.42_pre20220801.ebuild 2934 BLAKE2B 105e064ad5647ab8085f95e7cd4780018d27c3bc467ce15b70942a38241c65fb9c0c01f489be3429606568542295e7af1864f35829e2877fed22317e8e6f7f31 SHA512 69050e80a9cd5e182b17ae9e1baa4e2e05bdc40eb84f2c5277ce4874829e24184a7fea72c7890347577511210bd10e930816393909c4a4dea316845ed8cd5cb4
 EBUILD connman-9999.ebuild 2768 BLAKE2B 941f992ea03c199415c7c453a58335bc14f5d1bea965a676c364052a4dacaa3b95f28e7b8258f8069d2d4551142a0cd96c4eb748900778612372f79085141446 SHA512 b0e4d9b12c0a509899304e021b36a24ccae6e60334a50561224065b7ab022b14c31336cb4032cbaec05f8fd49db4fdc1c13775cccd434eef2cabc24203b8b495
 MISC metadata.xml 1303 BLAKE2B 5fd7c4c795c7003e86fb1f47f9e4569bfce981b13199efe2021009ba659cf67e2afa554fb99ded6f45985a43b09003e483d4c2283434efe26d4e06f7c97df6b0 SHA512 5575e585a4756330c323a2f000a53d80a9bf76225e294888542b5020c72846b27a4c4432d874b1952ed1c7ed4ee26e35925a75fd89d867b82c276784f50c3620
diff --git a/net-misc/connman/connman-1.42_pre20220801.ebuild b/net-misc/connman/connman-1.42_pre20220801.ebuild
index 848d8eebed34..c0a7ed478011 100644
--- a/net-misc/connman/connman-1.42_pre20220801.ebuild
+++ b/net-misc/connman/connman-1.42_pre20220801.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git"
 else
 	SRC_URI="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${COMMIT}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Provides a daemon for managing internet connections"
diff --git a/net-misc/csync/Manifest b/net-misc/csync/Manifest
deleted file mode 100644
index bc147565a4e6..000000000000
--- a/net-misc/csync/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX csync-0.50.0-gcc_5_and_8.patch 1346 BLAKE2B 55c78622122e429b5a72790c5db3b0e2e063f419ab85dac460541aac121bf8d957a2be443837023e745c71debfe908a8fd5f75d041b16f7c22610da9e049532b SHA512 fb739031b2eca4f69f1384262214b13d5ccfd0abc64d889bb1b69f3a04473a43129ed26990aebcfd51e5b98b70649d9fac36a7eb116d162631f074d60ea82a41
-AUX csync-0.50.0-libssh-version.patch 2107 BLAKE2B 1525fe1c9d9ac6d19c2b5dd6c7119795bddf2820e986b151b24f6dfc8afd61f39384da833be5936793bb312145a6db5eb81f4965e4f00fd221ea28e7a49b9404 SHA512 709456c8b162d994afb972b4712d30e6107eebdd356a99689335f1edffd1b07bd76de95186ffe5f9538899f9b6095da158973711e67ffffe4a601a7b2b422d5c
-DIST csync-0.50.0.tar.xz 2705992 BLAKE2B b59ee573eea9bd7c46302d3db782b46f978d62219e3a3e70e97a012d1ea32681a1aa3133505c3833c5d1e6d0fcb90cc985d21553086ed8de28c7ca9fc8aa0099 SHA512 babe44af3a4f0bf58e011f1c33c7a6df9bc7751e03714dd64d8269c7c51bcc7f2ab32c4d286e5a11465c9498c988d1812c426a4f415f1138a4fb9fa341e1e29a
-EBUILD csync-0.50.0-r2.ebuild 1170 BLAKE2B 6821df4617e8bc37106225e51ec1fe2faffcb62e609b8f77d42d5809e6071b3e25a713a069dba8996fac838494fbb1f08d6aefb821020b4736352d97a6c8a73f SHA512 3d3cf9573351a815c5bb548f04967b1ab8f9cfa98e3772cfabe5c348c97f2c0b7e03249ced17e67fd695a841d3a6dff9d797377adba0474beb40b4c8d4c891e0
-MISC metadata.xml 355 BLAKE2B 8340e48d7539b41e478209aebef5f25d42aa08936e109a848dacb7c3ca1ca208e4f23b113b0a6398065c90167bfc60cf6c53dad794d426d78c0cb3ecf2761453 SHA512 f9c45dd11f297f2851bf85aa2b694ba866936841e7b1f783e8920dfeb8cb5ef7587891bc490065788012bb506500f35371e38ca012afc79d5f9c01c5eeddec97
diff --git a/net-misc/csync/csync-0.50.0-r2.ebuild b/net-misc/csync/csync-0.50.0-r2.ebuild
deleted file mode 100644
index d749dab20f3e..000000000000
--- a/net-misc/csync/csync-0.50.0-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="lightweight file synchronizer utility"
-HOMEPAGE="https://www.csync.org/"
-SRC_URI="https://open.cryptomilk.org/attachments/download/27/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc iconv samba +sftp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-db/sqlite-3.4:3
-	net-libs/neon[ssl]
-	iconv? ( virtual/libiconv )
-	samba? ( >=net-fs/samba-3.5 )
-	sftp? ( >=net-libs/libssh-0.5[sftp] )
-	!net-misc/ocsync"
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cmocka )"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc_5_and_8.patch
-	  "${FILESDIR}"/${P}-libssh-version.patch )
-src_prepare() {
-	cmake_src_prepare
-
-	# proper docdir
-	sed -e "s:/doc/${PN}:/doc/${PF}:" \
-		-i doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DWITH_ICONV="$(usex iconv)"
-		-DUNIT_TESTING="$(usex test)"
-		$(cmake_use_find_package doc Doxygen)
-		$(cmake_use_find_package samba SMBClient)
-		$(cmake_use_find_package sftp LibSSH)
-	)
-	cmake_src_configure
-}
diff --git a/net-misc/csync/files/csync-0.50.0-gcc_5_and_8.patch b/net-misc/csync/files/csync-0.50.0-gcc_5_and_8.patch
deleted file mode 100644
index 44bcc3ed6819..000000000000
--- a/net-misc/csync/files/csync-0.50.0-gcc_5_and_8.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur csync-0.50.0.orig/modules/csync_smb.c csync-0.50.0/modules/csync_smb.c
---- csync-0.50.0.orig/modules/csync_smb.c	2013-07-29 14:04:37.000000000 +0200
-+++ csync-0.50.0/modules/csync_smb.c	2018-12-06 23:08:05.320992985 +0100
-@@ -49,7 +49,7 @@
-     char *pw, int pwlen)
- {
-   static int try_krb5 = 1;
--  char *h;
-+  const char *h;
- 
-   (void) smb_ctx;
-   (void) shr;
-diff -Naur csync-0.50.0.orig/src/csync_log.h csync-0.50.0/src/csync_log.h
---- csync-0.50.0.orig/src/csync_log.h	2013-07-29 14:04:37.000000000 +0200
-+++ csync-0.50.0/src/csync_log.h	2018-12-06 23:11:34.280239832 +0100
-@@ -55,7 +55,7 @@
- };
- 
- #define CSYNC_LOG(priority, ...) \
--  csync_log(priority, __FUNCTION__, __VA_ARGS__)
-+  csync_log(priority, __func__, __VA_ARGS__)
- 
- void csync_log(int verbosity,
-                const char *function,
-diff -Naur csync-0.50.0.orig/tests/csync_tests/check_csync_log.c csync-0.50.0/tests/csync_tests/check_csync_log.c
---- csync-0.50.0.orig/tests/csync_tests/check_csync_log.c	2013-04-22 13:00:35.000000000 +0200
-+++ csync-0.50.0/tests/csync_tests/check_csync_log.c	2018-12-06 23:11:34.280239832 +0100
-@@ -115,7 +115,7 @@
-     rc = csync_set_log_callback(check_log_callback);
-     assert_int_equal(rc, 0);
- 
--    csync_log(1, __FUNCTION__, "rc = %d", rc);
-+    csync_log(1, __func__, "rc = %d", rc);
- 
-     rc = _tstat(path, &sb);
- 
diff --git a/net-misc/csync/files/csync-0.50.0-libssh-version.patch b/net-misc/csync/files/csync-0.50.0-libssh-version.patch
deleted file mode 100644
index 77ce1cdafa14..000000000000
--- a/net-misc/csync/files/csync-0.50.0-libssh-version.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: csync-0.50.0/cmake/Modules/FindLibSSH.cmake
-===================================================================
---- csync-0.50.0.orig/cmake/Modules/FindLibSSH.cmake
-+++ csync-0.50.0/cmake/Modules/FindLibSSH.cmake
-@@ -20,7 +20,7 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD
- 
-   find_path(LIBSSH_INCLUDE_DIR
-     NAMES
--      libssh/libssh.h
-+      libssh/libssh_version.h
-     PATHS
-       /usr/include
-       /usr/local/include
-@@ -58,15 +58,15 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD
-     )
- 
-     if (LibSSH_FIND_VERSION)
--      file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MAJOR
-+      file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_MAJOR
-         REGEX "#define[ ]+LIBSSH_VERSION_MAJOR[ ]+[0-9]+")
-       # Older versions of libssh like libssh-0.2 have LIBSSH_VERSION but not LIBSSH_VERSION_MAJOR
-       if (LIBSSH_VERSION_MAJOR)
-         string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MAJOR ${LIBSSH_VERSION_MAJOR})
--	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_MINOR
-+	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_MINOR
-           REGEX "#define[ ]+LIBSSH_VERSION_MINOR[ ]+[0-9]+")
- 	string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_MINOR ${LIBSSH_VERSION_MINOR})
--	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h LIBSSH_VERSION_PATCH
-+	file(STRINGS ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h LIBSSH_VERSION_PATCH
-           REGEX "#define[ ]+LIBSSH_VERSION_MICRO[ ]+[0-9]+")
- 	string(REGEX MATCH "[0-9]+" LIBSSH_VERSION_PATCH ${LIBSSH_VERSION_PATCH})
- 
-@@ -75,7 +75,7 @@ else (LIBSSH_LIBRARIES AND LIBSSH_INCLUD
- 	include(FindPackageVersionCheck)
- 	find_package_version_check(LibSSH DEFAULT_MSG)
-       else (LIBSSH_VERSION_MAJOR)
--        message(STATUS "LIBSSH_VERSION_MAJOR not found in ${LIBSSH_INCLUDE_DIR}/libssh/libssh.h, assuming libssh is too old")
-+        message(STATUS "LIBSSH_VERSION_MAJOR not found in ${LIBSSH_INCLUDE_DIR}/libssh/libssh_version.h, assuming libssh is too old")
-         set(LIBSSH_FOUND FALSE)
-       endif (LIBSSH_VERSION_MAJOR)
-     endif (LibSSH_FIND_VERSION)
-\ No newline at end of file
diff --git a/net-misc/csync/metadata.xml b/net-misc/csync/metadata.xml
deleted file mode 100644
index 634008a187ee..000000000000
--- a/net-misc/csync/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>voyageur@gentoo.org</email>
-		<name>Bernard Cafarelli</name>
-	</maintainer>
-	<use>
-		<flag name="sftp">Enable sftp transfer support via <pkg>net-libs/libssh</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/net-misc/gsasl/Manifest b/net-misc/gsasl/Manifest
index 5bdd58085255..b584d489f421 100644
--- a/net-misc/gsasl/Manifest
+++ b/net-misc/gsasl/Manifest
@@ -4,5 +4,5 @@ DIST gsasl-2.0.1.tar.gz 3279632 BLAKE2B a25d121a5043455ed827a6bdc776c10d467a49b4
 EBUILD gsasl-1.10.0.ebuild 1904 BLAKE2B 3bc572a83c0dfa8837a6e8223bbbc2480a9a76746192884c4e85d6146ee0fa11b01fb38ba62a634f1f02be23a48fa86c68da085772cd3211fb30bf7b1c12b3bf SHA512 8daca23e2fbc2e6bb5fa0a4c671fcbb8f714043bead8e772d5735ff2f1879f0525dd20692281b90feaac735064a4732671617cfacc18b024d178d854acc0655d
 EBUILD gsasl-2.0.0.ebuild 1932 BLAKE2B dceeb9e0ba6793cb70ad1db1ac198ea2aa7880540e45359e7a0de35f52c4a16b730c16bee98f596c70c0347f3f077900801156fe7f80c351df10445e1c624e1b SHA512 a6c182d9d06c849a3bd9b66d24bb7336f7aa4b7225625f9737d4124003645e9c69da9f030cd64fbda907994b8a6e0cb46032a13c833490b27e00b4977c4812c1
 EBUILD gsasl-2.0.1-r2.ebuild 2185 BLAKE2B 8ead62589512588de24ae7619f1a39c7e31f0b5245a48d7a166e014f899f79db05389fc5d939e9d6c0af807ae813d79358a165e1a7bc50c6ed6364973159451e SHA512 ef7af4d634781a493f019ad8424eee1b1d5637662993d0739dfd21d481fe895841cd2ab011cffbd458397242232fb96dc805ff561ce09a1af0150fa2445ccf18
-EBUILD gsasl-2.0.1.ebuild 1996 BLAKE2B 4a846f9e1257038b8ac39ba166c10f3813f33ae8e2672fbdf46ea54853fdc3583b8fd6a531531aee9b5bdfee32e1a0854d5b48b94c99cb09d3f7bc578e9eccea SHA512 7c02e51f2ec6c5bf000042c8e21dc321b3233ef2ada1e3af80e59cfebb5c079a1e74b48f5466ed4419e6e627f4b233e53b5bbdf7fa08fa592af078a470d8c101
+EBUILD gsasl-2.0.1.ebuild 1994 BLAKE2B 6a85bdc65189d22d718530dd1769b98767099a10c49d2686f076daa99a19ac18eb38703252191e4633146732f1aa68f0e654012d81262366f413b4c930aaa4d2 SHA512 d7d1e08f70185e6e90a22f29db6240f8af9a3c5c6dbfd0a2249ce957e17df7ae81de09e2b3b548b028d402c413e30f1875b0f6da7891c3e61d95f804538ceb5c
 MISC metadata.xml 579 BLAKE2B 87f59c4a4c3ba2b3741aac713b47ec1357889afce3d06919705a5e31fba874ba5e0ba53c1a43cfb465d4c3ed138d465060f883afedd882547a39cefd58e20c01 SHA512 ccf34d49ff3453e97e1e4c2c9c769ea7ae201243d3756bd7154cf98581e704ae980a6e82ba8020993e42956a512111972ba2cc39e0f3fe789b1080ebe9e5f351
diff --git a/net-misc/gsasl/gsasl-2.0.1.ebuild b/net-misc/gsasl/gsasl-2.0.1.ebuild
index 2627134d7195..d8b4db232b4c 100644
--- a/net-misc/gsasl/gsasl-2.0.1.ebuild
+++ b/net-misc/gsasl/gsasl-2.0.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 # Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see
 # if it's a stable release or not!
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs"
 REQUIRED_USE="|| ( client server )"