gentoo resync : 25.08.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
commit: 43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree: 6208a7f4fc744684fce0f55acbb47511acace498 /net-misc
parent: 28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)
62 files changed, 2007 insertions, 1178 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8b8e185e2642..8925bdaa4129 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index f3e368155928..7a1494b50903 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -16,6 +16,8 @@ DIST asterisk-11.25.1.tar.gz 35125897 BLAKE2B 42f79202c3e69dc0ff1ddad909c87bc0a0
 DIST asterisk-11.25.3.tar.gz 35134682 BLAKE2B 9da24d5d6a674ab660edb103e5fc56ddfbcc58cd86166cc08cceb0598a63b51eae36133565e09a30ad11ff6623ba8945437dfb561d2916f68341d398540dabce SHA512 9c0521d55e5b69663ea40066d52e397ba6c165a4b20cd0a1e5e375b9c0e5a6e4f37908e50b0b580e288dec9be252af9a8bce7bceb03ba029f902fb757e6311ed
 DIST asterisk-13.19.0.tar.gz 33027887 BLAKE2B f799f51dc4b45d6db2261abfae33f41416616650702ff0cf6c253a80cf2f554f180df9e90bd107ac6a29eeeeef16e3bfadba087f6485fa93978899590b417443 SHA512 5404080a42e2d6d76b8fa8629c9570ae55c943676c51901a34552dc69c35f82001a1738e2da3adedf1de254bc8d1821ea7708f844685462ecdd1fd4e979e0e7f
 DIST asterisk-13.19.2.tar.gz 32991960 BLAKE2B 3b1f731fb68e2d455bfc76e863a8abbd8903ac2f7e89f5bc4b97db0072b0999679a79e6ebbb55c886847fb1db639b6ad84d1f7de1fc3414968ab6b48c5eed72f SHA512 3ee3d57d359ce3049480303b9662a33a905d08491e84d898fd6ee170ee9d34b8bdfcd082b80120dab606929a03572141fe219da75bb87770ed206aeb0249f1e4
+DIST asterisk-13.20.0.tar.gz 32986236 BLAKE2B bc634d93ce4d0a6b524554fa35845a2f289035aea9e7da3098517cdd6d2c85c94482d393276937ea0bc7064260835757e5ffc048f10ea73ba9c0525fd1cf0457 SHA512 de3e740b0dc5bc90806282cbe16f5ec6d151c4a7520b965e6ed30e3cd88d3dc8aca1994c7ae929c039ad755688af6f09a825b665665aacb10cf2566eaa270ca5
+DIST asterisk-13.21.0.tar.gz 32998111 BLAKE2B 7119c541efe80435db6b39571e25e24159b3929f075bd7fd8b1e3260a309bf1ab03599a79aea7d47c429af7e1553d1d89f348c55022e359a43b3fb98ee94882d SHA512 05b10017429a5c339bd50f7576e3198ffd6a71d698f7ad3f604d3e87b76f86da59841bad583c3d979e6e1b7a9fe9fba432c2a9c5faaa1e4dc48003228c637110
 DIST asterisk-13.22.0.tar.gz 33036487 BLAKE2B 09febd1d9ca875b532dffb7e2be5bda0aa9b2aac22d39a28ee3270d5bcb46f56946549aa5d7c8159c00fdb5a7f36e6f5466d6ebfc93f39cb65276efe0bee52b9 SHA512 eb5416d6911aac474c4a1532b1452b0d05359e4150b2e03ba8ac7d5f5f8bfc837a1640fcf26dfa8452b3a738af37e5659f5db6680c16d3ff1ee6c785864c5d5c
 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 BLAKE2B 3c945e77b54b2449253acb9fcea8d289a7a3184729190622c14aff5557d36c93556efa83320fe4e7ae84021960c09f35ae9f997e8015706eef933aae2948309e SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d
 DIST gentoo-asterisk-patchset-4.07.tar.bz2 2471 BLAKE2B d9026e7e8c12431496c24f204d117ed715741623195af10c838ec3ac5ce6a26fbb2d76d4c45c538881b532084e2ce74d2de83a27a0abaa5f65791be91416ef6d SHA512 73a9f92e6a737687c311941100c45bbc573f54fa79d0284318996c0d70274a4d2218693406d71b371496d27123d4d99bbc159974388e6547a682c06084d3b4c5
@@ -23,5 +25,7 @@ EBUILD asterisk-11.25.1.ebuild 9606 BLAKE2B a9175fdf2e654f5306ca07c001810f172299
 EBUILD asterisk-11.25.3.ebuild 9606 BLAKE2B a9175fdf2e654f5306ca07c001810f17229904d7ae9c08913cb0910d20d7f9aa9d27d719e06b23faf57174708cebc1212b11887de89d02b7916694702123b93a SHA512 bce64dc6beca0a55b8c8a86186e98f7947ee3ac8ad42ca9efb1b7bcfea105ef8a0c663568bbec1b157e225a12df3e2782f7fd5b92a353dc01317c0c6c0806887
 EBUILD asterisk-13.19.0-r1.ebuild 9715 BLAKE2B fe7475546c2ddf5adf4228ef38ce3944acf66d7537aefb1926072b28126b26e7c1e7dba8b95a30529dc598e84ca6823bbd961035c70dcc7e6e92b6e7274f258d SHA512 2b173fba18d6233628ef7db7fc797063ac0d9f584289b74a82d8b33722bcece400eafc50025648227cf2dd98aa09072d095aec4bbd362bc42b65f1f9d1e98d7d
 EBUILD asterisk-13.19.2.ebuild 9717 BLAKE2B 66ed61fd4b10c09012830fcd9d8260d75861de3e3f3d5c0697519f7d32ae469cac97d1545bf04ec3bf5b7188769ebb81f5cce33dd21916187876ac372a098825 SHA512 0733f846272e439e0e30061cb9b23f806b540eb935b0daf4cf27a9bc745b478796f037726983d75c8b96f78d59f486adca5efd408452dedd269cf422f21950bf
+EBUILD asterisk-13.20.0.ebuild 9717 BLAKE2B 66ed61fd4b10c09012830fcd9d8260d75861de3e3f3d5c0697519f7d32ae469cac97d1545bf04ec3bf5b7188769ebb81f5cce33dd21916187876ac372a098825 SHA512 0733f846272e439e0e30061cb9b23f806b540eb935b0daf4cf27a9bc745b478796f037726983d75c8b96f78d59f486adca5efd408452dedd269cf422f21950bf
+EBUILD asterisk-13.21.0.ebuild 9717 BLAKE2B 66ed61fd4b10c09012830fcd9d8260d75861de3e3f3d5c0697519f7d32ae469cac97d1545bf04ec3bf5b7188769ebb81f5cce33dd21916187876ac372a098825 SHA512 0733f846272e439e0e30061cb9b23f806b540eb935b0daf4cf27a9bc745b478796f037726983d75c8b96f78d59f486adca5efd408452dedd269cf422f21950bf
 EBUILD asterisk-13.22.0.ebuild 9717 BLAKE2B 66ed61fd4b10c09012830fcd9d8260d75861de3e3f3d5c0697519f7d32ae469cac97d1545bf04ec3bf5b7188769ebb81f5cce33dd21916187876ac372a098825 SHA512 0733f846272e439e0e30061cb9b23f806b540eb935b0daf4cf27a9bc745b478796f037726983d75c8b96f78d59f486adca5efd408452dedd269cf422f21950bf
 MISC metadata.xml 1135 BLAKE2B c4572b7c187ff1e7ac66ad38c03a04b51b601990ad48563dbcfa046f03fe0f3587a1e58c1bed7abe6a13a7e2252526d03a0937b5ddbf1a2427ec14b3f115c58c SHA512 660666a8abae2edae04e3c32b272e4f1d509d18566c6c9eb0b0b8a93710d8a1284c68f7ee613ca70bf4c54779a1df1e29d9a56093212bc0fdf1c057450037ab1
diff --git a/net-misc/asterisk/asterisk-13.20.0.ebuild b/net-misc/asterisk/asterisk-13.20.0.ebuild
new file mode 100644
index 000000000000..e0b88a37696c
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.20.0.ebuild
@@ -0,0 +1,327 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/jansson
+	dev-libs/libxml2
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	sys-libs/ncurses:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp:0 )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+	pjproject? ( >=net-libs/pjproject-2.6 )
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject" eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio) \
+		$(use_with pjproject)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd8 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 13 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-13.21.0.ebuild b/net-misc/asterisk/asterisk-13.21.0.ebuild
new file mode 100644
index 000000000000..e0b88a37696c
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.21.0.ebuild
@@ -0,0 +1,327 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils linux-info multilib user systemd
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="http://www.asterisk.org/"
+SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.tar.gz
+	 mirror://gentoo/gentoo-asterisk-patchset-4.07.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE="
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+"
+IUSE="${IUSE_VOICEMAIL_STORAGE} alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc xmpp ldap libedit libressl lua mysql newt +samples odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp static syslog vorbis"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE/+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+EPATCH_SUFFIX="patch"
+PATCHES=( "${WORKDIR}/asterisk-patchset" )
+
+CDEPEND="dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/jansson
+	dev-libs/libxml2
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl )
+	sys-libs/ncurses:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez )
+	calendar? ( net-libs/neon
+		 dev-libs/libical
+		 dev-libs/iksemel )
+	caps? ( sys-libs/libcap )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? ( >=net-libs/libpri-1.4.12_beta2
+		net-misc/dahdi-tools )
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( dev-libs/ilbc-rfc3951 )
+	xmpp? ( dev-libs/iksemel )
+	ldap? ( net-nds/openldap )
+	libedit? ( dev-libs/libedit )
+	lua? ( dev-lang/lua:* )
+	mysql? ( virtual/mysql )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	osplookup? ( net-libs/osptoolkit )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp )
+	span? ( media-libs/spandsp )
+	speex? ( media-libs/speex )
+	srtp? ( net-libs/libsrtp:0 )
+	vorbis? ( media-libs/libvorbis )"
+
+DEPEND="${CDEPEND}
+	!net-libs/openh323
+	!net-libs/pjsip
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	virtual/pkgconfig
+	pjproject? ( >=net-libs/pjproject-2.6 )
+"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+PDEPEND="net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	enewgroup asterisk
+	enewgroup dialout 20
+	enewuser asterisk -1 -1 /var/lib/asterisk "asterisk,dialout"
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject" eautoreconf
+}
+
+src_configure() {
+	local vmst
+
+	econf \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-ssl \
+		--with-z \
+		--without-pwlib \
+		$(use_with caps cap) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with portaudio) \
+		$(use_with pjproject)
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	menuselect/menuselect --disable chan_misdn menuselect.makeopts
+	menuselect/menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	menuselect/menuselect --enable smsq menuselect.makeopts
+	menuselect/menuselect --enable streamplayer menuselect.makeopts
+	menuselect/menuselect --enable aelparse menuselect.makeopts
+	menuselect/menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	menuselect/menuselect --enable chan_mgcp menuselect.makeopts
+	menuselect/menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	menuselect/menuselect --enable pbx_dundi menuselect.makeopts
+	menuselect/menuselect --enable func_aes menuselect.makeopts
+	menuselect/menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	menuselect/menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	menuselect/menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			menuselect/menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	use_select alsa			chan_alsa
+	use_select bluetooth		chan_mobile
+	use_select calendar		res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	use_select cluster		res_corosync
+	use_select curl			func_curl res_config_curl res_curl
+	use_select dahdi		app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	use_select freetds		{cdr,cel}_tds
+	use_select gtalk		chan_motif
+	use_select http			res_http_post
+	use_select iconv		func_iconv
+	use_select xmpp			res_xmpp
+	use_select ilbc                 codec_ilbc format_ilbc
+	use_select ldap			res_config_ldap
+	use_select lua			pbx_lua
+	use_select mysql		app_mysql cdr_mysql res_config_mysql
+	use_select odbc			cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	use_select osplookup		app_osplookup
+	use_select oss			chan_oss
+	use_select postgres		{cdr,cel}_pgsql res_config_pgsql
+	use_select radius		{cdr,cel}_radius
+	use_select snmp			res_snmp
+	use_select span			res_fax_spandsp
+	use_select speex		{codec,func}_speex
+	use_select srtp			res_srtp
+	use_select syslog		cdr_syslog
+	use_select vorbis		format_ogg_vorbis
+
+	# Voicemail storage ...
+	for vmst in ${IUSE_VOICEMAIL_STORAGE/+/}; do
+		if use ${vmst}; then
+			menuselect/menuselect --enable $(echo ${vmst##*_} | tr '[:lower:]' '[:upper:]')_STORAGE menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_THREADS BETTER_BACKTRACES; do
+			menuselect/menuselect --enable $o menuselect.makeopts
+		done
+	fi
+}
+
+src_compile() {
+	ASTLDFLAGS="${LDFLAGS}" emake
+}
+
+src_install() {
+	mkdir -p "${D}"usr/$(get_libdir)/pkgconfig || die
+	emake DESTDIR="${D}" installdirs
+	emake DESTDIR="${D}" install
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+	diropts -m 0750 -o root -g asterisk
+	keepdir	/etc/asterisk
+	if use samples; then
+		emake DESTDIR="${D}" samples
+		for conffile in "${D}"etc/asterisk/*.*
+		do
+			chown root:root $conffile
+			chmod 0644 $conffile
+		done
+		einfo "Sample files have been installed"
+	else
+		einfo "Skipping installation of sample files..."
+		rm -f  "${D}"var/lib/asterisk/mohmp3/* || die
+		rm -f  "${D}"var/lib/asterisk/sounds/demo-* || die
+		rm -f  "${D}"var/lib/asterisk/agi-bin/* || die
+		rm -f  "${D}"etc/asterisk/* || die
+	fi
+	rm -rf "${D}"var/spool/asterisk/voicemail/default || die
+
+	# keep directories
+	diropts -m 0770 -o asterisk asterisk
+	keepdir /var/lib/asterisk
+	keepdir /var/spool/asterisk
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/1.8.0/asterisk.initd8 asterisk
+	newconfd "${FILESDIR}"/1.8.0/asterisk.confd asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	systemd_newtmpfilesd "${FILESDIR}"/asterisk.tmpfiles.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# install the upgrade documentation
+	#
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	#
+	if use doc
+	then
+		dodoc doc/*.txt
+		dodoc doc/*.pdf
+	fi
+
+	# install SIP scripts; bug #300832
+	#
+	dodoc "${FILESDIR}/1.6.2/sip_calc_auth"
+	dodoc "${FILESDIR}/1.8.0/find_call_sip_trace.sh"
+	dodoc "${FILESDIR}/1.8.0/find_call_ids.sh"
+	dodoc "${FILESDIR}/1.6.2/call_data.txt"
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+}
+
+pkg_postinst() {
+	#
+	# Announcements, warnings, reminders...
+	#
+	einfo "Asterisk has been installed"
+	echo
+	elog "If you want to know more about asterisk, visit these sites:"
+	elog "http://www.asteriskdocs.org/"
+	elog "http://www.voip-info.org/wiki-Asterisk"
+	echo
+	elog "http://www.automated.it/guidetoasterisk.htm"
+	echo
+	elog "Gentoo VoIP IRC Channel:"
+	elog "#gentoo-voip @ irc.freenode.net"
+	echo
+	echo
+	elog "Please read the Asterisk 13 upgrade document:"
+	elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13"
+}
+
+pkg_config() {
+	einfo "Do you want to reset file permissions and ownerships (y/N)?"
+
+	read tmp
+	tmp="$(echo $tmp | tr '[:upper:]' '[:lower:]')"
+
+	if [[ "$tmp" = "y" ]] ||\
+		[[ "$tmp" = "yes" ]]
+	then
+		einfo "Resetting permissions to defaults..."
+
+		for x in spool run lib log; do
+			chown -R asterisk:asterisk "${ROOT}"var/${x}/asterisk
+			chmod -R u=rwX,g=rwX,o=    "${ROOT}"var/${x}/asterisk
+		done
+
+		chown -R root:asterisk  "${ROOT}"etc/asterisk
+		chmod -R u=rwX,g=rwX,o= "${ROOT}"etc/asterisk
+
+		einfo "done"
+	else
+		einfo "skipping"
+	fi
+}
diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest
index fceaf76e112f..8ec76f2a137e 100644
--- a/net-misc/connman/Manifest
+++ b/net-misc/connman/Manifest
@@ -10,8 +10,10 @@ DIST connman-1.29.tar.xz 653324 BLAKE2B 16c09339f84eff5c4977d0c7b71e5a757cf8bdef
 DIST connman-1.33.tar.xz 669800 BLAKE2B 5500b9a318bc0484d9647e5e27fa2da6d59d9238cba26564940979f27e339648f72700f6f78ded719ce08e8d2353bd361388baedb353301519363c4f14227544 SHA512 5670124d2e17ffde4bd5fb878198843b712a31f5840e8523e8247373c8547619e32a4d6dda9cf993eebd5c65bdd256cfc570708a79da1d10f969662b5b750566
 DIST connman-1.34.tar.xz 684992 BLAKE2B 48912ed7e52f1e696189240fc0d8cecec596cdb247683cd80c236a5757846d337d6d171dd1707acbb8414e09d4168212e614238136138c89acede6fc77c3a406 SHA512 732669648936630ae5895cba8bcccc69757ab594bc31ee8e4925b0e402d190939891fac61136f3f086ce708b8d576136f0947914c0cc07427c170cbf9b85a308
 DIST connman-1.35.tar.xz 686092 BLAKE2B 706d8333dc2fcbee8d0ef3849325c4975dfe312a7a542ee96859a1724e05b1302c244a0108ab70033b398301c235fb13cb9509e9147dc2bb049e900f3799cd98 SHA512 2234b4d18b038f9a33939035cddebd31c74ce962e5616c2c30b2912476612ef3f7d5b9edca64bf6e69fa358252ed432124e036ac3516b291b86695cb9a96c6a8
+DIST connman-1.36.tar.xz 692616 BLAKE2B 7d8cea55365fbfe78cd897b5b65d8edf475a737220732c46c95dda4c6b12badddca38150dbedddcc95c29bce486d86fe130a9d65043c6e18ed6b1eba3fe5aec0 SHA512 c0b9e924a28d58539d44c314168ae7aa46dfea8ce9d125198f525a6d6ef95ca77fd0357c4c4c7548b362b9de8e6f85c7915b1a4cf89b65116c4cbc4df75318e1
 EBUILD connman-1.29.ebuild 2013 BLAKE2B 8b80a54f1e7db67aaf16b7ba31d27aa4e9533260944944d6e3877d3794f67963b420a074bafdc5b5ec1f26fe29f6a24e29bd618a9eec52b3c3c2d690db21975e SHA512 e77846ca1759957f4d898fd76b06f126d6181c85384eed8f6ffee4d9e6845eb43f831a0db1ea349b387392e60e43dda8c364f87b1f98c5ca84652e2fa858e35b
 EBUILD connman-1.33-r1.ebuild 2280 BLAKE2B ac059303eeae7e2eefa254a874ff80c254c8dda3b80bbbf27ea62f6a9a59c5033bb0b244d30c68dc2dd3cb8117af6c0204b766911804cae6323a8056f7b1852e SHA512 8c396fa66e67a4519d2fe067e43f11cff3cb751e7f610e6ccb2cc75836cf74784fde1f8ae291b4b2189e92c941885b3c67e55556807eb1c9fdf619c9bc247ce0
 EBUILD connman-1.34.ebuild 2490 BLAKE2B bd804da85d0d880e69cf9fd6ea2b8fe813c508ffc3196cb82774d59966b9a4468f271e7e9472e74814c8c6a3df22c934ca2fcac5c792e64bb72226f0172d4b4a SHA512 51b456ca18a681392a9ffdc44ca31d1838cfe597e43ecef28b5202f69415465ee29a70d26a6ead153acaf7028b3da18049ab7d2c465b21fffd443c8b07afe302
 EBUILD connman-1.35-r1.ebuild 2557 BLAKE2B 4a24da33f7d40a1b0ae339e7031e83b01fbce6da1da149b7ea8de388b859a48f24c50acf85a0d432e516c2da0de74ec0480304d0fcf0e40f5ad2a461ffa5dbe3 SHA512 bd20274ae49359ce891711a0e8e56320b9e63fca510403171f40a4f71d996b5d88d71972076eb4cb62d8dc7c6ed21b0fb7431598fcf1424049f4699ea2b22d95
-MISC metadata.xml 1087 BLAKE2B a6c16a8e9ce0a5154d6b6081f1527316dd2bf9aec3d45c1f64c224ab25479e041b4848f08fef072ef5d026517bfc49c04756f062524aa6ad60c80945c7c182b1 SHA512 8f02d9cf4194c9e24edaa9a0427d63db483bbf559ea119a043a70a759f583aec42203bedd12c91364e1c24850e9cb6b1831054294c3837a0c3a50cb75dc1de42
+EBUILD connman-1.36.ebuild 2568 BLAKE2B 902e767beeeb20850f0387485444905ac4b607dbdcca5fe73b4db808df7534829d2a2ccec1636c1ecaf8cbcc0c60bea9dc8b8865d8da13b1d748fd778a62d551 SHA512 f9c93a7263ce7d683dcfb6e1fc2d6798a222159bdcaf432ab75fb37d5c8a37e200ad6ad2ba5efef8438eff2eaa486545d4593817aa9ff3532833c1a15f9acb27
+MISC metadata.xml 1259 BLAKE2B 9c4804b5e650d4823a129d3d64e59ca3165ea04a171dfdbf669c184c14eb6e3ab923e5f0834952aaadb734e5867d4ad241084c0388d52a29b8e208e23c72d44e SHA512 02189e5081b74da0b4a8d23dfb27c1b71e34b2f8b3e5bdac8817e50206470e5b6591979b65dede6dad0f5b14b3fe5ca627ba50f8856a5c586fe8b8996f813322
diff --git a/net-misc/connman/connman-1.36.ebuild b/net-misc/connman/connman-1.36.ebuild
new file mode 100644
index 000000000000..78b5dc5b9197
--- /dev/null
+++ b/net-misc/connman/connman-1.36.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+inherit autotools systemd tmpfiles
+
+DESCRIPTION="Provides a daemon for managing internet connections"
+HOMEPAGE="https://01.org/connman"
+SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="${IUSE} bluetooth debug doc examples +ethernet iptables iwd l2tp nftables"
+IUSE="${IUSE} ofono openvpn openconnect pptp policykit tools vpnc +wifi wispr networkmanager"
+
+REQUIRED_USE="|| ( iptables nftables )"
+RDEPEND=">=dev-libs/glib-2.16
+	>=sys-apps/dbus-1.2.24
+	iptables? ( >=net-firewall/iptables-1.4.8 )
+	bluetooth? ( net-wireless/bluez )
+	iwd? ( net-wireless/iwd )
+	l2tp? ( net-dialup/xl2tpd )
+	nftables? (
+		>=net-libs/libnftnl-1.0.4:0=
+		>=net-libs/libmnl-1.0.0:0= )
+	ofono? ( net-misc/ofono )
+	openconnect? ( net-vpn/openconnect )
+	openvpn? ( net-vpn/openvpn )
+	policykit? ( sys-auth/polkit )
+	pptp? ( net-dialup/pptpclient )
+	vpnc? ( net-vpn/vpnc )
+	wifi? ( >=net-wireless/wpa_supplicant-2.0[dbus] )
+	wispr? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-2.6.39
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.33-polkit-configure-check-fix.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--localstatedir=/var \
+		--with-systemdunitdir=$(systemd_get_systemunitdir) \
+		--with-tmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
+		--enable-client \
+		--enable-datafiles \
+		--enable-loopback=builtin \
+		$(use_enable examples test) \
+		$(use_enable ethernet ethernet builtin) \
+		$(use_enable wifi wifi builtin) \
+		$(use_enable iwd) \
+		$(use_enable bluetooth bluetooth builtin) \
+		$(use_enable l2tp l2tp builtin) \
+		$(use_enable ofono ofono builtin) \
+		$(use_enable openconnect openconnect builtin) \
+		$(use_enable openvpn openvpn builtin) \
+		$(use_enable policykit polkit builtin) \
+		$(use_enable pptp pptp builtin) \
+		$(use_enable vpnc vpnc builtin) \
+		$(use_enable wispr wispr builtin) \
+		$(use_enable debug) \
+		$(use_enable tools) \
+		$(use_enable networkmanager nmcompat) \
+		--with-firewall=$(usex iptables "iptables" "nftables" ) \
+		--disable-iospm \
+		--disable-hh2serial-gps
+}
+
+src_install() {
+	default
+	dobin client/connmanctl
+
+	if use doc; then
+		dodoc doc/*.txt
+	fi
+	keepdir /usr/lib/${PN}/scripts
+	keepdir /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd2 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process /usr/lib/tmpfiles.d/connman_resolvconf.conf
+}
diff --git a/net-misc/connman/metadata.xml b/net-misc/connman/metadata.xml
index a4bbe92fa34b..9bf64dff4d86 100644
--- a/net-misc/connman/metadata.xml
+++ b/net-misc/connman/metadata.xml
@@ -5,8 +5,13 @@
 		<email>dlan@gentoo.org</email>
 		<name>Yixun Lan</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
 	<use>
 		<flag name="ethernet">Enable ethernet support.</flag>
+		<flag name="iwd">Enable wifi support via net-wireless/iwd</flag>
 		<flag name="l2tp">Use <pkg>net-dialup/xl2tpd</pkg> for L2TP VPN support.</flag>
 		<flag name="iptables">Use <pkg>net-firewall/iptables</pkg> as firewall.</flag>
 		<flag name="nftables">Use <pkg>net-firewall/nftables</pkg> as firewall.</flag>
diff --git a/net-misc/dhcpcd-ui/Manifest b/net-misc/dhcpcd-ui/Manifest
index 1d92838c79b8..5d08af511c1c 100644
--- a/net-misc/dhcpcd-ui/Manifest
+++ b/net-misc/dhcpcd-ui/Manifest
@@ -1,3 +1,3 @@
 DIST dhcpcd-ui-0.7.5.tar.bz2 209112 BLAKE2B 1eec904acefbc5059496419991b1d53c6715d56e611e09d7474879b4ae2741e61ce85bdd7ca32db42a8a890790d8784ee8904fa1228ab43488a88480f73dcd1c SHA512 78dba758f7cee825a1618c33b1fff9549c4e51e19fd5eebd1ae5d6a4686726ec8ad86dc1ec5384238b43589dd700979c694f48bc94e2844f1ef898292660a5d2
 EBUILD dhcpcd-ui-0.7.5-r1.ebuild 1168 BLAKE2B 4d8ddcf2828a6b7523861e74b29be68d1cbef7fbaeea01de7920ddf6d64206179f292626238639b74bfb34b83307b1989810aa6f35c7c978cb0798e8b919c30d SHA512 9a89b625ccd2b930266a5767f38a6e3f42389ddd2a3b9312564a3782948598d251ed957c33a0be852e754445c6574dc566c1ccd47eb5ae734d0053b618124526
-MISC metadata.xml 440 BLAKE2B 335c157ba107da11be8172245f752cde939dbef33fb9210aee6748ac0ca47ae0ca818f0c0fa12ad14ee253e5b504b4fd778f24749506a68efee2a9b56f184e24 SHA512 849995665f76d76e0ca35eaf1fd8e3ea7ab5ca1e770d00826d1935948bce7dffbd8d229e5de3e81db910611549092336ee682f7de15e07c639837b273fd99d80
+MISC metadata.xml 271 BLAKE2B d35f3e181d7989e6fa9e9cd6923a47aaf9723824442648ce9cea821c560a290fd110b67d5440d095aa67d576cc984574993959fb0fc6069600e4935f13166b3d SHA512 f105166a6d7a278c725e881cd33a253058e0cc4d57d4bb616c09c90e557cc31824b94b41eef95d1241cb31aa0058f34fd95672051c93331244869b7d22433598
diff --git a/net-misc/dhcpcd-ui/metadata.xml b/net-misc/dhcpcd-ui/metadata.xml
index 1f8337a2bebb..a2e2ed249ee7 100644
--- a/net-misc/dhcpcd-ui/metadata.xml
+++ b/net-misc/dhcpcd-ui/metadata.xml
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tokiclover@gmail.com</email>
-	</maintainer>
-<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 <use>
 	<flag name="gtk3">
 		Add support for <pkg>x11-libs/gtk+</pkg> (The GIMP Toolkit)
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index d41558d24709..ea75b24c6c3a 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -5,10 +5,12 @@ DIST dhcpcd-6.11.5.tar.xz 198080 BLAKE2B 3172fcb1c09c3bb7fcf4896c6e9896744a8f4f6
 DIST dhcpcd-7.0.1.tar.xz 207908 BLAKE2B 1a9350a0c4a9eb1eb6f5a7be78beb4a5fecd802ee90a4649ab17db69eabc75a913b9f3db97ea6260bcad3516b9613c20f74d9d68a7ac98b508458e5cd30cf15f SHA512 d2a9b053aa663dd1ed38a10a73ee3377a3a076c9638bdda9331a4c161c2ba87f5f68f366ac8e1f1015404f617b74261a03a97ac7cdfd642b4a41b87b54984c34
 DIST dhcpcd-7.0.6.tar.xz 210392 BLAKE2B c343ebfd42cfd0c76d3524cab799d05e3ec0c1735fde1703613a60cd4e3a656d4a1428ed8a84f7d66ef4d39ffb519ab7eabf4d7c765e6dec93386ccf7d84f363 SHA512 5885739e60d6eb4fded117cb87f59a073ae6e8da8454dee56d8e7c5d33778e413e121d28a22163ebf31e4508a21d3a21c1d17ee6d4551081db2ee8e5384d44c9
 DIST dhcpcd-7.0.7.tar.xz 210572 BLAKE2B 4ba70c32fe012930928a8c3363c8fe3f655943883ff521fcfb3b5b75950be2e7432ca79e52298a119fc70c1dd8095a28f59d4cabe62da3ad8179c0dc73af0aac SHA512 04c316f7b180bbbf48aa58273d3a28d659824e474d1ce48325f610ed2c5d2a01117f5b65b4a9697f3e8e1b85d4bdcc0b8ab75a928a8cd5723a865d8c0a065269
+DIST dhcpcd-7.0.8.tar.xz 210752 BLAKE2B ad8ba622589cc1c8c4bb332470c59527e03c817729f43a5b55b4f53f8ed60f35faaffbff24416f8596e78df8deb304f0598e27d890e9601d36c81250fda99942 SHA512 82cd845eb35670788b8f31b973945460f4c5f1a0a3025e3a452b79230dc30704e129d97140e6aec6d0281e0c89c333c0ce0af03c4767b2e5e66547ed3e071953
 EBUILD dhcpcd-6.11.3.ebuild 3278 BLAKE2B f7d9dbf6a9d28a1f45e4f33becc4545da4db8298a107d543613035e386b8c529ea2ed21a289b943a6a3f9867f41490acfb9eb15aa791b3f526ac7d2155ab560b SHA512 a97575ba47e8912b17c228d694399af86ab928b87432a9ac6e5ed176ae3906db2fd80a044bc348203a4553571382afca619cb01b8b610b0bf7eab61b5cdc107d
 EBUILD dhcpcd-6.11.5.ebuild 3282 BLAKE2B bc9251210e85f02249a25f0861b598b587f8fcac8bf9e1524c3df64b269f44d654f6cd078b45e1597ee5114da8f17a64af06792e43c53355b1f321aaa09f2546 SHA512 20d99b37d66cf2e16892579189a32bf6586392a3c8216042f25238c7129d829a723da1e66b183edc153527b5c3036b4f588097d4a19b44c41c3d9f108dcaffd6
 EBUILD dhcpcd-7.0.1.ebuild 4448 BLAKE2B b9540c9cc1e5e4feeb4839fff89371b89b775d403a704cc64e2212d0e985aae629d22e8174849d7e2be5ed0a858511347cdb56c7653bc1f47e30afe59a0a8311 SHA512 f9b859fab6072982c8081997fa72e3dc1ae1ea48f59857f9af410644caf2826073e7c677fc46ed7b8010dec2883b9ca11dc90e40713600df2603e1595bfd7a80
 EBUILD dhcpcd-7.0.6.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
 EBUILD dhcpcd-7.0.7.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
+EBUILD dhcpcd-7.0.8.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
 EBUILD dhcpcd-9999.ebuild 4483 BLAKE2B e52765832f907303220589f1efa8a820b6dfaa2f366e67dcf2824324b2ef5d845407d8bc8c323c918fca239c8aab1448847b9dff2adad3522b12368522d77f4e SHA512 b5c4db0e1f2861c333b6379a82a342a43079a6b2998407148fe2db3d5e28baffd671339ca9c1d2516d6a973e6202ee06a59c834620402d73075dd9287ef84082
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-7.0.8.ebuild b/net-misc/dhcpcd/dhcpcd-7.0.8.ebuild
new file mode 100644
index 000000000000..bca59ecd5d70
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-7.0.8.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
+	inherit git-r3
+else
+	MY_P="${P/_alpha/-alpha}"
+	MY_P="${MY_P/_beta/-beta}"
+	MY_P="${MY_P/_rc/-rc}"
+	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure()
+{
+	local dev hooks rundir
+	use udev || dev="--without-dev --without-udev"
+	hooks="--with-hook=ntp.conf"
+	use elibc_glibc && hooks="${hooks} --with-hook=yp.conf"
+	use kernel_linux && rundir="--rundir=${EPREFIX}/run"
+	econf \
+		--prefix="${EPREFIX}" \
+		--libexecdir="${EPREFIX}/lib/dhcpcd" \
+		--dbdir="${EPREFIX}/var/lib/dhcpcd" \
+		--localstatedir="${EPREFIX}/var" \
+		${rundir} \
+		$(use_enable embedded) \
+		$(use_enable ipv6) \
+		${dev} \
+		CC="$(tc-getCC)" \
+		${hooks}
+}
+
+src_install()
+{
+	default
+	keepdir /var/lib/dhcpcd
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
+
+pkg_postinst()
+{
+	local dbdir="${EROOT%/}"/var/lib/dhcpcd old_files=
+
+	local old_old_duid="${EROOT%/}"/var/lib/dhcpcd/dhcpcd.duid
+	local old_duid="${EROOT%/}"/etc/dhcpcd.duid
+	local new_duid="${dbdir}"/duid
+	if [ -e "${old_old_duid}" ]; then
+		# Upgrade the duid file to the new format if needed
+		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+		fi
+
+		# Move the duid to /etc, a more sensible location
+		if [ ! -e "${old_duid}" ]; then
+			cp -p "${old_old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_old_duid}"
+	fi
+
+	# dhcpcd-7 moves the files out of /etc
+	if [ -e "${old_duid}" ]; then
+		if [ ! -e "${new_duid}" ]; then
+			cp -p "${old_duid}" "${new_duid}"
+		fi
+		old_files="${old_files} ${old_duid}"
+	fi
+	local old_secret="${EROOT%/}"/etc/dhcpcd.secret
+	local new_secret="${dbdir}"/secret
+	if [ -e "${old_secret}" ]; then
+		if [ ! -e "${new_secret}" ]; then
+			cp -p "${old_secret}" "${new_secret}"
+		fi
+		old_files="${old_files} ${old_secret}"
+	fi
+
+	# dhcpcd-7 renames some files in /var/lib/dhcpcd
+	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+	local new_rdm="${dbdir}"/rdm_monotonic
+	if [ -e "${old_rdm}" ]; then
+		if [ ! -e "${new_rdm}" ]; then
+			cp -p "${old_rdm}" "${new_rdm}"
+		fi
+		old_files="${old_files} ${old_rdm}"
+	fi
+	local lease=
+	for lease in "${dbdir}"/dhcpcd-*.lease*; do
+		[ -f "$lease" ] || continue
+		old_files="${old_files} ${lease}"
+		local new_lease=$(basename "$lease" | sed -e "s/dhcpcd-//")
+		[ -e "${dbdir}/${new_lease}" ] && continue
+		cp "${lease}" "${dbdir}/${new_lease}"
+	done
+
+	# Warn about removing stale files
+	if [ -n "${old_files}" ]; then
+		elog
+		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+		elog "${EROOT%/}/etc to ${dbdir}"
+		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+		elog "prefix dropped."
+		elog
+		elog "You should remove these files if you don't plan on reverting"
+		elog "to an older version:"
+		local old_file=
+		for old_file in ${old_files}; do
+			elog "	${old_file}"
+		done
+	fi
+
+	if [ -z "$REPLACING_VERSIONS" ]; then
+		elog
+		elog "dhcpcd has zeroconf support active by default."
+		elog "This means it will always obtain an IP address even if no"
+		elog "DHCP server can be contacted, which will break any existing"
+		elog "failover support you may have configured in your net configuration."
+		elog "This behaviour can be controlled with the noipv4ll configuration"
+		elog "file option or the -L command line switch."
+		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+		elog
+		elog "Dhcpcd has duid enabled by default, and this may cause issues"
+		elog "with some dhcp servers. For more information, see"
+		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+	fi
+
+	if ! has_version net-dns/bind-tools; then
+		elog
+		elog "If you activate the lookup-hostname hook to look up your hostname"
+		elog "using the dns, you need to install net-dns/bind-tools."
+	fi
+}
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index 99a8684372ec..01650cd230ba 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -1,7 +1,7 @@
 DIST geoipupdate-2.3.1.tar.gz 362497 BLAKE2B e07eb22d6b4897d735af0c354f99111931646e8d194d493cf6992ac76a065a02816e5eaf0c974f752aeabb9cde7e7f8ec70d70529402b0b58072c44994e39e53 SHA512 98537e17ea03dbc0e377bf3fd045a96cbcf2f36f1fbcdf494f0a60d15f9ea5d2f0cd5e127245c6425e0ff8b77028147a2a6316034752298c8e9671007b7245a1
-DIST geoipupdate-2.4.0.tar.gz 369949 BLAKE2B ff385bd1fe6245bc025a9c922869385067064e6af9e020578297c2b687e8ef1e14eb1b4064b23488b15d9196cae11aebfaf49c3835f17d3839f2a802681f4332 SHA512 6285810380a12ce34c90798fe31954959c9b462060e9b49348b5dbca3af7f3b1798384cf958de3b213ac7d03d42688c6744365d91efc4ad1fe76330bd893d4b1
 DIST geoipupdate-2.5.0.tar.gz 371882 BLAKE2B 52a1794f2d3e91d4fcb274ddd5b65f9c8c99400d8c278ea9bdfd11208269da3e6ff3002c92a2cf5a805f6b81b0b0c8321b1a2bf4df1a0455a335828f4a61efc5 SHA512 2733c06b77634cf80e161168ff452aa7a4ade21e33260bd7dd01167b4edb5b88d62d2ef15cf014e5d059699e5a9b9ba3f265a324f4c91cec8f935fba3d5c243f
+DIST geoipupdate-3.1.0.tar.gz 370293 BLAKE2B 5cd7b4563ca0b6820b863e24b80054f27c49bd9e89898f6b7248d3389a81f9c680f9979293fa2acaab0727b3c915926396404e19e90ffbb0ef6647a64d30c14a SHA512 9efd30593df0a2564f98a0e99d02ac3671e5752034d8c747d84a204cd620845e619bec511b6004d895cdb611a2d98b921eb830192d258c572ac9efd603cd5c99
 EBUILD geoipupdate-2.3.1.ebuild 573 BLAKE2B 1a4e9421d90bed8da5b4ddb282b53a9bb2cd9d7123007a8c7a207ed807480abf95ec3c2e7cea6a987d399fd73c7148778f6b28b9c66ea0f48f2c1cb4d9ae4435 SHA512 add023538fe12026667cf0feba8c1ebf1157609ba2ac9622466920d2ed7c128bec10ba7ac1a12acb358067e0ec757996ad0eec63c91c7b4a7c9d75984b06bcff
-EBUILD geoipupdate-2.4.0.ebuild 582 BLAKE2B e6010078e17ecfe850fe2b58c3af7d6aea924d9859f2a9b4668fe629b52f3c37ef58225b51668e2e5e1526008f84b97958b99a09f521b95206a47345b05b219d SHA512 f96dbf26af4c15369a5fce9b2a0a9e5571b7940304031e98c201231cc662b8ddf179a55b5454d6cd91855b68653eda03bf078043eb55edffb4e7992a8d5815f8
 EBUILD geoipupdate-2.5.0.ebuild 582 BLAKE2B e6010078e17ecfe850fe2b58c3af7d6aea924d9859f2a9b4668fe629b52f3c37ef58225b51668e2e5e1526008f84b97958b99a09f521b95206a47345b05b219d SHA512 f96dbf26af4c15369a5fce9b2a0a9e5571b7940304031e98c201231cc662b8ddf179a55b5454d6cd91855b68653eda03bf078043eb55edffb4e7992a8d5815f8
+EBUILD geoipupdate-3.1.0.ebuild 582 BLAKE2B 106db9ba7a0f95104f0728fd820da17c03ed7c1fa79481d3fe09e666594b707b64ec4522b5095c1f19b0afecc0cfa9f5dd6e60829d12cb0887910ddc82e66053 SHA512 b6fddee463197592d4bff439b9ba4e407725895544af9875c9157fad695cc700ce2d3ab293da271fa6d3826b458a1a20c477c1df51daef6367d59798b4ad1392
 MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc
diff --git a/net-misc/geoipupdate/geoipupdate-2.4.0.ebuild b/net-misc/geoipupdate/geoipupdate-3.1.0.ebuild
index c853ab96cf0b..bced45a506fb 100644
--- a/net-misc/geoipupdate/geoipupdate-2.4.0.ebuild
+++ b/net-misc/geoipupdate/geoipupdate-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/guacamole-server/Manifest b/net-misc/guacamole-server/Manifest
deleted file mode 100644
index e7b8922bf856..000000000000
--- a/net-misc/guacamole-server/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX guacamole-server-0.9.9-clipboard-id-update.patch 4393 BLAKE2B adc61367736df7d1e2adc18cc6b9338c8d3fcceec272585ab749b8a4bccf1a38b8fa73e3ea18f02fc0c7391441fb6c09ae81c16c3aa8fca320cb92f32e37151d SHA512 1667f56cd1a19222eff4bbc4af2ecb32d8a95d3cd0bbc9a66f38e91d8b38fb063cfc227d58502fb64da0ebc314f5b238d680793a1f7bb14874c3bb735b158391
-AUX guacamole-server-0.9.9-glyph-order.patch 1369 BLAKE2B 22dedd30a0da1d1828a8ab5eb585692f3a77be439ead4c2be3bfe68d0f3ca6ec9062f8e89b0d0cac7062052b305b525f34a06d5b053fdf8a9bc9b4a0eb7071ea SHA512 5e86bc03235611920a941573dd080031e4b2c811684cbe98d56d204addd44fda6ae0a900a2296ebf1d4d73462c5cb52b781ee2079981ec8e15c761aeb4b2a308
-AUX guacd 551 BLAKE2B 51ec6135053fe55a3c9693abdaf970b6cb345712a4bd92cb367bd4c8ee7ae4ee6c55dd0b1e037fa18ea9c23ba85216bcb5fa9ede38b1e4f209acdd15b0a9bc0c SHA512 58dd13812256eae0e4e4a76072ec10ccee55696d96d86200809c10cf281d5f451f1a83b7d853a268555d08e283d0f25d186169c3f3ea0e9a8f57e857e89cbfa2
-AUX guacd.service 178 BLAKE2B 2dcd16e97560ebfacc311cdfce77357a719b56a38f5f633df8b197b7e7d9c589811d458dea5fb6c58e162c2f4efccca8d620c3cfcae2b9c3679cb883d131cb7c SHA512 a7b36ab99a88c5f37ca37ae57bd59e21c7d5a890ad6d3a19756ab9655da44abed98867114799407d070376a8207a29ceb6097785bbce377826686c4e7601e0e0
-DIST guacamole-server-0.9.9.tar.gz 679635 BLAKE2B e870a68f19d5946bc6df53160db95986c80d64176838084cf0626b24258585260c7b9f61a31a51815d98a1b99e3e4185bd6e4cd19e6c983f93d54915420c7d97 SHA512 bdc004c45e63bb2c692c1dfd280840ea682e461b2c578da511247cd36d727ffa22c3fdde22b3635ef6ac7e35a1b5e63f5971bdbb4d227f88d1b81ff035bd5f83
-EBUILD guacamole-server-0.9.9-r1.ebuild 1468 BLAKE2B 858a1016007f1fbf56704b0f99be5584beb10360e95083f7c38793e35be362971a4fc605b4e6bc08a95a7b6c9b96a797ba76ea30c3cdcddd860013330d702432 SHA512 631c6ba02bb03cdfa786e0e66ce4c38b9bf0bfb62f207fbcf5e7b6ff00a7e3cb21c6bb531f24d40265d782f80fd0405b32d8812b0780c5ee07323233d641c5d9
-MISC metadata.xml 601 BLAKE2B bc22389484d78161fc16475b261665c6a9360a092313e2403a98e8e3625acf86d3919ab38460ef14d12aaf8ce0edfbfdaef88b3da0dd498039d1ae26c845863a SHA512 e6dbb46879c4224ed91eec7935d6c343aa7c963ca44b45af139d1e433ece6985a3ba8b2c8d6aeac3f55688492f37eff90024137fcce4a377bfd4e186a00b6e1b
diff --git a/net-misc/guacamole-server/files/guacamole-server-0.9.9-clipboard-id-update.patch b/net-misc/guacamole-server/files/guacamole-server-0.9.9-clipboard-id-update.patch
deleted file mode 100644
index 4191479f34d8..000000000000
--- a/net-misc/guacamole-server/files/guacamole-server-0.9.9-clipboard-id-update.patch
+++ /dev/null
@@ -1,104 +0,0 @@
---- guacamole-server-0.9.5/src/protocols/rdp/rdp_cliprdr.c.orig	2015-03-17 12:39:58.316549546 +0000
-+++ guacamole-server-0.9.5/src/protocols/rdp/rdp_cliprdr.c	2015-03-17 12:40:57.059229957 +0000
-@@ -104,8 +104,8 @@ void guac_rdp_process_cb_monitor_ready(g
- 
-     /* Respond with supported format list */
-     format_list->formats = (UINT32*) malloc(sizeof(UINT32)*2);
--    format_list->formats[0] = CB_FORMAT_TEXT;
--    format_list->formats[1] = CB_FORMAT_UNICODETEXT;
-+    format_list->formats[0] = CF_TEXT;
-+    format_list->formats[1] = CF_UNICODETEXT;
-     format_list->num_formats = 2;
- 
-     freerdp_channels_send_event(channels, (wMessage*) format_list);
-@@ -147,22 +147,22 @@ void guac_rdp_process_cb_format_list(gua
-     for (i=0; i<event->num_formats; i++) {
- 
-         /* If plain text available, request it */
--        if (event->formats[i] == CB_FORMAT_TEXT)
-+        if (event->formats[i] == CF_TEXT)
-             formats |= GUAC_RDP_CLIPBOARD_FORMAT_CP1252;
--        else if (event->formats[i] == CB_FORMAT_UNICODETEXT)
-+        else if (event->formats[i] == CF_UNICODETEXT)
-             formats |= GUAC_RDP_CLIPBOARD_FORMAT_UTF16;
- 
-     }
- 
-     /* Prefer Unicode to plain text */
-     if (formats & GUAC_RDP_CLIPBOARD_FORMAT_UTF16) {
--        __guac_rdp_cb_request_format(client, CB_FORMAT_UNICODETEXT);
-+        __guac_rdp_cb_request_format(client, CF_UNICODETEXT);
-         return;
-     }
- 
-     /* Use plain text if Unicode unavailable */
-     if (formats & GUAC_RDP_CLIPBOARD_FORMAT_CP1252) {
--        __guac_rdp_cb_request_format(client, CB_FORMAT_TEXT);
-+        __guac_rdp_cb_request_format(client, CF_TEXT);
-         return;
-     }
- 
-@@ -186,11 +186,11 @@ void guac_rdp_process_cb_data_request(gu
-     /* Determine output encoding */
-     switch (event->format) {
- 
--        case CB_FORMAT_TEXT:
-+        case CF_TEXT:
-             writer = GUAC_WRITE_CP1252;
-             break;
- 
--        case CB_FORMAT_UNICODETEXT:
-+        case CF_UNICODETEXT:
-             writer = GUAC_WRITE_UTF16;
-             break;
- 
-@@ -232,12 +232,12 @@ void guac_rdp_process_cb_data_response(g
-     switch (client_data->requested_clipboard_format) {
- 
-         /* Non-Unicode */
--        case CB_FORMAT_TEXT:
-+        case CF_TEXT:
-             reader = GUAC_READ_CP1252;
-             break;
- 
-         /* Unicode (UTF-16) */
--        case CB_FORMAT_UNICODETEXT:
-+        case CF_UNICODETEXT:
-             reader = GUAC_READ_UTF16;
-             break;
- 
---- guacamole-server-0.9.5/src/protocols/rdp/client.c.orig	2015-03-17 12:40:07.079651048 +0000
-+++ guacamole-server-0.9.5/src/protocols/rdp/client.c	2015-03-17 12:40:57.064230015 +0000
-@@ -722,7 +722,7 @@ int guac_client_init(guac_client* client
-     guac_client_data->rdp_inst = rdp_inst;
-     guac_client_data->mouse_button_mask = 0;
-     guac_client_data->clipboard = guac_common_clipboard_alloc(GUAC_RDP_CLIPBOARD_MAX_LENGTH);
--    guac_client_data->requested_clipboard_format = CB_FORMAT_TEXT;
-+    guac_client_data->requested_clipboard_format = CF_TEXT;
-     guac_client_data->audio = NULL;
-     guac_client_data->filesystem = NULL;
-     guac_client_data->available_svc = guac_common_list_alloc();
---- guacamole-server-0.9.5/src/protocols/rdp/rdp_stream.c.orig	2015-03-17 12:40:13.952730659 +0000
-+++ guacamole-server-0.9.5/src/protocols/rdp/rdp_stream.c	2015-03-17 12:40:57.066230038 +0000
-@@ -289,8 +289,8 @@ int guac_rdp_clipboard_end_handler(guac_
- 
-     /* Notify server that text data is now available */
-     format_list->formats = (UINT32*) malloc(sizeof(UINT32));
--    format_list->formats[0] = CB_FORMAT_TEXT;
--    format_list->formats[1] = CB_FORMAT_UNICODETEXT;
-+    format_list->formats[0] = CF_TEXT;
-+    format_list->formats[1] = CF_UNICODETEXT;
-     format_list->num_formats = 2;
- 
-     freerdp_channels_send_event(channels, (wMessage*) format_list);
---- guacamole-server-0.9.5/src/protocols/rdp/client.h.orig	2015-03-17 12:40:22.535830076 +0000
-+++ guacamole-server-0.9.5/src/protocols/rdp/client.h	2015-03-17 12:40:57.067230050 +0000
-@@ -143,7 +143,7 @@ typedef struct rdp_guac_client_data {
-      * The format of the clipboard which was requested. Data received from
-      * the RDP server should conform to this format. This will be one of
-      * several legal clipboard format values defined within FreeRDP, such as
--     * CB_FORMAT_TEXT.
-+     * CF_TEXT.
-      */
-     int requested_clipboard_format;
- 
diff --git a/net-misc/guacamole-server/files/guacamole-server-0.9.9-glyph-order.patch b/net-misc/guacamole-server/files/guacamole-server-0.9.9-glyph-order.patch
deleted file mode 100644
index 70bba86d9000..000000000000
--- a/net-misc/guacamole-server/files/guacamole-server-0.9.9-glyph-order.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- guacamole-server-0.9.5/src/protocols/rdp/rdp_glyph.c~	2015-02-04 05:58:22.000000000 +0000
-+++ guacamole-server-0.9.5/src/protocols/rdp/rdp_glyph.c	2015-03-17 14:04:45.549617112 +0000
-@@ -126,7 +126,8 @@ void guac_rdp_glyph_free(rdpContext* con
- }
- 
- void guac_rdp_glyph_begindraw(rdpContext* context,
--        int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor) {
-+        int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor,
-+        BOOL fOpRedundant) {
- 
-     guac_client* client = ((rdp_freerdp_context*) context)->client;
-     rdp_guac_client_data* guac_client_data =
---- guacamole-server-0.9.5/src/protocols/rdp/rdp_glyph.h~	2015-02-04 05:58:22.000000000 +0000
-+++ guacamole-server-0.9.5/src/protocols/rdp/rdp_glyph.h	2015-03-17 14:05:27.929142981 +0000
-@@ -53,7 +53,8 @@ void guac_rdp_glyph_new(rdpContext* cont
- void guac_rdp_glyph_draw(rdpContext* context, rdpGlyph* glyph, int x, int y);
- void guac_rdp_glyph_free(rdpContext* context, rdpGlyph* glyph);
- void guac_rdp_glyph_begindraw(rdpContext* context,
--        int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor);
-+        int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor,
-+        BOOL fOpRedundant);
- void guac_rdp_glyph_enddraw(rdpContext* context,
-         int x, int y, int width, int height, UINT32 fgcolor, UINT32 bgcolor);
- 
diff --git a/net-misc/guacamole-server/files/guacd b/net-misc/guacamole-server/files/guacd
deleted file mode 100644
index 64aa93fd0678..000000000000
--- a/net-misc/guacamole-server/files/guacd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DAEMON="/usr/sbin/guacd"
-PIDFILE="/run/guacd/guacd"
-
-depend() {
-    use net
-}
-
-start() {
-    checkpath -q -d -m 0755 -o guacd:guacd /run/guacd/
-    ebegin "Starting guacd"
-    start-stop-daemon --start --user guacd:guacd --exec "${DAEMON}" -- -p "${PIDFILE}"
-    eend $? "Failed to start guacd"
-}
-
-stop() {
-    ebegin "Stopping guacd"
-    start-stop-daemon --stop --pidfile "${PIDFILE}"
-    eend $? "Failed to stop guacd"
-}
diff --git a/net-misc/guacamole-server/files/guacd.service b/net-misc/guacamole-server/files/guacd.service
deleted file mode 100644
index 547dc030259d..000000000000
--- a/net-misc/guacamole-server/files/guacd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Guacamole proxy daemon
-Documentation=man:guacd(8)
-
-[Service]
-ExecStart=/usr/sbin/guacd -f
-StandardOutput=null
-User=guacd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/guacamole-server/guacamole-server-0.9.9-r1.ebuild b/net-misc/guacamole-server/guacamole-server-0.9.9-r1.ebuild
deleted file mode 100644
index 60d3b04ba27e..000000000000
--- a/net-misc/guacamole-server/guacamole-server-0.9.9-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit systemd user
-
-DESCRIPTION="This is the proxy-daemon used by www-apps/guacamole"
-
-HOMEPAGE="http://guac-dev.org/"
-SRC_URI="mirror://sourceforge/guacamole/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="multilib pulseaudio rdp ssh ssl telnet vnc vorbis"
-REQUIRED_USE="multilib? ( ssl )"
-
-RDEPEND="
-	x11-libs/cairo
-	media-libs/libpng:0=
-	virtual/jpeg:0
-	dev-libs/ossp-uuid
-	rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20150312:= )
-	ssh? (
-		x11-libs/pango
-		net-libs/libssh2 )
-	telnet?	(
-		net-libs/libtelnet
-		x11-libs/pango )
-	vnc? (
-		net-libs/libvncserver[threads]
-		pulseaudio? ( media-sound/pulseaudio ) )
-	ssl? ( dev-libs/openssl:0= )
-	vorbis? ( media-libs/libvorbis )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	# From Fedora for compat with newer freerdp
-	"${FILESDIR}"/${P}-glyph-order.patch
-	"${FILESDIR}"/${P}-clipboard-id-update.patch
-)
-
-src_configure() {
-	local myconf="--without-terminal --without-pango"
-
-	if use ssh || use telnet; then
-		myconf="--with-terminal --with-pango"
-	fi
-
-	econf ${myconf} \
-		$(use_with ssh) \
-		$(use_with rdp) \
-		$(use_with vnc) \
-		$(use_with pulseaudio pulse) \
-		$(use_with vorbis) \
-		$(use_with telnet) \
-		$(use_with ssl)
-}
-
-src_install() {
-	default
-	doinitd "${FILESDIR}/guacd"
-	systemd_dounit "${FILESDIR}/guacd.service"
-}
-
-pkg_postinst() {
-	enewgroup guacd
-	enewuser guacd -1 -1 -1 guacd
-}
diff --git a/net-misc/guacamole-server/metadata.xml b/net-misc/guacamole-server/metadata.xml
deleted file mode 100644
index 4d42c6188d3d..000000000000
--- a/net-misc/guacamole-server/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>nativemad@gentoo.org</email>
-		<name>Andreas Schuerch</name>
-	</maintainer>
-	<longdescription>
-		This is the proxy-daemon for vnc, ssh and rdp connections used by www-apps/guacamole.
-	</longdescription>
-	<use>
-		<flag name="ssh">enable support for ssh connections</flag>
-		<flag name="telnet">enable support for telnet connections</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">guacamole</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/net-misc/megatools/Manifest b/net-misc/megatools/Manifest
index 9d7dbb846668..b4f619f01a3b 100644
--- a/net-misc/megatools/Manifest
+++ b/net-misc/megatools/Manifest
@@ -1,5 +1,5 @@
 DIST megatools-1.9.97.tar.gz 105211 BLAKE2B d28e51fb178a7ff3378793261df73a53a64d0a650d7891e3bb6adaffb3ab26922f66fc48bbdc664d9103d791a83f13417e62991e0d8d8bb035f1ab339b96693b SHA512 bdc28b0d5abed23ef2b36c19d9b3572e776c293ff9e1b8cfc5966ae4a1107d554509bf136b4ceeb351cdfb3b0e094406d1ba5432c9a4572691b6ea16f6680552
 DIST megatools-1.9.98.tar.gz 83684 BLAKE2B f5c2a8559c7d4eb79eab2719fc63fd4a8c8d2acbf1d14e9de9d966a32043f291822bc5c67c9a5a63d5f9612ae3b3e3e3054ddf2f6b7695710ac6460021f5dc75 SHA512 0610809e16d135fd7cc3be45517a342f9800b098ed306b4341205bf0359832b4cb2a64220c84d5879cea6c4074229920dffd461824c93e08b492080ce87e012b
 EBUILD megatools-1.9.97.ebuild 974 BLAKE2B bfa854a0fd5807386b87bdbd25a2cc09813b0521551ede62878689def03aec6a0da37eec1ca1ee32bb37871cf0c9e8d672dcfbeac36544dbe43e408ff6d95d9d SHA512 41b24a0ae3b125e92406bed4ba40e75a3481f50cb748143289fcd2cd6f5068f530bad1c60bf962c05a607c8b4b23216a0bada21565038362a04274f1dfc1fce9
-EBUILD megatools-1.9.98.ebuild 974 BLAKE2B bfa854a0fd5807386b87bdbd25a2cc09813b0521551ede62878689def03aec6a0da37eec1ca1ee32bb37871cf0c9e8d672dcfbeac36544dbe43e408ff6d95d9d SHA512 41b24a0ae3b125e92406bed4ba40e75a3481f50cb748143289fcd2cd6f5068f530bad1c60bf962c05a607c8b4b23216a0bada21565038362a04274f1dfc1fce9
+EBUILD megatools-1.9.98.ebuild 798 BLAKE2B 0f6c5d4fc2b8c5219ddc6c9f139601105430a066b41b2ee034d833bad57bebcb7012ba99e63ae8071ecaf9c58cf7f29ce3a1c5266f08cb1a585661755ceb8fa9 SHA512 21b483593d1c135208303350f36d8542bcdaa88d897c92ab5962d7c9fc23efa61d7207b1b3f97a4d277e48087687147dc6cffecef81d3b34d60eb2fe442bcc70
 MISC metadata.xml 666 BLAKE2B 22d33973b3a8d2433ed21c5682cbad6d037f16c93169ef17621d20d487028da766033b338b62f75a44d5cfd3d3daa358a3b3a5c7d35d2b2eac5105cbfb1e5a0b SHA512 321d7e5b4918744e25067abd15fdd0d1fc1a4f627915ad9f38ed059b0a69cada014c8bb28bddc584c0c405a308818b597ce37bdf8603aa3d7d21a995d3eafe18
diff --git a/net-misc/megatools/megatools-1.9.98.ebuild b/net-misc/megatools/megatools-1.9.98.ebuild
index 42d283b633f9..b802483dd5ad 100644
--- a/net-misc/megatools/megatools-1.9.98.ebuild
+++ b/net-misc/megatools/megatools-1.9.98.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,12 +14,11 @@ SRC_URI="https://github.com/megous/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="fuse introspection static-libs"
+IUSE=""
 
 COMMON_DEPEND="dev-libs/glib:2
-	dev-libs/openssl:0
+	dev-libs/openssl:0=
 	net-misc/curl
-	fuse? ( sys-fs/fuse )
 "
 RDEPEND="${COMMON_DEPEND}
 	net-libs/glib-networking[ssl]
@@ -30,14 +29,9 @@ DEPEND="${COMMON_DEPEND}
 
 src_configure() {
 	local myeconfargs=(
-		--enable-shared
-		--enable-docs-build
 		--disable-maintainer-mode
 		--disable-warnings
 		--disable-glibtest
-		$(use_enable static-libs static)
-		$(use_enable introspection)
-		$(use_with fuse)
 	)
 	autotools-utils_src_configure
 }
diff --git a/net-misc/networkmanager-wireguard/Manifest b/net-misc/networkmanager-wireguard/Manifest
index e0dd307908bc..f92e10d65605 100644
--- a/net-misc/networkmanager-wireguard/Manifest
+++ b/net-misc/networkmanager-wireguard/Manifest
@@ -1,2 +1,2 @@
 EBUILD networkmanager-wireguard-9999.ebuild 979 BLAKE2B e0a7088d60db1e9d3f174063ee605c3afe438abdf007723250c85ba4d4b7a37283fa8624992d622cb43f952f1918ca48ccf6f184e6acc6ec7f0d9afbfbb0c9d4 SHA512 c33a5c78245a59e247aa6f7124bc6196fb06561fd0d20d16b70cefe204029f95b3962ab9c4da96d0b363c37ce95c027f7899ec2ded3761e336541d3f89989734
-MISC metadata.xml 245 BLAKE2B e1699af4b81d0a5829bac6fec911eb9fe66f9e1030346889cd4bdb27a6327fbe6c75dbf59cac764ecd2940a486cbca3de234861684ff1f29b45f95ddf85bce00 SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/networkmanager-wireguard/metadata.xml b/net-misc/networkmanager-wireguard/metadata.xml
index 97df2a00971b..6f49eba8f496 100644
--- a/net-misc/networkmanager-wireguard/metadata.xml
+++ b/net-misc/networkmanager-wireguard/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>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index e40e1eb5f935..5e932dfb55c1 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,4 +1,7 @@
+AUX nextcloud-client-2.5.0_beta1-fix_cmake.patch 783 BLAKE2B e02f2df582ec0e1a2872e2d200fd20916b45a7c654be270b4cfb698010c494dd8babc1ead29daafcd2b80ffdc94e381de939619d1cf46080b9b170be8b3a1db9 SHA512 e3cd2de00c7baa00085498b05f4a64c63dd5e73f2ca435143e9069708e31d68a99bb3e903721a335256889c1e244b38c95ab8be7956a15ac3fd5c4dad2123343
 DIST nextcloud-client-2.3.3.tar.gz 708611 BLAKE2B 8f0a1f433ad18743e7d78bf4ab523e57f2c40cc1527508e940bb14c75f944723d728a5ee188c06a181ded535b910bea68620e8eb950c290af7556423fc28264f SHA512 fd02c61a7a92b77f9063e4f15be426be84d02033bead4b176d876134f8b85d7385e4a361959b68c332f1ccb55d43e2a8b55e0d5c8e5a54f645a5816a37790bde
+DIST nextcloud-client-2.5.0_beta1.tar.gz 18930446 BLAKE2B cb6630950e26013c96151a6f8fc236a9e25313fa6479e00de754fe9c45762c62042b039f18d11febfed4cac4e36c9d7bc2fdb25a522d1a6c153343eca03d46f7 SHA512 0d6a7b24965b4cdae41aacb06804ea5463309f219d39cefbf970ba57697035b4113d1f185166b51ab296745d26e43591896fa1c8fb7430a9d624f7547fafaea4
 DIST owncloudclient-2.3.3.tar.xz 33801712 BLAKE2B 7642148a4f503a2702d56f920067202699b4a55bb6216337ecbd9df141e0a7467aaf2db8d7d6871502061d3866294f8c44c791fdbf9597ca8d761f360f7ffda1 SHA512 8cbffd4fdd4bd3bbbfb947498ec9bfbaceac3966ac29d61dea3db82405976230c1067c3a3afc9ddc4ce152c69c530ad44be154615a391f63524dc2fb40d5e5d2
 EBUILD nextcloud-client-2.3.3.ebuild 2453 BLAKE2B e953f8c60f10101c891e46c98ba4c6c2f3ec09a17c40cdfe66687b31dcc0e17a9c3da8c4c8d6e7f27c1c0786f756dd98df2b979d671fa8d649d18eb1861fc7e2 SHA512 42614380bd5945afc39fb3b653c1d03e7afcd61f7bdb3715983198bb8dc7e75a029150189bf800ab39d9a0d9775aa3b05439269b6a0a987f9c02443167dc447f
-MISC metadata.xml 597 BLAKE2B 397ed87eb33cdcdb7fb56b9668bd6e9c5209f2e0ebf674f7ad3ddc7d5971f7e2a14a160c9ab9ea49ab5ea75cbde6114fa143c469bc83987a3c58a2b1615acdf2 SHA512 162d60e031785d85fd743e92f422579d3654414f014ea3a827f7f2467b5b7d6f7552593e68f46d29a8d757a31fa58c59aeae8acd9b99430a68648cd331fccb77
+EBUILD nextcloud-client-2.5.0_beta1.ebuild 2073 BLAKE2B c71f9f29633bfd6bd7da1bac441267234a427fbbccf4837e97d4935b620783a7327eabb62e5aaaf82d1942bfcfd22e82c8d736833accc5ed483db084572caf71 SHA512 1187ec4c134cad98547e5132d1677bba9d9f6e05d221598e62ab28c9e645f47a0f66367b03bed9b2083aa7e918f8bb78cd43bfbdc9eea656461202fb99d8a1d5
+MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.5.0_beta1-fix_cmake.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.5.0_beta1-fix_cmake.patch
new file mode 100644
index 000000000000..e160d514088f
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-2.5.0_beta1-fix_cmake.patch
@@ -0,0 +1,24 @@
+From 2b825a1748b2ecd624a38976d1bd6601bdb198c9 Mon Sep 17 00:00:00 2001
+From: Ronny Kunze <Shinji.Ikari_de@gmx.de>
+Date: Sat, 4 Aug 2018 16:53:06 +0200
+Subject: [PATCH] rearange CMake find_package OpenSSL
+
+the command seems to be malformed . The keyword VERSION is not valid .
+And the version should follow direct after the packagename.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f8b8330f2..f1d07eea2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -183,7 +183,7 @@ if(BUILD_CLIENT)
+     endif()
+     find_package(Sphinx)
+     find_package(PdfLatex)
+-    find_package(OpenSSL REQUIRED VERSION 1.1)
++    find_package(OpenSSL 1.1 REQUIRED )
+ 
+    find_package(ZLIB REQUIRED)
+    find_package(GLib2)
diff --git a/net-misc/nextcloud-client/metadata.xml b/net-misc/nextcloud-client/metadata.xml
index 965f93ab61b0..4342ef68dc63 100644
--- a/net-misc/nextcloud-client/metadata.xml
+++ b/net-misc/nextcloud-client/metadata.xml
@@ -11,6 +11,6 @@
 		<flag name="shibboleth">Build support for Shibboleth single sign-on</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">nextcloud/client_theming</remote-id>
+		<remote-id type="github">nextcloud/desktop</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta1.ebuild
new file mode 100644
index 000000000000..388cf73e7697
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils gnome2-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/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}
+	!net-misc/ocsync
+	!net-misc/owncloud-client
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)
+"
+
+S=${WORKDIR}/desktop-${PV/_/-}
+
+PATCHES=( "${FILESDIR}"/${P}-fix_cmake.patch )
+
+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/ntp/Manifest b/net-misc/ntp/Manifest
index 9d02ec265d90..10e3129b833b 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -18,5 +18,8 @@ AUX sntp.service-r2 324 BLAKE2B c94e72170f46453e94d6fb48b3ee353ba2db1bdf1903f652
 AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be686966e6ee738375a5b8df68a4216c0d8e14c11223945be82a5f221d46d94e15349753a358542b7c9ae SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8
 DIST ntp-4.2.8p11-manpages.tar.xz 25700 BLAKE2B 8efff006297925e4dfe57abfb8130d0dcb69e804744a597ad92b9969019b87c7b3e44f032187073d3c19092ca92445ce06b93f89f449430fd21cc540f11f5f3b SHA512 403bc238681abaadc838f5a6619851dcd0cfa5bf780e8aeaa94e8f77e776998d1f5142d65e3fa99c23e22e4cb7207d24b059fbbc6ddcf4414f0076a4b6ab4e81
 DIST ntp-4.2.8p11.tar.gz 7076566 BLAKE2B e81ce2093ea7307a565089bba9cb267be64c71499872272cda221d7356676762a23ac1066ddfed7fb803083dbb9b26ca7376ea75277a63ee8de1c70409e81432 SHA512 05ac60f15a6aac50aaf340d40e4e439a421fa6e3d897bf30a69b2cef0cc97f8a6956012bfc6ceba055f4c3485a24f7fb8ebbd055e1875f1c69cbfdc35e71f236
+DIST ntp-4.2.8p12-manpages.tar.xz 25700 BLAKE2B 0a84908556e997bdd08a78cd04f7f38a32a8441138f31d0adf7fefc380da79e509bea4a8bc67154501e359638f4edcab561d14cbdd1d573473bd2ea5a14f0c48 SHA512 e6df0099b9f62db63d200702267276ee094e8d00b20a67d2181f3f32fe6b871c49ac2eedbc2186b3255c919820c05eac528718b80afe7ed7ed7654b55c361f7c
+DIST ntp-4.2.8p12.tar.gz 7079642 BLAKE2B d7d7817afaf9f94bf230951901b7531aff03c0828eecd40ca6fcc836ffd081387837afee44978742b507a9bee58788022fe9556733e8861dcc37d63f5637b3d1 SHA512 5382dcd1bb7feca8f28fc650f68892cb53f9364ebeb3780754cfbe71b1602057fdfd6eb27956afe79014a435624d77e2648d9e07f4d86ce7a98f5a4438d08310
 EBUILD ntp-4.2.8_p11.ebuild 4517 BLAKE2B 87ccf28c99af3848df8ca2bfc5825358d6c38d2045939b3d8a7c6509a83493ef1de004e4afdc466c453335b637c63895446c351cb2072193620e2af4883c2fbf SHA512 e8d5662377daa1c0ea1e9c1d746b05cf16944d8b3c3d9811307bca1cf6be923899390597019f9a5d203acfdec00d252860110ca0f434bffc43a25c42162696ff
+EBUILD ntp-4.2.8_p12.ebuild 4527 BLAKE2B aab6adb14c39d2cf5ded64e8c2e9f03b4db5c9152d829f4ef4ee515027067ae85700ded1ee605d5c57208ae56b7a415bdb623c1b2066d69b58addb28845ca35b SHA512 ea5bfe4085840ff9046a3aac100f9bafb7a4fb4f2a26684545e5a62a5341a1d6a63d7d51c71c5f108f11a9642e9aa14932e038e662a61b8543e063799eb6c7a3
 MISC metadata.xml 1014 BLAKE2B 133457965d766f0db56bbca2755a7e4c37319237843dbb92e7b2563194cc2282500010e76877d9cd5d6c9a56f8b815ffab1bdc84d76446310f3cee5476ff7f52 SHA512 37f6b14a86b13c20ecc83967332599b26e958015798e341ca3e1c1d79a666a3b69904c4aeb5ff298477d2b5fd709a2fe09271dbe41910e3f439bef47efa6b650
diff --git a/net-misc/ntp/ntp-4.2.8_p12.ebuild b/net-misc/ntp/ntp-4.2.8_p12.ebuild
new file mode 100644
index 000000000000..179de05fc600
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.8_p12.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools toolchain-funcs flag-o-matic user systemd
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
+	https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
+
+LICENSE="HPND BSD ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+IUSE="caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf"
+
+CDEPEND="readline? ( >=sys-libs/readline-4.1:0= )
+	>=dev-libs/libevent-2.0.9:=[threads?]
+	kernel_linux? ( caps? ( sys-libs/libcap ) )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	snmp? ( net-analyzer/net-snmp )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	parse-clocks? ( net-misc/pps-tools )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-ntp )
+	vim-syntax? ( app-vim/ntp-syntax )
+	!net-misc/ntpsec
+	!openntpd? ( !net-misc/openntpd )
+"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966
+	"${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922
+	"${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch
+)
+
+pkg_setup() {
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_prepare() {
+	default
+	append-cppflags -D_GNU_SOURCE #264109
+	# Make sure every build uses the same install layout. #539092
+	find sntp/loc/ -type f '!' -name legacy -delete || die
+	eautoreconf #622754
+	# Disable pointless checks.
+	touch .checkChangeLog .gcc-warning FRC.html html/.datecheck
+}
+
+src_configure() {
+	# avoid libmd5/libelf
+	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
+	export ac_cv_lib_elf_nlist=no
+	# blah, no real configure options #176333
+	export ac_cv_header_dns_sd_h=$(usex zeroconf)
+	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+	# Increase the default memlimit from 32MiB to 128MiB.  #533232
+	local myeconfargs=(
+		--with-lineeditlibs=readline,edit,editline
+		--with-yielding-select
+		--disable-local-libevent
+		--docdir='$(datarootdir)'/doc/${PF}
+		--htmldir='$(docdir)/html'
+		--with-memlock=256
+		$(use_enable caps linuxcaps)
+		$(use_enable parse-clocks)
+		$(use_enable ipv6)
+		$(use_enable debug debugging)
+		$(use_with readline lineeditlibs readline)
+		$(use_enable samba ntp-signd)
+		$(use_with snmp ntpsnmpd)
+		$(use_with ssl crypto)
+		$(use_enable threads thread-support)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# move ntpd/ntpdate to sbin #66671
+	dodir /usr/sbin
+	mv "${ED%/}"/usr/bin/{ntpd,ntpdate} "${ED%/}"/usr/sbin/ || die "move to sbin"
+
+	dodoc INSTALL WHERE-TO-START
+	doman "${WORKDIR}"/man/*.[58]
+
+	insinto /etc
+	doins "${FILESDIR}"/ntp.conf
+	use ipv6 || sed -i '/^restrict .*::1/d' "${ED%/}"/etc/ntp.conf #524726
+	newinitd "${FILESDIR}"/ntpd.rc-r1 ntpd
+	newconfd "${FILESDIR}"/ntpd.confd ntpd
+	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+	newinitd "${FILESDIR}"/sntp.rc sntp
+	newconfd "${FILESDIR}"/sntp.confd sntp
+	if ! use caps ; then
+		sed -i "s|-u ntp:ntp||" "${ED%/}"/etc/conf.d/ntpd || die
+	fi
+	sed -i "s:/usr/bin:/usr/sbin:" "${ED%/}"/etc/init.d/ntpd || die
+
+	keepdir /var/lib/ntp
+	use prefix || fowners ntp:ntp /var/lib/ntp
+
+	if use openntpd ; then
+		cd "${ED}" || die
+		rm usr/sbin/ntpd || die
+		rm -r var/lib || die
+		rm etc/{conf,init}.d/ntpd || die
+		rm usr/share/man/*/ntpd.8 || die
+	else
+		systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service
+		if use caps ; then
+			sed -i '/ExecStart/ s|$| -u ntp:ntp|' \
+				"${D%/}$(systemd_get_systemunitdir)"/ntpd.service \
+				|| die
+		fi
+		systemd_enable_ntpunit 60-ntpd ntpd.service
+	fi
+
+	systemd_newunit "${FILESDIR}"/ntpdate.service-r1 ntpdate.service
+	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
+	systemd_newunit "${FILESDIR}"/sntp.service-r2 sntp.service
+	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
+}
+
+pkg_postinst() {
+	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
+		eerror "The notrust option was found in your /etc/ntp.conf!"
+		ewarn "If your ntpd starts sending out weird responses,"
+		ewarn "then make sure you have keys properly setup and see"
+		ewarn "https://bugs.gentoo.org/41827"
+	fi
+}
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index 1e5d1fcd5785..93c045116689 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -2,7 +2,9 @@ AUX ofono.initd 418 BLAKE2B 0a0f8894ec52b7213e46c8a1474f1a6061324f6e31842910e241
 DIST ofono-1.16.tar.xz 854296 BLAKE2B 4ee8f895e21903b8181fe14f5a91fea466eb3a2f66c8a5ab270a8dd81c601dc5e2a1beae368cf0f14b556f0dfb8301439d40d93bfd1d058d43ce864cdd1f0788 SHA512 21887e1bc3b8af18881f9456f950b97885b567164e28ebe2ab6fc5a3042c439891a20b5034a8fa0c7a78567286ac53c1b8a72122f428fbcf5da8bf139423b913
 DIST ofono-1.20.tar.xz 935448 BLAKE2B 751f6c340cf95dd4ab6f3d17f81a967406b3f6cc4d6024435aba1e663a220a47d14f04d62b765205bf04f11a9b5b0075501dbbaaa22f9380ffb0ef3a78fce5ec SHA512 8dc86654ae8a1dc1761c95df5f0de55566db20012e523f11bcd5ab5e1540f4cd9fc7bd6bf1665dcbeb31f2925f9322c21fd05fb00034e408b5d85b265e2fe840
 DIST ofono-1.23.tar.xz 978472 BLAKE2B 0bd0b7921df075f0ea35d61d4ea852dad0bc752802263f8525e697f3b23e555488116918fed8f143c95ae6fc919515cbb06d0644f7119225076d1fe7c5be1f52 SHA512 103dc28f9a6c583804884bdb891424eb53323b5edf764edd6c64e0b6c76ee6ea063c6a1d1d36a35d4ae6740e00479e2fc0abc6fca1dc92b916e166d48a1642fd
+DIST ofono-1.24.tar.xz 980644 BLAKE2B 74974ab104cc31a67ec04c62149e282de5295573e1b236b39da8005721c8277a0636fd290aaa3c6380eb117364d2098af856f22ce9f6d41af599c5bf78bf98b1 SHA512 d3148df4bcac60c0f12bc4665e170e92d35473a7ff9fc516bd6a3c35c3e9b6f9beadc624ac9bbdfb9de2876e4ab417d857bd52b27a634f433f3607a7e11381c3
 EBUILD ofono-1.16.ebuild 1610 BLAKE2B 4da501cec1347a1a745732f2ad1a8db28234eab5c828be18a1d493ee83a18dac95dbb0588fd9b56b7d06e54054d8e5134ca3dcdd123d959038955b6327c86ad1 SHA512 b3bd40291d278fe831a1aa4d50ca7c6a79ab32f61f6b54a961e80b4929b620b17344c76c4d1e555a110f51036231c5b4d1af2a7e1c77736e06129b1909c8de24
 EBUILD ofono-1.20.ebuild 1668 BLAKE2B 45171e8d0582a35853b59a39eee4e42471d83ad0416144695442ed3a5a4ed766d87caaf6fcac2b529a2579dd178c9f63baa9dca86db083aeaccd066915c1296e SHA512 7bc146aa1ca4fe35a1899ea724c1e44cc42badc9e9e91c69e3a7ef01fbbf8e47be69a9b1e5e1074c5327d2e807a33f4388ca2d43dd0bf56164be55b402607a75
 EBUILD ofono-1.23.ebuild 1668 BLAKE2B 45171e8d0582a35853b59a39eee4e42471d83ad0416144695442ed3a5a4ed766d87caaf6fcac2b529a2579dd178c9f63baa9dca86db083aeaccd066915c1296e SHA512 7bc146aa1ca4fe35a1899ea724c1e44cc42badc9e9e91c69e3a7ef01fbbf8e47be69a9b1e5e1074c5327d2e807a33f4388ca2d43dd0bf56164be55b402607a75
+EBUILD ofono-1.24.ebuild 1668 BLAKE2B 45171e8d0582a35853b59a39eee4e42471d83ad0416144695442ed3a5a4ed766d87caaf6fcac2b529a2579dd178c9f63baa9dca86db083aeaccd066915c1296e SHA512 7bc146aa1ca4fe35a1899ea724c1e44cc42badc9e9e91c69e3a7ef01fbbf8e47be69a9b1e5e1074c5327d2e807a33f4388ca2d43dd0bf56164be55b402607a75
 MISC metadata.xml 951 BLAKE2B fd63ccff3b96dea1e770b7ec50c1a9e5e583fe81bcb2ca9c1915386a4fbd85a30c806f9ac3e163b1110e93b44f6714c555cee9273ecf90d5a9f9e209f0774897 SHA512 26f8b8b3ac43991d14534b4b1257a5c4dc1dd0eaca83c9f30aab74bbc721d9573e93e8f245a4ac2d0805ea9325aa759ca144951fef1b158b0b68f54df4df3e7e
diff --git a/net-misc/ofono/ofono-1.24.ebuild b/net-misc/ofono/ofono-1.24.ebuild
new file mode 100644
index 000000000000..2978ac9372eb
--- /dev/null
+++ b/net-misc/ofono/ofono-1.24.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib systemd
+
+DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
+HOMEPAGE="https://01.org/ofono"
+SRC_URI="mirror://kernel/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 threads 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 threads) \
+		$(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/openssh/Manifest b/net-misc/openssh/Manifest
index 643537eb2d40..e7ef9ff5012d 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -14,6 +14,7 @@ AUX openssh-7.6_p1-warnings.patch 324 BLAKE2B d9fb6e710f797b687b285f70b7c7b32aba
 AUX openssh-7.7_p1-GSSAPI-dns.patch 11342 BLAKE2B e648273cdd04bcd46b25a2ae2b4ffdfff455c7ab04f6c56cb5ad91859231c267211564f6b2785d9fad1b78c4fe0a095302c7acf732357efdb2273ebab9ceebab SHA512 bbfe702786636006dfe4560d8245d9007f9a94768a2df17a3ca3ead7bd1351edd2960f993e322b96828a0054ad55f71fcb77793a05ba2e52d8d9286431cc538a
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd.confd 396 BLAKE2B 2fc146e83512d729e120cfe331441e8fe27eba804906cc0c463b938ddaf052e7392efbcda6699467afde22652c599e7d55b0ce18a344137263cd78647fea255f SHA512 b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81
+AUX sshd.initd 2735 BLAKE2B c3fd3b653676b0e628d58939a55e0ff5cfdd177af18a9ef2d53dcb1717ce478ecb654da398752ee4fef0f6225416fd4fa5cfa6e83d7e977086744616d291dcd3 SHA512 9c3e908c79674bb070e99491dc587c1e6404b1e2eec711dc27cd54510ff68217c83e7ac6fcf7b89f62ba5393ff3e417774fd6d105422464203544e8fbc91c6bb
 AUX sshd.pam_include.2 156 BLAKE2B 91ebefbb1264fe3fe98df0a72ac22a4cd8a787b3b391af5769798e0b0185f0a588bc089d229c76138fd2db39fbe6bd33924f0d53e0513074d9c2d7abf88dcb78 SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c
 AUX sshd.rc6.4 2108 BLAKE2B 55b66dddb45aadccde794667195f716f84c521576d886a3acc56f6f66087f0ff7167bde629c876da4ee1306a4995b8a4cd089eece35037616d17ee4b691b4cf8 SHA512 fe58e950514743a72467233ff2f2a63112c50e5db843d61e141a5ca3dd8ef8f42a616cd9de7748ae582054c47c2cc38ce48b638e2d88be39c1387f77e79c83e1
 AUX sshd.rc6.5 2723 BLAKE2B 3509a84c3f3d09ac3946f3e59c07ce615fb263ed7580815384589b9451e4c3df9c6c82a6d7cbd738e87d8b2dd2a4e7907e59b179250c828a191e395e25900fa9 SHA512 b65910477e6d255cb0eb8a49ffd2c43b1d8876f9e6cf8dd4c7161dbedd17ed757aea7ead4ebecc29d830e2675f66a0974c063fbcf93849c06f1599cbf0ff9d1b
@@ -24,19 +25,12 @@ DIST openssh-7.4_p1-sctp.patch.xz 8220 BLAKE2B 2d571cacaab342b7950b42ec826bd896e
 DIST openssh-7.5p1+x509-10.2.diff.gz 467040 BLAKE2B 4048b0f016bf7d43276f88117fc266d1a450d298563bfc6ce705ec2829b8f9d91af5c5232941d55004b5aea2d3e0fb682a9d4acd9510c9761ba7ede2f2f0e37f SHA512 ec760d38771749d09afc8d720120ea2aa065c1c7983898b45dba74a4411f7e61e7705da226864e1e8e62e2261eecc3a4ab654b528c71512a07798824d9fb1a9a
 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.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.tar.gz 1489788 BLAKE2B 938bfeeff0a0aaa2fc7e4c345f04561c6c071c526e354a7d344a08742cb70ab1f4a41d325b31720f2fba5c4afa4db11f3fc87055c8c9c8bea37b29cc11dc8f39 SHA512 de17fdcb8239401f76740c8d689a8761802f6df94e68d953f3c70b9f4f8bdb403617c48c1d01cc8c368d88e9d50aee540bf03d5a36687dfb39dfd28d73029d72
 DIST openssh-7.7p1-hpnssh14v15-gentoo2.patch.xz 22060 BLAKE2B 9ee654f689d4b90bd0fe4f71d57b4a8d9d957012be3a23ff2baa6c45ae99e2f1e4daf5de24479a6a3eb761ee6847deb3c6c3021d4cbabc9089f605d8d7270efc SHA512 856d28ac89c14d01c40c7d7e93cfaebd74b091188b5b469550eb62aa5445177aec1a5f47c1e2f7173013712e98e5f9f5e46bbb3dbd4ec7c5ee8256ef45cda0f8
-DIST openssh-7.7p1-patches-1.1.tar.xz 16476 BLAKE2B fca2885a9e29faec40700ece37a995ba83e40bd2a6875129a5327770d8ee43663a7c063de33b4653994ed7332adb03730f613c047550d874190b95c66e2e9efa SHA512 aa5e33ce4bb4be16abf27ac1bade1dc85c51d82002be546402e0b8b0685de3ec7029f0f56bf1295ec346eb3960a6bed7cfc882722e57957a19a732f3174b3039
+DIST openssh-7.7p1-patches-1.2.tar.xz 17584 BLAKE2B 192ec01906c911197abec4606cdf136cf26ac4ab4c405267cd98bafaea409d9d596b2b985eaeda6a1425d587d63b6f403b988f280aff989357586bf232d27712 SHA512 e646ec3674b5ef38abe823406d33c8a47c5f63fa962c41386709a7ad7115d968b70fbcf7a8f3efc67a3e80e0194e8e22a01c2342c830f99970fe02532cdee51b
 DIST openssh-7.7p1-sctp-1.1.patch.xz 7548 BLAKE2B 3b960c2377351955007005de560c2a3e8d0d059a0435e5beda14c63e444dad8b4357edaccd1cfe446c6268514f152b2bcfa7fa3612f1ae1324a31fecb0e85ac5 SHA512 093605865262a2b972db8c92990a49ed6178ed4567fb2626518c826c8472553d9be99a9e6052a6f5e545d81867b4118e9fd8a2c0c26a2739f1720b0f13282cba
 DIST openssh-7.7p1-x509-11.3.1.patch.xz 362672 BLAKE2B 55b8b0ef00dc4d962a0db1115406b7b1e84110870c74198e9e4cb081b2ffde8daca67cb281c69d73b4c5cbffde361429d62634be194b57e888a0b434a0f42a37 SHA512 f84744f6d2e5a15017bce37bfa65ebb47dbafeac07ea9aab46bdc780b4062ff70687512d9d512cab81e3b9c701adb6ce17c5474f35cb4b49f57db2e2d45ac9ac
 DIST openssh-7.7p1.tar.gz 1536900 BLAKE2B 7aee360f2cea5bfa3f8426fcbd66fde2568f05f9c8e623326b60f03b7c5f8abf223e178aa1d5958015b51627565bf5b1ace35b57f309638c908f5a7bf5500d21 SHA512 597252cb48209a0cb98ca1928a67e8d63e4275252f25bc37269204c108f034baade6ba0634e32ae63422fddd280f73096a6b31ad2f2e7a848dde75ca30e14261
 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 11184 BLAKE2B c6725a371359485803c89cb73b9efad9a69ed6255ff8f411574e218af71880c507567010a749c22bea5f1a12043acb01cbfe452e9aba50e0b508b737f7fb7576 SHA512 414033d873ea94e0a3f087a8739d4266bdb96b6e02702a0385f09911ee2c279666baa837048e825489478b7774126b1dafa48e1f354f50d0d6cfc73b446da286
-EBUILD openssh-7.6_p1-r5.ebuild 11360 BLAKE2B ca0a8157c9c4fbd9219f8e73f6009c18b467e3a1b234bfa346ddb20c8e21438d16230ce0f1062ed947da67435f7e3a50a57675a7e285c37c8b515a9d17430f29 SHA512 fb6ee3771fb67700e596835267c8f26d0c1afe5c3c3366963951c07266a7ab58224d78062256c176e13a00238d9c21ba0ad66965ce6ffd41eb74e28eab81970c
-EBUILD openssh-7.7_p1-r6.ebuild 16437 BLAKE2B c51f18e66e44006d0830ca9e692d31967e6208532e8ef2b946b9831a2066257d4a74cbf8fdf432a353ca4c480b9f10aa200e8700743c525bc74e7281b9e99f06 SHA512 6266a68419c4beb5ec624dd41c38386f70f56e321c09925df39406d783b3bbfc420463f50e5b8b5ccc554ef7e9df4422aaee7ca2b5b2c7ffc52e6dade1334f6a
-EBUILD openssh-7.7_p1-r7.ebuild 15931 BLAKE2B 948b3fa5a2fb834fedbccc262df98805a51dec2d1237e11db1b461e70e6ed43d0d0b2a7377782081988e6f3ef9fb31cc74828c369707808545ca93936e3792aa SHA512 15c80f2ded1de0a22b324285f3ee942b5e932ca8d5d742cec666db13fa3507f6213078819697823cf531ec62455bd9ac4e7f25c599fa9dc0a40a80c2ec179a3e
+EBUILD openssh-7.5_p1-r4.ebuild 11172 BLAKE2B ad8d14a4f2e2edfb842963ea4b73c16c7ff4db05541cd9e2c8fbad08bd67619a10b95df1d3d367429d9b59aa103181c60b9ab4ac596271647f757d2c634c6647 SHA512 8951e6cd77403411c57d9757b42e3065c5296033093c49de4bbc933d79cd1f74f884647e608ef282937e49a0ea617fcfb16cba7c1f3ebb11f283cbef0901d1fb
+EBUILD openssh-7.7_p1-r9.ebuild 15954 BLAKE2B 2ab19aed784ba9d1781746d016a4895585667e25724b34ecf380f6f35eee20e96217ccf02acb22b86ff04a6d0ccdd29d24d8d2945045d178c5c6e49b34b9df2c SHA512 12afcd80010dcf0fcec55c8a70bce8a4fcf73d3f0d2e0bb3efec3cfdc57ad9626ca08c81ee5b904f4133ec072dd13a05b4d8a68c2e628c434af58a41de854aaa
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/files/sshd.initd b/net-misc/openssh/files/sshd.initd
new file mode 100644
index 000000000000..c5df4693dbe3
--- /dev/null
+++ b/net-misc/openssh/files/sshd.initd
@@ -0,0 +1,89 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+: ${SSHD_CONFDIR:=${RC_PREFIX%/}/etc/ssh}
+: ${SSHD_CONFIG:=${SSHD_CONFDIR}/sshd_config}
+: ${SSHD_PIDFILE:=${RC_PREFIX%/}/run/${SVCNAME}.pid}
+: ${SSHD_BINARY:=${RC_PREFIX%/}/usr/sbin/sshd}
+: ${SSHD_KEYGEN_BINARY:=${RC_PREFIX%/}/usr/bin/ssh-keygen}
+
+command="${SSHD_BINARY}"
+pidfile="${SSHD_PIDFILE}"
+command_args="${SSHD_OPTS} -o PidFile=${pidfile} -f ${SSHD_CONFIG}"
+
+# Wait one second (length chosen arbitrarily) to see if sshd actually
+# creates a PID file, or if it crashes for some reason like not being
+# able to bind to the address in ListenAddress (bug 617596).
+: ${SSHD_SSD_OPTS:=--wait 1000}
+start_stop_daemon_args="${SSHD_SSD_OPTS}"
+
+depend() {
+	# Entropy can be used by ssh-keygen, among other things, but
+	# is not strictly required (bug 470020).
+	use logger dns entropy
+	if [ "${rc_need+set}" = "set" ] ; then
+		: # Do nothing, the user has explicitly set rc_need
+	else
+		local x warn_addr
+		for x in $(awk '/^ListenAddress/{ print $2 }' "$SSHD_CONFIG" 2>/dev/null) ; do
+			case "${x}" in
+				0.0.0.0|0.0.0.0:*) ;;
+				::|\[::\]*) ;;
+				*) warn_addr="${warn_addr} ${x}" ;;
+			esac
+		done
+		if [ -n "${warn_addr}" ] ; then
+			need net
+			ewarn "You are binding an interface in ListenAddress statement in your sshd_config!"
+			ewarn "You must add rc_need=\"net.FOO\" to your ${RC_PREFIX%/}/etc/conf.d/sshd"
+			ewarn "where FOO is the interface(s) providing the following address(es):"
+			ewarn "${warn_addr}"
+		fi
+	fi
+}
+
+checkconfig() {
+	checkpath --mode 0755 --directory "${RC_PREFIX%/}/var/empty"
+
+	if [ ! -e "${SSHD_CONFIG}" ] ; then
+		eerror "You need an ${SSHD_CONFIG} file to run sshd"
+		eerror "There is a sample file in /usr/share/doc/openssh"
+		return 1
+	fi
+
+	${SSHD_KEYGEN_BINARY} -A || return 2
+
+	"${command}" -t ${command_args} || return 3
+}
+
+start_pre() {
+	# If this isn't a restart, make sure that the user's config isn't
+	# busted before we try to start the daemon (this will produce
+	# better error messages than if we just try to start it blindly).
+	#
+	# If, on the other hand, this *is* a restart, then the stop_pre
+	# action will have ensured that the config is usable and we don't
+	# need to do that again.
+	if [ "${RC_CMD}" != "restart" ] ; then
+		checkconfig || return $?
+	fi
+}
+
+stop_pre() {
+	# If this is a restart, check to make sure the user's config
+	# isn't busted before we stop the running daemon.
+	if [ "${RC_CMD}" = "restart" ] ; then
+		checkconfig || return $?
+	fi
+}
+
+reload() {
+	checkconfig || return $?
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $?
+}
diff --git a/net-misc/openssh/openssh-7.5_p1-r4.ebuild b/net-misc/openssh/openssh-7.5_p1-r4.ebuild
index 3deb8a130f70..be7aea7c8888 100644
--- a/net-misc/openssh/openssh-7.5_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-7.5_p1-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit eutils user flag-o-matic multilib autotools pam systemd versionator
+inherit eutils user flag-o-matic multilib autotools pam systemd
 
 # Make it more portable between straight releases
 # and _p? releases.
diff --git a/net-misc/openssh/openssh-7.6_p1-r5.ebuild b/net-misc/openssh/openssh-7.6_p1-r5.ebuild
deleted file mode 100644
index 35d4f26e7bd7..000000000000
--- a/net-misc/openssh/openssh-7.6_p1-r5.ebuild
+++ /dev/null
@@ -1,342 +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-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.2" 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? ( https://dev.gentoo.org/~chutzpah/${HPN_PATCH} )}
-	${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~polynomial-c/${LDAP_PATCH} )}
-	${X509_PATCH:+X509? ( https://dev.gentoo.org/~chutzpah/${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 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"
-	eapply "${FILESDIR}/${P}-permitopen.patch"
-	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.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
-			popd >/dev/null
-			save_version X509
-		fi
-		# remove this with the next version bump
-		pushd "${WORKDIR}" >/dev/null
-		eapply "${FILESDIR}/${P}-permitopen-x509-glue.patch"
-		popd >/dev/null
-
-		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.7_p1-r6.ebuild b/net-misc/openssh/openssh-7.7_p1-r6.ebuild
deleted file mode 100644
index 2c9745079e53..000000000000
--- a/net-misc/openssh/openssh-7.7_p1-r6.ebuild
+++ /dev/null
@@ -1,460 +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_VER="14v15-gentoo2" HPN_PATCH="${PARCH}-hpnssh${HPN_VER}.patch.xz"
-SCTP_VER="1.1" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-X509_VER="11.3.1" X509_PATCH="${PARCH}-x509-${X509_VER}.patch.xz"
-
-# Disable LDAP support until someone will rewrite the patch,
-# upstream removed auth_parse_options() via commit 7c856857607112a3dfe6414696bf4c7ab7fb0cb3
-#LDAP_VER="0.3.14" LDAP_PATCH="${PN}-lpk-7.7p1-${LDAP_VER}.patch.xz"
-
-PATCH_SET="openssh-7.7p1-patches-1.1"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="https://www.openssh.com/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
-	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
-	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )}
-	${HPN_PATCH:+hpn? ( https://dev.gentoo.org/~whissi/dist/openssh/${HPN_PATCH} )}
-	${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~whissi/dist/openssh/${LDAP_PATCH} )}
-	${X509_PATCH:+X509? ( https://dev.gentoo.org/~whissi/dist/openssh/${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 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 hpn && maybe_fail hpn HPN_PATCH)
-		$(use ldap && maybe_fail ldap LDAP_PATCH)
-		$(use sctp && maybe_fail sctp SCTP_PATCH)
-		$(use X509 && maybe_fail X509 X509_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
-}
-
-src_prepare() {
-	sed -i \
-		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \
-		pathnames.h || die
-
-	# don't break .ssh/authorized_keys2 for fun
-	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
-	eapply "${FILESDIR}"/${PN}-7.7_p1-GSSAPI-dns.patch #165444 integrated into gsskex
-	eapply "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
-	eapply "${FILESDIR}"/${PN}-7.5_p1-disable-conch-interop-tests.patch
-
-	local PATCHSET_VERSION_MACROS=()
-
-	if use X509 ; then
-		eapply "${WORKDIR}"/${X509_PATCH%.*}
-
-		# We need to patch package version or any X.509 sshd will reject our ssh client
-		# with "userauth_pubkey: could not parse key: string is too large [preauth]"
-		# error
-		einfo "Patching package version for X.509 patch set ..."
-		sed -i \
-			-e "s/^AC_INIT(\[OpenSSH\], \[Portable\]/AC_INIT([OpenSSH], [${X509_VER}]/" \
-			"${S}"/configure.ac || die "Failed to patch package version for X.509 patch"
-
-		einfo "Patching version.h to expose X.509 patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE.*/a #define SSH_X509               \"-PKIXSSH-${X509_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in X.509 patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_X509' )
-
-		einfo "Disabling broken X.509 agent test ..."
-		sed -i \
-			-e "/^ agent$/d" \
-			"${S}"/tests/CA/config || die "Failed to disable broken X.509 agent test"
-
-		# The following patches don't apply on top of X509 patch
-		rm "${WORKDIR}"/patch/2002_all_openssh-7.7p1_upstream_bug2840.patch || die
-		rm "${WORKDIR}"/patch/2009_all_openssh-7.7p1_make-shell-tests-portable.patch || die
-		rm "${WORKDIR}"/patch/2016_all_openssh-7.7p1_implement-EMFILE-mitigation-for-ssh-agent.patch || die
-		rm "${WORKDIR}"/patch/2025_all_openssh-7.7p1_prefer-argv0-to-ssh-when-re-executing-ssh-for-proxyjump.patch || die
-	else
-		rm "${WORKDIR}"/patch/2016_all_openssh-7.7p1-X509_implement-EMFILE-mitigation-for-ssh-agent.patch || die
-		rm "${WORKDIR}"/patch/2025_all_openssh-7.7p1-X509_prefer-argv0-to-ssh-when-re-executing-ssh-for-proxyjump.patch || die
-	fi
-
-	if use ldap ; then
-		eapply "${WORKDIR}"/${LDAP_PATCH%.*}
-
-		einfo "Patching version.h to expose LDAP patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE.*/a #define SSH_LDAP               \"-ldap-${LDAP_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in LDAP patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_LDAP' )
-	fi
-
-	if use sctp ; then
-		eapply "${WORKDIR}"/${SCTP_PATCH%.*}
-
-		einfo "Patching version.h to expose SCTP patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_SCTP        \"-sctp-${SCTP_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in SCTP patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_SCTP' )
-
-		einfo "Disabling know failing test (cfgparse) caused by SCTP patch ..."
-		sed -i \
-			-e "/\t\tcfgparse \\\/d" \
-			"${S}"/regress/Makefile || die "Failed to disable known failing test (cfgparse) caused by SCTP patch"
-	fi
-
-	if use hpn ; then
-		eapply "${WORKDIR}"/${HPN_PATCH%.*}
-
-		einfo "Patching Makefile.in for HPN patch set ..."
-		sed -i \
-			-e "/^LIBS=/ s/\$/ -lpthread/" \
-			"${S}"/Makefile.in || die "Failed to patch Makefile.in"
-
-		einfo "Patching version.h to expose HPN patch set ..."
-		sed -i \
-			-e "/^#define SSH_PORTABLE/a #define SSH_HPN         \"-hpn${HPN_VER}\"" \
-			"${S}"/version.h || die "Failed to sed-in HPN patch version"
-		PATCHSET_VERSION_MACROS+=( 'SSH_HPN' )
-
-		if [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-			einfo "Disabling known non-working MT AES cipher per default ..."
-
-			cat > "${T}"/disable_mtaes.conf <<- EOF
-
-			# HPN's Multi-Threaded AES CTR cipher is currently known to be broken
-			# and therefore disabled per default.
-			DisableMTAES yes
-			EOF
-			sed -i \
-				-e "/^#HPNDisabled.*/r ${T}/disable_mtaes.conf" \
-				"${S}"/sshd_config || die "Failed to disabled MT AES ciphers in sshd_config"
-
-			sed -i \
-				-e "/AcceptEnv.*_XXX_TEST$/a \\\tDisableMTAES\t\tyes" \
-				"${S}"/regress/test-exec.sh || die "Failed to disable MT AES ciphers in test config"
-		fi
-	fi
-
-	if use X509 || use hpn ; then
-		einfo "Patching packet.c for X509 and/or HPN patch set ..."
-		sed -i \
-			-e "s/const struct sshcipher/struct sshcipher/" \
-			"${S}"/packet.c || die "Failed to patch ssh_packet_set_connection() (packet.c)"
-	fi
-
-	if use X509 || use sctp || use ldap || use hpn ; then
-		einfo "Patching sshconnect.c to use SSH_RELEASE in send_client_banner() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshconnect.c || die "Failed to patch send_client_banner() to use SSH_RELEASE (sshconnect.c)"
-
-		einfo "Patching sshd.c to use SSH_RELEASE in sshd_exchange_identification() ..."
-		sed -i \
-			-e "s/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION/PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE/" \
-			"${S}"/sshd.c || die "Failed to patch sshd_exchange_identification() to use SSH_RELEASE (sshd.c)"
-
-		einfo "Patching version.h to add our patch sets to SSH_RELEASE ..."
-		sed -i \
-			-e "s/^#define SSH_RELEASE.*/#define SSH_RELEASE     SSH_VERSION SSH_PORTABLE ${PATCHSET_VERSION_MACROS[*]}/" \
-			"${S}"/version.h || die "Failed to patch SSH_RELEASE (version.h)"
-	fi
-
-	sed -i \
-		-e "/#UseLogin no/d" \
-		"${S}"/sshd_config || die "Failed to remove removed UseLogin option (sshd_config)"
-
-	eapply "${WORKDIR}"/patch/*.patch
-
-	eapply_user #473004
-
-	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
-
-	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 and sctp patch conditionally, so can't pass --without-{ldap,sctp}
-		# unconditionally else we get unknown flag warnings.
-		$(use ldap && use_with ldap)
-		$(use sctp && use_with sctp)
-		$(use_with ldns)
-		$(use_with libedit)
-		$(use_with pam)
-		$(use_with pie)
-		$(use_with selinux)
-		$(use_with skey)
-		$(use_with ssl openssl)
-		$(use_with ssl md5-passwords)
-		$(use_with ssl ssl-engine)
-	)
-
-	# stackprotect is broken on musl x86
-	use elibc_musl && use x86 && myconf+=( --without-stackprotect )
-
-	# 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_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[*]}"
-}
-
-# Gentoo tweaks to default config files.
-tweak_ssh_configs() {
-	local locale_vars=(
-		# These are language variables that POSIX defines.
-		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
-		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
-
-		# These are the GNU extensions.
-		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
-		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
-	)
-
-	# First the server config.
-	cat <<-EOF >> "${ED%/}"/etc/ssh/sshd_config
-
-	# Allow client to pass locale environment variables. #367017
-	AcceptEnv ${locale_vars[*]}
-
-	# Allow client to pass COLORTERM to match TERM. #658540
-	AcceptEnv COLORTERM
-	EOF
-
-	# Then the client config.
-	cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config
-
-	# Send locale environment variables. #367017
-	SendEnv ${locale_vars[*]}
-
-	# Send COLORTERM to match TERM. #658540
-	SendEnv COLORTERM
-	EOF
-
-	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
-
-	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
-}
-
-src_install() {
-	emake install-nokeys DESTDIR="${D}"
-	fperms 600 /etc/ssh/sshd_config
-	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd.rc6.5 sshd
-	newconfd "${FILESDIR}"/sshd-r1.confd sshd
-
-	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
-
-	tweak_ssh_configs
-
-	if use ldap && [[ -n ${LDAP_PATCH} ]] ; 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 hpn && dodoc HPN-README
-	use X509 || dodoc ChangeLog
-
-	diropts -m 0700
-	dodir /etc/skel/.ssh
-
-	keepdir /var/empty
-
-	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
-	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-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
-
-	if use hpn && [[ -n "${HPN_DISABLE_MTAES}" ]] ; then
-		elog ""
-		elog "HPN's multi-threaded AES CTR cipher is currently known to be broken"
-		elog "and therefore disabled at runtime per default."
-		elog "Make sure your sshd_config is up to date and contains"
-		elog ""
-		elog "  DisableMTAES yes"
-		elog ""
-		elog "Otherwise you maybe unable to connect to this sshd using any AES CTR cipher."
-		elog ""
-	fi
-}
diff --git a/net-misc/openssh/openssh-7.7_p1-r7.ebuild b/net-misc/openssh/openssh-7.7_p1-r9.ebuild
index 90c537b121a1..b64d100d14c7 100644
--- a/net-misc/openssh/openssh-7.7_p1-r7.ebuild
+++ b/net-misc/openssh/openssh-7.7_p1-r9.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
-inherit user flag-o-matic multilib autotools pam systemd versionator
+inherit user flag-o-matic multilib autotools pam systemd
 
 # Make it more portable between straight releases
 # and _p? releases.
@@ -13,7 +13,7 @@ HPN_VER="14v15-gentoo2" HPN_PATCH="${PARCH}-hpnssh${HPN_VER}.patch.xz"
 SCTP_VER="1.1" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
 X509_VER="11.3.1" X509_PATCH="${PARCH}-x509-${X509_VER}.patch.xz"
 
-PATCH_SET="openssh-7.7p1-patches-1.1"
+PATCH_SET="openssh-7.7p1-patches-1.2"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="https://www.openssh.com/"
@@ -26,7 +26,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux skey +ssl static test X X509"
 RESTRICT="!test? ( test )"
@@ -274,6 +274,7 @@ src_configure() {
 		$(use_with ssl openssl)
 		$(use_with ssl md5-passwords)
 		$(use_with ssl ssl-engine)
+		$(use_with !elibc_Cygwin hardening) #659210
 	)
 
 	# stackprotect is broken on musl x86
@@ -366,7 +367,7 @@ src_install() {
 	emake install-nokeys DESTDIR="${D}"
 	fperms 600 /etc/ssh/sshd_config
 	dobin contrib/ssh-copy-id
-	newinitd "${FILESDIR}"/sshd.rc6.5 sshd
+	newinitd "${FILESDIR}"/sshd.initd sshd
 	newconfd "${FILESDIR}"/sshd-r1.confd sshd
 
 	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index a922e18ee3d6..cde680707b89 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,5 +1,7 @@
 DIST owncloudclient-2.4.1.tar.xz 15403164 BLAKE2B 0ab1ffbe2179fe04efc7977972d5941a32bc20cd73e310fa72e2a3cf341f7223911fd430f4d34f7e265819acb68d8576e2687a7bfe4ab7140b4c9e9381ea863b SHA512 5b0ceea299078efbc92c1abe22210a93df44bf98094bf4cf8a0c5138f0b69a6719fdc88ef2d5674d49c0ec18ffb12493319eb84616c3e4b8666171cb1a52f0b7
 DIST owncloudclient-2.4.2.tar.xz 15409188 BLAKE2B 89ae891479f29c8637843e14e3aa58d91769393dcfedcfaa415a601962eabd4d1760250fa57166fde215e5c0c5b5799b72dc4f1b52814e59149b778d92d5eb93 SHA512 17f857354b270ecde75cae81557adb78dab830589b32df0b3cf96667010f02501d793609cddf57223d1dd3d9cdb493f1f55bcb04a09d05c467afaddfeb2210b0
+DIST owncloudclient-2.4.3.tar.xz 15406724 BLAKE2B 1e8790f9ebb96ba7de5350c3f7be01f6e0a06e66de591b598795c2ea6787d0caf238daae4f56fad5a8695b8c4eeeea62e36b469fecfdc2df7a90f110a7c7a1c8 SHA512 072fafe69a962f3f0892706f8fff9a9af643b479229dc99e95c712071f11942f75ecc08e7a3470a9ac49f0564da23f8fb21097064c9fa8c6ba1c830c32a6c01f
 EBUILD owncloud-client-2.4.1.ebuild 1977 BLAKE2B ce1731892cab01d405f6ed07d94cbaf567b85c8bb94b0d49b6eedd158a0721efb821a3f4fa2385b3c5f500d5755c29bbc2b6dbb92d0bb7d65996bb5afad150c0 SHA512 74259af9e1679515592c929687a92dcbde906da7d14c4d6bf5949bfb7d38acb60827e9705b11d1cf37380794bf47976390b862cf457c3df5f33c10da50a86af2
 EBUILD owncloud-client-2.4.2.ebuild 1977 BLAKE2B ce1731892cab01d405f6ed07d94cbaf567b85c8bb94b0d49b6eedd158a0721efb821a3f4fa2385b3c5f500d5755c29bbc2b6dbb92d0bb7d65996bb5afad150c0 SHA512 74259af9e1679515592c929687a92dcbde906da7d14c4d6bf5949bfb7d38acb60827e9705b11d1cf37380794bf47976390b862cf457c3df5f33c10da50a86af2
+EBUILD owncloud-client-2.4.3.ebuild 1964 BLAKE2B 5f76eaf7e9a235a59ef092b870dba42de326def85549ebacfe9e903f5f192c8ec82ce5f19a3d349b2017a8b2f36f47209fb45b203933ca92bbf220fef9f68520 SHA512 731ec31418bc8ab853fb2015baee798ae9473500c0aecd0078526a9e4fbb8450f623e19e6f465cf3c02c4fbe2832d41c12a41dd4764ad98b0e42b4fc8ec36b9f
 MISC metadata.xml 508 BLAKE2B cbba1d7edcfe92d38f2f0d959695cac4f2c1eef8949e9816a995b18432a5c372185094cfa2548787ee63d58175b2110792f5e51688bc456c6376d86a7e8d9864 SHA512 1e757d6db30a7d5d90f317325fa96a1bdf46029e79846d17637f699d07ffa9f489f2d66855c647896a7b932e545b91242cc9df1dbb4bcce83e266c13c8fcf6c1
diff --git a/net-misc/owncloud-client/owncloud-client-2.4.3.ebuild b/net-misc/owncloud-client/owncloud-client-2.4.3.ebuild
new file mode 100644
index 000000000000..e777bb2702aa
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-2.4.3.ebuild
@@ -0,0 +1,91 @@
+# 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 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}
+	!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
+
+	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/qtm/Manifest b/net-misc/qtm/Manifest
index 2661989806ad..3351cad8e058 100644
--- a/net-misc/qtm/Manifest
+++ b/net-misc/qtm/Manifest
@@ -1,3 +1,6 @@
+AUX qtm-1.3.19-qt-5.11.patch 757 BLAKE2B f0bc6f3858e7864efa343193d8519a1e83444e69e4532219077f5d3e852bbd4d0bf979023fadbb53d817d41e1632244baf9232434f8b274dcb6d0eec06070ec3 SHA512 c4e886726686ea2fbf785aaaafd1238affbe778f20a0b11cea98360570f52c421a6942b03f27fe57bc08894a93c92427920509a1efac8b23d502464b353e6df0
 DIST qtm-1.3.18.tar.bz2 186137 BLAKE2B b405bc922246d5c8fe65fc68250b3eb401be3b17dd55cc81bfa70d6ddd72280398df25c850b2d71cc4383b9463e3aff6d641ce4080c100d10ae79f9002793055 SHA512 d4685f22a883e1d7513dcac57a807b0d21c26dfceda547b22889ee980758de1a49c2e898c745bb597efd709823d96da59f7494015c0915edb34e9141fa60e2ca
+DIST qtm-1.3.19.tar.bz2 191559 BLAKE2B e193e75771f04b7ecf772a55305c5a0b923449570933c76716235912223417e1340462893b5c566a22c3d6689eb2fc66b7b41aa3148afcbbc4db65abfcc06545 SHA512 a56a5c1d6098213637806a8a8c3889bbfbd11cb5b1d568520197c6c21e51d99f95975359c18f63961aba945b58a5ce3abf3ff85f552a555b91965414934f9565
 EBUILD qtm-1.3.18-r1.ebuild 1067 BLAKE2B 17f2d02385d6b3eadf1feef09dea8e882ca1a7a3a24acdecdfacbc97edf088640b2b70bd23d229615a5df0d75f2d126a0568e03feef0374068f7cfbdf59c7e0f SHA512 a41516a90aa8e5c692bce38e2101c3f0c4ae58aa06b8286aed98a22e83b708cd8022daa4a24f68a93000e855b693281cbf9df1f5931e1e86ee617ecc6e0726df
+EBUILD qtm-1.3.19.ebuild 1112 BLAKE2B ff156e4af9dd3c8492287bf7d6110227605f13507f9fc2a7ba94de9399b2ef9ae80928f95f5b735ae8db9c75c155042764d74dd7df6f708cbe2efd823c303b4e SHA512 001f4de05b04f4578f07948fa9dbd6eef7053c7719c18a574d5459242df5774673aea3a209de6bfc337360dcdcaa63a378532842be58a19a3f31fb5286cb0e1c
 MISC metadata.xml 382 BLAKE2B f06322dd6521d5ca81b3b9f409189f4c0a4e1e1e31dc04a8b5ec03c0b265fe947a377437e75cc906de5f9b8fb1783abd176fa812c5d193663febefe88699f22e SHA512 009632d82fedc2deb9796dba8a2de9910afd0b67617f5c1d9ecd14fc641f61839812815197089dc186a201a8848de3706d56802f12f33f22a3badad2cd99420f
diff --git a/net-misc/qtm/files/qtm-1.3.19-qt-5.11.patch b/net-misc/qtm/files/qtm-1.3.19-qt-5.11.patch
new file mode 100644
index 000000000000..76bf75e11283
--- /dev/null
+++ b/net-misc/qtm/files/qtm-1.3.19-qt-5.11.patch
@@ -0,0 +1,23 @@
+Fixes build error due to internal header cleanup in Qt 5.11.
+Gentoo-bug: https://bugs.gentoo.org/662480
+
+--- a/AccountsDialog.cc	2017-06-12 12:27:59.964042017 +0200
++++ b/AccountsDialog.cc	2018-08-17 23:51:40.559225179 +0200
+@@ -21,6 +21,7 @@
+  *************************************************************************************************/
+ 
+ 
++#include <QAction>
+ #include <QWidget>
+ #include <QDialog>
+ #include <QListWidget>
+--- a/QuickpostTemplateDialog.cc	2017-06-12 12:28:00.244038449 +0200
++++ b/QuickpostTemplateDialog.cc	2018-08-17 23:55:11.793673907 +0200
+@@ -20,6 +20,7 @@
+  *****************************************************************************/
+ 
+ 
++#include <QAction>
+ #include <QWidget>
+ #include <QDialog>
+ #include <QListWidget>
diff --git a/net-misc/qtm/qtm-1.3.19.ebuild b/net-misc/qtm/qtm-1.3.19.ebuild
new file mode 100644
index 000000000000..94d9740b4632
--- /dev/null
+++ b/net-misc/qtm/qtm-1.3.19.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# CMAKE_IN_SOURCE_BUILD="1"
+inherit cmake-utils eapi7-ver
+
+DESCRIPTION="Qt blogging client"
+HOMEPAGE="http://qtm.blogistan.co.uk"
+SRC_URI="https://bitbucket.org/IndigoJo/${PN}-$(ver_cut 1-2)/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus debug"
+RESTRICT="strip"
+
+RDEPEND="dev-lang/perl
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	virtual/perl-Digest-MD5
+	dbus? ( dev-qt/qtdbus:5 )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	virtual/pkgconfig"
+
+DOCS=( Changelog README )
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) # TODO: upstream
+
+src_prepare() {
+	# bug 463810
+	sed -i -e '/Categories/s/Application;//' qtm-desktop.sh || die 'sed on qtm-desktop.sh failed'
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQt5=ON
+		-DDONT_USE_PTE=OFF
+		-DINSTALL_MARKDOWN=ON
+		-DNO_SSL=OFF
+		-DUSE_DBUS=$(usex dbus)
+		-DDONT_USE_DBUS=$(usex !dbus)
+		-DQDEBUG=$(usex debug)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index e660a0e49519..130cec8bb6f0 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -1,8 +1,11 @@
-AUX rdesktop-1.6.0-sound_configure.patch 799 BLAKE2B 73afd08044230d613f137f43ec13561db630ea601cbd6cdb60fbd823bb77174978ea37e8f5a6eae0d86b53c76aca4ef2a926297c1753c70d37ad5aa356669b5c SHA512 d2f5cf974b042ca752fc5f114c7f3c87647cbf757c986bf163b183b19a1072942c413827331f74847f4cd5b3aa1d91a0a1f609fca8440ff0dd791a44ab74b888
+AUX rdesktop-1.6.0-sound_configure.patch 818 BLAKE2B 131a59e1e403982d269acf9e0ebd8a82f4bfa030594e919d920f9ac081dc82acb75a2e4a76f520516efbfeca24c14ef15fe853c13a62f7db7776e05a700a11cd SHA512 78012c0ad279b870e3a550cd13afd5dc02f8e3af7708090aa6bd3c9892c9a6914f343e51787d9546f1416b45a17c57d2f643dd04a5dda479e22889d55a800a96
 AUX rdesktop-1.7.0-libao_crash.patch 494 BLAKE2B 57c5dcf40c15173942db524717819d3185d7d57c0205027dbf95e191a87d01d5d6ec05176494441f73d3b49e05fb8daa2a610b7902ab08ebbff0fd5507d6a4cd SHA512 65477259452d78cadfe73679b70a7fde2486d2ec3dcacc3248174dc5869a62f7de97b9823801ce8c98dd956c2f92032076691b2f8820b05cbcd52fca4605f8ce
-AUX rdesktop-1.8.3-xrandr_configure.patch 647 BLAKE2B 2f5f950771f510352c6af83126addb0135a6d59e5d73999d1095ce4e2923bdd7fcc3e4d43aa71654f73478bae2fab5369c9b5640a1f345462be7fd173ce4c8d7 SHA512 a0ef25458c2468b472a606e12502c1867cb06cb69f10e077f774396cd17f80af51ee2748385b203b63fb11280f8849cd70cc9d87dcc0ed2165e10597eb92cfa3
+AUX rdesktop-1.8.3-no_strip.patch 428 BLAKE2B 86249bbebd944fc5d3f8e79978f712ab3633b199ce907017656c79a3be4a5e85cdc76b5e11d49cd6fa83c248c34244177eecc7d1e5bbcc4456044765ba34f16c SHA512 bdf1c4e89f14cc87cf5acc657b5998947c37e3e3103254a3dd4dea0a544f61d9e1b421bddaecca339d993dcd367ef836c328f6782152072fb755aba1662bff03
+AUX rdesktop-1.8.3-openssl-1.1.patch 3643 BLAKE2B 986f8af19dcd2613d1b45a66060096bed3913ea20aff61a2c0b2f3f2ccee5cad97f054b90128488a2dcf8a997b7b107eca0923714a5f769de040946d880144e5 SHA512 b525aeced7971d77120ad7da166b5fcb491436b8716e140d22df39e2a036ed837f7d2a3623958208d7f1c027ffca9cd7237746ef9e01c10edee24320022a3b41
+AUX rdesktop-1.8.3-xrandr_configure.patch 666 BLAKE2B 1d2b0b57069b4e8a4eeed2d3d81628ebd9f4770bf70c3e88a123d636778240de37cec9c7fa6e5131fc9e019b9d7d6e22b5c8dbd39059ffe1b121c8c800777111 SHA512 f887b2499f71992501485061b047905dbd38445fc45a24e65f5b7e22b83aa14a80b339346ecfc5c185f5fd77e15daeeb5361f009ef02a2858f55cd1a34c56c3d
 DIST rdesktop-1.8.3.tar.gz 320212 BLAKE2B daca0b78a8fcd0461f1c3251135bd980aaafacf8e0cd51ab731b576adb23006ec9f51858586e7e3a1a7f192b7830308e585984b4a31fb013748f8c6b3a8c47bb SHA512 06b94ad3b09430b05e424ef31a3e6f2388190b4920e348603cb66a414244896e0dc8906b9f12920e9406cf153ffa7f6507b23bf6713c3a675c0540a8ef57902d
 EBUILD rdesktop-1.8.3-r1.ebuild 1854 BLAKE2B 6836ceeb60e7342292eba2c8d007841011e9c299902478240154e5bf608455008b92d14452c5227f2177e50ef8fb6f9235057a801690c2526459da58aec47b0f SHA512 4c70505726e22fba07d333ccea0bdf6a8364d04bded7df577839f1300d585f490f0774ac3810fad0cd39b3410d76d199439eb600700c48f4d5878a08036800c7
 EBUILD rdesktop-1.8.3-r2.ebuild 1907 BLAKE2B 3636154af2f39d9c2c8cb34e05a5d6f8d7b9c86af15691d954e741f313409a41927ffb1d504e812fad576a8c9a0e3565998435ad107f7ae8a5e53a3ea0c52e99 SHA512 599d6900a1fd58c137abcba8e9c3651e8937b9414d63377bd29291367b9586ae7d71ec95c2261c35a4a78bc5d6895df78f9e63da9392f549f71c8d0d6b93fea2
+EBUILD rdesktop-1.8.3-r3.ebuild 1736 BLAKE2B f755cf95c78453d0836f1774673176edeb529f09726eb41c5142903993c1328b896e0b2ce0196f2020a5a0fcde31b6daccaca5e3c884448d217b84c4065362e7 SHA512 b041f5cf5cdfdbe4cc6eb678cf0d51d1ff0baa7fccd51034d347524a45364c26e387796fdd66be16092d4800c3cd4cd03c659871053a217ae298bbf29b6563e8
 EBUILD rdesktop-1.8.3.ebuild 1814 BLAKE2B 650a04a637c6a34d9e1bd2e3986e2ebc1ca481171a15bfe9826bd7a37914946291460290c68458dfb108b3a5f95420fd189a3282cbdabe5e0f7bfae683be6e2f SHA512 fb0ae6e70dd092e8e27499e9dab31a3c0bb86085e1c7a2b0f6e8b225c02ce09570f7b87a603dd8a23f3b473ad04917c38f3213cba2c0a55afa439c80707534a9
 MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea
diff --git a/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch b/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch
index 8e64ba8b48cb..b2f492b10716 100644
--- a/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch
+++ b/net-misc/rdesktop/files/rdesktop-1.6.0-sound_configure.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig	2009-06-30 10:35:14.000000000 +0200
-+++ configure.ac	2009-06-30 11:35:10.000000000 +0200
+--- rdesktop.orig/configure.ac	2009-06-30 10:35:14.000000000 +0200
++++ rdesktop/configure.ac		2009-06-30 11:35:10.000000000 +0200
 @@ -228,7 +228,11 @@
  if test -n "$PKG_CONFIG"; then
      PKG_CHECK_MODULES(LIBAO, ao, [HAVE_LIBAO=1], [HAVE_LIBAO=0])
diff --git a/net-misc/rdesktop/files/rdesktop-1.8.3-no_strip.patch b/net-misc/rdesktop/files/rdesktop-1.8.3-no_strip.patch
new file mode 100644
index 000000000000..018ceeedacfa
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.8.3-no_strip.patch
@@ -0,0 +1,12 @@
+diff -Naur rdesktop-1.8.3.orig/Makefile.in rdesktop-1.8.3/Makefile.in
+--- rdesktop-1.8.3.orig/Makefile.in	2013-01-21 13:28:14.000000000 +0100
++++ rdesktop-1.8.3/Makefile.in	2018-08-20 18:05:38.401218002 +0200
+@@ -60,7 +60,7 @@
+ installbin: rdesktop
+ 	mkdir -p $(DESTDIR)$(bindir)
+ 	$(INSTALL) rdesktop $(DESTDIR)$(bindir)
+-	$(STRIP) $(DESTDIR)$(bindir)/rdesktop
++	
+ 	chmod 755 $(DESTDIR)$(bindir)/rdesktop
+ 
+ .PHONY: installman
diff --git a/net-misc/rdesktop/files/rdesktop-1.8.3-openssl-1.1.patch b/net-misc/rdesktop/files/rdesktop-1.8.3-openssl-1.1.patch
new file mode 100644
index 000000000000..c74bd48c5aa0
--- /dev/null
+++ b/net-misc/rdesktop/files/rdesktop-1.8.3-openssl-1.1.patch
@@ -0,0 +1,125 @@
+From bd6aa6acddf0ba640a49834807872f4cc0d0a773 Mon Sep 17 00:00:00 2001
+From: Jani Hakala <jjhakala@gmail.com>
+Date: Thu, 16 Jun 2016 14:28:15 +0300
+Subject: [PATCH] Fix OpenSSL 1.1 compability issues
+
+Some data types have been made opaque in OpenSSL version 1.1 so
+stack allocation and accessing struct fields directly does not work.
+---
+ ssl.c | 65 ++++++++++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 40 insertions(+), 25 deletions(-)
+
+diff --git a/ssl.c b/ssl.c
+index 48751255..032e9b9e 100644
+--- a/ssl.c
++++ b/ssl.c
+@@ -88,7 +88,7 @@ rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 *
+ 		  uint8 * exponent)
+ {
+ 	BN_CTX *ctx;
+-	BIGNUM mod, exp, x, y;
++	BIGNUM *mod, *exp, *x, *y;
+ 	uint8 inr[SEC_MAX_MODULUS_SIZE];
+ 	int outlen;
+ 
+@@ -98,24 +98,24 @@ rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 *
+ 	reverse(inr, len);
+ 
+ 	ctx = BN_CTX_new();
+-	BN_init(&mod);
+-	BN_init(&exp);
+-	BN_init(&x);
+-	BN_init(&y);
+-
+-	BN_bin2bn(modulus, modulus_size, &mod);
+-	BN_bin2bn(exponent, SEC_EXPONENT_SIZE, &exp);
+-	BN_bin2bn(inr, len, &x);
+-	BN_mod_exp(&y, &x, &exp, &mod, ctx);
+-	outlen = BN_bn2bin(&y, out);
++	mod = BN_new();
++	exp = BN_new();
++	x = BN_new();
++	y = BN_new();
++
++	BN_bin2bn(modulus, modulus_size, mod);
++	BN_bin2bn(exponent, SEC_EXPONENT_SIZE, exp);
++	BN_bin2bn(inr, len, x);
++	BN_mod_exp(y, x, exp, mod, ctx);
++	outlen = BN_bn2bin(y, out);
+ 	reverse(out, outlen);
+ 	if (outlen < (int) modulus_size)
+ 		memset(out + outlen, 0, modulus_size - outlen);
+ 
+-	BN_free(&y);
+-	BN_clear_free(&x);
+-	BN_free(&exp);
+-	BN_free(&mod);
++	BN_free(y);
++	BN_clear_free(x);
++	BN_free(exp);
++	BN_free(mod);
+ 	BN_CTX_free(ctx);
+ }
+ 
+@@ -146,12 +146,20 @@ rdssl_cert_to_rkey(RDSSL_CERT * cert, uint32 * key_len)
+ 
+ 	   Kudos to Richard Levitte for the following (. intiutive .) 
+ 	   lines of code that resets the OID and let's us extract the key. */
+-	nid = OBJ_obj2nid(cert->cert_info->key->algor->algorithm);
++
++	X509_PUBKEY *key = NULL;
++	X509_ALGOR *algor = NULL;
++
++	key = X509_get_X509_PUBKEY(cert);
++	algor = X509_PUBKEY_get0_param(NULL, NULL, 0, &algor, key);
++
++	nid = OBJ_obj2nid(algor->algorithm);
++
+ 	if ((nid == NID_md5WithRSAEncryption) || (nid == NID_shaWithRSAEncryption))
+ 	{
+ 		DEBUG_RDP5(("Re-setting algorithm type to RSA in server certificate\n"));
+-		ASN1_OBJECT_free(cert->cert_info->key->algor->algorithm);
+-		cert->cert_info->key->algor->algorithm = OBJ_nid2obj(NID_rsaEncryption);
++		X509_PUBKEY_set0_param(key, OBJ_nid2obj(NID_rsaEncryption),
++				       0, NULL, NULL, 0);
+ 	}
+ 	epk = X509_get_pubkey(cert);
+ 	if (NULL == epk)
+@@ -201,14 +209,24 @@ rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len,
+ {
+ 	int len;
+ 
+-	if ((BN_num_bytes(rkey->e) > (int) max_exp_len) ||
+-	    (BN_num_bytes(rkey->n) > (int) max_mod_len))
++	BIGNUM *e = NULL;
++	BIGNUM *n = NULL;
++
++#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
++	e = rkey->e;
++	n = rkey->n;
++#else
++	RSA_get0_key(rkey, &e, &n, NULL);
++#endif
++
++	if ((BN_num_bytes(e) > (int) max_exp_len) ||
++	    (BN_num_bytes(n) > (int) max_mod_len))
+ 	{
+ 		return 1;
+ 	}
+-	len = BN_bn2bin(rkey->e, exponent);
++	len = BN_bn2bin(e, exponent);
+ 	reverse(exponent, len);
+-	len = BN_bn2bin(rkey->n, modulus);
++	len = BN_bn2bin(n, modulus);
+ 	reverse(modulus, len);
+ 	return 0;
+ }
+@@ -229,8 +247,5 @@ void
+ rdssl_hmac_md5(const void *key, int key_len, const unsigned char *msg, int msg_len,
+ 	       unsigned char *md)
+ {
+-	HMAC_CTX ctx;
+-	HMAC_CTX_init(&ctx);
+ 	HMAC(EVP_md5(), key, key_len, msg, msg_len, md, NULL);
+-	HMAC_CTX_cleanup(&ctx);
+ }
diff --git a/net-misc/rdesktop/files/rdesktop-1.8.3-xrandr_configure.patch b/net-misc/rdesktop/files/rdesktop-1.8.3-xrandr_configure.patch
index f57a86b4315b..fea0b975260f 100644
--- a/net-misc/rdesktop/files/rdesktop-1.8.3-xrandr_configure.patch
+++ b/net-misc/rdesktop/files/rdesktop-1.8.3-xrandr_configure.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig	2015-09-14 11:27:54.974472081 +0200
-+++ configure.ac	2015-09-14 11:34:37.729155044 +0200
+--- rdesktop.orig/configure.ac	2015-09-14 11:27:54.974472081 +0200
++++ rdesktop/configure.ac		2015-09-14 11:34:37.729155044 +0200
 @@ -151,9 +151,12 @@
  AC_SUBST(CREDSSPOBJ)
  
diff --git a/net-misc/rdesktop/rdesktop-1.8.3-r3.ebuild b/net-misc/rdesktop/rdesktop-1.8.3-r3.ebuild
new file mode 100644
index 000000000000..d8c5ec13872b
--- /dev/null
+++ b/net-misc/rdesktop/rdesktop-1.8.3-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A Remote Desktop Protocol Client"
+HOMEPAGE="http://rdesktop.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.6 )
+	kerberos? ( net-libs/libgssglue )
+	libsamplerate? ( media-libs/libsamplerate )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
+	xrandr? ( x11-libs/libXrandr )"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+BDEPEND=virtual/pkgconfig
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
+	"${FILESDIR}"/${P}-no_strip.patch
+	"${FILESDIR}"/${P}-xrandr_configure.patch
+	"${FILESDIR}"/${P}-openssl-1.1.patch
+)
+
+DOCS=( doc/HACKING doc/TODO doc/keymapping.txt )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use ao; then
+		sound_conf=$(use_with ao sound libao)
+	else if use alsa; then
+			sound_conf=$(use_with alsa sound alsa)
+		else
+			sound_conf=$(use_with oss sound oss)
+		fi
+	fi
+
+	econf \
+		--with-openssl="${EPREFIX}"/usr \
+		$(use_with debug) \
+		$(use_with ipv6) \
+		$(use_with libsamplerate) \
+		$(use_with xrandr) \
+		$(use_enable kerberos credssp) \
+		$(use_enable pcsc-lite smartcard) \
+		${sound_conf}
+}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index d9480cb8f923..16954b655162 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,5 +1,7 @@
 DIST Remmina-1.2.31.2.tar.gz 1247378 BLAKE2B 923b131ea2b4cff57d952bcfc2cdac58ad849ce3220dc6e3084b3905f9fe1203443fe0bb2f8a3fa910e7f367299b1b8c1b2373e8b337da7c4ff99ced1951492b SHA512 e66bd77e3b3e8374773e6029a727d814ada09b90a5620452e8ecce19e6f4327aa2e50b8956b292abce2e9329deec79370665a6a6aecbc2d33557381ce5b8db3b
+DIST Remmina-v1.2.31.3.tar.gz 1248295 BLAKE2B da748ceea5aa50702b060075c8e5c4aefe11ca1ebbc301b2951df76208da5998746631ef4c57f5692678e948839a8869a183b777f7046d416a55e5ac5b0d76d1 SHA512 f95c4dcebd833b590fbf0b418854bae66541743bc77cda4b0b97e1e49b158927fa859907619fd532b0660fc30eee80be472e02c38a2afe33e477c4a903a99e28
 DIST remmina-1.2.0_rc24.tar.gz 1052140 BLAKE2B 57b3d2ed8a765f98f1ffd3c79df076d07e00329bf95dfddb9094d8bc62838b0f6742b404b4deef0a037bd88259751799e1842fb97313337e11b8f0faed8ad302 SHA512 aab421c580e434ca673be063f3662f1d9128cc83aaee6f9bc6acf6996af0379af6fb99cc63273941c40c6b989653b972de6c43b575ca06bf56ec7c266590c17e
 EBUILD remmina-1.2.0_rc24.ebuild 2035 BLAKE2B 7490ba779c88bf0caf7f1de2398dec1484acf428f3f1ddd06b021965d3ef255927d9637e24c56a71a3737707ef6a2df0257dc1a486c60e665e99721aaa5c1092 SHA512 058740deb4f072b8677fcb5bcedf2c870dccf748c166594cdf24cc09574b1fd1b8fb0157b89c82e43bd3dabcc892e72f561ed4db816ea269c40b2da9b73ce3cf
 EBUILD remmina-1.2.31.2.ebuild 2223 BLAKE2B 475810adc6d4769e4ffe6e3763b5f9539dd110ba33d68f7f2a8c7c6cedfd4d1b95d0a221051a49392b9030f51c03252dc3a28180f4aaf634297612e93bf98050 SHA512 f54b5095ddea11519b03258406b5f36db4afb010020abd9c883028e24690dd36f662d0f8259d3247ee652294dcb04d1a6ac508ce361ee2076148b032fc2d8bca
+EBUILD remmina-1.2.31.3.ebuild 2241 BLAKE2B 63c9742c96d5a6da07651416b84f66f39ab41d8a4c47164ba3abfb110008d0300f1fa419bf5fc6dc5b6fc7e7d54f56ec3290743466e41bbc0ba9a5ba48a9b0c4 SHA512 5f85dbfdd8e7cca66648155a089dd77d683f7b8d7398af394302457b0f16918a025a48e8756bb5fabb895c91f2e916e9a3ee7b7ab5297626a4d4baa127702586
 MISC metadata.xml 1150 BLAKE2B b75ab4d0b30c602c1bdf2d9bb5701444570ea7cc53a97e3a27dde34044ab69f0f550fb2f8ca3d76ff04b0ff0a30164fc20696443896f3f732c4ce589a4a57b0d SHA512 9ed39584a65811d52192ff8390d02c3630f88a213c998e7990acf74f1aa26cb2abb54f4f75eb01cfe88b1986756eb9d59f2362e1ccfacc9e81c99e044a739809
diff --git a/net-misc/remmina/remmina-1.2.31.3.ebuild b/net-misc/remmina/remmina-1.2.31.3.ebuild
new file mode 100644
index 000000000000..53a4922379f8
--- /dev/null
+++ b/net-misc/remmina/remmina-1.2.31.3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils gnome2-utils xdg-utils
+
+MY_P="${PN^}-v${PV}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana crypt examples gnome-keyring libressl nls spice ssh rdp telepathy vnc zeroconf"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	net-libs/libsoup
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	ayatana? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc2 )
+	gnome-keyring? ( app-crypt/libsecret )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	vnc? ( net-libs/libvncserver )
+	zeroconf? ( net-dns/avahi[gtk3] )
+"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${CDEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex ayatana)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_EXAMPLES=$(usex examples)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_AVAHI=$(usex zeroconf)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 8827d7ce8f43..223838feb532 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -2,7 +2,9 @@ AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4
 AUX spice-gtk-0.34-libressl.patch 1539 BLAKE2B ff7826221a8e551999004c818be806bed8a254d7447d9233012b566941307b117789f73c32887a1d713fe7352a5dac26dfa0eaf67eeadf32283dc46b5f3c18eb SHA512 243ce8cfce2d5fd26b5dc8f5da985b0cf9e95290cb82336439d015352479018075408092425dbac5cabf815f1be95e85680058d9dc1900e992d37c2a04fb85d2
 AUX spice-gtk-0.34-openssl11.patch 518 BLAKE2B d9c692996f64ccfb61f16f2c8b620559d1321f35c74072c3e0c51a115f7d40039b7c6dd484cf3beec90c8950df5fbb42575ab62e3c309da3405b5217864b746b SHA512 f879a3f26be439a68e1f40e32e654eea301efc9f5494039b7166673337688f0832e180ab77863cde55627ee033572caf04d5bb08816d4272382d9dccf43ef7f1
 DIST spice-gtk-0.34.tar.bz2 1480566 BLAKE2B 35350cf930d091fa11df1d573f9eff23696745a20e88fcd20783c108b6ddca9064bc4e75d414f23bd94318e37d509e581866c5dcc955cd21ca7c9384b492f0ec SHA512 17ea737511855b47f5eaf5143756483542cf8ee83f8d276cbfb2c0407355f68ed329fcbed8a67737179f3e53587710634d6faa856590234ee68be7b4b13f2689
+DIST spice-gtk-0.35.tar.bz2 1437231 BLAKE2B f2731a794cf22b491bf858fff44506288af730b37f1c37e16ac3042d662373b4e4021808d5ca72440012fb36a5119ad11858cb8cf872b04376518487faebef49 SHA512 f0914a4a9baf892e39dab7d51aa9f5ab4dbb4ef01f09da158b20756f890745837d0a6c8c1f7897844e695be2ed01f3b1d04ada1cacc958b5cfadb0d4bf7c4729
 EBUILD spice-gtk-0.34-r2.ebuild 3752 BLAKE2B e27f8a92b0284f6fa2296f0a5f7cb38d01eec7e7502e6730186094835d9ce3b397f002206a976a861ef9e2ef904b8256d696c6e46783c30875b16781df597875 SHA512 1c756aa20ca07af0bf3796b7e42bf76337a15ac3d5aa794eee24649ff9f503e014e7bfc8ac815b6117f5ceca3c2f8461af94cdb89b8119217ab21dff78bd7b1c
 EBUILD spice-gtk-0.34-r3.ebuild 3838 BLAKE2B 6a3789e5ec78191addbda947d680fe0adf97970c7a2b47f0b9f015e29d1b9c159f23820a025149dc78df56d0d2c46480a27e53651891413a53b7022d78477b10 SHA512 8f9de4514153f47b1c26fd586dd4cd56a9c68140892d194950fa510755ae2f979ccc75d9e4a696a57ccafa0108464e758fb93216cc8f940debb47d7f0c8623d9
+EBUILD spice-gtk-0.35.ebuild 3809 BLAKE2B fffcc99ca1a4a6084fd296bfab2f101fa9924e80fc52dac5ff6f20ac8b3031af51f218e013c9bc4dabaf60c510799feafbfe5baef91947e05a236b431e79a56a SHA512 b35b3eee0f14e0dc7ca9c6b41e3ec989eff48d84074a1aa6cbc1d85339970c1621c223a6f3f0519a6f8c2a7ee88f1bdfc2f412229a4a72cd72442d27a1131f5b
 EBUILD spice-gtk-9999.ebuild 3693 BLAKE2B a85fb7bd44fa36252f13c6d5a25fba4eb213e41a0c5b6d77c2bdbfe4e250981970f42c359175d1de41d81feb86e59ce6e524304eb8e3d8111181f1ec36f2e848 SHA512 3dc59d0315a6e4786a9af9d662647dfc056ce4ab4d2f57c1e308f767e19cd49a769b4fbbc9c8bb985f8b873569641f95e7099719df7fea02c894ecb00d4c882d
 MISC metadata.xml 1166 BLAKE2B 37cf826a7a49dc48170fb99e05b191964810eacbf8b13db383a37e70faed6a2b4b70acfd724eeffbbe10d97fab27bfec7d56cfb2cbc2537ac4df7612afdbe8d2 SHA512 5229ddeaf19765abee5b0120b066ac2049f77878b1b8886e2b552f2c56d6049df297b227f0bee36bbe6be7041b9d8e1c1d3d868c34b1e39b49a5c0bc16b2c947
diff --git a/net-misc/spice-gtk/spice-gtk-0.35.ebuild b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
new file mode 100644
index 000000000000..336cd853c148
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools eutils xdg-utils vala readme.gentoo-r1
+
+DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
+HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dbus gstaudio gstvideo +gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
+
+REQUIRED_USE="?? ( pulseaudio gstaudio )"
+
+# TODO:
+# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
+# * use external pnp.ids as soon as that means not pulling in gnome-desktop
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	pulseaudio? ( media-sound/pulseaudio[glib] )
+	gstvideo? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		)
+	gstaudio? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		)
+	>=x11-libs/pixman-0.17.7
+	media-libs/opus
+	gtk3? ( x11-libs/gtk+:3[introspection?] )
+	>=dev-libs/glib-2.36:2
+	>=x11-libs/cairo-1.2
+	virtual/jpeg:0=
+	sys-libs/zlib
+	introspection? ( dev-libs/gobject-introspection )
+	lz4? ( app-arch/lz4 )
+	sasl? ( dev-libs/cyrus-sasl )
+	smartcard? ( app-emulation/qemu[smartcard] )
+	usbredir? (
+		sys-apps/hwids
+		>=sys-apps/usbredir-0.4.2
+		virtual/libusb:1
+		virtual/libgudev:=
+		policykit? (
+			sys-apps/acl
+			>=sys-auth/polkit-0.110-r1
+			!~sys-auth/polkit-0.111 )
+		)
+	webdav? (
+		net-libs/phodav:2.0
+		>=dev-libs/glib-2.43.90:2
+		>=net-libs/libsoup-2.49.91 )
+"
+DEPEND="${RDEPEND}
+	>=app-emulation/spice-protocol-0.12.13
+	dev-perl/Text-CSV
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.34-openssl11.patch
+)
+
+src_prepare() {
+	# bug 558558
+	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
+	echo GIT_CEILING_DIRECTORIES=${GIT_CEILING_DIRECTORIES}
+
+	default
+
+	eautoreconf
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	# Clean up environment, bug #586642
+	xdg_environment_reset
+
+	local myconf
+
+	if use vala ; then
+		# force vala regen for MinGW, etc
+		rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
+	fi
+
+	myconf="
+		$(use_enable static-libs static)
+		$(use_enable introspection)
+		$(use_with sasl)
+		$(use_enable smartcard)
+		$(use_enable usbredir)
+		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids)
+		$(use_with usbredir usb-acl-helper-dir /usr/libexec)
+		$(use_with gtk3 gtk 3.0)
+		$(use_enable policykit polkit)
+		$(use_enable pulseaudio pulse)
+		$(use_enable gstaudio)
+		$(use_enable gstvideo)
+		$(use_enable mjpeg builtin-mjpeg)
+		$(use_enable vala)
+		$(use_enable webdav)
+		$(use_enable dbus)
+		--disable-celt051
+		--disable-gtk-doc
+		--disable-maintainer-mode
+		--disable-werror
+		--enable-pie"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	default
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+
+	# Remove .la files if they're not needed
+	use static-libs || prune_libtool_files
+
+	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
+	readme.gentoo_create_doc
+}
diff --git a/net-misc/tipcutils/Manifest b/net-misc/tipcutils/Manifest
index bd8ae93a10dc..123f5ce03e78 100644
--- a/net-misc/tipcutils/Manifest
+++ b/net-misc/tipcutils/Manifest
@@ -3,4 +3,4 @@ DIST tipcutils-2.0.0.tar.gz 66495 BLAKE2B 2c0116ce8a59ba6dfeec0061109c003c6eb73e
 DIST tipcutils-2.0.3.tar.gz 166337 BLAKE2B 70a06e0f71550123da9b10cc9330e89e2f0722614f00ab93d229baa78f189b3ae03a9aa70722245886e6dee4b9ebf9f95b9ecc06c4c552096afdf54cf28fab0c SHA512 7f07b4729dbd2c0c93cd69ffe6d2d082cd10f8de8bda335555548d14bd6287229da3686d288be3c10024cc6b607e6e4be983716f734f2d049352f924409511ec
 EBUILD tipcutils-2.0.0.ebuild 815 BLAKE2B a641d072a85f4595ab518d8a8c0680b0c1e38601c5e141cc145247ba86a4f4ff3d9fc4478abda87ac8df078aecc7f6dd34a732a982b8513290572c7f80565cfe SHA512 3eaf4ec70c756f43780d2cef705a72ad9722445b294052c753edc99818e1a985b2f0593a92cede845e749d368e9e160154d15aa3bd97a3f03b238238223d02a5
 EBUILD tipcutils-2.0.3.ebuild 449 BLAKE2B 8dd589c389b293bf4c9c79bb5069d5e3a3c1ef2f261808637634072a6d8dcc3bdda71705ff6f0cf5b6a9c310b2b0eca2d4de9e01c7f3f15042a1620e4f966f1c SHA512 6b805810c2ccfdbacfff7015e09956dee32be3ae598f5eaa15ceeadef794cba1b7781eedcc0bd935d0ea86bfa0664eff08de6bf95d7dc1471ebed3adc3acd715
-MISC metadata.xml 411 BLAKE2B 362c56a17075b7f4a077b86f89fad23a64829bc16569cf69f7e5a96b958c671f2cbb5c253258b5eab1b2a0132ac38125d03118e268d25ce95757b1ea7155c0ab SHA512 165dac5c292bacc8205a9fa78a2893cd63474a04ee4de7ffcf19f61acd4865649714d84792a2dd301611c9f63669c03e9fc0e0fade8c0f0a281bab379e706b0b
+MISC metadata.xml 241 BLAKE2B eb3c33457610df6ba6f6698f73504e0ce94c5538fc2432c3b2555b4c8e0f6a1b9d2c54806aba3a5aff5f74c2f62f2b8a4151a6f214282b666041cfaf1fe788b2 SHA512 ff2c5ffaf00fa30dd4ed38f986992dfd88a006a63a07c836efbd00dc682f5ad708c8640007c4e8b7b4aab46a7dbcbfbca501aae31f8c73936b7ca9143fafe4a8
diff --git a/net-misc/tipcutils/metadata.xml b/net-misc/tipcutils/metadata.xml
index 28efbae751da..6d830367c0cd 100644
--- a/net-misc/tipcutils/metadata.xml
+++ b/net-misc/tipcutils/metadata.xml
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tokiclover@gmail.com</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">tipc</remote-id>
 	</upstream>
diff --git a/net-misc/yandex-disk/Manifest b/net-misc/yandex-disk/Manifest
index 7e1e070cb61d..c23a809834ec 100644
--- a/net-misc/yandex-disk/Manifest
+++ b/net-misc/yandex-disk/Manifest
@@ -1,7 +1,4 @@
-DIST yandex-disk-0.1.5.940-1.fedora.i386.rpm 4551033 BLAKE2B 7d989a6aa3c2659bddeedd38cd0e4763548352e270d5ecfeaecf0aa901836dd8a1b4f794f71d2345d0041242773f01a8222e31d9a2ded50bf434dfce1250bbe2 SHA512 40438b9b079c3f1fc9c23794abd320b552f9f77c0f7aa4972fd2de94f60b607bc067a56e00bb35597a505e087ecc6ec7089b90d87695320c685abbf4af735db4
-DIST yandex-disk-0.1.5.940-1.fedora.x86_64.rpm 4349853 BLAKE2B 87982bbcdabfe5e78f81a2f2a2bd8669ab05f217fc716564b2040a584fa76e7244f8c9e5ad01d1f93419dc33b1ea49eaee72e8cc65d84330ef90deac80feeacd SHA512 0e52eb6275a349191b56d89a1e288c7112a8f93c31d4017787ede0a1fd7b69666f8425abb0309500361cbdd56e850e2380f74730d5ace97f1b3e4dd2c5eed6fb
 DIST yandex-disk-0.1.5.978-1.fedora.i386.rpm 4353188 BLAKE2B 5d82bf72cf670754c6889e1b7f4c99c47426fe938f7131381bf06d1bb6d5e98d403d746b336624f958a75839fb0c73982b14ba86d4d3db581286ace31fac48f7 SHA512 59008f42463185fab2aed221b44283e57c279ef7fd0966732dc3b6a3f474104f2ca676d77e7d958f53bff38aac9c0f7ea82b25202fd9da5f0de62bb56a983319
 DIST yandex-disk-0.1.5.978-1.fedora.x86_64.rpm 4534132 BLAKE2B 1e39bf6a9dab9c6d7bf1960214c23a9196347d7d757e014b22cd37a598f479e2576346ad1d38bc8986f7a1b30529db0e0e58b0fc20f51d4abcbdac028759678c SHA512 d4f22bf008767289abf95237aa86ae27b33b99c62ba89381c4ed73a510d8096c169c1c215274133cc7fdf885fb7d629e758cea5925f4afc5acf7b6d688bf0078
-EBUILD yandex-disk-0.1.5.940_p1.ebuild 1026 BLAKE2B f723fd1774e86ee3296e41812ae6bc5a4d012051fab647bdd853d02ac3b4ff7a64ae77d684def2923ead3e9afbf57a5bf45308bade974d56e951dd209f253172 SHA512 1f702cc6ed8d661dab0b66ba974675dd1fd0dda55d69161ce4e1f9a99348e23a2312c0cadcb82b2d3e3439d000949d0717720bff236673950f8046f410431384
-EBUILD yandex-disk-0.1.5.978_p1.ebuild 1028 BLAKE2B 5f8f1560ef642fd501eab422b0a7ec8f287d31396c7730adcc1813cdb943b8eec5c8d5f8649dac3851fcadab914208e58f8b4d0ea6e35607a7542f60826d45b0 SHA512 d8523494f36813060e2cf2db4259d42baafe742876d9c2ae4cf9399eeb1a542930c38558efb23089c21444002fc5cc5a3b5e84b1d908a73723fc6ee9baf9b06f
+EBUILD yandex-disk-0.1.5.978_p1.ebuild 1026 BLAKE2B 0b1ce41863ca7b8604cb9078210124b13075288bd97016d3edd85704418fcbad29f417cf9e82764cd43faa3d5be8059d3b12e6024bccdfdee22a608de979ef48 SHA512 1b1557fc9c954ee30060fe8136a3bbcc8e7e6c0b9e1994e4d386baea6abc55bd3c2080edea315baba2df3078d625c17c6e562067d255a53bc6cd791ba754bd3f
 MISC metadata.xml 359 BLAKE2B f42092316fc9b64d257cbcf253d696471614f6a108d50cde587dd22753cc69209bc9033802856d32b4c9dffac4bc4338acbdaee27602555e218c95b718e7196e SHA512 bfdfbc956a34caec3772c6b094fca9512b87c17e475e3b4d0329368aa2a060efd72d152e3920abb7763ffbb9b5508f6396e9769a8f208ffaab928e984ea99369
diff --git a/net-misc/yandex-disk/yandex-disk-0.1.5.940_p1.ebuild b/net-misc/yandex-disk/yandex-disk-0.1.5.940_p1.ebuild
deleted file mode 100644
index 0ba7ec85dfa9..000000000000
--- a/net-misc/yandex-disk/yandex-disk-0.1.5.940_p1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 eutils rpm
-
-MY_P="${PN}-${PV/_p/-}"
-
-DESCRIPTION="CLI to access Yandex Disk file storage service"
-HOMEPAGE="https://disk.yandex.ru"
-SRC_URI="
-	amd64? ( http://repo.yandex.ru/yandex-disk/rpm/stable/x86_64/${MY_P}.fedora.x86_64.rpm )
-	x86? ( http://repo.yandex.ru/yandex-disk/rpm/stable/i386/${MY_P}.fedora.i386.rpm )
-"
-
-LICENSE="YDSLA"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-
-DEPEND=""
-RDEPEND="sys-libs/zlib"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/bin/yandex-disk"
-
-src_prepare() {
-	# bug #526312
-	sed -i \
-		-e '/have /d' \
-		-e 's/+o nospace/-o nospace/' \
-		-e '/^complete/s/-X //' \
-		etc/bash_completion.d/yandex-disk-completion.bash || die
-
-	eapply_user
-}
-
-src_install() {
-	exeinto /opt/bin
-	doexe usr/bin/yandex-disk
-	newbashcomp etc/bash_completion.d/yandex-disk-completion.bash "${PN}"
-	insinto /usr/share/man
-	doins -r usr/share/man/*
-	insinto /usr/share
-	doins -r usr/share/locale
-}
diff --git a/net-misc/yandex-disk/yandex-disk-0.1.5.978_p1.ebuild b/net-misc/yandex-disk/yandex-disk-0.1.5.978_p1.ebuild
index 7f1a75788731..c2f03cb326ab 100644
--- a/net-misc/yandex-disk/yandex-disk-0.1.5.978_p1.ebuild
+++ b/net-misc/yandex-disk/yandex-disk-0.1.5.978_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="YDSLA"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 
 DEPEND=""
 RDEPEND="sys-libs/zlib"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 787781e81798..db145603d07a 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,8 +1,8 @@
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2018.07.29.tar.gz 3012839 BLAKE2B 9550f03b74db95fe26310348113883763240a187d69f1f859fe516848f6d9647555113d12397b7d30f3b4c7799c930b373825b54f2db05ac72b3be0e6b7efad0 SHA512 a41b97b5dca0715a891ff77d8317939d2b86e495fe2ec1cca6aaea72da545f6cdd6c4cf605c2ebd004a0add049d5fb1ed17b6dab9d99fc349f378e37ff6be330
 DIST youtube-dl-2018.08.04.tar.gz 3015718 BLAKE2B e9b64bfa791fdd854b180f58ed81ceead89b5cd8a1d6f537eca54ff041151504bbd1ea125fbb8be9c5e05abcd9a1064c699211378dd53f67ff3aa653df59da4d SHA512 4a23dd644b039a8bc64d5d55821cc5470a29b3ce2c5ccea9eb2aa6ba753d675363e14b9ba959f6b0dfc62a97898032225c21eb4993fd742b273259d89ba99cba
+DIST youtube-dl-2018.08.22.tar.gz 3025389 BLAKE2B e8d2d8bccab8c169d08de35544e5efb05c65799c26894807e075edfe090d36de30fea787f54d59e4fc8b671356ce2e1d9002627948fb05becc9d2e3bc634164c SHA512 ef17c744ac27b3bf547124f18a155908a66ee75f3f6fb5d7dd8a1d8da61a5a598bbade6cf0362e8c93c337dcf47750db5f56357919226430f02d0b764011ffb5
 EBUILD youtube-dl-2017.11.15.ebuild 2376 BLAKE2B 184105b328f74b20fbb61357b33aeff4b3d4a984179398c9ebbd67a3973a0e0730b98e3414e52d7cf89c7bb15340491d110dc0480b033d4c49714c0cd3ff387c SHA512 baefa087e59c737053e923f7a384ab22ba727f3b9ffd02fad2d80d0fea957babe2ca40f19889eabbf4237416df9cdacfe4b5df2b106a3a7dd4fe1aed9c62a49f
-EBUILD youtube-dl-2018.07.29-r1.ebuild 3312 BLAKE2B 98cedcc93b25d20e32cd550f48f2347f114b7cb34e0317f5dab3cdd26abe08ee875424f6f226f3c53df6ec6a4a88579c561301a3da07b4e25e6423056d0b0f8d SHA512 a43df4e5d3c563bc7ae67728b765387f62b090db24a96bf367f045ed0011db3e24f71014feaaff014b23db06c74cafee816594f2c6090825481346e31e7e7a0f
-EBUILD youtube-dl-2018.08.04.ebuild 3312 BLAKE2B 98cedcc93b25d20e32cd550f48f2347f114b7cb34e0317f5dab3cdd26abe08ee875424f6f226f3c53df6ec6a4a88579c561301a3da07b4e25e6423056d0b0f8d SHA512 a43df4e5d3c563bc7ae67728b765387f62b090db24a96bf367f045ed0011db3e24f71014feaaff014b23db06c74cafee816594f2c6090825481346e31e7e7a0f
-EBUILD youtube-dl-99999999.ebuild 3168 BLAKE2B 2b6c54cc0441d82b300163338ee9f8d61afa8d0418fc860bec168c5a9eb156a4c2e31fda632ff5e69943aaaf98c6d8de49b4d9a38e75020e264b5a3ea3f2b0cf SHA512 23a01cefa9229f12b67c2d01f5a0abf5e463da6bd1dc3affc40ee9aa2305d0f7ff18d2b7de069da5be4fcbed4cbb4a7a26c65e0a60728e2432b3a53ac3d0ce5c
+EBUILD youtube-dl-2018.08.04-r1.ebuild 3300 BLAKE2B 11407c2650d8273cc61e3497ca7babd4b03a7fcb2484cf1b78393c652d415df53c8c67dd6f958901e1477283da8d02996ea46a9cfed467fc2f345170d93526f3 SHA512 40ff5c705776b30a996a93557daaa69a161f21851190c0e2cf621576b96de37eff72e4dfc9029b5fa46814833909618257db7936aebdda9cc0cd24ff6258cb30
+EBUILD youtube-dl-2018.08.22.ebuild 3300 BLAKE2B 11407c2650d8273cc61e3497ca7babd4b03a7fcb2484cf1b78393c652d415df53c8c67dd6f958901e1477283da8d02996ea46a9cfed467fc2f345170d93526f3 SHA512 40ff5c705776b30a996a93557daaa69a161f21851190c0e2cf621576b96de37eff72e4dfc9029b5fa46814833909618257db7936aebdda9cc0cd24ff6258cb30
+EBUILD youtube-dl-99999999.ebuild 3156 BLAKE2B 3e94ee7379ea96aa47c6276d78bab9683bc2317980a7206d119c9710ccf99ec2da383bb8744208bf4d82af91990b12a769dc66760614330a2ef276c3051f3d05 SHA512 b45f8856a4d7067dfe53f1a7689373c001f0e1b98540cd1654001c9e23c442a245bf41d014945b2b84d818f0e26d0995fd7b35b73d3e3871a6c567c8e664c5e4
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2018.07.29-r1.ebuild b/net-misc/youtube-dl/youtube-dl-2018.08.04-r1.ebuild
index 033b66fc205e..af8daced1abc 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.07.29-r1.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.08.04-r1.ebuild
@@ -87,7 +87,7 @@ python_install_all() {
 	insinto /usr/share/zsh/site-functions
 	newins youtube-dl.zsh _youtube-dl
 
-	insinto /usr/share/fish/completions/vendor_completions.d
+	insinto /usr/share/fish/vendor_completions.d
 	doins youtube-dl.fish
 
 	distutils-r1_python_install_all
diff --git a/net-misc/youtube-dl/youtube-dl-2018.08.04.ebuild b/net-misc/youtube-dl/youtube-dl-2018.08.22.ebuild
index 033b66fc205e..af8daced1abc 100644
--- a/net-misc/youtube-dl/youtube-dl-2018.08.04.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.08.22.ebuild
@@ -87,7 +87,7 @@ python_install_all() {
 	insinto /usr/share/zsh/site-functions
 	newins youtube-dl.zsh _youtube-dl
 
-	insinto /usr/share/fish/completions/vendor_completions.d
+	insinto /usr/share/fish/vendor_completions.d
 	doins youtube-dl.fish
 
 	distutils-r1_python_install_all
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
index 5d18c5096250..beb514a7d658 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -86,7 +86,7 @@ python_install_all() {
 	insinto /usr/share/zsh/site-functions
 	newins ${PN}.zsh _${PN}
 
-	insinto /usr/share/fish/completions/vendor_completions.d
+	insinto /usr/share/fish/vendor_completions.d
 	doins ${PN}.fish
 
 	distutils-r1_python_install_all
author	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
commit	43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree	6208a7f4fc744684fce0f55acbb47511acace498 /net-misc
parent	28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)