summaryrefslogtreecommitdiff
path: root/net-misc
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/Manifest.gzbin55083 -> 55106 bytes
-rw-r--r--net-misc/curl/Manifest4
-rw-r--r--net-misc/curl/curl-7.79.1.ebuild3
-rw-r--r--net-misc/curl/curl-7.80.0.ebuild3
-rw-r--r--net-misc/dhcpcd/Manifest6
-rw-r--r--net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild4
-rw-r--r--net-misc/dhcpcd/dhcpcd-9.4.1.ebuild4
-rw-r--r--net-misc/dhcpcd/dhcpcd-9999.ebuild4
-rw-r--r--net-misc/dropbox/Manifest2
-rw-r--r--net-misc/dropbox/dropbox-138.4.2392.ebuild4
-rw-r--r--net-misc/gallery-dl/Manifest10
-rw-r--r--net-misc/gallery-dl/gallery-dl-1.19.2.ebuild4
-rw-r--r--net-misc/gallery-dl/gallery-dl-1.19.3.ebuild4
-rw-r--r--net-misc/gallery-dl/gallery-dl-1.20.0.ebuild (renamed from net-misc/gallery-dl/gallery-dl-1.18.1.ebuild)4
-rw-r--r--net-misc/gallery-dl/gallery-dl-9999.ebuild4
-rw-r--r--net-misc/gnome-online-miners/Manifest2
-rw-r--r--net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild2
-rw-r--r--net-misc/iperf/Manifest2
-rw-r--r--net-misc/iperf/iperf-3.9-r1.ebuild40
-rw-r--r--net-misc/minidlna/Manifest2
-rw-r--r--net-misc/minidlna/minidlna-1.3.0-r2.ebuild4
-rw-r--r--net-misc/networkmanager/Manifest2
-rw-r--r--net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild2
-rw-r--r--net-misc/nextcloud-client/Manifest2
-rw-r--r--net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch79
-rw-r--r--net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch419
-rw-r--r--net-misc/nx/Manifest4
-rw-r--r--net-misc/nx/nx-3.5.99.25.ebuild3
-rw-r--r--net-misc/nx/nx-3.5.99.26.ebuild3
-rw-r--r--net-misc/oidc-agent/Manifest2
-rw-r--r--net-misc/oidc-agent/oidc-agent-4.2.5.ebuild78
-rw-r--r--net-misc/openssh/Manifest2
-rw-r--r--net-misc/openssh/openssh-8.8_p1-r4.ebuild2
-rw-r--r--net-misc/pcapfix/Manifest4
-rw-r--r--net-misc/pcapfix/files/pcapfix-1.1.7-respect-CFLAGS.patch21
-rw-r--r--net-misc/pcapfix/pcapfix-1.1.7.ebuild41
-rw-r--r--net-misc/realtek-r8152/Manifest4
-rw-r--r--net-misc/realtek-r8152/realtek-r8152-2.14.0.ebuild2
-rw-r--r--net-misc/realtek-r8152/realtek-r8152-2.15.0.ebuild2
-rw-r--r--net-misc/rsync/Manifest4
-rw-r--r--net-misc/rsync/rsync-3.2.3-r5.ebuild6
-rw-r--r--net-misc/rsync/rsync-9999.ebuild6
-rw-r--r--net-misc/socat/Manifest4
-rw-r--r--net-misc/socat/socat-1.7.3.4.ebuild66
-rw-r--r--net-misc/socat/socat-1.7.4.1.ebuild61
-rw-r--r--net-misc/spice-gtk/Manifest4
-rw-r--r--net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild4
-rw-r--r--net-misc/spice-gtk/spice-gtk-9999.ebuild4
-rw-r--r--net-misc/suite3270/Manifest4
-rw-r--r--net-misc/suite3270/suite3270-4.0_p14.ebuild102
-rw-r--r--net-misc/suite3270/suite3270-4.1_p11.ebuild86
-rw-r--r--net-misc/vinagre/Manifest2
-rw-r--r--net-misc/vinagre/vinagre-3.22.0-r3.ebuild2
-rw-r--r--net-misc/websocketd/Manifest2
-rw-r--r--net-misc/websocketd/websocketd-0.4.1.ebuild2
-rw-r--r--net-misc/wget/Manifest4
-rw-r--r--net-misc/wget/wget-1.21.1.ebuild5
-rw-r--r--net-misc/wget/wget-1.21.2.ebuild5
-rw-r--r--net-misc/youtube-dl/Manifest6
-rw-r--r--net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild4
-rw-r--r--net-misc/youtube-dl/youtube-dl-2021.12.17.ebuild74
-rw-r--r--net-misc/youtube-dl/youtube-dl-9999.ebuild4
-rw-r--r--net-misc/yt-dlp/Manifest4
-rw-r--r--net-misc/yt-dlp/yt-dlp-2021.12.27.ebuild (renamed from net-misc/yt-dlp/yt-dlp-2021.12.25.ebuild)2
-rw-r--r--net-misc/ytfzf/Manifest2
-rw-r--r--net-misc/ytfzf/ytfzf-2.0.ebuild47
66 files changed, 546 insertions, 754 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a3068712e5b3..2904cd4bd1e8 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
Binary files differ
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 420b5398f49a..de264b1412c7 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -2,6 +2,6 @@ AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd
AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
DIST curl-7.79.1.tar.xz 2465212 BLAKE2B 2b694f96661c0aa0a136fdae4159e0ca8e811557c5a1f0b47cccaaad122f3ddbdaa6450c3835290955baf9357e872ee105a8cb0912064af3d3e38d16beb124ad SHA512 1edb71647a7f4dbb070baf1a019b4751aefeda793ff523c504410bb5cc74e5bffc52f20dd889697d1585f9ca3c4e81b1a9caadd182c30c8358ffd25f33e4db4d
DIST curl-7.80.0.tar.xz 2474492 BLAKE2B 0452ecb6943bc56b20ad8f1223135c9cae68cf31089b0e17e84d81af98dc5a47f5edfc271c5b4c23f232db6cea7ff5a9bffa9c7c319255d9afdb06fa5b8f761f SHA512 e04ddd74b0d5b3607a29bcf5d379d83a01c7dffa4ad3e2f25d8c85a3df7dbdb0625b0df1f04f02351695674502828e0e17e8b46c889cbf1e43f86d6e6dd716ab
-EBUILD curl-7.79.1.ebuild 7976 BLAKE2B c357b42732f1cd78231236fba09d431ab43feaa62601287f06d5a6254c1978d009a75d7df341837c1d192e1f3610fd6adcf4a50a07a9a58a5e96c301d3bad797 SHA512 3e97838ef17a7cc0bd45f258f1fddf22a1ba8b263860637c580d8aee3a8fccb91e75fbdd3fd9957e300a55ab26e548f9bcc95694341c17d8c4fe1e2de3793cb3
-EBUILD curl-7.80.0.ebuild 7525 BLAKE2B be1ff7440c5c3468bc50c9fe8b3935a6452725afdbc07b73dd167147fb3c346d3e5be89f8544241b0acbf42212b4ea7a6d803cde5ef04bf762416f7081f6e46d SHA512 070d9611fb4ecc21811040f9d742156dd5e343fd6f5dbf6a281b5081e87bc69d09727bede3060390194c0576b320e6e82266f23ab722143d91145582fdee1ed4
+EBUILD curl-7.79.1.ebuild 7955 BLAKE2B fdfb668aa3523341fe5bf6dcb330b75af3279a58202c4aecb7b61a33cf9f9622c6b79eb20803cfcea2320b3d1c5509ee7e6ed6c850da6364c2dd19b3154d78cf SHA512 b9ca03e8d6e96d8e401ac0fa115788226c490e614f76cb9d6c240f5ca64adcb062ff344cdfe7666979697b9e53a436b56a5a94f1137faf723fd247029c4e873d
+EBUILD curl-7.80.0.ebuild 7504 BLAKE2B d55d48dcbbf407a8bdd87005b264a755221085d1ecd92b334d2136e54afdf2675b5fce23aa28cd457ef2881e42bd71cc6b2b1a25c7f6d56b979107b3620f765d SHA512 7c35440cefe794b801d8b47d62abcc72a3649fc09e0b11230cf2f7b12296f71421f52707f691faa5f92ae85872a9d90d2c941fb13fc578042ebed75c0bd2c196
MISC metadata.xml 2050 BLAKE2B a795f1af5b0945a936d279317ac89de2c32ca0e0512ccbd5d19acd29d82415d6c8e4ea4480150de8910b0a1c5e7ce4260b3c26f5f720a4ec828c4d78f6d40adf SHA512 add740cc284bd6912dcd4beb1d706cbfde85ff9859032b9706dddb69dbd5df613043f8e2b1fe634700b97a92cd6a953908486ec9b7b1564a16ecbec2c48b5dfd
diff --git a/net-misc/curl/curl-7.79.1.ebuild b/net-misc/curl/curl-7.79.1.ebuild
index 9a26258ec6b1..cb574d8fbe9f 100644
--- a/net-misc/curl/curl-7.79.1.ebuild
+++ b/net-misc/curl/curl-7.79.1.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"
@@ -15,7 +15,6 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 s
IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads winssl zstd"
IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
IUSE+=" nghttp3 quiche"
-IUSE+=" elibc_Winnt"
# c-ares must be disabled for threads
# only one default ssl provider can be enabled
diff --git a/net-misc/curl/curl-7.80.0.ebuild b/net-misc/curl/curl-7.80.0.ebuild
index eb15e98757d7..f844759cd300 100644
--- a/net-misc/curl/curl-7.80.0.ebuild
+++ b/net-misc/curl/curl-7.80.0.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"
@@ -15,7 +15,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~
IUSE="adns alt-svc brotli +ftp gnutls gopher hsts +http2 idn +imap ipv6 kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp samba +smtp ssh ssl sslv3 static-libs test telnet +tftp threads zstd"
IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl"
IUSE+=" nghttp3 quiche"
-IUSE+=" elibc_Winnt"
# c-ares must be disabled for threads
# only one default ssl provider can be enabled
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 0b500a5c7a1c..da4a4d3d7ff6 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -5,7 +5,7 @@ AUX dhcpcd.initd-r1 339 BLAKE2B f5c8574545d211918cba49b0e0caf22b6dd0630d3e8627e8
AUX dhcpcd.service-r1 308 BLAKE2B 558789adc2b67ee9d13b8213c9729f23dc691d3da8e96d93283c6c1fcf3733b17036df2a736166414a4a4738ca2a41f11b498326f18dace02e3b77945f7d8f23 SHA512 992b6f3c69b982f1dc01098dbecdee1ee2dc12e59646d13648f378a2e628cc612b65ee15a1373e3cacf7e712c6a6708c6824a9396b53e8ed8b0b3179f5267041
DIST dhcpcd-9.4.0.tar.xz 256440 BLAKE2B 16d63e957dbdf49647806ebe69487edc96502f43af8b8b6c6e40311994611d2516e2c839fed41863b8509a0953421091577d4cb202ebda3b300f3b1c761c07ce SHA512 e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f
DIST dhcpcd-9.4.1.tar.xz 257092 BLAKE2B 847c7451918ac89fe384e180ec52ee4624c0f2dc73354ecb4c63b02d8d9cf0a6d164b33e5d083a05d4868079dcf6208a820b4263c80337a12be40a27517ecf87 SHA512 530e6a5bddab4f91bd66f8d47ccd8d6cac4bc2998ddd36da7e257c83270b558016e9e1fc2f815fb99c0d86ed4bbc2a3a1b78788e69fe151fddaf94428a47fa45
-EBUILD dhcpcd-9.4.0-r1.ebuild 4803 BLAKE2B 1c93be89788270ed167a8d2e5f9fc6761f563aafad9053187c118f3b5b6b47833411577f3071726380c82a1d8d5c53b50a3f544d244e72ddbfe82cbaa37fba43 SHA512 fddf7f0abe8a11e8763835c970e5da8d7cc61076b201829ed0ea4464e2df3bd3eee884e3b8c6fc570197202e06ac175510509921e7d621d6b1b04cac6b50d865
-EBUILD dhcpcd-9.4.1.ebuild 4672 BLAKE2B 5f9a04694321efff65e9e362f2003751866fa5da42fe06b173f9adb24d39b9d04f3c818b13f4a89e90f6cf09d8fdad85cdd52e2035cb198b9a1c50bdc222268d SHA512 25d79939886e696848791b9a317fd5b63a42ef6d64d2810fa63efe887f6d534f3d058ba6c92503d35cc8b9a3da49c7e32db345b91f0479b5377a17f79a7f042b
-EBUILD dhcpcd-9999.ebuild 4672 BLAKE2B 5f9a04694321efff65e9e362f2003751866fa5da42fe06b173f9adb24d39b9d04f3c818b13f4a89e90f6cf09d8fdad85cdd52e2035cb198b9a1c50bdc222268d SHA512 25d79939886e696848791b9a317fd5b63a42ef6d64d2810fa63efe887f6d534f3d058ba6c92503d35cc8b9a3da49c7e32db345b91f0479b5377a17f79a7f042b
+EBUILD dhcpcd-9.4.0-r1.ebuild 4791 BLAKE2B af8654964e43e6ee078187b7cf855e2ef36379850cb7aa8b5df3527777a5b348a8b84c7aff5ef7008ea115eb1062e16b37bf61049f45c4bd6fa39ad38968cb6f SHA512 ce858a4c1c3b40fd09201d2db3d9842bbb1b3226da6e8a454574c8a814192b9960445a413b4bcff1856483abfa3fd715dd64763ba4eedfaf2e51c24c6d730396
+EBUILD dhcpcd-9.4.1.ebuild 4660 BLAKE2B 131d57f1dc222f616c7424023e2691b781eddc61702aa2a1002b5f0f8cba642f57db58de4a6418d6982e72256edbba7f8180092eb7a6e41719a30ca8c4a9879a SHA512 2df45d73f5b353b23600935c20657c04abf78719e2fcfb54cf80a1e386b29201aa7e759f3995b4efe5a2a29bbaab915ca5f0cb139c2d3662c454bd27470d5626
+EBUILD dhcpcd-9999.ebuild 4660 BLAKE2B 131d57f1dc222f616c7424023e2691b781eddc61702aa2a1002b5f0f8cba642f57db58de4a6418d6982e72256edbba7f8180092eb7a6e41719a30ca8c4a9879a SHA512 2df45d73f5b353b23600935c20657c04abf78719e2fcfb54cf80a1e386b29201aa7e759f3995b4efe5a2a29bbaab915ca5f0cb139c2d3662c454bd27470d5626
MISC metadata.xml 714 BLAKE2B 2ee7c968d6c9285404d5cd22afdf2d62db42af2d3d35f7784dffe80d448ea96dec7dcaa2d4784aa35ab7002de5784b191a71cb854eeede645fb3bf018c19f37b SHA512 44cb0105baac58bc24a7ff3d868ab2eb01d7f1447ca5f6ab830c60d8dc46212bb064bdb67d48bb86908aa9803b5dc887fd51733fccda8338828317f10895ea45
diff --git a/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild b/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
index 996f45958644..2eea3c71b144 100644
--- a/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.4.0-r1.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
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/
https://roy.marples.name/projects/dhcpcd/"
LICENSE="BSD-2"
SLOT="0"
-IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev"
+IUSE="debug +embedded ipv6 kernel_linux privsep +udev"
COMMON_DEPEND="udev? ( virtual/udev )"
DEPEND="${COMMON_DEPEND}"
diff --git a/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild b/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild
index 7cebecfb3116..6d04f97031af 100644
--- a/net-misc/dhcpcd/dhcpcd-9.4.1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.4.1.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
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/
https://roy.marples.name/projects/dhcpcd/"
LICENSE="BSD-2"
SLOT="0"
-IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev"
+IUSE="debug +embedded ipv6 kernel_linux privsep +udev"
COMMON_DEPEND="udev? ( virtual/udev )"
DEPEND="${COMMON_DEPEND}"
diff --git a/net-misc/dhcpcd/dhcpcd-9999.ebuild b/net-misc/dhcpcd/dhcpcd-9999.ebuild
index 7cebecfb3116..6d04f97031af 100644
--- a/net-misc/dhcpcd/dhcpcd-9999.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9999.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
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/
https://roy.marples.name/projects/dhcpcd/"
LICENSE="BSD-2"
SLOT="0"
-IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev"
+IUSE="debug +embedded ipv6 kernel_linux privsep +udev"
COMMON_DEPEND="udev? ( virtual/udev )"
DEPEND="${COMMON_DEPEND}"
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index db89bf86874e..4f1527ac77ba 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -9,5 +9,5 @@ DIST dropbox-lnx.x86_64-136.4.4345.tar.gz 101755439 BLAKE2B db966087ad02d05096d8
DIST dropbox-lnx.x86_64-138.4.2392.tar.gz 101870495 BLAKE2B c9e38624814afd47776a04d0cf8f7ce7fe1392a72bc778d322f91e3aa097e2769acfe696366dd98f53b2af5ff87f88a9bb78bc906a3cfcd6bff0cd436fb16bd5 SHA512 6692711545af89bbde6f43bafb76b8c89d813522849ddfc66892d575ee4c315273a4a489a73f6e80f457c8b2059a62100469c4d43dd12f99a98d803fde9701bf
EBUILD dropbox-135.4.4221.ebuild 2673 BLAKE2B 6e031fb04250842de2b31700ca9f5c68a2ee605ed8d55a0a1b07247fafc85179968da4cca5f55e7231a6024d5cdc7c8d691003cdf00e3352985aa245e3ddea59 SHA512 fda0adb204f8899a4355e9d618989b0772ae987fd2694e7a099aad4b8ec3c6f45cc6af63d74bf68728668724251ee56e83eecf7452b084c89c50a10191189869
EBUILD dropbox-136.4.4345.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
-EBUILD dropbox-138.4.2392.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
+EBUILD dropbox-138.4.2392.ebuild 2673 BLAKE2B ea072896d60698af6f9e20e5fe55d846c858748a04d3b7530df6bd5e33b159a76b82046b246a2c38ff56bfc0503c7a71199e5cc2c29731d45349a5f39c3553d0 SHA512 929ebc6094fac362fed2d41379ff535a632da9a9e3c5ade2b1d66a591e9c571b8bb981cfa109a8460918e5e89af49a10071cb7ba4f972d3d66bed673567320c0
MISC metadata.xml 336 BLAKE2B 0932d5cb97ca50abfbfd49b3b209733da73c94ed41ef1087e6c43c4e65f3a09186f74c507cf0db5d64a1c5231d3560a7d6a8bb6130e95e1d5dbb7f3974801df3 SHA512 25bee9aa1ab64f01bb4544dec14b4b98bcb3877714ec33c6cbed4cdd3362d2a4cab58f425cad3723398e4ee0a2ba16a550ab38ff9f974cd0c5046df1b34b5eb0
diff --git a/net-misc/dropbox/dropbox-138.4.2392.ebuild b/net-misc/dropbox/dropbox-138.4.2392.ebuild
index be2fed244fff..f3ad56f900ca 100644
--- a/net-misc/dropbox/dropbox-138.4.2392.ebuild
+++ b/net-misc/dropbox/dropbox-138.4.2392.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
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
IUSE="selinux X"
RESTRICT="mirror strip"
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 4889ed6e2965..11d44eda237a 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,8 +1,8 @@
-DIST gallery-dl-1.18.1.tar.gz 368692 BLAKE2B f92eb7a876563ed5bc78ca1222b8c45fe78ad6d899a55bf2edefece14209acfc784bc3ac84c7e84397746f5a5ab01c2c6f94efcb0f28d2aacac3cbd68ebcd545 SHA512 20e4f983160870a646a66963505d2c53f5498b9bbbb869a603ae53848ee788f26c6df4c5951805d99f225954ddbe692c2da5501a409650cc3e522d97f34a7c0d
DIST gallery-dl-1.19.2.tar.gz 393664 BLAKE2B cae6b2cdd9f940892032498c0450918481aea22a701b236f580e6c7d2f77b7ce5fb2336a93c882b35063eb0193b9ebb956f8d12e8b6794255318b6eb65ee9de9 SHA512 7aa014e0e84d856bd9ca45131baed513f1d3c73c1500df32c39b5a40f17cd951e80b819130254f9b563a504866e5feebabf6b5c8bf517a43a6ad7a15e41f0476
DIST gallery-dl-1.19.3.tar.gz 399869 BLAKE2B cef40ac7759bffb42536fed866df946e6c22e333ddae98db149109779dd9439c775722b887898e322de26860aee0990a440aa0812620dadb9d223da09f25d662 SHA512 b50c0e341a0b2b08ddd8f5674c1f4df097b862827f8bca2270d3fd62be619fab8a4c097de9d3193e8161ebcb64eb6c77676c243bca4cabc7dc1d3f192b485ad3
-EBUILD gallery-dl-1.18.1.ebuild 930 BLAKE2B a1a3bbf757d21d87f8813e8afe080946ffacf4f4d7cdcd1f6608d7e67c5c25b6ec7a941ebbddf8760f42a0da6eacd213a8a1e8e3ae70bf08efd72f09827a7c42 SHA512 b6d7e658f90d49356efcd4561bc71cd936f0e25d8577299803555f405de3af8259800a7301ee7974aedf6b83047791353e41e394e5d191831d794654ace5d037
-EBUILD gallery-dl-1.19.2.ebuild 930 BLAKE2B 77f317e5edf7a8bfd60183c9aa71a56e1b7bea662c11587a2141ff46f3d70ba8f9e46a023054aacfb78743ea5d5a29a26bac6dfe3a175571aa0aa52f46d6b443 SHA512 4ea35f63ffcc9da3ffa40f4e703440a3241bcf3a1d68ccd643404cf83079e44dffaa44e89ef2b65ca90287555d2c7bc458f203cd53f9237c4e11b9ca1d23e0eb
-EBUILD gallery-dl-1.19.3.ebuild 930 BLAKE2B 77f317e5edf7a8bfd60183c9aa71a56e1b7bea662c11587a2141ff46f3d70ba8f9e46a023054aacfb78743ea5d5a29a26bac6dfe3a175571aa0aa52f46d6b443 SHA512 4ea35f63ffcc9da3ffa40f4e703440a3241bcf3a1d68ccd643404cf83079e44dffaa44e89ef2b65ca90287555d2c7bc458f203cd53f9237c4e11b9ca1d23e0eb
-EBUILD gallery-dl-9999.ebuild 930 BLAKE2B 77f317e5edf7a8bfd60183c9aa71a56e1b7bea662c11587a2141ff46f3d70ba8f9e46a023054aacfb78743ea5d5a29a26bac6dfe3a175571aa0aa52f46d6b443 SHA512 4ea35f63ffcc9da3ffa40f4e703440a3241bcf3a1d68ccd643404cf83079e44dffaa44e89ef2b65ca90287555d2c7bc458f203cd53f9237c4e11b9ca1d23e0eb
+DIST gallery-dl-1.20.0.tar.gz 407372 BLAKE2B 8d7bd6ed4a769b4d4b3357b146babda2ac36989ce1373977b4902ae350a1e430585a5064205fb2038c62727c13c8b09a010aa9e32a96483783229db6366425b6 SHA512 d373b7a104232c99bfae8f92adc3af5ea51e8a1ccfec6db54831de899f9568be0526c8c7cd8f9cdc4680b8dc8934d483c95172b68cffca6b59b605698e2bca65
+EBUILD gallery-dl-1.19.2.ebuild 933 BLAKE2B f7d5f587bec0896d09db3aa50b936b78d96afe4d0e2501b33588416862eb25225999d51777a623a54c1179fd50a368bc7226ded68fa885372222f5b22fe91aa2 SHA512 85582c518e42919661dad278a4a72092316c4e32d7f7a830c9efe5e0df59c2a7f47913135ab744eda5d36a3c888baca84db8aac9dca8557d41479a882e1e9808
+EBUILD gallery-dl-1.19.3.ebuild 933 BLAKE2B f7d5f587bec0896d09db3aa50b936b78d96afe4d0e2501b33588416862eb25225999d51777a623a54c1179fd50a368bc7226ded68fa885372222f5b22fe91aa2 SHA512 85582c518e42919661dad278a4a72092316c4e32d7f7a830c9efe5e0df59c2a7f47913135ab744eda5d36a3c888baca84db8aac9dca8557d41479a882e1e9808
+EBUILD gallery-dl-1.20.0.ebuild 933 BLAKE2B 68ab8a68d180c9c3672feb882c5a416b1884eecbba5b13e3e8b8df4e289b4917b96d94eda15fb5d30943f55276a3e96350c14560d297ce811e4dad780be6edc5 SHA512 bebbb69025617fb35750cf18406ec75ebb0f3836e9762ef3350ca7594be6c18bc3140e241c1b74b2f3811c0c7fb37887be29cdfd25e52b89f5f6651c7b1df5bc
+EBUILD gallery-dl-9999.ebuild 933 BLAKE2B f7d5f587bec0896d09db3aa50b936b78d96afe4d0e2501b33588416862eb25225999d51777a623a54c1179fd50a368bc7226ded68fa885372222f5b22fe91aa2 SHA512 85582c518e42919661dad278a4a72092316c4e32d7f7a830c9efe5e0df59c2a7f47913135ab744eda5d36a3c888baca84db8aac9dca8557d41479a882e1e9808
MISC metadata.xml 606 BLAKE2B 231314cca96ba14b3da1d9876ae9096f321ffd7803dee9c9242b87c7fad20977d9e3a8c5d0fb9060583eea95ec8726c58b9d4a4074972eabd4e6dd34bd263c94 SHA512 8401ded38af47ac11b6a11a1847e6ec5ff4609aef50ec96bca539a2d0601c53d46913decc0a03ffc757f79dc6284072ffd29e2cdab4504e7e1a91a03e006f160
diff --git a/net-misc/gallery-dl/gallery-dl-1.19.2.ebuild b/net-misc/gallery-dl/gallery-dl-1.19.2.ebuild
index 79c29ccc0450..e0f925d5ec54 100644
--- a/net-misc/gallery-dl/gallery-dl-1.19.2.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.19.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=(python3_{8,9})
+PYTHON_COMPAT=(python3_{8,9,10})
PYTHON_REQ_USE="sqlite,ssl,xml"
inherit distutils-r1 optfeature
diff --git a/net-misc/gallery-dl/gallery-dl-1.19.3.ebuild b/net-misc/gallery-dl/gallery-dl-1.19.3.ebuild
index 79c29ccc0450..e0f925d5ec54 100644
--- a/net-misc/gallery-dl/gallery-dl-1.19.3.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.19.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=(python3_{8,9})
+PYTHON_COMPAT=(python3_{8,9,10})
PYTHON_REQ_USE="sqlite,ssl,xml"
inherit distutils-r1 optfeature
diff --git a/net-misc/gallery-dl/gallery-dl-1.18.1.ebuild b/net-misc/gallery-dl/gallery-dl-1.20.0.ebuild
index f202ee3c50b3..885d94ca287f 100644
--- a/net-misc/gallery-dl/gallery-dl-1.18.1.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.20.0.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=(python3_{8,9})
+PYTHON_COMPAT=(python3_{8,9,10})
PYTHON_REQ_USE="sqlite,ssl,xml"
inherit distutils-r1 optfeature
diff --git a/net-misc/gallery-dl/gallery-dl-9999.ebuild b/net-misc/gallery-dl/gallery-dl-9999.ebuild
index 79c29ccc0450..e0f925d5ec54 100644
--- a/net-misc/gallery-dl/gallery-dl-9999.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-PYTHON_COMPAT=(python3_{8,9})
+PYTHON_COMPAT=(python3_{8,9,10})
PYTHON_REQ_USE="sqlite,ssl,xml"
inherit distutils-r1 optfeature
diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest
index 5d54668137ba..4132cf411d18 100644
--- a/net-misc/gnome-online-miners/Manifest
+++ b/net-misc/gnome-online-miners/Manifest
@@ -1,3 +1,3 @@
DIST gnome-online-miners-3.34.0.tar.xz 272324 BLAKE2B 3718b649cd08a03a7e974607975992f4779926c08cbdeb724c314aa431f161599f6d74c2114dc1bd6fa0896781bf07df024f4a53a3f2fadaf1e9d849f8054e5a SHA512 bfcdd7f11607663eda491314c34a9b50f2885f6fb39e7c9e68a77927bbcc326979fb8900ab5dfac1494ac575dbf0e3f3b7459ec3f38cb1eb8961158e3fe44464
-EBUILD gnome-online-miners-3.34.0-r1.ebuild 905 BLAKE2B 281d226cb596077c5e20981a3bde383fef4dfacb9dc7fdbdb4b31f471febe877efadbb7e717420eadb1fe0e5b8eaf4919cbab0562928a2392420c4e035bb534b SHA512 9d1e05d9a4bf8f064a26d01ed822664bac8775f32148ee56732bb412626d6e3f4afdd846fe7917984a02c57ce4b68335c9a8a1bd80b7696f517e6e2cf533ee66
+EBUILD gnome-online-miners-3.34.0-r1.ebuild 912 BLAKE2B 51694cc1809a5b5de5f532826d90c2e3bc1d3d30b2cd8ee125d77ad64c7f1f92953f858b34769da5da5db72cb0599b30585f872f21a2e2edad6d3b80b1457d1e SHA512 b59f8843356afa761ea89c282cf546f187abd754312699e127992ed28e31a11f3ebab13926463c0c68ed8f67013318b415c1be3e76920a8aaabf3a0c998997d5
MISC metadata.xml 313 BLAKE2B 14b8dc0d350cff3ce60111be31eaab9f7097a90bf3140bbd79e64fd91319819bcf63d50ac77ee4b5d65ec9fbc4df4b5fd73d2de2f242e02e6140aae39e3cf732 SHA512 2f69d70da13321905317bc066afa7c041d154eb4dbc3b86c912a971ad36c07a9d4d56b1bfc18651bcd84058cfeab254269670bdffe04366220132dba3d6ae0e9
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild
index 0330845cb380..d5adda1e10f7 100644
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.34.0-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
LICENSE="GPL-2+"
SLOT="0"
IUSE="flickr"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
# libgdata[gnome] needed for goa support
RDEPEND="
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 77ad379d27a5..506a36181b42 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -6,10 +6,8 @@ AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1
AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712f4a83c45ef426a8eada38b671c32023e5661e03d9bd52c9f361f8702a94999ce8134534f87bc2 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040
DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
DIST iperf-3.10.1.tar.gz 636957 BLAKE2B 8390b4fb0d4c6590bf73e46d55fbe100f1c9832b4e7baba23b4bec2808b42582bf76cc4250c529a1eb4a58c7214120f0e3a393a7c2602b838b22d97eb53842b3 SHA512 d1139aed0c7a99e8cfc23c41d606854d48a57db24d45ea31412d81222b09faeee6edccdf4030a00eeb6acbfd540d4b985b4a89f81a4d5b84592339ad5e2e9e41
-DIST iperf-3.9.tar.gz 627100 BLAKE2B c09018dc066612c61076ed4c53dd93b4dba766fbcbc359eb402055dcaa90af63e2df2b6c67ba8a0a72a17648014240dc5b355084e69550afed4d59257a224de8 SHA512 3da0939bed576a7c14baa03c996e6f407f20bfe58c4b3a36a66e74f41bd5442c0b23ab18c8eb1f2f37fd47449af533b61b658d810c68707b2b06d28894ac2035
EBUILD iperf-2.0.14a.ebuild 856 BLAKE2B d75c7d282707edad5bcf7b8304c1820beb7dbe082f8a0203dd75857ab9ab80a741049acb671bd3383aafa936a51fcaf4cee19e98de64e71456332d6cd676e8b9 SHA512 2dfca97c4d60f56a8977279dd947fc35f0c30d8bc3c36fe308bb72de8287b5975ea20be2b11aaf1b2d858b1e3543ef759a94419e90a9ae0a304e8f852e9a1d34
EBUILD iperf-2.99999.99999.ebuild 670 BLAKE2B 753dbd819ad867ee52dcdb9af069667d78053826f0028257eaee9fa13b6fab31cb27e5d419baa4c038a3346f607cd06639ed4dcc8fabbee6af943de336e9c45d SHA512 37d2329648792714b13e5fcdd2709b181d1cf32aa159aa39d8e3a1b922a01ef47e13ea340bef966991b7321d93bf9a41e7d2e824204f6770610eb71afeec6f13
EBUILD iperf-3.10.1.ebuild 956 BLAKE2B c15ea0249e0b0d6b42f8201c906d21cb6cd2c7feddcd5e08c763fa8bd9e80114f77feabd9b800b2b6c55a18593ffe9ca36b604e4308689e06f875bf9bfaf8d36 SHA512 9c189cc81ae98013a401f2224913b8a223f2467b7cf89cea563ffd5995954262daecbfb8defc3dadd117e5cb587d02c4a613ad56ad58b0ca33c22fe7e90d3d25
-EBUILD iperf-3.9-r1.ebuild 907 BLAKE2B 1657b6f91e6592920f7134e262fe8bb6c5e8d3369b722f134463645f00fbba39404f26798eb54c34230131b582f1f7d29e0eba090c4d4ff4c66470476953f6c6 SHA512 0486535a43e0973e7bbd0dd842796492a07c9c0bc398d95100b1f4ddeea516f4dc60cd7ba4afaeb5f7da65b3d2c49c015cdb6e4c2ecc05aa6f13582448274cb4
EBUILD iperf-3.99999.99999.ebuild 722 BLAKE2B 3e048d5eb49365b5c5f89e4072de496e908269c1dcf754f54810671d6ee66c08c814278be899060a7ac97a04464da4ddcbb9a93e79f5cbc6fa195eed584ea71d SHA512 b47ee419c1d04829ccb9a5a4225d58bb15f723a0f297b01c99f194ec662bba4200371aa0e084e737af0f9ccbbccb656c4e0dd680830fc9af11dc1be342bcd64c
MISC metadata.xml 570 BLAKE2B e17cc2b8458663f6ed2e9de7cca4e6a0d2e21e7f0c22a92c7b2d8589a944a466436f0dec4e18843641cc9364f407b061ff44dbbe342162ab28556ec953b029b4 SHA512 e3acd2262d442675557b837bbed0feaf7a1f148f7306b64139d8ba39d052794a9e7b60f125eee8745b0d13cdeafbb93012c62d1c524caa1e0f4730d1200426cc
diff --git a/net-misc/iperf/iperf-3.9-r1.ebuild b/net-misc/iperf/iperf-3.9-r1.ebuild
deleted file mode 100644
index 6e77ed4440e0..000000000000
--- a/net-misc/iperf/iperf-3.9-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
-HOMEPAGE="https://github.com/esnet/iperf"
-SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/_/}"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="sctp static-libs"
-
-DEPEND="
- dev-libs/openssl:0=
- sctp? ( net-misc/lksctp-tools )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md RELNOTES.md )
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- $(use_with sctp)
-}
-
-src_install() {
- default
-
- newconfd "${FILESDIR}"/iperf.confd iperf3
- newinitd "${FILESDIR}"/iperf3.initd iperf3
- systemd_dounit contrib/iperf3.service
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index d43cb451b875..4b956fdbf30d 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -5,5 +5,5 @@ AUX minidlna-1.3.0-fd-leak.patch 1176 BLAKE2B 007c5ea969cc6b8a28353ef5a9bf8b653e
AUX minidlna-1.3.0-fno-common.patch 602 BLAKE2B dca6dff5dd0d2b7eafa5d58b8879d4f0f28ff8cbe7fe8d31d97a3078c5c6eecbf0462b10fb646f57ecc734e0102a9010f6f66142774f32d69d9b6a7c09b5d17c SHA512 a02c78cdac03884115f5fffc85cedf92c13687fad002a82c9497b63d394d53020bb4ab5e04e2d6a27b662b93153c6244576559a425ed67de849cecb7f7e5a9b8
DIST minidlna-1.3.0.tar.gz 509576 BLAKE2B 3574d48ee63f8c391d1beac653587b87460522178d9f100fe4b0e49f33398b8e527ee74af02d5ea36b23338f7ac73ef3c177edae6be8eed24e94f9db5c8323b0 SHA512 92a5ec0e59244c65dad5360ca68856ecc66fd32ec2aaddb9e49c142b866d2642726c7c62898059e5fa56431d2bbb644bbe60c7ae5eb0aba4fe2255c8e69dd2d6
DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e
-EBUILD minidlna-1.3.0-r2.ebuild 2106 BLAKE2B b2e6ca37a4c6b69537f2cb54ec614374f9b7afa05f9606657f92660506e00c9399847820b1c22f3f2d97089936cb4ee3fc6fed948c67ff1b9802e0c9505e6404 SHA512 4140daa124ecd4947ad74661861d945e430fdd32de9bdddf7a6af4ed6533a7b5a0615fd0ea1065b95071d44e169b3dfbcbca15aa24e6074a74024caf742cd44b
+EBUILD minidlna-1.3.0-r2.ebuild 2095 BLAKE2B 5244e6d9dc8b817e4a719a44e40a308e1dfba8ea9f592eb074299d040944487875b3054d06e7803cf54c1e80b99c0c09046c760e86d28214eb984e32aa9926df SHA512 e03701ab0ea317fb88e8b52f452be01ceeb61b3282c2d6197b558d7a6b1980f7f025aa384a1129e61ff4ea3249c433ee2b950977a1a5411f70b6b535358ebc6d
MISC metadata.xml 513 BLAKE2B 6e851975b83efd7972d5d58c85093a36bf0f51845cb6ef1f7d7b37dab65dd913a5bbd6e5f163b2142eee11d6860b55e1bd346e23b5f4f427ca0812701149eede SHA512 99fe90016717a048a38feec908049f5f0c7b81045dc9e8953b204eb22e858f74b876fd5ae3765cbf88204f9f6ece87310dccb2123bdb1cc007e3c9049967a4e1
diff --git a/net-misc/minidlna/minidlna-1.3.0-r2.ebuild b/net-misc/minidlna/minidlna-1.3.0-r2.ebuild
index 113c81783d7f..37b1bb9ceac0 100644
--- a/net-misc/minidlna/minidlna-1.3.0-r2.ebuild
+++ b/net-misc/minidlna/minidlna-1.3.0-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
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="BSD GPL-2"
SLOT="0"
KEYWORDS="amd64 arm x86"
-IUSE="elibc_musl netgear readynas zeroconf"
+IUSE="netgear readynas zeroconf"
RDEPEND="
acct-group/minidlna
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index f8830c7e2471..030fabd7db70 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -7,7 +7,7 @@ DIST NetworkManager-1.32.12.tar.xz 5373452 BLAKE2B 29ca1f1c2aea60e4ddc7e3d546460
DIST NetworkManager-1.32.4.tar.xz 5250412 BLAKE2B 6c0931d50a8666f88865d4ca5281e1570dd230156e30bb27822c9ea3d93b3b3b24f336e154787794e7edd7c00296f9f7c5761136cac0c0eacf142a0371cbfe81 SHA512 95be90d4c8f8f9f58a3c7ad8d8c9b592d2b77f283df58b495fe1b673c4fadd4409f4fc00fc9766343e3ac240dd805583db4f05e6d1f0b367fe22b306227fc684
DIST NetworkManager-1.32.8.tar.xz 5255076 BLAKE2B 5f1bc55e3b9e6864c05421c8506ac202162deaf5081450e5d50f52699abc2d9bfb6e89b6f48c9874cccdc11fe754a5063a63e830702e211cf178ce7df0d628fb SHA512 328733f3dce9e52e680e464b60112995439f94dfeaea3b6c2082b323e85418483db6c6dc9e43f52176ff7c1291b226db77fe5acab9935dad7735c4397f5e9b83
EBUILD networkmanager-1.32.10-r1.ebuild 11696 BLAKE2B 8cf1b21ce091f0d60b303b176ab801dfb292c3ff5da76e0988e7440c718d2a02786bd8b82828f8b9f70c21b4bfd4acecb87f9c32b56a6ba251f60512a855087f SHA512 4ba056421e940bf557f037a4357a31af2d3d577d1ba013350009ec1849146c6d0cb412180a60bc2ac7c9f712e0fd6c093f7e2cda45ce08823e0acc2bab0e0177
-EBUILD networkmanager-1.32.12-r1.ebuild 12176 BLAKE2B 5b158ded9412830690fdc1a7b2546ea0e3dfcc01f7e663c0d0f7c89c9db7728b190cfe32abd6cbf3e2aa27d65329ce2e7c564592389996bdc9b11592cb0ea069 SHA512 2df198811228f9e191db18489722449fc0de3007017eec480d618d8ad371e85f1528811f2395b6f84574cb52c19b510d2f830f77ff16dcc1f8e174c9c6775c07
+EBUILD networkmanager-1.32.12-r1.ebuild 12170 BLAKE2B 9693a795fd77208c5755286f0640f53ea12cace1d7ceaadc721e090fa5718eae59772c9bb14223ffc44f13869783fa2ce40902ff5a86baa224a6ddc3a5f3572b SHA512 c5fb410eafd83f7fd544b0b0c66f19c308a625a7cbf18b1d5ffdfa58aa252e81de0a40588581e6c6988488d24eb4c649c0af80327fca5df861457eee82477a14
EBUILD networkmanager-1.32.12.ebuild 11967 BLAKE2B b94f628f497e85d43f000598a74a88fea23f21dbda412abb24dffe2bb736aef7a3d0d587fecd1f706049ad2411610ed4790c8391fbd5caf391857e38e9ec56e8 SHA512 31de3c5f36e5033175ed9c1fa6d3687542237f04d17303528c73671627e85d801a65d3d2fdb0494cba6c2f041941a360ff799c8984558eb33860b544a4a80ac8
EBUILD networkmanager-1.32.4-r1.ebuild 11371 BLAKE2B 5ad40b864ffd1ded48fd148267362ffaca2b1139332a1fd7e632909ef617b9549b4cf913be4dd43bdd8c862b6eb77a284aa75863c10bba4e0859bd3ee9dc8808 SHA512 e44332cfac5c3e9cd2931e5f5a40c3b219c0f55684c0bced16432ba40ebacf2dffe368a741f521014cbac4a16eb04d88c985fdbfd6c1f4c9da8f31ddfe919a9e
EBUILD networkmanager-1.32.8-r1.ebuild 11384 BLAKE2B 8ba69b4605e75af3d6ae5cdded420ab18aba256b9ea4dee03885d068f0715e405c8fa6698a7c8bce9f6578293d37ca357829f801cebcef55cc3982c197b22648 SHA512 01ef6f7183dcf8d0876a725f729d8d064b492c295ec12345465fe74823d26a14dfd03a4f0331283dcd8d98c8606bc46ca2c8d1ab10385b5516ac1f02a8904667
diff --git a/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild b/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild
index 005ce3efffb2..9e18c78df482 100644
--- a/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="
?? ( syslog systemd )
"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
COMMON_DEPEND="
sys-apps/util-linux[${MULTILIB_USEDEP}]
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index c42be6095a5b..c80f2edfe87b 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,5 +1,3 @@
-AUX nextcloud-client-3.2.3-inkscape.patch 3190 BLAKE2B 432a1d418e61c982ff6f4d7a43151c5bd8ffb7d231542abc3ee42f450fad2eeed4e1d3e641ee4ac246d43174d69de4de7384516dd9a22c26a1c878ab0aa06f7e SHA512 0a92815371923bce701edd362583e11977556f17866fedf13ea48ed26e409610b80eb7a6b6181702b59250fa3868319624bdad34911746490f5a8330ad94b4a2
-AUX nextcloud-client-3.2.3-webengine.patch 15574 BLAKE2B 8cd752db888f87f075f3b69cf34e3e84fde99f3f2dec4891092d47c020b60efc49968bfee7ef8136b6e0454cc331b778fcbc2a94903b11c1cc3e587d153e3aa9 SHA512 b3ea743ab50ef8eda12a0bef8513d1563d3682c54e6af586ccf60cf7b4377e93913c4d6eb0ba1b65075203608bfa81f934dfc408b89c5bf3b84352524bc08091
AUX nextcloud-client-3.3.4-inkscape_to_rsvg.patch 2170 BLAKE2B 1593e98d25f5a9cbb30829a9619ad6916e6fd2e3be64a538dc0452ff3785deea86cdccfa5c7bae40dc4dcfc83e127d9dfb16e14d3954449ebf15939cf3f34d76 SHA512 9d97656af41df5dcd1c647f49833cdc71bfa5c7d0941d722ee01d6040702754c6d07d7320637a18bd8baddcf724e84c4dec6128d329646bb5773f5f2fd22830a
DIST nextcloud-client-3.1.3.tar.gz 19552683 BLAKE2B 321ddc6bd5f9428abe1eafe25d426c26c99307c5e7d204bc60fd1bafe773fbed9cb54264f7b1ec7766078b8c06a2399c916a8bd9291e0e28e5b6b3ed8725a7a4 SHA512 ca0a70e65be67e10a7cb45f2b30f6b82230f30c2e3afcd16a222a8ed6fb8df4eff5e78fe0b6e3f4c6a18ff963896ccd6d8282c9829bd75a943324d4ab0068a99
DIST nextcloud-client-3.3.6.tar.gz 14106065 BLAKE2B b4f1179787a835f7fa203dfeaa2091eb1368f15ea6252dbf2ddd2d1a46786752f3a896574283c9ebc3faeaa024272c20fa67e4ee08b8ebca319d224ad4eb19f5 SHA512 d6c16ebd8af0d97f412102cfa9f7b7d4ca502ff5d025618f3a98a33a068dce9d0b71ee71e7b3c3a02219929584559a1237d57b1a7aa27ad8234653b56530c9f0
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch
deleted file mode 100644
index 8b02ab2a8086..000000000000
--- a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-inkscape.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -Naur desktop-3.2.3.orig/src/gui/CMakeLists.txt desktop-3.2.3/src/gui/CMakeLists.txt
---- desktop-3.2.3.orig/src/gui/CMakeLists.txt 2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/CMakeLists.txt 2021-07-06 19:20:34.225000546 +0200
-@@ -241,75 +241,6 @@
- set(APPLICATION_ICON_NAME ${APPLICATION_SHORTNAME})
- endif()
-
--# Generate png icons from svg
--find_program(INKSCAPE
-- NAMES inkscape inkscape.exe
-- REQUIRED
-- HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV INKSCAPE_DIR)
--# REQUIRED keyword is only supported on CMake 3.18 and above
--if (NOT INKSCAPE)
-- message(FATAL_ERROR "Could not find inkscape. Set INKSCAPE_DIR to the path of executable.")
--endif()
--
--function(generate_sized_png_from_svg icon_path size)
-- get_filename_component(icon_name_dir ${icon_path} DIRECTORY)
-- get_filename_component(icon_name_wle ${icon_path} NAME_WLE)
--
-- if (EXISTS "${icon_name_dir}/${size}-${icon_name_wle}.png")
-- return()
-- endif()
--
-- set(icon_output_name "${size}-${icon_name_wle}.png")
-- message(STATUS "Generate ${icon_output_name}")
-- execute_process(COMMAND
-- "${INKSCAPE}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}"
-- WORKING_DIRECTORY "${icon_name_dir}"
-- RESULT_VARIABLE
-- INKSCAPE_SIDEBAR_ERROR
-- OUTPUT_QUIET
-- ERROR_QUIET)
--
-- if (INKSCAPE_SIDEBAR_ERROR)
-- message(FATAL_ERROR
-- "inkscape could not generate icon: ${INKSCAPE_SIDEBAR_ERROR}")
-- else()
-- endif()
--endfunction()
--
--if ((APPLICATION_ICON_SET MATCHES "PNG")
-- AND
-- (NOT EXISTS "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg"))
-- # We may have no svg application icon in when customers use PNG
-- # icons in brander, but theme.qrc expects a svg icon.
-- file(TOUCH "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg")
--endif()
--
--if(APPLE)
-- set(MACOS_SIDEBAR_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-sidebar.svg")
-- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 16)
-- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 32)
-- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 64)
-- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 128)
-- generate_sized_png_from_svg(${MACOS_SIDEBAR_ICON_SVG} 256)
--endif()
--
--if(WIN32)
-- set(STARTMENU_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-w10startmenu.svg")
-- generate_sized_png_from_svg(${STARTMENU_ICON_SVG} 70)
-- generate_sized_png_from_svg(${STARTMENU_ICON_SVG} 150)
--endif()
--
--set(APP_ICON_SVG "${theme_dir}/colored/${APPLICATION_ICON_NAME}-icon.svg")
--generate_sized_png_from_svg(${APP_ICON_SVG} 16)
--generate_sized_png_from_svg(${APP_ICON_SVG} 24)
--generate_sized_png_from_svg(${APP_ICON_SVG} 32)
--generate_sized_png_from_svg(${APP_ICON_SVG} 48)
--generate_sized_png_from_svg(${APP_ICON_SVG} 64)
--generate_sized_png_from_svg(${APP_ICON_SVG} 128)
--generate_sized_png_from_svg(${APP_ICON_SVG} 256)
--generate_sized_png_from_svg(${APP_ICON_SVG} 512)
--generate_sized_png_from_svg(${APP_ICON_SVG} 1024)
--
- file(GLOB_RECURSE OWNCLOUD_ICONS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-icon*")
- if(APPLE)
- file(GLOB_RECURSE OWNCLOUD_SIDEBAR_ICONS "${theme_dir}/colored/*-${APPLICATION_ICON_NAME}-sidebar*")
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch
deleted file mode 100644
index 8152528f30cb..000000000000
--- a/net-misc/nextcloud-client/files/nextcloud-client-3.2.3-webengine.patch
+++ /dev/null
@@ -1,419 +0,0 @@
-diff -Naur desktop-3.2.3.orig/src/CMakeLists.txt desktop-3.2.3/src/CMakeLists.txt
---- desktop-3.2.3.orig/src/CMakeLists.txt 2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/CMakeLists.txt 2021-07-07 20:26:40.620839467 +0200
-@@ -4,7 +4,13 @@
-
- set(synclib_NAME ${APPLICATION_EXECUTABLE}sync)
-
--find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent WebEngineWidgets WebEngine REQUIRED)
-+find_package(Qt5 5.12 COMPONENTS Core Network Xml Concurrent REQUIRED)
-+find_package(Qt5 5.12 COMPONENTS WebEngineWidgets WebEngine)
-+
-+if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
-+ add_compile_definitions(WITH_WEBENGINE=1)
-+endif()
-+
- get_target_property (QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
- message(STATUS "Using Qt ${Qt5Core_VERSION} (${QT_QMAKE_EXECUTABLE})")
-
-diff -Naur desktop-3.2.3.orig/src/gui/CMakeLists.txt desktop-3.2.3/src/gui/CMakeLists.txt
---- desktop-3.2.3.orig/src/gui/CMakeLists.txt 2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/CMakeLists.txt 2021-07-07 20:26:40.620839467 +0200
-@@ -128,12 +128,17 @@
- wizard/owncloudwizardcommon.cpp
- wizard/owncloudwizard.cpp
- wizard/owncloudwizardresultpage.cpp
-- wizard/webviewpage.cpp
-- wizard/webview.cpp
- wizard/slideshow.cpp
- wizard/welcomepage.cpp
- wizard/linklabel.cpp
--)
-+ )
-+
-+if (Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
-+ list(APPEND client_SRCS
-+ wizard/webviewpage.cpp
-+ wizard/webview.cpp
-+ )
-+endif()
-
- IF(BUILD_UPDATER)
- set(updater_SRCS
-@@ -339,9 +344,12 @@
- Qt5::Qml
- Qt5::Quick
- Qt5::QuickControls2
-- Qt5::WebEngineWidgets
- ${synclib_NAME}
--)
-+ )
-+
-+if(Qt5WebEngine_FOUND AND Qt5WebEngineWidgets_FOUND)
-+ target_link_libraries(nextcloudCore PUBLIC Qt5::WebEngineWidgets)
-+endif()
-
- set_target_properties(nextcloudCore
- PROPERTIES
-diff -Naur desktop-3.2.3.orig/src/gui/creds/webflowcredentials.cpp desktop-3.2.3/src/gui/creds/webflowcredentials.cpp
---- desktop-3.2.3.orig/src/gui/creds/webflowcredentials.cpp 2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/creds/webflowcredentials.cpp 2021-07-07 20:26:40.618839464 +0200
-@@ -16,7 +16,9 @@
- #include "account.h"
- #include "configfile.h"
- #include "theme.h"
-+#ifdef WITH_WEBENGINE
- #include "wizard/webview.h"
-+#endif // WITH_WEBENGINE
- #include "webflowcredentialsdialog.h"
-
- using namespace QKeychain;
-@@ -144,8 +146,12 @@
- // Do a DetermineAuthTypeJob to make sure that the server is still using Flow2
- auto job = new DetermineAuthTypeJob(_account->sharedFromThis(), this);
- connect(job, &DetermineAuthTypeJob::authType, [this](DetermineAuthTypeJob::AuthType type) {
-- // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic
-+ // LoginFlowV2 > WebViewFlow > OAuth > Shib > Basic
-+#ifdef WITH_WEBENGINE
- bool useFlow2 = (type != DetermineAuthTypeJob::WebViewFlow);
-+#else // WITH_WEBENGINE
-+ bool useFlow2 = true;
-+#endif // WITH_WEBENGINE
-
- _askDialog = new WebFlowCredentialsDialog(_account, useFlow2);
-
-diff -Naur desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.cpp desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.cpp
---- desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.cpp 2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.cpp 2021-07-07 20:26:40.618839464 +0200
-@@ -8,16 +8,20 @@
- #include "owncloudgui.h"
- #include "headerbanner.h"
- #include "wizard/owncloudwizardcommon.h"
-+#ifdef WITH_WEBENGINE
- #include "wizard/webview.h"
-+#endif // WITH_WEBENGINE
- #include "wizard/flow2authwidget.h"
-
- namespace OCC {
-
- WebFlowCredentialsDialog::WebFlowCredentialsDialog(Account *account, bool useFlow2, QWidget *parent)
-- : QDialog(parent),
-- _useFlow2(useFlow2),
-- _flow2AuthWidget(nullptr),
-- _webView(nullptr)
-+ : QDialog(parent)
-+ , _useFlow2(useFlow2)
-+ , _flow2AuthWidget(nullptr)
-+#ifdef WITH_WEBENGINE
-+ , _webView(nullptr)
-+#endif // WITH_WEBENGINE
- {
- setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-
-@@ -49,10 +53,12 @@
-
- _flow2AuthWidget->startAuth(account);
- } else {
-+#ifdef WITH_WEBENGINE
- _webView = new WebView();
- _containerLayout->addWidget(_webView);
-
- connect(_webView, &WebView::urlCatched, this, &WebFlowCredentialsDialog::urlCatched);
-+#endif // WITH_WEBENGINE
- }
-
- auto app = static_cast<Application *>(qApp);
-@@ -73,12 +79,14 @@
- void WebFlowCredentialsDialog::closeEvent(QCloseEvent* e) {
- Q_UNUSED(e)
-
-+#ifdef WITH_WEBENGINE
- if (_webView) {
- // Force calling WebView::~WebView() earlier so that _profile and _page are
- // deleted in the correct order.
- _webView->deleteLater();
- _webView = nullptr;
- }
-+#endif // WITH_WEBENGINE
-
- if (_flow2AuthWidget) {
- _flow2AuthWidget->resetAuth();
-@@ -89,9 +97,14 @@
- emit onClose();
- }
-
--void WebFlowCredentialsDialog::setUrl(const QUrl &url) {
-+void WebFlowCredentialsDialog::setUrl(const QUrl &url)
-+{
-+#ifdef WITH_WEBENGINE
- if (_webView)
- _webView->setUrl(url);
-+#else // WITH_WEBENGINE
-+ Q_UNUSED(url);
-+#endif // WITH_WEBENGINE
- }
-
- void WebFlowCredentialsDialog::setInfo(const QString &msg) {
-diff -Naur desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.h desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.h
---- desktop-3.2.3.orig/src/gui/creds/webflowcredentialsdialog.h 2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/creds/webflowcredentialsdialog.h 2021-07-07 20:26:40.618839464 +0200
-@@ -13,7 +13,9 @@
- namespace OCC {
-
- class HeaderBanner;
-+#ifdef WITH_WEBENGINE
- class WebView;
-+#endif // WITH_WEBENGINE
- class Flow2AuthWidget;
-
- class WebFlowCredentialsDialog : public QDialog
-@@ -50,7 +52,9 @@
- bool _useFlow2;
-
- Flow2AuthWidget *_flow2AuthWidget;
-+#ifdef WITH_WEBENGINE
- WebView *_webView;
-+#endif // WITH_WEBENGINE
-
- QLabel *_errorLabel;
- QLabel *_infoLabel;
-diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.cpp desktop-3.2.3/src/gui/wizard/owncloudsetuppage.cpp
---- desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.cpp 2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/wizard/owncloudsetuppage.cpp 2021-07-07 20:26:40.619839465 +0200
-@@ -119,21 +119,6 @@
- _ui.leUrl->setPalette(leUrlPalette);
- }
-
--#ifdef WITH_PROVIDERS
--void OwncloudSetupPage::slotLogin()
--{
-- _ocWizard->setRegistration(false);
--}
--void OwncloudSetupPage::slotGotoProviderList()
--{
-- _ocWizard->setRegistration(true);
-- _ocWizard->setAuthType(DetermineAuthTypeJob::AuthType::WebViewFlow);
-- _authTypeKnown = true;
-- _checking = false;
-- emit completeChanged();
--}
--#endif
--
- // slot hit from textChanged of the url entry field.
- void OwncloudSetupPage::slotUrlChanged(const QString &url)
- {
-@@ -228,8 +213,10 @@
- return WizardCommon::Page_OAuthCreds;
- case DetermineAuthTypeJob::LoginFlowV2:
- return WizardCommon::Page_Flow2AuthCreds;
-+#ifdef WITH_WEBENGINE
- case DetermineAuthTypeJob::WebViewFlow:
- return WizardCommon::Page_WebView;
-+#endif // WITH_WEBENGINE
- }
- return WizardCommon::Page_HttpCreds;
- }
-diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.h desktop-3.2.3/src/gui/wizard/owncloudsetuppage.h
---- desktop-3.2.3.orig/src/gui/wizard/owncloudsetuppage.h 2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/wizard/owncloudsetuppage.h 2021-07-07 20:26:40.617839462 +0200
-@@ -67,10 +67,6 @@
- protected slots:
- void slotUrlChanged(const QString &);
- void slotUrlEditFinished();
--#ifdef WITH_PROVIDERS
-- void slotLogin();
-- void slotGotoProviderList();
--#endif
-
- void setupCustomization();
-
-diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudwizardcommon.h desktop-3.2.3/src/gui/wizard/owncloudwizardcommon.h
---- desktop-3.2.3.orig/src/gui/wizard/owncloudwizardcommon.h 2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/wizard/owncloudwizardcommon.h 2021-07-07 20:26:40.619839465 +0200
-@@ -46,7 +46,9 @@
- Page_HttpCreds,
- Page_OAuthCreds,
- Page_Flow2AuthCreds,
-+#ifdef WITH_WEBENGINE
- Page_WebView,
-+#endif // WITH_WEBENGINE
- Page_AdvancedSetup,
- Page_Result
- };
-diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.cpp desktop-3.2.3/src/gui/wizard/owncloudwizard.cpp
---- desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.cpp 2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/wizard/owncloudwizard.cpp 2021-07-07 20:26:40.619839465 +0200
-@@ -54,7 +54,11 @@
- , _flow2CredsPage(new Flow2AuthCredsPage)
- , _advancedSetupPage(new OwncloudAdvancedSetupPage(this))
- , _resultPage(new OwncloudWizardResultPage)
-+#ifdef WITH_WEBENGINE
- , _webViewPage(new WebViewPage(this))
-+#else // WITH_WEBENGINE
-+ , _webViewPage(nullptr)
-+#endif // WITH_WEBENGINE
- {
- setObjectName("owncloudWizard");
-
-@@ -66,7 +70,9 @@
- setPage(WizardCommon::Page_Flow2AuthCreds, _flow2CredsPage);
- setPage(WizardCommon::Page_AdvancedSetup, _advancedSetupPage);
- setPage(WizardCommon::Page_Result, _resultPage);
-+#ifdef WITH_WEBENGINE
- setPage(WizardCommon::Page_WebView, _webViewPage);
-+#endif // WITH_WEBENGINE
-
- connect(this, &QDialog::finished, this, &OwncloudWizard::basicSetupFinished);
-
-@@ -78,7 +84,9 @@
- connect(_httpCredsPage, &OwncloudHttpCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
- connect(_browserCredsPage, &OwncloudOAuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
- connect(_flow2CredsPage, &Flow2AuthCredsPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
-+#ifdef WITH_WEBENGINE
- connect(_webViewPage, &WebViewPage::connectToOCUrl, this, &OwncloudWizard::connectToOCUrl);
-+#endif // WITH_WEBENGINE
- connect(_advancedSetupPage, &OwncloudAdvancedSetupPage::createLocalAndRemoteFolders,
- this, &OwncloudWizard::createLocalAndRemoteFolders);
- connect(this, &QWizard::customButtonClicked, this, &OwncloudWizard::skipFolderConfiguration);
-@@ -230,9 +238,11 @@
- _flow2CredsPage->setConnected();
- break;
-
-+#ifdef WITH_WEBENGINE
- case WizardCommon::Page_WebView:
- _webViewPage->setConnected();
- break;
-+#endif // WITH_WEBENGINE
-
- case WizardCommon::Page_AdvancedSetup:
- _advancedSetupPage->directoriesCreated();
-@@ -256,8 +266,10 @@
- _credentialsPage = _browserCredsPage;
- } else if (type == DetermineAuthTypeJob::LoginFlowV2) {
- _credentialsPage = _flow2CredsPage;
-+#ifdef WITH_WEBENGINE
- } else if (type == DetermineAuthTypeJob::WebViewFlow) {
- _credentialsPage = _webViewPage;
-+#endif // WITH_WEBENGINE
- } else { // try Basic auth even for "Unknown"
- _credentialsPage = _httpCredsPage;
- }
-@@ -281,7 +293,11 @@
- button(QWizard::NextButton)->setHidden(true);
- // Need to set it from here, otherwise it has no effect
- _welcomePage->setLoginButtonDefault();
-- } else if (id == WizardCommon::Page_WebView || id == WizardCommon::Page_Flow2AuthCreds) {
-+ } else if (
-+#ifdef WITH_WEBENGINE
-+ id == WizardCommon::Page_WebView ||
-+#endif // WITH_WEBENGINE
-+ id == WizardCommon::Page_Flow2AuthCreds) {
- setButtonLayout({ QWizard::Stretch, QWizard::BackButton });
- } else if (id == WizardCommon::Page_AdvancedSetup) {
- setButtonLayout({ QWizard::Stretch, QWizard::CustomButton1, QWizard::BackButton, QWizard::NextButton });
-diff -Naur desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.h desktop-3.2.3/src/gui/wizard/owncloudwizard.h
---- desktop-3.2.3.orig/src/gui/wizard/owncloudwizard.h 2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/wizard/owncloudwizard.h 2021-07-07 20:26:40.619839465 +0200
-@@ -128,7 +128,7 @@
- OwncloudAdvancedSetupPage *_advancedSetupPage;
- OwncloudWizardResultPage *_resultPage;
- AbstractCredentialsWizardPage *_credentialsPage = nullptr;
-- WebViewPage *_webViewPage;
-+ WebViewPage *_webViewPage = nullptr;
-
- QStringList _setupLog;
-
-diff -Naur desktop-3.2.3.orig/src/gui/wizard/welcomepage.cpp desktop-3.2.3/src/gui/wizard/welcomepage.cpp
---- desktop-3.2.3.orig/src/gui/wizard/welcomepage.cpp 2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/gui/wizard/welcomepage.cpp 2021-07-07 20:26:40.620839467 +0200
-@@ -13,6 +13,7 @@
- */
-
- #include "welcomepage.h"
-+#include "guiutility.h"
- #include "theme.h"
- #include "wizard/owncloudwizard.h"
- #include "wizard/slideshow.h"
-@@ -94,11 +95,18 @@
-
- void WelcomePage::setupCreateAccountButton()
- {
-+#ifdef WITH_WEBENGINE
- connect(_ui->createAccountButton, &QPushButton::clicked, this, [this](bool /*checked*/) {
- _ocWizard->setRegistration(true);
- _nextPage = WizardCommon::Page_WebView;
- _ocWizard->next();
- });
-+#else // WITH_WEBENGINE
-+ connect(_ui->createAccountButton, &QPushButton::clicked, this, [this](bool /*checked*/) {
-+ _ocWizard->setRegistration(true);
-+ Utility::openBrowser(QStringLiteral("https://nextcloud.com/register"));
-+ });
-+#endif // WITH_WEBENGINE
- }
-
- void WelcomePage::setupHostYourOwnServerLabel()
-diff -Naur desktop-3.2.3.orig/src/libsync/networkjobs.cpp desktop-3.2.3/src/libsync/networkjobs.cpp
---- desktop-3.2.3.orig/src/libsync/networkjobs.cpp 2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/libsync/networkjobs.cpp 2021-07-07 20:26:40.619839465 +0200
-@@ -30,6 +30,7 @@
- #include <QCoreApplication>
- #include <QJsonDocument>
- #include <QJsonObject>
-+#include <qloggingcategory.h>
- #ifndef TOKEN_AUTH_ONLY
- #include <QPainter>
- #include <QPainterPath>
-@@ -958,7 +959,11 @@
- auto flow = gs.toObject().value("desktoplogin");
- if (flow != QJsonValue::Undefined) {
- if (flow.toInt() == 1) {
-+#ifdef WITH_WEBENGINE
- _resultOldFlow = WebViewFlow;
-+#else // WITH_WEBENGINE
-+ qCWarning(lcDetermineAuthTypeJob) << "Server does only support flow1, but this client was compiled without support for flow1";
-+#endif // WITH_WEBENGINE
- }
- }
- }
-@@ -985,20 +990,24 @@
-
- auto result = _resultPropfind;
-
-+#ifdef WITH_WEBENGINE
- // WebViewFlow > OAuth > Basic
- if (_account->serverVersionInt() >= Account::makeServerVersion(12, 0, 0)) {
- result = WebViewFlow;
- }
-+#endif // WITH_WEBENGINE
-
- // LoginFlowV2 > WebViewFlow > OAuth > Basic
- if (_account->serverVersionInt() >= Account::makeServerVersion(16, 0, 0)) {
- result = LoginFlowV2;
- }
-
-+#ifdef WITH_WEBENGINE
- // If we determined that we need the webview flow (GS for example) then we switch to that
- if (_resultOldFlow == WebViewFlow) {
- result = WebViewFlow;
- }
-+#endif // WITH_WEBENGINE
-
- // If we determined that a simple get gave us an authentication required error
- // then the server enforces basic auth and we got no choice but to use this
-diff -Naur desktop-3.2.3.orig/src/libsync/networkjobs.h desktop-3.2.3/src/libsync/networkjobs.h
---- desktop-3.2.3.orig/src/libsync/networkjobs.h 2021-06-24 12:04:33.000000000 +0200
-+++ desktop-3.2.3/src/libsync/networkjobs.h 2021-07-07 20:26:40.619839465 +0200
-@@ -444,9 +444,11 @@
- public:
- enum AuthType {
- NoAuthType, // used only before we got a chance to probe the server
-+#ifdef WITH_WEBENGINE
-+ WebViewFlow,
-+#endif // WITH_WEBENGINE
- Basic, // also the catch-all fallback for backwards compatibility reasons
- OAuth,
-- WebViewFlow,
- LoginFlowV2
- };
- Q_ENUM(AuthType)
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 8cd6800a766c..ab4f0a5e8874 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,6 +1,6 @@
AUX nx-3.5.99.26-binutils-2.36.patch 1130 BLAKE2B 80bcb5c7fa7d4e14493a6e641dab3db393da2d20aa90cd5da68520c90b20b608c8a247ef0c85ee8f501907fe45c3b68d7c122b133c14a37d90599bcf132b22a2 SHA512 f767cb459f82c5f69fd957b42f04c51fff5fb583a2f1b47edb14a33654f5e36b8371fa9ca886fbf13ef780e403af089c055349b21f0f1cb154bb82e32980bcb3
DIST nx-libs-3.5.99.25.tar.gz 11065489 BLAKE2B 9210441fd2dc38fec14c90018ead4e3ddacd5ac266a26b1d985f874af0abdef3fdc2255614e45ec23816f1194ebe6ffe2beb776901eb1ed206658e8175b1ff57 SHA512 142378ae9a81542ed1bc969e9fcb2d421f1d63f7d46185c80e1e07493298e62379697ca2a367301c0f3df631acb19510113f3852922454fdc964767c36a81004
DIST nx-libs-3.5.99.26.tar.gz 11070624 BLAKE2B f67f522b127858aa2ddf1c9723468a74722a5ef2fa1e7f438844a8e5b05b868cacac22abf2c604c67d5e83a346217b192773f5debe67945d085768ae43205cb7 SHA512 1aead6161e4d7b8d7229ff80937935b23ad1f87135a578ae483a00348d0df7de35e9f9b78c47c473fda3ab2cc896ef23e845cc5656344a43520b091af9663211
-EBUILD nx-3.5.99.25.ebuild 3399 BLAKE2B 8374b0636f45bbce371c9d2c08f0f87b25f85248a216ca3f7213b5a663952407237e8647e4099ba749efc5f114550ef05106ca18a5e502aad8ed7eb3c8233ef0 SHA512 f14f778992a7d4bc75656a99de471505703305f4d1ec66c11ec4694821d5d8f2746aa4a84ec1f9ffd522db230669a67df9dff43d6b16f90b0d2bf0baee55aade
-EBUILD nx-3.5.99.26.ebuild 3525 BLAKE2B 9d0bbcdfc90b01046c1df65c3d719b31715e0914ce92c9dd9ef1e0bac04915234f8e82284c41890243bc35962047127747789bc172d6ff0492d79d31310dfd17 SHA512 9f9e7f5cbd4805e6d90f4cce3fd3b76e9de32d397b4a13aec5ccd9bf9edfb8b0c119f677975ce0216e89ac8c4bc66189954efc32a4b3a13259391450de5af564
+EBUILD nx-3.5.99.25.ebuild 3380 BLAKE2B 9b4ba75bcf61ac416de39e1358cd434e59780cb03bf203da2b392509fc0ef3f7578be5fc774facf53c50d64c78cfb1c2e6e964c1605b717fa069d5bf65b723b1 SHA512 811d6e02840b69e5828436fe048632ca6cbc17251992e7a105640a917aace15ec2233e42ce94f6cbe00fbf1b3b0ef801c8e8fd939968e9fee3c9fd28c86cb017
+EBUILD nx-3.5.99.26.ebuild 3506 BLAKE2B b7848587314dad9689639d211d1bec68288e1acea9ba24754b051a111d415fed68f81a0bd9ffbc6330b83ea74cf9be68433c9856312ec38897596c46de6fef76 SHA512 1d130976803baccd18c5e57e78b1b30770d260ca37c8560bad9cfe91fbedbc49a0ffaa0c7f0308bcaa9a85ac40540a6ddf82955c190744d6654c8f46a9d4c252
MISC metadata.xml 333 BLAKE2B 1b2843f4928b28b0b3abea2c4b7cf046c77d8c87363672f8516c7edab36597bd2ae831f23eecbec5c38029891bd5fa5bc0dc42a407e3d656ab6cfb098262f64a SHA512 77a92a8f8cec2c2a236544dc53e58fce7e0d399d9122042ddc6a097b58d013d04bad6e2ccaafcca11ce3c2e0ddd2d6aa479776e1e37539e40e3645ed20485bfd
diff --git a/net-misc/nx/nx-3.5.99.25.ebuild b/net-misc/nx/nx-3.5.99.25.ebuild
index d3b7370a9078..184060c37318 100644
--- a/net-misc/nx/nx-3.5.99.25.ebuild
+++ b/net-misc/nx/nx-3.5.99.25.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
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-li
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
-IUSE="elibc_glibc"
RDEPEND="dev-libs/libxml2
>=media-libs/libpng-1.2.8:0=
diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild
index 6ddb12f1652c..639d0e415a4a 100644
--- a/net-misc/nx/nx-3.5.99.26.ebuild
+++ b/net-misc/nx/nx-3.5.99.26.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
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-li
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm64 ~ppc x86"
-IUSE="elibc_glibc"
RDEPEND="dev-libs/libxml2
>=media-libs/libpng-1.2.8:0=
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index 92690bf7a712..b01f116ee8d8 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -4,6 +4,8 @@ AUX oidc-agent-4.1.0_makefile-toolchain-vars.patch 1439 BLAKE2B 9e3477c1eb3303cf
AUX oidc-agent-4.2.4_makefile-toolchain-vars.patch 1216 BLAKE2B 52a0b1141772b4c0be288909657a8215db635f9a95cadf542d36c421a6fd7a71a38996f691d94838f4f37d28fd49ac7921e4371c13a7d702d07ba75f67a7693f SHA512 1664e44399a7152b632376d6d44ae8ccf360145f705709af24011ca0e637e976393a49898b0666eebba9ccddc7525d38c464e16768c34e8972709739c567eb16
DIST oidc-agent-4.1.1.tar.gz 801103 BLAKE2B dcb82a537787ae6ced577843c67acdd4e3fa315d017222067b2914837dfffccae27ddbdeeeaf4e8ca70c7e2744e03df5964d3ba318efd4460c73252bfd3f8e95 SHA512 e383e054623dc3b8fe73ec02df44faa05d4b69aaed47c7925f6f92d25cbc5301173fbc607b6198bc70f99e634e582fbae7c5570812086a8e5694d40ce6d2c2d1
DIST oidc-agent-4.2.4.tar.gz 823459 BLAKE2B 71c2fd983031641c5ed39ba3f1771bf283ab56eae6bba426da5308a7c9fcf2ce48103220375b9881e255eeddf05d50d58e2dee047b0b4436451c8d39b0cd55e6 SHA512 6f4f79823869197a0b74cd757b72e1d060ed9f1d9be477f815989b723a86285b200bd72b95f07a4698e754b9ad7aae48cee72603e1a6eaab71590cc63c2bae3d
+DIST oidc-agent-4.2.5.tar.gz 823881 BLAKE2B 533917fdb739ef529c1ca4e06b30a64361710c958b2b6e7a23a6d9c1f1195263ec98f1211cda5dbe9d77f6df7ca0509d29c4e0d595825a908d605ea5ececa8be SHA512 983e59dc3b97b1800733c98fc7ba5e33405a84cb66be7006932c88cb3ccdbfbc9f12d274c1f61294b0fb7ec93fecd2165196f7cc9e056bda0c23a974479f6aa2
EBUILD oidc-agent-4.1.1-r1.ebuild 2052 BLAKE2B 1b40576b3e8869a7a6904192ab397786a3dfb3be1c14910fb8efacc0f7931dea599378602f4f776947d81c38cb188c792c74db741685d292eb4533dafd7907aa SHA512 e498dd833ef994e96f4f9fe41d42edb5334f3dae38d85a3929c5d2b6ef7d28bca15253be4029922a45849e51771b92f411f81f3fb2850e3f86bbed50be694d13
EBUILD oidc-agent-4.2.4.ebuild 2073 BLAKE2B a0fe26c99af5804e0f677b8f59e72ba6500aea62ec747b9cc37e2e28b4345a143af9e98b3db6c71b1e49bdb33c3a976be5138b0235ef5e895cc07edcc85722af SHA512 b8421a3a592487eec4ece9b51e11f94bd0e93a59f78e7ade0cbb75f0ce239d929d4d11a8e75835f0fa27ea2bb8b2a591f5120cce53b036ee0ec43076597b3781
+EBUILD oidc-agent-4.2.5.ebuild 2073 BLAKE2B f9ee4244e3d735893a35cf91b639346c75832e7a9e9796897e7200f5a71bd7bb97209f145c46930ebca2d83f6d56ea171eff4f5b3bac724d04115b0847ef9adf SHA512 91d47f30a9dc9b2934e1c070d0dcca9cf3f82a613f7b8f21c2f4c18467d874577db4da52a7f616ea792641d6740d5ed40dd0de8947d5422dc0a39f7a10fb6411
MISC metadata.xml 780 BLAKE2B 8a2538e5b233383449dc76e49a4d68f950ad3982874e657664ee027fd71a12f18a9a86f38efd6452732305783cd175b761a7702d1a21b97200b1991d20624fd7 SHA512 a4ba3692ce9304b119ea331f83f702bba0956f0013bbe239bca376dea7ccf72a5bb639f06006cf2d65f8ea4b2817173ef26f1c086ab5482095eff34fea026d3f
diff --git a/net-misc/oidc-agent/oidc-agent-4.2.5.ebuild b/net-misc/oidc-agent/oidc-agent-4.2.5.ebuild
new file mode 100644
index 000000000000..eb58ba92f64c
--- /dev/null
+++ b/net-misc/oidc-agent/oidc-agent-4.2.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="Agent and tools for managing OpenID Connect tokens on the command line"
+HOMEPAGE="https://github.com/indigo-dc/oidc-agent"
+SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="test"
+
+DEPEND="app-crypt/libsecret
+ dev-libs/libsodium:=
+ media-gfx/qrencode
+ net-libs/libmicrohttpd:=
+ sys-libs/libseccomp"
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-libs/check )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.0.2_makefile-liblist-automagic.patch
+ "${FILESDIR}"/${PN}-4.1.0_install-perms.patch
+ "${FILESDIR}"/${PN}-4.2.4_makefile-toolchain-vars.patch
+)
+
+src_prepare() {
+ default
+ sed -i -e 's|^\(\s\+\)@|\1|' Makefile || die "Failed to increase verbosity in Makefile"
+}
+
+src_install() {
+ emake \
+ PREFIX="${ED}" \
+ BIN_AFTER_INST_PATH="/usr" \
+ INCLUDE_PATH="${ED}"/usr/include \
+ LIB_PATH="${ED}"/usr/$(get_libdir) \
+ install
+
+ # This file is not compatible with Gentoo and in any case, we generally
+ # let the users load such agents themselves.
+ rm -f "${ED}"/etc/X11/Xsession.d/91${PN}
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog
+ elog "You should use oidc-gen to initially generate your account configuration"
+ elog "before it can be loaded into oidc-agent using oidc-add. For details, please"
+ elog "consult the man page of oidc-gen, or full documentation at"
+ elog " https://indigo-dc.gitbooks.io/oidc-agent/"
+ elog
+ else
+ local new_major_ver old_ver
+ new_major_ver=$(ver_cut 1)
+ for old_ver in ${REPLACING_VERSIONS}; do
+ if [[ $(ver_cut 1 ${old_ver}) != ${new_major_ver} ]]; then
+ ewarn
+ ewarn "You are upgrading from a different major version. Please restart any running instances of ${PN}"
+ ewarn "to make sure they are compatible with the updated clients."
+ ewarn
+ break
+ fi
+ done
+ fi
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 5348d4d51e55..29e3bc92c1b2 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -28,5 +28,5 @@ DIST openssh-8_5_P1-hpn-AES-CTR-15.2.diff 30096 BLAKE2B f0c020dd2403806c79d4c37a
DIST openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff 51428 BLAKE2B 370b88a7da7f148bf5a4d445f05cf593b486e9df53bba027e2e179726f534b68cf9d94edd6e53024e0b6ff5f20e568727bc9d26c94d0d415603602a80d3ad241 SHA512 2d8d887901164b33b2799ff3ec72e86a39ae4a1696e52bcee0872dbae7772fcc534351e6e7f87126ee71b164c74e9091350f14b782f4b242a09f09b4f50d047a
DIST openssh-8_5_P1-hpn-PeakTput-15.2.diff 2429 BLAKE2B 849bf3c313719ab7a25c75e82d5dc5ac98365a038b2a66fe58d01eae5b20c7777258b94b5830e799d6909e75c69753cda05a910f3bdab9606fb7d5efa68e05f1 SHA512 c4a56fab55fabd1d902d45f235b603708d43f969920e45c9a57e557dccfa9cade2ec61f26d1ace938f6f73e79f17b12f119b5aea9166cbda8e3435b910500914
EBUILD openssh-8.7_p1-r4.ebuild 17206 BLAKE2B b730e377c8b6f9f5c20c37cb902e17415cc70d3a64f5043ba8e9195ed8912942686febd1e411d45155fc6abe9f81f6118fd83a2a66f25fcf0aebc371494c28a2 SHA512 741b4e2b9c0adf1b9c5042f338ddc42728a60aef904d3b04b9a06893e1d1562b6ec6c7decab4694381346cebc0dbcf29e908fa8028617ebe72a70ed1c0351109
-EBUILD openssh-8.8_p1-r4.ebuild 16716 BLAKE2B 922069eff2e0eaa56e07bbb70c0390ea98b769eb88184b5d224c1c6c1b385a0820168c5da2c9dd51e61fb8d4f342eba69d1468e8fbc13f287095c1df89b25857 SHA512 a884880cbe92972f47d7ef8785f0a0945c3d2176d75d608b96042cb7c6d0157c8e06a6addb92962a58e4ec700df2ce8f920d53a5b22f1a56336b3b4cae635379
+EBUILD openssh-8.8_p1-r4.ebuild 16715 BLAKE2B 43156878415dfb4f2ea8d2dfa5a0397abc7d31a885ec29ac7931302e589cbbae7175da120057c67cd31982fec6bb54ae24258566491fbcd2b26a0ea5c0984daa SHA512 4341b0459eaf64eeb1f57a9f0c57a74d54648e8574e69f6a770e665948f6edc68232adf9b63e83a24b82946cd942c51f1634a520ef7b3576fe95f68ffce97956
MISC metadata.xml 2013 BLAKE2B 5d452c9b16516ff3a7e01ae7a6f95102bec19b3f0df1aa4607558b012718e14e72e24fa09c1bd3ea6bc48506a7fc55180a9e4735809381bf4535569de59b1409 SHA512 5b56870f1e203f339b57792fca7ddcdf488be2f010c0a23e0b811825e0d8f2f5823c2f4ae8a2ec05b27ffd663fac4f8029a3b2bede9fa1beac067f5b5a57d6bd
diff --git a/net-misc/openssh/openssh-8.8_p1-r4.ebuild b/net-misc/openssh/openssh-8.8_p1-r4.ebuild
index cc2c72f2fd25..207de04962a7 100644
--- a/net-misc/openssh/openssh-8.8_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-8.8_p1-r4.ebuild
@@ -34,7 +34,7 @@ S="${WORKDIR}/${PARCH}"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Probably want to drop ssl defaulting to on in a future version.
IUSE="abi_mips_n32 audit debug hpn kerberos kernel_linux ldns libedit livecd pam +pie +scp sctp security-key selinux +ssl static test X X509 xmss"
diff --git a/net-misc/pcapfix/Manifest b/net-misc/pcapfix/Manifest
index b611bd823668..472bc7f27b29 100644
--- a/net-misc/pcapfix/Manifest
+++ b/net-misc/pcapfix/Manifest
@@ -1,3 +1,7 @@
+AUX pcapfix-1.1.7-respect-CFLAGS.patch 704 BLAKE2B 3a70786cc1926c1e59f1a9af22295c8ba5ace0fae56caad458b0db74074684ecffcae654bba82928ef6fe0415a451a4bafdd25f18a069455432de0e5f6e64347 SHA512 53c412152f64c2f63127e0a1dc39106f12bd8ecb0fec7d386cfbdac653668bdf09e027dce7e0c69c0b448764e27292f06ce5868b043abfcdbf9a78ab90fd5711
DIST pcapfix-1.1.4.tar.gz 52184 BLAKE2B 4def04cebc9144af86d43c28892575627ed98bf14fa99e5e4fe5181a406871ceeac1f431c73d90daae151bb8b6e5315e8bc47c430d2ed55f9e0c3de1decbe0e9 SHA512 6203e9032d2f24fe5d4aaefd9cfd57ece97a318af3ecd8da7171307a59c2a10b2e92206d5cf96e2dd9bfafc239dd9bc95a224bf5fef9e0c0432a6e76ff10d1da
+DIST pcapfix-1.1.7-musl-stdint.patch.bz2 2084 BLAKE2B 2dafe8597f247c1b403e89552403850f10e9a0149a74d092a9187510a997b6339af831ea6f3b01d7ab04367a966828aedc665b517e7108fea9b6d3607815d531 SHA512 5e6d197d6bda6bd10525066a46dc301ae7b92a2a0d9062e3dcef22730b27b12d1b8cd1e58e344f6b4a7bd5b0dfe1351bf868489285bf1651f8aa96f0014b3adf
+DIST pcapfix-1.1.7.tar.gz 54784 BLAKE2B c688b3eabf04ff4baf88170c5868edd2b504779a9550ce6a2ca8b4839310b75a26c7e6ae6afc82cf763f19f8ffebe357c730b0ea1bd4b05ed071e78ad6c9f6e5 SHA512 d8d1106349116303f35254f680916f1ea26b163f9afceb5d237eed89880810d4b7b40ebca9de58ec95af2336dd78f4e11af1a08b89f6765055843a9791c156bd
EBUILD pcapfix-1.1.4.ebuild 550 BLAKE2B f772b0e00db6e31efd7626ce918e32065783a15c844fde801b504275c79a150b98eb0c5e999814a3a9451539694c7eeadc5c2af827a045e3860d2bf22b16454b SHA512 3072edc7108cb41c016b16b4fe4a05386c87bed96eeba1dff0312bf2609c500a13b3d79f245218c53428de3ceb58bae670f11d56c81e046ec3a4a775882f7264
+EBUILD pcapfix-1.1.7.ebuild 799 BLAKE2B b348179d8515406b1016a27c3d35cd7c41ac736efc4dccc1f1750d08db777da81586196742017bca9f540acb9a41a882b1f9fc50dd6e2a35d7abcb0dfdd33474 SHA512 bafc9e61b296ee5deabf2225e284ef8c0e529a5a0d2e59ae62f2848d64250d382f8eaf8143b123754c2f28c7b08f6890904c1912842893993c5dc6ba05b4dd5e
MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/net-misc/pcapfix/files/pcapfix-1.1.7-respect-CFLAGS.patch b/net-misc/pcapfix/files/pcapfix-1.1.7-respect-CFLAGS.patch
new file mode 100644
index 000000000000..a80419b1a87b
--- /dev/null
+++ b/net-misc/pcapfix/files/pcapfix-1.1.7-respect-CFLAGS.patch
@@ -0,0 +1,21 @@
+https://github.com/Rup0rt/pcapfix/pull/27
+
+From: Sam James <sam@gentoo.org>
+Date: Wed, 29 Dec 2021 06:48:09 +0000
+Subject: [PATCH] build: respect CFLAGS
+
+Allow overriding in the environment by using our value
+as just a default.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/Makefile
++++ b/Makefile
+@@ -6,7 +6,7 @@ MANDIR ?= $(PREFIX)/share/man
+ OPTFLAGS = $(shell getconf LFS_CFLAGS) -D_FORTIFY_SOURCE=2 -O2 -fstack-protector --param=ssp-buffer-size=4
+ WARNFLAGS = -Wall -Wextra -std=gnu99 -pedantic -Wformat -Werror=format-security
+ DEBUGFLAGS = -g
+-CFLAGS += $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
++CFLAGS ?= $(OPTFLAGS) $(WARNFLAGS) $(DEBUGFLAGS)
+
+ # Determine extra LDFLAGS
+ OS := $(shell uname)
diff --git a/net-misc/pcapfix/pcapfix-1.1.7.ebuild b/net-misc/pcapfix/pcapfix-1.1.7.ebuild
new file mode 100644
index 000000000000..71f00b4ceb75
--- /dev/null
+++ b/net-misc/pcapfix/pcapfix-1.1.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Repair and fix broken pcap files"
+HOMEPAGE="https://f00l.de/pcapfix/"
+SRC_URI="https://f00l.de/pcapfix/${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-1.1.7-musl-stdint.patch.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DOCS=( Changelog README )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.7-respect-CFLAGS.patch
+ "${WORKDIR}"/${PN}-1.1.7-musl-stdint.patch
+)
+
+src_prepare() {
+ default
+
+ use debug || sed -e 's/DEBUGFLAGS = -g/DEBUGFLAGS =/g' -i Makefile || die
+}
+
+src_configure() {
+ tc-export CC
+
+ append-lfs-flags
+}
+
+src_install() {
+ doman pcapfix.1
+ dobin pcapfix
+ einstalldocs
+}
diff --git a/net-misc/realtek-r8152/Manifest b/net-misc/realtek-r8152/Manifest
index 2cb409c33090..a934e9e3a78f 100644
--- a/net-misc/realtek-r8152/Manifest
+++ b/net-misc/realtek-r8152/Manifest
@@ -1,5 +1,5 @@
DIST realtek-r8152-2.14.0.tar.gz 88356 BLAKE2B c530080cab5e6f7433aa6452e3c5f1f19f14c2ac473751958d85efa5553d2b2889d80cc47c2ad4064ad5673008df97dce197254f445c5fc7ae3905c7833e1641 SHA512 2908e9963b6bec9d638514e6a54ab8bca0b56c4866245f476889e4c8462c36f2bece86abac2e5ece9aee1776f00f7d4a67fd5561d830a67e02e386d79aba07dd
DIST realtek-r8152-2.15.0.tar.gz 93420 BLAKE2B 24b7a71adfddde3ff2ecc8c0b92d51f50202dada31a2f86a19d518f37814dd52d7ca5ffb5f81f07c7a92436f4fef53c8538a64d6bc5afbb0b6b7ccbace0a7923 SHA512 b46012d6e9c48ebb0eb0b7387933977bc56df7a9e010f0707907719e833a8f409d5af55ef84ebb0d54de89239e69697b6995c75e194ef7d0fa2c371d5fc362ba
-EBUILD realtek-r8152-2.14.0.ebuild 1606 BLAKE2B f93f03a5a24aa816ef0f06ed33edfe3190c7d9e7745f19774e898c4286b5b93911cd078e88f3078f8332ea7af9f6e4684828466a829dcfd66646fca45d88672b SHA512 8d71c10ec640cd395c5a779e9214e339860f81f7b8c4974710c92316ed36a8dd1dbc2f570e0542f83830fa18f43cf5c20ab07f3b53d4a6dd83296db6e500ad2a
-EBUILD realtek-r8152-2.15.0.ebuild 1608 BLAKE2B d3e3d51c689e73b230936b46dd01ec582fffec9855b377e51e656ea385b171a088d35a004cf76fb2b99af5b10df6479707310db5205e9a91eb6eb95dede29780 SHA512 7fb49e147edd47989c3680bee50c51d76e17bb8c29bcd1d7abae1ef8b16f1ee38e2206b5e43a4d4508587fd2b9a12ae3b331b5c3bf831ec2db02987ca3539a7d
+EBUILD realtek-r8152-2.14.0.ebuild 1605 BLAKE2B 525fcf936fb04e0ddf45509a594d643cbf64a7c6059ecad352e994f8b1c7fe8f40519a7f1f20ecd262105f704c2dd3aaf337178355a2eb6f03397dd9747417a1 SHA512 636a53aa95fa0efac53e1f5ce74e3fd4b85ba896a8966c082bc9dd86426f5e04ca5816145267c2e347cd5eaa511584d295dd229e0213d639c82b5f80bb437e65
+EBUILD realtek-r8152-2.15.0.ebuild 1607 BLAKE2B 46b615bcca4d117f9f0ef41e47c37ee4cb2319f243b30f6d35e9296c6e76cc6cce35296abc071b063794a39768a0d6568018d9ec4abc03317f4927b4b789df90 SHA512 87238a316d9080022fbbb53583b45f431e343db2e88521956bd0693ec16d69bf522299d188d14c256a437e75c0aa1e9e464cda859ad2ff787845730ad13d2ed9
MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
diff --git a/net-misc/realtek-r8152/realtek-r8152-2.14.0.ebuild b/net-misc/realtek-r8152/realtek-r8152-2.14.0.ebuild
index 1f3685ed7ba4..82668bc49329 100644
--- a/net-misc/realtek-r8152/realtek-r8152-2.14.0.ebuild
+++ b/net-misc/realtek-r8152/realtek-r8152-2.14.0.ebuild
@@ -8,7 +8,7 @@ inherit linux-mod linux-info udev
SRC_URI="https://github.com/slashbeast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="amd64 x86"
-DESCRIPTION="Out-of-tree driver for Realtek's 2.5 GbE USB NICs."
+DESCRIPTION="Out-of-tree driver for Realtek's 2.5 GbE USB NICs"
HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-usb-3-0-software"
SLOT="0"
diff --git a/net-misc/realtek-r8152/realtek-r8152-2.15.0.ebuild b/net-misc/realtek-r8152/realtek-r8152-2.15.0.ebuild
index ac2d53b76ca1..b8439d39d198 100644
--- a/net-misc/realtek-r8152/realtek-r8152-2.15.0.ebuild
+++ b/net-misc/realtek-r8152/realtek-r8152-2.15.0.ebuild
@@ -8,7 +8,7 @@ inherit linux-mod linux-info udev
SRC_URI="https://github.com/slashbeast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
-DESCRIPTION="Out-of-tree driver for Realtek's 2.5 GbE USB NICs."
+DESCRIPTION="Out-of-tree driver for Realtek's 2.5 GbE USB NICs"
HOMEPAGE="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-usb-3-0-software"
SLOT="0"
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 989b68a0096f..6c0b8156f31c 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -8,6 +8,6 @@ AUX rsyncd.logrotate 104 BLAKE2B 8e031a851e527815d26816985b8438dd439614cf8753d51
AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e
EBUILD rsync-3.2.3-r4.ebuild 3498 BLAKE2B 7ed62167acab5e725dba71c258a9a4f770595142469ca6c3b43939c2f99669f08fadc5fa6ac0104a14b774f6e679d547065b58135f13b5f0bacfb22e3d1b03b5 SHA512 b1bcf2bc437955ff6c86a9f0dbf492b927103b05d93edbdc44823fa49496f373d11c477af5c0fd83a1894f8e12148f6eddc0767c6535ef78b5ea4394520e0fa6
-EBUILD rsync-3.2.3-r5.ebuild 3621 BLAKE2B 0d6c1e197fef7e354abd57a2e08924c346283d28133bfcd86613af941e606bed3189ddb4936c053b63e041eb2b2ea09084c33ea565dbe2d96812a316476bc6f3 SHA512 bfd4e8a42faee142f9557979d21c08e869da3a42ce778a163a62c4c13da8e38ef093b748271a9d2afa820095dfc4da14669f98d1c8ba9e4f28304a92420ed2e7
-EBUILD rsync-9999.ebuild 3766 BLAKE2B 0343b2bd8957f9073295932f740e298789e0d7d2e5354ca640b1110d0ab47103878d6c3f9f7df57c1f30fb5cf128b98128f32c5ef61da134dc73cdc1ad42d984 SHA512 3f0366d6dd0ca85a75211766e6836d27a93d14006b8fe2718010007596f470c680b67e4a6c8b34ee17b2e3e2c8590d0d80eeca81d6f43700d57a4f45513d03c3
+EBUILD rsync-3.2.3-r5.ebuild 3787 BLAKE2B 0269ef2e8d91da95a7789e7da7d9603fface6ac2c99d747c3f430813aca8f1ba5f1d4147df1dbab0ded354fd3a6ef6d4589c554f3fe7d9e5c29883c19dfcc866 SHA512 abf1d2c92c2414fae3a341119cf41a64d61f81f2ea854f21d5f5f64a2f601700d3d50300f21b102fa3f3217371562939e86a892657435e5e7f327f7df3d80e32
+EBUILD rsync-9999.ebuild 3932 BLAKE2B 23cb0f29da61f0b15a52664584bcd69d9796512720a0ab3f68f5cc061a62bcae338f1113d6006c102969e988a7cc092b7d33b4ce8fa01712c43e3c0325de4d13 SHA512 0d7ffade47161a6da93fd41bcc4068c8bd5611ab45ea645c74150c39f11255d4d650bb36f6b21c3e8b3232b8004e85cf53ea4c97e80722396221b3e1fa9fed92
MISC metadata.xml 655 BLAKE2B 4c3c8c26cf6d9bd27ae43a72408e8d587d7a5d3db588ccf67b2d68a8b697e4dbc531e959ebe57274413f5a1630be54415a56540953e44241d4810baa8bbb06d8 SHA512 de38cb9841631855730caa0630af6acc5413d8460dfb529ab1e972cbb33f557475a37b1fb1544114a8a48f72bcec670b72d2d142e951ac30e9356a4c540d59e4
diff --git a/net-misc/rsync/rsync-3.2.3-r5.ebuild b/net-misc/rsync/rsync-3.2.3-r5.ebuild
index 684a8e105cd7..7f996c540050 100644
--- a/net-misc/rsync/rsync-3.2.3-r5.ebuild
+++ b/net-misc/rsync/rsync-3.2.3-r5.ebuild
@@ -10,7 +10,7 @@ fi
WANT_LIBTOOL=none
-inherit autotools prefix systemd
+inherit autotools flag-o-matic prefix systemd
DESCRIPTION="File transfer program to keep remote files into sync"
HOMEPAGE="https://rsync.samba.org/"
@@ -47,6 +47,10 @@ src_prepare() {
}
src_configure() {
+ # Force enable IPv6 on musl - upstream bug:
+ # https://bugzilla.samba.org/show_bug.cgi?id=10715
+ use elibc_musl && use ipv6 && append-cppflags -DINET6
+
local myeconfargs=(
--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
--without-included-popt
diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild
index 8c91d4f3a17a..0da8ff82f683 100644
--- a/net-misc/rsync/rsync-9999.ebuild
+++ b/net-misc/rsync/rsync-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit prefix systemd
+inherit flag-o-matic prefix systemd
DESCRIPTION="File transfer program to keep remote files into sync"
HOMEPAGE="https://rsync.samba.org/"
@@ -59,6 +59,10 @@ src_prepare() {
}
src_configure() {
+ # Force enable IPv6 on musl - upstream bug:
+ # https://bugzilla.samba.org/show_bug.cgi?id=10715
+ use elibc_musl && use ipv6 && append-cppflags -DINET6
+
local myeconfargs=(
--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
--without-included-popt
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 85aabeb6ef54..97602b9dcdd0 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,12 +1,8 @@
AUX socat-1.7.3.0-filan-build.patch 1164 BLAKE2B ea158041a421fdfbbcfb14f050920f9f6ea9d99097d74c9c81c63c5816595f2ef8475b3add04d9efd8d19498382520a4f686d73c85b1df1879d5997b2f4da635 SHA512 479a189bbc0546e8838f40e770902c0c82d5fd042e1d94731d0036f66448810dd5ffcd5297b3ad4e474db8e037d211e65648a5f35f41827d7a320d6b2b8208bf
AUX socat-1.7.3.1-stddef_h.patch 1272 BLAKE2B 1693a96be8fc27c102ef48fd16a1c719ff240b7330800ee26876f2b9a0b21671d79da3244f87894ee2f65ca833f34e9636ed7ace4f19951fa4443abe26a2bb9c SHA512 294acc9f05526eb47bc2cc01603b1c5bc553c4a2ffaaf63b87b66eb653930c0f8139fb8c4d72ddec10482e35ae3a6ba144a6555c8ba64066c30cc4132f10f2bf
AUX socat-1.7.3.4-fno-common.patch 497 BLAKE2B b1329f43afd86989d527a292ec188ebacfd269efe68bb649c6652cc7eb49d43363b0e0925c40cfa2e52a318a7eb84ae4822db98a5cbed69b394481f168def9ca SHA512 0dd7c92f8da42e99409b086ba48e757aa0fcdc404b771ce6d8f43296c72ab939bb98c202056312df5424332f9209b4f2b32b212b90c9d5819fb98ab0d890bc24
-DIST socat-1.7.3.4.tar.bz2 490552 BLAKE2B 68db1674a3156b28c10340e515f346de83d4e953570f3a3cdee9402db9f276285a8f46db14978b4651df6d0fa90fb496696f151afb3e826172daa444ee35e666 SHA512 f338d28e5fd9d7ebb9e30b0fa700bcd5ff50ff9e668403474963a3310ba2b5f68b5236b928872c18e4b1ee95328374987e7e263ac7655a0d9b3fc9da77281123
-DIST socat-1.7.4.1.tar.bz2 510101 BLAKE2B 9b7ca0a0add173c39d736d470079bf8e1330a8b11497128cc2b5edb019277682697f1f71f6d3d4a526a74a7297e4aace25493acea98ea95a885c52e5a9c34568 SHA512 7fa069bff294a01baebfd790faed027391ab1f47f09f0990e6dcb1c7cce5f3cdc20638fecb10e82c10b6342d903de9481f6d85a0debcc0368c882417dafbc756
DIST socat-1.7.4.2.tar.gz 653068 BLAKE2B 0eba89e2f8993e6c5f2ffaa57ca9e93ae89cb01bf9d6f0f0d5e9550d4cd7e6aa390b26120a47e3661772550f4fb189807bedd31d1477ff0065f478ef2be062ab SHA512 c331a6348e0febb35cd8adc2b116e3b8896cd7f64bcd93e507df4b8197ee1e6738ca256abf74c9b225e7a3769cf9643f0e237826125c6f390b5124ce0f10c972
DIST socat-2.0.0-b9.tar.bz2 516673 BLAKE2B 808c8821b89ae2463074f87915dfae10f82b66ac6cd0b6ff56ab18f57c704e5a2a3ce76650152dccce41e4bd00e3a937948d4ade0a915b1f0e917c7543c6fc31 SHA512 f728bd634feeeacd2f0e4020c1c6aafdadaef3ba9da818d9ae1195e9f48fb693b2bea8dbbb208af8daddd8d6405217113d5ce31d05c2e9b27f5d2fba6b1cc834
-EBUILD socat-1.7.3.4.ebuild 1532 BLAKE2B 798d515cf02e7ae01ff39357151bb57d6a2d29594e6fdcfabefec77432f6ca94b73cf697850a83558c675bf83cde86bea452358fe574e1b64bb6d53b786c916c SHA512 92c581282a689a04bc8f7a9300d9565ebfa1a45b1ad18e114e7cc539055ab04bc962e92292aa1873d816d0ed470bb05c3d57c888d2b1cd923e0bf49357b9e4dc
-EBUILD socat-1.7.4.1.ebuild 1479 BLAKE2B fe50e1861da8d2e17344ae1df1e6433ea7ad694a7ee8a19953a6d35afacfda16bb34813391f35483224c71a93d214eb5bf928f8ab480df384d988e4c105c897a SHA512 9a7aade38d9239f319f1f2fe313ad4ed9ca9040bfedd14d1329294cada49b76aa924b66a4c792e31ed0e58f4431818bdcc42a6ef616d0c72ccdc08f49477af3f
EBUILD socat-1.7.4.2.ebuild 1502 BLAKE2B 35babb2d5719c566afebb8717ed3fdc92b5c611cb097d46851471d2f2b91eb9c15fe90efe2fb2433b6a88f0ebf41ab36afdaefee581ae91f88572b86f4e382b3 SHA512 db8b77987c12436f8db4a89a6b8cfb8fa1c0e818e7d1f2de14bfab0ef0291cff2ae96e624f9d1deadc14fca56d1a1789c8d032abf45a18095eefd4922a4aa6d8
EBUILD socat-2.0.0_beta9.ebuild 1569 BLAKE2B 9dfa4c8b0b0abf35ac8f5cb1b8b719bae89f5814084606ecc3b1fc8197aa598b11b94912985578e939ce8c549da194fe2e17bb42214521297f0a41c5acc0d1cb SHA512 219edf709f24642d0113f0a9e4ea1566940895b1cc9b11163ab69f598a8863155fec5f06b66a8c09441e113d9fa210a1d7e26a194b5e4c6441d6e52cc2a1cb1a
MISC metadata.xml 468 BLAKE2B 3b8eb979af07fe02eac29cbb79d6da3782adf46025c072e03026bd765c562ddb7ae18dff9f162b18f9f9a07fa5fff3b3fda9a4445c9dc75d65d4395abc0de217 SHA512 0c3b9355c7420ea8bba4932c9c5f457393e0b7719fa65e5f9cd05ce38209d8cf8ab3e4401b8608a62fc8277742cf2b8728b9718b1183b634cfd596cedbe353aa
diff --git a/net-misc/socat/socat-1.7.3.4.ebuild b/net-misc/socat/socat-1.7.3.4.ebuild
deleted file mode 100644
index be9f48e777e4..000000000000
--- a/net-misc/socat/socat-1.7.3.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P=${P/_beta/-b}
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git"
-SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bindist ipv6 readline ssl tcpd"
-
-DEPEND="
- ssl? ( dev-libs/openssl:0= )
- readline? ( sys-libs/readline:= )
- tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEPEND="${DEPEND}"
-
-# Tests are a large bash script
-# Hard to disable individual tests needing network or privileges
-RESTRICT="
- test
- ssl? ( readline? ( bindist ) )
-"
-
-DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.3.4-fno-common.patch
-)
-
-pkg_setup() {
- # bug #587740
- if use readline && use ssl ; then
- elog "You are enabling both readline and openssl USE flags, the licenses"
- elog "for these packages conflict. You may not be able to legally"
- elog "redistribute the resulting binary."
- fi
-}
-
-src_configure() {
- # bug #293324
- filter-flags '-Wno-error*'
-
- tc-export AR
-
- econf \
- $(use_enable ssl openssl) \
- $(use_enable readline) \
- $(use_enable ipv6 ip6) \
- $(use_enable tcpd libwrap)
-}
-
-src_install() {
- default
-
- docinto html
- dodoc doc/*.html doc/*.css
-}
diff --git a/net-misc/socat/socat-1.7.4.1.ebuild b/net-misc/socat/socat-1.7.4.1.ebuild
deleted file mode 100644
index 7a65f4b61cdc..000000000000
--- a/net-misc/socat/socat-1.7.4.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-MY_P=${P/_beta/-b}
-DESCRIPTION="Multipurpose relay (SOcket CAT)"
-HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git"
-SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="bindist ipv6 readline ssl tcpd"
-
-DEPEND="
- ssl? ( dev-libs/openssl:0= )
- readline? ( sys-libs/readline:= )
- tcpd? ( sys-apps/tcp-wrappers )
-"
-RDEPEND="${DEPEND}"
-
-# Tests are a large bash script
-# Hard to disable individual tests needing network or privileges
-RESTRICT="
- test
- ssl? ( readline? ( bindist ) )
-"
-
-DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY )
-
-pkg_setup() {
- # bug #587740
- if use readline && use ssl ; then
- elog "You are enabling both readline and openssl USE flags, the licenses"
- elog "for these packages conflict. You may not be able to legally"
- elog "redistribute the resulting binary."
- fi
-}
-
-src_configure() {
- # bug #293324
- filter-flags '-Wno-error*'
- tc-export AR
-
- econf \
- $(use_enable ssl openssl) \
- $(use_enable readline) \
- $(use_enable ipv6 ip6) \
- $(use_enable tcpd libwrap)
-}
-
-src_install() {
- default
-
- docinto html
- dodoc doc/*.html doc/*.css
-}
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 59cf34345c0a..326fd8c9d49d 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,6 +1,6 @@
AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b
AUX spice-gtk-0.39-fix-finding-pyparsing.patch 634 BLAKE2B 232f39c0762c23553952e3f84018622b01f51ea2e1967b83f1016cf9e096e798d914e044598dcf6c41359dc95116152409918d7be800fe686dbdaa2d711ce30b SHA512 54140731f5005d2ccbd41358f499be6dfcdf909606c894c3707f686ba80898595484f2509857608c54d60908dbbb1ef4309ae0673f47d1594eb7b543db39fb45
DIST spice-gtk-0.39.tar.xz 845528 BLAKE2B c886c4c9f0e51d7f2bf6dbfe574f1a2bcab249f863cb7da1f009410572cdaa7a35ef98fc370a7e74f7e490ad3bfe8ffa832601f8bb0b0894b90ec1de76495ce9 SHA512 ff0f3ca6b10a2c415f2fa8d61464c5710aaa2a46c2c83909f146fa45f01151e756d9c3d79cb162dd3d0c1279b6ef55a67fc5c1266af2cb5b46ac1eaa0254c8d2
-EBUILD spice-gtk-0.39-r2.ebuild 3233 BLAKE2B b0cd50b79dbf5a8edce15dc1cc1571480b3db1ee9daac6a5fa64b95a5d3a73f11d4f75deae0da8a24bec3bdf5f0be2a5c8503d57640daa485c23a530a2dd5f1a SHA512 85134bb29b726698a892e2f13e0eb0f5295a0eeb740bfe4a5127c88c279a2a1f901efdac09afcbf6334d6222bb9cff3f1cd02e483751c98665c7f0ca266de66e
-EBUILD spice-gtk-9999.ebuild 3185 BLAKE2B e8e5fe02e0a2c84281c85f25287f2e2703f49e57189c4911ac8db56e0989cb18b5c96f69e534619bb54fcc8a71d476b54011d8c8973c1aeb5622f0aa97ff619d SHA512 ede7935207d82cdc9a27242354f8affdabecdf317128a468ab05cd65accfd15669abdb06d8daeeceedc96bbeaa1191f0ad0f6da531e4d4c89bf71120bb34d707
+EBUILD spice-gtk-0.39-r2.ebuild 3234 BLAKE2B 20b097d6409033f2b2c72c38290d66b8518716cb4cff151748f33d8fd502bdeff86212dd683f333eaf9c199b6d8796a0a15e2aea6a5ebaf91f665c607db46715 SHA512 258f54764d2c9b1bb7ddad7b4f7a3194aa3fcd098261cca9c54db544d5cd04ed184b17a005ac35efb09ddd000d33e4a912b165a615556a4fb5707427bdd237fa
+EBUILD spice-gtk-9999.ebuild 3186 BLAKE2B 3c81547b005ed094146cf9fb8d323bef0d937d9853c105397ec9793420dfdbcfad93fd392de4fe2e4640d1f799f410171646a246040edf297dd944533d0f836a SHA512 8806a1e345db874f7e8a0b701d7c4ec7fc88430312cc98977c776e670e1bb964307167f71ab747ca91ce586ba096219c6cbe107ed6e5c472469c0b47e745577f
MISC metadata.xml 786 BLAKE2B 92848ffe7209398af8bb17b6ec7017474aac7abfd9b2d1babdf9724c909ab364c53d23115d46c7cfc316ac2014c56d89a80590924e5fa31302b9a9016783e30d SHA512 1de921c89ecdeeaf601d8a362f025ed636a4125152a5042e51ca7c54c1b0dbe479566ad9528913c24209ac4c22c94c7b8a927bf6e352ea8223c65408af3a7dfa
diff --git a/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild
index f6db285d1dc8..af1ce907709d 100644
--- a/net-misc/spice-gtk/spice-gtk-0.39-r2.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.39-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
@@ -6,7 +6,7 @@ EAPI=7
VALA_MIN_API_VERSION="0.14"
VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit desktop meson python-any-r1 readme.gentoo-r1 vala xdg-utils
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index 59fac8bcb9c5..cac0f2b7b32f 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.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
@@ -6,7 +6,7 @@ EAPI=7
VALA_MIN_API_VERSION="0.14"
VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit desktop git-r3 meson python-any-r1 readme.gentoo-r1 vala xdg-utils
diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index 3ac4e6662ddb..4849a8a07f16 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -1,3 +1,7 @@
DIST suite3270-4.0ga13-src.tgz 3317494 BLAKE2B 898f279143006e1fc1f470bda3917afe85957de745676dc915f9c94292824ba0e10fc2ccf0a47e307c41e48741a3da7c066c45f63c917295e0522122226b79dd SHA512 bdf9c5d129419c87b45907186e5f158d8623009151357e4d8a3d08ffff2f3729449cead84d005227bfb32968ae363d1a29350692cabe9bf8b71f760eda3f496b
+DIST suite3270-4.0ga14-src.tgz 3318277 BLAKE2B 218d2332e3a5a3af1aa2f4f234d71ad5415ff74eefe485d1e9db2f4606caea56ce05142eec3b051f01eac3a0f0b7796221c98f16e7d7c625af291917148c5e37 SHA512 0c76946420bbc2a483ab321658350a5b3e1c03e66b65e99f1a8cb4d350e07eedd44f9f24671244f3c374f512e5d211304785b8e44ae125265ce8f71f0a9dcc65
+DIST suite3270-4.1ga11-src.tgz 3900772 BLAKE2B b56fc8464fa01c65db333bea3a4dc204b3981a39177e108add0220cbddb9c41c4170f879ec1e9bf2755575f7cdf43490fc1a81ca1ca0e9883f97943de0c3a048 SHA512 1032a03bf9b24ae9d0e9b9f8b6a7c6319dff2c77db14257f22eb05b52b308e9134d8c6a5080178081f7ba893936e2eca63bb0e04b804d4a7df2507a5b3f625fb
EBUILD suite3270-4.0_p13.ebuild 2048 BLAKE2B d80986faad81ef67e87e2b04c08501597b52038a3b2c9d1acc036e7b60771dae0b7fbf87778362c243c461b17122f43d493e45b90a0306b3b350048613ecc9be SHA512 7f3b6c7fe32ff609f6ac04bc07ed1f2db932ab3dbc8cf8f5a33a296e1dc45fddc122900be2cea3b5ce307106b564a64cc07b78dc1a51f613c47f471af9221292
+EBUILD suite3270-4.0_p14.ebuild 2052 BLAKE2B 9dc44ca0a90febe1ce62cd0a97ad7eb77ba1f61dabe77d22b2285fc9549779d554a389e3b6563e4cff6cd1d98d074c27e67d70d3c769efd2596f5c1eaaa044fe SHA512 c4ac7388701fa6756d9b4e982e234813ab9edcd488d1afea90875ea8fd2e286ff670c8467915bf1a2dd6f12361f19112035cad2ff4c80790b3f25e4f33e45b26
+EBUILD suite3270-4.1_p11.ebuild 1799 BLAKE2B fbe8aac18578cd104aa9414e1592c5b70d2840afc96cb43603280513cf6ff73879a6a338e46476d339a70f394768cc68f02adef29de54dbabf8473bdf98e82e0 SHA512 478e1319207d5fe0a4d1811803f8cb2159a372142880c8e3e7d985d370de5154585436ee56c81229d1067604038f2bfe84249b7e5b0c2f6262600b27848e4289
MISC metadata.xml 464 BLAKE2B 554ca4970949cc2eee2b196a4f08e76c0a74b2d5bc46d89739b1e19a8d7047780cf2381782d666d0986212ccac5f27bfb094a83d1f461cb09138bbdbcf61938c SHA512 3c816eebe5b34446af66ddb66fc48021cbf0b914155f5d458669259397699280a813778ba0c10d471a1c9f6fc3d64ef3d288d70422ff56339a6c562372f3135f
diff --git a/net-misc/suite3270/suite3270-4.0_p14.ebuild b/net-misc/suite3270/suite3270-4.0_p14.ebuild
new file mode 100644
index 000000000000..a4f2fe5f2b6e
--- /dev/null
+++ b/net-misc/suite3270/suite3270-4.0_p14.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PV=${PV/_p/ga}
+MY_P=${PN}-${MY_PV}
+SUB_PV=${PV:0:3}
+
+S=${WORKDIR}/${PN}-${SUB_PV}
+
+# only the x3270 package installs fonts
+FONT_PN="x3270"
+FONT_S="${S}/${FONT_PN}"
+
+inherit font
+
+DESCRIPTION="Complete 3270 access package"
+HOMEPAGE="http://x3270.bgp.nu/"
+SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+IUSE="cjk doc ncurses ssl tcl X"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libXt
+ )
+ ncurses? (
+ sys-libs/ncurses:=
+ sys-libs/readline:0=
+ )
+ tcl? ( dev-lang/tcl:0 )"
+DEPEND="${RDEPEND}
+ X? (
+ x11-base/xorg-proto
+ x11-misc/xbitmaps
+ app-text/rman
+ >=x11-apps/mkfontscale-1.2.0
+ x11-apps/bdftopcf
+ )"
+
+suite3270_makelist() {
+ echo pr3287 s3270 \
+ $(usex ncurses c3270 '') \
+ $(usex tcl tcl3270 '') \
+ $(usex X x3270 '')
+}
+
+src_prepare() {
+ default
+
+ # Some subdirs (like c3270/x3270/s3270) install the same set of data files
+ # (they have the same contents). Wrap that in a retry to avoid errors.
+ cat <<-EOF > _install
+ #!/bin/sh
+ for n in 1 2 3 4 5; do
+ install "\$@" && exit
+ echo "retrying ..."
+ done
+ exit 1
+ EOF
+ chmod a+rx _install
+ # Can't use the $INSTALL var as top level configure also uses it.
+ # https://sourceforge.net/p/x3270/bugs/15/
+ export ac_cv_path_install="${S}/_install"
+}
+
+src_configure() {
+ econf \
+ --cache-file="${S}"/config.cache \
+ --enable-s3270 \
+ --enable-pr3287 \
+ $(use_enable ncurses c3270) \
+ $(use_enable tcl tcl3270) \
+ $(use_enable X x3270) \
+ $(use_with X x) \
+ $(use_with X fontdir "${FONTDIR}")
+}
+
+src_install() {
+ use X && dodir "${FONTDIR}"
+ emake DESTDIR="${D}" install{,.man}
+
+ local p
+ for p in $(suite3270_makelist) ; do
+ cd "${S}/${p}"
+ docinto ${p}
+ dodoc README*
+ use doc && dodoc -r html
+ done
+
+ use X && font_src_install
+}
+
+pkg_postinst() { use X && font_pkg_postinst ; }
+pkg_postrm() { use X && font_pkg_postrm ; }
diff --git a/net-misc/suite3270/suite3270-4.1_p11.ebuild b/net-misc/suite3270/suite3270-4.1_p11.ebuild
new file mode 100644
index 000000000000..ff116d07cfcf
--- /dev/null
+++ b/net-misc/suite3270/suite3270-4.1_p11.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PV=${PV/_p/ga}
+MY_P=${PN}-${MY_PV}
+SUB_PV=${PV:0:3}
+
+S=${WORKDIR}/${PN}-${SUB_PV}
+
+# only the x3270 package installs fonts
+FONT_PN="x3270"
+FONT_S="${S}/${FONT_PN}"
+
+inherit font
+
+DESCRIPTION="Complete 3270 access package"
+HOMEPAGE="http://x3270.bgp.nu/"
+SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+IUSE="cjk doc ncurses ssl tcl X"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libXt
+ )
+ ncurses? (
+ sys-libs/ncurses:=
+ sys-libs/readline:0=
+ )
+ tcl? ( dev-lang/tcl:0 )"
+DEPEND="${RDEPEND}
+ X? (
+ x11-base/xorg-proto
+ x11-misc/xbitmaps
+ app-text/rman
+ >=x11-apps/mkfontscale-1.2.0
+ x11-apps/bdftopcf
+ )"
+
+src_prepare() {
+ default
+
+ # Some subdirs (like c3270/x3270/s3270) install the same set of data files
+ # (they have the same contents). Wrap that in a retry to avoid errors.
+ cat <<-EOF > _install
+ #!/bin/sh
+ for n in 1 2 3 4 5; do
+ install "\$@" && exit
+ echo "retrying ..."
+ done
+ exit 1
+ EOF
+ chmod a+rx _install
+ # Can't use the $INSTALL var as top level configure also uses it.
+ # https://sourceforge.net/p/x3270/bugs/15/
+ export ac_cv_path_install="${S}/_install"
+}
+
+src_configure() {
+ econf \
+ --cache-file="${S}"/config.cache \
+ --enable-s3270 \
+ --enable-pr3287 \
+ $(use_enable ncurses c3270) \
+ $(use_enable tcl tcl3270) \
+ $(use_enable X x3270) \
+ $(use_with X x) \
+ $(use_with X fontdir "${FONTDIR}")
+}
+
+src_install() {
+ use X && dodir "${FONTDIR}"
+ emake DESTDIR="${D}" install{,.man}
+ use X && font_src_install
+}
+
+pkg_postinst() { use X && font_pkg_postinst ; }
+pkg_postrm() { use X && font_pkg_postrm ; }
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index 44882bcc0ada..b4928f9dae91 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -2,5 +2,5 @@ AUX vinagre-3.20.2-freerdp2.patch 1355 BLAKE2B 6d9655bcb8bf778d6c9a9a4336d08d6e9
AUX vinagre-3.22.0-freerdp2-2.patch 3671 BLAKE2B 62d1307fc79adbe7d2949c005fcb133f2a75ed39572dcceb85348a60bdd0a1d432b21ad3bb9689866d644cc48e764f5c7b42b12e2b614805b3b4b82c5b7ba41d SHA512 167d92664001ee35ba8d2b0e262b7f45ec9488eca604e4a63979c51065c9d1e97701fab9377fb7cd623dd87ed9db8be3361ad306a1f55cce8da234ac13e2a312
AUX vinagre-3.22.0-gcc10-fno-common.patch 690 BLAKE2B 4f552f190f520fb1e09ae91fb8d88a4c31658f99c4e218df1d2362c8b2c20de1b7d67d04a6846041d26a0eaaf38236823381436c05abb2e293491fde2b17e94a SHA512 f6ec1a339aaf0d8a6a9f663cc51ae10c9a15e6c772dcc978c27a54842e8079d68079f5280cec34942921e4265f8fe94f61af9edc29946b6262d36ad321b6c37d
DIST vinagre-3.22.0.tar.xz 1574984 BLAKE2B a8e6c7be07816b49f7194ece223a3ee35608736e69c0390e5f67691135706f1e993df53b3e4cb5b1f3d6850ff546444efc477419ca1b5f5ca2fa490124f6c373 SHA512 6a84b353d75b48649af507cb747688115b35268bc0303554afc9684bbfec4f9c3b2d93d89fa64480ede07bb4fb1eabe360b6eccd11e58691ce9f955f329c615f
-EBUILD vinagre-3.22.0-r3.ebuild 1766 BLAKE2B 71f0e5b65f265f158a1f7f7bb8e062d1d263b496a0712b1047966da09bd32d270cc4f49e97def5cd92c41122134bed620918a57def779e8fca9ea64d0431ded3 SHA512 d39485fd0c35bff1555d440ffe88454f8ddb2ce50435c3d33aa62f61b344dfcb83cf9273a87ae7fb2f55046baafc1e24ab977088b564aa69db2f6673ac2a3240
+EBUILD vinagre-3.22.0-r3.ebuild 1773 BLAKE2B 5697a84339a4de18f8ce9c6a21ac255811cc946ca08e2dd9d09e8a4a6f9835b73cc7b6dd23402c33279c97bdf73d8572c544fb3f8fc004105bf65625c8407ac9 SHA512 4993c38d025b4156832b36a747c80d700666c357d8b304ac17f05e3a812cc653de6f73527a0f52f08989d790fe0a185752a627d624009a0fd11102c380a10ea9
MISC metadata.xml 551 BLAKE2B 59c0171d54fb7a4ae9f9eb9092dae3a3a933a72d68ffd7ca98b3fe43411ca0150f5283235fd1e13eead8fe39af78286991dce5234bbef6911f6c18acb7fc20e3 SHA512 73064bbb94834be628ac91b7a1da25b068ef9a9b37da2398c9adb8eb2e2513ce8be285d826f658b2f5272d612b589633d153fbf30ab41ceb3def7dd884a65a63
diff --git a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild b/net-misc/vinagre/vinagre-3.22.0-r3.ebuild
index 97706955cfeb..0d7b0315a0b9 100644
--- a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild
+++ b/net-misc/vinagre/vinagre-3.22.0-r3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
IUSE="rdp +ssh spice +telepathy zeroconf"
# cairo used in vinagre-tab
diff --git a/net-misc/websocketd/Manifest b/net-misc/websocketd/Manifest
index 58a3c5968b8b..fe3afa6a5093 100644
--- a/net-misc/websocketd/Manifest
+++ b/net-misc/websocketd/Manifest
@@ -1,5 +1,5 @@
DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip 73861 BLAKE2B ab1760636aad8ffa0aceb1720b6221debe9ddc6ef0c50d180cf5eb30d19a746acbe07ba3bb83047d7595a7e3060370c63ae6288fd2c57fa66a49e36492fc93da SHA512 6261d3ef4f67e239ad3a2d5b3a6b7b05254f6596ee7e9410c1e80de1b42047642286b2c0239b62ee769fbd2319c5aaeae595a1b9beb69abdd85504b53108bac8
DIST websocketd-0.4.1.tar.gz 46366 BLAKE2B 8b2fd1b63736cb47363e512044cb22a6eaa726c471289dbd1a6b77733d64b3023eddadd47a82357aec4bcbe097ce2b90806284f4483a36d2cf446d4eef66c224 SHA512 8535637bdf8fecbc4340606b6096672420126c32ed9e68944593f577e6307c810caf654e76f7077bf119d6273c6eec4c4c21eb21bfd805d0b8f5549c626460e4
-EBUILD websocketd-0.4.1.ebuild 737 BLAKE2B 28d5c70abd78e4a81747dd2436324cefc8db766b2e0d311e43618024a36f0ebe3df7a039a6aea30615f086743fd6e9f4daa280fca9096d9ba6de858d8dc0da21 SHA512 095d9712dee37c00bf16dda7885a9304d0ce02bfc83849df3775db65d1b6d5b16029198b88eddd079e61bcfbcb8027e1c7b4d3337e7297fb0261ef199998200a
+EBUILD websocketd-0.4.1.ebuild 736 BLAKE2B b93da8ffc1bb3762fb987647b541b5bcb3a4732f57391c631280a504515e2bf769d939c41d6b21cbdb90429529d84f3e7769e442c10bfc3e07db1f11bcb031bc SHA512 241df086228d8036dcef1d5ddb5cc1fcfe1322085ef6ca0fde923538234c1602cd49e32734d2744380c510d1fa8c6bca11287635527db8b813ff8a0ee55c3255
MISC metadata.xml 304 BLAKE2B 52cb3bbea8b0f20effed18bba6fde0ef8e73d862d30e279c22c5fb49aad5f0d887dd5538d9eaf29ee15261a7ed04bd0f74746b118ad0934b397d19e687572f53 SHA512 036653c438bcd6345dbd2a355cecc790459922fd2a61bca37f17d1abdfbcf43aaf2548a4bbf8c26d1f649279fee0699042be09b83db70b429acedf90628d998d
diff --git a/net-misc/websocketd/websocketd-0.4.1.ebuild b/net-misc/websocketd/websocketd-0.4.1.ebuild
index a611fd44e054..3e47380c1fb4 100644
--- a/net-misc/websocketd/websocketd-0.4.1.ebuild
+++ b/net-misc/websocketd/websocketd-0.4.1.ebuild
@@ -7,7 +7,7 @@ inherit go-module
EGIT_COMMIT="v${PV}"
ARCHIVE_URI="https://github.com/joewalnes/websocketd/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
-DESCRIPTION="Like inetd, but for WebSockets."
+DESCRIPTION="Like inetd, but for WebSockets"
HOMEPAGE="https://github.com/joewalnes/websocketd"
SLOT="0"
LICENSE="BSD-2"
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index a4da1928e36d..4a2a04b9b426 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,5 +1,5 @@
DIST wget-1.21.1.tar.gz 4884887 BLAKE2B 28a3044f33df1d24e13900e8018a38cabae21fb41dd2e089bdbfd759b4adee3771ab558b84f5a8b6f546bc84a3387c973903f9fe06562093d3566e22d1528587 SHA512 784efbf9fe43a1671109e32a9c36237eb2d5c19cf756bf6f6e65517fb21464d3d94b1d6f491852d23b3ddff63e38fe6b60df9125c91b139993af59875e3a0712
DIST wget-1.21.2.tar.gz 5004576 BLAKE2B e11c3a2b89ab26834dc4cbb445bcc6122d3a6b2a5b9c6de1ce9e8f062281f9e5aa1f80ca37a44791ba5aaf6a447015a26afef2199cdb75f1931d5e1ffb1f406b SHA512 3e35f92604486ca459f26df97d392579f1d83a9254519e8ce249b410bacf70dddf716d6caa3b29fd4865163f60410b2b8ad1ca1f7bb3dbb2456386b7647b988d
-EBUILD wget-1.21.1.ebuild 3474 BLAKE2B 61fa48665cd3fba01a0d83529c3e0087941e2d9fc97732409b27077305be0950fb5bc319a3c65c7bfda4c55ffbb231696dfa0568057829669e9f61fb6a0daa1f SHA512 5c5699eb526c63b185cbc95e94c5f68bd1c2b1c6220627b40d85e0f133a96fe45cf43c888baa97dd544fc37c5b7a07e81e41c66e9950ca8a30de034b94a09b3c
-EBUILD wget-1.21.2.ebuild 3594 BLAKE2B 4526793337e1bac52ee10d931dac8e8ae12a3bdc823265e1193911c72fbe5d53628ef99e4535944143317f4126348c07e851054e339fde8a61ddbf38c8dc9d31 SHA512 a62cb9feb4169556643dbc1435e1a22abcf3f759e84859495e8899c168fed4f32cba6e649294c6afdbd97f533e1f4a28efd950ae26e2c48ad427499632ff12ae
+EBUILD wget-1.21.1.ebuild 3441 BLAKE2B 04cde1ee54f6d0253270f2e61a24d424055a51c5188356cfaabf6f31b5c36c931ad7759aec0e26583baf1d8a19d2e85764a26be23c41f008d8744448cd46c114 SHA512 d25b64ebd446bb6457e52643b5ef10cd150e1479fb47cee0a08fe16096735f1837f39999aaf57f0db95c7538ca792e8b02caaf1a5f9975306c86e0074019cb5c
+EBUILD wget-1.21.2.ebuild 3561 BLAKE2B dce0e2c5e3139570873393ebf1f4a2819693f3a008dcc298cff4e5085ec0a3105714ad0eaf4ea68a7824193421d197ea0b01bca2e38228fda4edeee0b355f023 SHA512 d836c81242aa0c07af0d3e84fb5f57793c9ef568f967f0dc57c31579038f84141d74d045a516f3133eb0cd69b2ed67516e30440f607c8f9bc116010aa4e24640
MISC metadata.xml 740 BLAKE2B edacdb0309ad76e024fe551f53c21c87f2f8242879fbc59f6a9ad2e8cef7741e44a75bc9cb211b0a1f11fc2c89868fed7f1325132d3b30fad6a648d2aa9e5414 SHA512 563748bfa80727d7782f6a084fdbf7578eaaceb8501a2a349422fb38026d288eb72df4103173733a88345f22b43f30bdf45ea2dfe516a5e1724ca89ec2a67608
diff --git a/net-misc/wget/wget-1.21.1.ebuild b/net-misc/wget/wget-1.21.1.ebuild
index dfd4fce484b8..2a526b27a951 100644
--- a/net-misc/wget/wget-1.21.1.ebuild
+++ b/net-misc/wget/wget-1.21.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit flag-o-matic python-any-r1 toolchain-funcs
@@ -61,7 +61,6 @@ src_prepare() {
# revert some hack that breaks linking, bug #585924
if [[ ${CHOST} == *-darwin* ]] \
|| [[ ${CHOST} == *-solaris* ]] \
- || [[ ${CHOST} == *-uclibc* ]] \
|| [[ ${CHOST} == *-cygwin* ]] \
; then
sed -i \
diff --git a/net-misc/wget/wget-1.21.2.ebuild b/net-misc/wget/wget-1.21.2.ebuild
index 27f69c718b3b..f50b041c1a7a 100644
--- a/net-misc/wget/wget-1.21.2.ebuild
+++ b/net-misc/wget/wget-1.21.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
inherit flag-o-matic python-any-r1 toolchain-funcs
@@ -61,7 +61,6 @@ src_prepare() {
# revert some hack that breaks linking, bug #585924
if [[ ${CHOST} == *-darwin* ]] \
|| [[ ${CHOST} == *-solaris* ]] \
- || [[ ${CHOST} == *-uclibc* ]] \
|| [[ ${CHOST} == *-cygwin* ]] \
; then
sed -i \
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index b3dfb9411378..5b8186929b5c 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,6 @@
DIST youtube-dl-2021.06.06.tar.gz 3336227 BLAKE2B f30252927ddd79062995ec78d45854e1723fe561ca34777fb0a337750bf09c76da8c205af63869c68c6bc09bfe8f6de1d3f5ee240914ae871bb7920076d8d16c SHA512 7b4d453723d03c3fde46451277d5c44be01469ed1b414ce94e782d6228c132c982835805207222862d0d7b8ba162157196f976400fd15cea7ea513e3595aeea3
-EBUILD youtube-dl-2021.06.06.ebuild 2152 BLAKE2B af86d64eaf6fd32e80916fa1b42c4e99742ecab1aef7208a5a8d8c13f81992f7e032fe8ae6c4bb4931061eaa62965b7cb023aae869141730b62659606cdfd6d2 SHA512 35d7f7c29caed0f0cc741d62b665b4d19df036c33143fd31b5e582fb0ada17994c97db8803a0c6f4294af49dff1dbeecb779c1f896ace5a4777e22f37d2606f5
-EBUILD youtube-dl-9999.ebuild 2150 BLAKE2B 845e5d04d4ce84654c07ac59a7d3ee585fd8c514fc26ef6bf6d768c9812e8f72a8be6c41b76c74d995b8e0cef84e5d5e9dc3a4f20d6789c7160bc287cf0a011f SHA512 bc42946c393450632744e8c2e06a2defaa4066322756caccf8010a6d3c9db12d9296f9f366b7e8375283d166655089f06beb4cb3be313c1a7ec2bc74f4d576f0
+DIST youtube-dl-2021.12.17.tar.gz 3332299 BLAKE2B 5c798ad1f54f06cc42fd9a538536310e1084a02ec96969ff8e85ef0c6487ef54f34d58858512ade8b279929d8ebb9dda48175302fa23af9833c2301daa1d49c2 SHA512 bfc8280703b08f66e1108e9ebd9ab4689f064ac7cef03bd3d1fd2bc64928570e4376e389c9bc188eafdbcd74444cfc8aeccc83ee362ad4f478910efef3573ddb
+EBUILD youtube-dl-2021.06.06.ebuild 2135 BLAKE2B 9bd1d02f0ad68eb66930fa6095326f06c0cec70d15d37eccbcb02ca11bb92297e81221ded81c3a569461ff15049457a7a59fee7e2f0f11aa09dac2324a3d87b1 SHA512 d1b3e488591accac80bcae305cab64d896efece4c763fa85c7e1a14fc8a63438299581094a4fc3e3b7b06e6913554ce018a6d417e1aa144121986b46f2564cbc
+EBUILD youtube-dl-2021.12.17.ebuild 2141 BLAKE2B 6dd1abc54cbfea6f50eb307182710c6e041becd4ca583c32f01b58d5577dd857bde368a6d97c75ffed3373a510dc07fa66a4f5471d75028e2c6334f68b1e12b1 SHA512 ee9060a1417f5f838d23807f8ec2791c848c67dc4c06a6639f111e2e5419b4076d177b078dfa853cb78e07787bd83442ca56081d44c372651d82172ec7751e58
+EBUILD youtube-dl-9999.ebuild 2133 BLAKE2B 65068df0fabb30083664de67ad5d4416d9cb04595479ca531aa67548314c56920ac0cc7a3b2211a514cf777983115634a68df96ec7e51bed3c1347bd68e03098 SHA512 9dd56361b81ee86ceb5481f8a2d61cc359490702bacd310ae76560df648a920a7a52acfe07c5ab9adc3d77cab256fc71595ba5c8754411c962aead2f4a33457e
MISC metadata.xml 378 BLAKE2B 2affaeab2530f0780ed78dbdf847c1548038514574435673144e39daf96451dba415cf0d4799ec8c2bbd13d425165ebc98858498cfdf74ba62b22aa91bf9d54e SHA512 c8489d7732f8cada555d40cf91ea20481102639531ca06b22a3b1d330f34df5fd9d8727521b283dd6ca66bae70071eceb8d31426c614d28f38170671dace96ea
diff --git a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
index f22b67f5220c..c397d925fb6d 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+inherit bash-completion-r1 distutils-r1
DESCRIPTION="Download videos from YouTube.com (and more sites...)"
HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
diff --git a/net-misc/youtube-dl/youtube-dl-2021.12.17.ebuild b/net-misc/youtube-dl/youtube-dl-2021.12.17.ebuild
new file mode 100644
index 000000000000..140eed0ebc77
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2021.12.17.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+S=${WORKDIR}/${PN}
+
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+SLOT="0"
+
+RDEPEND="
+ dev-python/pycryptodome[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+
+src_prepare() {
+ sed -i -e '/flake8/d' Makefile || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ emake offlinetest
+}
+
+python_install_all() {
+ doman youtube-dl.1
+
+ newbashcomp youtube-dl.bash-completion youtube-dl
+
+ insinto /usr/share/zsh/site-functions
+ newins youtube-dl.zsh _youtube-dl
+
+ insinto /usr/share/fish/vendor_completions.d
+ doins youtube-dl.fish
+
+ distutils-r1_python_install_all
+
+ rm -r "${ED}"/usr/etc || die
+ rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+ if ! has_version media-video/ffmpeg; then
+ elog "${PN} works fine on its own on most sites. However, if you want"
+ elog "to convert video/audio, you'll need media-video/ffmpeg."
+ elog "On some sites - most notably YouTube - videos can be retrieved in"
+ elog "a higher quality format without sound. ${PN} will detect whether"
+ elog "ffmpeg is present and automatically pick the best option."
+ fi
+ if ! has_version media-video/rtmpdump; then
+ elog
+ elog "Videos or video formats streamed via RTMP protocol can only be"
+ elog "downloaded when media-video/rtmpdump is installed."
+ fi
+ if ! has_version media-video/mplayer && ! has_version media-video/mpv; then
+ elog
+ elog "Downloading MMS and RTSP videos requires either media-video/mplayer"
+ elog "or media-video/mpv to be installed."
+ fi
+ if ! has_version media-video/atomicparsley; then
+ elog
+ elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails"
+ elog "from the metadata into the resulting MP4/M4A files."
+ fi
+}
diff --git a/net-misc/youtube-dl/youtube-dl-9999.ebuild b/net-misc/youtube-dl/youtube-dl-9999.ebuild
index 6ea8ff1593c3..14727bf79b6b 100644
--- a/net-misc/youtube-dl/youtube-dl-9999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 distutils-r1 git-r3 readme.gentoo-r1
+inherit bash-completion-r1 distutils-r1 git-r3
DESCRIPTION="Download videos from YouTube.com (and more sites...)"
HOMEPAGE="https://youtube-dl.org/ https://github.com/ytdl-org/youtube-dl/"
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 97d9687accf6..cc9c1cf66d18 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,5 +1,5 @@
DIST yt-dlp-2021.12.1.tar.gz 2064958 BLAKE2B d97bf6bc5d6a97aec05be73dcc00aac6b1aff011c307abcbf604a3bfab06dadfd28401eab8ad26d42b7ec3db778c66e9fa2de09d3e6c28304fd28791532509d9 SHA512 d04e9e5ae36e73923ac79bb98af6e402ba0b4403430cbcc0517e7f446d42b6c637846b11489c0159faf667ab798b937abb9597fb5fba76b6f7b6e2b379bae328
-DIST yt-dlp-2021.12.25.tar.gz 2096136 BLAKE2B b40e35f8e7f644051ca80d7d6eeb5d7963e5d0b0c5ffbbc10ed2e4d1f7133a43ec19a715e2ca131fb95ce31c322b952cb13b40adcfe1d8f655e1bd2162ec8329 SHA512 826abb5654527e37454424a949607d2c9934328228566ab0baa89df23ea081c3feb01584a25d0154d30d389d4c10cc7203ad530ddf8472ae70d6e782e3ded490
+DIST yt-dlp-2021.12.27.tar.gz 2102852 BLAKE2B 69a3a9c916771ab2e1b8f86bbc43e03d0543801f587708b638348088d4454aff8ac93420fd8bd2ebb4f493c74acdf23f08a9495dbcdad77d840a95cfece4aa6b SHA512 2c687493736fabe131481d6bf8df13afc1959ac1458675bfe3c4273df7bb64218f84e07ea324b664b0a52c3e39b3e10999e81bc907bfc98a71a28c92dca90737
EBUILD yt-dlp-2021.12.1-r1.ebuild 2008 BLAKE2B 289ee6fd98fd60002e19aa82c706dc67f72a61c26b82fab1ec6cd9bf9d9461f8373473bfaf1c1be6931d0fcf98283c9868522c1b6fa805be3cb159e58985642c SHA512 cdd1d4390e74f2463a37db297b40ea0ba50c7676a364db00292242ea16a2488900d3f87a7db77724fd0d39cadc22c2b165766353d66f85af80d210ef61f817c9
-EBUILD yt-dlp-2021.12.25.ebuild 2010 BLAKE2B 281937f52d9ba8a97d5297c994a41a5cf702e6173019601e5cbe8b3757b69e02ba991e8feaad56bd66a63d172019321c9ab74840ab945f0ba62f51dc6cdc0413 SHA512 4120db145b0f3759dd55b3699f4a6bfa997c2d7b6dc44135576de870c9f016c41b5349d061f5d6977c8369265a48d5704fa39c83a4526374aae298099006b3ea
+EBUILD yt-dlp-2021.12.27.ebuild 2008 BLAKE2B 289ee6fd98fd60002e19aa82c706dc67f72a61c26b82fab1ec6cd9bf9d9461f8373473bfaf1c1be6931d0fcf98283c9868522c1b6fa805be3cb159e58985642c SHA512 cdd1d4390e74f2463a37db297b40ea0ba50c7676a364db00292242ea16a2488900d3f87a7db77724fd0d39cadc22c2b165766353d66f85af80d210ef61f817c9
MISC metadata.xml 461 BLAKE2B cf54d866278b449c8551d3d1681df0c08315b3863fb2e61ece2613b9a263f9fc122b54028f6f6cce5442db62b49e8c422c5b0baccd57a79b63f926efcbb1a85b SHA512 bb30935bab43083ba0328512acf204d8494571b00ee08caadc53a300ffccef2ae63bab8852166d9c158ce554f15493deeffef17ae52f7fe82734f9ef6bbf07ff
diff --git a/net-misc/yt-dlp/yt-dlp-2021.12.25.ebuild b/net-misc/yt-dlp/yt-dlp-2021.12.27.ebuild
index 449b50847e09..f6633c012f81 100644
--- a/net-misc/yt-dlp/yt-dlp-2021.12.25.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2021.12.27.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P::1}/${PN}/${P}.tar.gz"
LICENSE="Unlicense"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
RDEPEND="
dev-python/pycryptodome[${PYTHON_USEDEP}]
diff --git a/net-misc/ytfzf/Manifest b/net-misc/ytfzf/Manifest
index 37024bdf8e39..d4cb51af0cd6 100644
--- a/net-misc/ytfzf/Manifest
+++ b/net-misc/ytfzf/Manifest
@@ -1,3 +1,5 @@
DIST ytfzf-1.2.0_p20211208.tar.gz 3230303 BLAKE2B eb1cc05945bc91226d9a3f893edfcfcc5d8544ac2607d6bec7bfc5dd4a8f4b0c01e7387a73d82d148e908e727a1f2809765c9e21e13ca9e7de947c68c1a28f10 SHA512 f87dea2afb706ec9ea23fab3fa02833ddeff7261807f8e2e77471829fe05d293644c6b1d75660cbaae798cfdaede5553d1eabcf6b608a08a7a9d2de825ab92a2
+DIST ytfzf-2.0.tar.gz 3227372 BLAKE2B fa67fdc44174e1a0bbbf581f51fc0010230a6de37a38f54bd6c3b5dc1a8ae19790486db90ab0ab1f15fa1a70b544dd7888ec88c6f53ec5c2543235f64dc1ab94 SHA512 43c43b6a446335a7eef9d206864069df1e075d49151b359ead47de6e7234efc1042ce0557233e53c303d3c38572fd33a955e229c457561211250ddd0df5ccb0e
EBUILD ytfzf-1.2.0_p20211208.ebuild 1083 BLAKE2B 9b3075fd59ebea17f97c33072cb8b4200a60698af92eaa30877eb17fc43447caf4827123d157061237b42d65048ad8015e71594f342b0ec18f056d59078b17d1 SHA512 7e5dbe88fd2651dd127c0fa943e72a6c6ed0cb49f1e80b0ab3e9cc5bfcdcea24fba7ad1b93a1899ed8462badee6d0c1bbe6b4d7be0764e5318db953a855483db
+EBUILD ytfzf-2.0.ebuild 1362 BLAKE2B 1f728488f93a7a4f0dbb7ecb7125665698931e0251c790f961626b3a0486281992b74a3322b73e0098907ec1b30cae6dfd846870349ec214e70552c99341078d SHA512 cb7352b026b094e77b97e239c5d4491f935655287b1f3db7ccbe1830082e8c3f9bf059fd465012751fc3ba5e08e3c934f8685d2a89f70d6f20b406573de7207b
MISC metadata.xml 498 BLAKE2B 465ce6a83a75395c9021b7208a156bc91f55fe2522279a781509bc490e832611e89718317c88d4e2986f16f6ea1f8bc457d2f5978efa011e62c56cef756cf0ed SHA512 49f6d3c039246622d687f63b703390eef0d4fef51f485a091ccdb767da1b2cd8a380275cabe6117465add0e15acf6f6533033a5b17c751091abe462a43044884
diff --git a/net-misc/ytfzf/ytfzf-2.0.ebuild b/net-misc/ytfzf/ytfzf-2.0.ebuild
new file mode 100644
index 000000000000..66efd3b37f84
--- /dev/null
+++ b/net-misc/ytfzf/ytfzf-2.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="Posix script to find and watch youtube videos from the terminal"
+HOMEPAGE="https://github.com/pystardust/ytfzf/"
+SRC_URI="https://github.com/pystardust/ytfzf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
+
+# fzf/mpv/yt-dlp "can" be optfeatures depending on configuration, but depend
+# on them so it works as expected out-of-the-box while allowing to disable.
+RDEPEND="
+ app-misc/jq
+ net-misc/curl[ssl]
+ !minimal? (
+ app-shells/fzf
+ media-video/mpv[lua]
+ net-misc/yt-dlp
+ )"
+
+src_compile() { :; }
+
+src_install() {
+ dobin ytfzf
+ doman docs/man/${PN}.{1,5}
+ dodoc README.md docs/conf.sh
+}
+
+pkg_postinst() {
+ optfeature "external menu support" x11-misc/dmenu
+ optfeature "in-terminal thumbnails on X11" media-gfx/ueberzug
+ optfeature "in-terminal thumbnails on wayland" media-gfx/chafa
+ optfeature "desktop notifications" x11-libs/libnotify
+
+ if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0; then
+ elog "Note that >=${PN}-2.0 is a major rewrite and is not compatible with"
+ elog "configuration and some command arguments of older versions, see the"
+ elog "newly added ${PN}(1) and ${PN}(5) man pages for more information."
+ fi
+}