15 files changed, 207 insertions, 60 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 2095cd0dc276..f3e45e899ded 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index cfc413c8b087..c4dd62ddb395 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,4 +1,5 @@
 AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
+AUX curl-7.59.0-libressl-compatibility.patch 2838 BLAKE2B 95726ee47d375a98e85145fa52cd9d9d8d0048a3d83059c8c24e5275ef0f5e137ecfd5f3a5cc718f49b6ced84dc49f7c06c2da5584391bd8619194e5069d7736 SHA512 2a9fe255c0117421da3e7cc080f84e129460982deaea666e13007d775d682d8becc9c48e3f2ba26a15ffa2f5dd021e33437283aaad953c92d0d50f9cf668b636
 AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.57.0.tar.bz2 2849283 BLAKE2B 05bf62df8908a7c2b00abbc31067b8e12e8f8527594597e0c92e950a83e359e3ad430930face01057e0d2e6af8e8d759a9e078bd179cdbd69bc7fe2d10c5c5e3 SHA512 f366d2e931d7aff63bac0e1f760ced32c849252947d522427ba92124566906a7e6bd081b6d1630df36895dda2a00ac4cf1bed1470740693ef47ab90c6a270377
@@ -7,5 +8,5 @@ DIST curl-7.59.0.tar.bz2 2904158 BLAKE2B c44d9985a19cb7b1e273f868181b0017c7b0068
 EBUILD curl-7.57.0-r1.ebuild 7234 BLAKE2B 9ddf61766ebc6378b9b86446b4dd761630cb7a24a1293a3552d57e360c26d85ec38ac311f66bca6eb6c041f8922e91a587768c5417411842d5bd7850ebd73a9c SHA512 164351baedae507342aa4182882e7122be03964e3355c8e087a425f7c3595cc34dcb4303e781dbfb2576f02623595a1f5399f8dccb462759b1cb2593bf449e3e
 EBUILD curl-7.57.0.ebuild 7181 BLAKE2B 6b64ba502ac4b586b689b42b90d009c682f1df867e1f0aaa2964c51f5b22b4bd1f8a6da5376d9b3858821708e7a257a2b190188aaf0de2f821d86a80c82cd853 SHA512 65a2058ee302123fc3d18551b68c8be5efa2640f621620084df6d27772e7bdfb6ad8dcc36acb46dfaf63c8f883e6c68933d35a471951ec587d509d6a2c4db9b8
 EBUILD curl-7.58.0.ebuild 7224 BLAKE2B c87344a4b7a4a96668e8b4b483f2a93763ed8cd31b2ccc4f2c5946cb71aab90b770507d1aff22032f9171ec819be457f98c8ab0022a2fce1ed14b62c0ef2b0da SHA512 9954591b40a37617c9717780c426a1c400c376e9343d85b0d1f5a5b3cf8cc214d180d87bc67004abc538dd727dae31a8146e42127203f7a3f8cdcc57558fec8b
-EBUILD curl-7.59.0.ebuild 7224 BLAKE2B c87344a4b7a4a96668e8b4b483f2a93763ed8cd31b2ccc4f2c5946cb71aab90b770507d1aff22032f9171ec819be457f98c8ab0022a2fce1ed14b62c0ef2b0da SHA512 9954591b40a37617c9717780c426a1c400c376e9343d85b0d1f5a5b3cf8cc214d180d87bc67004abc538dd727dae31a8146e42127203f7a3f8cdcc57558fec8b
+EBUILD curl-7.59.0.ebuild 7398 BLAKE2B e283bf0466a098391eb3cb83f2091a16c176ebc0f45408a392d8064c185da4891c6e4318474336a8819c04e6bc708f9fd0827ec61b7c16504b6f977ca5a44b29 SHA512 6308685a668564672b0f74c81127e78cb902c899032fd755ae50600a5dcd48ddc1d143d36ef574230e9ee382eae41cd5af3deb88231cf454170a53286411ac94
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.59.0.ebuild b/net-misc/curl/curl-7.59.0.ebuild
index 2240efbd3a89..ffbfa22f6c56 100644
--- a/net-misc/curl/curl-7.59.0.ebuild
+++ b/net-misc/curl/curl-7.59.0.ebuild
@@ -108,6 +108,8 @@ src_prepare() {
 	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
 	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
 	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+	# the next curl release (7.60.0) *should* contain this patch as it is in Git head and 7.60.0 has been tagged
+	eapply "${FILESDIR}"/${PN}-7.59.0-libressl-compatibility.patch
 
 	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
 
diff --git a/net-misc/curl/files/curl-7.59.0-libressl-compatibility.patch b/net-misc/curl/files/curl-7.59.0-libressl-compatibility.patch
new file mode 100644
index 000000000000..e7ee6c3ab157
--- /dev/null
+++ b/net-misc/curl/files/curl-7.59.0-libressl-compatibility.patch
@@ -0,0 +1,70 @@
+From da51ddee81e10398172f0baf3327b5db82846175 Mon Sep 17 00:00:00 2001
+From: Bernard Spil <brnrd@FreeBSD.org>
+Date: Mon, 2 Apr 2018 19:04:06 +0200
+Subject: [PATCH] openssl: fix build with LibreSSL 2.7
+
+ - LibreSSL 2.7 implements (most of) OpenSSL 1.1 API
+
+Fixes #2319
+Closes #2447
+Closes #2448
+
+Signed-off-by: Bernard Spil <brnrd@FreeBSD.org>
+---
+ lib/vtls/openssl.c | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
+index 2a6b3cfac..bbb8ec766 100644
+--- a/lib/vtls/openssl.c
++++ b/lib/vtls/openssl.c
+@@ -104,7 +104,8 @@
+ #endif
+ 
+ #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && /* OpenSSL 1.1.0+ */ \
+-  !defined(LIBRESSL_VERSION_NUMBER)
++    !(defined(LIBRESSL_VERSION_NUMBER) && \
++      LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ #define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER
+ #define HAVE_X509_GET0_EXTENSIONS 1 /* added in 1.1.0 -pre1 */
+ #define HAVE_OPAQUE_EVP_PKEY 1 /* since 1.1.0 -pre3 */
+@@ -128,7 +129,8 @@ static unsigned long OpenSSL_version_num(void)
+ #endif
+ 
+ #if (OPENSSL_VERSION_NUMBER >= 0x1000200fL) && /* 1.0.2 or later */ \
+-  !defined(LIBRESSL_VERSION_NUMBER)
++    !(defined(LIBRESSL_VERSION_NUMBER) && \
++      LIBRESSL_VERSION_NUMBER < 0x20700000L)
+ #define HAVE_X509_GET0_SIGNATURE 1
+ #endif
+ 
+@@ -147,7 +149,7 @@ static unsigned long OpenSSL_version_num(void)
+  * Whether SSL_CTX_set_keylog_callback is available.
+  * OpenSSL: supported since 1.1.1 https://github.com/openssl/openssl/pull/2287
+  * BoringSSL: supported since d28f59c27bac (committed 2015-11-19)
+- * LibreSSL: unsupported in at least 2.5.1 (explicitly check for it since it
++ * LibreSSL: unsupported in at least 2.7.2 (explicitly check for it since it
+  *           lies and pretends to be OpenSSL 2.0.0).
+  */
+ #if (OPENSSL_VERSION_NUMBER >= 0x10101000L && \
+@@ -259,7 +261,9 @@ static void tap_ssl_key(const SSL *ssl, ssl_tap_state_t *state)
+   if(!session || !keylog_file_fp)
+     return;
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
++    !(defined(LIBRESSL_VERSION_NUMBER) && \
++      LIBRESSL_VERSION_NUMBER < 0x20700000L)
+   /* ssl->s3 is not checked in openssl 1.1.0-pre6, but let's assume that
+    * we have a valid SSL context if we have a non-NULL session. */
+   SSL_get_client_random(ssl, client_random, SSL3_RANDOM_SIZE);
+@@ -2082,8 +2086,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
+   case CURL_SSLVERSION_TLSv1_2:
+   case CURL_SSLVERSION_TLSv1_3:
+     /* it will be handled later with the context options */
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
+-    !defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
+     req_method = TLS_client_method();
+ #else
+     req_method = SSLv23_client_method();
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 25e46dc078ac..5e7bb9ec02d9 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,6 +2,9 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r1 220 BLAKE2B 3e7111d8b49bc52626343960d2609f084032c8015c06d700883d47c8ce7569ef5bcb881b682c68a2a911d5f24bcbf554a0e098722f4bf0f1477b80243c6978b0 SHA512 ea685e6eb901b841e54aeb9b530d5a0d2a367d8b598019f7f0d2ae69b013be7cf3986c68fabbbaa30c51c9fb5406dc45b07ff15914c7cf18a7aceacf466328e5
 DIST dropbox-lnx.x86-45.3.88.tar.gz 108891513 BLAKE2B f72ea5663a2ea46b0c34294eb18e647f857c8769a3a341fe73b1d4d252a3c08f3add1613b0413e6909e3a5b770f32e473b3383a956c08fec78067736b5b66cbe SHA512 499249377c22452a8266402e6b4ab48f9a1cf1249c4354919a5861ccb7080e8df47d4ef7d757a1667b3511b82c9faf512de1aa1e2e35a939908f74976a728724
+DIST dropbox-lnx.x86-48.3.56.tar.gz 108876564 BLAKE2B b809a220605265685026657e791aff3e716f7ff51e1fc5074d66df87eb8dc473c63c7513c94ca0715844c600fe71aaa3c42a108be4baee2e3e72baade97e3429 SHA512 3174c41e19a01cbd986c111711bc0df80b68882d595a5c869b81bfa1982b3f219da4cda852168bf7fdc9d67b91f52260017f4d25508f6372efd470536a6b96c8
 DIST dropbox-lnx.x86_64-45.3.88.tar.gz 114967662 BLAKE2B 3276b3b20bc96eff3a756064c64b5a0e8ad28b27d29579dd6dc34043427bb209bc5d86be62651f6642f61af17388113ec9a1a4a211e3149ecb8679a4b8e505ca SHA512 d3a787487084237fff928afd6ec2192f27e196c589bba3c6bd8a501055d1a3d4c8dcb88b15336ea03bed38e2a02d0731bb9725cbb324bb6e00ec95e98ed671ea
+DIST dropbox-lnx.x86_64-48.3.56.tar.gz 114940928 BLAKE2B 7d678344b59aa12bdbd28f3e425c0b80b15feae403911ef25a03150d1dfa47e94da1eb17d4b703feea6721d2fdfa721da54fab92e1a56b6b8f31456482bc3614 SHA512 cbd3eed71286be079aa8c898929dea305a4cefb9b5e2e41b196d07f68bfc3b5f2839f78d676a3fd7df62644fe00b9ad1930121bde88a6eea9c864d956ccb6f8e
 EBUILD dropbox-45.3.88.ebuild 3079 BLAKE2B 4cea1be2d51e713e471fe54411a54c6652c302085798fa67d696c72dab246615b7fc767eb278c08b6ff3feab02eac7945a9b4259bf90b1c2bef85e82993dd386 SHA512 e3e1b8989ccf71656e3fd2d77b747db3e66207dc80cae00ac9ac441768e1eebe87f44060874cdc349dcb07357d05ae3b5ea1998d5671a047d0fdef543e8f5fcf
+EBUILD dropbox-48.3.56.ebuild 3081 BLAKE2B c9cc9629a3f9f37df18119d626534d8f91652d5fc24cf401cc6aaa847061e6ab251442f6b70e63143871b687342c6b63666a47153bf1386bafd3cfc12ec21520 SHA512 aaeb99168a5b3a20a193bee845c6aae1de5752b7b402e1c9d82a724b93132289d7a449d36c71fd7d78cc6ccf616824d0616a417a5164f56712d89a6caf6ced14
 MISC metadata.xml 392 BLAKE2B 19f1d26ecc891282c1930e65db36adbfc73c6cc110dbfa1a90a6ed85f87dd1936860dd1710c3c3e2593df22fea34e5aa803a4b46a812e764563dcad19320c466 SHA512 35be87e089ea5aa62a5f90ac1241953df5c5115dc59258c7f5bdbacdb7a11938c79361c07e87d366f1db2af8a172d571cf2c9061885c60b7fa39a802bd31a141
diff --git a/net-misc/dropbox/dropbox-48.3.56.ebuild b/net-misc/dropbox/dropbox-48.3.56.ebuild
new file mode 100644
index 000000000000..fd6a76df5146
--- /dev/null
+++ b/net-misc/dropbox/dropbox-48.3.56.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
+inherit eutils gnome2-utils pax-utils systemd python-single-r1
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="http://dropbox.com/"
+SRC_URI="
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )"
+
+LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="+librsync-bundled selinux X"
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="librsync-bundled? ( dev-util/patchelf )"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+# USE=X require wxGTK's dependencies. system-library cannot be used due to
+# missing symbol (CtlColorEvent). #443686
+RDEPEND="${PYTHON_DEPS}
+	X? (
+		dev-libs/glib:2
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5[-gles2,xcb]
+		dev-qt/qtopengl:5[-gles2]
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5[-gles2]
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5[-gles2]
+		media-libs/fontconfig
+		media-libs/freetype
+		virtual/jpeg
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		x11-misc/wmctrl
+		x11-themes/hicolor-icon-theme
+	)
+	!librsync-bundled? ( <net-libs/librsync-2 )
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/popt
+	net-misc/wget
+	>=sys-devel/gcc-4.2.0
+	sys-libs/zlib
+	|| (
+		sys-libs/ncurses:5/5
+		sys-libs/ncurses:0/5
+	)"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	eapply_user
+
+	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
+	# tray icon doesnt load when removing libQt5* (bug 641416)
+	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf PyQt5* *pyqt5* images || die
+	fi
+	if use librsync-bundled ; then
+		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi*.so || die
+	else
+		rm -vf librsync.so.1 || die
+	fi
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropbox_py3,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r1 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index 6ec510c74a17..ba91d110c75f 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,5 +1,4 @@
 AUX lldpd-0.7.11-zsh-completion-dir.patch 318 BLAKE2B 98a182c00ac6d5fedabf2c5c0891020b1c896e6b412bdefbf2db6715065df8b1bf75965f262f42a794d2be3cfe78c716c44b02e6076bc5a1bfcb68f88730e337 SHA512 cd4c069f9d637d6c9f0a687a7a415a6382bf5217390a94a269de19f5a35c1edd47d5c3455bc63d75aa7bc74a72d7f2c9de9210c0795a95bd0c78a10c1709fcb1
-AUX lldpd-0.9-add-getpid-to-seccomp.patch 779 BLAKE2B 3d92182ad013859dec9153fab62278b675b437fa66b291b76cec0a9f22a5767cee0a619215c302dcc608811c7d5539687762b37cb5bd95f8637a55e8b03747a5 SHA512 0094bf64e231eed45f33787c11f6f3c6332e32995b57673e41f1300c1eab606f4669ec4a60e9c4435929fc8c8f4b1831338fbdad786d9f13d6c4462a10b88741
 AUX lldpd-0.9-seccomp-missing-syscalls.patch 1192 BLAKE2B 2692d29b9ffcd7edc09c96b512dfdf1e868be50a07428ac810ec5276b132ef43215f59de498e0b1e61fbf9dce0db4261c96ee81461b20d2ab9764448b74a56ca SHA512 360c53265171ba2effed935da762d66213a911da53832d2c5426e775d4e0d00d2ee74b0041bebe100a4aeb1ecd0292ac4bd2f95dcf0c79440e28f2ec47b01669
 AUX lldpd-0.9.5-seccomp-add-socket-ops.patch 833 BLAKE2B 47f508fd0894334cc4d00079c3c3907bbe419c1729ed54214dee835661742b8a904098a5a28a86bdf836becf10004942fe6159be29ff27adeaa8bc8258156681 SHA512 5b39207b33a5b419e1775bfbaa91f11b1aa07af786a4be7733f305ac5d5a7a1ef9e8a2eb91d023aaac005bc19c1445f864b5a702073892436b5e310fd4fa79dc
 AUX lldpd-confd-1 142 BLAKE2B 38b3709d5cfcfdcfdf91ad4bd47902db779d035f825a7c875cbbfa55b35f085c04cc387599526465a0f12a0686d6550e7d3750b077f04993b55893cba2bbe362 SHA512 a2a4c85068a6b8b80c92fe56af7799a8b8cb2516e5a65b3ae4cb28f278e5acc72402da2a35f0c48a6048fd4a8536061142cafaa49a4bae8e52ca0a5d9ed38b4c
diff --git a/net-misc/lldpd/files/lldpd-0.9-add-getpid-to-seccomp.patch b/net-misc/lldpd/files/lldpd-0.9-add-getpid-to-seccomp.patch
deleted file mode 100644
index 55ed4b6f8e38..000000000000
--- a/net-misc/lldpd/files/lldpd-0.9-add-getpid-to-seccomp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/daemon/priv-seccomp.c b/src/daemon/priv-seccomp.c
-index 1905236..7d911bc 100644
---- a/src/daemon/priv-seccomp.c
-+++ b/src/daemon/priv-seccomp.c
-@@ -161,6 +161,7 @@ priv_seccomp_init(int remote, int child)
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendmmsg), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(wait4), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(stat), 0)) < 0 ||
-+	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(getpid), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(rt_sigreturn), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(close), 0)) < 0 ||
- 	    (rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(sendto), 0)) < 0 ||
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index 0cf9203b4591..27d13b327bee 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -4,6 +4,6 @@ DIST mosh-1.3.0.tar.gz 356220 BLAKE2B c0a74243f7f54e24b2ccc326f89cff87f2772bf98b
 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
 EBUILD mosh-1.2.6.ebuild 1414 BLAKE2B 0e25ad166c0585e5ab666995ec51dde78873d70baaef606b7792c3f40c8f936d301540283d9e58b62ec7c35501230eccfbdc6e511d6d2880941da9cf468cae2b SHA512 d71a034a819cf74ccde1bcef032e9bb61fab3b8f77f344f1ecb8dec642a35ef16af4a8735fb07a4f363eafdc907dc684454762588d83a8090b272fa3e75134e8
 EBUILD mosh-1.3.0.ebuild 1418 BLAKE2B ea80d1bb63dff0ea18e76ce252bc343411f2a472b4bff33c1bd0f7481194f924b6e27f5d12f85c206bc7ee86e182a5d5e6de2d4251d64bc0ef713a0cff3a8578 SHA512 96ef79e279f7f5ca889a0a0cbd0b5d97e32181d8c5865e314b91e052a1b0cfa92343959e501536b11917e5092b11ecc7a834198ce06a211b1395dd5e4be9b0c5
-EBUILD mosh-1.3.2.ebuild 1425 BLAKE2B 627ee545e7507b29d88126b1c39e70e8bf3963becae03fc928c4531ec170218b4495f11c79be9a73d8f03bacc5fb181ae2e22127db0aa6fdc145bece3c88579f SHA512 f6683d78f7e3c092a61006795d8c15637293f78d1108db156cdb9973c2fa48f101d00fbe057a98ea712d6cfa152005e62920e84bd5bf05c2105b1c4390831138
+EBUILD mosh-1.3.2.ebuild 1423 BLAKE2B ce22c8c50e95a1c432ccf6bbf1ed7ab0ad7c1e64ef56b44c6d1032647d58fb6b2cde83497a7c4ab631277fd05e9524ae6d8c4c0a0ad37fd5f4799da42b9f7f79 SHA512 601b76c6db42372567c990e5de7e94e7224824e73319f1980c872ae55e55ba7f336ce94821b4087ab3da1684f7a9069df449778bd97dcbbcb2e298dbb82203a9
 EBUILD mosh-9999.ebuild 1369 BLAKE2B e9aaec4ebb618d05c9ca0a609f821594de3359e6b82d336a5ca261e720cdd83ee7cb29b97ba8ad2fac5f68f89fc73e0ddb20afe5508c0db60458b5dcafc48748 SHA512 778cc0316c4f8f600132477f2a9cb7f0011dbc204d5d2692f1fe61ad40276142f9f105025cef3aeddc1a158eecb5798a7b9e291fe2279348f206ab09e2a2a9c3
 MISC metadata.xml 1158 BLAKE2B c248c447c308c6a1361f605ce9ee6030bd89e23083295a7ff93c7f039860b16d3c98aeff4eb7f1d26687dfb9f00b1e3547c6df9ff62281433f71c01de11ed97b SHA512 fe6d5f54ffa09d5fb33df2669668a6e3f6c04809d4c61ece08c083600f7ac63dc4acb29b006ef7208b44e56ab8e232f598f33c390e0e2fa586ace6ad825f5c53
diff --git a/net-misc/mosh/mosh-1.3.2.ebuild b/net-misc/mosh/mosh-1.3.2.ebuild
index 73919ad6dbf8..09040483e95f 100644
--- a/net-misc/mosh/mosh-1.3.2.ebuild
+++ b/net-misc/mosh/mosh-1.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mosh.org/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
 IUSE="+client examples +mosh-hardening +server ufw +utempter"
 
 REQUIRED_USE="
diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
index 10b769c04eaa..3b81cdf8262f 100644
--- a/net-misc/wput/Manifest
+++ b/net-misc/wput/Manifest
@@ -1,6 +1,5 @@
 AUX wput-0.6-gentoo.diff 641 BLAKE2B 2876ac3eb4f42590d01cde847cd5866ddfc7cd7e4630d901e573ef87f8b99d55e08c063c8ff0e497fae3cc75ccb72acddfd1787f19dfef12672a5447b364ceb6 SHA512 7fdf3cd385753dac4fa219aaebde585427f9b4b208252f36f48132b850f28cf58934d4972cefcaf4a1f8b97eb02f32ca1b60eec2ca68f2fc3f1a623f6bf4817a
 AUX wput-0.6-respectldflags.patch 391 BLAKE2B fd2c41ce1fcc4866b5951bba49f4cd4d7ff5f4a9891016460e99d14ff78d3275273d234fd86df1b1cb3ecc5d5a4c7527f5b80cb2a00106a69f5d82badfc46497 SHA512 3ae0d882e94b23a84b40b3c79a793dd21c7a070019fe3003f6aa213e269eef455826830e316483328507c359b0c27e5723f919d383af0a73eb0d8559954db146
 DIST wput-0.6.1.tgz 312342 BLAKE2B 67053f71307e9fbb3f085e9347c7843f4bcaf951858164fa228f9cfd80898192efc344f1f9cbf65a3db286fae5b514da64ed3599627f264586c9242ac753f62b SHA512 f5eb5e343c77cec0f3370e8d73679e3c720a848a963c2cdc64e6c52f30b47d76e0de9ccde965da9af97d2e5f23f45dd894f26371f56ead498d28fadffe65fc4b
-EBUILD wput-0.6.1-r1.ebuild 772 BLAKE2B 021df49888874a7aa20fc506f3ac463477118b7267e8bf144121f2ff5ba825d7ffa95a5cd51ffe61be2934f31e88f06d6a950fa43f88e3546bc0e726af91dbdb SHA512 14ccbce2d2562dd3e3c0f50f7c9b23f69ac2cb8a336227e0982422de98c98cb723d303941bddb73d6c9ec0e82f4372cde32e90e2aae6eadd608485ea24d7fd67
-EBUILD wput-0.6.1.ebuild 937 BLAKE2B 280991485b1ebdd0a3535724fea44dc200c7170e17f419cb4ccf5e78c2fc969638cd8ebffcec8174bff1c02d8476dea669ac7528bf7849234d5540389e58043d SHA512 09ff86266767d47be0269d2d35d0d6e5d79669a7e587075622f5248cb1be597234e84314080fe01117ad58e1858841ec0adf5009df336488571897fafffcec68
+EBUILD wput-0.6.1-r1.ebuild 771 BLAKE2B 11233a6e15d359f028f1abe461ad17b63236daf5eede7311e0fe86989941153033334575be4c41a8470f931161e1de535be12446ebccaf47037a6684e11e9ea8 SHA512 284e8945df93ba93a2322f1f62254b4fa671a1bd6045cecbe52bfcb54918b12f27cde9d710f896ea39839cafa1dfe617597fe6674717d8c297cf512dc43e9702
 MISC metadata.xml 213 BLAKE2B fc154a4a8f3de9a525bbf6fb99faa45fbc8a7acc300b3ebc91e2c7b69a2094f47fa312e0141e060b3e4f83e9f7fbc3b61f3d2c8946b3c6663120f1a791834f86 SHA512 6aa0dd15c8b17b8007764f93049ca69537377c25282ff538d14b792fda16dd1eb4d847b2354d140e1ff68c2df28b4280d6e93b2ca0c90f862c4a6748d916ae4c
diff --git a/net-misc/wput/wput-0.6.1-r1.ebuild b/net-misc/wput/wput-0.6.1-r1.ebuild
index 95361822ca98..4622df777968 100644
--- a/net-misc/wput/wput-0.6.1-r1.ebuild
+++ b/net-misc/wput/wput-0.6.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="debug nls ssl"
 
 RDEPEND="ssl? ( net-libs/gnutls )"
diff --git a/net-misc/wput/wput-0.6.1.ebuild b/net-misc/wput/wput-0.6.1.ebuild
deleted file mode 100644
index 1d495ab77a2c..000000000000
--- a/net-misc/wput/wput-0.6.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP"
-HOMEPAGE="http://wput.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="debug nls ssl"
-
-RDEPEND="ssl? ( net-libs/gnutls )"
-DEPEND="${RDEPEND}
-		nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.6-gentoo.diff"
-	# Fix bug 126828
-	epatch "${FILESDIR}/wput-0.6-respectldflags.patch"
-}
-
-src_compile() {
-	local myconf
-	use debug && myconf="--enable-memdbg=yes" || myconf="--enable-g-switch=no"
-	econf ${myconf} \
-		$(use_enable nls) \
-		$(use_with ssl) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc ChangeLog INSTALL TODO
-}
diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index b95dc429034a..f5d027a111bb 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -9,6 +9,6 @@ EBUILD youtube-viewer-3.2.0.ebuild 2335 BLAKE2B eeb267da1690c4322bede79f6a7173c5
 EBUILD youtube-viewer-3.2.4.ebuild 2302 BLAKE2B 709a44a8c589bf8b8b143e8465e9aeaa17a8d42ea94c30f453276b61e31a10d6fcb5ef1039b8b2f48738beff63b64cba0599c8fdcdeba380f7f53efda7edc20b SHA512 401d3e44d86c4fcf8397e39ae2b05e06664c6ac53c7048d419138851e2ec5b21ee5beed3e170bb9156e313c3c36b91b11adf6ecd1704e75031194e322cb5775d
 EBUILD youtube-viewer-3.2.5.ebuild 2258 BLAKE2B 12b8ac05908daa5b28c301620ed3c0e5a1538fd4ae22112c2baa7a17f1c6c750d248d8aa2c47cf4d8502c31eb0e89e704af7d4bb7858ae6574dfe89493467708 SHA512 1b2d4d344fb4406a0a9fa8ca70c6e73ea0c597069a92a95684b2f34111799f2bd94d1d4e9eae23f67a3355f5545c8f3237122de80264b2e465d04cd5d363ea87
 EBUILD youtube-viewer-3.2.8.ebuild 2025 BLAKE2B 390f88f32c0c4bfaca84c8265ac73dc1b712868b481d949f15f0c96bd83b780e42039d2d422faaaeeea557c5794164abe40694d4dd74c36e9e2519ef42661933 SHA512 2fa5e47ed3c5dca68f1176c26a468862c4e9f31782a8dc7328aca3754791114fb0f4090cd4936468c8b04f485919701eaa6c4a56301866dc7ddbe6eb97a0f726
-EBUILD youtube-viewer-3.3.3.ebuild 2027 BLAKE2B d090963e37b0a6198e6aaea0c358c860b36c59c8201cef648c42acb59d970aa28283eb63d1dc1173be74624e7161d4a284f0a2757416bce826a1cd68ba9c47a1 SHA512 a62061be86dfe9a526790673f3c47ce60146537956cbc2d1f1b0c64cdfec6954044662d770ac74ad8e3b8245f4da9e6c194d5175631a81e82deb89494f2f97b8
+EBUILD youtube-viewer-3.3.3.ebuild 2025 BLAKE2B 390f88f32c0c4bfaca84c8265ac73dc1b712868b481d949f15f0c96bd83b780e42039d2d422faaaeeea557c5794164abe40694d4dd74c36e9e2519ef42661933 SHA512 2fa5e47ed3c5dca68f1176c26a468862c4e9f31782a8dc7328aca3754791114fb0f4090cd4936468c8b04f485919701eaa6c4a56301866dc7ddbe6eb97a0f726
 EBUILD youtube-viewer-9999.ebuild 2252 BLAKE2B 5cb27656f5f6ff899760f9f200ea3ddaae1f3a721bbeff90b8b7c3fe4b0c38f09b2ce7cc9be2a19cbd7b41c03d54426cc1e2e1d62dab1038d866b27e876e6875 SHA512 15f2acb1b4346ada4d71913569ef91852657ac52861ff89b6b7952903ef20c6a9bcb438f89a024aaab030c9e0a4820c2f0cab08a7ce4fbe92884a5d3e4044f04
 MISC metadata.xml 1001 BLAKE2B ea9aae31db72d91c37e3f37b672404262ad303a26461df31c78d4a45050ac27c46e9ed18b160eb96f34d15b08bd6250139ed2960834b0aa93923c2651bd19e58 SHA512 2136df64736fa79cae9cda680d3412ff700c03b943c19184a0d1c94d51f161b34eddefee88468ef63a99e87a553973caeb1241226fbac13eabb5462990d98fd6
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.3.3.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.3.3.ebuild
index 0a797691ff7f..4e5e8e27bcb5 100644
--- a/net-misc/youtube-viewer/youtube-viewer-3.3.3.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-3.3.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/trizen/youtube-viewer/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk"
 
 RDEPEND="