gentoo resync : 18.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-18 10:15:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-18 10:15:03 +0000
commit: b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch)
tree: 16fe44748708acacd909d4e2e160a09a7f6d936a /net-misc
parent: 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff)
77 files changed, 1093 insertions, 523 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 13726bf982c3..d132e12d99e7 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 2e7a32c4ce7e..05effe99c163 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,11 +1,16 @@
 AUX apt-cacher-ng-3.2-flags.patch 4172 BLAKE2B 9068ada51f5c12a662f521eee7a834c6eb07299a41671a6d8b47474bdbe15f1c25f531a9f2d058af97ee77d6ddb05fdfa64f018f3bb2ceaad51ac6b7a5f66903 SHA512 b57dc514d976b6f808c332c36c5014a407ec1e7184fb8653404dcf745872b03611ccc9f33bc42846429dc389b4b91831f308874deca4682e6dc636ea4c707713
+AUX apt-cacher-ng-3.3-flags.patch 2661 BLAKE2B 7a1d477819aae614b7598cec314de9627d9f56f974d4d5970be5b624b7cb6d6896f591a2d3eeea0e5af4f8cf264340cceb5a51961fae96343348180f0f66266e SHA512 e03aecb4332d34c1ed9dfe92e9c2fdd1a7f2e7a353039f9b86d14f7717fad2519c32f75a53614653323cf28f65705139244b5851fa6645f7461ecf3fce40394c
 AUX confd 90 BLAKE2B 5a0ba4fe7d07c4d74559f194cc497b0de5ea86db746fa8425267b9e1fe0d88afc3bae69129a60f4553729d24dfd09f910c037742181915d03f4c18b764f235cd SHA512 14412f717ad334e6ce5cf65b9b0968fc3ab27e93f3d3ce52d39e0b646694e8e7d7905ede25feeabad6ef3301b5644677f30e27b867ff32f665ab6c4e2cd0a662
+AUX confd-r1 100 BLAKE2B e5f0e9ca77d9d3b30a0a59a755e286a914d1ed81a2afd47ed0fd2563eca81ec9db8e50aa9d34c9e31b1014ecf2db7e85cb055d7a67af494bf88c2ec9b9c13465 SHA512 c58ecc104ab7fa90cbccc1d9f9725c9ddad84bb7225ea3eea56d7874b060ce453e4576ca055e014b9621b9514d95a189915fead2057557fb785d9520d7121831
 AUX cron.daily 459 BLAKE2B 8798bcc7f57cfe0798fc6594dccf89165df88361510ceb962ff8cd70bd10c15f2cc8acff11ad0e2051d6a6bfe65e53e438d5fee9a60ac293334561f603adbedf SHA512 3e42afb0be6235594e2ccf68d0fd4c7be4954d6583562e1692e98ab55e8fdc74026690b01417e4b6fc9fe288df40e66e5e63e5a1fd98d5484c6eb366aa1b4d4a
-AUX initd 725 BLAKE2B 3984d5c7f4b34fdb16420d29935edf2a5975e5f7aca2559506ba839d21d781f0a5a5f914bbd35efcc73dfa70d0610ed57b51b3ec9b66de0d77e864c59bf5fa04 SHA512 de8dbff432540d3b725556bb9189e14cf06afc876ec636a9ae2a00ee6158f791a9306c2630cfbf11de80b81ffadb45f39bae235c5d9ee76b5245c0599a387b0a
 AUX initd-r1 906 BLAKE2B 828ac672348454842e3daeb62e39436dce86f3ff9ba2319755f2bc64a20d3dc9e73689c27f79e7f521b6d6553c5d6922eb1b8d72a52a97c7f92b2847b6322b9d SHA512 c4aa04ea30734f00c617684ea014c632bf0d43580ae7b7c6e9ae58e2c947d15177f93e7b92fd9f7b79d1898d0c6a386de1da7fa038dace6381cd72907845e57c
+AUX initd-r2 1003 BLAKE2B f8e87da524cb10358420de9bc7e76d5b954cdfa70ba54637ca0b4653c1f718eebe77bbc3220003691d7163374f3af0aa4ca8568b76218d7214e2e498c2998f79 SHA512 f57c58074bbe1c35b748f94bf2a8a4aa10f8264e662b61c1178582f16f5e53c38941e9b2c2c0a46718ab8615ff426a887f64fe170da42b7aaaa9bb3c23a0fc00
 AUX logrotate 377 BLAKE2B deaa8badb74a660419df29efc02d0f00d3100c4357f43e02c7c9eba305902a204d3b61073a3e483b0f7d614ddf4053bdc731737c5199b792380a922e25e2a49f SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885
 DIST apt-cacher-ng_3.2-2.debian.tar.xz 48740 BLAKE2B ab2f6349aa66f39b778f346827767514761eeb8977d69a55940d7dd4c738b54ba20a9725387f769edf2cce454588746bc10361d4a174ed380a431a6ecf6b096d SHA512 e5299432b91cdf6cb51934fcc440e62d24c1b4849ad3a0c3a5e47a256c874ebb85c7ba56b97da27c2e03e0621b4ae42b69592440d521e718f4f8725a6ff379d4
 DIST apt-cacher-ng_3.2.orig.tar.xz 319036 BLAKE2B 576fc7a409556d34ee702edd57527c9c35eb033d0e8c8ea4f7b8a8a2dae86f75cd1ca3a7fb0e02845e70d6f8715692b638ff9d574ce1664b67fec9247b60fbc0 SHA512 7dfee4a8f38e7c5251c761a5faae063926c5001fe0b97136d938cdbff907e97fb0a20b89dcf685645a518e92be04fe5660d840e738960b4465408f04fe532cae
-EBUILD apt-cacher-ng-3.2.ebuild 2495 BLAKE2B a70da3cd229c554d91ee3ea67c9feaa2eb7259902203efe366e84a9af12fc17ae0eed4fd09be05e90d6a5252cdf36fe47068821db64e81af0053fdfd767aacc1 SHA512 49c0eb48c086f9631750f3875be888751dbefd7b268538bc3dfa3e61eb6517564202ffd1a71eb95e3a428b1212942716b2cd15f42fa8319b3cee3042e515fcb6
+DIST apt-cacher-ng_3.3-1.debian.tar.xz 48472 BLAKE2B 9d7f531d84f470ada8236a5603d06e45d9b7acb7bdeb8bd639c250724013a0552819cabe67f1cee0a1f337d7725429932bdf179afae307242e4d45081854614e SHA512 44a241791b92d6b9231caff8296ed1d9536ffcdc18263451d662da01f1b257b8ea4741e5cfb09c5cd90986c46fe1e91b3110379442d9ed20434e696c6cf645aa
+DIST apt-cacher-ng_3.3.orig.tar.xz 320884 BLAKE2B c4bda8de90f76e7cb8335fdb758571db030c1298881afceb865f84e506aeb82e4db69c5c091debfdcf6c85bc8d4e703b75725ae6b06f2e412ba4b4362d568a05 SHA512 01a09bc13d2a9d24ee3012a21ae954362715bc0b69ef021a3446ad7d78157209aaaf941fbb02b0e5323bfb0337a1e3d6450c07b680d42f7bf93855d7ac65c60f
 EBUILD apt-cacher-ng-3.2_p2-r2.ebuild 2715 BLAKE2B cf204efafbd483b174bd2f0627dd81c0d04bf9c232a4c7e694c43e0ad5dca58eb69180bb27e5f80f1981643d0696689c724a8417e56c4a1c7be032ac476760cf SHA512 bc9486e131b1d6fd294d50a62d9e20ac3e25d4fd24de9f28e334f6504140bd0a7217b1af0832ad70df5a08cbadced4229a51a7bb6df7e5a5b861bd6b3f24d98c
+EBUILD apt-cacher-ng-3.3_p1-r1.ebuild 2807 BLAKE2B 7d8fdc71ae134fe136b05ea1482640727960e134dff98cd200328c9e87ce378a88f6dda930da58123db17c157255c0f8e4e5282424beb3d41a42ba11f60e5bd0 SHA512 6c9428d87835712ee4676f24653adaec346a441e18de1f4bc4cc70e3b803546d84d5956994216fa474d2973a62c1e841b7ffd07ab9ba15d55d817e413355aa04
+EBUILD apt-cacher-ng-3.3_p1.ebuild 2713 BLAKE2B 51d2c1171543ff2aab95cbe97e5b3cb8d92e66ca7e8764227e71bce6dd8c1a0048e791d2fabe833bcd81104852b360f33ba06acc0dd1339476635e5445cc1026 SHA512 56ebef8ba58686261ebd7e4472e0c63f7494fe844c87d9eb531b4ad3e8ef02816cb5f31b34933649e1c542b2f60641d303550d75e84e5cd08d49af2e01f7ad0b
 MISC metadata.xml 493 BLAKE2B 6c2fb1f7abaee7df8db9ccdd7b71774230ddf2dc860d59f65a1cb77560532eb363e550bef6df18a63a78858a0a2469b0eb011d8bf0d41bf36a4c1b11223f0b2d SHA512 58f1345b841c7d5105432d0dab345033b9cefcfd4dedfe05f52d25135716be336a2f4a5fee3288236239bae9bbb1381deff0917fff8c80d81caaf64e8706b5a6
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1-r1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1-r1.ebuild
new file mode 100644
index 000000000000..682a66fd9f07
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils 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
+	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
+"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fuse systemd tcpd"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	systemd? (
+		sys-apps/systemd
+	)
+"
+BDEPEND="
+	${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 )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3-flags.patch
+)
+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
+
+	sed -i -e '/LogDir/s|/var/tmp|/var/log/'"${PN}"'|g' "${BUILD_DIR}"/conf/acng.conf || die
+}
+
+src_install() {
+	pushd "${BUILD_DIR}" || die
+	dosbin ${PN} acngtool
+	dolib.so libsupacng.so
+	if use fuse; then
+		dobin acngfs
+	fi
+	popd || die
+
+	newinitd "${FILESDIR}"/initd-r2 ${PN}
+	newconfd "${FILESDIR}"/confd-r1 ${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
+
+		docinto html
+		dodoc doc/html/*
+
+		find conf -name '*.gz' -exec gzip -d {} \; || die
+		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 "${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/apt-cacher-ng/apt-cacher-ng-3.2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1.ebuild
index d04cec3cc611..a2ab7261f60d 100644
--- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.2.ebuild
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit cmake-utils toolchain-funcs user
 
 DESCRIPTION="Yet another caching HTTP proxy for Debian/Ubuntu software packages"
@@ -11,7 +11,10 @@ HOMEPAGE="
 "
 LICENSE="BSD-4 ZLIB public-domain"
 SLOT="0"
-SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
+SRC_URI="
+	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_*}.orig.tar.xz
+	mirror://debian/pool/main/a/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
+"
 
 KEYWORDS="~amd64 ~x86"
 IUSE="doc fuse systemd tcpd"
@@ -25,7 +28,7 @@ COMMON_DEPEND="
 		sys-apps/systemd
 	)
 "
-DEPEND="
+BDEPEND="
 	${COMMON_DEPEND}
 	dev-util/cmake
 	>sys-devel/gcc-4.8
@@ -37,8 +40,10 @@ RDEPEND="
 	fuse? ( sys-fs/fuse )
 	tcpd? ( sys-apps/tcp-wrappers )
 "
-
-S=${WORKDIR}/${P/_}
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.3-flags.patch
+)
+S=${WORKDIR}/${P/_*}
 
 pkg_pretend() {
 	if [[ $(gcc-major-version) -lt 4 ]]; then
@@ -55,28 +60,31 @@ pkg_setup() {
 }
 
 src_configure(){
-	mycmakeargs=( "-DCMAKE_INSTALL_PREFIX=/usr" )
+	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" )
+		mycmakeargs+=( "-DHAVE_LIBWRAP=yes" )
 	else
-		mycmakeargs=( "-DHAVE_LIBWRAP=no" )
+		mycmakeargs+=( "-DHAVE_LIBWRAP=no" )
 	fi
 
 	cmake-utils_src_configure
 }
 
 src_install() {
-	pushd ${CMAKE_BUILD_DIR}
-	dosbin ${PN}
+	pushd "${BUILD_DIR}" || die
+	dosbin ${PN} acngtool
+	dolib.so libsupacng.so
 	if use fuse; then
 		dobin acngfs
 	fi
-	popd
+	popd || die
 
 	newinitd "${FILESDIR}"/initd-r1 ${PN}
 	newconfd "${FILESDIR}"/confd ${PN}
@@ -93,8 +101,11 @@ src_install() {
 	dodoc doc/README TODO VERSION INSTALL ChangeLog
 	if use doc; then
 		dodoc doc/*.pdf
+
 		docinto html
 		dodoc doc/html/*
+
+		find conf -name '*.gz' -exec gzip -d {} \; || die
 		docinto examples/conf
 		dodoc conf/*
 	fi
@@ -106,7 +117,7 @@ src_install() {
 
 	# default configuration
 	insinto /etc/${PN}
-	newins "${CMAKE_BUILD_DIR}"/conf/acng.conf ${PN}.conf
+	newins "${BUILD_DIR}"/conf/acng.conf ${PN}.conf
 	doins $( echo conf/* | sed 's|conf/acng.conf.in||g' )
 
 	keepdir /var/log/${PN}
diff --git a/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3-flags.patch b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3-flags.patch
new file mode 100644
index 000000000000..a2f43a4d3789
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/apt-cacher-ng-3.3-flags.patch
@@ -0,0 +1,75 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -14,7 +14,7 @@
+ 
+ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
+ set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
+-#set(CMAKE_SKIP_BUILD_RPATH on) # no -rdynamic needed ever
++set(CMAKE_SKIP_BUILD_RPATH on) # no -rdynamic needed ever
+ 
+ INCLUDE(CheckIncludeFiles) 
+ INCLUDE(CheckCXXSourceCompiles)
+@@ -27,7 +27,7 @@
+ INCLUDE(GNUInstallDirs)
+ 
+ IF(NOT DEFINED(CMAKE_INSTALL_PREFIX))
+-set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE STRING "Target file space")
++#_cmake_modify_IGNORE set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE STRING "Target file space")
+ ENDIF()
+ IF(NOT DEFINED(LIBDIR))
+ 	set(LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/${PACKAGE}" CACHE STRING "Location of ${PACKAGE} extra files")
+@@ -94,23 +94,6 @@
+         _append(ACNG_CXXFLAGS -fvisibility-inlines-hidden)
+ endif()
+ 
+-foreach(linkarg -Wl,--as-needed -Wl,-O1 -Wl,--discard-all -Wl,--no-undefined -Wl,--build-id=sha1 -Wl,-fuse-ld=gold)
+-	STRING(REGEX REPLACE "=|-|," "" optname "${linkarg}")
+-	set(CMAKE_REQUIRED_FLAGS "${linkarg}")
+-	CHECK_CXX_COMPILER_FLAG("" "LD_${optname}")
+-	if(LD_${optname})
+-          _append(CMAKE_EXE_LINKER_FLAGS ${linkarg})
+-	endif()
+-	set(CMAKE_REQUIRED_FLAGS "")
+-endforeach(linkarg)
+-
+-set(CMAKE_REQUIRED_FLAGS "-Wl,-fuse-ld=gold -Wl,--threads")
+-CHECK_CXX_COMPILER_FLAG("" LD_MULTITHREADED)
+-if(LD_MULTITHREADED)
+-	_append(CMAKE_EXE_LINKER_FLAGS "-Wl,-fuse-ld=gold -Wl,--threads")
+-endif()
+-set(CMAKE_REQUIRED_FLAGS "")
+-
+ option(USE_SSL "Use OpenSSL library for TLS and other crypto functionality" on)
+ 
+ IF(CMAKE_SYSTEM MATCHES "Darwin")
+@@ -132,15 +115,6 @@
+ if(CMAKE_BUILD_TYPE MATCHES Debug)
+    set(USE_LTO_DEFAULT off)
+    _append(ACNG_COMPFLAGS -DDEBUG)
+-else()
+-   set(CMAKE_REQUIRED_FLAGS "-Wl,--gc-sections")
+-   CHECK_CXX_COMPILER_FLAG("-Os -fdata-sections -ffunction-sections -Wl,--gc-sections" GC_SECTIONS)
+-   if(GC_SECTIONS)
+-           _append(ACNG_COMPFLAGS -fdata-sections -ffunction-sections)
+-           _append(CMAKE_EXE_LINKER_FLAGS -Wl,--gc-sections)
+-           _append(CMAKE_SHARED_LINKER_FLAGS -Wl,--gc-sections)
+-   endif()
+-   set(CMAKE_REQUIRED_FLAGS "")
+ endif()
+ 
+ option(USE_LTO "Enable Link Time Optimization (requires modern compilers)" ${USE_LTO_DEFAULT})
+@@ -385,3 +359,14 @@
+ LIBDIR: ${LIBDIR}
+ AVAHIDIR: ${AVAHIDIR}
+ ")
++
++MESSAGE(STATUS "<<< Gentoo configuration >>>
++Build type      ${CMAKE_BUILD_TYPE}
++Install path    ${CMAKE_INSTALL_PREFIX}
++Compiler flags:
++C               ${CMAKE_C_FLAGS}
++C++             ${CMAKE_CXX_FLAGS}
++Linker flags:
++Executable      ${CMAKE_EXE_LINKER_FLAGS}
++Module          ${CMAKE_MODULE_LINKER_FLAGS}
++Shared          ${CMAKE_SHARED_LINKER_FLAGS}\n")
diff --git a/net-misc/apt-cacher-ng/files/confd-r1 b/net-misc/apt-cacher-ng/files/confd-r1
new file mode 100644
index 000000000000..84b659bc488b
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/confd-r1
@@ -0,0 +1,3 @@
+# Additional options that are passed to the Daemon.
+DAEMON_OPTS=" -c /etc/apt-cacher-ng "
+LOGDIR=""
diff --git a/net-misc/apt-cacher-ng/files/initd b/net-misc/apt-cacher-ng/files/initd
deleted file mode 100644
index d054b4de76bd..000000000000
--- a/net-misc/apt-cacher-ng/files/initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-NAME="apt-cacher-ng"
-DAEMON="/usr/sbin/$NAME"
-RUNDIR="/var/run/$NAME"
-PIDFILE="$RUNDIR/$NAME.pid"
-SOCKETFILE="$RUNDIR/$NAME.socket"
-DAEMON_OPTS="$DAEMON_OPTS pidfile=$PIDFILE SocketPath=$SOCKETFILE foreground=0"
-
-depend() {
-	use net
-}
-
-start() {
-	ebegin "Starting $NAME"
-	checkpath -d -m 0755 -o ${NAME}:${NAME} ${RUNDIR}
-	start-stop-daemon --start --exec $DAEMON \
-	    --user $NAME --group $NAME \
-	    --pidfile $PIDFILE \
-	    -- $DAEMON_OPTS
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping $NAME"
-	start-stop-daemon --stop --retry 15 --exec $DAEMON \
-	    --pidfile $PIDFILE
-	rm -f $PIDFILE
-	eend $?
-}
diff --git a/net-misc/apt-cacher-ng/files/initd-r2 b/net-misc/apt-cacher-ng/files/initd-r2
new file mode 100644
index 000000000000..ae9ab7258cc4
--- /dev/null
+++ b/net-misc/apt-cacher-ng/files/initd-r2
@@ -0,0 +1,34 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CACHEDIR="var/cache/${RC_SVCNAME}"
+DAEMON="/usr/sbin/${RC_SVCNAME}"
+RUNDIR="/var/run/${RC_SVCNAME}"
+PIDFILE="${RUNDIR}/${RC_SVCNAME}.pid"
+SOCKETFILE="${RUNDIR}/${RC_SVCNAME}.socket"
+DAEMON_OPTS="${DAEMON_OPTS} pidfile=${PIDFILE} SocketPath=${SOCKETFILE} foreground=0"
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting ${RC_SVCNAME}"
+	checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "${RUNDIR}"
+	checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "${CACHEDIR}"
+	[ -z "${LOGDIR}" ] && checkpath -d -m 0755 -o ${RC_SVCNAME}:${RC_SVCNAME} "/var/log/${RC_SVCNAME}"
+	start-stop-daemon --start --exec ${DAEMON} \
+	    --user ${RC_SVCNAME} --group ${RC_SVCNAME} \
+	    --pidfile ${PIDFILE} \
+	    -- ${DAEMON_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${RC_SVCNAME}"
+	start-stop-daemon --stop --retry 15 --exec ${DAEMON} \
+	    --pidfile ${PIDFILE}
+	rm -f ${PIDFILE}
+	eend $?
+}
diff --git a/net-misc/autossh/Manifest b/net-misc/autossh/Manifest
index 74b5dbfb66a4..fa604fce8be8 100644
--- a/net-misc/autossh/Manifest
+++ b/net-misc/autossh/Manifest
@@ -1,3 +1,3 @@
 DIST autossh-1.4g.tgz 67599 BLAKE2B 179af97ee6f3b9c1c4fcbad1593118aa5d69dbd2b6215efd4a16ab7641f6f0194faaca3c3101b3a918d652988a06b5fa8ce6e52f85f81edd95b3d71d49aad076 SHA512 499b560d978736f4e764d5d828282fdaba1cbf94811ae6be0be5434d9c1cdc6ca5513d728b6372aa243843cb1b91e61cfc5fdeb77ddb0b6a7ce027218ba67466
 EBUILD autossh-1.4g.ebuild 502 BLAKE2B a2d63bb81429bf158edc3c92ec6f5fc74705d3441f14b553cbe1562211a4f40c9e5399e156b3d006218dc31d73298ec5388e7653904e9f37a9164eb95dfe0d6b SHA512 c996e46e2dbb306103c3fb35650247ff8bc2fd2d0b6b6d6b3b15a82a67e20b4366b1b2921e092531639821ff33d57305f9e24a069b853ac69757c83301a9cabb
-MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/autossh/metadata.xml b/net-misc/autossh/metadata.xml
index 78e64a5cf1ad..6f49eba8f496 100644
--- a/net-misc/autossh/metadata.xml
+++ b/net-misc/autossh/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>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/autoupnp/Manifest b/net-misc/autoupnp/Manifest
index 894459c0f6d2..fabc1083dd4f 100644
--- a/net-misc/autoupnp/Manifest
+++ b/net-misc/autoupnp/Manifest
@@ -1,4 +1,4 @@
 DIST autoupnp-0.4.7.tar.bz2 264916 BLAKE2B 3542c577a32f5ba3a8ea60c6f2ebb3d5cea76fa440d281e6895c246252d3ba70720aaafa4d843f06a23f1b022942cddb2a0b37b41eff91919db55fbbd87f28b5 SHA512 2c6bb3421fecbffea2a63ea1e930b7c789459d4626a0f281abe0e9bb62e5efc772475d4bf0c9f13fe2e9e13417940c6eb17408e6aae28bc24a4fc2e16d4dc8de
-EBUILD autoupnp-0.4.7.ebuild 610 BLAKE2B 0ef201d9447206f72f7d081245f7ce756ec59e2c1e13e8ec88bf555709f5406a97f105ee067e60cd5627fe69d04c686e78499d30d4362fc15da2bedc7438e5f1 SHA512 a433cd85eb23299a5ae377ddeccdc41bcaa2875b81fd9e09092647e5eee15aded956a24d6d9120c829491ec8dde370ac64b9917f98cbf4f7e8159e32a099d033
-EBUILD autoupnp-9999.ebuild 776 BLAKE2B c772f18299b242de3a22ea8d7babe829d4584cc8474d2cdc0a68301ca80b490bc245a7db07647010635bb0f01647084df3edcc3e793bddd33163bea4f88bbd4e SHA512 714a716c73c950068a91659593d82493eec249da7d9b8f38074eeaa377f5f0920a62418c426a7d5dc511ce888e6d06672a8825000d68fda1e1f5540fd30c5008
-MISC metadata.xml 511 BLAKE2B 75ced551d168b8262824bb7393f8289c57c57dbd6feedc922b44e083e5bb13e5acdcaee6c6b24ff8d40e919d3bbb2a2b59004cf2879e4f2e3082a95a1585e291 SHA512 91af116a031d29419468e6d690a12aa9dda0095cab46e529634e2eb3cd486e069a8ff0ab59637cf0ced97aedac86afe0ae4469226ea49f1b637d65931e090b22
+EBUILD autoupnp-0.4.7.ebuild 613 BLAKE2B c27ef2e0ceca01d708ca3613289f57f00adcabc20a34105c1a157db81dc982594d00142ea55dd8efc108ce7b8b3bc45950c923bfe5dcdbf990ac213bb9b61ca1 SHA512 a10502a183a05be67b128714c3a0e0acb5773c7b9e776093857575b5197812f1569a31ccc6ff45142798b4a4f66435c9d5a086b7e49e25dd9de6f54042f54e91
+EBUILD autoupnp-9999.ebuild 638 BLAKE2B c0d9468b76db496100c6f2897c716361af2604cd11b70c12d5d4676f97f478bbdee86f4b9d7347323a1585b2c27f84988fe2d489804df47b14db4a421565cf7a SHA512 e306e4285009481c31399d5217aa9549cfafdebd9952fa73802b399b560bc3688b02575d904f759e3c377c8abcd866f46b71dde0a6bb294b74526b04ddd3611f
+MISC metadata.xml 505 BLAKE2B 43bae0e9fbf0a0af23e1d1828d94fba4be25a15325bc8bcec8d874c009e8409d684a237876f91d1f1a95ac4c66c4d6cd9d49620e4ba49fa81d688bcf81c8f143 SHA512 22f4afac747b3668d77c9f8759d792d6ab6b22ff62f7e6e49065c6bd98da74891cdda397e90a76af08f94c80b693cc67f363a2cb862e07e260cb6e1d4b15df22
diff --git a/net-misc/autoupnp/autoupnp-0.4.7.ebuild b/net-misc/autoupnp/autoupnp-0.4.7.ebuild
index 88e67f8857d4..c418eecc98a7 100644
--- a/net-misc/autoupnp/autoupnp-0.4.7.ebuild
+++ b/net-misc/autoupnp/autoupnp-0.4.7.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Automatic open port forwarder using UPnP"
-HOMEPAGE="https://bitbucket.org/mgorny/autoupnp/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/autoupnp/"
+SRC_URI="https://github.com/mgorny/autoupnp/releases/download/v${PV}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
@@ -28,5 +26,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-misc/autoupnp/autoupnp-9999.ebuild b/net-misc/autoupnp/autoupnp-9999.ebuild
index c7de9275db3e..f7ea428391ea 100644
--- a/net-misc/autoupnp/autoupnp-9999.ebuild
+++ b/net-misc/autoupnp/autoupnp-9999.ebuild
@@ -1,35 +1,27 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-#if LIVE
-EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
+EAPI=7
 
 inherit autotools git-r3
-#endif
-
-inherit eutils
 
 DESCRIPTION="Automatic open port forwarder using UPnP"
-HOMEPAGE="https://bitbucket.org/mgorny/autoupnp/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/autoupnp/"
+EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="libnotify"
 
 RDEPEND="net-libs/miniupnpc:0=
 	libnotify? ( x11-libs/libtinynotify:0= )"
 DEPEND="${RDEPEND}"
 
-#if LIVE
-KEYWORDS=
-SRC_URI=
-
-src_prepare() { eautoreconf; }
-#endif
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	local myconf=(
@@ -41,5 +33,5 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/net-misc/autoupnp/metadata.xml b/net-misc/autoupnp/metadata.xml
index 527c08acfeae..cbee44522aef 100644
--- a/net-misc/autoupnp/metadata.xml
+++ b/net-misc/autoupnp/metadata.xml
@@ -10,7 +10,7 @@
 			<email>mgorny@gentoo.org</email>
 			<name>Michał Górny</name>
 		</maintainer>
-		<bugs-to>https://bitbucket.org/mgorny/autoupnp/issues/</bugs-to>
-		<remote-id type="bitbucket">mgorny/autoupnp</remote-id>
+		<bugs-to>https://github.com/mgorny/autoupnp/issues/</bugs-to>
+		<remote-id type="github">mgorny/autoupnp</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index c8371cb32938..5ca9424611fb 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -14,6 +14,6 @@ DIST chrony-3.5.tar.gz 458226 BLAKE2B 611f21e36c6e745208e00eba988519fcd912c6c0c3
 EBUILD chrony-3.1.ebuild 2825 BLAKE2B c3af56079c3130002499dda974bb5117a2cce988f8a1aaca7cb6f9f11a0aa011fefe3f600262939b72b4f41d7e096a94dd1305572a04aabe96519cff36ec0165 SHA512 f97265a0a7006c1f8fc07f4a25f27ff0f78b123fdeabe2329a0e48ba33409e16a8373d6c114c2d25f463f560b47e8ef5510c140e5e045a02ccfd4eb669f463b3
 EBUILD chrony-3.3.ebuild 2909 BLAKE2B 2d314e96402839948b95e9f8650e8523676f201deab27230ac9d006a0a73c878239c23c7118d0698bec9d7c2796b3a08be9cfa695c21b84ee333c23161d963ad SHA512 0ef1db3668f626dc07057728f7d33d9a200f1e4fcb93e6fb3b69e874b8d5d0e3bbb2d57c21513d7825151b08b0a86a36ef1838c44f27e536aa7abd5b9e973cdf
 EBUILD chrony-3.4.ebuild 2912 BLAKE2B 0b8948414c95862295efec709f2f4467974c2955fc03153d5d2bfa15a74fcee2714f012425b4b1002b90cafe9008fa7ce02f0f40582b7b4b0917d82363cc9c77 SHA512 13c6caf8f3d813e1caa515d1ab00f1e5c1539198ee51913f649ee2ef2562bffee15b0f78c78ff5419728740a867d02a90eb889f2711a32db85f7756c3bdda3b3
-EBUILD chrony-3.5-r2.ebuild 3038 BLAKE2B 7eb36a4d537e97a691c4bb677bd117b8dfc82a62e22f4653636a5c35b0457c1198ecdd4fa050d32bd54804883c17ba9ac70de35977bde2cde1f1d7f28ee1014e SHA512 c679616ff7a3326c60d3bbe9ac59f6d209c190fd73edde6efbfdbe1b819681e57cd81d2a49305a7179b2fe05dba2b11883f3cb33d443be4f6a8d2eeb19515220
+EBUILD chrony-3.5-r2.ebuild 3036 BLAKE2B 430231032232c20309f05393c7155329579d4f4f8c1a2b861e6c7f00ea92d588398330f1b712ce3eb828fabb0e88c9d0ff71431ff39faebe5d8dfd20704febf8 SHA512 2fe71bee4b303f1f3cfa152aa2b0a9c44052c59196c35c8ada3f2249edaac3020bab26b1ec0bfbe5daf86ad958734dfe08e7511837bfbe9af07e2753636b12ef
 EBUILD chrony-9999.ebuild 2934 BLAKE2B 325fccb1baf09e65dee2fd3d4a7f1fa1e665ae95daf36a8b9a00ffa9770f69bf29940584595c9cb13bd32ef8695169dc3d19c6d2f34812da00540efc67b6a57a SHA512 2414c0b1f95ae47de1ec308dabacc4a791982af9dad4fa8a45297c336695298df826bca0a5a565adc6667a69166a41910aa093bd4c120827aba4a1d533fe0a9c
 MISC metadata.xml 1566 BLAKE2B 88bf43a72fed47580395641d87651a7828fa3fb443a36568bc8ee44f2d09117aa296f8b214f1560279cce2e9bad189a3d941708fe37c1760b053f3669f25ed8e SHA512 acdca169396f72dbbfd3c2ca781024818133ec4af07661a0c8b5a619ca6a43713910aadc28e6d8e5b3d0d8da960ac1bfba05ec5cb5c49d80b17fdf9c1c5d1b1d
diff --git a/net-misc/chrony/chrony-3.5-r2.ebuild b/net-misc/chrony/chrony-3.5-r2.ebuild
index 15c993414095..7c213a4f9e61 100644
--- a/net-misc/chrony/chrony-3.5-r2.ebuild
+++ b/net-misc/chrony/chrony-3.5-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 sparc x86"
 IUSE="
 	+adns caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc
 	seccomp selinux
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index e18d6f55fec0..3177db994c05 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -7,6 +7,6 @@ DIST curl-7.66.0.tar.xz 2414840 BLAKE2B f5d731c304c826442a8509016d00b9c68438ef91
 DIST curl-7.67.0.tar.xz 2418548 BLAKE2B 818b3d03ac8c4adb8a629147feccebcbd3d89164a77d7cb457924bd44c3069f1b03326861b73c51a6427d7169d40485a509f74edd89b99b760649e7adcdce693 SHA512 1d5a344be92dd61b1ba5189eff0fe337e492f2e850794943570fe71c985d0af60bd412082be646e07aaa8639908593e1ce4bb2d07db35394ec377e8ce8b9ae29
 EBUILD curl-7.65.0.ebuild 6953 BLAKE2B 3f0dcce2560ef08897189f44afd843e0322176d6e1368a9bf02211670d4b5fed096d23b1eeb02f89eb44d12f10f1e78839f8dac2a5ad66b225bba5d967942a39 SHA512 b554bca7de8c0cc32e2075d35103da865929fc29c447d9fd0314a161b3b300f3e89d0df2ff8dca15e2d2aa6484ec97ca4ba078cb14abfca57a7b43e8d93d90f5
 EBUILD curl-7.65.3.ebuild 7138 BLAKE2B 06732af10263c41e523f0b36637597fb81d51cd26eedbd198cc2cc59758da3c36e74fc2810296400df2576576b94255637e35c018751c91be9d8333a441b90ca SHA512 f13cbc01affb023970ec54686d09d56bf59660c634399383c709405074e9e77ffa476a418ca9b89aacadb1541b4f2e01c2180e871f1bf5885020b9f0e9ab6494
-EBUILD curl-7.66.0.ebuild 7567 BLAKE2B 307415eb3d37bfd4b68a1dfce50c8c8507dc0c86b4a4caa55532e4695d525d843ac20506151473180562f00ae7a1a41336a567b0839562a64b2e17a138e30197 SHA512 16ae04651ad500e20b87bae64bcee58674848fa981cbba0881bd4626cfe5d8c02b5f20707afc556b176d0dbbdf7606ef2358c1198b0ec3c1bd56c5bf2b65fa6f
+EBUILD curl-7.66.0.ebuild 7564 BLAKE2B 0b31777e043d3b5368103e244e02d316b396b8153b34738fa390f73a99af44fd2047733a8984461b7c856da984f38ac58f26c3bf15b49e0bcf466a61b5399e9f SHA512 889b8ff9ed76359d1642d4c0987a70a3b978118a3ca0c156eae6e7e5a21452102e8cb332dfcad0f681337f6cb1e3bf9f9fe46937a9bb13ea30d597a88430289d
 EBUILD curl-7.67.0.ebuild 7603 BLAKE2B a4541d17a9204d4407dc801cee9fe9a2bb3fa5ef79a13e1d00d48cdb06c809688bab0c64b079f89fbf9bff1191b305912dd0aa052e85d56e6683bd9c0afd01a1 SHA512 167e2ed770929ef5e77bec3aac33b4e8d3c77aa301acd30d7b25ca7fe815e266872a8d5fc2dd7e925b90a0515d313e7489ce81295e3fd624861a0f171fd40668
 MISC metadata.xml 1294 BLAKE2B 2908425a7e08af48dfbe009fa1ed435339cdec92297500b62bd7a086db0911f271c173bce19c2ffc301f0694858d1ffa19a6140fa1e2f80713a709cc418fa73b SHA512 5285b65f142c11ee78166ddd6d2d73c206fd2639ee906d1c077c761d5f5e2c5139c14c5c5cdf207a476f9d500f31c745cfb6fbde7a0dc35bf3e99e5f4e52075e
diff --git a/net-misc/curl/curl-7.66.0.ebuild b/net-misc/curl/curl-7.66.0.ebuild
index 5c1cee00e155..d31b90a467f5 100644
--- a/net-misc/curl/curl-7.66.0.ebuild
+++ b/net-misc/curl/curl-7.66.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" nghttp3 quiche"
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index f20218f294bd..aa3d3998f00d 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -2,9 +2,9 @@ AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29
 AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e
 DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f
 DIST dhcpcd-8.0.6.tar.xz 224552 BLAKE2B 5d0fab5977597ce182a2de56c8c4d085d3595a8f1209fc76788b707af0fffd4285a958cebfe7bab6c04ae7a2ba94c466d689dc9c3a71708c1baabd328b2bbf3e SHA512 19a568800a4e510a250de7cc111700b364c68bfe3907f1ac2cda81aacd079cb9ac87731cbabbf8f1e85e055a11c7ba88e419f6c4d7b33f8842dfaeadc7d1e193
-DIST dhcpcd-8.1.1.tar.xz 227088 BLAKE2B ab9ab5ec5ed969f79dd2092a1ab2dbc10b0f4c40afe8edaf67381b50fc34a9aee4ff264f4f50d439eed200d0273a1abed52875fe90cffcd0587d993220ef1d28 SHA512 2acca049029fa629ab6ba4f45959a2b67cf20c13e8659e71c1d5688fff5527df7007a4edfd9e88634ded9c76179d91b3e7adb92719f7a049d4f0cdbbd06e9a79
+DIST dhcpcd-8.1.2.tar.xz 228736 BLAKE2B 905829d2a0066729afa884f48049066e7fd802525f5ea436f02379845c848ac84b739394dfa90c1aebd74d87842b281121503815a31d05dcaa8b48c3026e357f SHA512 190e42391bc065536d0174a4a51db63b5e7360ccca3f69524a5c347d575ca9ee8439a739f88fadc1bb2509016d1d8f27fc7c7f2cc6724774f8072431f87b9bd7
 EBUILD dhcpcd-7.2.3.ebuild 4385 BLAKE2B df0815025660e0500e89ca24703d2d102d160f63fe049b0b8b254623da1a46e77b038db5c25a04ff42f266c6381104cec39d22096ec38bfa95b2a2ce30a49a62 SHA512 3302777fd50a12f7a6d69fd3d66682cee889c4a41e810a42ed9c13172312101bd0d349dcbb024dea0637c2607fb29b9eb64a17747e77e70ffe116a4592487618
 EBUILD dhcpcd-8.0.6.ebuild 4398 BLAKE2B 0ae3be12a91b88313d9a702e709b5133175ab19eac38c7cedaded1ce719da2dce75bb61bcc566d382354bb25a000596b2e2e3d23f49156c524c18aaf80eea3bf SHA512 399729e9555bfd91bbc658789f96242e0fc16acf7b279bea222247a6ca6d15a8ef3afb8d981f71cf74b07b39a72b8ec5ca63bb5922730157af7d3551100e3691
-EBUILD dhcpcd-8.1.1.ebuild 4398 BLAKE2B 0ae3be12a91b88313d9a702e709b5133175ab19eac38c7cedaded1ce719da2dce75bb61bcc566d382354bb25a000596b2e2e3d23f49156c524c18aaf80eea3bf SHA512 399729e9555bfd91bbc658789f96242e0fc16acf7b279bea222247a6ca6d15a8ef3afb8d981f71cf74b07b39a72b8ec5ca63bb5922730157af7d3551100e3691
+EBUILD dhcpcd-8.1.2.ebuild 4398 BLAKE2B 0ae3be12a91b88313d9a702e709b5133175ab19eac38c7cedaded1ce719da2dce75bb61bcc566d382354bb25a000596b2e2e3d23f49156c524c18aaf80eea3bf SHA512 399729e9555bfd91bbc658789f96242e0fc16acf7b279bea222247a6ca6d15a8ef3afb8d981f71cf74b07b39a72b8ec5ca63bb5922730157af7d3551100e3691
 EBUILD dhcpcd-9999.ebuild 4427 BLAKE2B c57c5170026230050182276f914c22963f077d960d5f695267ea46bc54c6ef37a4809da798c897ece97d019497aed04a2ba815047ebc265922265c5edf01ff9c SHA512 c2db16bd7e6c3b4e7ba256c6e652408cc5f4257c188e3b668e27fa12e437aeed806a7d2045532ae22f124da6732aceeac65d69f17b18793a175eeb6af0995d98
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-8.1.1.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.2.ebuild
index 97babad6cfa4..97babad6cfa4 100644
--- a/net-misc/dhcpcd/dhcpcd-8.1.1.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-8.1.2.ebuild
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index c038bb1be449..a010be933928 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -1,8 +1,10 @@
-AUX dropbear-0.46-dbscp.patch 500 BLAKE2B 268b3a065ff9a9d52659c969195a712e8bfcbc6984e201b69f2a2cc04956220bcda766c932e46fdf4d75f379d1f5a9dcbab842d66a9f6c62fc7f0dd03024d1ed SHA512 33596d1b59ba266eade106e8fe058cc9d20d1657db88d51fb11c2111835f7887b3fa5714b3feb9767c48ed94d3af0c539864886e0a2586b6f58a38bb9f741210
+AUX dropbear-0.46-dbscp.patch 432 BLAKE2B 93f27fb4f5806d7a5e637ccc3ed14b6929d25b395d4731807895761a3cec76de8fcc154db85bb4913214ecac4f65a85489e0091d36c213be38b7b1f7719d5694 SHA512 071a346dbd98490a1ad967b582bb54ef07c45bb25e3b130eb7f22405dd361d6a54061a800e687385f37b2efd4057efcac8e4d07506b9100e51a334c0be12e2d6
 AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f
 AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8
 DIST dropbear-2017.75.tar.bz2 1623392 BLAKE2B c024037d3ebcb3f16aed2a5f24e07c06699a510b327a0ea528db7160ad2a8e554af2a233a266f869e0e30c78f3b0b7792a817d9c07f058f605dbf2dc749a4fda SHA512 9c2f2a5e718339f83abc0ad7719bda12bfc75e5bcb87a7c0eec0afefc743e5c0a1575d290d5fde152ff2100b0f0e6fd5ef4431f7bbcb5ca9a332d93c20f5a8f4
 DIST dropbear-2018.76.tar.bz2 2688697 BLAKE2B 1c22d38487e94427b2678d070f8d370eb09bb2d69253fd6f76d8d80fd637ff86a44b00ab42e1f6d84042c72cbcbd4bb6cbb415f961502e0437c7c8c1b812f059 SHA512 82323279f7e78c366ba1ea07ff242259132b2576122429f54326518dd6092aba8ae5de4a0b8a3cef7efc3507015741abe2ac23376c03b40b247527da7a88120e
+DIST dropbear-2019.78.tar.bz2 2708659 BLAKE2B 212b173cfea8655b43a8d93422dd4d3e0d669a67681cb17d6494b6083e6e4c58d21d52850c0cdf414617ee3dcaa071e376d0b5b156b6856cee2e4fe111550f7d SHA512 f667ba8dae17ea89c118642b566f2c134c71bfd0b8bacea5cf7ec87d75ac79bd7cd1864a8788367a89d30ee35427d389ef6416375adff6e83caae30ff3e0549f
 EBUILD dropbear-2017.75.ebuild 2477 BLAKE2B f9918bcf6c5e95393ac0b21c29b73b0984902d585058a09929782c1419157cf6b386b05fdeafdf163c4f4041b67b7c0ae22f8f0e5f3af572ddef65e4d3b294f9 SHA512 1aa24f08ad011950206d2e83191f85d8605668a9831635f139c1b96f60b05e30f061ff6829d2434115783c5377398822be8071e667c5cd4b611bc5d3ee880525
 EBUILD dropbear-2018.76.ebuild 2657 BLAKE2B b58bc6b4acdabdc63ddee489c8d5bf3c6a56f5fc5fa26ec4c66e37df2724a7abc4d5ce5bba3eaf0532b82cf146cbe33271f945dff645a9a35a534f50cf13960a SHA512 7449a450bfdc03364dbff6a32d63b720ef0ac7ab47fcf5aee15da7e4db1cbb6abf7a69b73eecee4cc81d4c81779b01b471bbd975831cf47eb0740dcd4a4b332e
+EBUILD dropbear-2019.78.ebuild 2704 BLAKE2B 3ff6a6aebafe7b3d31f83a890b56323b727d3f5830d5b4f92ef3a57050caf364ececec071bc1285e23a4c03b1b52ae8840c205eaef6636abf4f99c7543b96633 SHA512 bc1e300042447bfa9f781363246f996159e18718af69229d2a9dec0dc38b3d4df75438603dbb577fe76e7d0e6aec85f90eaa0c8ef470752d6fb6d02ae151f168
 MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314
diff --git a/net-misc/dropbear/dropbear-2019.78.ebuild b/net-misc/dropbear/dropbear-2019.78.ebuild
new file mode 100644
index 000000000000..0ebbf5215899
--- /dev/null
+++ b/net-misc/dropbear/dropbear-2019.78.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit savedconfig pam user
+
+DESCRIPTION="small SSH 2 client/server designed for small memory environments"
+HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
+SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
+
+LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
+	dev-libs/libtommath[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( sys-libs/pam )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
+
+REQUIRED_USE="pam? ( !static )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.46-dbscp.patch
+)
+
+set_options() {
+	progs=(
+		dropbear dbclient dropbearkey
+		$(usex minimal "" "dropbearconvert scp")
+	)
+	makeopts=(
+		MULTI=$(usex multicall 1 0)
+	)
+}
+
+src_prepare() {
+	default
+	sed \
+		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
+		default_options.h > localoptions.h || die
+	sed \
+		-e '/pam_start/s:sshd:dropbear:' \
+		-i svr-authpam.c || die
+	restore_config localoptions.h
+}
+
+src_configure() {
+	# XXX: Need to add libtomcrypt to the tree and re-enable this.
+	#	--disable-bundled-libtom
+	# We disable the hardening flags as our compiler already enables them
+	# by default as is appropriate for the target.
+	local myeconfargs=(
+		--disable-harden
+		$(use_enable zlib)
+		$(use_enable pam)
+		$(use_enable !bsdpty openpty)
+		$(use_enable shadow)
+		$(use_enable static)
+		$(use_enable syslog)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	set_options
+	emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
+}
+
+src_install() {
+	set_options
+	emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
+	doman *.8
+	newinitd "${FILESDIR}"/dropbear.init.d dropbear
+	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
+	dodoc CHANGES README SMALL MULTI
+
+	# The multi install target does not install the links right.
+	if use multicall ; then
+		cd "${ED}"/usr/bin || die
+		local x
+		for x in "${progs[@]}" ; do
+			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
+		done
+		rm -f dropbear
+		dodir /usr/sbin
+		dosym ../bin/dropbearmulti /usr/sbin/dropbear
+		cd "${S}" || die
+	fi
+	save_config localoptions.h
+
+	if ! use minimal ; then
+		mv "${ED}"/usr/bin/{,db}scp || die
+	fi
+
+	pamd_mimic system-remote-login dropbear auth account password session
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
diff --git a/net-misc/dropbear/files/dropbear-0.46-dbscp.patch b/net-misc/dropbear/files/dropbear-0.46-dbscp.patch
index 18873f24c5a6..ea0d17066d68 100644
--- a/net-misc/dropbear/files/dropbear-0.46-dbscp.patch
+++ b/net-misc/dropbear/files/dropbear-0.46-dbscp.patch
@@ -1,5 +1,5 @@
---- dbmulti.c	2005-07-17 07:00:07.000000000 -0400
-+++ dbmulti.c	2005-07-17 06:59:35.000000000 -0400
+--- a/dbmulti.c
++++ b/dbmulti.c
 @@ -60,7 +60,7 @@
  		}
  #endif
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index e47fdb4162ee..1b05b1ba4c8d 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -3,8 +3,14 @@ AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af00
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST dropbox-lnx.x86-83.4.152.tar.gz 94612498 BLAKE2B ddf86853785ee4806cc96f2427a300b2db751bf3a5b12ec1508bdbc68ba7ff35d2d65e83e86b5a09ad4a7cc160e0f94e7cd141a819d35f9be87aea7f3cb8dd0d SHA512 75793878c15ecd7224f0ef1897e38c1050d36e11ddf1c30db8e79c22dcb40ceed48fd6e4be204b19c54fe4ef7a2c68d5528df6e10a041cbe4220d9c129619a4b
 DIST dropbox-lnx.x86-84.4.170.tar.gz 95127426 BLAKE2B 09f985565839c5411647fba7eaf84c88a69941456c6e64b23e6e2ca0cc21b8f393153210db23be7ddc4ee0deb3771c9af8ac2b5fefb2325227e8ae3b52a3be0a SHA512 69ab398860bd7559d971ecc42a271a432839b00ab920b8c068d317d420bd521b1ffc1c74912c98d56627b72cd972c059a5eb0ab89c53bb50ab766179baeda448
+DIST dropbox-lnx.x86-85.3.138.tar.gz 95798182 BLAKE2B 25cda9b6841c027b3dc919606b7f9c7aa6cba4f73949068792e613f46db20a6c6e4d9dc5e9b8f0c565c9c74b786a3bcbbc16cce664f79d80ca2b291d8ff996b7 SHA512 e1c3b91b8b81a13468a2041d73f40feec31d25a860031d3e3f415692389739c73eadbbb4e37827452b7634559a314674e1a595ebae47d793a87245fef11193fb
+DIST dropbox-lnx.x86-85.4.155.tar.gz 95826112 BLAKE2B fc20ee2495729a573a2c5b02672690a0d012a1a3b1509bef2c9089ce4875cc559e00fb43f66d721e1d18d9b7d431ff15a194469fa7f72c72022df985901b9150 SHA512 640ac43d382796aeb68ef41fe83493e777492e1d1f20694aa49fb5682dae30087f411eeb60bf7d35ecf48ea94cf38dbe4543f8d179756efb86abc47543043d1f
 DIST dropbox-lnx.x86_64-83.4.152.tar.gz 98772192 BLAKE2B c023fe81128217b8e11b287afdf6d5cd74d7dd4229c7845aa8e96065f03912720dfe3531995bacc45c50a2971dac0bb7e10364206c531fe5f4e23ce6c617a1d4 SHA512 55874247f3dcfafc62d07aad459a6b3d951c87e675a28f6e66c9c51c9190ca8e4dc32bce5339e338694d31036bc8e1b039f54460b84bce0ee1fff9dd3d6aa684
 DIST dropbox-lnx.x86_64-84.4.170.tar.gz 99360343 BLAKE2B 05dd47e681f03757a622079121001060a73f4c0415fc6508d74738026388f8d27f4b59b41535280a793d2f95976fbf6da9e1c0ec963cc002ad2f14ab46dd73be SHA512 e89e6b727699a439c7cf1fed57f5c7db6fd98c7ef484c9530b2c4ce0b09a86de59a50934afd4d18fd591db024eb92d57181d75574d3d32e587dd76682524b871
+DIST dropbox-lnx.x86_64-85.3.138.tar.gz 100138034 BLAKE2B d7499b31afa7c8cac56d0a785b083c187ce97946bee8c76020bc277284c26e0441477ea9988d3c1928aa706a5519eb7dba9e55bbaed62d192c2383c2b0e86e4c SHA512 94890e958173c76940ff932744af267096327f37c454c913ffcda4b4b9815afeb0877e38fea6be99b7f0d53a6951f72e0400a9405b2b65e8c7d9c5c197a6d1d9
+DIST dropbox-lnx.x86_64-85.4.155.tar.gz 100174580 BLAKE2B 247d9c429f160cc3535a5741ef150e81f499ffa44fe68a7836255d4679c4a75532ffaf68b3f2d8e9b73ee311536c8c25148c370232b52fdbf2b945ae64908446 SHA512 870b3f1b2a6711d2e797a485db9fdbb78e63c9a66b240265f2ef5c907caf00a7cd748f796861fb2bcb46123bd00f52d7aa022fefbd5bb959cd1f966e270adae6
 EBUILD dropbox-83.4.152.ebuild 2857 BLAKE2B 4018ebd8749c24f4b321789d6c31c990f83757381f54310b755eb46d218b0fc227f7d97e106730c0da9891e53070d25f803239ec805a8abc73e66ffeb32d18fa SHA512 b4208396c6bedf47278f0507a5c14c9ac184bf8a91d2a8433708178c4c92484d26fc1d32dc3781f8a85623f4dcea8dbf2e9f34720ca76c695c0e9cf2878629e5
 EBUILD dropbox-84.4.170.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
+EBUILD dropbox-85.3.138.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
+EBUILD dropbox-85.4.155.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
 MISC metadata.xml 503 BLAKE2B e87633e1962a70d62a58006f874a93170d1a5e2729ef6158bf44ab331b5dde53c848266b942fe21579bdc83fda10a421795f630276b96e1c71a954a54ba3436f SHA512 b766938aa2c74e5e9d4558fe882c2d0354c14c9744a7e5eac664ed5234cb723601fc5d04d65e19877c3bb60d8bdaa305eb1c8273704ac2fa1a5779de60d9484f
diff --git a/net-misc/dropbox/dropbox-85.3.138.ebuild b/net-misc/dropbox/dropbox-85.3.138.ebuild
new file mode 100644
index 000000000000..c21396bd015d
--- /dev/null
+++ b/net-misc/dropbox/dropbox-85.3.138.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils pax-utils systemd
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="+librsync-bundled selinux X"
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+DEPEND="librsync-bundled? ( dev-util/patchelf )"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="X? (
+		dev-libs/glib:2
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5[-gles2,xcb]
+		dev-qt/qtopengl:5[-gles2]
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5[-gles2]
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5[-gles2]
+		media-libs/fontconfig
+		media-libs/freetype
+		virtual/jpeg
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		x11-misc/wmctrl
+		x11-themes/hicolor-icon-theme
+	)
+	!librsync-bundled? ( <net-libs/librsync-2 )
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/libffi-compat:6
+	dev-libs/popt
+	net-misc/wget
+	>=sys-devel/gcc-4.2.0
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	eapply_user
+
+	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
+	# tray icon doesnt load when removing libQt5* (bug 641416)
+	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf PyQt5* *pyqt5* images || die
+	fi
+	if use librsync-bundled ; then
+		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi*.so || die
+	else
+		rm -vf librsync.so.1 || die
+	fi
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/dropbox/dropbox-85.4.155.ebuild b/net-misc/dropbox/dropbox-85.4.155.ebuild
new file mode 100644
index 000000000000..c21396bd015d
--- /dev/null
+++ b/net-misc/dropbox/dropbox-85.4.155.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils pax-utils systemd
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="+librsync-bundled selinux X"
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+DEPEND="librsync-bundled? ( dev-util/patchelf )"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="X? (
+		dev-libs/glib:2
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5[-gles2,xcb]
+		dev-qt/qtopengl:5[-gles2]
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5[-gles2]
+		dev-qt/qtwebkit:5
+		dev-qt/qtwidgets:5[-gles2]
+		media-libs/fontconfig
+		media-libs/freetype
+		virtual/jpeg
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		x11-libs/pango[X]
+		x11-misc/wmctrl
+		x11-themes/hicolor-icon-theme
+	)
+	!librsync-bundled? ( <net-libs/librsync-2 )
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/libffi-compat:6
+	dev-libs/popt
+	net-misc/wget
+	>=sys-devel/gcc-4.2.0
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	eapply_user
+
+	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
+	# tray icon doesnt load when removing libQt5* (bug 641416)
+	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf PyQt5* *pyqt5* images || die
+	fi
+	if use librsync-bundled ; then
+		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi*.so || die
+	else
+		rm -vf librsync.so.1 || die
+	fi
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index fa95d1a45890..c8d336145702 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -3,10 +3,8 @@ AUX gerbera-1.0.0.config 6164 BLAKE2B f16c1e32be600b778e6818267b76bff34a26653d8a
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
 DIST gerbera-1.2.0.tar.gz 2910704 BLAKE2B b0d0f52dcfbcefe09d96e6b63a73005fb069176fb42af16cf9a4729742988d5c5a0b68109ab50b93ba65ec604c3ced7a827fb75300d6c3409bdde77e18346589 SHA512 5472136b0605e4cc9645219ab9fbe9ae4240a4b80f52fc611456cef0336a7eac8136448132f30fab04655d4bdb0f85f5a37e92e2830ec976f71c6b294935e1dc
-DIST gerbera-1.3.2.tar.gz 2845728 BLAKE2B 15c8294486e9c5eb804d4b433e491b9db98821e0cc7274696b0056a8dde69beded83e092beddf31a171085d5913533a5d7dfe01afd1385f659da6fadd2eebaec SHA512 32a66dc25340969bbbbc2810199735b72ff258eb2d4a359402469f4ce21690843d37ad4134667d10f03967d113b33b08bcae7329cdda49dfd60dbd01b21d5b27
-DIST gerbera-1.3.3.tar.gz 2891422 BLAKE2B f9317f878f718083c2ca8a72642fca1c6f83c619494dea487318bfa274698531257fbf1c4640304c592d5ab3f0c2f074c5be7aaa8ee4c0983c0b031205c5f6da SHA512 d579a36265f178f24fd88aa3c9ede8bf678e89b1fe455bf4047369d8483e1104c0b2fd995b4dca0b473585e0dbcccc23b2894c3931db350d8b85a3224505fefd
+DIST gerbera-1.3.4.tar.gz 2893706 BLAKE2B a7356bf4d44f28a00cb7101240c50c913a48690c47aff159f42d4930daebc87cb35a51eae21e06c08a49d1495dea1b9203e61b157fd7935fde0eec782f933f68 SHA512 5ef81bcfcf83302133b6d99bbfb0ca0f46520128be1f086d175aa5e4533a7dbfeaeb70f249a71e848bab8951789fd50c4bd07a05792a9fcfe24a617ddbc2361d
 EBUILD gerbera-1.2.0-r1.ebuild 2558 BLAKE2B c5f81e11241cb74d63428c263cd0141d61a90f595f8c42ad4f2987d73f885ff6275b85f9ad772b8ff8862847119dd953206972ebe8461e659cf5bc9476b3da89 SHA512 57b790ea36d49c2ecff0116d0aa2e583a8a6bc9847e79396d93061156c06d2b9380f9725a543e4f1cd6f91574b6cd77c26fec65b77552308998b886f6f993495
-EBUILD gerbera-1.3.2.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
-EBUILD gerbera-1.3.3.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
+EBUILD gerbera-1.3.4.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
 EBUILD gerbera-9999.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
 MISC metadata.xml 1142 BLAKE2B 000fa449f9dff3541b6d1507e6945a2508c0478ac19ed4a1ff1108ecde9dbbad96b76d304da9f34a2169bdaf620be5d710b111e0c442e05c94ab58747a7dab87 SHA512 28acbb3ef7011c52e77a323a4ec346ca25a3c255f8dc41da4c4c6c8f21bcbf0fcc8ebef501efd0f225ac2f0d29d828584a904774d7fb061635b007a0ea123f54
diff --git a/net-misc/gerbera/gerbera-1.3.3.ebuild b/net-misc/gerbera/gerbera-1.3.3.ebuild
deleted file mode 100644
index 1b1129c47251..000000000000
--- a/net-misc/gerbera/gerbera-1.3.3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils linux-info systemd tmpfiles user
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/gerbera/${PN}.git"
-	KEYWORDS=""
-	SRC_URI=""
-	inherit git-r3
-else
-	SRC_URI="https://github.com/gerbera/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${P}"
-fi
-
-DESCRIPTION="UPnP Media Server (Based on MediaTomb)"
-HOMEPAGE="https://github.com/gerbera/gerbera"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic mysql protocol-extensions systemd +taglib"
-
-DEPEND="
-	!!net-misc/mediatomb
-	>=net-libs/libupnp-1.8.3[ipv6,reuseaddr]
-	>=dev-db/sqlite-3
-	dev-libs/expat
-	mysql? ( dev-db/mysql-connector-c )
-	javascript? ( dev-lang/duktape )
-	taglib? ( >=media-libs/taglib-1.11 )
-	lastfm? ( >=media-libs/lastfmlib-0.4 )
-	exif? ( media-libs/libexif )
-	exiv2? ( media-gfx/exiv2 )
-	ffmpeg? (
-		libav? ( >=media-video/libav-10:0= )
-		!libav? ( >=media-video/ffmpeg-2.2:0= )
-	)
-	ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
-	curl? ( net-misc/curl net-misc/youtube-dl )
-	magic? ( sys-apps/file )
-	sys-apps/util-linux
-	sys-libs/zlib
-	virtual/libiconv
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /dev/null ${PN}
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CURL="$(usex curl)" \
-		-DWITH_DEBUG="$(usex debug)" \
-		-DWITH_EXIF="$(usex exif)" \
-		-DWITH_EXIV2="$(usex exiv2)" \
-		-DWITH_AVCODEC="$(usex ffmpeg)" \
-		-DWITH_FFMPEGTHUMBNAILER="$(usex ffmpegthumbnailer)" \
-		-DWITH_JS="$(usex javascript)" \
-		-DWITH_LASTFM="$(usex lastfm)" \
-		-DWITH_MAGIC="$(usex magic)" \
-		-DWITH_MYSQL="$(usex mysql)"
-		-DWITH_PROTOCOL_EXTENSIONS="$(usex protocol-extensions)" \
-		-DWITH_SYSTEMD="$(usex systemd)" \
-		-DWITH_TAGLIB="$(usex taglib)" \
-		-DWITH_INOTIFY=1
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newinitd "${FILESDIR}/${PN}-1.0.0.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}-1.0.0.confd" "${PN}"
-
-	insinto /etc/${PN}
-	newins "${FILESDIR}/${PN}-1.3.0.config" config.xml
-	fperms 0640 /etc/${PN}/config.xml
-	fowners root:gerbera /etc/${PN}/config.xml
-
-	keepdir /var/lib/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN}
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog "Gerbera has been built with MySQL support and needs"
-		elog "to be configured before being started. By default"
-		elog "SQLite will be used."
-	fi
-}
diff --git a/net-misc/gerbera/gerbera-1.3.2.ebuild b/net-misc/gerbera/gerbera-1.3.4.ebuild
index 1b1129c47251..1b1129c47251 100644
--- a/net-misc/gerbera/gerbera-1.3.2.ebuild
+++ b/net-misc/gerbera/gerbera-1.3.4.ebuild
diff --git a/net-misc/haeredes/Manifest b/net-misc/haeredes/Manifest
index f0150f6de827..6554f9a2477a 100644
--- a/net-misc/haeredes/Manifest
+++ b/net-misc/haeredes/Manifest
@@ -1,3 +1,3 @@
 DIST haeredes-0.5.1.tar.gz 20590 BLAKE2B 8ae474451a83695a259ea90babc912d58c2c52988d5858c0540b8447f91bb91403a0404970771f65dea79b3d38d23df5cbdcead6630043bbd6bb465d1ca9fe64 SHA512 54351734df35bffec96fa664c4e2458c929fc9a7d63c77dc35ba545b814741e1191019ca663579940af8f39fc5f85cd7dc1db313671b149b9af08facf600fde5
-EBUILD haeredes-0.5.1.ebuild 840 BLAKE2B 5cc3ac43bfa304f5d717ec30bf84f4ef6119c70d8d13f2cc0bd047225bbb2e92eba684f0d9d404d8751470e525b7fa1ee6e89f7f4efbefc45faf1b39184c61c6 SHA512 7e97c0991e1ef41adacad1dfa6923b9b36f14754269e32e67985ef11c3db425d38109ed4a7a30cdfa33221dff3a02a727643b288a59622db07714a3afcf5eca8
+EBUILD haeredes-0.5.1.ebuild 835 BLAKE2B 2f68b309f5220d1ce1a8ab973f65f60012cf359c1e192b7a3f75c0d69ca3d6bffb23674d642ee3869d9ab8f80d4c0de1c1fa64f56a2905484a36c2baf8bff302 SHA512 512b65312f4affb69a7e90e6bc6fc84820b597cb09b72cb17df50bbfe64028a074fadfcb3595f36455e4504f12388d82f54dbb5ca2f2559d4fe69b3f2d531753
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/net-misc/haeredes/haeredes-0.5.1.ebuild b/net-misc/haeredes/haeredes-0.5.1.ebuild
index 3807f1b5e13f..7b8eb5a35cbd 100644
--- a/net-misc/haeredes/haeredes-0.5.1.ebuild
+++ b/net-misc/haeredes/haeredes-0.5.1.ebuild
@@ -8,7 +8,7 @@ inherit haskell-cabal
 
 DESCRIPTION="Confirm delegation of NS and MX records"
 HOMEPAGE="http://michael.orlitzky.com/code/haeredes.xhtml"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
diff --git a/net-misc/hath/Manifest b/net-misc/hath/Manifest
index 5823d2cad6b0..4b2bdf3b51da 100644
--- a/net-misc/hath/Manifest
+++ b/net-misc/hath/Manifest
@@ -1,3 +1,3 @@
 DIST hath-0.5.0.tar.gz 31258 BLAKE2B 496832d35cf88ccda3a8ce394a1b4b17f673d1873c44d6ee112881e1da0431a069feb3612a3d1c00b14005690f4a71898d3755635b4bc444f23fbe23fe6f95b5 SHA512 877b95f3b608315f2dd393097747918f20499ae9ffaf69d26f7113639458cb30425a63ecb358cb2cab7f543c658aa7297f3f54b0f500dffe3bda3c9e63647a99
-EBUILD hath-0.5.0.ebuild 790 BLAKE2B b0faf40b2037080e36f4703d48d07b5495087f2eb9047872646e6b1d7def85712c253630bad3cd6d1c4fb1db57bb33c1d3209d98fd28163f5cd55ad967ac8a6a SHA512 2691c660d3a0e466130d44239aabd1801614b5eb7567b372c036680b650c200c5ff45d66e6df87c93707dfe2d0a04dbe7b78797433990387b324162221f2cbbd
+EBUILD hath-0.5.0.ebuild 785 BLAKE2B 0be470bbb9cdf30be33ddb9fb091e98435b2985411a1ffcef830870676b9a36bc0c071ca5ccaefecca869592ddecbd92958494c0e8699a7759394ceb45129479 SHA512 c714af6f087d5ff9a2ca2faef477b7e7ec44685d911ff8bfdf399883745997979f4c33b947f9d5cc4661679fbe4a104645d77e127d0f657238e0646b4d202a06
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/net-misc/hath/hath-0.5.0.ebuild b/net-misc/hath/hath-0.5.0.ebuild
index 9c801092097d..72234a8b54ae 100644
--- a/net-misc/hath/hath-0.5.0.ebuild
+++ b/net-misc/hath/hath-0.5.0.ebuild
@@ -10,7 +10,7 @@ inherit haskell-cabal
 
 DESCRIPTION="Hath manipulates network blocks in CIDR notation"
 HOMEPAGE="http://michael.orlitzky.com/code/hath.xhtml"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index d4e3ac479645..42b279f71672 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -8,6 +8,6 @@ DIST linuxx64-19.10.0.15.tar.gz 102164402 BLAKE2B d432c0addc7dc01f371dbede8125d1
 DIST linuxx64-19.8.0.20.tar.gz 101850343 BLAKE2B 275896b781addbc4b83e2ce54b46136a2595b65eb8adf9675b2a2695aea5acd36d99ee01b0171498a6f724c5d1878ec4a7741f3fae27a08b93d1bb6a79a9c49a SHA512 141f2c3a0fef7be341568029228a4c32ed5d578014a513fb3ca1fd6213b42b613a07b0c5dcf350712a0d7190006b9443ed3d7279707a29d0c00ddc4108b7b090
 DIST linuxx86-19.10.0.15.tar.gz 109350883 BLAKE2B e7f7b98e04db9259b02177e18d5f2bf62975a50635e745b99d9c860370b468e63b30f01b85090b0749f962916c3606f4b53b66e1b6a271f6b33ba6a5d39c8ad7 SHA512 0d9e1692855d4122cef478a04059b0a7261165a50cebbf1524a426b841f65b6e26e01aa98865f7ba35ba7c8386eaf7d7301e5fc03019f9034c91971a53459c1d
 DIST linuxx86-19.8.0.20.tar.gz 108044897 BLAKE2B a76d8c507bdc662f62c7874e19bbbbbe5a59f0f146b7226f3f989ff9626db3def036b7b218c47a71f75c5ec873cd81a785d79a69291c49d3db3ca630950379b2 SHA512 0c88f511b289caac27d1b8a83e8a1c49a9a9f431b880f53172229a58df85052d67890bbb1b5e3f8272c9c7f6d3dd9e588aff481ac727293cec6148a18facb061
-EBUILD icaclient-19.10.0.15.ebuild 4562 BLAKE2B ecc1d62665c372e622df639a2445ba67a04011622ca01551f56164ca7bd7a89eb24954765ae8ddc24975e2730cf2de4bb44505e986387c1121cc417b8db508c2 SHA512 ea51340b1bc5d1b5435e3067a5eae1410055454503bf85abc9c7be22f2e5d5abdc0789617c6c7d99298f04765fd5ba10d736574face335510cf908778b1c4d0b
-EBUILD icaclient-19.8.0.20.ebuild 4560 BLAKE2B 3134576f7a893a1eaa82d768d94391ba5b3bfac015437ec8e00223866206fcdd8ef2242a7b2bcccd3c6c12beb792f50c319229979d5a222bc82ba501e0ff91dd SHA512 cc4eeefd96a0c3fcebea06a408abb34bd51f9fdd322ec408026b37397d41970e94a04a8b05fc8caca03a4deb9b66ca00a09b94d2bec9d34cac3a1a26e85e6196
+EBUILD icaclient-19.10.0.15.ebuild 4593 BLAKE2B 68bc7cccdf05285b57c5c319aa289057f9e4a06b2bef35f39ac5f25388e04f476d5b5f7cf6b031097feb4c28957bf47db45f562bdb09f7053a388c8cad156911 SHA512 dc8b0f1557dd842415bf9c30eb738b9e6019e9cfb32b3066eeadf931cab60e1f2c35eaeb88e3f7d661557d7ace5f2598953e47b4deed8f6144b12f673e24072d
+EBUILD icaclient-19.8.0.20.ebuild 4591 BLAKE2B 76e06a63a082b3011e2bd3fcf2bb67d0846de132285e7297c060e50c05b218016e0d43545a30196d1e09a951f4bbc2747857d482cb900896c6b0a9d87f9f090b SHA512 3af23277d88290f4df02d500e979b86c7cca5a9e03f7c4983b928dd43ada3dfb34628ac28b9b445bfd09a1bf1c28be8b4b23359722eee9aaa91aaaa70e51c466
 MISC metadata.xml 602 BLAKE2B d0a0f2a13b43053f748f4250ff9fd0f7aee5d53501d773081e646097e40b5a60bb49c4517ec4689272c2e14bfd51acff76c8b4c8575533697f8f069854a4d5eb SHA512 281c87fd74b63941c4ae76772c7020b0c70adfcde3e87be13cb9b0994aa4794df2c2904e623518812d1da8ea602b45c95db083ea7d239e7f0e7c9c92487bd68c
diff --git a/net-misc/icaclient/icaclient-19.10.0.15.ebuild b/net-misc/icaclient/icaclient-19.10.0.15.ebuild
index 941c09b0cfba..48377166995b 100644
--- a/net-misc/icaclient/icaclient-19.10.0.15.ebuild
+++ b/net-misc/icaclient/icaclient-19.10.0.15.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	dev-libs/atk
 	dev-libs/glib:2
 	dev-libs/libxml2
+	dev-libs/openssl-compat:1.0.0
 	media-fonts/font-adobe-100dpi
 	media-fonts/font-misc-misc
 	media-fonts/font-cursor-misc
diff --git a/net-misc/icaclient/icaclient-19.8.0.20.ebuild b/net-misc/icaclient/icaclient-19.8.0.20.ebuild
index 935af4875168..45ae009f1b9e 100644
--- a/net-misc/icaclient/icaclient-19.8.0.20.ebuild
+++ b/net-misc/icaclient/icaclient-19.8.0.20.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
 	dev-libs/atk
 	dev-libs/glib:2
 	dev-libs/libxml2
+	dev-libs/openssl-compat:1.0.0
 	media-fonts/font-adobe-100dpi
 	media-fonts/font-misc-misc
 	media-fonts/font-cursor-misc
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index a1ca53ee9c95..0ca51a939686 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -7,6 +7,8 @@ AUX memcached.init2 2205 BLAKE2B d27dbf6fb4d72ec49ff89cb3957770a25afe467c96c0564
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
 DIST memcached-1.5.14.tar.gz 485076 BLAKE2B 729b4b708e921184bfedadbb02b0304eb09dcebbbd1420605deb608dcd7dea25a8982ca0f387f237a1a6412b4682372018c593396ef9bff5aa0fa901c0fdafd6 SHA512 d06083d971d0a40195b4dfb252a3bf7c3a0d20b2dcad56726ff9e0b87ba84024309300516dad40181f1b7af4d9c4f35924383977c5e1ff9b5f13d2ef05f684ed
 DIST memcached-1.5.19.tar.gz 517380 BLAKE2B 8c6e7c87e786d88c783da87396daec9deb0c9f8c4112fa7cec6d79e8e96505576c2b7f3dff91317a3f45582322cfdb435535a41bb537b0a0bfec9df6f8d5986f SHA512 4445f383e18ffc53071c13b495c3864978658f4f6f439ab4579dd831fc12ad4850e04e9526954608ae627b0b23a9d6cb327560f02d15abff23e12f5d7c1723b4
-EBUILD memcached-1.5.14.ebuild 2902 BLAKE2B ac9d561fc47ca13f81329356c6df5b4e8a01d9455523d2f76ec59dc72f988c0a419419f20ee6554e43b47256f9ee575f8d6b003c55a31456ac0980049fcd04d4 SHA512 40d6050f2d55fbe1f3aa44813d3838d7bc6f7b8450b28812b560d71fc3ff5d2c3d091add8561832109c2675c91eb0947126f29e693fa08972e3a03a77840c12e
-EBUILD memcached-1.5.19.ebuild 2910 BLAKE2B 45f2b2f38071fbac8b3136504cb867ce0bc3ff88f07a16ac345a9c6e1e25b911d2a444a205f724cbf99cdc01d12c9f91b0bc59ea3cec3f7fc20b59d6eb3892cd SHA512 eea0bfb868eb713e062903928d3a3a6994d4aaa6ef655ccdd040f124d992ef7e85008ab96c44e4f563bc97ffd8c742d6efb85780962a245d0b76d65daf9c4cae
+DIST memcached-1.5.20.tar.gz 531035 BLAKE2B fcabbb8deac585f20100855bbdd27616077e0f129a8537c39869ceb251fae8d598c64998846120f63f29a690afdc2a3603f87bb21ecc473e13f5ef9e9c48bbb9 SHA512 07b125971fcec2cd06797fe16e9825e18b9d3446f6b91583f82f1b50920cd0e55c65506ebdf5fcef7b08d92f9641a20859ba67b3dd3986ba5624d0d6f494293d
+EBUILD memcached-1.5.14.ebuild 2930 BLAKE2B 1e47dcee14202eb3f7de51c779c5e6ddb9eea26fd743a362919fb6bf60e4d2333910b8eb1db13491f429eeb19d9451912e6ec1bdb753ee21eb7f2bdf90415864 SHA512 29986b6567a677dc7b9fb514a03966dc9f661ddfcc5e380118eb4e1b12d06601347149a8e4a97bfbdcbec04f6de243c2fd9201725017c562cb73bc407d79578d
+EBUILD memcached-1.5.19.ebuild 2938 BLAKE2B b67de575ce5c41510d4d0f8c19999e8f6b327460eff5b61192532e682981d27a69142f781e1b6f889b37bb69705fe375e6347d27dedca2c186ea9687dd55b71c SHA512 3989cbe5a174f963dc4daef97add3183f05dc45c2b1a5f1b937ac7d4c700f4ea633ed84697d61a08dfa147568ccde35b77b44cb05cfd95c18ad712ed641999a8
+EBUILD memcached-1.5.20.ebuild 2940 BLAKE2B abcb695f6e2510d3e471d671a63e7603137557f7189a9eec1ca060dca67407a3fd1dc5b104d66978265c4bc3ec2e5b3b690440fe88d23d0dcedcb19b82a8d292 SHA512 ce50addf474089d4a901216fd4c0e936fdb469a6da0f6ab66e75328622b4b9c7f70fdc4a1bb011e30a7c6440cc01b56e3ae99fbd0a4fca88a398389de7775413
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.5.14.ebuild b/net-misc/memcached/memcached-1.5.14.ebuild
index 7aa1883474fc..2b30e1b9a807 100644
--- a/net-misc/memcached/memcached-1.5.14.ebuild
+++ b/net-misc/memcached/memcached-1.5.14.ebuild
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+RESTRICT="!test? ( test )"
+
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
 	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
diff --git a/net-misc/memcached/memcached-1.5.19.ebuild b/net-misc/memcached/memcached-1.5.19.ebuild
index c2d8ac61d125..77a0b3f38a8a 100644
--- a/net-misc/memcached/memcached-1.5.19.ebuild
+++ b/net-misc/memcached/memcached-1.5.19.ebuild
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+RESTRICT="!test? ( test )"
+
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
 	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
diff --git a/net-misc/memcached/memcached-1.5.20.ebuild b/net-misc/memcached/memcached-1.5.20.ebuild
new file mode 100644
index 000000000000..0a1da23139ba
--- /dev/null
+++ b/net-misc/memcached/memcached-1.5.20.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic systemd user
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+	https://www.memcached.org/files/old/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+	dev-lang/perl
+	sasl? ( dev-libs/cyrus-sasl )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sec-policy/selinux-memcached )"
+DEPEND="${RDEPEND}
+		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+	eautoreconf
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+	default
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	enewuser memcached -1 -1 /dev/null daemon
+
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
+
+src_test() {
+	emake -j1 test
+}
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index d4fd86bfdc00..0a5a4fd9578e 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -4,6 +4,6 @@ DIST mosh-1.3.0.tar.gz 356220 BLAKE2B c0a74243f7f54e24b2ccc326f89cff87f2772bf98b
 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
 EBUILD mosh-1.2.6.ebuild 1421 BLAKE2B efaae0cc26ad8542351721bd8a82e33241175170b5883b40f2bfb8cf8b6b55209b7e526087ec4104f5eb3a27328844c0f59aa70379ef3d950945259147f8bf86 SHA512 116498494644dfe64dc2764d33e4ee567b7e67ea8fc538ce17eec31243a739d2f5c7ad046952be7b01119fbf1635a44807284694e35ea0ffa56c2520c59646c0
 EBUILD mosh-1.3.0.ebuild 1425 BLAKE2B 8244b7496ab7091af92ff8ddf6d0f702c5d75ae9a647baddaf514fa67fe3532fb3c645cae287dde5da6d226e9d64a005427d656c5121dc7ad53524a552547662 SHA512 aa1d9546fc5a8ac7b58951e54e343a567b1afa63ccccc740e431b716c9ba58bac6ad5e27b4c07b89618ae56ade77d73a7da9d29b99d43b63179683913ce074ab
-EBUILD mosh-1.3.2.ebuild 1522 BLAKE2B 9fdfbc5762acd2b8897db9c01f89646d74b65312968f3f778e89511a58d5ba8d54907a5aeda3d33d839801148d755c710ba53eb21f42e0f234ef7b74a1a8c0fd SHA512 bdfec478e306626b6a79026c866e572c5e5adad61617e956caaaf68c0e63a008b470a15e739c59f38b713dacb94758c68d20a0b133776df361cd02df5f463f5c
+EBUILD mosh-1.3.2.ebuild 1521 BLAKE2B 5c705dd5a60e2bc0a20d05ce9e144bd10b4dac450a447edd5b405497ce99ef3c9db0036399d10ae5461c537f5a3443305702804ba1a70557dc298144a38454ab SHA512 b396876e91803b785adc4e930b74b335e58266fa616b6a6b82eeeea6ff2e78703c96081ce7b97b55fbbbb5a98ad81b018e33ed1b1c34a427a33e0423c0771401
 EBUILD mosh-9999.ebuild 1474 BLAKE2B 752b071131e7a0f33587374e8a2150c62570d2c6c70f9c5ed44efe629230202dd2bce07acc40f3cce14eed60ef467df3fc1d78e2fc2be7bc005c8f550b0a7036 SHA512 c7e8cd3814ec54f377472285f7f9c47737bd2dedb596a97551959c3332dfbee5c129cb52c41dd1f1649aa38aa1db38b45793e9d4af42f97d479d2dfb13c1fa0e
 MISC metadata.xml 1054 BLAKE2B 88f7bb070bcd535ba07cd1897dbf27bd2a5081f367354f67943e22148b2ce4d0c9e8b9ba5c1d4906057d4a015f69af2836abb69bd9e656bfd66ad483592cb843 SHA512 48fd6dc4aa24de61a6951b49cad3db41c084a0ec985af53d13d78c7bcae801152afcc7930eae5a0b6393cdcf844f0986f4a943d7d6f6193b950845e9da509ab2
diff --git a/net-misc/mosh/mosh-1.3.2.ebuild b/net-misc/mosh/mosh-1.3.2.ebuild
index 4eea0ddd9726..950ba4172437 100644
--- a/net-misc/mosh/mosh-1.3.2.ebuild
+++ b/net-misc/mosh/mosh-1.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mosh.org/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="+client examples libressl +mosh-hardening +server ufw +utempter"
 
 REQUIRED_USE="
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index db345476a672..1f687584d7e4 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,5 +1,7 @@
 DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae
 DIST nextcloud-client-2.6.0.tar.gz 18789917 BLAKE2B db5c703ecf630a96c141c9c8a7b15894c5a679e1b36217f38a02cd55307fadb5ea19c13ab44371fbbcf0610ddafdd2fb0c1ef6119db04808b94a72dbfb27da9a SHA512 161733540de85c436e204b150fb91b527737fee213e569335248ce7c6e1446497aad5e3fa814b3f98a1ec0cdb94fad64ccc0807eb953a94170f9d40abb478545
-EBUILD nextcloud-client-2.5.2.ebuild 2004 BLAKE2B bf10f233d3d41a8aeefef7c8c14fd996b75dacd66daa79573ae391896704397fc448b7c85ce3047372bf1fe02938aee85d0a9e85287e4e7fb1ab99a6c8a92df2 SHA512 b10fe3a2a696763d6ea390966b3597efd76da7c88d1b98a757031a47ea9762f9fa02d762ce337c142a723ec8ed4bf81dec59c78c73ffc3127a8d235c5c7b64a5
-EBUILD nextcloud-client-2.6.0.ebuild 1997 BLAKE2B 93dcb863a801307fc378326d0d3027e23b6db25d70cadd8c58d5a5cc5a17d4847f8018574823a933b634c76b2018590a64083ef12cc7b4384d1d0e8701c1739b SHA512 39367dad554bbf6a6d062dc1f85474b931d6a92d099957f0322ec100eaa540c925574afefbd69407a007509bf2f0ba2960065aafe61d5538d2f5c86b48e21a0b
+DIST nextcloud-client-2.6.1.tar.gz 18947504 BLAKE2B 940145f9f633ad35e740a92d44d0d7172f7c0883bf29951694dd540213dcfc64f9d480a1cd38b586842dad8c96d3c2948d6e8af6042005f0cd23d9b6d3eab7c6 SHA512 dbda59f5ef6f5f85d8344732be4a0b51e51fa9d0180d5b589f79ab6fe1bacf3a63879aee2f297bc76d6257dd830b38c695cf88f98b9e3f788acf9d6b2f11f619
+EBUILD nextcloud-client-2.5.2.ebuild 2032 BLAKE2B 7d8868094ef1a9c9204165ae2e716f09e1964c2eaad5e74a100492a11b3d180ec6ac66f6fc3374515c01dcf8430f1cf00ee845d1ea27ab6026b98dbc24b78eb0 SHA512 18b8ff5a30c85e4cfeb487e8f1cdd70b088e729b27a3031ec5bcdc1378bcbc9fd8f17d4b225067e2c9c024373cb76c42a32674bcad5f7069fd50c578442b5f17
+EBUILD nextcloud-client-2.6.0.ebuild 2025 BLAKE2B eac2c678f5ec56df913561427cd809d7bf78b29b98c93bd7a07ee507a937d86932d7b79fefa1b830fb444bed242f3a0f25db617a647c2b9cf8c182a8adde6919 SHA512 993568c7066c2e3ae06fff1440c2d183fc383ce42e2b8ea7682a2678437ec4fbcc29ea16fec6a43ec9069df0081b192bef46f7e25093633e517b3eb0851c8065
+EBUILD nextcloud-client-2.6.1.ebuild 2025 BLAKE2B eac2c678f5ec56df913561427cd809d7bf78b29b98c93bd7a07ee507a937d86932d7b79fefa1b830fb444bed242f3a0f25db617a647c2b9cf8c182a8adde6919 SHA512 993568c7066c2e3ae06fff1440c2d183fc383ce42e2b8ea7682a2678437ec4fbcc29ea16fec6a43ec9069df0081b192bef46f7e25093633e517b3eb0851c8065
 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild
index ec0ad38c8fec..64e9dfd92b7f 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild
@@ -49,6 +49,8 @@ DEPEND="${COMMON_DEPEND}
 		dev-qt/qttest:5
 	)"
 
+RESTRICT="!test? ( test )"
+
 S=${WORKDIR}/desktop-${PV/_/-}
 
 src_prepare() {
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild
index e931c2d92649..6a82390c3c07 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild
@@ -49,6 +49,8 @@ DEPEND="${COMMON_DEPEND}
 		dev-qt/qttest:5
 	)"
 
+RESTRICT="!test? ( test )"
+
 S=${WORKDIR}/desktop-${PV/_/-}
 
 src_prepare() {
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild
new file mode 100644
index 000000000000..6a82390c3c07
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc dolphin nautilus shibboleth test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	>=dev-libs/openssl-1.1.0:0=
+	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/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/inotify-tools
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	shibboleth? ( dev-qt/qtwebkit:5 )"
+
+RDEPEND="${COMMON_DEPEND}"
+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
+	)"
+
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/desktop-${PV/_/-}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	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}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-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
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-misc/npapi-sdk/Manifest b/net-misc/npapi-sdk/Manifest
index c99d6c7288bc..8fe8e54cedb4 100644
--- a/net-misc/npapi-sdk/Manifest
+++ b/net-misc/npapi-sdk/Manifest
@@ -1,4 +1,4 @@
 DIST npapi-sdk-0.27.2.tar.bz2 65811 BLAKE2B 7f746f077bb87ef8de31499cc3ba0f0c15197ebd9da7891096ecb368d66ca2a7a54fc2b27e7ecc78e942c74e1623b09ca1d39df8f4fbb0843a5cc0ab98b9caa9 SHA512 827d52fbc8eb601ac0e486aed267b1ca6cb8732c92f1224f4b38e039288b77d07d47c5d4cf384a3114403b85e7f086f345912f1b20b41d27785c9bb367514842
-EBUILD npapi-sdk-0.27.2.ebuild 415 BLAKE2B f72288c34f3828f2f58ab4c955b1265c2c1e9c28191a280297492887e8e0cc181f9524568d90570bc32f18d5d05337245f9cb220de5b44248ab5462098b428b6 SHA512 3ab904ff87f507bf07ee1febe0aaa3b708fade6f5f4aef1a7d0b283a2806b5f966eb159bd16e676ad6ae6de88044edf4fa14d54538d2bf8823c79949242c37de
-EBUILD npapi-sdk-9999.ebuild 577 BLAKE2B 09a4a13d1cb6ee4563d9b227297afbffa72735c108a5553729aeee260a7776262e4f1a5ee33e707a7d4c6965483e7cd65e42a1c1f948c421cded9a7d29eef0e8 SHA512 aba465072a130b85c1257d6e769a3cae53ca63fc2d06180e7befb2013dd3f2e97f955124e81ea0255102505fe09360324b33928965d55ea6370d05d8a17e50bb
-MISC metadata.xml 446 BLAKE2B e07f9be14637daae4d18800ea41e81cb184807ec5b1ba3aabcc969305abff9ec92726cf2be5ff3a2e52e280d9bfd6d93d086f9acd6e8bce9f133e5df3c3be970 SHA512 10be832423bb894889549683ab994b00cbca688a6f38cd3b34f66fb955ed4c9ca1bfff6e5cff02083aeea860d3d0223d7ce63c446b9ba03e265a4bdca414cc13
+EBUILD npapi-sdk-0.27.2.ebuild 397 BLAKE2B 96250a6461c4523d261240d3c01112b12b2370cbd73637e891931c99f7bb325a23a53c75fb0c1c1b86e6fa0bf4f64fc5b01e85e26c9a3ac2554b16f9678b0301 SHA512 1f113acf21158c6d244dd8bafb9664f7acd70ef1f4f4fd48fd81b46b2b114bf59d77d02e80e4826002ca20e38083bc6ce0913051c458d7e13771ea67c909e0b7
+EBUILD npapi-sdk-9999.ebuild 387 BLAKE2B ab17a3761f4a41e182ef3016cf6b8b98e928c0717cf74540d34a1b8b39e56d7cadef8c7d71e397f3ccb88ab8e298451cb9ab81f8b7930530a736430e7024568a SHA512 fbef4e67de851b6027c8928c81d588239ea968fe6f20e0d74982956ee09ba15b08ea703a0e63c3d7eb9b3f0a9f317f5e52b3145fa41a9ce838c00001b49d55f3
+MISC metadata.xml 443 BLAKE2B 1e501dd78a1f3b7d9caea6c6d935b19d08d672fc054d50c22980df21ca536f32968a9a952aafbad1acedafc50256fe3d86db17ece531e3faa081a37cd451a5bb SHA512 2972f9d9367efdb7a37cbc28b9fcb5930b4898e367fe0d3538a0a328293aec9cd80163cfcdfb4fc42d2b676f763f88b7507c84a37212a08efa87b6a496d1287b
diff --git a/net-misc/npapi-sdk/metadata.xml b/net-misc/npapi-sdk/metadata.xml
index cc6d3e382c6a..00053de32b1c 100644
--- a/net-misc/npapi-sdk/metadata.xml
+++ b/net-misc/npapi-sdk/metadata.xml
@@ -10,6 +10,6 @@
 		<name>Gentoo Mozilla Team</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="bitbucket">mgorny/npapi-sdk</remote-id>
+		<remote-id type="github">mgorny/npapi-sdk</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild b/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild
index b44229e93f0c..b78350844400 100644
--- a/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild
+++ b/net-misc/npapi-sdk/npapi-sdk-0.27.2.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit autotools-utils
+EAPI=7
 
 DESCRIPTION="NPAPI headers bundle"
-HOMEPAGE="https://bitbucket.org/mgorny/npapi-sdk/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/npapi-sdk/"
+SRC_URI="https://github.com/mgorny/npapi-sdk/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-misc/npapi-sdk/npapi-sdk-9999.ebuild b/net-misc/npapi-sdk/npapi-sdk-9999.ebuild
index f627ee218d9c..30c5fda915de 100644
--- a/net-misc/npapi-sdk/npapi-sdk-9999.ebuild
+++ b/net-misc/npapi-sdk/npapi-sdk-9999.ebuild
@@ -1,29 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-#if LIVE
-AUTOTOOLS_AUTORECONF=yes
-EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
-
-inherit git-r3
-#endif
-
-inherit autotools-utils
+inherit autotools git-r3
 
 DESCRIPTION="NPAPI headers bundle"
-HOMEPAGE="https://bitbucket.org/mgorny/npapi-sdk/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/npapi-sdk/"
+EGIT_REPO_URI="https://github.com/mgorny/${PN}.git"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS=""
 IUSE=""
 
 DEPEND="virtual/pkgconfig"
-#if LIVE
 
-KEYWORDS=""
-SRC_URI=
-#endif
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index 8ebd7ce693e2..fe0dd79322e0 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -1,10 +1,8 @@
 AUX ofono.initd 418 BLAKE2B 0a0f8894ec52b7213e46c8a1474f1a6061324f6e31842910e241e40e88fdb92c15560f9a8744922fea9cf83114a242315de910fe849918e9e26f7b8ce63831ad SHA512 ef86f8e4d3b30d98eee5849c85fd8fd1bed0d8ac9c76bcce91440483439dbaea36e1ff3529fe8f5c1b0255a91917ab67d98513cafcae8f0031cce1bf3f133704
 DIST ofono-1.16.tar.xz 854296 BLAKE2B 4ee8f895e21903b8181fe14f5a91fea466eb3a2f66c8a5ab270a8dd81c601dc5e2a1beae368cf0f14b556f0dfb8301439d40d93bfd1d058d43ce864cdd1f0788 SHA512 21887e1bc3b8af18881f9456f950b97885b567164e28ebe2ab6fc5a3042c439891a20b5034a8fa0c7a78567286ac53c1b8a72122f428fbcf5da8bf139423b913
-DIST ofono-1.28.tar.xz 1016308 BLAKE2B 0aec5bc6c845c0906548f62bda95bfee5ca5ef17bc2defd60fe4b0967b9f58fcbbbfeb9593aa33f6852360266ea4ea025a87a07ac95ef50829b592accfb5bc72 SHA512 963471fac89db746d0e99fee805413342203be0d200bc14f0e56c5ec3053e25ea8112943657c88c57c539ae485ac11eb5f80052aad12443c248888f6e6a4114e
-DIST ofono-1.29.tar.xz 1019512 BLAKE2B e073f324c58fee1beac31ba685d92ee85814ccb072aaedc0fa2d0d25419d60449557fcabd0e1b3e5aad6c349582a2abe6fb69094f36b61dbea0f94ed0f8dff4e SHA512 14c3cd3a7ee134dd85f286e3ce47914a10c48a9a2bbbebd0d2715334f233a9b7e4e01bae5a151e4f4b3fb3e98eab96ba345f3fb2c2960d2f9c0645f36c218a99
 DIST ofono-1.30.tar.xz 1030428 BLAKE2B 94248b7eb7b48000333fdee38eaecf13c259adf2ca71946a25c06463abc052c568974981b0116ef5e006a6bd9f106a0bf2a5d2b1f9ad06beaffceff6cb3bbde4 SHA512 e65c5af7f09eef31c1e8c2b8202315b1bfeeb18e6e3cca07e3758ee693e51f8d8007211cba9e0da17656b063f362858a51234908c89a2bfd1ef0e057d538bda5
+DIST ofono-1.31.tar.xz 1049252 BLAKE2B f7b40d3aa7854369a7886a4b64bb66044e8f016682665935f7727bf219c084d266d8fd7f80c97e58234d845f7db3dc52133298697274745d115cf14c62769d82 SHA512 377cda34dcc92d1f339a4b3271de5a14afaf309061c4467e5af18089cd821e65c0d8ad29d07e96d0f0480bb51554b284afb6bc2b9da586cc30dc0c1440612b20
 EBUILD ofono-1.16.ebuild 1624 BLAKE2B 1948438d3150f5cdc848ce72c10fcd70105d1854bec2f0e941d5eb24aaf869826e6e7de8b7b46c92d4f9a5a56a537baacaecce29d406abf1302964b4ab46a2e7 SHA512 fafe6075e7c1abb6b513c0a09620c61ce8e1472b6972d69ec23bfc652b7b63d2e983affe67bad31a5160e885e40576d3c67230e4f67ab0c989714ece954457bd
-EBUILD ofono-1.28.ebuild 1642 BLAKE2B 4588c877b0dbeb2eb46d65b6e0eaee6bbe2d55f6d9bebe272346fd925bcda89909fd18db0e641962b4de28a1b5e319a8bf17adc2ac07033d94cee43fa4221bec SHA512 f5eeb1ec9a0df58193fc1cf260155af8ea5cc4a1a69451051df31cb9d8ecd68ab64e66dcc949831c0d99173e62bf18cc1f50f5f705254d2fa803a19d1e462784
-EBUILD ofono-1.29.ebuild 1642 BLAKE2B 4588c877b0dbeb2eb46d65b6e0eaee6bbe2d55f6d9bebe272346fd925bcda89909fd18db0e641962b4de28a1b5e319a8bf17adc2ac07033d94cee43fa4221bec SHA512 f5eeb1ec9a0df58193fc1cf260155af8ea5cc4a1a69451051df31cb9d8ecd68ab64e66dcc949831c0d99173e62bf18cc1f50f5f705254d2fa803a19d1e462784
 EBUILD ofono-1.30.ebuild 1642 BLAKE2B 4588c877b0dbeb2eb46d65b6e0eaee6bbe2d55f6d9bebe272346fd925bcda89909fd18db0e641962b4de28a1b5e319a8bf17adc2ac07033d94cee43fa4221bec SHA512 f5eeb1ec9a0df58193fc1cf260155af8ea5cc4a1a69451051df31cb9d8ecd68ab64e66dcc949831c0d99173e62bf18cc1f50f5f705254d2fa803a19d1e462784
+EBUILD ofono-1.31.ebuild 1642 BLAKE2B 4588c877b0dbeb2eb46d65b6e0eaee6bbe2d55f6d9bebe272346fd925bcda89909fd18db0e641962b4de28a1b5e319a8bf17adc2ac07033d94cee43fa4221bec SHA512 f5eeb1ec9a0df58193fc1cf260155af8ea5cc4a1a69451051df31cb9d8ecd68ab64e66dcc949831c0d99173e62bf18cc1f50f5f705254d2fa803a19d1e462784
 MISC metadata.xml 951 BLAKE2B fd63ccff3b96dea1e770b7ec50c1a9e5e583fe81bcb2ca9c1915386a4fbd85a30c806f9ac3e163b1110e93b44f6714c555cee9273ecf90d5a9f9e209f0774897 SHA512 26f8b8b3ac43991d14534b4b1257a5c4dc1dd0eaca83c9f30aab74bbc721d9573e93e8f245a4ac2d0805ea9325aa759ca144951fef1b158b0b68f54df4df3e7e
diff --git a/net-misc/ofono/ofono-1.29.ebuild b/net-misc/ofono/ofono-1.29.ebuild
deleted file mode 100644
index 406ed49a7a36..000000000000
--- a/net-misc/ofono/ofono-1.29.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils multilib systemd
-
-DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
-HOMEPAGE="https://01.org/ofono"
-SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower"
-
-REQUIRED_USE="dundee? ( bluetooth )"
-
-RDEPEND=">=sys-apps/dbus-1.4
-	>=dev-libs/glib-2.32
-	net-misc/mobile-broadband-provider-info
-	bluetooth? ( >=net-wireless/bluez-4.99 )
-	udev? ( virtual/udev )
-	examples? ( dev-python/dbus-python )
-	tools? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog AUTHORS )
-
-src_configure() {
-	econf \
-		$(use_enable udev) \
-		$(use_enable isimodem) \
-		$(use_enable atmodem) \
-		$(use_enable cdmamodem) \
-		$(use_enable datafiles) \
-		$(use_enable dundee) \
-		$(use_enable bluetooth) \
-		$(use_enable phonesim) \
-		$(use_enable provision) \
-		$(use_enable qmimodem) \
-		$(use_enable tools) \
-		$(use_enable examples test) \
-		$(use_enable upower) \
-		--disable-maintainer-mode \
-		--disable-rilmodem
-		--localstatedir=/var \
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-
-	if use tools ; then
-		dobin tools/auto-enable \
-			tools/huawei-audio \
-			tools/lookup-provider-name \
-			tools/lookup-apn \
-			tools/get-location \
-			tools/tty-redirector
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	use doc && dodoc doc/*.txt
-}
diff --git a/net-misc/ofono/ofono-1.28.ebuild b/net-misc/ofono/ofono-1.31.ebuild
index 406ed49a7a36..406ed49a7a36 100644
--- a/net-misc/ofono/ofono-1.28.ebuild
+++ b/net-misc/ofono/ofono-1.31.ebuild
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index e4925b010dec..0ea69ec3269c 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -20,12 +20,7 @@ AUX openssh-7.9_p1-hpn-sctp-glue.patch 597 BLAKE2B d7ac82653c48467ebdc59e1444eea
 AUX openssh-7.9_p1-include-stdlib.patch 914 BLAKE2B 9c7eb79f87ecd657a80821dfa979d8b0cc12a08d385ec085724f20aa6f5332593ffc7481bb9f816e91df3eb4d75d8f7b66383ff473d271270de128c3b2bf92e5 SHA512 7dade73bdafb0da484cbd396b4a644442f8ea12fef54c07e6308ae2e73a587fa4ddf401e8a0c467469b46fe7f00585e047462545182924c157b4d3894c707a70
 AUX openssh-7.9_p1-openssl-1.0.2-compat.patch 514 BLAKE2B e3859c2bed0e4116e558e7ea8c4679a8666316c26a650acd93ea023444bf69fafad6eba47a6faef7c017d812da76fe93a291e51c427ddecc1fe89bd362758403 SHA512 dde28496df7ee74a2bbcf0aba389abefade3dc41f7d10dc6d3c1a0aca087478bafe10d31ec5e61e758084fa0a2a7c64314502091d900d9cee487c1bdc92722a6
 AUX openssh-8.0_p1-GSSAPI-dns.patch 11634 BLAKE2B 80c304f2a8df328b77a4531bc499bbc83c378007bfd01412a3c879d8a45aa26a68d3fb2b9469f037ec37e5d54fa22aa87c5f963329fb67a16690dcb30407eec9 SHA512 075e0734a15f593a641e3fbc49c7502dc75722501ce6762f0df7a5b5fafb3cceaff05ad9e0bdcb3636b4bb20cf6e680cc20e8d242b6de9b7cec972ba12118ecd
-AUX openssh-8.0_p1-X509-12.0-tests.patch 531 BLAKE2B cfb14747ed4e39d11d7727b779753ddf5f7e94be56d1dbe0a76131d8434dd4453c253467ec1eb7cac49a50f5a3f81c82b804926f46dc79ed09c252397ac9d349 SHA512 7f1322a94aa79c822a8bede36a92fe48dc6b9bf7ceca3068450877b543a1d186031060d642c7d689c02e06ef3e038eae9739deda53c6401439ed20808e82ff10
 AUX openssh-8.0_p1-X509-12.1-tests.patch 405 BLAKE2B 1a1c29fea98c4ce277c943709576b5130a573e9786a33c957229d74d0e572ca6e5d0dce68b5b515b5c3f44862f1f4dafe2dad1cd3d3710ca415137f8a4013b86 SHA512 0e80b79d3aa8b7e89cf250b31e6bbc2471990b9a2c0ab8b54e6af4c3de77adff3dc6db83f4f14524f830455b5ce4d586f630d33b4ac4b134d1028e325ab351b3
-AUX openssh-8.0_p1-X509-dont-make-piddir-12.0.patch 814 BLAKE2B 596967e4b13d59b1fedff8fbdde7b824bf495c10d4386510b04d38cc518ea18b4dba90ec0b26692634858b39ae964865791f829a52350a9f122e7104ca4a32c1 SHA512 68b8e9235626594eb022f4bb67f11fbcc2a0236377dc26900be17d22b9aa33f1e72bf8aed868ef9f98f8a45d1a2e626411ae08dfb12575015368350a2511fda9
-AUX openssh-8.0_p1-X509-dont-make-piddir-12.1.patch 812 BLAKE2B a7ded816857183e6a35dd4706ff5c4f4788e2eee5afb08dd59aedd13f0a7d3efc04f74df43bb23d808c8ba53866fdbc1cc89a15ec1b28a995a29181430bffbcf SHA512 1fdc152be81c7a19d8d15c8da03c3de0456cdccb715d1c1fdeea6b7ef89b838e560886dc20d85696fd1105d00512aff884c20ed4117a5afae5c0c00e74831aa5
-AUX openssh-8.0_p1-X509-glue-12.0.patch 825 BLAKE2B 9fc0b5b291551d55770bddcf23d44601d15cbc23a6d8f0795cd064f53e1bc2e49056b23b2d7db0aa25e31e8b68c71ef476cb926a7efa765edf81440489711225 SHA512 edd8c0bdc3b90f7afce8eb5d91ec1344b6e22fc9d16787f63eaee9a576178f5e0b4937fb0dc2640779c049a9102ece63360fef4f690b09894ec46995e0f5ebe2
-AUX openssh-8.0_p1-X509-glue-12.1.patch 825 BLAKE2B 494e16224e9dc9b90c61f7d3721305192344fe41631c6088768b578f8c5620d8e664403105073ef702df4cf234f00279e5e02fb637b2d392ea9b1a1b962b9b67 SHA512 966553aaf2188395f7d3ac05e91a604fe8db47f781b2c1e01ce7cd5a42bff0e3c76c1fbcf557ee3fbcf16ab77de61b8f9812499553f05c843e1048cd713593e4
 AUX openssh-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch 977 BLAKE2B b2e28683176c4678f51a9a0be3e29496620ac795c7de4649fb3cc0bd076682e42bc1c606b17a76e140f51319e4c4a1cc890c3a37c4bc3cf9222a88e31b8a773f SHA512 8c2567ae16dccc73e302ba90c1bb03e19d4afc3892dd8e1636d7c8853932662eccbda3957e4db55a21bd37d2e65abe74b0b2c1efb74e31751335eb523759d945
 AUX openssh-8.0_p1-fix-an-unreachable-integer-overflow-similar-to-the-XMSS-case.patch 2696 BLAKE2B 86bac20233102c5beefb3a79e2da8c5421d47d1c175e9e602f14c127e1bf7ec67e193620461ebd7a835bae556dbf9db904c3f63bbd3283a04dac444f34a3eab8 SHA512 f951cdc664088a124754fe963bb6abc659264183a3c773d61243bb12ca87f7554422d9acabb86c6390fe0e088fee60cc3129ad85e336ebf84f5c126d61d1fa3f
 AUX openssh-8.0_p1-fix-integer-overflow-in-XMSS-private-key-parsing.patch 506 BLAKE2B d4e88cc9553c6e2708447edd3ceeeea4f6c967893f34cad6c5fc980ee46895b64b58c5b8d271b7363e7144d34e05fd1e9519e01a9bb05d7c2cc5a9613b2b096c SHA512 cae5a9f5c46a2c70be4284bc050b69dab347181397a9e34c0c2ee5a470992070a2b8359ade42ce6840b5ff6311d3b0026bf6d548e944662c481a74456737a095
diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-12.0-tests.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-12.0-tests.patch
deleted file mode 100644
index 9766b1594ea0..000000000000
--- a/net-misc/openssh/files/openssh-8.0_p1-X509-12.0-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur openssh-7.9p1.orig/openbsd-compat/regress/Makefile.in openssh-7.9p1/openbsd-compat/regress/Makefile.in
---- openssh-7.9p1.orig/openbsd-compat/regress/Makefile.in	2018-10-16 17:01:20.000000000 -0700
-+++ openssh-7.9p1/openbsd-compat/regress/Makefile.in	2018-12-19 11:03:14.421028691 -0800
-@@ -7,7 +7,7 @@
- CC=@CC@
- LD=@LD@
- CFLAGS=@CFLAGS@
--CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
-+CPPFLAGS=-I. -I.. -I$(srcdir) -I../.. @CPPFLAGS@ @DEFS@
- EXEEXT=@EXEEXT@
- LIBCOMPAT=../libopenbsd-compat.a
- LIBS=@LIBS@
diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.patch
deleted file mode 100644
index aac98fef35df..000000000000
--- a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.0.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/openssh-8.0p1+x509-12.0.diff	2019-04-18 14:53:26.850768799 -0700
-+++ b/openssh-8.0p1+x509-12.0.diff	2019-04-18 14:56:48.870364519 -0700
-@@ -33578,12 +33578,11 @@
-  
-  install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
-  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
--@@ -334,6 +352,8 @@
-+@@ -334,6 +352,7 @@
-  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
-  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
-  	$(MKDIR_P) $(DESTDIR)$(libexecdir)
- +	$(MKDIR_P) $(DESTDIR)$(sshcadir)
--+	$(MKDIR_P) $(DESTDIR)$(piddir)
-  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
-  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
-  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.1.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.1.patch
deleted file mode 100644
index 9bb081a50919..000000000000
--- a/net-misc/openssh/files/openssh-8.0_p1-X509-dont-make-piddir-12.1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/openssh-8.0p1+x509-12.1.diff	2019-04-29 14:11:55.210175168 -0700
-+++ b/openssh-8.0p1+x509-12.1.diff	2019-04-29 14:12:55.603761971 -0700
-@@ -34176,12 +34176,11 @@
-
-  install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
-  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
--@@ -334,6 +352,8 @@
-+@@ -334,6 +352,7 @@
-  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
-  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
-  	$(MKDIR_P) $(DESTDIR)$(libexecdir)
- +	$(MKDIR_P) $(DESTDIR)$(sshcadir)
--+	$(MKDIR_P) $(DESTDIR)$(piddir)
-  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
-  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
-  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.0.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.0.patch
deleted file mode 100644
index 1667e13850cf..000000000000
--- a/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.0.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/openssh-8.0p1+x509-12.0.diff	2019-04-18 14:53:02.804935946 -0700
-+++ b/openssh-8.0p1+x509-12.0.diff	2019-04-18 14:53:26.850768799 -0700
-@@ -75925,16 +75925,6 @@
- +	return mbtowc(NULL, s, n);
- +}
- +#endif
--diff -ruN openssh-8.0p1/version.h openssh-8.0p1+x509-12.0/version.h
----- openssh-8.0p1/version.h	2019-04-18 01:52:57.000000000 +0300
--+++ openssh-8.0p1+x509-12.0/version.h	2019-04-18 19:07:00.000000000 +0300
--@@ -2,5 +2,4 @@
-- 
-- #define SSH_VERSION	"OpenSSH_8.0"
-- 
---#define SSH_PORTABLE	"p1"
---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
--+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
- diff -ruN openssh-8.0p1/version.m4 openssh-8.0p1+x509-12.0/version.m4
- --- openssh-8.0p1/version.m4	1970-01-01 02:00:00.000000000 +0200
- +++ openssh-8.0p1+x509-12.0/version.m4	2019-04-18 19:07:00.000000000 +0300
diff --git a/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.1.patch b/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.1.patch
deleted file mode 100644
index d6b6c5ac2f79..000000000000
--- a/net-misc/openssh/files/openssh-8.0_p1-X509-glue-12.1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/openssh-8.0p1+x509-12.1.diff	2019-06-17 10:42:03.233392491 -0700
-+++ b/openssh-8.0p1+x509-12.1.diff	2019-06-17 10:42:24.696248976 -0700
-@@ -78536,16 +78536,6 @@
- +	return mbtowc(NULL, s, n);
- +}
- +#endif
--diff -ruN openssh-8.0p1/version.h openssh-8.0p1+x509-12.1/version.h
----- openssh-8.0p1/version.h	2019-04-18 01:52:57.000000000 +0300
--+++ openssh-8.0p1+x509-12.1/version.h	2019-06-16 15:07:00.000000000 +0300
--@@ -2,5 +2,4 @@
-- 
-- #define SSH_VERSION	"OpenSSH_8.0"
-- 
---#define SSH_PORTABLE	"p1"
---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
--+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
- diff -ruN openssh-8.0p1/version.m4 openssh-8.0p1+x509-12.1/version.m4
- --- openssh-8.0p1/version.m4	1970-01-01 02:00:00.000000000 +0200
- +++ openssh-8.0p1+x509-12.1/version.m4	2019-06-16 15:07:00.000000000 +0300
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index ae51520f5830..a658d414c664 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,5 +1,7 @@
 DIST owncloudclient-2.5.3.11470.tar.xz 16719780 BLAKE2B 0c10d95ef2d851ba3f728dfe1c55c4143cf9d1542c1f9e77904324f598ecbfa29e54119d12ebef78b8eafa1188e7359ce11d01034ff34a55a80d31d1d3b1db35 SHA512 331d8e8e71d64cf9c958f9391001c6fdff45795e7caad2ce7bf6802c4f0959adf694712cd298fb8702cd4e93577282957cabc61ccc5f4f3a57edc9ddf1c7c2a0
 DIST owncloudclient-2.5.4.11654.tar.xz 16720764 BLAKE2B f970e3ed5fbe465f93e9c4f4c2106604a08ada765f8692e1287878b7deb44ac92c53608f34b24a9c913510a5625c4e980c9ac2646689700e38e78822d3e98d21 SHA512 70b687d7ace4d1335388ebf60bf65137943ff0cadfefdcaffb09539c656889233100033f28db7d03f3d48f4b956aeed476bb458f8ef16ac5461287cf02e226d9
-EBUILD owncloud-client-2.5.3.11470-r1.ebuild 1915 BLAKE2B 7f1927b02f1726ef0052b3ea1a981d9cb7e8def3dca2ceca810c15812c9496ab3e1376032e49ee2105820ee9b467476ac5859661d4209832b84bd1405f578f05 SHA512 3f8868e83c006325135b7a9887747a36cffb6b4b4c93d26a0064f5e15683f7dce443c92470be3ba25127d1d4983a30b900200e996781d4a17c60ccb0b445c6fb
-EBUILD owncloud-client-2.5.4.11654.ebuild 1915 BLAKE2B 7f1927b02f1726ef0052b3ea1a981d9cb7e8def3dca2ceca810c15812c9496ab3e1376032e49ee2105820ee9b467476ac5859661d4209832b84bd1405f578f05 SHA512 3f8868e83c006325135b7a9887747a36cffb6b4b4c93d26a0064f5e15683f7dce443c92470be3ba25127d1d4983a30b900200e996781d4a17c60ccb0b445c6fb
+DIST owncloudclient-2.6.0.13018.tar.xz 17311396 BLAKE2B b0c76b2fea51ca9e71f918ada2b99ce20b9b62494c41608e804c4ca0c8aafe59897fea31d28bed1ec61feefca4b4b6e783c6fa777ea56524e7c18d1a460ab954 SHA512 b8eb9dc6f9c061a74fee3f31926a3fb7f5093277955fe327d1169c84f929d1e1ad8da472a7098c1c10399f395c6bfc3b2684cf4c85cddc5e45b733abfb8e4046
+EBUILD owncloud-client-2.5.3.11470-r1.ebuild 1943 BLAKE2B 62f7abcd01c755da4f088a363d4b9d7d0f4cfe64a9beb76e20746d657c50c1f8918864a2b63fdf449720af08162a43fb5bb95cea38df29970780a7070991f585 SHA512 d93b89fa803a994b9fc87ea6e90ca5e0f9034f6b3e4c5fdcf8ce9822d7027fc0e523df1c153adba5371b1b6811a8a46c9748a9dffbf0a9e239a351f3cdf2c3a7
+EBUILD owncloud-client-2.5.4.11654.ebuild 1943 BLAKE2B 62f7abcd01c755da4f088a363d4b9d7d0f4cfe64a9beb76e20746d657c50c1f8918864a2b63fdf449720af08162a43fb5bb95cea38df29970780a7070991f585 SHA512 d93b89fa803a994b9fc87ea6e90ca5e0f9034f6b3e4c5fdcf8ce9822d7027fc0e523df1c153adba5371b1b6811a8a46c9748a9dffbf0a9e239a351f3cdf2c3a7
+EBUILD owncloud-client-2.6.0.13018.ebuild 1943 BLAKE2B 62f7abcd01c755da4f088a363d4b9d7d0f4cfe64a9beb76e20746d657c50c1f8918864a2b63fdf449720af08162a43fb5bb95cea38df29970780a7070991f585 SHA512 d93b89fa803a994b9fc87ea6e90ca5e0f9034f6b3e4c5fdcf8ce9822d7027fc0e523df1c153adba5371b1b6811a8a46c9748a9dffbf0a9e239a351f3cdf2c3a7
 MISC metadata.xml 508 BLAKE2B cbba1d7edcfe92d38f2f0d959695cac4f2c1eef8949e9816a995b18432a5c372185094cfa2548787ee63d58175b2110792f5e51688bc456c6376d86a7e8d9864 SHA512 1e757d6db30a7d5d90f317325fa96a1bdf46029e79846d17637f699d07ffa9f489f2d66855c647896a7b932e545b91242cc9df1dbb4bcce83e266c13c8fcf6c1
diff --git a/net-misc/owncloud-client/owncloud-client-2.5.3.11470-r1.ebuild b/net-misc/owncloud-client/owncloud-client-2.5.3.11470-r1.ebuild
index 37f3df0acddb..406a7f288f9f 100644
--- a/net-misc/owncloud-client/owncloud-client-2.5.3.11470-r1.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.5.3.11470-r1.ebuild
@@ -47,6 +47,8 @@ DEPEND="${COMMON_DEPEND}
 		dev-qt/qttest:5
 	)"
 
+RESTRICT="!test? ( test )"
+
 S=${WORKDIR}/${P/-}
 
 src_prepare() {
diff --git a/net-misc/owncloud-client/owncloud-client-2.5.4.11654.ebuild b/net-misc/owncloud-client/owncloud-client-2.5.4.11654.ebuild
index 37f3df0acddb..406a7f288f9f 100644
--- a/net-misc/owncloud-client/owncloud-client-2.5.4.11654.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.5.4.11654.ebuild
@@ -47,6 +47,8 @@ DEPEND="${COMMON_DEPEND}
 		dev-qt/qttest:5
 	)"
 
+RESTRICT="!test? ( test )"
+
 S=${WORKDIR}/${P/-}
 
 src_prepare() {
diff --git a/net-misc/owncloud-client/owncloud-client-2.6.0.13018.ebuild b/net-misc/owncloud-client/owncloud-client-2.6.0.13018.ebuild
new file mode 100644
index 000000000000..406a7f288f9f
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.6.0.13018.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="https://owncloud.org/"
+SRC_URI="https://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin nautilus 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
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	shibboleth? ( dev-qt/qtwebkit:5 )"
+
+RDEPEND="${COMMON_DEPEND}"
+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
+	)"
+
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${P/-}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	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}
+		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-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/proxychains/Manifest b/net-misc/proxychains/Manifest
index 644b1a717776..8a8aec21b15e 100644
--- a/net-misc/proxychains/Manifest
+++ b/net-misc/proxychains/Manifest
@@ -1,4 +1,7 @@
 AUX proxychains-4.12-makefile.patch 1269 BLAKE2B e52a59dd39e19c063cf37455aef06551bfb93f12b12c39c432237d80552c2833bc40a7aa033548770f3ae921c0a929ddefe8a495b84448bffad13548f307417a SHA512 c25bae5b6d72c496cc4d92b0f8db22a113bd5e138cfccd0c5cebe45788f2dc88a4e2b194a86e635619e5ba575747bbf460b246efb35993544dab06b12009ea04
+AUX proxychains-4.14-makefile.patch 1299 BLAKE2B 9c53f252910da0f0247c95e74856703bf257a9d7c5a4bf91cbf4574f117dd7d6dc800a1def5d772d6ab74194db92d053e759d2ae2955d5d1d11fb4598b0f0d6e SHA512 79dde568a605a085208a2cefa23780448a71b44a273ebe8f19f2ba478b33eeb29b38a478a5c2aa88dcf2352f52aefded8ac8985ccf52839e8b332bf885381203
 DIST proxychains-ng-4.12.tar.xz 31816 BLAKE2B 1267cd67ca3a21737abe9e510103c35e409a4afebf30c8917b7be8a84f1bb4edc55b6ec633eb5e63682ed2f6c277a464e16adaa52c70c8bac2588cfe7b36f1a6 SHA512 c1319065b2885fb16f1cd10092a25f49c20ace82dc67edcb2e8845fe79274fe63f5214d117eef3bfdffdc6aa8bf6904ea216047bd626043c5ecb36cd15d5560a
+DIST proxychains-ng-4.14.tar.xz 33844 BLAKE2B 598dd7973fd341a9916ece55ee18aeb0e0654d01659ffd3f5b7b9437fbb3660376aca77cd1326553a1beffd1ea4f95c6eb3da9c0f6ce43f3d72b1a16cf2bab4e SHA512 75a1a4629d2b7ebac9b909a694b395339cf669fa4e23bfcc57938e46377b5619f31c9651d2bc457d1ad10ec1be7747981106392bf8bf65999cb7bb9c748d7e95
 EBUILD proxychains-4.12-r1.ebuild 1053 BLAKE2B 3a7efc6ab9b696cc44abef396a81c23311c674260dee94e6957c844f6dc7692b53466ca6606766ca53658b00eac1b130410e934ebaa6fb9acb4f91435c1d9526 SHA512 5ec56256c1a1ba7ef38cc47143d6a10adddde05974c14cccc0e85ca2844b103115e02a5740395a1e8b0baab2e5f1e88d48a265c34af64845c66db3887d4bb558
-MISC metadata.xml 332 BLAKE2B ec0a64e6a8b98117123ea94cdea29f12583127fda7ee5e5bb8e538628652971674df48012f8b07cd89994b9bc1badc1f42276dae92d899dd4983109f302ba42a SHA512 fd3dc4c1f4bc62a11a150838c07c619a57dcac24070b56594e73c0fc75551432449da46424b3c1072d24c2c0dbc0ffc02af8473772c4adf5d72da86b68d0e5eb
+EBUILD proxychains-4.14.ebuild 1038 BLAKE2B 159f93afdf7b3c839bd1b23f74387c812b087b327ef85da98ce844bc499e45aaace2968a867847d101d1814a14fc2eb5c9eb32ab5ca698a0242dbff9d77b3989 SHA512 a5e158942cb57d0cfa34b223e3552450f65d8dce6990ae9629fc7d781c0aefdc2ee293304b11d022c1af2a2cbd1dd4fef5bf061fff01c77a125fe75fc519c279
+MISC metadata.xml 253 BLAKE2B 3e4b9b170b225b9391c36cf88a21abdcae8482183a3455b61290468e87ff293831ce690981b2359b67454a6245503ea40150cbda72375033f4d25bf7f66337d7 SHA512 1193e3a626c519491a529009a6df3dd2fb76de6e6510e825f01ea9f5ad5f61b2b27a3bef5a1fae47aa1a922d02faef8b4a1691cee99665a5d6492c4c73effc17
diff --git a/net-misc/proxychains/files/proxychains-4.14-makefile.patch b/net-misc/proxychains/files/proxychains-4.14-makefile.patch
new file mode 100644
index 000000000000..3724ec6a5a22
--- /dev/null
+++ b/net-misc/proxychains/files/proxychains-4.14-makefile.patch
@@ -0,0 +1,43 @@
+--- proxychains-ng-4.14/Makefile
++++ proxychains-ng-4.14/Makefile
+@@ -22,10 +22,8 @@
+ 
+ GENH = src/version.h
+ 
+-CFLAGS  += -Wall -O0 -g -std=c99 -D_GNU_SOURCE -pipe
+-NO_AS_NEEDED = -Wl,--no-as-needed
+-LIBDL   = -ldl
+-LDFLAGS = -fPIC $(NO_AS_NEEDED) $(LIBDL) -lpthread
++CFLAGS  = -Wall -std=c99 -D_GNU_SOURCE
++LIBS    = -ldl -lpthread
+ INC     = 
+ PIC     = -fPIC
+ AR      = $(CROSS_COMPILE)ar
+@@ -36,11 +34,11 @@
+ LD_SET_SONAME = -Wl,-soname=
+ INSTALL = ./tools/install.sh
+ 
+-LDSO_PATHNAME = libproxychains4.$(LDSO_SUFFIX)
++LDSO_PATHNAME = libproxychains.$(LDSO_SUFFIX)
+ 
+ SHARED_LIBS = $(LDSO_PATHNAME)
+ ALL_LIBS = $(SHARED_LIBS)
+-PXCHAINS = proxychains4
++PXCHAINS = proxychains
+ ALL_TOOLS = $(PXCHAINS)
+ ALL_CONFIGS = src/proxychains.conf
+ 
+@@ -82,11 +80,10 @@
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_MAIN) $(INC) $(PIC) -c -o $@ $<
+ 
+ $(LDSO_PATHNAME): $(LOBJS)
+-	$(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) $(USER_LDFLAGS) \
+-		-shared -o $@ $(LOBJS) $(SOCKET_LIBS)
++	$(CC) $(LDFLAGS) $(LD_SET_SONAME)$(LDSO_PATHNAME) -shared $(PIC) -o $@ $(LOBJS) $(LIBS) $(SOCKET_LIBS)
+ 
+ $(ALL_TOOLS): $(OBJS)
+-	$(CC) src/main.o src/common.o $(USER_LDFLAGS) -o $(PXCHAINS)
++	$(CC) $(LDFLAGS) src/main.o src/common.o -o $(PXCHAINS)
+ 
+ 
+ .PHONY: all clean install install-config install-libs install-tools
diff --git a/net-misc/proxychains/metadata.xml b/net-misc/proxychains/metadata.xml
index 08334168ca3c..5046f26bf419 100644
--- a/net-misc/proxychains/metadata.xml
+++ b/net-misc/proxychains/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>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">rofl0r/proxychains-ng</remote-id>
 	</upstream>
diff --git a/net-misc/proxychains/proxychains-4.14.ebuild b/net-misc/proxychains/proxychains-4.14.ebuild
new file mode 100644
index 000000000000..9897fb23beb4
--- /dev/null
+++ b/net-misc/proxychains/proxychains-4.14.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs multilib
+
+MY_PN=${PN}-ng
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="force any tcp connections to flow through a proxy (or proxy chain)"
+HOMEPAGE="https://github.com/rofl0r/proxychains-ng/"
+SRC_URI="http://ftp.barfooze.de/pub/sabotage/tarballs/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_prepare() {
+	default
+	sed -i "s/^\(LDSO_SUFFIX\).*/\1 = so.${PV}/" Makefile || die
+	tc-export CC
+}
+
+src_configure() {
+	# not autotools
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--sysconfdir="${EPREFIX}"/etc \
+		|| die
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc AUTHORS README TODO
+
+	dolib.so lib${PN}.so.${PV}
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV:0:1}
+	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+	insinto /etc
+	doins src/${PN}.conf
+}
diff --git a/net-misc/r8168/Manifest b/net-misc/r8168/Manifest
index ddaaf912f4cf..a5c885e77655 100644
--- a/net-misc/r8168/Manifest
+++ b/net-misc/r8168/Manifest
@@ -1,6 +1,6 @@
 AUX linux-4.15-2.patch 3248 BLAKE2B 376d3ba01865ed6cfcedc7900e4a034881abb0ff5a98bc4f40a51122a6950f92ecfbb9e36590be3e735f69f4639b889d1d4b5e215fccf92090e157d96ce49f77 SHA512 b4bfb0f1674c1add10b743438853abe3892d7355d251d30cc5ee927c161541e8bb32ec0e89db1db3ca96f29f3273fe53cbce58e75094216e7f7738a952c430aa
 DIST r8168-8.045.08.tar.bz2 104427 BLAKE2B 56e332b518aa3c244750310a77d53ca2fc9a365f4a043e452c5593bcfcd5679c882d35b9977438ddb6a42ba40bb7c9b45e73926fda37c372314d57290ea3ffab SHA512 9037527f193d59da8bcf69396582e13acb58880ce52328e596ffb469352d38649d43f3c31b01ed607773bba1624561f299b3909dd6124448ed75e8f548d80563
-DIST r8168-8.047.04.tar.bz2 108928 BLAKE2B 825426342d482a710b8d0f120f91356fdad03a924ed263c51e6ff3cf3ee3b7f470144364ee1a2f43acd45a90237f65eb77191b210a7991e8d74c48d104d1b059 SHA512 29d4405cdf9e7588a8a8b75ba99a1fadf9022f139e25b521eb9f5b6b61a96772239e9a7cdf442fae213f6b0a91c98bae892e2a8e076a5f5ef6c17e69db4482c1
+DIST r8168-8.047.05.tar.bz2 108933 BLAKE2B 03e0bd90c970fc5f98f3e2e2a5d724891a6ffdfe53dc9de1e30b6c855658d53944ed1d8f996edf63ac448194d917685ef8902d6960fafebfe695453e8ea34e51 SHA512 a58cbbdfd836373ad65607908bd84e48a93222966c65d190ae5dff20621b55976c044c31a18e1c00ea5c4c6d66ac300acdc7537d4dec5dd1e281f0ad33bb24e6
 EBUILD r8168-8.045.08.ebuild 764 BLAKE2B b337a217df697f7ed8ff91b812cea9e59864d2b7b6f5d45f35d97805137bd0d333505ec275abf1f1f5b69914bc95b6df183c9af914d69091f07d0e74d66e3698 SHA512 9eb1659e0aff4ad03cd9fc0a63b473427c2ce6aed67b800533aa11bda7666c58a544309cd5e65f799894a1e609a2bebea2ea7bec3e6828110372053370c8e629
-EBUILD r8168-8.047.04.ebuild 920 BLAKE2B dab9ae702be8ab8a3831cd5bffa59cc50568a39fac3151808fbc13ec35c8b3564b13a952784361ebb4a02f12de3464ae8b8a03b125706bb01f27bd77d0bec7ba SHA512 6fa701e698809e092cec6f333218b01afcad37e593de77b4875c5f22af3ac38013569ba8280954bee6c1618b55d004a27c0707aa424f1e9e37b4edeb108479c5
+EBUILD r8168-8.047.05.ebuild 920 BLAKE2B dab9ae702be8ab8a3831cd5bffa59cc50568a39fac3151808fbc13ec35c8b3564b13a952784361ebb4a02f12de3464ae8b8a03b125706bb01f27bd77d0bec7ba SHA512 6fa701e698809e092cec6f333218b01afcad37e593de77b4875c5f22af3ac38013569ba8280954bee6c1618b55d004a27c0707aa424f1e9e37b4edeb108479c5
 MISC metadata.xml 484 BLAKE2B d2e95cf281876ff9ac28d8c35fb696b4a813d40abbe84756f7cb83f6b6c495f89d6cbb3490ef7813eb0bc3b60ee31bfb00c14b6f4a351c7e14e207537cccd0f5 SHA512 7abfc4933b44ad4365a455892cc10ef3797827f87db77e8b8349e19f6d77922bf9c3c094e5f5c29694bc240e43ac72e88daf3acc3ed8d63ffd4b90554fe9e67e
diff --git a/net-misc/r8168/r8168-8.047.04.ebuild b/net-misc/r8168/r8168-8.047.05.ebuild
index 5d05429e616c..5d05429e616c 100644
--- a/net-misc/r8168/r8168-8.047.04.ebuild
+++ b/net-misc/r8168/r8168-8.047.05.ebuild
diff --git a/net-misc/x11-ssh-askpass/Manifest b/net-misc/x11-ssh-askpass/Manifest
index f0b1e836fd71..71dc7ba6782a 100644
--- a/net-misc/x11-ssh-askpass/Manifest
+++ b/net-misc/x11-ssh-askpass/Manifest
@@ -1,4 +1,3 @@
 DIST x11-ssh-askpass-1.2.4.1.tar.gz 29229 BLAKE2B 0b49f8eeb568ccba9843e216a688cc64f3ec4799efae0c0f870803c166e40d5f5d52a9eb45a5d3e5475bbf461e5898feda0b2c91c91c61bf984b81ec89839abe SHA512 879887cc1d6eb26662494e3a6b59b79a8d153b354abf86e8e8667940545c8e07d0aa051491f5ba6ca5273e3a7fcc367edb4cc79bb2e4bf1bdbd0e234690ad6b9
-EBUILD x11-ssh-askpass-1.2.4.1-r1.ebuild 923 BLAKE2B 0c58c634c173af9549c4c68e6496455bf39f5414a3fb7b387d139a03f9d2d5ff90bb1e446d9861b58cb2593c21c2e4f6f375e258259094f72f3ff6c83819e192 SHA512 52d0706cdb99e3c68ec624f82c816da9dd7a7e84329788335c13fe54a9000dfa02430a2a9f43c0f1f051b11b54d53835b912935513bae98f9698107c81b39f43
-EBUILD x11-ssh-askpass-1.2.4.1-r2.ebuild 976 BLAKE2B b41c791844939138f78e52c2c24440c9fe93d8b2adc97506415624e7221210d00573771aaa3d6e07ee49b252b40ae7488e0cb23f9743677cfa94631409268dca SHA512 c6d978abcb0d25cfc93b100b6dbb0a1531cf6cbba5a16c884a4772428888fca9a28d9c673813415b6aa8ddc073d422d9ba7cc2bc674c10bfb0360192c45cf8db
+EBUILD x11-ssh-askpass-1.2.4.1-r2.ebuild 970 BLAKE2B 6617544904d75e0b01fb85dc68001529ba86792f39771ddca1b20255b40b48fbaff6f2d3e5570ebf827a55f23eb9409b5a550cdfe0e52e897e19ec66994da16d SHA512 3cf54cba8398aa8d12f7717c3cb33c6dc630284c5b442e913a8f8b5de34ef6124c6610fca0ff5194d0191735fc310fac54b4e4115268bc4af912ca1f44c79fba
 MISC metadata.xml 673 BLAKE2B 916fd47492be5b298834b6abd7561edbcc2af1fcab3de2db3e595c5ddb08318a74ac61f008e5edbc38857c1670e765add0432f893eb8d30626f4465d9f9999c3 SHA512 18222b1092cd44e1e040d42a37d7f600489b8a09e8b75008182925eeff2e750e3a82523e0d4afe379ee35acd10f85b14df8c5e7feac053d497c55228b787b2a4
diff --git a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild
deleted file mode 100644
index 71a861cd690b..000000000000
--- a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib
-
-DESCRIPTION="X11-based passphrase dialog for use with OpenSSH"
-HOMEPAGE="http://www.liquidmeme.net/software/x11-ssh-askpass/"
-SRC_URI="http://www.liquidmeme.net/software/x11-ssh-askpass/${P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="virtual/ssh
-	x11-libs/libXt
-	x11-libs/libX11
-	x11-libs/libSM
-	x11-libs/libICE"
-
-DEPEND="${RDEPEND}
-	>=x11-misc/imake-1.0.7
-	app-text/rman"
-
-src_compile() {
-	econf --libexecdir=/usr/$(get_libdir)/misc || die
-	xmkmf || die
-	make includes || die
-	make "CDEBUGFLAGS=${CFLAGS}" || die
-}
-
-src_install() {
-	newman x11-ssh-askpass.man x11-ssh-askpass.1
-	dobin x11-ssh-askpass
-	dodir /usr/$(get_libdir)/misc
-	dosym /usr/bin/x11-ssh-askpass /usr/$(get_libdir)/misc/ssh-askpass
-	dodoc ChangeLog README TODO
-}
diff --git a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
index 65224da4bf5b..39a9265be13c 100644
--- a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
+++ b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.liquidmeme.net/software/x11-ssh-askpass/${P}.tar.gz"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="virtual/ssh
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 4065338322d6..324f9981d557 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,4 @@
-DIST youtube-dl-2019.10.29.tar.gz 3172150 BLAKE2B 2cdaed88f1518245515d3d4030db8dd22b83ad1955bbd08fcef52b581d35f2de28dd9a95aafaede4edcba67aaf3b6e7697142ed6c715754da957a5cf8476cf80 SHA512 53d79440a86a08c39ec2f6d26e54aec12594b41419aeba2494eab087b49de97485beaeabc17cf819024799cf6f44d2386422c9d8f484c091c34b8cb202023c9d
 DIST youtube-dl-2019.11.05.tar.gz 3159084 BLAKE2B 9db643c3f3fafa0ee0b35b24afa411a169fe91f4dc2dd756ce1d3ce4b0db32cb483bca9cafdde6395232f38d5bafe90cca065fe7c1359f35d26e75dfecdb8bc3 SHA512 ec6d42e61d01e7f4087e980953c47facbbc9c5722d40f6c066789b940e084042fdc9a00266c13822a671137adf7f528fd7eb31a7849337e2e7418a722d9f865f
-EBUILD youtube-dl-2019.10.29.ebuild 2124 BLAKE2B 608cd130bf27ff5253236fea27c22981fd804fa73e49ee6d0e67173d1840bd266349334f041307b4fe82c7a0708ae1a032d8f3d113dda7e0931197267f4b1246 SHA512 7ff84adcc79769d2acd9f9baa88e6f4222c65e8c892de335200e0f27d2aa15dc839241363bd2f58a6fe37e0af1345b072c5147a2205a927caeb9b9540dc17f72
-EBUILD youtube-dl-2019.11.05.ebuild 2130 BLAKE2B a6b9c8c31b6c7631f19183fccd1adf7b4c3ae5f5bc3108549803c83df78b66c2af9e04e1549a70b6f3bcca4cbc78a6e279f8aa063259c63e2fa464996ee69bcd SHA512 84f330ea104602ecd898906b7d33c98bd254715fc9feb5e71d35e34ac32466b56f178d22fe72dbea83f78ba45ffcd5fe73952c6d508dfc99bccec9a237daa155
+EBUILD youtube-dl-2019.11.05.ebuild 2124 BLAKE2B 608cd130bf27ff5253236fea27c22981fd804fa73e49ee6d0e67173d1840bd266349334f041307b4fe82c7a0708ae1a032d8f3d113dda7e0931197267f4b1246 SHA512 7ff84adcc79769d2acd9f9baa88e6f4222c65e8c892de335200e0f27d2aa15dc839241363bd2f58a6fe37e0af1345b072c5147a2205a927caeb9b9540dc17f72
 EBUILD youtube-dl-99999999.ebuild 1997 BLAKE2B 7b5974dc4df22cbb2fb7d87f60e73b2fddc7117331a6a81e8e9f0efef84788211d5fdefb1c96e9d4df0677fda2d264ef2846f36e60a890233fa79b06722b2abb SHA512 71019b536d5301dfbd5e9cb8085d1a001854f5bf204c0e76866c16a9553516a55081c17396bcc89c0128e44116b6e2dc451541b7e89d677822f3d541b316d5c5
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.10.29.ebuild b/net-misc/youtube-dl/youtube-dl-2019.10.29.ebuild
deleted file mode 100644
index 8b7913f66a7d..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2019.10.29.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://github.com/ytdl-org/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"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-"
-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
-	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"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2019.11.05.ebuild b/net-misc/youtube-dl/youtube-dl-2019.11.05.ebuild
index 89ac8f636eea..8b7913f66a7d 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.11.05.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.11.05.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/ytdl-org/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"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 RESTRICT="test"
 SLOT="0"
 DEPEND="
diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index c3ff3afeaa15..16f0ada492f7 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -1,8 +1,8 @@
-DIST youtube-viewer-3.5.4.tar.gz 237736 BLAKE2B 900cd48025d28a1077f909a740d94824c07cc9d0c0fb0954c16fc79dd5bb7db53431fdadf4fca2ebb89b3fabc61801bd64bf8f042bbd70d53f1616d9fd74fcbd SHA512 60da8bd6017eeedb299ac5b226fc3094823a5dab8db938b603f4630724590dae5acc03c6ad609b8b3f3b0f2149bb37398d018893da7b2fde762f9f795bdaf618
 DIST youtube-viewer-3.5.5.tar.gz 238922 BLAKE2B 8e5b57f5e83ce53b3249e948e141042a4dff019e201718c5a75d5577a349707add5f2d4a6e5a53ff4968394b0b54df43bdee4933e9d4fe9ef62b6ed489a54678 SHA512 6e73565e7b8ba415e0f056a402804510af2d2d3e833daf3254330f75b404a21042318441d52b9b7ecb6659a693189c43a9b9148be4d3e154d4a1d23b402e8a63
 DIST youtube-viewer-3.5.8.tar.gz 239590 BLAKE2B 7230518b87f77d153820ba8c60af8e017cbc7e5f65d96597673f5c9500f5116a63aac28f385eac92a0df9e7f36ea7c3af8c4efa5b1ad55ae66afdb03abad95d7 SHA512 1d657c08ccf4fc4d79408e2020fda1f9187ffc1b6faea5524b4190627b46d22336b8faff22330882507ac81e3717344fdef614ea57717c1face1807a835ef746
-EBUILD youtube-viewer-3.5.4.ebuild 2077 BLAKE2B aeccdf3f4c52ef9c7c1d87fcf73abbaae60ed073379e8d49296555cefa04a8a4a35377a5813701de4434473efd9b7f93122b4432aab38f713b5840a16c28533e SHA512 e643fd7e4b39e992619b4c16acc4fbd23ff5227348a3d0379a67cb4608164c7115bcd5737db3e3be4075182ed963aa646e194715ea19162ad3698a4701e55181
+DIST youtube-viewer-3.5.9.tar.gz 236095 BLAKE2B b98cfbca26da99f148d3afe0a4f7a4478abaf7c9f9727b421b7718004950e8bee52f58fe08e30b7ccfcd44bdc3ba3f7f75a5a5450581c3f2a9badaeac0fcb5f4 SHA512 2fe06feacbb0240606197b982aa097272d1d615e83a15d686da96fe336a5e85c71dccc046faaa106d85b1012a6b169ff39434b72b2033b2c8d301616c085eae1
 EBUILD youtube-viewer-3.5.5.ebuild 2077 BLAKE2B aeccdf3f4c52ef9c7c1d87fcf73abbaae60ed073379e8d49296555cefa04a8a4a35377a5813701de4434473efd9b7f93122b4432aab38f713b5840a16c28533e SHA512 e643fd7e4b39e992619b4c16acc4fbd23ff5227348a3d0379a67cb4608164c7115bcd5737db3e3be4075182ed963aa646e194715ea19162ad3698a4701e55181
 EBUILD youtube-viewer-3.5.8-r1.ebuild 2126 BLAKE2B b4cdfcdf7e1ba4e9764c49d417b4109767254a3c848abe9580231b168a0232e72900d776178b90a487ecfe36aee7713e5f8c1ca5c5ca964aa2594335cacc34d8 SHA512 132f0f0cfb73393428e79a86b95a4109c1dec252ec2d6c67c7d58318d90595fdb08c86a105464f0d8ed9f620142840fda1090179ed05e83c6cb19a7b87e2abd8
+EBUILD youtube-viewer-3.5.9.ebuild 2126 BLAKE2B b4cdfcdf7e1ba4e9764c49d417b4109767254a3c848abe9580231b168a0232e72900d776178b90a487ecfe36aee7713e5f8c1ca5c5ca964aa2594335cacc34d8 SHA512 132f0f0cfb73393428e79a86b95a4109c1dec252ec2d6c67c7d58318d90595fdb08c86a105464f0d8ed9f620142840fda1090179ed05e83c6cb19a7b87e2abd8
 EBUILD youtube-viewer-9999.ebuild 2066 BLAKE2B 2e4b124f1665cf74802d26c2846bada76df74c1ec3c924209b5337317f54eec6966e91938813d07dc3a19b1fe175da51744a10ea1647a879d332865bece9c325 SHA512 020de8cd2fe7a25980841da52c21deab563bebd1e40f5135b8cac247dff88f55d5ddb1736ed75d631c82b171f2bdc1482040b5b723e5c4ffdfe32f6a0ff70b4a
 MISC metadata.xml 1001 BLAKE2B ea9aae31db72d91c37e3f37b672404262ad303a26461df31c78d4a45050ac27c46e9ed18b160eb96f34d15b08bd6250139ed2960834b0aa93923c2651bd19e58 SHA512 2136df64736fa79cae9cda680d3412ff700c03b943c19184a0d1c94d51f161b34eddefee88468ef63a99e87a553973caeb1241226fbac13eabb5462990d98fd6
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.5.4.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.5.9.ebuild
index c3fb66845352..676951a81313 100644
--- a/net-misc/youtube-viewer/youtube-viewer-3.5.4.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-3.5.9.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils gnome2-utils perl-module
+inherit desktop eutils perl-module xdg-utils
 
 DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
 HOMEPAGE="https://trizenx.blogspot.com/2012/03/gtk-youtube-viewer.html"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/trizen/youtube-viewer/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="gtk"
 
 RDEPEND="
@@ -35,7 +35,7 @@ RDEPEND="
 		virtual/freedesktop-icon-theme
 		x11-libs/gdk-pixbuf:2[X,jpeg]
 	)
-	|| ( media-video/ffmpeg[openssl] media-video/ffmpeg[gnutls] )
+	|| ( media-video/ffmpeg[openssl,-libressl] media-video/ffmpeg[-openssl,libressl] media-video/ffmpeg[gnutls] )
 	|| ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) )"
 DEPEND="dev-perl/Module-Build"
 
@@ -57,7 +57,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	use gtk && gnome2_icon_cache_update
+	use gtk && xdg_icon_cache_update
 	elog "Optional dependencies:"
 	optfeature "cache support" dev-perl/LWP-UserAgent-Cached
 	optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS
@@ -71,5 +71,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use gtk && gnome2_icon_cache_update
+	use gtk && xdg_icon_cache_update
 }
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-18 10:15:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-18 10:15:03 +0000
commit	b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch)
tree	16fe44748708acacd909d4e2e160a09a7f6d936a /net-misc
parent	77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff)