gentoo resync : 20.02.2019

31 files changed, 400 insertions, 367 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index d2a8ddbbe6c9..1bbc8d7f98a7 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index 427b16afadb7..615d0205f6cb 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -3,8 +3,6 @@ AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8c
 AUX initd 725 BLAKE2B 3984d5c7f4b34fdb16420d29935edf2a5975e5f7aca2559506ba839d21d781f0a5a5f914bbd35efcc73dfa70d0610ed57b51b3ec9b66de0d77e864c59bf5fa04 SHA512 de8dbff432540d3b725556bb9189e14cf06afc876ec636a9ae2a00ee6158f791a9306c2630cfbf11de80b81ffadb45f39bae235c5d9ee76b5245c0599a387b0a
 AUX initd-r1 906 BLAKE2B 828ac672348454842e3daeb62e39436dce86f3ff9ba2319755f2bc64a20d3dc9e73689c27f79e7f521b6d6553c5d6922eb1b8d72a52a97c7f92b2847b6322b9d SHA512 c4aa04ea30734f00c617684ea014c632bf0d43580ae7b7c6e9ae58e2c947d15177f93e7b92fd9f7b79d1898d0c6a386de1da7fa038dace6381cd72907845e57c
 AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885
-DIST apt-cacher-ng_3.1.orig.tar.xz 319308 BLAKE2B 6c312cda0f7ffb008b1175fc28fb8fdf9a521f0011c72d651f54d0f2f30856982be137f2facc05bc9770793f41ad445f5bbb96a3916be15d53858abffab5dbc0 SHA512 daebbf2fa6e140903eb6ddebcc62a4333486f2fa29a951724d316e4376b602e265094c42c9ffa5ba1f54aa93b1599d65c5c1bede39e088e9a52e4019276362fd
 DIST apt-cacher-ng_3.2.orig.tar.xz 319036 BLAKE2B 576fc7a409556d34ee702edd57527c9c35eb033d0e8c8ea4f7b8a8a2dae86f75cd1ca3a7fb0e02845e70d6f8715692b638ff9d574ce1664b67fec9247b60fbc0 SHA512 7dfee4a8f38e7c5251c761a5faae063926c5001fe0b97136d938cdbff907e97fb0a20b89dcf685645a518e92be04fe5660d840e738960b4465408f04fe532cae
-EBUILD apt-cacher-ng-3.1.ebuild 2490 BLAKE2B 97ee553ef1c8102928c4db5c843ab46072fa8f1bb430013351ed1ed9c43eab83f4a9bcbbc14ca5ae56c5cc0fe339d072b80d0795b631db453f7413c12797a1fb SHA512 1b40a054f5a67e5ae802570a191691fa97d8fa275d11789a210b2d9c8e6c6c625fdcb46d6aa09736ede0c0133e77b873a033d18a414cc79c99152656c28573f6
 EBUILD apt-cacher-ng-3.2.ebuild 2497 BLAKE2B bcf3587c34503a6bad3b32b1a666f2b8d42abd1f5d401dc40c92ae8bb94515b6c2b51aa1f41f2a79ee23919c41ec0a1c18f364188eea4a5376338d20380e2022 SHA512 ec023741c65c638d144b74f12e3340428f70982db16e020bccf2e9d2c1a5edcfc1c94a4e5ac2932fac32dcc019c6964f70902eada986c74390e848ada334540e
 MISC metadata.xml 493 BLAKE2B 6c2fb1f7abaee7df8db9ccdd7b71774230ddf2dc860d59f65a1cb77560532eb363e550bef6df18a63a78858a0a2469b0eb011d8bf0d41bf36a4c1b11223f0b2d SHA512 58f1345b841c7d5105432d0dab345033b9cefcfd4dedfe05f52d25135716be336a2f4a5fee3288236239bae9bbb1381deff0917fff8c80d81caaf64e8706b5a6
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.1.ebuild
deleted file mode 100644
index 092180f5b76f..000000000000
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils toolchain-funcs user
-
-DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
-HOMEPAGE="
-	https://www.unix-ag.uni-kl.de/~bloch/acng/
-	https://packages.qa.debian.org/a/apt-cacher-ng.html
-"
-LICENSE="BSD-4 ZLIB public-domain"
-SLOT="0"
-SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fuse systemd tcpd"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-libs/openssl:*
-	sys-libs/zlib
-	systemd? (
-		sys-apps/systemd
-	)
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-util/cmake
-	>sys-devel/gcc-4.8
-	virtual/pkgconfig
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lang/perl
-	fuse? ( sys-fs/fuse )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-
-S=${WORKDIR}/${P/_}
-
-pkg_pretend() {
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	elif [[ $(gcc-major-version) = 4 ]] && [[ $(gcc-minor-version) -lt 8 ]]; then
-		die "GCC 4.8 or greater is required but you have $(gcc-major-version).$(gcc-minor-version)"
-	fi
-}
-
-pkg_setup() {
-	# add new user & group for daemon
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_configure(){
-	mycmakeargs=( "-DCMAKE_INSTALL_PREFIX=/usr" )
-	if use fuse; then
-		mycmakeargs+=( "-DHAVE_FUSE_25=yes" )
-	else
-		mycmakeargs+=( "-DHAVE_FUSE_25=no" )
-	fi
-	if use tcpd; then
-		mycmakeargs=( "-DHAVE_LIBWRAP=yes" )
-	else
-		mycmakeargs=( "-DHAVE_LIBWRAP=no" )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	pushd ${CMAKE_BUILD_DIR}
-	dosbin ${PN}
-	if use fuse; then
-		dobin acngfs
-	fi
-	popd
-
-	newinitd "${FILESDIR}"/initd-r1 ${PN}
-	newconfd "${FILESDIR}"/confd ${PN}
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/logrotate ${PN}
-
-	doman doc/man/${PN}*
-	if use fuse; then
-		doman doc/man/acngfs*
-	fi
-
-	# Documentation
-	dodoc doc/README TODO VERSION INSTALL ChangeLog
-	if use doc; then
-		dodoc doc/*.pdf
-		dohtml doc/html/*
-		docinto examples/conf
-		dodoc conf/*
-	fi
-
-	# perl daily cron script
-	dosbin scripts/expire-caller.pl
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/cron.daily ${PN}
-
-	# default configuration
-	insinto /etc/${PN}
-	newins "${CMAKE_BUILD_DIR}"/conf/acng.conf ${PN}.conf
-	doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
-
-	keepdir /var/log/${PN}
-	# Some directories must exists
-	keepdir /var/log/${PN}
-	fowners -R ${PN}:${PN} \
-		/etc/${PN} \
-		/var/log/${PN}
-}
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 3b9300498a0d..c8cd2a4308c1 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -28,5 +28,5 @@ AUX dhcrelay6.service.conf 220 BLAKE2B 936c3f0b4e6cfb4e8160dbf01c12d8ceafe62d6c9
 DIST dhcp-4.3.6-P1.tar.gz 10189202 BLAKE2B 5dfbda82fa76d1011c552c9d9b5f15296834c2f380795e11fc6419010dd533fa45b9544fc10fc9da45095127f54ffe136b5fd7cc584589150b1b0a9a054e800c SHA512 cb04af2fb0fa8c5621e8b3dcb41e81422475218e1569b0eac6e13c876a21279928a3348f799253d7207517720466523b1cc28005c671542e37b1a391342b1e62
 DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b36aa08a61280aa8acae5cf581c67cd70222b46eb24b1f9a571e1c028cc853952feac4b6a12f9b7d7d3dbc2fc9 SHA512 684ae349f224918c9f8cec7bd6c55cd0b83ad2b5827375b2876ca088eb05b7ff1364e50f6dc24f2485c610d9be94d4ba3020f60a0fa0ef63962349d191b887e7
 EBUILD dhcp-4.3.6_p1.ebuild 7814 BLAKE2B e3bb178b440b23c39e97fc082af1949dcd3bc9c5b9ba0b778ffbb10cfb8e99e3b8cc3d3c79b1dfa10bb7d924f7b643704a9acfef4289d822b78a71910f632721 SHA512 627121c2f592bdf85e3d1b7b1d98209caa7eda69fa2ca6d9042ed3e6c07b9a4ef2b4b9d985930d21e7275e55ea6bcba816c87b6339f88249d29554d7cf2771b4
-EBUILD dhcp-4.4.1.ebuild 7935 BLAKE2B eaa07ea858ac52f75e3dc0b021c3466e1ae96fe5e711dc8fa079b48f4b74499c791d90e273cc37818c6d00c30b9fcb1f3ecaae4eacf5d7d128f445ceac1c0c89 SHA512 789f26d3926020eef97abf2e2b02066dae9a26cb35d17eb16e40bd01508bf921edccd3e78aa20eebfa378189236ff471322e87032f6d70afa615ffcb9cd975ed
+EBUILD dhcp-4.4.1.ebuild 7934 BLAKE2B ee5c645f9cac4042374b5539b76b39f47d3d4bd5a6c0cd70fb71f77543e7e01ec382b4ad4e7fac342b5a5aa7ad36028490eacf8dd16c76f3df19b2342993ea66 SHA512 d3b4c25e3a82d5d7fa4ef2afcf214f111f131b2cbba6780a4797565e7d08396881a369099138927c2c18f7e6886ddee0e19691f64d732396acddf030eaa50be1
 MISC metadata.xml 669 BLAKE2B 27f8b039b9fdca5cb487c31d12bdfe550efff35a3705ba3fd20e6a783c70e48d4d6ca26fdb966230517bb0f3182da2df3d565396e2ced70f6fd94b15a1d4f601 SHA512 854b5b781642506f45df585d2072a79164620ec16e2b59abe2ef55e474f229d676f69f4820b4db1f6dce04df55bc5e3a20bcff959a34b3cc41bf61cce31f1efd
diff --git a/net-misc/dhcp/dhcp-4.4.1.ebuild b/net-misc/dhcp/dhcp-4.4.1.ebuild
index 572693563b65..35ed728fa017 100644
--- a/net-misc/dhcp/dhcp-4.4.1.ebuild
+++ b/net-misc/dhcp/dhcp-4.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="MPL-2.0 BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
 
 DEPEND="
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index a2835d54ec80..c623bbe77320 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -3,6 +3,6 @@ AUX 2.0.0-rc4-libressl.patch 1770 BLAKE2B a0f9c5938ecc9ee6f7ec3d67f0a285285c5dc4
 DIST freerdp-2.0.0-rc2.tar.gz 6611081 BLAKE2B 564abd6289f0c9d3947b9074111ade8c2e7b6e6dce9af8a06ef1772d0e76822c5df80932a5cbac2f23c4d2a76d4796c12bd4fa067c6ef21ea84a1b8423be1ce3 SHA512 cb765b3b9559c4877be4c10e5df9e95d11a0184ce34e89564097c3234f859de8e82b6de6217396628e5f70c85c40c65ccd75f9b0f7f89daaed7e0e971a833589
 DIST freerdp-2.0.0-rc4.tar.gz 6662044 BLAKE2B 50bc72336841e421b8fd89ce4f2be6a0b1a9f052933c4cd5bad33261689e6a6b54bc5563fb1ace8cc7a2271990c0ff4c7fe239243f5d75140af497ee6ff9bcd6 SHA512 63cf89aecc6d7ac55db8c7aca60f4ba29cfa54ad70d0fa87fdab011cd16500a3d184659119cd08b7596b7236346db3b61b46282c5325d7f0ca6da09b42d0df20
 EBUILD freerdp-2.0.0_rc2-r1.ebuild 2664 BLAKE2B 8612caa8fd82f99e1e6369ea991dd25270b9d7d104825038d6f0bc11983d43b84ac0ca15b02ad112072ab654b10f68372bd949b171ca0f9282dd0971be6b6389 SHA512 0c17d9a07ef8a13bfa8462eac1b3f19c3741e156e1dfd4e5fad41158cbd65bd18403b55cef9a04d0f3f5fb4c53a75c1f34b3405e86210823916eb2a10d6510be
-EBUILD freerdp-2.0.0_rc4.ebuild 2696 BLAKE2B aff4ef66a714733ac5eae705f01d9bf2e237f41ebaa78e6541a9d90e6b80a2d9b81a9d5c5b872a78de8f80b175d06c6f47b48d965bd5661cb6d036159ee7786a SHA512 f8929b63953bba9d22f29af069da0af4da9631ab6de613bcd486241311932aeed457405fab0f6676a5747cc036b90d2ee2c1205cce7e69e6edec8d73bc1b4002
+EBUILD freerdp-2.0.0_rc4.ebuild 2703 BLAKE2B 687f1401be2c68ebf450dc715d8e329497d5cb1cfff986adb89850663f704b4c08e2cdf0f39366ea57d9df37cd6e5597f74f94560d561759b333bebd31b95478 SHA512 4e46a70cbf3a1f009a10ac1ee93ae5a39ab41e6b83b59e7a97084e619a3859a89bd51ef6fde3a4480c1538eec6e2caaead1e5140ab5c30615cd3161e8b61f249
 EBUILD freerdp-9999.ebuild 2650 BLAKE2B 9366eac7edf2dc9ab3ce1b7bab9804bca0faf93822e2f4263d94ef49fe23125e0404b940234f8ecbb2b43da9e9e4ba02260cf8aabc826c61c580031db60203f0 SHA512 f462a8d947212addd7e406992f1ee5d09a65ff7cdfb2aa5156012c715149f5a0e7fedbf18da5ab1633ae0794426c081387717357cf4d5c25fabbb895a7fc664b
 MISC metadata.xml 532 BLAKE2B fc894629c3fa7e1e83f4b3a2e7697e820e705a4616de55d00c6c79a6d23438e5b7e4e192019dff50f17b102280802dc8d2742284b530fcb9e63935c13d95ae72 SHA512 7e80224d494d65b4215f157266512649803df82de87a73a68e08f8cc1a62b7e87b966641b75779179ed26fc124d4235e4efe9b239c13701c96f92de09bcab3b0
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
index 01b6f127c5bc..dcf32d13beb8 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -9,7 +9,7 @@ if [[ ${PV} != 9999 ]]; then
 	MY_P=${P/_/-}
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://pub.freerdp.com/releases/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~ppc ~ppc64 x86"
+	KEYWORDS="alpha amd64 arm ~arm64 ~ppc ~ppc64 x86"
 else
 	inherit git-r3
 	SRC_URI=""
diff --git a/net-misc/gwhois/Manifest b/net-misc/gwhois/Manifest
index 14b75fc96784..88d298f91a2b 100644
--- a/net-misc/gwhois/Manifest
+++ b/net-misc/gwhois/Manifest
@@ -1,6 +1,6 @@
 AUX gwhois.xinetd 305 BLAKE2B 7ed747398edeb544cccd308ca04a192b62c2bad7206a8a2db85382f01cb72d5794a7c7818caf9a26a9a59841b1282a1a6dd8821b2153d8a3ac6631aa23074419 SHA512 33afac83df9f8d53b54144358cd50b1ea40e266fd5438d1f8a32954c4f05cdb608b5ebc688673f1866ac76e59dfb0b097884bb38077e50061639152899d68460
 DIST gwhois_20120626-1.2.tar.gz 41800 BLAKE2B 695005bd37abaf0dc39593dcc3dfd01102b896dc2bb74a8f3be774d5f7316861588ca3ca621eabdeb19739abfda9be0ab215c757181d3d08ce0416f315410d0d SHA512 c18e20a033e3d2de3b1a5c81d1fdae88cfd9dbc5261b4512b87376d0909ea538db46b3380aaa426ef43904ef292662185dd2f3cb59c56dba306c41a0e827bcb0
 DIST gwhois_20120626.tar.gz 41698 BLAKE2B cce3a6eb385bb782a772a7532cecc2ae164d6ea00a42a6afa29b2ff4d16526507511c16e9cae3dab3d26e7818126b2fcd20a5d88a4affa472162f9ef30c0e464 SHA512 8ffaa611389929435f70d3f020e28249e6e3109c4e822e9318b050f52cf09d6934adbb14ab67a6361574ce8645656d5eaf24808dea453f2187352fc2b2513e0e
-EBUILD gwhois-20120626-r1.ebuild 1360 BLAKE2B 9eb382287ff1eb80c0c2dad4274864abc447051a7aaf79bfa54b4ef843d53d00f629e051c1bc5e57039afae01f55d1f9710aedaff81b30f392f53d008ae36cf7 SHA512 ab3b7f6434d1bb6e0b2c45eb4ad155f14b37ecf883ecba4fe7f090ff237092b4b989217d4f187622acfc1e4914e15ca4834efe650b11828d55d91e9ba21c2047
+EBUILD gwhois-20120626-r1.ebuild 1359 BLAKE2B c1ce2b2386e1538cf45466c505f0b0a6f039fb873842f1e6b865bd21ee6bf4c6945ecdf69352c31c464aeec14f65712ec9a22db5af03dc62370cd84cc4566fe7 SHA512 bac5dec7178f57ee3d86894ff793e2fea021b5da19fadd18bf6d9ee4700aa59d47cc7dabcdb566d3956325065506c821fdd518a948836629ed4a22e4a0a0d9e1
 EBUILD gwhois-20120626.ebuild 1176 BLAKE2B 8c4f27cd2a32a3227b4a22ebac16b9d694e8ce845ca450f83e3a23cc90a99f1ca0a0cdc044d9eb97cd9e801997d646df6d6dcfccada9df39626892a2da46758b SHA512 730f084c67f0051c130d25dd1f2dfb765b8ace18bf29d81454b8f937d45ec80e01cacfc02adc6652fa369e95fd3553d688edd4030b2b7455ce7201e6e3c4259e
 MISC metadata.xml 530 BLAKE2B 8bde49044c3d194febcd4dd6d43e60854f2282264a5a22d8e35a131c3f6fe5f72f91bb20a8d1179267af873246611fb4defa8ffc5b8e0f0288f6e514475f55c6 SHA512 8e59f39cd78c74a06d0c9d0efc4cf72e80df415b2433970707977cf049140630e976e12062ad2bab2822ac790ae6c160f87cb65c2c746e7ede14d288f6364306
diff --git a/net-misc/gwhois/gwhois-20120626-r1.ebuild b/net-misc/gwhois/gwhois-20120626-r1.ebuild
index d83034a44fdf..ef9a7ad8c339 100644
--- a/net-misc/gwhois/gwhois-20120626-r1.ebuild
+++ b/net-misc/gwhois/gwhois-20120626-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://debian/pool/main/g/${PN}/${MY_P/-/_}-${DEBIAN_VER}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-misc/jlj/Manifest b/net-misc/jlj/Manifest
index a4b62fa444f6..4ab67b340050 100644
--- a/net-misc/jlj/Manifest
+++ b/net-misc/jlj/Manifest
@@ -1,4 +1,3 @@
 DIST jlj_2.12.tar.gz 32480 BLAKE2B 9d0cc73a1c75c5ca2e856593ed5ae19d694cfc4b4c91d19ceac17604709bb887464ffde712c7fb0f243f240585f5d2321cdf8552494d118bff10e63c240d1877 SHA512 e0d14520c584ca6bca473286cadef46c7deefc47d48fc39e3bd61e01189fe445a9452406a3aec1ed05d9d44925042589cc1396991b56f02018ea01df11ab8594
-EBUILD jlj-2.12-r1.ebuild 619 BLAKE2B 8c24f6b97638a29fc4dcc09559bcbe7f08597ae61b62959b1b227b2bc3d301503940178f6f217aaa48e394defa696a849c6bb8ec4a1157d591418d57fbfc27a7 SHA512 70157f8584fc7d8eaee361a73a6c5936a013292186a353c6caa165c11cf6240945214acd2a7604652d48f124e8eabf0e156bba1900d8ef435e074c2dceeb0300
-EBUILD jlj-2.12.ebuild 638 BLAKE2B 60a4956223b340af24a7aca3f29cb99a1d88abc8d53bbf48832edcfcc25c8f236b6cd242e0a9b165ef6cf2336c932b2b8206cb5e8077fdabcbf2a724af758326 SHA512 5e5c77c5b0ada7710b47cc15a71598d1c20fe155ceb9b06392e7708d7667607a56e05b3f54d3d18f30539b85d0b788c3af772bcca4d359ebfca79ef6ae1334e5
+EBUILD jlj-2.12-r1.ebuild 622 BLAKE2B 2ce325bb325aab34d160d9a6e528ed3b777595e78995403cea59215dd9a9978f964b63b9958c19a2292a62ffd29a3083281523203de6682f9dcb1130560e9728 SHA512 deee2a075a3f5ab88af7de664a55ee9891ffd4714fc1a5ece3caed4f68169813a099cc92c629cac88dd8c438e2cc5231c0cd2a905d33ba9bc1b65d8dea2452f8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/jlj/jlj-2.12-r1.ebuild b/net-misc/jlj/jlj-2.12-r1.ebuild
index caaba49b41ec..7585da7bd035 100644
--- a/net-misc/jlj/jlj-2.12-r1.ebuild
+++ b/net-misc/jlj/jlj-2.12-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://umlautllama.com/projects/perl/#jlj"
 SRC_URI="http://umlautllama.com/projects/perl/${PN}_${PV}.tar.gz"
 
 LICENSE="freedist"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~ppc ~sparc x86"
 SLOT="0"
 
 DEPEND="dev-lang/perl"
diff --git a/net-misc/jlj/jlj-2.12.ebuild b/net-misc/jlj/jlj-2.12.ebuild
deleted file mode 100644
index 7741532b0544..000000000000
--- a/net-misc/jlj/jlj-2.12.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A simple console LiveJournal entry system"
-HOMEPAGE="http://umlautllama.com/projects/perl/#jlj"
-SRC_URI="http://umlautllama.com/projects/perl/${PN}_${PV}.tar.gz"
-LICENSE="freedist"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	newbin ${PN}.pl ${PN} || die
-	newdoc .livejournal.rc livejournal.rc
-	dodoc README.JLJ
-}
-
-pkg_postinst() {
-	elog "README.JLJ and a sample livejournal.rc have been installed to"
-	elog "/usr/share/doc/${PF}/"
-}
diff --git a/net-misc/ndisc6/Manifest b/net-misc/ndisc6/Manifest
index c59abd2e7190..3f0e6bf6d332 100644
--- a/net-misc/ndisc6/Manifest
+++ b/net-misc/ndisc6/Manifest
@@ -3,12 +3,6 @@ AUX rdnssd.rc 498 BLAKE2B 816d955e40052a1db7903f9382439264efd88e02cc227471606cf6
 AUX rdnssd.rc-1 502 BLAKE2B 39875eee2e81627e0e603bc01e552622e219af3bb18fede1d6b86364c501bd1e5eaccaf682f93ef38a4e18de4b2e955a98604bc5854054da5a31ef97cebde602 SHA512 0582ed315756d3e3c17d789252b3c68d1a7dfc6e74e600c0ea186775c976af447923cdc8182be23dd1418323503a91f8f82bc5068148a92bb40f9888a7c5cec2
 AUX resolvconf 148 BLAKE2B 7e11d5f6d87fdf2e60ebb2b308663c51d4683cc389ba9640cd026da5ac99dcdd196c9e7dc4733b77da58285fe3fd6a0eab9d0a6b9695eeb8b7cf54aa17c560c8 SHA512 ba04b2ae327a1136122bf68929fee7946bc2938ce335cfe3c982ccb5bc4d53a66154dad65d79eeb47fd3b306cf203e69aa0197f6751ae5b0e021aff6d7f01ecf
 AUX resolvconf-1 152 BLAKE2B 1219e02e170a1cf279a1497e12269061659af7c61d662adb9beab39e772068d597a5f63b6c1f39efa5001c5f8d1014cd2f265cb3e49c3163ff38d9205126dbcd SHA512 cdba5bbfa69a8288696f14d1f7798445769bf37c6363cf0bdeb2aa162ff5c83728f513917c7649e3f6493bfc9cf437e0c08e460a87b80604fa31dd599441ef83
-DIST ndisc6-0.9.9.tar.bz2 233493 BLAKE2B 794631cfbe0b41d59ddfb408ceeaf94774979ae3661c1ea4f5cb73fa0d3a7c0592655241087d6877134ca26a130a4499c90150f7b6c7bcd2a93608de55362127 SHA512 ff0853140328e0ef4075aca56d54b959e2d6804c4fb38c60b13eafba1bfd0befd7790a4ff3e6795bb25a2b2d7e90eb5c733190898223b08edf3d6f431cb21abe
-DIST ndisc6-1.0.2.tar.bz2 239249 BLAKE2B 3afa792421a39f5efe340480a0866d0fe7dd1f854eaa8b71672b1a4a4b6ef79bb172e9bda4e480e5391eb2d2a22b897d505fcbe02624cdf24d84c7b2e54431c8 SHA512 87441bc9d76f3fa22c6d173ca95fa295e0c30fca28c39d60ca13800f55278e83a9e6cae316e3b4a2c3675f813886d0f38999d538904fcefbb9ef7d171972d42a
 DIST ndisc6-1.0.3.tar.bz2 260294 BLAKE2B cb9f302bd4d4f15effc8165dfdc686b2eda7543dd745cae43a24fea49086e3b5c58cc5b4eb14bc1a46657a15f6bd11322d5629570461f68743619deb9cd10004 SHA512 11dc9833edfc76650b46977d653686ed800dc1cc1dd069051410570f522d538ea9297b013a8d16b94aac3ebf33043cafdaee9fdccb5c02cc08b4c29ceaa96a54
-EBUILD ndisc6-0.9.9-r2.ebuild 677 BLAKE2B c1696f8497970344334d894e848547c44ac0fcdaffdabbf126bf5fb0f784723fc3edd5d3875d8e0e7e5806eaef50d713b6508d96461748195c164eaa0ecc2713 SHA512 9693cf1e1ed83b3d7565b54466c97f761946b5213857e1b016ff9d72a0c8bee04bff38ae83bcd53210e7e6b8fbeea7903904a63f06717a51d1aefb9e796251f4
-EBUILD ndisc6-0.9.9.ebuild 659 BLAKE2B ca4ea1607a560892ca4b60cf638342b5fb2869cc2d70bd6ca0472b4867c69109e73d014c6d9be98544765ef842fc2eab297f5c4ae57453044bf86a0ad305d816 SHA512 f7894a6e9393d68148617a88bd0887a2f306d7f22c6016b8a45a9c6b54d70dcd11c6871633398c3ef3e934ad894ca8ceb5b1c44f5e7106cc83912eb34b05fbb9
-EBUILD ndisc6-1.0.2-r1.ebuild 737 BLAKE2B 1ca4cb82d5a13a8cee418e9dd2d7fccce1f3eb7592e75eb2381e5b1f3046a89b106aca57dc0591759b6f9cb8ecab70aea5f1ec232e4307920855eb9f752bd25f SHA512 c4e35cb157782390e5a3262ecb4d84e939286ad9b4445e5a5e24a3377b6636cb41c3bf78dcc64531e702cc2527021c3f7bf2e49bedff7c4a5c2258a90a01447e
-EBUILD ndisc6-1.0.2.ebuild 677 BLAKE2B c1696f8497970344334d894e848547c44ac0fcdaffdabbf126bf5fb0f784723fc3edd5d3875d8e0e7e5806eaef50d713b6508d96461748195c164eaa0ecc2713 SHA512 9693cf1e1ed83b3d7565b54466c97f761946b5213857e1b016ff9d72a0c8bee04bff38ae83bcd53210e7e6b8fbeea7903904a63f06717a51d1aefb9e796251f4
-EBUILD ndisc6-1.0.3.ebuild 744 BLAKE2B 4589ff21a50c5ba6d0fb2f5e4d29cf41764705ddd7daa31fd0c4aa48a7b05bc2cd9c53a0fb295750bc5f8d1c3985e7241236524ba4effd61ad925f0b91666a4f SHA512 19bd5cd374849fdaa6e28b6a2f6f74ef0e66c4c510d13d9aaf4488bf6c7d80aa1e3fe13213f720de013e3cbf80d1a7d638ce5f5456635e752640ea855a7042cb
+EBUILD ndisc6-1.0.3.ebuild 743 BLAKE2B 35e638a9a2a40556bd7aa02d4543466f9d77e54d6d841d5e81a9cf66ce453a32e720784a939dc5a07b6c9a242c2907c38c06d8f1259c9fc7b04c95c20604c4b8 SHA512 526c6a9968b733292006f8d9c28d176d7f4dc7e154610a1d54d205c5c80991cb97c5ed474dc815e0aef8cfbb71315121ced92f68f76197e4a8641a3aab4ee4d8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/ndisc6/ndisc6-0.9.9-r2.ebuild b/net-misc/ndisc6/ndisc6-0.9.9-r2.ebuild
deleted file mode 100644
index 2495ca127617..000000000000
--- a/net-misc/ndisc6/ndisc6-0.9.9-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Recursive DNS Servers discovery Daemon (rdnssd) for IPv6"
-HOMEPAGE="https://www.remlab.net/ndisc6/"
-SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	sys-devel/gettext"
-RDEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	newinitd "${FILESDIR}"/rdnssd.rc-1 rdnssd || die
-	newconfd "${FILESDIR}"/rdnssd.conf rdnssd || die
-	exeinto /etc/rdnssd
-	newexe "${FILESDIR}"/resolvconf-1 resolvconf || die
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
diff --git a/net-misc/ndisc6/ndisc6-0.9.9.ebuild b/net-misc/ndisc6/ndisc6-0.9.9.ebuild
deleted file mode 100644
index b24589b77aba..000000000000
--- a/net-misc/ndisc6/ndisc6-0.9.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Recursive DNS Servers discovery Daemon (rdnssd) for IPv6"
-HOMEPAGE="https://www.remlab.net/ndisc6/"
-SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	sys-devel/gettext"
-RDEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	newinitd "${FILESDIR}"/rdnssd.rc rdnssd || die
-	newconfd "${FILESDIR}"/rdnssd.conf rdnssd || die
-	exeinto /etc/rdnssd
-	doexe "${FILESDIR}"/resolvconf || die
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
diff --git a/net-misc/ndisc6/ndisc6-1.0.2-r1.ebuild b/net-misc/ndisc6/ndisc6-1.0.2-r1.ebuild
deleted file mode 100644
index c65f7bed95a9..000000000000
--- a/net-misc/ndisc6/ndisc6-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Recursive DNS Servers discovery Daemon (rdnssd) for IPv6"
-HOMEPAGE="https://www.remlab.net/ndisc6/"
-SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug"
-
-DEPEND="dev-lang/perl
-	sys-devel/gettext"
-RDEPEND=""
-
-src_configure() {
-	econf $(use_enable debug assert)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	newinitd "${FILESDIR}"/rdnssd.rc-1 rdnssd || die
-	newconfd "${FILESDIR}"/rdnssd.conf rdnssd || die
-	exeinto /etc/rdnssd
-	newexe "${FILESDIR}"/resolvconf-1 resolvconf || die
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
diff --git a/net-misc/ndisc6/ndisc6-1.0.2.ebuild b/net-misc/ndisc6/ndisc6-1.0.2.ebuild
deleted file mode 100644
index 2495ca127617..000000000000
--- a/net-misc/ndisc6/ndisc6-1.0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Recursive DNS Servers discovery Daemon (rdnssd) for IPv6"
-HOMEPAGE="https://www.remlab.net/ndisc6/"
-SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl
-	sys-devel/gettext"
-RDEPEND=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	newinitd "${FILESDIR}"/rdnssd.rc-1 rdnssd || die
-	newconfd "${FILESDIR}"/rdnssd.conf rdnssd || die
-	exeinto /etc/rdnssd
-	newexe "${FILESDIR}"/resolvconf-1 resolvconf || die
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
diff --git a/net-misc/ndisc6/ndisc6-1.0.3.ebuild b/net-misc/ndisc6/ndisc6-1.0.3.ebuild
index 511a76c11558..5302cb4d211d 100644
--- a/net-misc/ndisc6/ndisc6-1.0.3.ebuild
+++ b/net-misc/ndisc6/ndisc6-1.0.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86 ~x64-macos"
+KEYWORDS="amd64 ~arm x86 ~x64-macos"
 IUSE="debug"
 
 DEPEND="dev-lang/perl
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 8945f6e86808..cf78c7516b6a 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -19,5 +19,6 @@ AUX sntp.service-r2 324 BLAKE2B c94e72170f46453e94d6fb48b3ee353ba2db1bdf1903f652
 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
 DIST ntp-4.2.8p12-manpages.tar.xz 25700 BLAKE2B 0a84908556e997bdd08a78cd04f7f38a32a8441138f31d0adf7fefc380da79e509bea4a8bc67154501e359638f4edcab561d14cbdd1d573473bd2ea5a14f0c48 SHA512 e6df0099b9f62db63d200702267276ee094e8d00b20a67d2181f3f32fe6b871c49ac2eedbc2186b3255c919820c05eac528718b80afe7ed7ed7654b55c361f7c
 DIST ntp-4.2.8p12.tar.gz 7079642 BLAKE2B d7d7817afaf9f94bf230951901b7531aff03c0828eecd40ca6fcc836ffd081387837afee44978742b507a9bee58788022fe9556733e8861dcc37d63f5637b3d1 SHA512 5382dcd1bb7feca8f28fc650f68892cb53f9364ebeb3780754cfbe71b1602057fdfd6eb27956afe79014a435624d77e2648d9e07f4d86ce7a98f5a4438d08310
+EBUILD ntp-4.2.8_p12-r1.ebuild 4577 BLAKE2B c5397373388f007bf6f307b6b8cf2d83351800481344c531ca7a5c3ec8a0ebccae7cdc76518e2779ccc15ee5e82bf59cc256e35bdf3e46e3538690891f21f784 SHA512 3cdfaeede3199bcf6f82f0fa64feaa2961e99785c161abf230d6430af7f2bdc67153a0d86f3b3762a5660dc8077467089eec5b1a3b04098588e0c5e1efc0073e
 EBUILD ntp-4.2.8_p12.ebuild 4564 BLAKE2B f084db146b958fc8c789b82459135d8fb9de1295bfd39c06c36b580c79bcaf3e8f8cfde8a89001a16fe542dcfe1a08a479413c63356d8480d8aeb2bb860f9465 SHA512 303114ca6511626059920736006fd5e5075787951f9ce61a47ab3b3d7181db904c6b2ab915fa2981e8d89c7a6276bcab129ba4a267fa00a3ef31c1c08038ea11
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/ntp-4.2.8_p12-r1.ebuild b/net-misc/ntp/ntp-4.2.8_p12-r1.ebuild
new file mode 100644
index 000000000000..72de82eb89bb
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8_p12-r1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools toolchain-funcs flag-o-matic user systemd
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
+
+LICENSE="HPND BSD ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
+
+CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
+	>=dev-libs/libevent-2.0.9:=[threads?]
+	kernel_linux? ( caps? ( sys-libs/libcap ) )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	snmp? ( net-analyzer/net-snmp )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	parse-clocks? ( net-misc/pps-tools )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-ntp )
+	vim-syntax? ( app-vim/ntp-syntax )
+	!net-misc/ntpsec
+	!openntpd? ( !net-misc/openntpd )
+"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
+	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
+	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
+	"${FILESDIR}"/${PN}-4.2.8_p12-libressl-2.8.patch
+)
+
+pkg_setup() {
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_prepare() {
+	default
+	append-cppflags -D_GNU_SOURCE #264109
+	# Make sure every build uses the same install layout. #539092
+	find sntp/loc/ -type f '!' -name legacy -delete || die
+	eautoreconf #622754
+	# Disable pointless checks.
+	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
+}
+
+src_configure() {
+	# avoid libmd5/libelf
+	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
+	export ac_cv_lib_elf_nlist=no
+	# blah, no real configure options #176333
+	export ac_cv_header_dns_sd_h=$(usex zeroconf)
+	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+	# Increase the default memlimit from 32MiB to 128MiB.  #533232
+	local myeconfargs=(
+		--with-lineeditlibs=readline,edit,editline
+		--with-yielding-select
+		--disable-local-libevent
+		--docdir='$(datarootdir)'/doc/${PF}
+		--htmldir='$(docdir)/html'
+		--with-memlock=256
+		$(use_enable caps linuxcaps)
+		$(use_enable parse-clocks)
+		$(use_enable ipv6)
+		$(use_enable debug debugging)
+		$(use_with readline lineeditlibs readline)
+		$(use_enable samba ntp-signd)
+		$(use_with snmp ntpsnmpd)
+		$(use_with ssl crypto)
+		$(use_enable threads thread-support)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# move ntpd/ntpdate to sbin #66671
+	dodir /usr/sbin
+	mv "${ED%/}"/usr/bin/{ntpd,ntpdate} "${ED%/}"/usr/sbin/ || die "move to sbin"
+
+	dodoc INSTALL WHERE-TO-START
+	doman "${WORKDIR}"/man/*.[58]
+
+	insinto /etc
+	doins "${FILESDIR}"/ntp.conf
+	use ipv6 || sed -i '/^restrict .*::1/d' "${ED%/}"/etc/ntp.conf #524726
+	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
+	newconfd "${FILESDIR}"/ntpd.confd ntpd
+	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+	newinitd "${FILESDIR}"/sntp.rc sntp
+	newconfd "${FILESDIR}"/sntp.confd sntp
+	if ! use caps ; then
+		sed -i "s|-u ntp:ntp||" "${ED%/}"/etc/conf.d/ntpd || die
+	fi
+	sed -i "s:/usr/bin:/usr/sbin:" "${ED%/}"/etc/init.d/ntpd || die
+
+	keepdir /var/lib/ntp
+	use prefix || fowners ntp:ntp /var/lib/ntp
+
+	if use openntpd ; then
+		cd "${ED}" || die
+		rm usr/sbin/ntpd || die
+		rm -r var/lib || die
+		rm etc/{conf,init}.d/ntpd || die
+		rm usr/share/man/*/ntpd.8 || die
+	else
+		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
+		if use caps ; then
+			sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
+				"${D%/}$(systemd_get_systemunitdir)"/ntpd.service \
+				|| die
+		fi
+		systemd_enable_ntpunit 60-ntpd ntpd.service
+	fi
+
+	systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
+	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
+	systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
+	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
+}
+
+pkg_postinst() {
+	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
+		eerror "The notrust option was found in your /etc/ntp.conf!"
+		ewarn "If your ntpd starts sending out weird responses,"
+		ewarn "then make sure you have keys properly setup and see"
+		ewarn "https://bugs.gentoo.org/41827"
+	fi
+}
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index c9d2004c7108..3291c2c0abfd 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -10,6 +10,6 @@ EBUILD rdesktop-1.8.3-r1.ebuild 1843 BLAKE2B cc3e9e807656d5cf1d92337f90be8ec6b7e
 EBUILD rdesktop-1.8.3-r2.ebuild 1896 BLAKE2B 5741137acba3af2842dfd5e6bdc95a53d230feadece2a7c5d71ed2042442a6702ff3d94bb1f98554fb2c0134488c8fecf456ca9d8171680c89cc0054ce2acba8 SHA512 2b5e2ed13d3a42dfd70173b7cbafde9d078c08a27ea13aec85951c7dddb302d61b61c08eecc72b7bc8a0ef13fa9fe1854069d6e1c106428adc2182314ca798ec
 EBUILD rdesktop-1.8.3-r3.ebuild 1725 BLAKE2B 0523fb8eb8962017673fe4dc7cfbd05457aa514c2166fbe5ec0beb1fe6902d5109a878f7371ce2157d2a0a85da2e6245d0ca9b80ef2c2de013dce2bca456c296 SHA512 519ff1eafb4ea9420c62a6ce864fdf5005aaa3f7dffa05dc5265d14837133430fc60a204390a7055a2b1277d0f90c2f84bc11ee46baaf0fd76f15c79fd5068ad
 EBUILD rdesktop-1.8.3.ebuild 1803 BLAKE2B 783d1cdb94a66f2c6339cc45fb4c201ed0ba2af0d06b91bf6d615b00b086d7f498fb082efbb34e48b6a110a1232d5c400fd8b984e7729685c7cf1410544ba7cd SHA512 c1bcdac48e93f0e30b57ebfdeb6338b20f980aca3630986e564f20483b38e9f31110a1efda74b94d8fb973b9299399ae7e75351dbda049b82f8e74002363f68a
-EBUILD rdesktop-1.8.4-r1.ebuild 1744 BLAKE2B d48a2224a154f2a7bbc5398611deb04a6f751a1c9c056ad6c1d0448b6683e07ce060d61591a838cfe853da2418228b5bbca03b27d862b085a2f4e87f9d24665e SHA512 3842760d78f8f3a694ccc21ff3f537917800eed0c18c52419f8f43fdafdf03afae34008ade9d8fd72197e5c18ce0902f47ef30fa2558fe9561854f8c64aa9e0e
+EBUILD rdesktop-1.8.4-r1.ebuild 1743 BLAKE2B 6e783bf68dd64e4e13d3ff7ace38d8f59b072b79d71adfd68d414bab753a759d2d780137bc0273eb30f8014e4f2763642b6589efac9dbd181377b4d39b13dbc1 SHA512 eb422e85c9412afc45f567a2d6085b02c194972de02dce8256947386ad8b0b4ab486c59c9a1ac8c112f999669786f3b785c6a95015bd0bcd832e25005d1ae1c8
 EBUILD rdesktop-1.8.4.ebuild 1709 BLAKE2B 09f9ae4b35a35d4a9882034e425c69f66fa30e30166cc26fb6d4ff1fba36512436c40ad4e52f181fae462257e9d575c973efa6b085d29d5e2684fafa55d5ac0d SHA512 c204cc5606d6c38eea53565a09ae57a6783d62aa3436b9049c470ef77053c15e5afbab8027fd8654c465f0878b4c98c5e99112f3f80e14a42475259d34d8c9f1
 MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea
diff --git a/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild
index d0abef7c4ac9..582da79a3506 100644
--- a/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 1a7b7e902850..90700302ff2a 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,9 +1,10 @@
 AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b
-AUX spice-gtk-0.34-libressl.patch 1539 BLAKE2B ff7826221a8e551999004c818be806bed8a254d7447d9233012b566941307b117789f73c32887a1d713fe7352a5dac26dfa0eaf67eeadf32283dc46b5f3c18eb SHA512 243ce8cfce2d5fd26b5dc8f5da985b0cf9e95290cb82336439d015352479018075408092425dbac5cabf815f1be95e85680058d9dc1900e992d37c2a04fb85d2
 AUX spice-gtk-0.34-openssl11.patch 518 BLAKE2B d9c692996f64ccfb61f16f2c8b620559d1321f35c74072c3e0c51a115f7d40039b7c6dd484cf3beec90c8950df5fbb42575ab62e3c309da3405b5217864b746b SHA512 f879a3f26be439a68e1f40e32e654eea301efc9f5494039b7166673337688f0832e180ab77863cde55627ee033572caf04d5bb08816d4272382d9dccf43ef7f1
+AUX spice-gtk-0.35-libressl.patch 2025 BLAKE2B f1123494cfa4f2cf3d168ae1f2a1277b77dd2afc9a0c4911a65941977f8bac30b30de1d03575fcaf483cd5f9cc8f4ff150a40b6f1bfb8b19da18d2027fc1f04f SHA512 b7717296b66a32f3dd3458de27059c82fd826479143b0261819d0abad5f496cedaca61da42706808b686e1b55bb8c7613187c0b103ccbc9566abb3385c7a36de
 DIST spice-gtk-0.34.tar.bz2 1480566 BLAKE2B 35350cf930d091fa11df1d573f9eff23696745a20e88fcd20783c108b6ddca9064bc4e75d414f23bd94318e37d509e581866c5dcc955cd21ca7c9384b492f0ec SHA512 17ea737511855b47f5eaf5143756483542cf8ee83f8d276cbfb2c0407355f68ed329fcbed8a67737179f3e53587710634d6faa856590234ee68be7b4b13f2689
 DIST spice-gtk-0.35.tar.bz2 1437231 BLAKE2B f2731a794cf22b491bf858fff44506288af730b37f1c37e16ac3042d662373b4e4021808d5ca72440012fb36a5119ad11858cb8cf872b04376518487faebef49 SHA512 f0914a4a9baf892e39dab7d51aa9f5ab4dbb4ef01f09da158b20756f890745837d0a6c8c1f7897844e695be2ed01f3b1d04ada1cacc958b5cfadb0d4bf7c4729
 EBUILD spice-gtk-0.34-r2.ebuild 3752 BLAKE2B e27f8a92b0284f6fa2296f0a5f7cb38d01eec7e7502e6730186094835d9ce3b397f002206a976a861ef9e2ef904b8256d696c6e46783c30875b16781df597875 SHA512 1c756aa20ca07af0bf3796b7e42bf76337a15ac3d5aa794eee24649ff9f503e014e7bfc8ac815b6117f5ceca3c2f8461af94cdb89b8119217ab21dff78bd7b1c
+EBUILD spice-gtk-0.35-r1.ebuild 3842 BLAKE2B 0ac70ab17094034ccc5afaf6c8bd4225dd0e81622d93498d31cbecb9da0840ea21b14d83a79c7295cb9fc4e8883f2e1ba2d33a592fbb6610bb5569f0f24227d8 SHA512 36b9b70d00fb434621f831374072f6942dee2760414c49b8c1538135ae5c7a61f7c1b72de0f4c04b68ac88414c497baabe11c6c25375295b740393b63ca8dfd0
 EBUILD spice-gtk-0.35.ebuild 3804 BLAKE2B aa969c2458a6b0d1b7343b9d7522adb72035a3d4e1f653e3d41d1a309246957ab2f061e385f4730de0ff2648090f9822476474b06be1dc0aae987f05bac07e02 SHA512 b2a660c9042a1d388a46b9a89ec9e0ea4ad8b209358fbb95bed23f8c735ac3c3c761f7e8e7a262a9fd01a38d1b7c2efdcf99d6de597272072d80095856d6d01e
 EBUILD spice-gtk-9999.ebuild 3713 BLAKE2B e00b824f12cbd92203780159bd9f6d288e906c1b392cc2eb7d14eef0f6a9f05f04fd9d5d5548b2fca5f9865431e2af99c08cacfea30a0b23f059683ee958a91c SHA512 a02cca86b0a157ac3f11d96317d8c1878be2f836989f5e22251dea7234a52f8b7435ebe7749ac7a2b06b339bcbdfece34cf39da0618c0fbd659c35120a54ea3b
 MISC metadata.xml 1166 BLAKE2B 37cf826a7a49dc48170fb99e05b191964810eacbf8b13db383a37e70faed6a2b4b70acfd724eeffbbe10d97fab27bfec7d56cfb2cbc2537ac4df7612afdbe8d2 SHA512 5229ddeaf19765abee5b0120b066ac2049f77878b1b8886e2b552f2c56d6049df297b227f0bee36bbe6be7041b9d8e1c1d3d868c34b1e39b49a5c0bc16b2c947
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.34-libressl.patch b/net-misc/spice-gtk/files/spice-gtk-0.35-libressl.patch
index e39efaee2746..6ecea6d11c2e 100644
--- a/net-misc/spice-gtk/files/spice-gtk-0.34-libressl.patch
+++ b/net-misc/spice-gtk/files/spice-gtk-0.35-libressl.patch
@@ -1,16 +1,21 @@
 https://bugs.gentoo.org/631250
 https://631250.bugs.gentoo.org/attachment.cgi?id=513720
 
+https://bugs.gentoo.org/664512
+https://cgit.freedesktop.org/spice/spice-common/commit/?id=8e8476d932d9866d950fe616fe1c10361b75a3a2
+https://cgit.freedesktop.org/spice/spice-gtk/commit/?id=a45e8a56e389e41c891eaa204b16dd89e74e2e69
+
 diff --git a/spice-common/common/ssl_verify.c b/spice-common/common/ssl_verify.c
 index a9ed650..821faa9 100644
 --- a/spice-common/common/ssl_verify.c
 +++ b/spice-common/common/ssl_verify.c
-@@ -33,7 +33,7 @@
+@@ -33,7 +33,8 @@
  #include <string.h>
  #include <gio/gio.h>
  
--#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined (LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || \
++    (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
  static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
  {
      return M_ASN1_STRING_data(asn1);
@@ -18,12 +23,13 @@ diff --git a/src/bio-gio.c b/src/bio-gio.c
 index 9358fae..30aa73b 100644
 --- a/src/bio-gio.c
 +++ b/src/bio-gio.c
-@@ -23,7 +23,7 @@
+@@ -23,7 +23,8 @@
  #include "spice-util.h"
  #include "bio-gio.h"
  
--#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || \
++    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
  static BIO_METHOD one_static_bio;
  
  static int BIO_meth_set_read(BIO_METHOD *biom,
@@ -31,12 +37,13 @@ diff --git a/src/spice-channel.c b/src/spice-channel.c
 index 4c3db9d..9df0203 100644
 --- a/src/spice-channel.c
 +++ b/src/spice-channel.c
-@@ -55,7 +55,7 @@ static void spice_channel_reset_capabilities(SpiceChannel *channel);
+@@ -55,7 +55,8 @@ static void spice_channel_reset_capabilities(SpiceChannel *channel);
  static void spice_channel_send_migration_handshake(SpiceChannel *channel);
  static gboolean channel_connect(SpiceChannel *channel, gboolean tls);
  
--#if OPENSSL_VERSION_NUMBER < 0x10100000
-+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || \
++    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
  static RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
  {
      if (pkey->type != EVP_PKEY_RSA) {
diff --git a/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild
new file mode 100644
index 000000000000..c72b4911bbd2
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools eutils xdg-utils vala readme.gentoo-r1
+
+DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
+HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dbus gstaudio gstvideo +gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
+
+REQUIRED_USE="?? ( pulseaudio gstaudio )"
+
+# TODO:
+# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
+# * use external pnp.ids as soon as that means not pulling in gnome-desktop
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pulseaudio? ( media-sound/pulseaudio[glib] )
+	gstvideo? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		)
+	gstaudio? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		)
+	>=x11-libs/pixman-0.17.7
+	media-libs/opus
+	gtk3? ( x11-libs/gtk+:3[introspection?] )
+	>=dev-libs/glib-2.36:2
+	>=x11-libs/cairo-1.2
+	virtual/jpeg:0=
+	sys-libs/zlib
+	introspection? ( dev-libs/gobject-introspection )
+	lz4? ( app-arch/lz4 )
+	sasl? ( dev-libs/cyrus-sasl )
+	smartcard? ( app-emulation/qemu[smartcard] )
+	usbredir? (
+		sys-apps/hwids
+		>=sys-apps/usbredir-0.4.2
+		virtual/libusb:1
+		virtual/libgudev:=
+		policykit? (
+			sys-apps/acl
+			>=sys-auth/polkit-0.110-r1
+			!~sys-auth/polkit-0.111 )
+		)
+	webdav? (
+		net-libs/phodav:2.0
+		>=dev-libs/glib-2.43.90:2
+		>=net-libs/libsoup-2.49.91 )
+"
+DEPEND="${RDEPEND}
+	>=app-emulation/spice-protocol-0.12.14
+	dev-perl/Text-CSV
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.34-openssl11.patch
+	"${FILESDIR}"/${P}-libressl.patch
+)
+
+src_prepare() {
+	# bug 558558
+	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
+	echo GIT_CEILING_DIRECTORIES=${GIT_CEILING_DIRECTORIES}
+
+	default
+
+	eautoreconf
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	# Clean up environment, bug #586642
+	xdg_environment_reset
+
+	local myconf
+
+	if use vala ; then
+		# force vala regen for MinGW, etc
+		rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
+	fi
+
+	myconf="
+		$(use_enable static-libs static)
+		$(use_enable introspection)
+		$(use_with sasl)
+		$(use_enable smartcard)
+		$(use_enable usbredir)
+		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids)
+		$(use_with usbredir usb-acl-helper-dir /usr/libexec)
+		$(use_with gtk3 gtk 3.0)
+		$(use_enable policykit polkit)
+		$(use_enable pulseaudio pulse)
+		$(use_enable gstaudio)
+		$(use_enable gstvideo)
+		$(use_enable mjpeg builtin-mjpeg)
+		$(use_enable vala)
+		$(use_enable webdav)
+		$(use_enable dbus)
+		--disable-celt051
+		--disable-gtk-doc
+		--disable-maintainer-mode
+		--disable-werror
+		--enable-pie"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	default
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+
+	# Remove .la files if they're not needed
+	use static-libs || prune_libtool_files
+
+	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
+	readme.gentoo_create_doc
+}
diff --git a/net-misc/spread/Manifest b/net-misc/spread/Manifest
index 28cb9031e900..1f88ba0e06fb 100644
--- a/net-misc/spread/Manifest
+++ b/net-misc/spread/Manifest
@@ -1,10 +1,6 @@
 AUX spread.init.d 519 BLAKE2B cc0795f77e5b94ebecdd178beb487555a039b8679a8cdd0edbcc54c1b0faa6bd52f481fc11e58ee98f0a6b8c6432d8fe79c1a2791093a6a8430ec49a3706fe58 SHA512 20852b8fe9b14a1b3cde97683042060382f7a66c28e2072ede63bca9752cd0c4307e5aad689b3274018cf83b0918d0418a99b162af67a332ecc0d90d0deb475a
-DIST spread-src-4.1.0.tar.gz 641060 BLAKE2B a1f8f0c943385cd23301faf9f00553a922919fa50113789ce1c8a028d83645bc7fb32fd7e6e21f6073bfc32476c7dd28b885435285f9ac8bab0b3ea6e2949779 SHA512 6db3cf9760d483685bd23d32760f52b9af667fcf98341fad198b0831cc41cc839998dee59dee04426bf4db15700656fe90f4f457e2a3c6e449eb51b07fc18a6d
-DIST spread-src-4.3.0.tar.gz 745113 BLAKE2B 06fc28a0535fcf61e4dae8cb45ad0f5b4ba70cf12835966bebb27a635736764fdd33d24e6e7fe1433240fb9f6c6e9338631108a93cf9e21b2c58691f09c4e156 SHA512 7eb87e896a623accfe3f36c44ba55f8258d078ff9cdc141509456af4a069802f087edaeafcd356791337dbfb4d4f67b808a482ea54ac58aef8fb980cdbc6fea6
 DIST spread-src-4.4.1.tar.gz 760038 BLAKE2B 250e6347695f5f6e8047bf527c92baa3cfb6c44ce88ea08ff6ab066b937fab29531743133e73e155a5cc07109b1942efe46fd1d3b74202264a2e8ef0f518a0ad SHA512 19f3fe897e4a4bd68dffc7d28d7b99826bbcbb5c2f44eb18127ed486063594bfd788c03c8c338b9b329302659325fa84a9cbfee3f202a9970afb1a560bb6f496
 DIST spread-src-5.0.1.tar.gz 803058 BLAKE2B b115675cb8ad89bfda7921d7ede0d168bfa833297a13cf5bba866505813fc255d3585b4a02e51409acda73597803ac691b0b6d329b189405004fce5505af7f1c SHA512 f57dbabb6e4d343434fe1c48bb8868cf601e22c599a520521a23c6dfa215b1d835fb2a7dc3b7cf124352060d12566c5f64114544428cc5a95e7899208379b115
-EBUILD spread-4.1.0-r1.ebuild 733 BLAKE2B e3faae9209052b879a673e42cff6d9831c06ceb8fef38a462268d9e61208883bd7e84b89d14ae9453bc34b27cb8adf5856f43aa558ea2916899962ab5929e897 SHA512 feffbcb7c76c5faf979e00a224c4487cc64dc754a27a4b6ea62335eac68e1a6ddcf8ff0acb7bc3e7996fff1f0dcfe8ddc7bc24f359c0f9109f4f31be0f1f556c
-EBUILD spread-4.3.0-r1.ebuild 712 BLAKE2B 5d0a5152a6778cff67be57e6bb75beb428d4b140551b82c9af99b12def13f5404d2dc571d431586cf8843b4198ce038d8f10d0a2fa09cead496fdc3d271f82f9 SHA512 4469a47c5ab38f67812df29aa559461b8cf79d98fa27519ddc179434c626507b38f580477d7b851829dd7e1850cf00dd645b966320cde66902ced1e3efa87c5b
-EBUILD spread-4.4.1.ebuild 703 BLAKE2B a06866661e1bba22c60437c70f2d78939cf868ebf75cb4f7552ac30b062ab449e4ccd4f59d4ab3c803d2ff0fbc2217564807d44d4200924ce10e0a1298cadd28 SHA512 bb618e00444c2d02c096d3c98eb97216307fa626059ed3c5750a775e9aa14bd918f7562d865092234f562b9cdbcb4b4a71bf3a28a64950b94149a7d04964984f
+EBUILD spread-4.4.1.ebuild 701 BLAKE2B ed2d42efea2341e3f86d3ccb6f4200f3d957a3fa385308fce5b6ff73d980427e3163298f39ec42a9e9e19885107aa72d64a12f119fda16aa1247d1dd7527f86a SHA512 597b098fd422b7d99d9a9a044d3aefaa989de71579bb629fe3819f34a700582c37d97a876b5b660723df94fe93effd1c5e6f4c513130d11b8f9e6cee6c1858b8
 EBUILD spread-5.0.1.ebuild 703 BLAKE2B a06866661e1bba22c60437c70f2d78939cf868ebf75cb4f7552ac30b062ab449e4ccd4f59d4ab3c803d2ff0fbc2217564807d44d4200924ce10e0a1298cadd28 SHA512 bb618e00444c2d02c096d3c98eb97216307fa626059ed3c5750a775e9aa14bd918f7562d865092234f562b9cdbcb4b4a71bf3a28a64950b94149a7d04964984f
 MISC metadata.xml 245 BLAKE2B 922e349900957e202d9925c3b56ddbc4e93034b041d2d500a4f85b60a78f34089bae6ab910423c336af01717f3a3c6003ebbcb6f51d0d7e1a07574e70e7cfe86 SHA512 4706a02393a13e76abffdbffc63ca8bcc70dd9d7145241e0469ab0511df26bf7d6be8d31fdabff7916d23ab1dc886e3d9886551d8ad80074488a31d02952ad16
diff --git a/net-misc/spread/spread-4.1.0-r1.ebuild b/net-misc/spread/spread-4.1.0-r1.ebuild
deleted file mode 100644
index 06e268e108bf..000000000000
--- a/net-misc/spread/spread-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit user
-
-MY_PN="spread-src"
-
-DESCRIPTION="Distributed network messaging system"
-HOMEPAGE="http://www.spread.org"
-SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="Spread-1.0 GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	enewuser spread
-	enewgroup spread
-}
-
-src_prepare() {
-	default
-
-	# don't strip binaries
-	sed -i -e 's/0755 -s/0755/g' daemon/Makefile.in examples/Makefile.in
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
-	newinitd "${FILESDIR}"/spread.init.d spread
-	dodir /var/run/spread
-}
diff --git a/net-misc/spread/spread-4.3.0-r1.ebuild b/net-misc/spread/spread-4.3.0-r1.ebuild
deleted file mode 100644
index 06bbce63e1c6..000000000000
--- a/net-misc/spread/spread-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit user
-
-MY_PN="spread-src"
-
-DESCRIPTION="Distributed network messaging system"
-HOMEPAGE="http://www.spread.org"
-SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="Spread-1.0 GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	enewuser spread
-	enewgroup spread
-}
-
-src_prepare() {
-	default
-
-	# don't strip binaries
-	sed -i -e 's/0755 -s/0755/g' daemon/Makefile.in examples/Makefile.in
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
-	newinitd "${FILESDIR}"/spread.init.d spread
-}
diff --git a/net-misc/spread/spread-4.4.1.ebuild b/net-misc/spread/spread-4.4.1.ebuild
index b7526d4dcd16..f7a6437d93e7 100644
--- a/net-misc/spread/spread-4.4.1.ebuild
+++ b/net-misc/spread/spread-4.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="Spread-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index de00727912c1..c0fdb93188c2 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,6 @@
 DIST youtube-dl-2019.02.08.tar.gz 3104780 BLAKE2B e89a9950de84c3d2c5530ca229f2dfb39bb372454a6a1d67c0d1c966f68f2372008556ffda32c042eca6d3c0aee3ace0c1cabdf1d65cb16efc80326b821a3624 SHA512 4fc027ec6d9d7059c34a3c16f1265989ec000c131e6a937f667928531dd2a6d9f56592d367f08ec5e3b1900b3e191aa36bcc997db04b77b95850a43ed1272640
+DIST youtube-dl-2019.02.18.tar.gz 3114830 BLAKE2B f948fc68d9bc2b7e400d22b4d2980b7f56bf734476a54b3e30b6ee33d5e4a0950233dfd74b0db26108a5759e3589acde4fe104d41ea856c88f68e165f330132b SHA512 86a321003b9e0bdc852294c8ac75d601141177f3469330c6ab01fa821758ee848dfcdf0e9dd514ca2da7b7e3c2a7f2dcddab9929f7fa8be2ab3c86d6eccbd5e3
 EBUILD youtube-dl-2019.02.08.ebuild 2021 BLAKE2B a7fe20e586f2d3243069237315e89ad05ff23c1684854a4029111c30622f23a8ba0c73325bb3a98f6fdc76203afd3ae4246ae62e0cfdc02c281188d3b1e25e40 SHA512 c589d6d581b2a91443ba9def42b278ed427bebc45a02b25a053dbb556c23dc299b5a8873540679394863a1ca2a3da929d27b779e467c0269707600fea55a7e7a
+EBUILD youtube-dl-2019.02.18.ebuild 2027 BLAKE2B 028f1bd62a12ad5b2b20eeaaf83e63c3dc765c0fd220ec2a187844993159f449b631a7e5c5d0b80977545e7ed47c9c452b3492c5001ce78c0452a69207120b8b SHA512 ce09e4ee4e17b44a51581d252ae5bda890d22168c612785033abd9297ea8be0409845b25a175775ddc64d9dbee0dd9324a2494df6316b4a41837fd4e8f483b23
 EBUILD youtube-dl-99999999.ebuild 1916 BLAKE2B 035ac8f58fec97b741be4d080401d6dea03531c95ef61782dcad898f51b2fe845d97ede3ddb4ac3ae52c327fb08d5729b41a1c057e8fb6c81e81afc3d87c4651 SHA512 ae1467fcc2b1bde3b33354a61e29b311a6d8876cbd0502186f55f0826c0182ea21afb229b34b39b37c9e625bb142d86348baa31dc0defc01e19beb427de40321
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.02.18.ebuild b/net-misc/youtube-dl/youtube-dl-2019.02.18.ebuild
new file mode 100644
index 000000000000..2cb0551f3e35
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2019.02.18.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+LICENSE="public-domain"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+RESTRICT="test"
+SLOT="0"
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+"
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+	elog "videos can be retrieved in a higher quality format without sound."
+	elog "${PN} will detect whether avconv/ffmpeg is present and"
+	elog "automatically pick the best option."
+	elog
+	elog "Videos or video formats streamed via RTMP protocol can only be"
+	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+	elog "Downloading MMS and RTSP videos requires either mplayer"
+	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+	elog
+	elog "If you want ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}