gentoo resync : 13.03.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-03-13 16:55:35 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-03-13 16:55:35 +0000
commit: 1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 (patch)
tree: c99a472cce74148d499f42ada873454b0e32a42d /net-misc
parent: da6a52f691ef980bab92d003d5df8f463c623af8 (diff)
45 files changed, 190 insertions, 1044 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6cfa04b2f6ac..b6f1215c3d31 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk-rate_engine/Manifest b/net-misc/asterisk-rate_engine/Manifest
deleted file mode 100644
index 59b418b385de..000000000000
--- a/net-misc/asterisk-rate_engine/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX rate-engine-0.5.4-astcfg.diff 1307 BLAKE2B 00fe9b68a512a89b038ddd291e5a9db6267201fbe6da32c262d8fb511c31b01bc018a869eb6546b7e8b4698456996e539e8317a3604f12868453746a13dc4f7b SHA512 5a571b8344c55297d49f74abce8af441ca9fa993aec00a9c1885258d88ed0449b9110a77dd3b8a8fc8eb063845500901d8eb8a306b4b2066557b1dd1a82b41d5
-DIST rate-engine-0.5.4.tar.gz 28883 BLAKE2B 8416dcb2e6a8c998b719fbf3572329fe97db4422b32ae9208bcfddb19ed96c5f61c8d83b0a47b5d33b0ed5f8d43e9958fbecdd26822374d93998456af3f625ff SHA512 2ddac9731d6cd3d3d8d6c83180f5c74b0f0c7dcb2b02e4fde8caa67b32119b725e6a6b4a01419ca753b8f40508027cf8bd876fc569c76287e38d9a042f116cb1
-EBUILD asterisk-rate_engine-0.5.4.ebuild 826 BLAKE2B efad208bc749f52ce07face4f653d638dc78237aafaeaa0d5c3b0735b4e6be4b20bce9736bbfb06307b4608bd2b01620a7bbbdc22015afd2bd9bb3a365c1676b SHA512 357f766114b587be2de5b0486e25348c2a4ffbbcd5d461605506747133eca4cc9a962ce7e0ad911a6303bad60706dca2a59ae561bcb53a99cf1a2c100d484102
-MISC metadata.xml 213 BLAKE2B a6b42a8b7c6f0c5a0b853af172e748301d2f4b9f2aa0424e217029affb54c88b1061dd970241a942e59a2a5ec66521ab9b67818181c03bd1dd019965e39eab3d SHA512 bddb1ae151571d0cd8833b083fd24fb4f1372e8fef6e726833ac8837abff03fb86ef85c7d954837ac82ecb906f1be4418d32d1011a2bc4be7711f2ab69a43380
diff --git a/net-misc/asterisk-rate_engine/asterisk-rate_engine-0.5.4.ebuild b/net-misc/asterisk-rate_engine/asterisk-rate_engine-0.5.4.ebuild
deleted file mode 100644
index b6a966de805d..000000000000
--- a/net-misc/asterisk-rate_engine/asterisk-rate_engine-0.5.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-MY_PN="rate-engine"
-
-DESCRIPTION="Asterisk application for least-cost routing"
-HOMEPAGE="http://www.trollphone.org/files/"
-SRC_URI="http://www.trollphone.org/files/${MY_PN}-${PV}.tar.gz"
-
-IUSE=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-
-DEPEND="dev-libs/libpcre
-	virtual/mysql
-	>=net-misc/asterisk-1.0.5-r1
-	!>=net-misc/asterisk-1.1.0"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	# cflag fixes, install fixes and changes for asterisk-config
-	epatch "${FILESDIR}"/${MY_PN}-${PV}-astcfg.diff
-}
-
-src_compile() {
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install samples || die
-	dodoc ChangeLog DISCLAIMER NEWS README TODO *.sql *.conf*
-}
diff --git a/net-misc/asterisk-rate_engine/files/rate-engine-0.5.4-astcfg.diff b/net-misc/asterisk-rate_engine/files/rate-engine-0.5.4-astcfg.diff
deleted file mode 100644
index fe2772d660cc..000000000000
--- a/net-misc/asterisk-rate_engine/files/rate-engine-0.5.4-astcfg.diff
+++ /dev/null
@@ -1,41 +0,0 @@
---- rate-engine-0.5.4/Makefile.orig	2005-02-21 04:42:24.046680160 +0100
-+++ rate-engine-0.5.4/Makefile	2005-02-21 04:47:38.049944408 +0100
-@@ -10,7 +10,7 @@
- 
- DEBUG+=		-g -fno-inline-functions
- 
--CFLAGS+=	-O3 -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow \
-+CFLAGS+=	-fPIC -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow \
- 		$(DEBUG) -D_REENTRANT -I/usr/include/pcre
- LDFLAGS+=	$(DEBUG)
- LDLIBS+=	-lpthread
-@@ -26,9 +26,9 @@
- OBJS:=		$(SRCS:%.c=%.o)
- MOD=		rate_engine.so
- 
--ASTLIBDIR=	/usr/lib/asterisk/modules
--ASTCONFDIR=	/etc/asterisk
--BINDIR=		/usr/bin
-+ASTLIBDIR=	$(shell /usr/bin/asterisk-config --modulesdir)
-+ASTCONFDIR=	$(shell /usr/bin/asterisk-config --sysconfdir)
-+BINDIR=		$(shell /usr/bin/asterisk-config --bindir)
- 
- .PHONY:		all
- 
-@@ -50,12 +50,14 @@
- .PHONY:		install
- 
- install:	all
--	install -m 755 $(MOD) $(ASTLIBDIR)
-+	if [ ! -d $(DESTDIR)$(ASTLIBDIR) ]; then mkdir -p $(DESTDIR)$(ASTLIBDIR); fi
-+	install -m 755 $(MOD) $(DESTDIR)$(ASTLIBDIR)
- 
- .PHONY:		samples
- 
- samples:
--	install -m 644 rate_engine.conf.sample $(ASTCONFDIR)/rate_engine.conf
-+	if [ ! -d $(DESTDIR)$(ASTCONFDIR) ]; then mkdir -p $(DESTDIR)$(ASTCONFDIR); fi
-+	install -m 644 rate_engine.conf.sample $(DESTDIR)$(ASTCONFDIR)/rate_engine.conf
- 
- ifneq ($(wildcard .depend),)
- include .depend
diff --git a/net-misc/asterisk-rate_engine/metadata.xml b/net-misc/asterisk-rate_engine/metadata.xml
deleted file mode 100644
index c10b09fa8f36..000000000000
--- a/net-misc/asterisk-rate_engine/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person"><email>chainsaw@gentoo.org</email></maintainer>
-</pkgmetadata>
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 1ae7c65884a0..9a56f8d9bf2a 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -23,6 +23,6 @@ DIST gentoo-asterisk-patchset-4.07.tar.bz2 2471 BLAKE2B d9026e7e8c12431496c24f20
 EBUILD asterisk-11.25.1.ebuild 9618 BLAKE2B 9eda0a7ea0e9494b993756971c668712bd29f3471e46ddf172d6108a18ebdfca6c066057a2e7655c8681a0590b45d5e81ea9fb5846f6629b071be088b5357d8c SHA512 2408972c5322735a4f4ea8ad7ea09bd7813e1618935f2f6f8655eeeddea7bc7e7a85fc37f1ee6084661dcc04d73279ac71e7a0ef029908e45d5844223fa4e7b0
 EBUILD asterisk-11.25.3.ebuild 9618 BLAKE2B 9eda0a7ea0e9494b993756971c668712bd29f3471e46ddf172d6108a18ebdfca6c066057a2e7655c8681a0590b45d5e81ea9fb5846f6629b071be088b5357d8c SHA512 2408972c5322735a4f4ea8ad7ea09bd7813e1618935f2f6f8655eeeddea7bc7e7a85fc37f1ee6084661dcc04d73279ac71e7a0ef029908e45d5844223fa4e7b0
 EBUILD asterisk-13.17.2.ebuild 9724 BLAKE2B 51e9c924c2dadd043c5c259a9ccb6a6041e4d2ac3b477dee4c41a3db57f821494d24e30970cd18bbe20abd0112e5c5f8787e41fcc8483ffd66c0418eca446974 SHA512 a3f8b96be8dab1b8a28177dcef963463122c1fc459419550d2329c8e054b08c9ea27bc5147c60cd6ac47ebacaa8b040691bb2a401de342b31a3073a79ba9043e
-EBUILD asterisk-13.19.0-r1.ebuild 9717 BLAKE2B 66ed61fd4b10c09012830fcd9d8260d75861de3e3f3d5c0697519f7d32ae469cac97d1545bf04ec3bf5b7188769ebb81f5cce33dd21916187876ac372a098825 SHA512 0733f846272e439e0e30061cb9b23f806b540eb935b0daf4cf27a9bc745b478796f037726983d75c8b96f78d59f486adca5efd408452dedd269cf422f21950bf
+EBUILD asterisk-13.19.0-r1.ebuild 9716 BLAKE2B 88137d10fad82bb8b81312eb39c896bb598359a908623f3df4440d6971b05ecf496ff5b9d05bb8c0fc098cfda58e870d3c2c972dbd366bea1b4a2f0f9b1ee25a SHA512 8914dde356784fb1bca8f5aed9abe87b34b590da07ce2f7a8bb372d26f0c00266fc7142edcdecb8c6112bd58691a52101469167708696f4639d5261f7195e67d
 EBUILD asterisk-13.19.2.ebuild 9717 BLAKE2B 66ed61fd4b10c09012830fcd9d8260d75861de3e3f3d5c0697519f7d32ae469cac97d1545bf04ec3bf5b7188769ebb81f5cce33dd21916187876ac372a098825 SHA512 0733f846272e439e0e30061cb9b23f806b540eb935b0daf4cf27a9bc745b478796f037726983d75c8b96f78d59f486adca5efd408452dedd269cf422f21950bf
 MISC metadata.xml 1135 BLAKE2B c4572b7c187ff1e7ac66ad38c03a04b51b601990ad48563dbcfa046f03fe0f3587a1e58c1bed7abe6a13a7e2252526d03a0937b5ddbf1a2427ec14b3f115c58c SHA512 660666a8abae2edae04e3c32b272e4f1d509d18566c6c9eb0b0b8a93710d8a1284c68f7ee613ca70bf4c54779a1df1e29d9a56093212bc0fdf1c057450037ab1
diff --git a/net-misc/asterisk/asterisk-13.19.0-r1.ebuild b/net-misc/asterisk/asterisk-13.19.0-r1.ebuild
index e0b88a37696c..ac2f2b5f6ecd 100644
--- a/net-misc/asterisk/asterisk-13.19.0-r1.ebuild
+++ b/net-misc/asterisk/asterisk-13.19.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.t
 	 mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE_VOICEMAIL_STORAGE="
 	+voicemail_storage_file
diff --git a/net-misc/bti/Manifest b/net-misc/bti/Manifest
deleted file mode 100644
index cbca47b8e550..000000000000
--- a/net-misc/bti/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bti-034.tar.xz 93328 BLAKE2B 21765ca5f1a5ef8a895741efdc4e9a942b4ed365a08a399b9bce4597f520dd03c2b9d548ee606d0b92e9b20d70a8e68cd2d279c2c87742f10c5432e6f1ab4184 SHA512 2b7cd66cff617f7592863a1a8e03754b3dea314c8eeb98bf0993601d4d4db848a74b26941bbd04f57a348bf0d02aefca4e3125f00fed531a67a3f17f36e665ba
-EBUILD bti-034.ebuild 792 BLAKE2B 6b4b6c62e982ae9de9a77447a3070899f85c47d8d49c44c11010bb8c23fa1c21203a756ac2144ec92f892a0a5ea1742ae522db2b9143e2af1aa7fced211dedae SHA512 f4dcf0d16357717861760fb39a8749237c69179530a1f1463bb887cbf9d9eb3d3def99029c2d2fe93cba4016d9175d376965cfb9406c3a920376773c7422642a
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/net-misc/bti/bti-034.ebuild b/net-misc/bti/bti-034.ebuild
deleted file mode 100644
index 65b7eb207a09..000000000000
--- a/net-misc/bti/bti-034.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-DESCRIPTION="A command line twitter/identi.ca client"
-HOMEPAGE="https://gregkh.github.com/bti/"
-SRC_URI="mirror://kernel/software/web/bti/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-libs/json-c
-	dev-libs/libpcre
-	dev-libs/libxml2
-	net-libs/liboauth
-	net-misc/curl
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-# Readline is dynamically loaded, for whatever reason, and can use
-# libedit as an alternative...
-RDEPEND="${COMMON_DEPEND}
-	|| ( sys-libs/readline dev-libs/libedit )
-"
-
-DOCS=( bti.example ChangeLog README RELEASE-NOTES )
-
-src_install() {
-	default
-	newbashcomp bti-bashcompletion ${PN}
-}
diff --git a/net-misc/bti/metadata.xml b/net-misc/bti/metadata.xml
deleted file mode 100644
index 097975e3adc2..000000000000
--- a/net-misc/bti/metadata.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-</pkgmetadata>
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 9e43a8a346bc..31cc6cae4a59 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -40,6 +40,6 @@ DIST dhcp-4.4.1.tar.gz 11164378 BLAKE2B fd3c65d8802c42cb936ff75ee19784e4f533c9b3
 EBUILD dhcp-4.3.4.ebuild 7914 BLAKE2B f6f94a7af0aa70428d5fa6e51ab8ac79f25fc25f094694d0ab278398c52c6021d8efe5fa1e524751ba8eb3db214e97660146175ab6e2d91bbaa234a619266087 SHA512 434a6523ec0e3f56889c71be0ab919c4282f3843badc4c8a08aba6634175eabfa4b9921602dfce7147a44f5dc215060fe335b7bec1435364cafe159a6e23bc95
 EBUILD dhcp-4.3.5.ebuild 7884 BLAKE2B 6ef306e4226389e05c904c74866918952ef16cf1caa2f4d23030aadcdbd259b8bbccb33df10daffce498fae9a189f1f8a6821a8746333d315bd2273c0cca6ed3 SHA512 d52d3ec0e9b046c29994af0af0cbd5bdc63cf040c7a4f8920d5f9f59d82223882df2cc6fa319d00a40d6b28b1938656587d9066942470fe0fdb812e732137a78
 EBUILD dhcp-4.3.6-r1.ebuild 7823 BLAKE2B a28cef0d32954b13e1f6a963e419616c656f1c8cc97451db95d922a13a86eec908cef6858f9b6a080ad94c437211ef639fb016d4d52e040f5fdd9e5bd3868bab SHA512 f9e6247ba9ec67c5f8a93f8eae87dbfde8e9754bf621eb48d7641fb42d0ca6bffa66ae7d36bd984c168bab7293e3d73b7d119b96e1d0889181cf2c64b912d522
-EBUILD dhcp-4.3.6_p1.ebuild 7818 BLAKE2B 90252df77d6c39bcbf987539ebe48f6ee505fa84d0a0ece437a0df8906b0875e04d317f6e96483775e74d27a341c79c3967773dbcbe1f26eb627171926d79e2d SHA512 51fd796f8282193391e179a913195e1d54dc9afe7ff58d1e6806d088289d7f4034eb77e6a54d96a175a7f74ea5a8bd09416a87f842c0f164b668e148f7dee6e3
+EBUILD dhcp-4.3.6_p1.ebuild 7815 BLAKE2B c6696256fdf95f9081c13fa4ef9b2abceb0d0a3668242039eab11379a6e4397e875ca855e81bcdb1702dc5c5a034f70536ca62dd6029a52e6dadbb3d48f55e28 SHA512 5cfa4f5bfc7a9ef9d841b9de9581612e82bf6fe56ccf074c623ed8acfccb370e3073fcaa57602fa554a50e0dc9e0267ae3dbc566a2ed7f7aa0a54e72d5fa2465
 EBUILD dhcp-4.4.1.ebuild 7926 BLAKE2B e0531baad9de9fa0ee437744ef35a7a747f29b8bfd490822b0c195423e7e57495e45bda40d59dbc16275b9723c43068d07c612e47c3e0753cf0952efcf9751fa SHA512 1952f93d33bb5e4c7f9c8bb7ebef4cbb1b279315435f8404405e824714c9c1ee1a469f7bd36732564f5b540a895539960e29b24160ef8acb729441835990f3f2
 MISC metadata.xml 669 BLAKE2B 27f8b039b9fdca5cb487c31d12bdfe550efff35a3705ba3fd20e6a783c70e48d4d6ca26fdb966230517bb0f3182da2df3d565396e2ced70f6fd94b15a1d4f601 SHA512 854b5b781642506f45df585d2072a79164620ec16e2b59abe2ef55e474f229d676f69f4820b4db1f6dce04df55bc5e3a20bcff959a34b3cc41bf61cce31f1efd
diff --git a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
index bcadccf48ac7..865f6c35067d 100644
--- a/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
+++ b/net-misc/dhcp/dhcp-4.3.6_p1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="+client ipv6 kernel_linux ldap libressl selinux +server ssl vim-syntax"
 
 DEPEND="
diff --git a/net-misc/eventd/Manifest b/net-misc/eventd/Manifest
index 0909677b446a..cce4f244cd11 100644
--- a/net-misc/eventd/Manifest
+++ b/net-misc/eventd/Manifest
@@ -1,5 +1,5 @@
 DIST eventd-0.21.0.tar.xz 392080 BLAKE2B 14d01d46e07e650f392abca53716c1fd5a5d70f05fe006e8a230d38be610e36ee0369742d258b46697376317be4ff6a071166a45528ef2840159a1024057d6cc SHA512 5907d453c493c9f2332df506037027ef7df021b1e29a6773cf8bb5c32c7a301b65ca55d3e3ea40982d3e48b837738c97b5420309a45a550f409d8912636d1dae
-DIST eventd-0.23.0_p20171112.tgz 239548 BLAKE2B 690b25f04aec4796117178c0fced9b46aa3b223d8c7c91bdd5dc3623759448c5012985ab5b6de0d24db8e19071f8e66f4f9014f7e7111a65256ad29d593606bb SHA512 1a8409d1292a237db7bc7c10e70b4b1c34e5bd0c7bac1bf144e288dd69718c48041066d190b75ea73670db6031b296d0697b2e41136fbe20878975351c6e8bab
+DIST eventd-0.24.0.tar.xz 184140 BLAKE2B 496b91b595d391ab056298b63a75df7be1a7362b960308d24bd950fefa2084d3b1eb04fb45f25cca11116d922ecb835b3f8545e7b3c5099261bc9872a157098f SHA512 204383140a0b6baf23ba148b525de7bcb90bdedd3be9e6cd7e8ce4222a689cd6cdeae8e29afa612afe3fbf8cec68f9bbdff74e826a04ff892e51d6fd4bba2cf2
 EBUILD eventd-0.21.0.ebuild 2966 BLAKE2B e6d82d1078f3bb0e6fecca2ae8a7809cd0a71744eda832f59b2516adaebbc9b8b88bb5ae3b9b1f644540ca9b773c6d33d79fc0e8805a613cea1f2363dfcdcdad SHA512 c01234e76c5d57a059da82843a3cfd33c088723432e4964a23440c7ab5276755a7e159a23bf10a736e999e7c0566a8d87dd751b58b7112cf19b5abebe5e032a1
-EBUILD eventd-0.23.0_p20171112.ebuild 3194 BLAKE2B 47e4377b525b0a8276af932c5bc1cd3726be5f74bc6d8d3275d73a6c008c6542486e23a98aad8dcab2509400c18cba3539fbb2e9c8060093aa68f72beb9815ec SHA512 4de380eb22ba24d7b96c2be2e42e2029c06979822aa5998312b0b5fea2e7725f2aa41831b1f3b6c4505f3e16620f287f1e1b7c75d53a1617179237e537c5eebd
+EBUILD eventd-0.24.0.ebuild 3277 BLAKE2B b89368449b3e37775087a3770a42612d43081ab796eebd2d202fa699b6ec0dedcb760a2523cc71b1762314b455b875008a84e0a00d3e316ca91c4c2a9c518668 SHA512 49c196f7763013a002ef5d478ee6d1c17e4b54207151d62f57ccb69d1f8d79f10761a1b36660cf6cfc66b337f16cd375d74976e0cbe9a8c10473fb3bf3c77fe2
 MISC metadata.xml 1106 BLAKE2B 659cbf6ddc00f8b32c3d4f028f461579bce6388ea62198575863e596207d791a7048a01cd5d8be1b6b8bdbcaa281cd14f5c2c65566e9dfe716524d3075a75455 SHA512 24381bc7069e34eeeb10e3e5c967da13f155ca2a785d04f144f658c97f8734f16fc2f72fa57874b7da4495b24eced2d2607b0f3f8b52bc9d124da29a11c4f254
diff --git a/net-misc/eventd/eventd-0.23.0_p20171112.ebuild b/net-misc/eventd/eventd-0.24.0.ebuild
index 94cc96e2e9c8..4580e0a092fb 100644
--- a/net-misc/eventd/eventd-0.23.0_p20171112.ebuild
+++ b/net-misc/eventd/eventd-0.24.0.ebuild
@@ -7,7 +7,7 @@ inherit linux-info meson systemd xdg-utils
 
 DESCRIPTION="A small daemon to act on remote or local events"
 HOMEPAGE="https://www.eventd.org/"
-SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${P}.tgz"
+SRC_URI="https://www.eventd.org/download/eventd/${P}.tar.xz"
 
 LICENSE="GPL-3+ LGPL-3+ MIT"
 SLOT="0"
@@ -79,7 +79,7 @@ src_prepare() {
 }
 
 eventd_use_enable() {
-	echo "-Denable-${2:-${1}}=$(usex ${1} 'true' 'false')" || die
+	echo "-D${2:-${1}}=$(usex ${1} 'true' 'false')" || die
 }
 
 src_configure() {
@@ -95,7 +95,7 @@ src_configure() {
 		$(eventd_use_enable notification notification-daemon)
 		# Wayland plugin requires wayland-wall, which is currently WIP.
 		# See https://github.com/wayland-wall/wayland-wall/issues/1
-		-Denable-nd-wayland="false"
+		-Dnd-wayland="false"
 		$(eventd_use_enable X nd-xcb)
 		$(eventd_use_enable fbcon nd-fbdev)
 		$(eventd_use_enable purple im)
@@ -111,7 +111,9 @@ src_configure() {
 }
 
 src_test() {
-	EVENTD_TESTS_TMP_DIR="${T}" meson_src_test
+	# Drop LC_NUMERIC=C on next verbump.
+	# https://github.com/sardemff7/eventd/issues/39
+	LC_NUMERIC=C EVENTD_TESTS_TMP_DIR="${T}" meson_src_test
 }
 
 pkg_postinst() {
diff --git a/net-misc/ipsorcery/Manifest b/net-misc/ipsorcery/Manifest
index 2a12a7a6495d..8a69aabf1d18 100644
--- a/net-misc/ipsorcery/Manifest
+++ b/net-misc/ipsorcery/Manifest
@@ -2,5 +2,5 @@ AUX ipsorcery-2.0.9-_BSD_SOURCE.patch 203 BLAKE2B d04a19c782186b5c966116eeb3681f
 AUX ipsorcery-2.0.9-gentoo.patch 756 BLAKE2B a37fc6896955a1b4e86847f027cc71320960c71e7e2eee077cc29d632c7fbfd0a60fa7456bdde1d354824e564a45ede7a18801b8ca270d1f83e465587e153e11 SHA512 9619924c02996032584c4a0975dcce9d5d9ad5945f3320b0d4cca0f0bb2d938ce07644992db794c928aa84a1e0a3d46968516b6bdb6180e547a8a13b50de6f39
 DIST ipsorc-2.0.9.tar.gz 38600 BLAKE2B b773a60105e03963edeead61d93d7a28cb16683cf00fbc9d874f4de7e854127c44c9c64dc045f4228520114593cf98587e594e7946015f2f3f8ec7e9e2fdd36c SHA512 a45454d70ecd928df36aa466dc886ab470ea3200e1b252288ea96f96e3fa8742af57bfe98f42d65c7e7abb07986092c2191aadee78ac785fffda40acc5ff8d66
 EBUILD ipsorcery-2.0.9-r1.ebuild 616 BLAKE2B 5e7520720dd063ec181cfeaf4fe229438e60214496ecdc33c8304d49f547d86845a3c5e17a3050293d507b396a8198d3463458776d89bdb5a0884b34099e2ec1 SHA512 5ce56c3e072b7cfa4cae49b058d9426a1d1161f0e742d7fb9c17f55c407c536a224d7b577fda2e77d7484ec1931a56f9cfc3d72c0918a6e9deebbce18b699496
-EBUILD ipsorcery-2.0.9-r2.ebuild 769 BLAKE2B 3349e58947ec2d526c4b44ab4d1e59b4bee2dff1cab396112d5cec2d84d4ca8dff505f23143df6905192f0c3fc90d5c64b3c8738065bfea634d1299c3554dc50 SHA512 426e39f205eefb996f2fcd7cff5d33eda8b0fb86886714fc620ba11ba7ececefea2e7746e250365bf4c4c41a2e1fa268b890f6d3fc9fcce51ebf3a5d82d777f7
+EBUILD ipsorcery-2.0.9-r2.ebuild 768 BLAKE2B 15908c1fec4583a1770e9a8d26fb75c70306260b70cbfe49cddaaa47ea334c5e1d838512d174bb452d0b62b21a00fc31266200405b9df2753e27e38201cb3f2c SHA512 412272d57ec0cbf5f1019bae21db7b1d7f773fc86bfad2ce8bccb58b3ff1a366a36655595e3ec405fef74a4c0a18b244418b32aa37b3bdcc4266baf8d2e263dc
 MISC metadata.xml 212 BLAKE2B fb59bcfbeb093c851e3e4a935d1614a10f509fd386894f9d9ade50348d9a1963e9eb482c89980f54986c79e073769212b0f9f0b4ec49d817fd252f578f292bfe SHA512 934c3c3ff6efab14f989c4b030de2bad2ce242d4402a68f90cb6e6fa9d5c3aa85cf0d6f5b92936acead641ebd9d05c870f4d5d59d1e94901c21cb9ebfa4ae685
diff --git a/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild b/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild
index 21d2e184dab3..8771173f2528 100644
--- a/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild
+++ b/net-misc/ipsorcery/ipsorcery-2.0.9-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/ipsorc-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="gtk"
 
 DEPEND="
diff --git a/net-misc/keychain/Manifest b/net-misc/keychain/Manifest
index d3e5628c07b2..d88c95e4506a 100644
--- a/net-misc/keychain/Manifest
+++ b/net-misc/keychain/Manifest
@@ -7,5 +7,5 @@ EBUILD keychain-2.8.1.ebuild 693 BLAKE2B 6bce0f8e4cfad5ac866fb3e231f91abf47e573f
 EBUILD keychain-2.8.2.ebuild 706 BLAKE2B 0440f24f9cdc23431ff7547a09549b15240d3234520abfe723e6b3f888946998c8ff22a8d8baa4eeb4f1e6d3de390b60cfca0419d0c4012bdee4749732fb7554 SHA512 412c3fb3acdc422c7b5bece95f4448cad628d5eca7c4209a4158fd14c28cf19b0d6299f2e5e1fb8fe9bb3a85d453f4432531b2ee9533db37eacb75d879811427
 EBUILD keychain-2.8.3.ebuild 703 BLAKE2B 41c7bbbac5cd9cb0e877893360bbbde5a359d6c3aa84f76a2906e83d03c52f7af4524f6f0c7ebd472226f70ae7ff20021928db85bf968b5a180efb5a928376c8 SHA512 1683d01f4b272b0711c10c456f957fcde079d169fc7677eaf1e3b29f90ede4109b72d9a85248d34335e3b9c138a98d3855bde0d0e890749ef6e343499acb3257
 EBUILD keychain-2.8.4.ebuild 703 BLAKE2B 41c7bbbac5cd9cb0e877893360bbbde5a359d6c3aa84f76a2906e83d03c52f7af4524f6f0c7ebd472226f70ae7ff20021928db85bf968b5a180efb5a928376c8 SHA512 1683d01f4b272b0711c10c456f957fcde079d169fc7677eaf1e3b29f90ede4109b72d9a85248d34335e3b9c138a98d3855bde0d0e890749ef6e343499acb3257
-EBUILD keychain-2.8.5.ebuild 703 BLAKE2B 41c7bbbac5cd9cb0e877893360bbbde5a359d6c3aa84f76a2906e83d03c52f7af4524f6f0c7ebd472226f70ae7ff20021928db85bf968b5a180efb5a928376c8 SHA512 1683d01f4b272b0711c10c456f957fcde079d169fc7677eaf1e3b29f90ede4109b72d9a85248d34335e3b9c138a98d3855bde0d0e890749ef6e343499acb3257
+EBUILD keychain-2.8.5.ebuild 694 BLAKE2B be99065c3b731cece1781f62eaad0eeef75a2542e30a2cf29a1293186e25b09c821bc288c6af77b1684439f910f41f153ec3fce207452fed8bbc1f91da8ffeee SHA512 2267f0e3a9d8148509af067f15de8aa8dc4c6dd6693101c2cc1b4ea07e7c119f62b5dffb9ca01970b432c71f7d8610709f5e409b62bf52cbe3711ecac8204500
 MISC metadata.xml 512 BLAKE2B 4f4829139a7ab1a24310dd9993a70525809fe24255213e17e98619d0b068798329f35c0dd4e40a47023582c58d80e4124fd0f393286b3e268aeedda189c69028 SHA512 f707b59b260f691f3e460687dfbe54815e5d751fa0b53f96a2a04c75392de3141794dbf7b3505adf1c6757cb1ec959772b3999aa38791ff83a31c752f98f536a
diff --git a/net-misc/keychain/keychain-2.8.5.ebuild b/net-misc/keychain/keychain-2.8.5.ebuild
index 6f06f6475bd1..edc8355d9559 100644
--- a/net-misc/keychain/keychain-2.8.5.ebuild
+++ b/net-misc/keychain/keychain-2.8.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/funtoo/keychain/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 998006718c98..c116049c4f3c 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -6,4 +6,4 @@ DIST miniupnpd-2.0.20180222.tar.gz 223697 BLAKE2B f551c9219a3a0a0eda905c953c5f9f
 EBUILD miniupnpd-2.0.20171212.ebuild 1468 BLAKE2B 646f5b6e83f38035a0658a43659645fe1df0ce75b29e2422c758c2240d73f74bdab91abd7ebdb78b030808285edd73aba09e284058e159405292b096dbda6f31 SHA512 ef1a6777848cc09930a15321ec2ad90fc458a3ce2bbc5e0387de5f4093583eaa69911ec0c8f79c5fb56f2fa916759553ce3b78606111be5aba8c36c9c224460e
 EBUILD miniupnpd-2.0.20180203.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899
 EBUILD miniupnpd-2.0.20180222.ebuild 1402 BLAKE2B 59507c9084ae623e60841402020c0b8a019e5f1af91deb3cadda0ec964119a787c1c6f90c95ceedebd62305672cb18c1baf262e5c83a3b1e7027b8156c9fd57c SHA512 13bc544d18529b3a242dc1f18add4d9b287a490b93133184cdd9f9395fbf284a01477e3abda52c8863d9c88e271ba2ae8049c99f12816878fd23687e27d88899
-MISC metadata.xml 1043 BLAKE2B 1ea4668279d5b43c5ffa7a2c95f3fec6532a2a6918fa0f1a9b6fc60f37af5524929d434da3a346aa093bc7ba8e5bde644342500606d753f43499f0df164e4782 SHA512 2f825098e0257d3242abfdbaa0ba3ae7e669912a1b81e7c0f559e208297e2bc0e82c07698f1e63c01b15170eae3560e27e8a67c3fc91598cf81b5b70f8e5101d
+MISC metadata.xml 923 BLAKE2B e7b26fae1c4f3f67ae6a3a7da57607cdca2c2999174c35ddf9db972d4871eacac116a4c0f068e4be467c9670294de7ec797a64b06106a54f986336bb111b0c38 SHA512 8e6c396f3601ccbba09e16cd48b0432616d692700b4b402484d4c592101f71a4434772efe63a4e9a2887d00e39eda9865173d74930aa6f792c61eb24b847af69
diff --git a/net-misc/miniupnpd/metadata.xml b/net-misc/miniupnpd/metadata.xml
index 1d5d87bb77ec..1b672f18d768 100644
--- a/net-misc/miniupnpd/metadata.xml
+++ b/net-misc/miniupnpd/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>gurligebis@gentoo.org</email>
-		<name>Bjarke Istrup Pedersen</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 15a44204cc88..7334cc8d297f 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,5 +1,5 @@
 DIST nx-libs-3.5.0.33-full.tar.gz 6811378 BLAKE2B f20de5f9f7214fa38f290b2a200481aeb80461b07839a19ca54059d0fb26de769f0d11720b6d443dd618b6ac5ce590a086a21745420411e6a09bfad65e8f8d79 SHA512 cfaa201e5422ddd8d1f12d3f0711d6d7a05fcd92379e5108c7c066ce8ae748f2f80f3bbbbba093d73cfe671fffc912443eb3ced0eeca1ab5a221c46488aa8bc5
 DIST nx-libs-3.5.99.15-full.tar.gz 5269081 BLAKE2B 79301870463aae8e71eaf8cad64ad03376c33d42c76884313ca78d439a070d41fff91af4894b60e38bbcc97c3e08e167b45675641cd8d06959fc68f1fece9de4 SHA512 b292e938bc8da7456418ef5356ebe04910ad306d6bb16d6befa3bb875f82b11a2a3f07488e42c6379bef60fc9e150695a8ec84e7af2f594fbd94883d90030e3f
 EBUILD nx-3.5.0.33.ebuild 2338 BLAKE2B 164bedd551b5be5ed917122cfff26069d411c5c5b0829ef9cf6712dbfca350209127d93fa36c18bbc6bdf2445b19d2ecc3bea91b0f9e867652e574655eede677 SHA512 e1f88b0e03f4066df1ef97cabcadd759cf80ed27619a3bbe228bed67a82ce287898cd47ac5f31c4de2e250441cf6eb5e69f6750609c978c56dd476c767828199
-EBUILD nx-3.5.99.15.ebuild 2791 BLAKE2B b28efc5e48608a9a91219e51685e4d6e11d226e3ea7f24e04908393e0bfc990de1596d1c7dc605256d1d079b1210d8061cd9ff32f4e6236a640be5206f95e4c7 SHA512 d77b35a1c330bc5905618355b56144a6fd65a0df2e93fafcd758a6cddcab909e070d4f158eca14ffaaf6ffd97e3ae33c60c5c8499458a842e39473b34e8ea28b
+EBUILD nx-3.5.99.15.ebuild 2844 BLAKE2B 8938b066be31e5f9965e6e52fd576b2ed1604847d04bc89e56dce37e472bea4ca2eb918566470b0002efc913c0a0f2d2b754fca766120485f933e57e09a8621b SHA512 9c69a3c3e37ea419344d9217660ee3e44c37286765a1e4e2eedde47e29d36471b037d3a03b2ec884aac8c49e15bd60140bc5ff88f63ec90380ac7822795cb7b3
 MISC metadata.xml 347 BLAKE2B 8a7badffb3f49b006ec80af7a13bb111d0a34b2b45b9b20a7eb575f74f426eb18eb6dda48ae614a2fa134a5f80260bcf07c9af74731e7a45f131a08e18f5b12f SHA512 95db9d7a6f2869d74b0f960845dcaff0490bd5d137bd3df477d6fc5ba7eef910c46b3dd16fd2508830024fa56f27ff1c479b47ec7b766d15103449b2c01485b4
diff --git a/net-misc/nx/nx-3.5.99.15.ebuild b/net-misc/nx/nx-3.5.99.15.ebuild
index bbb4663dc606..75aa788486f6 100644
--- a/net-misc/nx/nx-3.5.99.15.ebuild
+++ b/net-misc/nx/nx-3.5.99.15.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 	# have quilt installed.
 	sed 's@which quilt@false@' -i mesa-quilt || die
 
-	# run autoreconf in all neeed folders
+	# run autoreconf in all needed folders
 	for i in nxcomp nx-X11/lib nxcompshad nxproxy ; do
 		pushd ${i} || die
 		eautoreconf
@@ -57,11 +57,15 @@ src_prepare() {
 }
 
 src_configure() {
-	for i in nxcomp nx-X11/lib nxcompshad nxproxy ; do
+	for i in nxcomp nxcompshad nxproxy ; do
 		pushd ${i} || die
 		econf
 		popd || die
 	done
+
+	pushd "nx-X11/lib" || die
+	econf --disable-poll
+	popd || die
 }
 
 src_compile() {
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 0f9d213856f8..5dea347c9b39 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -6,12 +6,9 @@ AUX openssh-7.5_p1-cross-cache.patch 1220 BLAKE2B 7176b86024b072ff601421143f8567
 AUX openssh-7.5_p1-hpn-x509-10.2-glue.patch 2847 BLAKE2B 8a6151ab121871e4f2d93ace0e07dce1106c6841031cacfb197e00cc76fc1d0cf153aae52757dcf98a5fb89971125493d0572bd4964d0e59cb3f391fd1256aef SHA512 bc23fdf5995ae38ff166f12f64082f79a2135ca28f2240e89bee42b1e3ba39ce94467ece9ddea99173f1829b09b069dbf56a0bce7dfd1ae5f63c12f73b5ffba7
 AUX openssh-7.5_p1-s390-seccomp.patch 624 BLAKE2B 0bf595d72cd65993dde4e5aae0a3e091bb48021ef8affa84c988d55d9fe6a823b0329b6d9707c88e1556d45c304b6630ade7008f63fd649975594a75f570bb33 SHA512 058dc269eb032151e88e0ac79a0b0fd6fcd56d489e90e299ee431b1475a8f8080e8f4649244864af33e743820b081c9f90b32a1a93b8b60feeb491c0201a4d61
 AUX openssh-7.5_p1-x32-typo.patch 772 BLAKE2B 3f27d669ee76e191f2f6f7c7d86b1d9cb7297cecf17b2d88d86ef498c9ca35231adb0edc9fb811698ec86fd65527cc3fe9f2ce514836aebe5dc27bca2a3a55dc SHA512 20d19301873d4b8e908527f462f40c2f4a513d0bb89d4c7b885f9fc7eb5d483eea544eb108d87ff6aaa3d988d360c2029910c18f7125c96e8367485553f59a5e
-AUX openssh-7.6_p1-hpn-x509-11.0-glue.patch 2182 BLAKE2B 02953663257816c71734fc8bf9f9b4619860d75cd49e7758d8895d8368acda7fb8117322747af61cac6a8b57f24a5080397af4307f9f681b0cf25caa75cc9cff SHA512 387222fe9b46f0f2df3cb9f6125995c46f7428955784175c718e902a36e90994f5bcecfbbe160d28fc810e4e43e6f070937c39546f0df36ebb9b47bda3c3e032
-AUX openssh-7.6_p1-hpn-x509-11.1-glue.patch 2188 BLAKE2B 2be559ea9fbe4dcd619cb13334b9b10005d93d83284f895c18ae56b1059c81faf5e0d71ed02000ad14beac201b0af7a698882b1dc6fcc646f3e5bf7444e693ff SHA512 db93c85430bdfa802ae950de6170f9867bc82fad222b153433d14c6728f94bed3fbeb04e30c8960361dcb92aa6d3bc6480b2d02f0fa01e4ea70bc0039fa6e52f
 AUX openssh-7.6_p1-hpn-x509-11.2-glue.patch 2188 BLAKE2B 2be559ea9fbe4dcd619cb13334b9b10005d93d83284f895c18ae56b1059c81faf5e0d71ed02000ad14beac201b0af7a698882b1dc6fcc646f3e5bf7444e693ff SHA512 db93c85430bdfa802ae950de6170f9867bc82fad222b153433d14c6728f94bed3fbeb04e30c8960361dcb92aa6d3bc6480b2d02f0fa01e4ea70bc0039fa6e52f
+AUX openssh-7.6_p1-permitopen.patch 1857 BLAKE2B f2f7e091b99d96e77ec95353789cfd8051ced60a198219a88ae409cdedde8751af9bea5b048c76a610411f86a4e802e488fb2c5b4045e1410a6b2f2cc1a34227 SHA512 1fc3410f52e86930af5188cadf9e9f1046e7a695639e27b95da9e25a781e8f4445e279c54cd010d280e7b4df58da404b97fce8e6192ae5d456d33b498aaf00c7
 AUX openssh-7.6_p1-warnings.patch 324 BLAKE2B d9fb6e710f797b687b285f70b7c7b32abaa34bd57aeb32558f5d9978df5b5eb5ba5dc1ac8c46ed430619318fa3cfd3475a9c24e3f594ad05d081decd0e4c2f36 SHA512 08a9caf1cbb4dbde2828f14075b41762dad24a8a88882cc61cb133783caa1200f63f052824409b0334c832365c0d934f44b2eeac947228ff52be24a09548cd22
-AUX openssh-7.6_p1-x509-11.0-libressl.patch 570 BLAKE2B 0b22cca997909743ec3247a80a9efffda7e85235274df98fd8aebf549a1a7cddb3906dd4cc678bf4176f634c5e4b123a00af9d0690672e9bee06e848800eb1ff SHA512 795d3e99d81cbd76533196b6a73a9c9a6db800f9de1f6c7860b56058d0a319c6633ab09b8a149ed6d840b3c9a43162ce299e2a16e334a66802260fbdc35b2b17
-AUX openssh-7.6_p1-x509-11.1-libressl.patch 570 BLAKE2B 9b8baee7a209108ae5bd11fb8c121e77e1908e85210d8ae65d5037521dc7c75f8c9712b20fd1c3ba99eadf588b7f5510486c1f2f915a7652c545d3bd6e14508f SHA512 a503ad8363400fa32d7ba916641a3d5008c9e6dfab4ca63c7b81125e5214733c38375c415dd4ada2b08ace4c9a17ee6f23c578e626289f5140461d01fffa014d
 AUX sshd.confd 396 BLAKE2B 2fc146e83512d729e120cfe331441e8fe27eba804906cc0c463b938ddaf052e7392efbcda6699467afde22652c599e7d55b0ce18a344137263cd78647fea255f SHA512 b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81
 AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c
 AUX sshd.rc6.4 2108 BLAKE2B 55b66dddb45aadccde794667195f716f84c521576d886a3acc56f6f66087f0ff7167bde629c876da4ee1306a4995b8a4cd089eece35037616d17ee4b691b4cf8 SHA512 fe58e950514743a72467233ff2f2a63112c50e5db843d61e141a5ca3dd8ef8f42a616cd9de7748ae582054c47c2cc38ce48b638e2d88be39c1387f77e79c83e1
@@ -23,17 +20,12 @@ DIST openssh-7.5p1+x509-10.2.diff.gz 467040 BLAKE2B 4048b0f016bf7d43276f88117fc2
 DIST openssh-7.5p1-hpnssh14v12.tar.xz 23068 BLAKE2B 15702338877e50c2143b33b93bfc87d0aa0fa55915db1f0cab9c22e55f8aa0c6eeb5a56f438d849544d1650bdc574384b851292d621b79f673b78bc37617aa0b SHA512 45c42090a212b9ce898fbaa8284ddf0f0d17236af13c4a780e00bf265b0c7a4286027e90a7ce9ad70066309db722709dd2f0a7914f57e5364ffbaf7c4859cdf9
 DIST openssh-7.5p1.tar.gz 1510857 BLAKE2B 505764a210018136456c0f5dd40ad9f1383551c3ae037593d4296305df189e0a6f1383adc89b1970d58b8dcfff391878b7a29b848cc244a99705a164bec5d734 SHA512 58c542e8a110fb4316a68db94abb663fa1c810becd0638d45281df8aeca62c1f705090437a80e788e6c29121769b72a505feced537d3118c933fde01b5285c81
 DIST openssh-7.6_p1-sctp.patch.xz 6996 BLAKE2B 4a857afdc8fa5cb2bfb9dd1805ac6343e774ac7423e2f4439f2adf585aae18fcf55d63f7f5421e716d76e2dd0205b186b6fea1f53132453ea82f0821cea3124c SHA512 8445a9a8ae8e8baa67c8f386117877ba3f39f33c9cdaff341c8d5fb4ce9dfe22f26d5aedc2b0d4aab67864994ec5a6a487d18b728bd5d5c6efe14175eb9c8151
-DIST openssh-7.6p1+x509-11.0.diff.gz 440219 BLAKE2B 9329a7cf8575c21c31ec73f8ca1084708de34a5b530699d8be2a2a75e1ce0d37210a897c894ab75ee8e2ad0f0802d483d041b1bf3cf3ea46a4a423f1350f42d2 SHA512 add86ecdaa696d997f869e6878aaaef285590cc5eddf301be651944bbc6c80af6a891bad6f6aaa4b6e9919ad865a27dc6f45a6e0b923ca52c04f06523fa3197a
-DIST openssh-7.6p1+x509-11.1.diff.gz 451725 BLAKE2B 1397c05539ce7532f5e6bf33fc16d5661c32365e127ab1134c0a12c70f0645b05eb05d3ebd9bf64ed59cb94a63cbe8466ac87c9831605230d1ccd578a736904b SHA512 8d445911d8b28fb922a2a0ddb4b7783f81bc258af708148541d30cb79012789cc319bc2031b4584c4c5504480b70077e675be01070fd3065dc4f5ddee89ad8f1
 DIST openssh-7.6p1+x509-11.2.diff.gz 466657 BLAKE2B 3f4f108e2d97eb292c215bc3a6e2c64ae6b9e49704f46f46a21496a71d5ebd051ab648446bf71ef141e2114f4a03363d8cd043f5813f957c2c5f2e2eb193931d SHA512 1c0fea91037bfcaed7aa3f0cb01d262410a99d3e1b98a25a012db5d683f3275ab52f78f1e446bd7e543c78f9d406b1dce2bb3997214534ae94e11c254658080f
 DIST openssh-7.6p1-hpnssh14v12-r1.tar.xz 15440 BLAKE2B e140852a3ce63e4f744ed4b18b474cf88d09ca55509e5a16d26eef5cf8574466b472073eef56e19467932959d9ba7e941ab561d9ea0704dfee3fd08a6ba7ba8c SHA512 9d0450ec99fe550d790e471cb7815d0863788cf9c41dfef653d102f02be3d38a09e5103e537658279216a5815c1a075ded9f011e05ce216beee2c7daeea8c75a
-DIST openssh-7.6p1-hpnssh14v12.tar.xz 15392 BLAKE2B 6888ea4054a470116b2ab3d115f54e3ee54e0d05a24d3331613c241e684a43354b6100ee2be76e5b2dcc8f0444fbae5d146830d634e53a85124d5e553759a552 SHA512 0e2c62cdec360090b359edfd5bbe894fb25d22e387677e8a5d6cf6a0807b0572fda30b90c30390d5b68e359e9958cb1c65abae4afd9af5892c3f64f6f8001956
 DIST openssh-7.6p1.tar.gz 1489788 BLAKE2B 938bfeeff0a0aaa2fc7e4c345f04561c6c071c526e354a7d344a08742cb70ab1f4a41d325b31720f2fba5c4afa4db11f3fc87055c8c9c8bea37b29cc11dc8f39 SHA512 de17fdcb8239401f76740c8d689a8761802f6df94e68d953f3c70b9f4f8bdb403617c48c1d01cc8c368d88e9d50aee540bf03d5a36687dfb39dfd28d73029d72
 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
 DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 BLAKE2B a31dcb15848d3a22306108a4e181b1d52b195e6adcd2a78d5c7bf57f33c8ed62c3affa434c8d31c07eae84b59f1a3968a3f2a92e702f9225b121127616cb9d61 SHA512 e9a2b18fd6a58354198b6e48199059d055451a5f09c99bf7293d0d54137a59c581a9cb3bd906f31589e03d8450fb017b9015e18c67b7b6ae840e336039436974
 EBUILD openssh-7.5_p1-r4.ebuild 11115 BLAKE2B 31bfee62343a2124e48733c4db1367fcce121d5eff25008135d2e715a34a45a176c02a5fcee99271db723d437a62d0e79297cb17df1b1ab6a12534ad2cb0c0b5 SHA512 00dbc65bf70747906f2ae5ae538579b5bd4935bae224c59ad2de92820fc64f969ca2bddc1bf0ed8924f7b6825e5665730e3fa65b5682a7f7a170233b41b73acb
-EBUILD openssh-7.6_p1-r2.ebuild 11172 BLAKE2B ce0c8101f1e13686c748aaeeb4603244618a1efce52f2a7fc7eaef8d4bf7acf0f19c41e5393d03cb8179a813b0aaae91eca1f86b30c22bafcfec542fa9e0f7f7 SHA512 4d725eee7492aac558b3c5a73a52521278f80777be96cbb8fb7e195bd4463dca19806a35ff276c00ac081f071fba6f2edbe39a1981c14c52c99a453fb78c3d3d
-EBUILD openssh-7.6_p1-r3.ebuild 11160 BLAKE2B ae47330e350d828199cfa0218e7aab64638baf63b5c4dda71872c0c5a3b729b8dcab63cc3aae5098dbb6958c013b9ece73dae46fd6185918ac2294171c9e55c2 SHA512 1ab8699ae71d2949960f252894fd1b64c8997abc384cc8a85f221c6ef5c16ab54ad4e8b297b6796e9d3d1aa693dce203ba38f72e74ce7a74c9ec76a41c956c49
 EBUILD openssh-7.6_p1-r4.ebuild 11099 BLAKE2B 975314f6b62e9191bf6300becb51f6282e52edc889407996ba640b07755dc713f28f9669e84a7f269d2be58764c561d7c2a14ff9af03ea7664794eb7f8656d9a SHA512 40276711daceea7e595a57b9805d5a4099e644650c6d2b501d581f5297bfc59bc20b325db455ce9e959d1a8d85bc25471e873177af5feadf1813f50205d6bb35
-EBUILD openssh-7.6_p1.ebuild 11171 BLAKE2B 0c91399c7dbd07f7101c609eba7ae19d91f5c270f817f7d1311935faf5520b22a0ddfd2e4cf1953055fcc601092370d37d223714cb597be798ffe4019af3bbca SHA512 5b3c82f8999a4e59ca481eb7c6b77571ec33341c8f2a7b949dc3894c13d8adb93c6df4270216d2ecee4576f3c5f96aa29873b0caca841aae54adcc998e54f27a
+EBUILD openssh-7.6_p1-r5.ebuild 11143 BLAKE2B 1746247964bb636a9427969be1470f59ccbb96fd117885827c172904c8029d426aaa9fefc4b1952ee2e2a518cd96e118f73644587748e46f1f8ca403e8dcdddd SHA512 28989a23b7ed00e608dfc9fb672ec7db2a960ae3e78924bf445ee8ee092f8ec15b9374075a4dee4f39f704512e289fa60689a079cd9bf711cab8b961979ecea9
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.0-glue.patch b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.0-glue.patch
deleted file mode 100644
index d55656aae974..000000000000
--- a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.0-glue.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/openssh-7.6p1-hpnssh14v12/0004-support-dynamically-sized-receive-buffers.patch	2017-10-11 15:02:11.850912525 -0700
-+++ b/openssh-7.6p1-hpnssh14v12/0004-support-dynamically-sized-receive-buffers.patch	2017-10-11 15:35:06.223424844 -0700
-@@ -907,9 +907,9 @@
- @@ -517,7 +544,7 @@ send_client_banner(int connection_out, int minor1)
-  {
-  	/* Send our own protocol version identification. */
-- 	xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
---	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
--+	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
-+ 	xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n",
-+-	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, PACKAGE_VERSION);
-++	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, PACKAGE_VERSION);
-  	if (atomicio(vwrite, connection_out, client_version_string,
-  	    strlen(client_version_string)) != strlen(client_version_string))
-  		fatal("write: %.100s", strerror(errno));
-@@ -918,11 +918,11 @@
- --- a/sshd.c
- +++ b/sshd.c
- @@ -367,7 +367,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
-- 	char remote_version[256];	/* Must be at least as big as buf. */
-+ 	}
-  
-- 	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
---	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
--+	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
-+	xasprintf(&server_version_string, "SSH-%d.%d-%s%s%s%s\r\n",
-+-	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, pkix_comment,
-++	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, pkix_comment,
-  	    *options.version_addendum == '\0' ? "" : " ",
-  	    options.version_addendum);
-  
-@@ -982,13 +982,14 @@
- index e093f623..83f0932d 100644
- --- a/version.h
- +++ b/version.h
--@@ -3,4 +3,5 @@
-+@@ -3,3 +3,6 @@
-  #define SSH_VERSION	"OpenSSH_7.6"
-  
-- #define SSH_PORTABLE	"p1"
---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
-+-#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
-++#define SSH_PORTABLE	"p1"
- +#define SSH_HPN		"-hpn14v12"
-++#define SSH_X509		"-PKIXSSH-11.0"
--+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
-++#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1" SSH_HPN
- -- 
- 2.14.2
- 
diff --git a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch b/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch
deleted file mode 100644
index 2ed6a7b54a66..000000000000
--- a/net-misc/openssh/files/openssh-7.6_p1-hpn-x509-11.1-glue.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/openssh-7.6p1-hpnssh14v12-r1/0003-support-dynamically-sized-receive-buffers.patch	2017-10-11 15:02:11.850912525 -0700
-+++ b/openssh-7.6p1-hpnssh14v12-r1/0003-support-dynamically-sized-receive-buffers.patch	2017-10-11 15:35:06.223424844 -0700
-@@ -907,9 +907,9 @@
- @@ -517,7 +544,7 @@ send_client_banner(int connection_out, int minor1)
-  {
-  	/* Send our own protocol version identification. */
-- 	xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
---	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
--+	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
-+ 	xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX[%s]\r\n",
-+-	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, PACKAGE_VERSION);
-++	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, PACKAGE_VERSION);
-  	if (atomicio(vwrite, connection_out, client_version_string,
-  	    strlen(client_version_string)) != strlen(client_version_string))
-  		fatal("write: %.100s", strerror(errno));
-@@ -918,11 +918,11 @@
- --- a/sshd.c
- +++ b/sshd.c
- @@ -367,7 +367,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
-- 	char remote_version[256];	/* Must be at least as big as buf. */
-+ 	}
-  
-- 	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
---	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
--+	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
-+	xasprintf(&server_version_string, "SSH-%d.%d-%s%s%s%s\r\n",
-+-	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, pkix_comment,
-++	    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE, pkix_comment,
-  	    *options.version_addendum == '\0' ? "" : " ",
-  	    options.version_addendum);
-  
-@@ -982,13 +982,14 @@
- index e093f623..83f0932d 100644
- --- a/version.h
- +++ b/version.h
--@@ -3,4 +3,5 @@
-+@@ -3,3 +3,6 @@
-  #define SSH_VERSION	"OpenSSH_7.6"
-  
-- #define SSH_PORTABLE	"p1"
---#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
-+-#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
-++#define SSH_PORTABLE	"p1"
- +#define SSH_HPN		"-hpn14v12"
-++#define SSH_X509		"-PKIXSSH-11.0"
--+#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN
-++#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1" SSH_HPN
- -- 
- 2.14.2
- 
diff --git a/net-misc/openssh/files/openssh-7.6_p1-permitopen.patch b/net-misc/openssh/files/openssh-7.6_p1-permitopen.patch
new file mode 100644
index 000000000000..5dc96d4d0a37
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.6_p1-permitopen.patch
@@ -0,0 +1,49 @@
+From 69bda0228861f3dacd4fb3d28b60ce9d103d254b Mon Sep 17 00:00:00 2001
+From: "djm@openbsd.org" <djm@openbsd.org>
+Date: Wed, 4 Oct 2017 18:49:30 +0000
+Subject: [PATCH] upstream commit
+
+fix (another) problem in PermitOpen introduced during the
+channels.c refactor: the third and subsequent arguments to PermitOpen were
+being silently ignored; ok markus@
+
+Upstream-ID: 067c89f1f53cbc381628012ba776d6861e6782fd
+---
+ servconf.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/servconf.c b/servconf.c
+index 2c321a4a..95686295 100644
+--- a/servconf.c
++++ b/servconf.c
+@@ -1,5 +1,5 @@
+ 
+-/* $OpenBSD: servconf.c,v 1.312 2017/10/02 19:33:20 djm Exp $ */
++/* $OpenBSD: servconf.c,v 1.313 2017/10/04 18:49:30 djm Exp $ */
+ /*
+  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
+  *                    All rights reserved
+@@ -1663,9 +1663,9 @@ process_server_config_line(ServerOptions *options, char *line,
+ 		if (!arg || *arg == '\0')
+ 			fatal("%s line %d: missing PermitOpen specification",
+ 			    filename, linenum);
+-		i = options->num_permitted_opens;	/* modified later */
++		value = options->num_permitted_opens;	/* modified later */
+ 		if (strcmp(arg, "any") == 0 || strcmp(arg, "none") == 0) {
+-			if (*activep && i == 0) {
++			if (*activep && value == 0) {
+ 				options->num_permitted_opens = 1;
+ 				options->permitted_opens = xcalloc(1,
+ 				    sizeof(*options->permitted_opens));
+@@ -1683,7 +1683,7 @@ process_server_config_line(ServerOptions *options, char *line,
+ 			if (arg == NULL || ((port = permitopen_port(arg)) < 0))
+ 				fatal("%s line %d: bad port number in "
+ 				    "PermitOpen", filename, linenum);
+-			if (*activep && i == 0) {
++			if (*activep && value == 0) {
+ 				options->permitted_opens = xrecallocarray(
+ 				    options->permitted_opens,
+ 				    options->num_permitted_opens,
+-- 
+2.16.1
+
diff --git a/net-misc/openssh/files/openssh-7.6_p1-x509-11.0-libressl.patch b/net-misc/openssh/files/openssh-7.6_p1-x509-11.0-libressl.patch
deleted file mode 100644
index b84ee64e4f7c..000000000000
--- a/net-misc/openssh/files/openssh-7.6_p1-x509-11.0-libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/openssh-7.6p1+x509-11.0.diff	2017-11-06 17:16:28.334140140 -0800
-+++ b/openssh-7.6p1+x509-11.0.diff	2017-11-06 17:16:55.338223563 -0800
-@@ -54732,7 +54732,7 @@
- +int/*bool*/ ssh_x509store_addlocations(const X509StoreOptions *locations);
- +
- +typedef char SSHXSTOREPATH;
--+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- +DECLARE_STACK_OF(SSHXSTOREPATH)
- +# define sk_SSHXSTOREPATH_new_null()	SKM_sk_new_null(SSHXSTOREPATH)
- +# define sk_SSHXSTOREPATH_num(st)	SKM_sk_num(SSHXSTOREPATH, (st))
diff --git a/net-misc/openssh/files/openssh-7.6_p1-x509-11.1-libressl.patch b/net-misc/openssh/files/openssh-7.6_p1-x509-11.1-libressl.patch
deleted file mode 100644
index c3b6b4d61a3e..000000000000
--- a/net-misc/openssh/files/openssh-7.6_p1-x509-11.1-libressl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/openssh-7.6p1+x509-11.1.diff	2017-11-06 17:16:28.334140140 -0800
-+++ b/openssh-7.6p1+x509-11.1.diff	2017-11-06 17:16:55.338223563 -0800
-@@ -54732,7 +54732,7 @@
- +int/*bool*/ ssh_x509store_addlocations(const X509StoreOptions *locations);
- +
- +typedef char SSHXSTOREPATH;
--+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- +DECLARE_STACK_OF(SSHXSTOREPATH)
- +# define sk_SSHXSTOREPATH_new_null()	SKM_sk_new_null(SSHXSTOREPATH)
- +# define sk_SSHXSTOREPATH_num(st)	SKM_sk_num(SSHXSTOREPATH, (st))
diff --git a/net-misc/openssh/openssh-7.6_p1-r2.ebuild b/net-misc/openssh/openssh-7.6_p1-r2.ebuild
deleted file mode 100644
index ce99373986b0..000000000000
--- a/net-misc/openssh/openssh-7.6_p1-r2.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user flag-o-matic multilib autotools pam systemd versionator
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-#HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz"
-SCTP_PATCH="${PN}-7.6_p1-sctp.patch.xz"
-LDAP_PATCH="${PN}-lpk-7.6p1-0.3.14.patch.xz"
-X509_VER="11.0" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.org/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	${SCTP_PATCH:+https://dev.gentoo.org/~polynomial-c/${SCTP_PATCH}}
-	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
-	${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~polynomial-c/${LDAP_PATCH} )}
-	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
-	"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
-REQUIRED_USE="ldns? ( ssl )
-	pie? ( !static )
-	static? ( !kerberos !pam )
-	X509? ( !ldap !sctp ssl )
-	test? ( ssl )"
-
-LIB_DEPEND="
-	audit? ( sys-process/audit[static-libs(+)] )
-	ldns? (
-		net-libs/ldns[static-libs(+)]
-		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
-		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
-	)
-	libedit? ( dev-libs/libedit:=[static-libs(+)] )
-	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
-	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
-	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
-	ssl? (
-		!libressl? (
-			>=dev-libs/openssl-1.0.1:0=[bindist=]
-			dev-libs/openssl:0=[static-libs(+)]
-		)
-		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	)
-	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	virtual/pkgconfig
-	virtual/os-headers
-	sys-devel/autoconf"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20081028 )
-	userland_GNU? ( virtual/shadow )
-	X? ( x11-apps/xauth )"
-
-S="${WORKDIR}/${PARCH}"
-
-pkg_pretend() {
-	# this sucks, but i'd rather have people unable to `emerge -u openssh`
-	# than not be able to log in to their server any more
-	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
-	local fail="
-		$(use X509 && maybe_fail X509 X509_PATCH)
-		$(use ldap && maybe_fail ldap LDAP_PATCH)
-		$(use hpn && maybe_fail hpn HPN_PATCH)
-	"
-	fail=$(echo ${fail})
-	if [[ -n ${fail} ]] ; then
-		eerror "Sorry, but this version does not yet support features"
-		eerror "that you requested:	 ${fail}"
-		eerror "Please mask ${PF} for now and check back later:"
-		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-		die "booooo"
-	fi
-
-	# Make sure people who are using tcp wrappers are notified of its removal. #531156
-	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
-		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
-		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
-	fi
-}
-
-save_version() {
-	# version.h patch conflict avoidence
-	mv version.h version.h.$1
-	cp -f version.h.pristine version.h
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
-		pathnames.h || die
-	# keep this as we need it to avoid the conflict between LPK and HPN changing
-	# this file.
-	cp version.h version.h.pristine
-
-	eapply "${FILESDIR}/${P}-warnings.patch"
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	if use X509 ; then
-		if use hpn ; then
-			pushd "${WORKDIR}" >/dev/null
-			eapply "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
-			eapply "${FILESDIR}"/${P}-x509-${X509_VER}-libressl.patch
-			popd >/dev/null
-		fi
-		save_version X509
-		eapply "${WORKDIR}"/${X509_PATCH%.*}
-	fi
-
-	if use ldap ; then
-		eapply "${WORKDIR}"/${LDAP_PATCH%.*}
-		save_version LPK
-	fi
-
-	eapply "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
-	use X509 || eapply "${WORKDIR}"/${SCTP_PATCH%.*}
-	use abi_mips_n32 && eapply "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
-
-	if use hpn ; then
-		elog "Applying HPN patchset ..."
-		eapply "${WORKDIR}"/${HPN_PATCH%.*.*}
-		save_version HPN
-	fi
-
-	tc-export PKG_CONFIG
-	local sed_args=(
-		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
-		# Disable PATH reset, trust what portage gives us #254615
-		-e 's:^PATH=/:#PATH=/:'
-		# Disable fortify flags ... our gcc does this for us
-		-e 's:-D_FORTIFY_SOURCE=2::'
-	)
-	# The -ftrapv flag ICEs on hppa #505182
-	use hppa && sed_args+=(
-		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
-		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
-	)
-	# _XOPEN_SOURCE causes header conflicts on Solaris
-	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
-		-e 's/-D_XOPEN_SOURCE//'
-	)
-	sed -i "${sed_args[@]}" configure{.ac,} || die
-
-	eapply_user #473004
-
-	# Now we can build a sane merged version.h
-	(
-		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
-		macros=()
-		for p in HPN LPK X509; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done
-		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros[*]}"
-	) > version.h
-
-	eautoreconf
-}
-
-src_configure() {
-	addwrite /dev/ptmx
-
-	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
-	use static && append-ldflags -static
-
-	local myconf=(
-		--with-ldflags="${LDFLAGS}"
-		--disable-strip
-		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX}"/etc/ssh
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX}"/var/empty
-		--with-privsep-user=sshd
-		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
-		# We apply the ldap patch conditionally, so can't pass --without-ldap
-		# unconditionally else we get unknown flag warnings.
-		$(use ldap && use_with ldap)
-		$(use_with ldns)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use X509 || use_with sctp)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with ssl openssl)
-		$(use_with ssl md5-passwords)
-		$(use_with ssl ssl-engine)
-	)
-
-	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
-	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
-	newconfd "${FILESDIR}"/sshd.confd sshd
-
-	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-	if use pam ; then
-		sed -i \
-			-e "/^#UsePAM /s:.*:UsePAM yes:" \
-			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
-			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
-			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-
-	# Gentoo tweaks to default config files
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
-	# Allow client to pass locale environment variables #367017
-	AcceptEnv LANG LC_*
-	EOF
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
-	# Send locale environment variables #367017
-	SendEnv LANG LC_*
-	EOF
-
-	if use livecd ; then
-		sed -i \
-			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-
-	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
-		insinto /etc/openldap/schema/
-		newins openssh-lpk_openldap.schema openssh-lpk.schema
-	fi
-
-	doman contrib/ssh-copy-id.1
-	dodoc CREDITS OVERVIEW README* TODO sshd_config
-	use X509 || dodoc ChangeLog
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-
-	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
-	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-src_test() {
-	local t skipped=() failed=() passed=()
-	local tests=( interop-tests compat-tests )
-
-	local shell=$(egetshell "${UID}")
-	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
-		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
-		elog "user, so we will run a subset only."
-		skipped+=( tests )
-	else
-		tests+=( tests )
-	fi
-
-	# It will also attempt to write to the homedir .ssh.
-	local sshhome=${T}/homedir
-	mkdir -p "${sshhome}"/.ssh
-	for t in "${tests[@]}" ; do
-		# Some tests read from stdin ...
-		HOMEDIR="${sshhome}" HOME="${sshhome}" \
-		emake -k -j1 ${t} </dev/null \
-			&& passed+=( "${t}" ) \
-			|| failed+=( "${t}" )
-	done
-
-	einfo "Passed tests: ${passed[*]}"
-	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
-	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
-}
-
-pkg_preinst() {
-	enewgroup sshd 22
-	enewuser sshd 22 -1 /var/empty sshd
-}
-
-pkg_postinst() {
-	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
-		elog "Starting with openssh-5.8p1, the server will default to a newer key"
-		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
-		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
-		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
-		elog "Make sure to update any configs that you might have.  Note that xinetd might"
-		elog "be an alternative for you as it supports USE=tcpd."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
-		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
-		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
-		elog "adding to your sshd_config or ~/.ssh/config files:"
-		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
-		elog "You should however generate new keys using rsa or ed25519."
-
-		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
-		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
-		elog "out of the box.  If you need this, please update your sshd_config explicitly."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then
-		elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
-		elog "Furthermore, rsa keys with less than 1024 bits will be refused."
-	fi
-	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
-		elog "Be aware that by disabling openssl support in openssh, the server and clients"
-		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
-		elog "and update all clients/servers that utilize them."
-	fi
-
-	# remove this if aes-ctr-mt gets fixed
-	if use hpn; then
-		elog "The multithreaded AES-CTR cipher has been temporarily dropped from the HPN patch"
-		elog "set since it does not (yet) work with >=openssh-7.6p1."
-	fi
-}
diff --git a/net-misc/openssh/openssh-7.6_p1-r3.ebuild b/net-misc/openssh/openssh-7.6_p1-r5.ebuild
index 131e6e1da0d8..e19d5f0f30b4 100644
--- a/net-misc/openssh/openssh-7.6_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-7.6_p1-r5.ebuild
@@ -12,7 +12,7 @@ PARCH=${P/_}
 HPN_PATCH="${PARCH}-hpnssh14v12-r1.tar.xz"
 SCTP_PATCH="${PN}-7.6_p1-sctp.patch.xz"
 LDAP_PATCH="${PN}-lpk-7.6p1-0.3.14.patch.xz"
-X509_VER="11.1" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
+X509_VER="11.2" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="http://www.openssh.org/"
@@ -110,6 +110,7 @@ src_prepare() {
 	cp version.h version.h.pristine
 
 	eapply "${FILESDIR}/${P}-warnings.patch"
+	eapply "${FILESDIR}/${P}-permitopen.patch"
 
 	# don't break .ssh/authorized_keys2 for fun
 	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
@@ -118,7 +119,6 @@ src_prepare() {
 		if use hpn ; then
 			pushd "${WORKDIR}" >/dev/null
 			eapply "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
-			eapply "${FILESDIR}"/${P}-x509-${X509_VER}-libressl.patch
 			popd >/dev/null
 			save_version X509
 		fi
diff --git a/net-misc/openssh/openssh-7.6_p1.ebuild b/net-misc/openssh/openssh-7.6_p1.ebuild
deleted file mode 100644
index ff5b2fc3ad58..000000000000
--- a/net-misc/openssh/openssh-7.6_p1.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user flag-o-matic multilib autotools pam systemd versionator
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz"
-SCTP_PATCH="${PN}-7.6_p1-sctp.patch.xz"
-LDAP_PATCH="${PN}-lpk-7.6p1-0.3.14.patch.xz"
-X509_VER="11.0" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.org/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	${SCTP_PATCH:+https://dev.gentoo.org/~polynomial-c/${SCTP_PATCH}}
-	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
-	${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~polynomial-c/${LDAP_PATCH} )}
-	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
-	"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
-REQUIRED_USE="ldns? ( ssl )
-	pie? ( !static )
-	static? ( !kerberos !pam )
-	X509? ( !ldap !sctp ssl )
-	test? ( ssl )"
-
-LIB_DEPEND="
-	audit? ( sys-process/audit[static-libs(+)] )
-	ldns? (
-		net-libs/ldns[static-libs(+)]
-		!bindist? ( net-libs/ldns[ecdsa,ssl(+)] )
-		bindist? ( net-libs/ldns[-ecdsa,ssl(+)] )
-	)
-	libedit? ( dev-libs/libedit:=[static-libs(+)] )
-	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
-	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
-	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
-	ssl? (
-		!libressl? (
-			>=dev-libs/openssl-1.0.1:0=[bindist=]
-			dev-libs/openssl:0=[static-libs(+)]
-		)
-		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	)
-	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	pam? ( virtual/pam )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	virtual/pkgconfig
-	virtual/os-headers
-	sys-devel/autoconf"
-RDEPEND="${RDEPEND}
-	pam? ( >=sys-auth/pambase-20081028 )
-	userland_GNU? ( virtual/shadow )
-	X? ( x11-apps/xauth )"
-
-S="${WORKDIR}/${PARCH}"
-
-pkg_pretend() {
-	# this sucks, but i'd rather have people unable to `emerge -u openssh`
-	# than not be able to log in to their server any more
-	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
-	local fail="
-		$(use X509 && maybe_fail X509 X509_PATCH)
-		$(use ldap && maybe_fail ldap LDAP_PATCH)
-		$(use hpn && maybe_fail hpn HPN_PATCH)
-	"
-	fail=$(echo ${fail})
-	if [[ -n ${fail} ]] ; then
-		eerror "Sorry, but this version does not yet support features"
-		eerror "that you requested:	 ${fail}"
-		eerror "Please mask ${PF} for now and check back later:"
-		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
-		die "booooo"
-	fi
-
-	# Make sure people who are using tcp wrappers are notified of its removal. #531156
-	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
-		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
-		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
-	fi
-}
-
-save_version() {
-	# version.h patch conflict avoidence
-	mv version.h version.h.$1
-	cp -f version.h.pristine version.h
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
-		pathnames.h || die
-	# keep this as we need it to avoid the conflict between LPK and HPN changing
-	# this file.
-	cp version.h version.h.pristine
-
-	eapply "${FILESDIR}/${P}-warnings.patch"
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	if use X509 ; then
-		if use hpn ; then
-			pushd "${WORKDIR}" >/dev/null
-			eapply "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
-			eapply "${FILESDIR}"/${P}-x509-${X509_VER}-libressl.patch
-			popd >/dev/null
-		fi
-		save_version X509
-		eapply "${WORKDIR}"/${X509_PATCH%.*}
-	fi
-
-	if use ldap ; then
-		eapply "${WORKDIR}"/${LDAP_PATCH%.*}
-		save_version LPK
-	fi
-
-	eapply "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
-	use X509 || eapply "${WORKDIR}"/${SCTP_PATCH%.*}
-	use abi_mips_n32 && eapply "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
-
-	if use hpn ; then
-		elog "Applying HPN patchset ..."
-		eapply "${WORKDIR}"/${HPN_PATCH%.*.*}
-		save_version HPN
-	fi
-
-	tc-export PKG_CONFIG
-	local sed_args=(
-		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
-		# Disable PATH reset, trust what portage gives us #254615
-		-e 's:^PATH=/:#PATH=/:'
-		# Disable fortify flags ... our gcc does this for us
-		-e 's:-D_FORTIFY_SOURCE=2::'
-	)
-	# The -ftrapv flag ICEs on hppa #505182
-	use hppa && sed_args+=(
-		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
-		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
-	)
-	# _XOPEN_SOURCE causes header conflicts on Solaris
-	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
-		-e 's/-D_XOPEN_SOURCE//'
-	)
-	sed -i "${sed_args[@]}" configure{.ac,} || die
-
-	eapply_user #473004
-
-	# Now we can build a sane merged version.h
-	(
-		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
-		macros=()
-		for p in HPN LPK X509; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done
-		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros[*]}"
-	) > version.h
-
-	eautoreconf
-}
-
-src_configure() {
-	addwrite /dev/ptmx
-
-	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
-	use static && append-ldflags -static
-
-	local myconf=(
-		--with-ldflags="${LDFLAGS}"
-		--disable-strip
-		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
-		--sysconfdir="${EPREFIX}"/etc/ssh
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
-		--datadir="${EPREFIX}"/usr/share/openssh
-		--with-privsep-path="${EPREFIX}"/var/empty
-		--with-privsep-user=sshd
-		$(use_with audit audit linux)
-		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
-		# We apply the ldap patch conditionally, so can't pass --without-ldap
-		# unconditionally else we get unknown flag warnings.
-		$(use ldap && use_with ldap)
-		$(use_with ldns)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use X509 || use_with sctp)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with ssl openssl)
-		$(use_with ssl md5-passwords)
-		$(use_with ssl ssl-engine)
-	)
-
-	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
-	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
-	newconfd "${FILESDIR}"/sshd.confd sshd
-
-	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-	if use pam ; then
-		sed -i \
-			-e "/^#UsePAM /s:.*:UsePAM yes:" \
-			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
-			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
-			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-
-	# Gentoo tweaks to default config files
-	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
-	# Allow client to pass locale environment variables #367017
-	AcceptEnv LANG LC_*
-	EOF
-	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
-	# Send locale environment variables #367017
-	SendEnv LANG LC_*
-	EOF
-
-	if use livecd ; then
-		sed -i \
-			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
-			"${ED}"/etc/ssh/sshd_config || die
-	fi
-
-	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
-		insinto /etc/openldap/schema/
-		newins openssh-lpk_openldap.schema openssh-lpk.schema
-	fi
-
-	doman contrib/ssh-copy-id.1
-	dodoc CREDITS OVERVIEW README* TODO sshd_config
-	use X509 || dodoc ChangeLog
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-
-	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
-	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-src_test() {
-	local t skipped=() failed=() passed=()
-	local tests=( interop-tests compat-tests )
-
-	local shell=$(egetshell "${UID}")
-	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
-		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
-		elog "user, so we will run a subset only."
-		skipped+=( tests )
-	else
-		tests+=( tests )
-	fi
-
-	# It will also attempt to write to the homedir .ssh.
-	local sshhome=${T}/homedir
-	mkdir -p "${sshhome}"/.ssh
-	for t in "${tests[@]}" ; do
-		# Some tests read from stdin ...
-		HOMEDIR="${sshhome}" HOME="${sshhome}" \
-		emake -k -j1 ${t} </dev/null \
-			&& passed+=( "${t}" ) \
-			|| failed+=( "${t}" )
-	done
-
-	einfo "Passed tests: ${passed[*]}"
-	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
-	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
-}
-
-pkg_preinst() {
-	enewgroup sshd 22
-	enewuser sshd 22 -1 /var/empty sshd
-}
-
-pkg_postinst() {
-	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
-		elog "Starting with openssh-5.8p1, the server will default to a newer key"
-		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
-		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
-		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
-		elog "Make sure to update any configs that you might have.  Note that xinetd might"
-		elog "be an alternative for you as it supports USE=tcpd."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
-		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
-		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
-		elog "adding to your sshd_config or ~/.ssh/config files:"
-		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
-		elog "You should however generate new keys using rsa or ed25519."
-
-		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
-		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
-		elog "out of the box.  If you need this, please update your sshd_config explicitly."
-	fi
-	if has_version "<${CATEGORY}/${PN}-7.6_p1" ; then
-		elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
-		elog "Furthermore, rsa keys with less than 1024 bits will be refused."
-	fi
-	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
-		elog "Be aware that by disabling openssl support in openssh, the server and clients"
-		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
-		elog "and update all clients/servers that utilize them."
-	fi
-
-	# remove this if aes-ctr-mt gets fixed
-	if use hpn; then
-		elog "The multithreaded AES-CTR cipher has been temporarily dropped from the HPN patch"
-		elog "set since it does not (yet) work with >=openssh-7.6p1."
-	fi
-}
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 50326905610f..aa1e84bfad9d 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,5 +1,7 @@
 DIST owncloudclient-2.3.4.tar.xz 33796736 BLAKE2B 3792be4f534c3424a58e83bfacef30a20d089df55de79dbaa51cfc9d20e7558ab65b65bda4ebf691276de050436253ffdb69dcdf7bad397c3dd4a074124e3053 SHA512 2a66182c1f679f4bb6d13c8b21d280dd6b530b8ef82e71a4fa0fecfed9a3f1a55f181ae3d96b24ff040a6f3c0b12777df035ee951264186ad3409e66da05b87b
 DIST owncloudclient-2.4.0.tar.xz 15385568 BLAKE2B 616c4d5ca58a5c7fb4900a7b46df81a13f477c623e590e74be3b14fae2bf51f3f00154707aebb22fe839cba896c41caa6c71aa9d0f481bb8cf2b2b79dc648060 SHA512 b2e8bcc12e4f087d868244e1e453d7d81ab076dfe8b14965d37ef9e4cb05f2237254edd2c261a28bd5ddd9534bd80f0491d476844f4f0a5a69dd42ec52f450f0
+DIST owncloudclient-2.4.1.tar.xz 15403164 BLAKE2B 0ab1ffbe2179fe04efc7977972d5941a32bc20cd73e310fa72e2a3cf341f7223911fd430f4d34f7e265819acb68d8576e2687a7bfe4ab7140b4c9e9381ea863b SHA512 5b0ceea299078efbc92c1abe22210a93df44bf98094bf4cf8a0c5138f0b69a6719fdc88ef2d5674d49c0ec18ffb12493319eb84616c3e4b8666171cb1a52f0b7
 EBUILD owncloud-client-2.3.4.ebuild 2197 BLAKE2B d20496e997884021a7dc5f1fc607691204f81726a77a1a52dac7bb454158d9d0af23ae37fc3505a8a5e7cc40f7fabdfb163072a32a426f613e09e7d631319a59 SHA512 620899cccfee444bb7782cb85821b48c762682519a59c0a11fdd3d3734682e4167980eeef304dfbae7c4327f41d2a6e4db005316d7d55a157a52f125957ddf65
 EBUILD owncloud-client-2.4.0.ebuild 2197 BLAKE2B d20496e997884021a7dc5f1fc607691204f81726a77a1a52dac7bb454158d9d0af23ae37fc3505a8a5e7cc40f7fabdfb163072a32a426f613e09e7d631319a59 SHA512 620899cccfee444bb7782cb85821b48c762682519a59c0a11fdd3d3734682e4167980eeef304dfbae7c4327f41d2a6e4db005316d7d55a157a52f125957ddf65
+EBUILD owncloud-client-2.4.1.ebuild 2138 BLAKE2B 2fd7cc230f5f55334603d550ba700a42c4387931b6446765dfb982bdd81b1a48f78833d5209a299d030434b506849fd1491aaa307cadc9685440ce485593768a SHA512 45620d1ef30809dece06130559231f49f88a831823dc91bd3844612cfbe00bb722c3990a83c2fafca8e0b32fc2d6631a0027f50e23351c2bdd10588d0253f723
 MISC metadata.xml 595 BLAKE2B c5e1e40ab739c9c5713804647af8dde5f46743686da261d81523cda8e8f0c89eafd70f59b1b65d165febed25db03f6565a0bc5b345a56cd647476605745170b5 SHA512 3c79d7e86cdd5451171bc649488559cb028dfafbda29e260bb92af2db3ae0c60a486c4643bbe8685b8499be07b51424223b57f8da6437eac948ede96dffc12cc
diff --git a/net-misc/owncloud-client/owncloud-client-2.4.1.ebuild b/net-misc/owncloud-client/owncloud-client-2.4.1.ebuild
new file mode 100644
index 000000000000..d35a8f1964b6
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.4.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="http://owncloud.org/"
+SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc dolphin nautilus samba +sftp shibboleth test"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[qt5(+)]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-fs/inotify-tools
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	samba? ( >=net-fs/samba-3.5 )
+	sftp? ( >=net-libs/libssh-0.5 )
+	shibboleth? ( dev-qt/qtwebkit:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-misc/ocsync
+	!net-misc/nextcloud-client
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)
+"
+
+S=${WORKDIR}/${P/-}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
+
+	if ! use nautilus; then
+		pushd shell_integration > /dev/null || die
+		cmake_comment_add_subdirectory nautilus
+		popd > /dev/null || die
+	fi
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DWITH_DOC=$(usex doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
+		-DNO_SHIBBOLETH=$(usex !shibboleth)
+		-DUNIT_TESTING=$(usex test)
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 5432795818e9..95ee3e3a1d88 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -12,5 +12,5 @@ AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aab
 DIST rsync-3.1.2.tar.gz 892724 BLAKE2B e366514ae9835ba7c201a9e09fb9342c5e52fa36d45d46300d080403de25a64ba3ed7a703e56b4f47a743a597694a2d0a50bb4bab6cfa0aa7b59a4f7b93b9f21 SHA512 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b
 DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99
 EBUILD rsync-3.1.2-r2.ebuild 3067 BLAKE2B 6d7a98dd131f732aabf23725b90a0c4d9ca63bdfb94894c0764d249444331bd2c2aed6e07190ce8d844b6ebb60e32b38a4cd728f63539af80d05458f065ae77a SHA512 c1b0b9035e003d9c5648f5f265231fec047bda7f709d1e82172b6537eec10e8c2f0c0d73471d4d81f7a51339988ed4a3ebf4c7afc42106b5db17545f05162ce7
-EBUILD rsync-3.1.3.ebuild 2825 BLAKE2B d894298c6cbba97de3ecf79d65f15de455dfd01855cd2fa6b935ee49d27179353082faef42b09b6174799a6f8405f46212c30ef4037f522b4e3c9d52f0c08be6 SHA512 522b6d029488e39f6a5faf6b1e5cf4918dba83c5c43c32d530966176780f741439c465c2680d8121431801edae8e910bc870f2851efd0b5df7bf466a0a753cb3
+EBUILD rsync-3.1.3.ebuild 2823 BLAKE2B 08b0214ad538d8352101f9956331f8f42d0c0daa55b73ab338507270dd4a6528eb65b161e6132920bcf2dfeff95ba47cd13c214d1b4c263a484b4b947ae944ff SHA512 74020188503ec44e9a8e51fdfad3c0218d279f78cacffb696f7c1c37461ac94e0d0ab11b34bfa6441501e4effc3bdedc7dc13e26c2e01dafebf8dba1e57e11be
 MISC metadata.xml 449 BLAKE2B 961dae7e8c69c0d452c9eedf67223d14ff8ff481821206d6fe2daed3a23a0da704155d61339b0d32182e5ba9195ff25b3383bd90945ea474b21da7f66f09c77f SHA512 1c0f031c078a7c22b8375b093dcd241e139ca86a61e2d463d9d01946b57b24dff29ab489ac063b70d210d1306106896fe77bd9678331d5954ef3182222d4f920
diff --git a/net-misc/rsync/rsync-3.1.3.ebuild b/net-misc/rsync/rsync-3.1.3.ebuild
index ca94cc47d3fe..1a7cd51e4ff5 100644
--- a/net-misc/rsync/rsync-3.1.3.ebuild
+++ b/net-misc/rsync/rsync-3.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 [[ ${PV} = *_pre* ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl examples iconv ipv6 static stunnel xattr"
 
 LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
diff --git a/net-misc/slimrat/Manifest b/net-misc/slimrat/Manifest
deleted file mode 100644
index 4240cd450b95..000000000000
--- a/net-misc/slimrat/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD slimrat-9999.ebuild 1081 BLAKE2B 266774daccc38f3c9c5457105ebe908fe5dba418f6f0dde494f8fa3391fa715ba317a222dcdc55470a4fff89f59c5d50803024dfd69d80a19fe5a412d82598dd SHA512 e6e17e8f17ffbc31261556098147f20b9b2eeac032a7c7f6c5aaa69128abec116a702b1dc1a3bd3c33ccf63d457019377ed440ad123117cc801eb6d7511f91b4
-MISC metadata.xml 229 BLAKE2B 0c1ffd11f148f15f945671729b2cde7a789aa193b8621ff6a5227deb700d52e2c1b9fb73e245007c8317384e380d6f4b989edc65db070736baf5c42c5642a237 SHA512 ba528d80efe3c167796011b26ed43a6bd158ba4b46a028cc09d8a182052214bb5628283f2dd23e87adb83c2733fe24267fe931aeb12c61eb58a9befd6e720ebc
diff --git a/net-misc/slimrat/metadata.xml b/net-misc/slimrat/metadata.xml
deleted file mode 100644
index 212b389ebaac..000000000000
--- a/net-misc/slimrat/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<use>
-		<flag name="X">Install also GUI client</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-misc/slimrat/slimrat-9999.ebuild b/net-misc/slimrat/slimrat-9999.ebuild
deleted file mode 100644
index 2329d5f339e3..000000000000
--- a/net-misc/slimrat/slimrat-9999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils subversion
-
-DESCRIPTION="Linux Rapidshare downloader"
-HOMEPAGE="https://code.google.com/p/slimrat/"
-SRC_URI=""
-ESVN_REPO_URI="https://${PN}.googlecode.com/svn/trunk/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS=""
-IUSE="X"
-
-DEPEND="
-	>=dev-lang/perl-5.10.1[ithreads]
-	dev-perl/JSON
-	>=dev-perl/WWW-Mechanize-1.52
-	virtual/perl-Getopt-Long
-	virtual/perl-Term-ANSIColor
-	X? (
-		dev-perl/gtk2-gladexml
-		dev-perl/Spiffy
-		x11-misc/xclip
-	)
-"
-# aview: displaying captcha
-RDEPEND="${DEPEND}
-	media-gfx/aview
-	X? ( x11-terms/xterm )
-"
-
-src_prepare() {
-	esvn_clean
-}
-
-src_install() {
-	# install binaries
-
-	exeinto "/usr/share/${PN}"
-
-	doexe "src/${PN}"
-	dosym "/usr/share/${PN}/${PN}" "${ROOT}usr/bin/${PN}"
-
-	if use X; then
-		doexe "src/${PN}-gui"
-		dosym "/usr/share/${PN}/${PN}-gui" "/usr/bin/${PN}-gui"
-	fi
-
-	# install data
-	insinto /etc
-	newins "${S}/slimrat.conf" slimrat.conf
-
-	insinto "/usr/share/${PN}"
-	doins -r "src/"*.pm "src/plugins/" "src/${PN}.glade"
-}
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 4eb69c9ebd06..551e25afd67d 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -3,5 +3,5 @@ DIST x2goclient-4.1.1.0.tar.gz 2745227 BLAKE2B 3cd33a828a890189fa92790388abf34c9
 DIST x2goclient-4.1.1.1.tar.gz 2749650 BLAKE2B 212e4ef9bb13478c79b46fe5ac247db2ac1cde1e24c0293397f54c793fa647318fa8f1d13417cb54218ed6757a26db4d6fe00076ad5c04c4d426ee428200735a SHA512 b18f3b2889e2f43846a1c83fccb1a1219621b442849a8e454e82e3d27a638740ea22dd419d6b1e0544416445d4abe80f8b931d46f77237bce1df11d4394451dc
 EBUILD x2goclient-4.1.0.1-r1.ebuild 1212 BLAKE2B 817b894fa28a636679d986e1c1cbcc60c1c0c575c1ee3a6a61053c6ec4a396db6af09daa15f5b87729fb8b4da162d92345abe685f8028e78c06ca51f5342636f SHA512 6828dde23894609af104231e8e3f86e473bb9491caafe9016ffa2da2415813f785525169b288a23439d26926528bb8a2b26a1e77bf0fbd46ccc803c09527cef3
 EBUILD x2goclient-4.1.1.0.ebuild 1377 BLAKE2B e7f76cefcbb3fbe497dc3d653291dd5d70998f33632a83fe2a98bb724c2a4ea9953b41ca390473b2b494824f4b52f56c0dc06d030fa72d5f67a95e813d7a5c35 SHA512 6665dbc7ddef0a202a0dca44a8cae74dc1117253f0f9129bdee3b8dd80e2ddddfac7182d58dcda89dbcacbd7dd0d30b976c698c15c5a337b37fbceeb26338b04
-EBUILD x2goclient-4.1.1.1.ebuild 1379 BLAKE2B 995bd345ffd44ef17406c5269d8ca122ee2fac56fe6e41dfca8c0af469b9b1ae8d685d2f27a335f6634d670e6f39ace8f4468adb70c9b7966efdf405221f267e SHA512 a36080794b28a5ac4e373110b7bd1f6ecf0f3bd2d68998bf12c2b35128c0bfce4958a4a5385677fb8bf4a48bbafdf6401372d2476698f7a132b7d2519df4812c
+EBUILD x2goclient-4.1.1.1.ebuild 1378 BLAKE2B e57ee137c064cbca5f3a74a4d6da5c3a62cc12a13837d86a76934cb696f6ceae1320d0bcce78e45a1e937aa960c27b360354f7e9d8221e73570e034252089d64 SHA512 96ac2ad4645b5a220050b7a7b70ff8cf64330be309f5739f2230c6e89ea49cf296b8da6bb2335cd3a07e40cd57141cd44593f69737f17b8c0c30fa0d77c0054c
 MISC metadata.xml 307 BLAKE2B 23b74b66a93119c741def7e676af997a2442085095191b9511248b54ae1b638ab7965441881e1a45c22698068a19cebd28b898324ee5570c587428f49b964170 SHA512 c1da89b20bbe06d9193927fd9b28c1ae4b3d58fde4ef79ddc2923894b59a9ff2083b16424d6935755c734069a7f0ccd03a177884cb82c64da77aaf1835c63721
diff --git a/net-misc/x2goclient/x2goclient-4.1.1.1.ebuild b/net-misc/x2goclient/x2goclient-4.1.1.1.ebuild
index 53df37c70e2c..ae8b67cda78e 100644
--- a/net-misc/x2goclient/x2goclient-4.1.1.1.ebuild
+++ b/net-misc/x2goclient/x2goclient-4.1.1.1.ebuild
@@ -20,7 +20,7 @@ COMMON_DEPEND="dev-qt/qtcore:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	>=net-libs/libssh-0.6.0_rc1
+	>=net-libs/libssh-0.7.5-r2
 	net-print/cups
 	x11-libs/libXpm
 	ldap? ( net-nds/openldap )"
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 8d67b71966a4..b984fdc16e6f 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -5,8 +5,8 @@ AUX x2goserver-4.1.0.0-skip_man2html.patch 2936 BLAKE2B 6b18439c5dc994c5a8ec073e
 AUX x2goserver.init 442 BLAKE2B 11e29bed398d23cae9fccc29d2ccce6ef59422a3d258139f91dd100562bb3029202a0bb0174fcb71dd776b075a708558eeaf8b1d9914c671bd8e59799772be44 SHA512 4e5add80aedbfb732552158b8c2b97b711e333f45740b8e3dd37089e7a512bd145d64812ec651cd7b022065129cced5730e1b28ab3758fcd81bea5b84b46d93c
 DIST x2goserver-4.0.1.22.tar.gz 101286 BLAKE2B 238da88d333b6bcb31b37b7d5e44d223ad975388fdee0cfb1ba21c58d5ab9a42961c7fcd55e474affd29197bc92fcbddf8c679eab8052387996b983a9e0244ba SHA512 ba726663f4fdedaa13cd1496a693cc9b0d7c1a815563ef8abdfe9e53b69c83379d0ed6c5569e6e7d77ac792a18a4dfed8c9b12c0a356664a66fe3be917fb7a67
 DIST x2goserver-4.1.0.0.tar.gz 132386 BLAKE2B b24b29f2eebaec04061690b51cf00f65de256ce2f68b57909909fe88a08466a1f802ead00ad9cf62a5327c2b7bc6690feb7c26b8b5b711757e88a553586fbe1a SHA512 3f48dced332729d726bffa991a7a203035fc6580dd2e094561f52b327e7c2e48b807daf68219132fbec29b5abcb865021361a35654792e58da1f2e4715ea95d0
-EBUILD x2goserver-4.0.1.22-r1.ebuild 2677 BLAKE2B 61a7b46793ea8250431215b1c6019435535e5656a14af1c36d3956b906e76ecd40aa21dbf0463caa0d7fda0733b8e4299d334247bba36b3775004b80cfb9dd27 SHA512 dbbd84761f629d406e526835aa86a7367fc9d7a4a4c1e483df2f1b8b076b6f3e1b48b0246bf625f619a0b3f994bf378a4990193e4f86a5773a54fdabad9debb2
-EBUILD x2goserver-4.0.1.22.ebuild 2695 BLAKE2B 94ee6af4b19646dbb7bc7e596a8914d4e4d6e0da250b23dadb780f3ec5143ab0c9ac3b2c881a910945b95364819de253cd494af3d7cdd5835389280623be6c34 SHA512 39431ef93e633a1f8dd3acd195666c8a98af247025f17ad2055a43eb054bbb113df3d20fa54fc9b73529eececd5be96ab399102eb90220199c9642fc38c07b37
-EBUILD x2goserver-4.1.0.0-r1.ebuild 2666 BLAKE2B ca104859da24f6dec1e0eb686a5600a7309eb9f688fcfd82da424cfca520b993c194d693de4f1361026f0fc997e804b2aea155b1006a65a658c683edbea01abb SHA512 ba5e7e116e4d562fe46e3083e81f18a22025a364de10453a38bec909b92de60acb9878e30df32e81dd1facba45e35ed60d6e14bb2ab671bef7f19eb29c66be3f
-EBUILD x2goserver-4.1.0.0.ebuild 2482 BLAKE2B bcfcf2193352dff8ccf0a0600e8e7b609b973aeac09325ead42977e47e13eaab8d87e3b04d1498a62140a0457ec50e46398d71aaf48a7192a33595767cfe5faf SHA512 fef9591f7e35e5c3e46a9dfce6330da6a980670eab4fa521ba3f2471beb4276468590d84b3c4bdedcd48d4a704573f37e0bcb404b95a6ab0d95a166199db7cee
+EBUILD x2goserver-4.0.1.22-r1.ebuild 2727 BLAKE2B 6d532772e5e650a0a73c87f5ab6fb6ea2f79001205b2031f2b53eb9b8c7711c06058a893882d28f5485e0fea7a3d75268f5b124c780034d346ddeaa52fb856bd SHA512 22984e395f9f36257de45f739f8d689457bec3cfa7a843175791a3cd781b384104f3636f0f78a815cc66b31128be2b36befe589a64e6cfb2bca4154b2a3d0876
+EBUILD x2goserver-4.0.1.22.ebuild 2745 BLAKE2B 46368f9d193c2961f8a7643e36caf60c4e3e7917a5b0279e31e50e3132851c132c7d4398404de69cc2d7b786b993e250f39aec5d3b81de779f89be0c74b6b063 SHA512 085e01dc8fe8fb4b7e7d609db05852deaaec28a828f0ea7d27d17e02b6972240078b790a13b77d1df0dba826407ec4369b739cfd2a01068429fae9978025a85b
+EBUILD x2goserver-4.1.0.0-r1.ebuild 2716 BLAKE2B 9fcf8025a9173d0ee4d9b7d2c10a6dbee4b407719a94ff499dcb36de79ac0c854347f837a5fd5a524bd91cd920951623c51e651c773c4115abc8ada55713dd94 SHA512 f25ec7e1f78fda719e99b28bc90372bf6ff4748d610f8145a1cf31b244bddee2c62879e9349a79ee79b632012259683a47e95c7a24e173594a180d988cfc271b
+EBUILD x2goserver-4.1.0.0.ebuild 2532 BLAKE2B fbc9adb02d481fc288df75dfbc17c075971dbe9541c567ec1c33b878e7fbc46cb15fd6fa4c686319c289843d947ad5776692d9a6985c7aebdf52e548cf1d9a9b SHA512 580c25fd2d273a7f56fc6518bd391e517095cca6b127741b62ac2a0086cac63f971e4aaada892e0e326709ab780d469c85d6f488ad51a523106b3518889d40b4
 MISC metadata.xml 398 BLAKE2B 4e3f8a55917796a30045a54805c7d7d8d4457ec14aa2354987868e02805192f208f1dd624414e1b04633ccd4d2fccd0d05b91deabc3073aefdb019578acdc42d SHA512 f0c209499689338c77517afd3c49153e822ba45d29bf575dd6d3e8266bcbe4cb87d9a0a1744178a0392a7358b7164c765157831710ff85cb38dea5b76fd7b65f
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild
index 6f481fc8cff5..3aeb90b0e70f 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild
@@ -15,12 +15,13 @@ IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
 
-DEPEND=""
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
 RDEPEND="dev-perl/Capture-Tiny
 	dev-perl/Config-Simple
 	dev-perl/File-BaseDir
 	dev-perl/File-ReadBackwards
 	dev-perl/File-Which
+	dev-perl/Try-Tiny
 	media-fonts/font-cursor-misc
 	media-fonts/font-misc-misc[nls]
 	>=net-misc/nx-3.5.0.25
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild
index 7c027d7422ae..b875b6ca9daa 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild
@@ -15,12 +15,13 @@ IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
 
-DEPEND=""
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
 RDEPEND="dev-perl/Capture-Tiny
 	dev-perl/Config-Simple
 	dev-perl/File-BaseDir
 	dev-perl/File-ReadBackwards
 	dev-perl/File-Which
+	dev-perl/Try-Tiny
 	media-fonts/font-cursor-misc
 	media-fonts/font-misc-misc[nls]
 	>=net-misc/nx-3.5.0.25
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.0-r1.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.0-r1.ebuild
index 4604560af49d..36e6bdd7c3dd 100644
--- a/net-misc/x2goserver/x2goserver-4.1.0.0-r1.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.1.0.0-r1.ebuild
@@ -15,13 +15,14 @@ IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
 
-DEPEND=""
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
 RDEPEND="dev-perl/Capture-Tiny
 	dev-perl/Config-Simple
 	dev-perl/File-BaseDir
 	dev-perl/File-ReadBackwards
 	dev-perl/File-Which
 	dev-perl/Switch
+	dev-perl/Try-Tiny
 	media-fonts/font-cursor-misc
 	media-fonts/font-misc-misc[nls]
 	>=net-misc/nx-3.5.99.14
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild
index 5f3be4028956..c281ef09ff5a 100644
--- a/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild
@@ -15,13 +15,14 @@ IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
 
-DEPEND=""
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
 RDEPEND="dev-perl/Capture-Tiny
 	dev-perl/Config-Simple
 	dev-perl/File-BaseDir
 	dev-perl/File-ReadBackwards
 	dev-perl/File-Which
 	dev-perl/Switch
+	dev-perl/Try-Tiny
 	media-fonts/font-cursor-misc
 	media-fonts/font-misc-misc[nls]
 	>=net-misc/nx-3.5.0.25
author	V3n3RiX <venerix@redcorelinux.org>	2018-03-13 16:55:35 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-03-13 16:55:35 +0000
commit	1dde4e5c4b92d849bf1abf0a48135b2a0644f7e1 (patch)
tree	c99a472cce74148d499f42ada873454b0e32a42d /net-misc
parent	da6a52f691ef980bab92d003d5df8f463c623af8 (diff)