gentoo resync : 21.07.2018

41 files changed, 350 insertions, 374 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6b59045ae095..7acda35b1d07 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 63fe11d892b9..53701f3050fe 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -5,5 +5,5 @@ DIST curl-7.60.0.tar.bz2 2938400 BLAKE2B 1c80e63094b6c0e8c63265ed7a62f75aac2ba13
 DIST curl-7.61.0.tar.bz2 2949354 BLAKE2B bb9fb6155aa6031d000081fa17410e772a58ec111401e7854ad0148c33169f1a7067bb04029965f117be7df20c51a6157bf93fb6439bc4a2d25849a4784baadc SHA512 4907234c75a9e52a5b81cf895bcc811d7a69f1db84a9ae1adc3af360e8cc4371f58c00925ce6bc5170f2a8072848da47a52c41f4bfedcf14274ec75802afcddd
 EBUILD curl-7.60.0-r1.ebuild 7214 BLAKE2B c146b26c7a5872dff04bf4a77511df27597749ef09ddd625092e79fd6a6b756c65ba11f18fc4cf30f19c5480b6d44e083ed47a16aa5e79d66320556c26906ee4 SHA512 5a3ab159fdbff04d492a2e34f3f581944c163115bf52c4975bb9cde376101657435da985c522720651b7c2a6904de61087297bbcc22203f3bf8536d6f8d2f199
 EBUILD curl-7.60.0.ebuild 7190 BLAKE2B 36875f071012e815144664cc3a697702e53969d84c4bfd77d36c378692a288ad8744c563ed97228a19bd00396085d5d1ddc0e8d93d8aa8fcf36b70f95ce74542 SHA512 e133adfcfc13eca9b7ec229b8d53a9fa3e56b2af97f4687d4c149bafa05ed7d72c1587b59da21ab24f1f10e87bb20edb83ab99cc7d009e3297a6c421e3a6b8a0
-EBUILD curl-7.61.0.ebuild 7209 BLAKE2B 8b2d82cbf0d2974755d513f6849a4386dd39a8f21479c617a8cbcdb6b6881a9c1bf999fc6cce0042785d249bf97821c5fa4332889b6d12a5a6653259d1131910 SHA512 8fe630f4a1b4f2d8408add8e897f9461cea523bb602b073bf8c2860780ce1f472c850f16fc3faead8635c6c780b1290cd20133168d355fea39eb9e534c364a03
+EBUILD curl-7.61.0.ebuild 7205 BLAKE2B 4410b33b59a90bd6596758f6f0da55bf4c5fdf9291195b99e663c66ceb84ab65fc447c9fa513e6f8a3900263b019a3cb634a63f4b81692b23383d361af11733f SHA512 fc0eaab7edbc82ca67961003429fea9400938cfd551cffdf79e9bba25a59435e54ebaba2d6591b67173b485a8ecbcb5de442f9bd9239f5b5be25251128eec336
 MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.61.0.ebuild b/net-misc/curl/curl-7.61.0.ebuild
index 45cddf32ae70..34b333df18cd 100644
--- a/net-misc/curl/curl-7.61.0.ebuild
+++ b/net-misc/curl/curl-7.61.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" elibc_Winnt"
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 61495fa97b0c..1b805814f96c 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -4,14 +4,17 @@ AUX 3.1.2-desktop.patch 671 BLAKE2B 1be7fddfb50dccb1c4dbca8827e2a1198c926abba507
 AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173
 AUX 3.1.2-pip-optional-pkgs.patch 458 BLAKE2B 25f2ef7a37cb7e05fb0d4e9f70b6e4656d1423d940a1dcc8b6700d2fc67c221250a55f14fc5df99e2d6dede27c47223755e19e48ed776eb34432c8fd173a28a4 SHA512 ffe18ebfb67f6de8456e38228cbf864afce94a686ebc11ef866f4d9f0c324b3d96b8f3a315c13bd0efba0c62f6ee2af6f093005115be3cfb4d8a284d3a236b3f
 AUX 3.1.3-desktop.patch 683 BLAKE2B 15babc615c74152d5005ddc8dc644557fcaf176825fed335fa84168e66c16e2d3d946bd1be75bb15c78a06fc9efcb23a1797c6cfc74c821c2fe83044153fc6b2 SHA512 c05abf3d387143543ffec3342bdc6c820a56d82064f596c5e619286056f105c048db1947d13706d9aec45454f9133109bf3ec3de3ebf4aa4ace523f441a44b90
+AUX 3.2.2-pip-optional-pkgs.patch 725 BLAKE2B e0e5c3de68bc838665d818db491113c700e9512b6556ed2e24744f32c24f015ea4c28e93af16c25c04121b46e1c1275552100d4e65ae0491074870e46280326a SHA512 b85e11ada7e3a5849644262acf6a771f11d457ffdf46eaaf1f61183203bf8c7f7b07da54a57849198d2ea78d2fd43962970397d93af7a125bd9d381b0894267d
 DIST Electrum-3.0.5.tar.gz 2639766 BLAKE2B 28587ca056247a5671d84c0b79824e8eea8df8ca2e3204333e6edd7db98ecbeebdf81f4ac819de8b87c7593e83f948d091d48d55cdff08af76322d94bacec0fd SHA512 27cfa44ce8eeb5eef8038f1f68b4a42d173daaf7a940ffc9e9b1dad16a8f7f49bd53d5eefdbaf242e5e09aa2f887bce536f17941c2250225cd92c78f62c52e39
 DIST Electrum-3.0.6.tar.gz 2640475 BLAKE2B 2e10417fb59629b9e3af8ba10893fb85b3b0d0ed9f7d7226a58dc7a2f91ed682423168092101565b00824bc62cae60d878de0d78271b716c027c8616419037a8 SHA512 4df9d81d954a008c3a14a89a7191b8af94393701b55651ad19acc75addb70fea942876a45c545c89b290cbdd7adb41b2d36e3cbcf73449eaa5d0a39e1529b2ef
 DIST Electrum-3.1.1.tar.gz 2722902 BLAKE2B 31628d18a26f552469454c4f2712eee1aaba6ff5114a7cf0b7f261def5ed5731a267ae369ec3460c7f9bb5ad2b1713b2b464ef05fadb5e0e9ffd563adeee0ce8 SHA512 d7f987dde4a4fe5b2b0e576328c20b56ca650047321ac101dc6c3edd5bcbeedd569870d951262583a5ef1d1e40d6107ac46aa4fe031cc63d3a759d332db056cb
 DIST Electrum-3.1.2.tar.gz 2800714 BLAKE2B 0932932125f1fd7099c090806c669a998c00a70a8f34b20d0afe4b1f6c5c24ced8743a60923e466c3507d29c75ac58e2e3e01b422701be76bbcd8abf54497276 SHA512 e4e6d674817bacefaf9c64acfdf16c4c215264e825dd8b1bcf1d99429963b0da18d442b966ba986cf0ad2d621543c3e0e68e8ba023cca23b6626781c2e69a61e
 DIST Electrum-3.1.3.tar.gz 2806178 BLAKE2B e03a6ee8d7b211b26d99adfbaf42a9d43317e5a4ca887f62f5ef0e57d8f990c18ff07e15d4ac8faea33322cd7ae25d7544e59e9ff1fbe883b3b7be138d990421 SHA512 745d00ec944e46040a4ae21d23c5919b943696a85baf84ee553616ca73cd21f2fa95999212a23f9a96ad5606def2890ee057e5f5f18e82591fd4a9e497ba5439
+DIST Electrum-3.2.2.tar.gz 5617363 BLAKE2B aae6e12644c55542fb1e0ff702e751dc5ebcb3d1da6ef58c3509be248208c38b10f43bed555a1228f9e9f397350765d24544d89f56ffbfccda71ec39fe2256d3 SHA512 32c4a24c2d3e2e38b9d66f6102176533a991b1c1fd25173bcd3bdd2e78cf42fc5fd2f0d2ee0c6a8d99db1b17d47bd3e7f3cf1303964f0566f4eef4edb3c87f15
 EBUILD electrum-3.0.5.ebuild 4258 BLAKE2B c17c9fcdfec66850c979f0b35e8544cca75cb812052c6b437f432a5fb0dd102545c0082e2bbf210171fb379e89bc4f8ba1644a9d0687055c1f14ef272722912a SHA512 e8e97edc343ef92ff8f54c965fe1e9c1cb9428292425c67e591721c0d8d1d685c3cd144a31f96f3c24161d93dd82209f97643a9909bdf5b9b896eff9055ccb0f
 EBUILD electrum-3.0.6.ebuild 4225 BLAKE2B 845f9b71a1b9288b32110658f9d0aed5c841fbde6c3a1f7814a0f87130cb5bde5b8a7982a3dbe814d4901faa7ac92205fbed5e73b4102359841fa1bfa48a5d8f SHA512 488fce80e3ef95a47cc9198dd3c3df263757536a2adec499a33c6836ef391f8c0e9650e7445ac6572be26c9de1db00b8bb541884749a30e72c340068e319f1d0
 EBUILD electrum-3.1.1.ebuild 4266 BLAKE2B f2215c3d8fa7380a11d2afaac31c4c732363a6292f632cad6a4a2a0d7c62cf0e4a2c19925cb7e8c4a28ba01f63b51c684e5e672e701b922aeefb149e413626ef SHA512 dee404b782ec8bf6e67ea9a6ad18f1c84d34b1d2ec785b6e6f0324353ab34c08fcb42b9c25316fcc59960385b6a1f4b6f9ca74dd96f58f953785e8aba528c1a2
 EBUILD electrum-3.1.2.ebuild 4308 BLAKE2B 2c8bde9e2e8624a2a87881bc44197883ea9ae5e1a099452f24053ac753cfd34a66c5e44bd05d8dfa40c6337879754acee815101250aa980d59d9fe3c0b436e83 SHA512 602c93d714e71ac737ac3930f09fc0712026a4c1703923908c63531a1e2b5a52785fe7011ee814a1a715bfbc93efc836721a4ad893488ee4eb3b4dec5803b896
 EBUILD electrum-3.1.3.ebuild 4329 BLAKE2B 250c545a93aa26f86dad7d87049a9e407e124041fd46a07083368bf528bce23d4c0031123dfc8b05ede465a47da6290202d8fc4fd1026aeafbfc338eddd8365f SHA512 0412d8a4252480c6cc903353f3a6fb912e79967db24c75f4be12c55b0db4d3eae1ad8b5a7b6201a6a39ae1eb19d3c5df40e613d33280c357ea6ac0e6c29ef036
-MISC metadata.xml 1215 BLAKE2B b83eaefbc4e8ff18b6ecc097d9e7a84a0f810b97abe6d9bb0676ac728a0249daba58da27271e2c367365b7770e3e3302e55122ccbde8e5479b5a63f64b7103cd SHA512 227b4091ffbfa3160f44723ac043bb5c95a5a40598c300afe0fb112f64cfd84a110490c634f15e368216eb4459d89cf540adc6557e514932893b596bac3182c1
+EBUILD electrum-3.2.2.ebuild 4393 BLAKE2B 26acc075fd21430cfd08cb940ffac4c1217c1ca23f035e53a0edb4cdfe704fd239e93fb9a564486b6dc5cb36a56151eb867f85468e509d491df2c2d0ec96c1ce SHA512 5152ee6d100af50f2eef4c47c844adb50be11a397e0f81e20dfac9111b7bfb43bbd50adc8d77dabf41ae33993668f236b12ef4777f9e4a9932d0925b8a167dfd
+MISC metadata.xml 1310 BLAKE2B a513446594197d15f1ef462faf8730b0a5b593ff280b6221e6086f8caec173c6e75389c0dbb7b50e2ee2eba236350ab0503b5b9c4cd68beb570847b81847cc3a SHA512 4b07d535c78c4a039a426be75450f7a7718396e265f0fe19d22250be4f0090f6cad0d9ba383765a7cfc491d3c863c4bf0189c6f4de5ee08430080ddb41d1519f
diff --git a/net-misc/electrum/electrum-3.2.2.ebuild b/net-misc/electrum/electrum-3.2.2.ebuild
new file mode 100644
index 000000000000..d6633f147754
--- /dev/null
+++ b/net-misc/electrum/electrum-3.2.2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 gnome2-utils xdg-utils
+
+MY_P="Electrum-${PV}"
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
+
+my_langs_to_l10n() {
+	# Map all except pt_* and zh_* to their generic codes
+	case $1 in
+		pt_*|zh_*) echo ${1/_/-} ;;
+		*) echo ${1%%_*} ;;
+	esac
+}
+
+IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync revealer trustedcoin_com vkb"
+
+for lang in ${MY_LANGS}; do
+	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
+done
+unset lang
+
+REQUIRED_USE="
+	|| ( cli ncurses qt5 )
+	audio_modem? ( qt5 )
+	cosign? ( qt5 )
+	digitalbitbox? ( qt5 )
+	email? ( qt5 )
+	greenaddress_it? ( qt5 )
+	qrcode? ( qt5 )
+	sync? ( qt5 )
+	trustedcoin_com? ( qt5 )
+	vkb? ( qt5 )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/pyaes[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/tlslite[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( dev-lang/python )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
+	eapply "${FILESDIR}/3.2.2-pip-optional-pkgs.patch"
+	eapply "${FILESDIR}/3.1.3-desktop.patch"
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons/d' setup.py || die
+
+	# Remove unrequested localization files:
+	local lang
+	for lang in ${MY_LANGS}; do
+		use l10n_$(my_langs_to_l10n ${lang}) && continue
+		rm -r "lib/locale/${lang}" || die
+	done
+
+	local wordlist=
+	for wordlist in  \
+		$(usex l10n_ja    '' japanese) \
+		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
+		$(usex l10n_es    '' spanish) \
+		$(usex l10n_zh-CN '' chinese_simplified) \
+	; do
+		rm -f "lib/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
+	done
+
+	# Remove unrequested GUI implementations:
+	local gui setup_py_gui
+	for gui in  \
+		$(usex cli      '' stdio)  \
+		kivy \
+		$(usex qt5      '' qt   )  \
+		$(usex ncurses  '' text )  \
+	; do
+		rm gui/"${gui}"* -r || die
+	done
+
+	# And install requested ones...
+	for gui in  \
+		$(usex qt5      qt   '')  \
+	; do
+		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+	done
+
+	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
+
+	local plugin
+	# trezor requires python trezorlib module
+	# keepkey requires trezor
+	for plugin in  \
+		$(usex audio_modem     '' audio_modem          ) \
+		$(usex cosign          '' cosigner_pool        ) \
+		$(usex digitalbitbox   '' digitalbitbox        ) \
+		$(usex email           '' email_requests       ) \
+		$(usex greenaddress_it '' greenaddress_instant ) \
+		hw_wallet \
+		ledger \
+		keepkey \
+		$(usex sync            '' labels               ) \
+		$(usex revealer        '' revealer             ) \
+		trezor  \
+		$(usex trustedcoin_com '' trustedcoin          ) \
+		$(usex vkb             '' virtualkeyboard      ) \
+	; do
+		rm -r plugins/"${plugin}"* || die
+		sed -i "/${plugin}/d" setup.py || die
+	done
+
+	eapply_user
+
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 icons/${PN}.png
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/electrum/files/3.2.2-pip-optional-pkgs.patch b/net-misc/electrum/files/3.2.2-pip-optional-pkgs.patch
new file mode 100644
index 000000000000..0f54f477adc6
--- /dev/null
+++ b/net-misc/electrum/files/3.2.2-pip-optional-pkgs.patch
@@ -0,0 +1,23 @@
+diff -Naur Electrum-3.2.2.orig/setup.py Electrum-3.2.2/setup.py
+--- Electrum-3.2.2.orig/setup.py	2018-07-01 08:00:11.000000000 -0400
++++ Electrum-3.2.2/setup.py	2018-07-16 14:09:10.790238994 -0400
+@@ -40,19 +40,10 @@
+         (os.path.join(usr_share, icons_dirname), ['icons/electrum.png'])
+     ]
+ 
+-extras_require = {
+-    'hardware': requirements_hw,
+-    'fast': ['pycryptodomex'],
+-    ':python_version < "3.5"': ['typing>=3.0.0'],
+-}
+-extras_require['full'] = extras_require['hardware'] + extras_require['fast']
+-
+-
+ setup(
+     name="Electrum",
+     version=version.ELECTRUM_VERSION,
+     install_requires=requirements,
+-    extras_require=extras_require,
+     packages=[
+         'electrum',
+         'electrum_gui',
diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
index 4e86014c54f7..41040e7157e4 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name="email">Enable plugin to support emailing invoices</flag>
 		<flag name="greenaddress_it">Enable plugin to verify GreenAddress.it instant transactions</flag>
 		<flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
+		<flag name="revealer">Enable revealer plugin for extra security. https://revealer.cc/</flag>
 		<flag name="sync">Enable plugin to sync wallet metadata across multiple Electrum clients</flag>
 		<flag name="trustedcoin_com">Enable plugin to use two-factor service by TrustedCoin.com</flag>
 		<flag name="vkb">Enable plugin for virtual keyboard</flag>
diff --git a/net-misc/lldpd/Manifest b/net-misc/lldpd/Manifest
index ba91d110c75f..5f06cc43d646 100644
--- a/net-misc/lldpd/Manifest
+++ b/net-misc/lldpd/Manifest
@@ -1,6 +1,7 @@
 AUX lldpd-0.7.11-zsh-completion-dir.patch 318 BLAKE2B 98a182c00ac6d5fedabf2c5c0891020b1c896e6b412bdefbf2db6715065df8b1bf75965f262f42a794d2be3cfe78c716c44b02e6076bc5a1bfcb68f88730e337 SHA512 cd4c069f9d637d6c9f0a687a7a415a6382bf5217390a94a269de19f5a35c1edd47d5c3455bc63d75aa7bc74a72d7f2c9de9210c0795a95bd0c78a10c1709fcb1
 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-1.0.1-seccomp-add-brk.patch 900 BLAKE2B 0bfbdc01382c8b96e6b266797110f5988f94abc9e40c19e0e2b7f24eebe07d91182629c8c2f06632360096b9f2509dbc0aea3f87e2152ca1ea264535c9c25f55 SHA512 8b51bce336da2151323f9fd8a48efa59684bc72450a49c438a4fcac81f64602f0a2777bdc8880b21541ac22760c7922b455225af7c27e8c392d70a651f84e752
 AUX lldpd-confd-1 142 BLAKE2B 38b3709d5cfcfdcfdf91ad4bd47902db779d035f825a7c875cbbfa55b35f085c04cc387599526465a0f12a0686d6550e7d3750b077f04993b55893cba2bbe362 SHA512 a2a4c85068a6b8b80c92fe56af7799a8b8cb2516e5a65b3ae4cb28f278e5acc72402da2a35f0c48a6048fd4a8536061142cafaa49a4bae8e52ca0a5d9ed38b4c
 AUX lldpd-initd-5 410 BLAKE2B d42853ecf3e70fbef8e29a13c390c71df737d2c2e23f1fd7e127a861d259c00410c44223177a3b08cf87465a024120b089f5794957f287479c65542610205303 SHA512 ec0157dff35cb2c370b81bff827c22d2f6c5fb0e139c1a82fabe7c6f259da4f50525a90acb5e26b4e39e0d41495b050ff9c4cf38726d3a8c4c4cea19cdb925d9
 AUX lldpd.conf 49 BLAKE2B e0d6b2a386bc2ac794df1de27061c58a193a3d141beac3cb0d893cc7437aa236fac9449d4890989f10618146b1da11795c637f29f2849c89af04b5156f6d9b1d SHA512 171cfb435405aae67b2b3917754b8ba1c1e62526c264692b14c8a27b3c08f29c903fe151e257626849f323e65d2d93dd1a246d15a1682bad645a08fd436fd7f0
@@ -9,5 +10,6 @@ AUX tmpfilesd 32 BLAKE2B ad674d771fa90bde09e231ef21358928de2f3eccdbe0e9b3e2a0c04
 DIST lldpd-0.9.3.tar.gz 1601102 BLAKE2B 0ba31d20dad9770c93fa4930a7c439273c36e5cebdb0b4a1674f0a375008f642e33d71b9668c91313ec4bb3311e1b4bd22d0996ed6347d2cacfd7cce24536a58 SHA512 0d40d77bfde78f9ceece56968981f3a36bd7e683b12de05e84e5da0409b8e0d06062e5d665942637a66164af0254a6ac3d1a327aab3bcb48ec91ecfdd2693283
 DIST lldpd-1.0.1.tar.gz 1590903 BLAKE2B 37ff1c042537ac31f394986f1bbd3faf13105d07f340ed045a4bbc196912c0c017a5d60b2c6a89b0da9faa5a7ff8e9c4ef0d4d01a39504a31c23288a89eb92a3 SHA512 61b2a7a3a78276c613c6d0b34eb625e69e5c8a206b6658a167d6a09ac6d0e1c943e46c0ff6fc3538a791d9947f193185b65848da581b3d6ecb9bc0befadde8dd
 EBUILD lldpd-0.9.3-r1.ebuild 2457 BLAKE2B 4db8bd65035df013e9c3d8e70a235f2503c3e313da17f510deb498830966408f6761f42b12c8ee3dd98f296edb815df1de7f4da35f7eeebda7cbcbe9627dda27 SHA512 5426d7c8a2f73286a15b9901134692d77713d3cd4e20e31a4a30be64eb664b348cdd1c27196bc339af49a213e03bbc995bd4b30f8bab7c424b34f6595727b5bd
+EBUILD lldpd-1.0.1-r1.ebuild 2420 BLAKE2B 8847c8718f419481e92fdd857196c71bd73014448855ea8fba5f1b425def8614852fe2891498655acfb5fbc9d0eccf487f520ecc2bf2f475334b06d6c2524b09 SHA512 246b57c0f0e9acf2224e3138d136202d05603e5aa170314d5395679140b4545451a1eaf62d57f9842b967bf1ab2bdcd1ae1892e02bb178d6669a0127591f3335
 EBUILD lldpd-1.0.1.ebuild 2371 BLAKE2B a7926eb76298a0a53c0e2082452904d68f188da49eed3abae777d79ab60e93f68d0dad205effbfabef23c12c2a5ee53fbadad14fac25cb0a11b8df0086ae45fe SHA512 70370f83b91f0f7bd95227e52775386589b641c41f3d7d9ba671f52adab98cfbd78fce3bf02ede734d37b6389383e215bdbb3eefe4853054e4f252a7fa84c440
 MISC metadata.xml 2829 BLAKE2B 83e3f2636828107af74952f951e1e5874ce647f786932a509f79e154ab026a0556bc0341576f4c458e40c88feacee187e7a18fd1ee736953425d2cb252e0175c SHA512 a401329c2f122ba079995ce0c7810d32920a91dc94e8678378f3c0eb9f72e613710933df8508eb25ad1516bda1f406d6e459fe1049112dedd8c524a7d8432c01
diff --git a/net-misc/lldpd/files/lldpd-1.0.1-seccomp-add-brk.patch b/net-misc/lldpd/files/lldpd-1.0.1-seccomp-add-brk.patch
new file mode 100644
index 000000000000..40cc428ec8f2
--- /dev/null
+++ b/net-misc/lldpd/files/lldpd-1.0.1-seccomp-add-brk.patch
@@ -0,0 +1,11 @@
+diff -purN lldpd-1.0.1.orig/src/daemon/priv-seccomp.c lldpd-1.0.1/src/daemon/priv-seccomp.c
+--- lldpd-1.0.1.orig/src/daemon/priv-seccomp.c	2018-06-12 07:48:04.282557213 +0200
++++ lldpd-1.0.1/src/daemon/priv-seccomp.c	2018-06-12 07:52:26.214348537 +0200
+@@ -162,6 +162,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(brk), 0)) < 0 || /* brk needed for newer libc */
+ 	    (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 ||
diff --git a/net-misc/lldpd/lldpd-1.0.1-r1.ebuild b/net-misc/lldpd/lldpd-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..88ddeebee8dd
--- /dev/null
+++ b/net-misc/lldpd/lldpd-1.0.1-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user systemd bash-completion-r1 autotools
+
+DESCRIPTION="Implementation of IEEE 802.1ab (LLDP)"
+HOMEPAGE="https://vincentbernat.github.com/lldpd/"
+SRC_URI="http://media.luffy.cx/files/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdp doc +dot1 +dot3 edp fdp graph +lldpmed old-kernel sanitizers
+	seccomp sonmp snmp static-libs test readline xml zsh-completion"
+
+RDEPEND="dev-libs/libbsd
+	>=dev-libs/libevent-2.0.5:=
+	snmp? ( net-analyzer/net-snmp[extensible(+)] )
+	xml? ( dev-libs/libxml2 )
+	seccomp? ( sys-libs/libseccomp )
+	zsh-completion? ( app-shells/zsh )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		graph? ( app-doc/doxygen[dot] )
+		!graph? ( app-doc/doxygen )
+	)
+	test? ( dev-libs/check )"
+
+REQUIRED_USE="graph? ( doc )"
+
+PATCHES=(
+	"${FILESDIR}/lldpd-0.9.5-seccomp-add-socket-ops.patch"
+	"${FILESDIR}/lldpd-1.0.1-seccomp-add-brk.patch"
+)
+
+pkg_setup() {
+	ebegin "Creating lldpd user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+	eend $?
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--without-embedded-libevent \
+		--with-privsep-user=${PN} \
+		--with-privsep-group=${PN} \
+		--with-privsep-chroot=/run/${PN} \
+		--with-lldpd-ctl-socket=/run/${PN}.socket \
+		--with-lldpd-pid-file=/run/${PN}.pid \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable cdp) \
+		$(use_enable doc doxygen-man) \
+		$(use_enable doc doxygen-pdf) \
+		$(use_enable doc doxygen-html) \
+		$(use_enable dot1) \
+		$(use_enable dot3) \
+		$(use_enable edp) \
+		$(use_enable fdp) \
+		$(use_enable graph doxygen-dot) \
+		$(use_enable lldpmed) \
+		$(use_enable old-kernel oldies) \
+		$(use_enable sonmp) \
+		$(use_enable static-libs static) \
+		$(use_with readline) \
+		$(use_enable sanitizers) \
+		$(use_with seccomp) \
+		$(use_with snmp) \
+		$(use_with xml)
+}
+
+src_compile() {
+	emake
+	use doc && emake doxygen-doc
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files
+
+	newinitd "${FILESDIR}"/${PN}-initd-5 ${PN}
+	newconfd "${FILESDIR}"/${PN}-confd-1 ${PN}
+	newbashcomp src/client/completion/lldpcli lldpcli
+
+	use doc && dodoc -r doxygen/html
+
+	insinto /etc
+	doins "${FILESDIR}/lldpd.conf"
+	keepdir /etc/${PN}.d
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/tmpfilesd ${PN}.conf
+}
diff --git a/net-misc/mulk/Manifest b/net-misc/mulk/Manifest
index 1ad9e15f537d..19ca9c0ce441 100644
--- a/net-misc/mulk/Manifest
+++ b/net-misc/mulk/Manifest
@@ -3,4 +3,4 @@ DIST mulk-0.6.0.tar.gz 459141 BLAKE2B f63d2d78128e9f9cfa39107ec294d49d401fffe378
 DIST mulk-0.7.0.tar.gz 487995 BLAKE2B 446cf6652f7a1736dc1fbadf7a4fca8941507fa02abdc6ff3871e1cbb7dcd341e00be03c0e0b860f4cfe70ce1241a90adbae15e947e958fe37fd206863aaa01e SHA512 e1c6cf14b0ee2e42d83c8ad33d011feec9eb192ea4f8495cc67926db934d7ac132dfea66e40c47844965321573bd5b0734e4b19fe34c97c38170ee0cf4643499
 EBUILD mulk-0.6.0.ebuild 808 BLAKE2B 0f74eac84b91c0fd46504130291bc32c1717907e2f2412e46cd945231e6683e40a2648a07a8ddeb6c977c3bb7979c769b681ed48f05fb8b3b3dc47e0040a74bc SHA512 b19c6d6ac579f72fb128cae2ff6c7b39718942945866e1e2c84bcfeb513eb361895e10ccefe6e32151b87baff5bbe7c1830b03a2b2a900a6740c27ced35ea445
 EBUILD mulk-0.7.0.ebuild 758 BLAKE2B 1bc5c95884921369679b10ac05a639997fe76ada83803eaffb397c3826bb49f985b579f7263b202a84228615e7c5e7395f404868e541237360c0db86c1e314a2 SHA512 8cbd690937d3e4447e3b86a2667d89c740d59463c74578654cd52863b6dcbb2a2ef9e6091700a59996c688a0328d5500be1e80a737a18f0c6908f53faee71faf
-MISC metadata.xml 529 BLAKE2B 8c244ec7dc22e52d9358dc59de483006f3f22e2db391d2a864c205c525fca9dfea7c2cbe9ad2cccadafcf8eea709a474867b4b0132d18a5e62cfed3e9a9f1314 SHA512 889e8f520e741c56bf6d49b235af4cd3a1d39b63d37f6b5fd18ee6c29c2dd18c26bf4919dd98858e70f47921184bd1d39a3fc5836ae43753b029a0756a998b83
+MISC metadata.xml 446 BLAKE2B f58d02b9addd2437ec243d741627a52a72192583a4f2b99df560d9681d6486811c52149678161f5bdb8055b071fb1565cdc52fd07c136854a4c7180f764e2cb7 SHA512 8d36ae10e4da6a5a6aab41ac25d6e85dfd9b2dd1e976f771a330aa175a30e932d6e40e86ca32751e9c89b227a173757da647465c59f3de5659abaeae66e1fb20
diff --git a/net-misc/mulk/metadata.xml b/net-misc/mulk/metadata.xml
index 616f1fe1a5a0..88dc6dace8d7 100644
--- a/net-misc/mulk/metadata.xml
+++ b/net-misc/mulk/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="checksum">Enable checksum verification for Metalink from <pkg>dev-libs/openssl</pkg></flag>
 		<flag name="metalink">Enable support for <pkg>media-libs/libmetalink</pkg></flag>
diff --git a/net-misc/netctl/Manifest b/net-misc/netctl/Manifest
index 8c616c7409a0..15b380632dc4 100644
--- a/net-misc/netctl/Manifest
+++ b/net-misc/netctl/Manifest
@@ -5,4 +5,4 @@ EBUILD netctl-1.10.ebuild 1724 BLAKE2B 3e517407b274c15110e15ef7d4205169cbee392b6
 EBUILD netctl-1.11.ebuild 1684 BLAKE2B 617a84b658d99b4edc42aebb9a95a5636de0fd4f17c76bf9774cb3488f87ebccd9c4ab4bae66f42156761be1f2c3e865a3ad2e9e85c5e6ae985ce44b82a0fa76 SHA512 9ca531641c48a8d0c3829433dc9c363dc06ea8135dd508c820c617d9b129278d10a3eecaf6cca31d22657e7f01f2541d53c3f6e604d4c0f4b936d95ed6d10931
 EBUILD netctl-1.9.ebuild 1722 BLAKE2B 5fd24ed67d94e5394d6688d95b1a1576131984ea8df5e81bc9db411f9fc88ea382348c1bb6a547dd30f8009e352bd3a0da76a2ee8d85a31de497224e69afa83d SHA512 320d76469bf2534b1d137664ca20a8cedd20d4e2b26c22d1bb32abc8f899a6a027de74b5c19a29717aacdf8d475fc979c54c989ccba835e168eae4adc994b46f
 EBUILD netctl-9999.ebuild 1679 BLAKE2B 2a4eaf1d400ef026638c41680df2356dc6752f6cb0121330aa94f34917262c59833c22df57adc3908917ec1ac4027ff6bfa45ebaa9870cd2c21a6f11aed99024 SHA512 6991ea6d2a2fa753f97763b552b2defcd4400f8cb5bc6acea4657a95c17facd686f338a96f0f241ffe257bc8fc813dbb0fd357efbb2352784640bd5a8be91be1
-MISC metadata.xml 250 BLAKE2B 923ba29298f48b552a4e9659a0a7aaed2ad5e95749b4f5043f8c7a6fca5b973762577072789007eb6f047717189be9e6aa5b6b5964a6bf13d52da6f85399b042 SHA512 c1832990e49282daac7d60cef0249c7b287d4957dc820079efacf988ffee53463ec5a63fc0dd5551793808793fe14c5e5cfd4cd75701eb07dacae7c414a4a2c3
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/net-misc/netctl/metadata.xml b/net-misc/netctl/metadata.xml
index 18e140956483..7a38bb900964 100644
--- a/net-misc/netctl/metadata.xml
+++ b/net-misc/netctl/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 3c600756ca48..1833c3629817 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -6,7 +6,7 @@ DIST NetworkManager-1.10.10.tar.xz 4038552 BLAKE2B a0a3c2a74dd641d25267ec7932f08
 DIST NetworkManager-1.10.6.tar.xz 4029656 BLAKE2B 0fa99dbb54c3f51755329f229f941e408d883aeff24bbcf0f9df143544190ab59ed5742caca42ea7cced949de0891ecc148394fbff1b9cd87b26c3a84f2a728e SHA512 8406ed561efff13b63dc218babdd2ad9e2816bcc829ba3ef2ce942bb5fa027640de28660381203016fa9cddb61412d3cd5102b7cbd29d0e284b5cb8d13dd8610
 DIST NetworkManager-1.4.4.tar.xz 3762664 BLAKE2B 430f5a15540c43d067c27927b627ecb1c7935f42566e9b14b82b6f70cf7dae3ed7398bb45647911e91d8ce14558b1eccc0f6ffa97eae852dd524219dcc536a90 SHA512 a73e423e88b0e2694a46dc04f492a656d766796aa987b2e4644147a5939a6fdeb22ff5d8b36c723444bc0ab3d8740b80fa82c2f5e07f073998841695978d6e14
 DIST NetworkManager-1.8.4.tar.xz 3821500 BLAKE2B 7db1c95af5b8006cd3b7e1d960f9763c05caf5aadcc139bbe349a12ef996821afc38250afe4b078fd4d1953be19c1f16c6813562c5f4792e6c17f28ee0521c06 SHA512 e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1
-EBUILD networkmanager-1.10.10.ebuild 10770 BLAKE2B 67dbefb85f4edcd0134f51b4e9393d13db0f356bc782d72460f7a2d191ce3adc6c83f0a2726fe25862dcf15297bffd26f80ca4857103fb4867b71d170ba62e3f SHA512 77c6fac337708f8295d50da5cd4783694c43389d1142f2dc7dd917bcac288c55fb2090ac30f310723cc299ed0192d6e212ddf213b761231f54eb1cdf56befd47
+EBUILD networkmanager-1.10.10.ebuild 10769 BLAKE2B 0adb377fc034856e1e1045a9134f231009e9e4181e13e9b7a9e990dcf562d3b98984ebcb27c15ee475b9024a76e3e262b9a9a162f58c16510a86ac920cca7d57 SHA512 af2868a2490d80ecaa0e703b5f2091fe481e6c47e3362a781344cd2313e2cbf5bd5cfdd0ee5c404b1dcebc70e9ebc32f2bcc59416718659b2e0af6925f0b97f1
 EBUILD networkmanager-1.10.6.ebuild 10772 BLAKE2B 04abf058760e6a89a215de2e01e371f85c5a3fae221b79f3c2e1663f0cc9254c0fca3704094eb756cf2ab244e254392aa87bb21cd2ae087ae9999a3e443ccd6b SHA512 8950a84fe560747c914f7e2597860885d08c25a1ac3fe27a65507beb3ffb80889a98d6bb40342f8e68b02161af8b271a2543c8cea16f26b86611f33934d7c91d
 EBUILD networkmanager-1.4.4-r1.ebuild 11420 BLAKE2B 2245516cc7f356c194032729459a96c68e684fd1d3e3f78230424dff74648c29a75225d80376793544d15b9e450d7266a5e3457756fb0db9134981ba2d3c29c3 SHA512 35e42a8b58ebbf86980c15807c010246a2e7b90ae537a039c481266393bc1975ce2f7576dfb8bebd65fed2eb090d053bb8accdc09732549ff586b0ac1a04a956
 EBUILD networkmanager-1.8.4.ebuild 10684 BLAKE2B 5f5459e190d2c682f9b0cd84495be993ddc22cc6df6bb5961928d647676e9c99b27b0ab8b0ce576228d86f7b623e8289ba7d9b810320367b5d24849be2a833b2 SHA512 95b658dd24645f839870548fd14c1ae03a6f774282adc30cca5ef57c9dcef013438b8894e258b201af37e777f4b1adcf2ea564a5a0475347c8078e3b1e468dd3
diff --git a/net-misc/networkmanager/networkmanager-1.10.10.ebuild b/net-misc/networkmanager/networkmanager-1.10.10.ebuild
index 4c6417e0f0a1..35a4798cab10 100644
--- a/net-misc/networkmanager/networkmanager-1.10.10.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.10.10.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
 	?? ( consolekit elogind systemd )
 "
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86"
 
 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index b35d01086d1f..0d57edbd5790 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,7 +1,4 @@
-DIST nextcloud-client-2.3.2.tar.gz 671944 BLAKE2B 7970cca40e2642a6d7c6eca52568e7980d878b0232f87c1be9b1d7b814e1d36ee2e989ec6646b6b143c18f6a7ae162a657753919c8400a70edcd1f51dc1929c1 SHA512 0447a3e5ee3338cb98b9d503a94d32c926f9092a25fee11e3686e5d662362137dce09865350cdc3c9af62ac8a6ebfa7fcd00f817edbb10189512a6df8e587628
 DIST nextcloud-client-2.3.3.tar.gz 708611 BLAKE2B 8f0a1f433ad18743e7d78bf4ab523e57f2c40cc1527508e940bb14c75f944723d728a5ee188c06a181ded535b910bea68620e8eb950c290af7556423fc28264f SHA512 fd02c61a7a92b77f9063e4f15be426be84d02033bead4b176d876134f8b85d7385e4a361959b68c332f1ccb55d43e2a8b55e0d5c8e5a54f645a5816a37790bde
-DIST owncloudclient-2.3.2.tar.xz 12266008 BLAKE2B 53d08aec4971ae309b4fd07cea4e6ed9643411d4f6921c82213d55ec757abcd61ee64abc81e359ea0808b54d8447e3742fdec5394ed55b2e09805616f5430a75 SHA512 8abe071c28b365c100eb30ed91610640a25a7385f4347f5527289f4664788bda375e9618396ffa3e441c7e473da55bdaf7a5cdd99c8fd5801de78cb945fabb9c
 DIST owncloudclient-2.3.3.tar.xz 33801712 BLAKE2B 7642148a4f503a2702d56f920067202699b4a55bb6216337ecbd9df141e0a7467aaf2db8d7d6871502061d3866294f8c44c791fdbf9597ca8d761f360f7ffda1 SHA512 8cbffd4fdd4bd3bbbfb947498ec9bfbaceac3966ac29d61dea3db82405976230c1067c3a3afc9ddc4ce152c69c530ad44be154615a391f63524dc2fb40d5e5d2
-EBUILD nextcloud-client-2.3.2-r1.ebuild 2524 BLAKE2B f5a3f007fccc1e969614f8fd1d3dcd98bed981a0d90d5950b9e1557f1ea2b34e1eb39ed887517284943bbff1b8575e1af29747a459043ba132c095e1d442804b SHA512 2e032d6612dfeb36912e81b1b32d3a0d1324c4a45052d7e0c8ec9da48180574e8310e7e635d1355b507e1d4c4f62de226842bca6f6073cc3b7d7f47f448ae4bc
 EBUILD nextcloud-client-2.3.3.ebuild 2614 BLAKE2B c3b4090eba159a5b9170e2e951938faa22235946e8f846cbb28acdf3bc3e948f2bd89cc845a14e76cf65f5c34726bb5365fafe2795a06b43eba36697c9fcae88 SHA512 eb47fcbb1dad6ad540f81501d4b855ffbed8ee7ffcf387720084298772e2dc0b3665680a95fe78eabd2a80b9a41c83be8e3e0aedabb81c4957829f94f1f383e0
 MISC metadata.xml 684 BLAKE2B 68867eb334a7fba5a788d8174b44982d656e3a055372e42aaa1d08be948fb0ee8309fc547fe75adbb3f586f0761e6a4b31beb2f7a90be4c00a1ac2ce9c6776dd SHA512 914f49b010493ae3019d678fcaf92e2d41a2cdd7cee3b7041db7a65a8c122dba81fc3e6df237201d6a69b8755768fee5b65fb9df83c977449a48eb5fc1479b29
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.3.2-r1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.3.2-r1.ebuild
deleted file mode 100644
index 94a0c9840073..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Nextcloud themed desktop client"
-HOMEPAGE="https://github.com/nextcloud/client_theming"
-SRC_URI="http://download.owncloud.com/desktop/stable/owncloudclient-${PV}.tar.xz
-	https://github.com/nextcloud/client_theming/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus samba +sftp shibboleth test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	virtual/libiconv
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	samba? ( >=net-fs/samba-3.5 )
-	sftp? ( >=net-libs/libssh-0.5 )
-	shibboleth? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-misc/ocsync
-	!net-misc/owncloud-client
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)
-"
-
-S=${WORKDIR}/client_theming-${PV}
-
-src_unpack() {
-	default
-
-	rmdir "${S}"/client || die
-	mv "${WORKDIR}"/owncloudclient-${PV} "${S}"/client \
-		|| die
-}
-
-src_prepare() {
-	CMAKE_USE_DIR="${S}"/client
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" client/test/test*.cpp || die
-	# Fix icon name
-	sed -e "/^Icon.*=/s/@APPLICATION_EXECUTABLE@/Nextcloud/" \
-		-i client/mirall.desktop.in || die
-
-	if ! use nautilus; then
-		pushd client/shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DWITH_ICONV=ON
-		-DWITH_DOC=$(usex doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DBUILD_WITH_QT4=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
-		-DNO_SHIBBOLETH=$(usex !shibboleth)
-		-DUNIT_TESTING=$(usex test)
-		-DOEM_THEME_DIR="${S}"/nextcloudtheme
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/oidentd/Manifest b/net-misc/oidentd/Manifest
index c0450d7ccef3..cc3be97a3cac 100644
--- a/net-misc/oidentd/Manifest
+++ b/net-misc/oidentd/Manifest
@@ -16,6 +16,6 @@ AUX oidentd_masq.conf 429 BLAKE2B 08612753eb38386b0a20cf4432856d935697684680894a
 DIST oidentd-2.0.8.tar.gz 212354 BLAKE2B 46f4c4478822e832885f5f38a2ab5b2132ff5c1e5071fd1dc6050e55992d50bd96be096064996853af69d16316e6aff648c5320714b53b60c038cc9aaedfedda SHA512 86229a4ef9892121c25a7140616e180f862ca34b73ea3ad9f0fbb008f657abb17e9f14c2c25ae14c14bfc14bf1ea10b50fd68318631a9c52227bbfd6e6d43288
 DIST oidentd-2.2.2.tar.gz 260185 BLAKE2B a719413751280d44e134245793c4a88d93dd573d7d85895e341040c2d83a7b201f21f499b931c27e5c0f1d7d0957d730b2cda698ef98b74755e2ca1958457579 SHA512 c5c5040f8955e61e8a7cddd310501d24c3b2a3818e0cd122db85c03dc5b2b18ca7ea4e7edb420df3ad81558a25d4b31c1fea97684a9f53c71c9159014f84678d
 EBUILD oidentd-2.0.8-r5.ebuild 1203 BLAKE2B ddcffc10ec4c3ade58052268aa8eb33d64eca064ffcde17061801ca1103e6ca4ae3c3ac73ac28492ec09327ac048f49d8e71a5e2cafcc64949a8cf78d531111e SHA512 53a4113831796de47144d3bcf0c26528a2567ee3b3473cb53d455f0b51bfeacc2b18ee7d1a5b0d9d71fcc91fd88fe0101f332193a1fab6bdf95bc0509a93ca17
-EBUILD oidentd-2.0.8-r6.ebuild 1453 BLAKE2B f05c8c8bde3787b247655e49fe068f4faa56a2dfd6616676a74ad4974f6aa56a2096496329ac2f67ebc6dc1ccfe02f211832f0b3cfe37019032f2f83096ce3bc SHA512 fd331efca543b1951ea2252bdcdf011a0f36ec7acf18d7c87d82a4ca6d6feeb1bd495b764c1154e568cf9c381c61257b94891a8b7b42c34f5d50e7730ca0a2cb
+EBUILD oidentd-2.0.8-r6.ebuild 1452 BLAKE2B dd2938141d3d6d7bd666eec975e1c2a2908688c3da7295cc24a066a46555021657eaee49973f551af2d086a2d98c647650d441e93f658b5ab2401e837699f5c4 SHA512 ec3554673feb64904c19231bd749bc67a333148c61e56e1a57ac8ecfb451b13f739ec9b269f1e7cfb4a4fc2371d516a27c722bb87e269dead98d97a626c3de8f
 EBUILD oidentd-2.2.2.ebuild 1187 BLAKE2B 1245734eef6f751fc7564028231916fc88338236446e4d006802d438ff3052bb319007508ce50bc116d859d2668a665447db76edc04479172fd021b7d8fc103a SHA512 507a1e641075f577e60b9cfea052cab596e33f367214d2ad32d50f566ed56f1458455682ec6d8ab6100cf429580975f8fe5a42520356dfd72ccc8dd66cb7db41
 MISC metadata.xml 539 BLAKE2B 10058ed518667411899809727711217f873c5ea4f65819a7f70315f1baf9a856f2b017197e1bd5b02e7b1a9c38b9a189df27e572c1eb6b04b08d29429f8f6d03 SHA512 0e2ad57b9a3032c73a0206ff665dbf8d258fdd91e595eaf7b06a309488321809e0f8bd567e37452cf83c89c734c4d57857b95df0472bda0b8c29f4e14b23af84
diff --git a/net-misc/oidentd/oidentd-2.0.8-r6.ebuild b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
index ca2e86d89e56..f8ee48e0bbb9 100644
--- a/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
+++ b/net-misc/oidentd/oidentd-2.0.8-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="debug ipv6 masquerade selinux"
 
 DEPEND=""
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 3b60452efe8c..763742f53c93 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -39,6 +39,6 @@ DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 BLAKE2B a31dcb15848d3a22306108a4e18
 EBUILD openssh-7.5_p1-r4.ebuild 11184 BLAKE2B c6725a371359485803c89cb73b9efad9a69ed6255ff8f411574e218af71880c507567010a749c22bea5f1a12043acb01cbfe452e9aba50e0b508b737f7fb7576 SHA512 414033d873ea94e0a3f087a8739d4266bdb96b6e02702a0385f09911ee2c279666baa837048e825489478b7774126b1dafa48e1f354f50d0d6cfc73b446da286
 EBUILD openssh-7.6_p1-r5.ebuild 11360 BLAKE2B ca0a8157c9c4fbd9219f8e73f6009c18b467e3a1b234bfa346ddb20c8e21438d16230ce0f1062ed947da67435f7e3a50a57675a7e285c37c8b515a9d17430f29 SHA512 fb6ee3771fb67700e596835267c8f26d0c1afe5c3c3366963951c07266a7ab58224d78062256c176e13a00238d9c21ba0ad66965ce6ffd41eb74e28eab81970c
 EBUILD openssh-7.7_p1-r103.ebuild 16934 BLAKE2B d1108c86af72036ea9e64e7ae173c9cc8ae280b133963c1960244a4eb5d6539b5b164dc470f528db4e69b401b78a9fad72977a2865c7cc8b0facf29204418773 SHA512 28146aaf128a80222a0b821f75143b6f58ae31afcf033c54522188ea849cca5ef796b03f5cae31ffe01067949efb07ee2762746ec5810fe52e643f8bc63506fa
-EBUILD openssh-7.7_p1-r5.ebuild 15729 BLAKE2B 96f8fc8f63f16fcb10c023e19126bae10bfe33b528727638024a7fcddd558f99200cb11241410293034500c31426290cdbcee6ec7e44968583b25c5c53c7427a SHA512 a36d94286a23b8d890293c64020869b15e783f9577908ac030f61fc02f936462f57e217eebf4d868035e9779edd792cdec2f7ad3edfe24a958acfbb6d49894b5
+EBUILD openssh-7.7_p1-r5.ebuild 15727 BLAKE2B eea6af8f12731c8754bda3b4daf5cf1ef876a3aca9b07597a1be61de44f31591ceec65511ca441e28b5853a2284f0afd9110cf2e452455956a9e99573bb9f609 SHA512 19a538ad50c0c512088b45d5de10161eec33cfa777fc280b3321f45fd61bb2c9407dedd77dc2ed7238fe3b27a2e91a1b621445170c3231da35c7c1e790627572
 EBUILD openssh-7.7_p1-r6.ebuild 16444 BLAKE2B 4fdaa4029cefb40da2865653c508ea951dfc8becf4c79b8e37e2c8848859dade97523d3c3845a67df0ef206ee1e1d82beea6f3fa7af0e0c381333704b087a209 SHA512 c7decf934c521481962f05498b3c0807322bf097b5d423ea03cb380c7be3ebb10586a700df7403d4e96656f4c03853366cf56f0e77f068f1c6e7b81141d1f139
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/openssh-7.7_p1-r5.ebuild b/net-misc/openssh/openssh-7.7_p1-r5.ebuild
index bed23d9a6036..88b05334bf72 100644
--- a/net-misc/openssh/openssh-7.7_p1-r5.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r5.ebuild
@@ -31,7 +31,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
 REQUIRED_USE="ldns? ( ssl )
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index aa1e84bfad9d..176e435c77da 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,7 +1,3 @@
-DIST owncloudclient-2.3.4.tar.xz 33796736 BLAKE2B 3792be4f534c3424a58e83bfacef30a20d089df55de79dbaa51cfc9d20e7558ab65b65bda4ebf691276de050436253ffdb69dcdf7bad397c3dd4a074124e3053 SHA512 2a66182c1f679f4bb6d13c8b21d280dd6b530b8ef82e71a4fa0fecfed9a3f1a55f181ae3d96b24ff040a6f3c0b12777df035ee951264186ad3409e66da05b87b
-DIST owncloudclient-2.4.0.tar.xz 15385568 BLAKE2B 616c4d5ca58a5c7fb4900a7b46df81a13f477c623e590e74be3b14fae2bf51f3f00154707aebb22fe839cba896c41caa6c71aa9d0f481bb8cf2b2b79dc648060 SHA512 b2e8bcc12e4f087d868244e1e453d7d81ab076dfe8b14965d37ef9e4cb05f2237254edd2c261a28bd5ddd9534bd80f0491d476844f4f0a5a69dd42ec52f450f0
 DIST owncloudclient-2.4.1.tar.xz 15403164 BLAKE2B 0ab1ffbe2179fe04efc7977972d5941a32bc20cd73e310fa72e2a3cf341f7223911fd430f4d34f7e265819acb68d8576e2687a7bfe4ab7140b4c9e9381ea863b SHA512 5b0ceea299078efbc92c1abe22210a93df44bf98094bf4cf8a0c5138f0b69a6719fdc88ef2d5674d49c0ec18ffb12493319eb84616c3e4b8666171cb1a52f0b7
-EBUILD owncloud-client-2.3.4.ebuild 2197 BLAKE2B d20496e997884021a7dc5f1fc607691204f81726a77a1a52dac7bb454158d9d0af23ae37fc3505a8a5e7cc40f7fabdfb163072a32a426f613e09e7d631319a59 SHA512 620899cccfee444bb7782cb85821b48c762682519a59c0a11fdd3d3734682e4167980eeef304dfbae7c4327f41d2a6e4db005316d7d55a157a52f125957ddf65
-EBUILD owncloud-client-2.4.0.ebuild 2197 BLAKE2B d20496e997884021a7dc5f1fc607691204f81726a77a1a52dac7bb454158d9d0af23ae37fc3505a8a5e7cc40f7fabdfb163072a32a426f613e09e7d631319a59 SHA512 620899cccfee444bb7782cb85821b48c762682519a59c0a11fdd3d3734682e4167980eeef304dfbae7c4327f41d2a6e4db005316d7d55a157a52f125957ddf65
 EBUILD owncloud-client-2.4.1.ebuild 2138 BLAKE2B 2fd7cc230f5f55334603d550ba700a42c4387931b6446765dfb982bdd81b1a48f78833d5209a299d030434b506849fd1491aaa307cadc9685440ce485593768a SHA512 45620d1ef30809dece06130559231f49f88a831823dc91bd3844612cfbe00bb722c3990a83c2fafca8e0b32fc2d6631a0027f50e23351c2bdd10588d0253f723
 MISC metadata.xml 595 BLAKE2B c5e1e40ab739c9c5713804647af8dde5f46743686da261d81523cda8e8f0c89eafd70f59b1b65d165febed25db03f6565a0bc5b345a56cd647476605745170b5 SHA512 3c79d7e86cdd5451171bc649488559cb028dfafbda29e260bb92af2db3ae0c60a486c4643bbe8685b8499be07b51424223b57f8da6437eac948ede96dffc12cc
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.4.ebuild b/net-misc/owncloud-client/owncloud-client-2.3.4.ebuild
deleted file mode 100644
index d8fb3b873c2d..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.3.4.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus samba +sftp shibboleth test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	virtual/libiconv
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	samba? ( >=net-fs/samba-3.5 )
-	sftp? ( >=net-libs/libssh-0.5 )
-	shibboleth? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-misc/ocsync
-	!net-misc/nextcloud-client
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)
-"
-
-S=${WORKDIR}/${P/-}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DWITH_ICONV=ON
-		-DWITH_DOC=$(usex doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DBUILD_WITH_QT4=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
-		-DNO_SHIBBOLETH=$(usex !shibboleth)
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/owncloud-client/owncloud-client-2.4.0.ebuild b/net-misc/owncloud-client/owncloud-client-2.4.0.ebuild
deleted file mode 100644
index d8fb3b873c2d..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.4.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus samba +sftp shibboleth test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	virtual/libiconv
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	samba? ( >=net-fs/samba-3.5 )
-	sftp? ( >=net-libs/libssh-0.5 )
-	shibboleth? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-misc/ocsync
-	!net-misc/nextcloud-client
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	doc? (
-		dev-python/sphinx
-		dev-tex/latexmk
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)
-"
-
-S=${WORKDIR}/${P/-}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DWITH_ICONV=ON
-		-DWITH_DOC=$(usex doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DBUILD_WITH_QT4=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
-		-DNO_SHIBBOLETH=$(usex !shibboleth)
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/pmsvn/Manifest b/net-misc/pmsvn/Manifest
index f9760e8ac043..85517e9b411d 100644
--- a/net-misc/pmsvn/Manifest
+++ b/net-misc/pmsvn/Manifest
@@ -4,4 +4,4 @@ DIST pmsvn-1.0.7.tgz 7565 BLAKE2B 2af33cd57312ef9b6d3f46f429fe5ba9e103dba0b984a8
 EBUILD pmsvn-1.0.5.ebuild 893 BLAKE2B 87b8c381bc1e48796c0b04858a9f8db77a7a9d5f85e8955a7deae624727125df018be21c233d974b442d66d909e14e067e00083c20d5db52aa79a23ff4ca6db3 SHA512 79218d8b8fb8bfbcbb2d752ca5fac74a8c6abc44443ae43d9e7b163c61ff0b4e1c88c2104abc614524e9f9c373b315f25bb538a574346ef112f353add5751ce7
 EBUILD pmsvn-1.0.6.ebuild 846 BLAKE2B 7a1312790142dd0875256315b84ab28813adc10d0d284b9b78db5d90a33d1f187967ada1e5a79e93d27ea657cffcbdfb921c07ec8d8a33dea7eed1e24a8cf1ef SHA512 a3f698fe2a94a8ea97ef77b53e2dcf4bf6561d94e0e25e7b7694e4cb09f88042ab2a9211bf555d9f6ea17d1550e8beced4a516fd37acca20718e81ad5f419097
 EBUILD pmsvn-1.0.7.ebuild 782 BLAKE2B af5fdce97b76f4c25b9fe39dbbe812c9b93b9913f3ee73bb2caa993e4c8df584ea33698101fbbdc0d3c7b04b0e0ac1b53f0d1b03bb3a12237ad5edde36be8638 SHA512 d3ebefd72550e338c5d67f9bcede8a339f528744da2de3e62fbb9f03f07b66987fd34a354fcc19f700c92ce310486466544a260c2b2f0d7be37f63f8c8ebaab2
-MISC metadata.xml 325 BLAKE2B b60a5288560a7937e89bae8aa67691628aeced6d84f12641a7f0fbf27543475c739cb03cf1529c4e7f3c582ebe03ac357abd611e5fc73deba9542be20d50ec48 SHA512 5c984349af76dff4b32c0268d0dfd6f3540e217aa33141a9276a27e0304e358f5f019a95986c23eceb2123398f7bf012c9a84745fc054978049bbb5e78ea7298
+MISC metadata.xml 242 BLAKE2B 33fe71c26297e4323da4bc063f8eb4578e77d7bb1a8c7f2044f4624680a2efb008596d45780c2abfbb867258c42051f955798279d57f51ee7083a25fc15549d6 SHA512 4b9a6787713f824e4d7b7f54a8c4031c97b519fc2d92856486799a8e6ca0c5231cbf2c781723d79a5a736949ebe7c81c667af61a64aba3483b3dc4c3d55c2465
diff --git a/net-misc/pmsvn/metadata.xml b/net-misc/pmsvn/metadata.xml
index 7861b3ffc82e..5abb80da9067 100644
--- a/net-misc/pmsvn/metadata.xml
+++ b/net-misc/pmsvn/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">pmsvn</remote-id>
 	</upstream>
diff --git a/net-misc/qtm/Manifest b/net-misc/qtm/Manifest
index 300cd816e1e7..2661989806ad 100644
--- a/net-misc/qtm/Manifest
+++ b/net-misc/qtm/Manifest
@@ -1,3 +1,3 @@
 DIST qtm-1.3.18.tar.bz2 186137 BLAKE2B b405bc922246d5c8fe65fc68250b3eb401be3b17dd55cc81bfa70d6ddd72280398df25c850b2d71cc4383b9463e3aff6d641ce4080c100d10ae79f9002793055 SHA512 d4685f22a883e1d7513dcac57a807b0d21c26dfceda547b22889ee980758de1a49c2e898c745bb597efd709823d96da59f7494015c0915edb34e9141fa60e2ca
 EBUILD qtm-1.3.18-r1.ebuild 1067 BLAKE2B 17f2d02385d6b3eadf1feef09dea8e882ca1a7a3a24acdecdfacbc97edf088640b2b70bd23d229615a5df0d75f2d126a0568e03feef0374068f7cfbdf59c7e0f SHA512 a41516a90aa8e5c692bce38e2101c3f0c4ae58aa06b8286aed98a22e83b708cd8022daa4a24f68a93000e855b693281cbf9df1f5931e1e86ee617ecc6e0726df
-MISC metadata.xml 493 BLAKE2B 060c074323a2f1a4e2b928714f593767298923856992d3f08aa9141ffced7283c27385605cb16889ad7cc3c8d18bcc40ad0fba3f73b7470441f979c295d3d88d SHA512 8445728ea4bfd9de955c5eb0dd5fb8daf79ed88512bf70e6bd610ad27b349c0a4b06b3d26a2cf79b2c95cab3730996d152f5ad88a26582b354e2bc75dff394bd
+MISC metadata.xml 382 BLAKE2B f06322dd6521d5ca81b3b9f409189f4c0a4e1e1e31dc04a8b5ec03c0b265fe947a377437e75cc906de5f9b8fb1783abd176fa812c5d193663febefe88699f22e SHA512 009632d82fedc2deb9796dba8a2de9910afd0b67617f5c1d9ecd14fc641f61839812815197089dc186a201a8848de3706d56802f12f33f22a3badad2cd99420f
diff --git a/net-misc/qtm/metadata.xml b/net-misc/qtm/metadata.xml
index c518c18a9063..714795566c77 100644
--- a/net-misc/qtm/metadata.xml
+++ b/net-misc/qtm/metadata.xml
@@ -1,10 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
diff --git a/net-misc/sshpass/Manifest b/net-misc/sshpass/Manifest
index 70d1a5d87c1d..4e944dc1a26e 100644
--- a/net-misc/sshpass/Manifest
+++ b/net-misc/sshpass/Manifest
@@ -2,4 +2,4 @@ DIST sshpass-1.05.tar.gz 98362 BLAKE2B 59a48391cd41e467b7ef2fdd14dc1ba4aa7698689
 DIST sshpass-1.06.tar.gz 112205 BLAKE2B 9bae7ba60ca627664d12bcccb9a9bb76bc92752490458e4d4fdde27cdb14a0d71c94eeeefe83d95810c1cbe0fff0c9ac8a9d6fb8a90e2cd834c387ac2527875b SHA512 fc08fcca5aaa5e4958f16d38116d828739a5d53f8e2a83506ef78ee602941a7bfc0e3f07154dc390660df490dbdf7601e0c7ec17c68c9627d72d565e4c6717f8
 EBUILD sshpass-1.05.ebuild 408 BLAKE2B ad99bb2fb89dfd18afeb1e28ee9583a695dc08b7f73a22a171e712aab623635563ee6242c185f093879e75f6b7d257880a650a7d913aa729e2406098c16b422f SHA512 cc073ce58bca4f7191c878912e6198acfcd75f49bc49d59089014e2f5fc47cfbc1e5041f142cb9a6e923cdbe989826d051d8c2483565a6c0881eaeace9157871
 EBUILD sshpass-1.06.ebuild 398 BLAKE2B 8feb5215a83009c7d7be398a9a80c5720398e70b0966a2b8984c89837cb18ca2b3f1d71d5e641d63708d04431d7d0cdccd88a868ebde546271688aa93af0f946 SHA512 9405313f06d315f04e5d353de12e010dd9b90fda1dd2b7ac8a8c3921039f9088048ddb82415150f08333fe346c4c8b4d2eef743b4e776e630bfa0bb8d1b330b5
-MISC metadata.xml 327 BLAKE2B 4372f574cb7a9bce016d62dfa780699418196ab0ffad970e554e887d0afd35a5ea59f96241e38874f42b11dd5b67b4824caae265a4072ea95b8538a2715a0f34 SHA512 0e867d2b6e48f24f6457b06b06ee5bff469e8d46542d3a4de66a76df53dc38120ca14327543a60c9d578540a3ff2eba0cde4bb8d0b6a5c90b03c1c09bd6318b3
+MISC metadata.xml 322 BLAKE2B c05a742c8ed098102d51af6f02b578c0d53d26772a99fcd5ef16e58fcce6aaf2b2ff6bfdb2752e1c3f0ecc697bfb1f091bfb294e5ea7e385a3eef506ef3d9d56 SHA512 8cdaa25021136f87ed8c6197def5901ff101fd43b3938baf75f0246699711a8b8d7ad2bdcf4a8f8f5e1183c7e6f151a9496b1b0109690206958b521de15fd8f6
diff --git a/net-misc/sshpass/metadata.xml b/net-misc/sshpass/metadata.xml
index 5f237d0e61d1..3e556ccfad6d 100644
--- a/net-misc/sshpass/metadata.xml
+++ b/net-misc/sshpass/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sshpass</remote-id>
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 7303692082e4..51c8da4e45e8 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -11,4 +11,4 @@ EBUILD streamlink-0.6.0.ebuild 1439 BLAKE2B 1a6306a4cfb1b1c316a9ca93b5b944a7549d
 EBUILD streamlink-0.7.0.ebuild 1481 BLAKE2B 2a8f4ba7ed184a3b02c312da078b3e30b821aacdd66abe716da99ccb051d7f25e9b12126d6d50e18ad88890786b4720bbef84ba00ef2613d9f085248e7a4eda7 SHA512 d9fa66ff97771b07bcbf78800ec02ca3ad575a23228571b66ef45e674d379bfb55b2c11b71b5f6993d6108acf2d22a504c05f29c0948751290c02fc28ae21fa7
 EBUILD streamlink-0.9.0.ebuild 1580 BLAKE2B 425851d87baf78adf1b50410361483d73f959d7f959702ee2d505ab05173b8dfc306a2bb4c28c14c94b8789c604191131618176a0a72853bd0b18729adfe4557 SHA512 854aa7667c70e74acf2aa62f143032957d0b5d0360a3d774328358be3b084d371a4d8de29a051c979291705862ab670ed1763f328bf128e36a5d6d55b25e3eac
 EBUILD streamlink-9999.ebuild 1546 BLAKE2B 034d354005c4e72d769bc33de4068aa537d239050a64b83c3c260662ee1609d80a478fcb58bf42a94a50224e43a16ca2972d6ac7a2e9f31d54ddc1a643f5a235 SHA512 3c5f51958877bd15cd3c5f82c42c076bd8ff1ff52102702508d48a746b03b955520bccc14dbd13b80688f1824e68f79fb5a6fba565847a07e553bf42eb94b554
-MISC metadata.xml 443 BLAKE2B 8557851068cd831f7ba85676e7defbd7a3d990af985aac5e51c581cf56a47a137436a67236a194aa8d55c2f2eecc1b67bafdaf52f8315d796198be6edc3de0d5 SHA512 f5b30f24fc2574bdea1e1bbd0cf8dfd6173cdd56f913c018f6a93760d1df1e76e8f9a4730e2f2308b905b41688024fa48d7c9902a3dbb8dc8ac07fa439f32a9b
+MISC metadata.xml 330 BLAKE2B ad3caca1dc3dd2ea5915a6d14f9741ba7352d8a961939dacf89efdcae0cf1203343ca11ea230efc30cf69d359e09e7cd06218404943f8e4e3853a5c6676f7ff6 SHA512 73730cc94810711b86088a41beba0d0da4f20c4ca377c24122ebeac1ea68e712d03d0e79518df847aa15cb9d8a3f04658715f0b75dfaa1a6dfbedc0a15c33672
diff --git a/net-misc/streamlink/metadata.xml b/net-misc/streamlink/metadata.xml
index e6798e56f53a..aa35b1d35794 100644
--- a/net-misc/streamlink/metadata.xml
+++ b/net-misc/streamlink/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>fdsfgs@krutt.org</email>
-		<name>soredake</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>leio@gentoo.org</email>
+		<name>Mart Raudsepp</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">streamlink/streamlink</remote-id>
diff --git a/net-misc/trackma/Manifest b/net-misc/trackma/Manifest
index 290d42c91750..731daffc2270 100644
--- a/net-misc/trackma/Manifest
+++ b/net-misc/trackma/Manifest
@@ -3,4 +3,4 @@ DIST trackma-0.7.4.tar.gz 143814 BLAKE2B 8fafa53b4af94a1078e2343b1b309efe8caa058
 EBUILD trackma-0.7.3.ebuild 1982 BLAKE2B 613d1ebeb5373c34ad15981ce91f3e7361da68083d18a3cf973c3aa97f60790c5ce350a7549707a1d3420fb14817d16c0da07fd5fe7ce0d9c700d113f846b213 SHA512 b4927b0864f1e94d3fafe92d731e9f835cea28cb1e84778a3571e51cd70338624b3b650fd5b6a6c1f0f8fc2e77068caefd41ec02cad6184dbb8949f482dc9217
 EBUILD trackma-0.7.4.ebuild 1986 BLAKE2B 937c55c9391c0db9d35ffbc55fbe0928770e989aea9c0be7adc226f4da882f412cf97ecbeb8361358675bbcf94f81f191aa0dd28a92c2c1ac3e2689fb331aac9 SHA512 faf3ec4db84da619153a0dc4f126ea217af704a60d93f61dec00fd3500fa604ecd5a9f8eb0d15e62366c67432e13cf3a38e18e21a139161a772969adb9a07679
 EBUILD trackma-9999.ebuild 1938 BLAKE2B 91c1a8d7483ebd947017faa670c67e83ecee7b0395a690291fd7decbe1f09f2fb442ba5e6c3d2b42c1f0b273d06aa01ce010de00faf42becf915f11882ead882 SHA512 93d96f916d9e7599033e1356e32125f754c70b07b6a94b51ccda9c2588e0cb0cdd6cc35e884d2a3b0c3db8a4a87c42897f9d4c0744081f89ea50ab998ea40945
-MISC metadata.xml 762 BLAKE2B 7afbf902c505ccd16ac2f86132084992453ab7ddfd4c70fdc6395487d2dc7daa236cd7ac9ad8196e4131eac1ee00e9a336687a911f151df5a907ff1c2643e1f4 SHA512 f8229d99e027ce81938d220325147dae3df9fdc5b0fa5619ba73d4f437b885cca474483a29ade8817fe4ab06ae225f3c11bc170408ea933779c04ffb49901733
+MISC metadata.xml 579 BLAKE2B 246c639d17e6a69b309624da7ca46720c19f7226b770012bd7d020cb409b842d90d3ada211934062f65202798031dcc667e6801720e588b604b69b71ed0fa34f SHA512 0cc21a27e6dfe16172926c5a0b61b4349c6e68a538e32c041d259c4ada8c147040595c782c8d2ef9e1054edb72c8475f9e1b4d0d3544f277e805d681401d46bf
diff --git a/net-misc/trackma/metadata.xml b/net-misc/trackma/metadata.xml
index 70c3dfa9d170..4412ee5ffa5d 100644
--- a/net-misc/trackma/metadata.xml
+++ b/net-misc/trackma/metadata.xml
@@ -8,14 +8,7 @@
 	<flag name="cli">Enable cli version</flag>
 	<flag name="ncurses">Enable curses version</flag>
 </use>
-<maintainer type="person">
-	<email>fdsfgs@krutt.org</email>
-	<name>soredake</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 	<remote-id type="github">z411/trackma</remote-id>
 </upstream>
diff --git a/net-misc/ttytter/Manifest b/net-misc/ttytter/Manifest
index 9450c9adca43..4e775cd9c374 100644
--- a/net-misc/ttytter/Manifest
+++ b/net-misc/ttytter/Manifest
@@ -1,3 +1,3 @@
 DIST ttytter-2.1.00.txt 238320 BLAKE2B c12be49a7423a18da2da5b550bf899383115757f1045dac3166497a7a850adf2e195566845d18e5df10bb1d67e2a5570ba93751fd1445987f818f11ca8ca47b7 SHA512 06b52275c454b7ad772baddcc64c311633fa35cc038e5a62895bbe056bc117e60feaae5a3e83917ec506ca3411e66619c84fbcb8cc7db6428082d14182813cc4
 EBUILD ttytter-2.1.00.ebuild 756 BLAKE2B 6ac35486c2731d7dc0e2b5bb823ae33f3599d5b34f238dd58de2aee2c2e15336f958624924238da6bffc4451b642ce376c42dc5ed0e7268cc3a22032cdbbdea7 SHA512 9de8e9208d1c02d914aa6d2cc100a3d31e3d3fb942214df8b9c089c2985689077447b1bd08ab2b5e432b05182fcb6c38ce946cab1b513e1172297a31ac58a7a5
-MISC metadata.xml 244 BLAKE2B c4578615fd9f129ba63401a677b05631e811fc780e4c1f3e95ad1da14adb53c59705683a04a0ad1e54ec8ae3730b412d77ecd844b664272ff22c27dd00aafe53 SHA512 c0661c87a34d45258dc8236baf4e1fd4fcb3f418f4a6bb13670ae91141c7474ea8d423cb7df3c8f45cc4441e22783e6ceb807a84ccb8a75c574ea079f8a02117
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/ttytter/metadata.xml b/net-misc/ttytter/metadata.xml
index 2028cee3c389..6f49eba8f496 100644
--- a/net-misc/ttytter/metadata.xml
+++ b/net-misc/ttytter/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index b5fbb74a06c7..15ca1214bf06 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,9 +1,9 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
 DIST whois_5.2.20.tar.xz 82336 BLAKE2B b10d7e22f41bfb68cdd1264016bbfeeb93436a5c46b0ddcfc79834d0446ea8c21cd8ff95bc440bbe4fda0d5b08a16c50fe9504c98c3de3cf4ce18892203518e1 SHA512 3308d9f5562babe007e46b7764718f13c1e7cd8ef7f501161353e4b1b81efacec9742ec25dec3b1cc80940898c785c1920a1aa68af10081f952ebde320075808
-DIST whois_5.3.0.tar.xz 82728 BLAKE2B ac5e9bdd070c3a79306f79709d6450455ff74fc7c3a8c81380f79b98cdd36d25932032673710a39ec55da2220f1d0a21221e1a2b70c36e8798affe9b7f46f3bb SHA512 a507f38254d826a9112d1f5a7888fbd4b79eeaa372977c02e4e8235509d133540ba647ddece95376f6ac704f9b1042d276051d4a3a36d10906ad11f69561432f
 DIST whois_5.3.1.tar.xz 82920 BLAKE2B b4e58ae3f58c8e5de8bca5be3c0e753e0de91651bea1aa4789d389bc65e5155cddb1e87a2adc39340f33360533ef2b86eb9b7b13116a2d64e8a68496529e65e5 SHA512 4840ceecaef1d47bda436f8de8b539ff2b1446dd99ec0867d0bb2b478c13fac190a4a265ab31abb30a779f1a221062f298cd01a1b19ce873221b39dbd3a4a3d7
+DIST whois_5.3.2.tar.xz 82984 BLAKE2B 2e2d9ebf2e93831a1fa3e98a2f8922e531592b95175c9280358a37160a9033ee805baa6519304350399c112e619e293a2746df527ef5c580afbdde1542cbef06 SHA512 27d9576ee7b701778cac0dd7d4df2c4ae2d152fa5dfb3f84d7d5d592314e45872b2f3d6eca0754923ec3a0741e5365bf2238b2c0b366403c35e8a5b046e59434
 EBUILD whois-5.2.20.ebuild 1503 BLAKE2B c8f9f004b15d47af335cbb9ef8e8504fa5cf1e91c3c8dc35117df6772a3831081b51fd5379a93ed65119219f6657c6a2dbfade35dbdc39fa1080e203aabf82e7 SHA512 ef0fcf8e2a3d4b439644112a2b8e69f56e652f6afd19172d550c7669a34be8ee291944ae7bc74feb0fadaf346eadd9e64d192205b6d3b46a6efd1684268f2452
-EBUILD whois-5.3.0.ebuild 1590 BLAKE2B 3b648be6e2502e56ec753e97a444b81842fe6a79e16adfedbc650828a11013e82719b4ee3df4756efbaef706420cee5170ac782e86fa28bc80c34ccb26dc400e SHA512 9d143da77364034a848180148737efe53b579acbc97e33d941ce2061b0eaae5241659b399f1d608b74e2970638c96fbc9b1f586e4d158f26723c90310281f547
 EBUILD whois-5.3.1.ebuild 1593 BLAKE2B c4831da66c7db8d7f7b04c1f7b3f4ed97cd84598778a240c74a6a1ee7d5909bc7e2692f57ce7c0903146ed6aea85bd9ceaa69586cfc5d5b1e251c064a89c5bfe SHA512 89c30e09ef96e1cb38aba09549c5993549563651cac4d67e63d8693ffb7105de7886fadc0f7a73a2ddd941cc910e45171198d5dc1eb3abf75bde7aaa0341d9ee
+EBUILD whois-5.3.2.ebuild 1593 BLAKE2B c4831da66c7db8d7f7b04c1f7b3f4ed97cd84598778a240c74a6a1ee7d5909bc7e2692f57ce7c0903146ed6aea85bd9ceaa69586cfc5d5b1e251c064a89c5bfe SHA512 89c30e09ef96e1cb38aba09549c5993549563651cac4d67e63d8693ffb7105de7886fadc0f7a73a2ddd941cc910e45171198d5dc1eb3abf75bde7aaa0341d9ee
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-misc/whois/whois-5.3.0.ebuild b/net-misc/whois/whois-5.3.2.ebuild
index d04f5117a4da..27fc4102f0ca 100644
--- a/net-misc/whois/whois-5.3.0.ebuild
+++ b/net-misc/whois/whois-5.3.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 inherit toolchain-funcs
 
-MY_P=${P/-/_}
+MY_P="${P/-/_}"
 DESCRIPTION="improved Whois Client"
 HOMEPAGE="https://www.linux.it/~md/software/"
 SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
@@ -42,7 +42,7 @@ src_prepare() {
 	fi
 }
 
-src_configure() { :;} # expected no-op
+src_configure() { :; } # expected no-op
 
 src_compile() {
 	unset HAVE_ICONV HAVE_LIBIDN
diff --git a/net-misc/wol/Manifest b/net-misc/wol/Manifest
index 36248d4e4e0a..f8d85c7dbc89 100644
--- a/net-misc/wol/Manifest
+++ b/net-misc/wol/Manifest
@@ -1,3 +1,3 @@
 DIST wol-0.7.1.tar.gz 445648 BLAKE2B 80e34ee5a588f7caec92c17d3455abec8227789c30dcde46ecbb75d2f5d7f2a852f6a8c11dea54c036e63db73e28f6d2aaa32bbf7b5708f23c9005f163a17f5f SHA512 233cbd038633c4b04a22710c04a8349d7706c6b4ff0554b6899ee3309349502a318f6fb05a4ad4c80cd373c362b2ad8818cb52a432d768f569e80f05658615a3
 EBUILD wol-0.7.1-r1.ebuild 401 BLAKE2B 6ff91aaa835637c8d15ca4dece6ce25b3572720a60bac41551a106c95091b212be200c693269c94762952ec9dcf6097a6a58121b6d45f6af27ce5b78316bbdf8 SHA512 cb1396eb681e2bd3b09ea4b3c5327995c12e58f608e8685de7507a393feba86011ab31b2564e8a660c60834691720e54d7293810a4b14703a8cfbab57e18e78c
-MISC metadata.xml 649 BLAKE2B 46629d4fa9f033a03bbff82eba0b84447401c6ddf130be5d17f74ad8c15727d546d1b1da1f5e920bd3840dbef4e33713b40981c4ab12bdff0aef1685f0c3d1e9 SHA512 b47517a4899bce138c8982dfce164496844d1a534a77f15c128b5321cd6ce41fa6ffed9e5267233ae7e8871a1c36b5861389fc5143c7ccae4badf73bbd21b388
+MISC metadata.xml 561 BLAKE2B 344241901a3c2bcf8e8ade94b85a82c7583c8d9cc6c29b4ebf98b65bea8b0bc8f31e9c52bd57d2a7333dd2822919072cd2c7321c5fcef15e148a3f3d2439eb48 SHA512 8aa78cfbac54569a85944717b43010ce99e69bc9e7af00132bae751d821a5239ca6a09f5640e38dc142c3758edfc6a58a9ba758a5f67cdb8d4a853a36ae5b163
diff --git a/net-misc/wol/metadata.xml b/net-misc/wol/metadata.xml
index efb8e8ab0cb2..86ddb1d0fd53 100644
--- a/net-misc/wol/metadata.xml
+++ b/net-misc/wol/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hwoarang@gentoo.org</email>
-    <name>Markos Chandras</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
 wol implements Wake On LAN functionality in a small program. It wakes up hardware that is Magic Packet compliant.
 Consider you have a sleeping or turned-off computer and you want to remotely wake him up. Just type