gentoo resync : 19.01.2018

27 files changed, 528 insertions, 227 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 1ef6b7f606f1..71e1d2b7f478 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 1516cfc67b0d..98f04a928bf6 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -2,5 +2,6 @@ AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd
 AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.57.0.tar.bz2 2849283 BLAKE2B 05bf62df8908a7c2b00abbc31067b8e12e8f8527594597e0c92e950a83e359e3ad430930face01057e0d2e6af8e8d759a9e078bd179cdbd69bc7fe2d10c5c5e3 SHA512 f366d2e931d7aff63bac0e1f760ced32c849252947d522427ba92124566906a7e6bd081b6d1630df36895dda2a00ac4cf1bed1470740693ef47ab90c6a270377
+EBUILD curl-7.57.0-r1.ebuild 7234 BLAKE2B 9ddf61766ebc6378b9b86446b4dd761630cb7a24a1293a3552d57e360c26d85ec38ac311f66bca6eb6c041f8922e91a587768c5417411842d5bd7850ebd73a9c SHA512 164351baedae507342aa4182882e7122be03964e3355c8e087a425f7c3595cc34dcb4303e781dbfb2576f02623595a1f5399f8dccb462759b1cb2593bf449e3e
 EBUILD curl-7.57.0.ebuild 7181 BLAKE2B 6b64ba502ac4b586b689b42b90d009c682f1df867e1f0aaa2964c51f5b22b4bd1f8a6da5376d9b3858821708e7a257a2b190188aaf0de2f821d86a80c82cd853 SHA512 65a2058ee302123fc3d18551b68c8be5efa2640f621620084df6d27772e7bdfb6ad8dcc36acb46dfaf63c8f883e6c68933d35a471951ec587d509d6a2c4db9b8
-MISC metadata.xml 837 BLAKE2B 1f3436d7a90c4807a7399367c051aa644604daa46f9090f3cf4b12b4159a5f34d566e660288da7849ec7e8a51661fc71109ae3370d1b87e41842ca3713f7f076 SHA512 27e75529e492f897705e249135c7ed661de04eef216fe62669fce544b8c318e44c5435b884fb8f206433293be894bbe1b6214b6cf1a394c9cb907dad48db00a0
+MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
diff --git a/net-misc/curl/curl-7.57.0-r1.ebuild b/net-misc/curl/curl-7.57.0-r1.ebuild
new file mode 100644
index 000000000000..d27658e47325
--- /dev/null
+++ b/net-misc/curl/curl-7.57.0-r1.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
+IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:= )
+	ssl? (
+		curl_ssl_axtls? (
+			net-libs/axtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_libressl? (
+			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? (
+			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r13
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_axtls
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+
+	if [[ ${CHOST} == *-darwin17 ]] ; then
+		# https://bugs.gentoo.org/show_bug.cgi?id=637252
+		sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
+			configure || die
+	fi
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	local myconf=()
+	myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl ; then
+		if use curl_ssl_axtls; then
+			einfo "SSL provided by axtls"
+			myconf+=( --with-axtls )
+		elif use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		elif use curl_ssl_libressl; then
+			einfo "SSL provided by LibreSSL"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		elif use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-crypto-auth \
+		--enable-dict \
+		--enable-file \
+		--enable-ftp \
+		--enable-gopher \
+		--enable-http \
+		--enable-imap \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-ntlm-wb \
+		--enable-pop3 \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-hidden-symbols \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--without-libpsl \
+		--enable-manual \
+		--enable-proxy \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-cyassl \
+		--without-darwinssl \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		$(use_with rtmp librtmp) \
+		$(use_with brotli) \
+		--without-spnego \
+		--without-winidn \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index 8e1f6ab88a34..b911bba47df7 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Anthony G. Basile</name>
 	</maintainer>
 	<use>
+		<flag name="brotli">Enable brotli compression support</flag>
 		<flag name="http2">Enabled HTTP/2.0 support</flag>
 		<flag name="ssh">Enabled SSH urls in curl using libssh2</flag>
 		<flag name="metalink">Enable metalink support</flag>
diff --git a/net-misc/dleyna-server/Manifest b/net-misc/dleyna-server/Manifest
index a8cc5c58c04e..d58e43d67dab 100644
--- a/net-misc/dleyna-server/Manifest
+++ b/net-misc/dleyna-server/Manifest
@@ -1,4 +1,4 @@
 AUX dleyna-server-0.5.0-fix-references-to-GUPnPContextManager.patch 285 BLAKE2B 5425885163b4df90ec99ff0756d1d1da0b0336a73790f1f1c3e7c2ed40b51c78752705a229313d4e35503f62acd3d521026cc7553c154f35c464de5fe53dcf48 SHA512 76df25eac5b3b0d726089e98c38d8280bf3a72dfa830381f3b6a9a31df10abe31cc53c64e75f2fb12901130f243377392c607129821ca7645929ec2696bd88e4
 DIST dleyna-server-0.5.0.tar.gz 412938 BLAKE2B 532e1a418708d84dabd98670d84c865b6f69252cbd851504bd2d75bbbf683b699a47513a6ae994f809f3993a67815d5a3ee53683a016448c76d604fed040aceb SHA512 30bafd14c9b85406efc21dd078bce80ed10927ef2728c4535990654b6c279549c5a89099d9266cd1e22a2f574006d2c9cfec8e3e79109c2e760d8ab4609cf398
-EBUILD dleyna-server-0.5.0.ebuild 868 BLAKE2B eafd8ca835d28445d6ae7636ecb148e1df3367daa9c9b2da8d997fa0503676dd07b417b1642393f6e89dc6926908fb8bee958ff8332361300dc16d9f1f5b7f98 SHA512 e51835c8331450fe6e93d725695a250e1ec7ab1dceb1eac81539656e140e4fc030dca95d63fae03fe72a3609c87545ef71699005fcb32738a820b1c5f8d7a476
+EBUILD dleyna-server-0.5.0.ebuild 873 BLAKE2B d1af1ae02af52f45c6fdd533829bd4810057701d56d1c04328e1c589ea54dcac9f3f1783b20d74383e2d9857dc8321975f556e4ae6fdb8df10c81cd530820735 SHA512 507717788e3381b2e75d9bea7edcb7989a02c8bf21081199883da091ae09558148ab0a23807cadea032d1c0c8bc4e0b686eb206111c05802b681551a8a1e1a9c
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild b/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
index ba4c52b8a763..a10310c86cab 100644
--- a/net-misc/dleyna-server/dleyna-server-0.5.0.ebuild
+++ b/net-misc/dleyna-server/dleyna-server-0.5.0.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
@@ -11,7 +11,7 @@ SRC_URI="https://01.org/sites/default/files/downloads/dleyna/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest
index ef7c03aa7007..0f84ad818ea0 100644
--- a/net-misc/gnome-online-miners/Manifest
+++ b/net-misc/gnome-online-miners/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-online-miners-3.22.0.tar.xz 272832 BLAKE2B 67e56662dc74e35f23f7db5ae586a761a0043e01c07cb3ac9d3dd43b2f978e1472155748ac1c67498c1f30f0b342cab40d35a9934eff28ac31493778a8fc0c6f SHA512 91fafb41523b239fae6dda6dbbf0a1c64dba6089f70b2336574604c996c2e09e1f64445621c170ec70a98736362633443aea5ed7028cd8347d9beaaeb7f4aed4
 DIST gnome-online-miners-3.24.0.tar.xz 272572 BLAKE2B 6331e72f65510041cc278670df328ab6ec5336bb76ec1c6681136c6731c70b9d343ef296062da6de302cfea195d1b99c0040e1e016394b2fe3bbbe077915cd76 SHA512 96c6aa99b99553c399ecef754d10a918d8ef3bdf6369a77357241091edc9c2ff7a8350f8a064bb011deddac75b25bdde8006e8d72b6562f9cdcf3b373e693253
 EBUILD gnome-online-miners-3.22.0.ebuild 894 BLAKE2B 952812eaf8755bd1ba2ee159c87cbfc3e898cc6fc72d8163d24afa56319042082ab68e68cbdbcd79c2fffd45a228ceac74df747df87b2aa88d2e71322fd584fb SHA512 2d8df1e94072b071be24a5498baa901842163112f16edebb81784e8d86b4efd77120093e349df31a4d1a1a2306a332f3e1d0a098d4608c11631c84d427db9b46
-EBUILD gnome-online-miners-3.24.0.ebuild 896 BLAKE2B ce6e5cd677ffcd651ba83ef47263e95f00c83629bd27775a21ffc95da007a26d67e3570610278c911ccef5861db4ae5b4c4f4c845df9e079cdf0e52ced32296f SHA512 a5ec352c6e61c62905de73b31f46d03fdf7849845ce99bb5cfc87c95d4d507068c029a4146025f5907c40708d59ee745595fb434d59b5b62a727178f8e2203aa
+EBUILD gnome-online-miners-3.24.0.ebuild 895 BLAKE2B 0ef740d6869466629bec1a7cdc151186bb17d92cb37d323eac9477fdde4bc509b8d89ac1f9aaf6b81c0984963e00bedc7872a4b6a0170cebdac8de1d8b7e0b7c SHA512 c3a844f967dda3ac890ed1303b2a69415abbb7d9e40e6de2b63750c7b2e26604a7e56d2bf864c356f27b42f2dbfe9c9edfa76225a919d6624695260fa37d461e
 MISC metadata.xml 312 BLAKE2B 4529eb2ea76ee2c88700e8d551c726424ce4338361eb87c39599d1ee263914d9861cc8f93e1d8e667bdba186c40afbf1376bd9b530edbdab32ec4f961a60f00b SHA512 483189736c04729c1497b3bd6321a1d86241835c22df7c06658fda2af4f06d56f614499bcb8ab7eac76a3619fbaac81cfb430aedf3d4f78592ef3c8fd73746dd
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild
index 3aa887f5701d..25457546f6e5 100644
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.24.0.ebuild
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.24.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="flickr"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 # libgdata[gnome] needed for goa support
 RDEPEND="
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 6b2aa95a38f6..db74c2ff441e 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -14,7 +14,7 @@ DIST memcached-1.5.4.tar.gz 448831 BLAKE2B 721288bdc6184daf70817010074d6513b3fa1
 EBUILD memcached-1.4.33.ebuild 2624 BLAKE2B b5e15c766386beb37088661384ac7580e3b446bc338cabb047ee36141668a4459e1ceb19786f96d72de8fcb8da7a02fbfc093181163a949c146bc901a8fe4961 SHA512 95106208e83a37e1d1f94c04cb2942194f4ed9e7f8470b831529849c3ca62b48477fc0937e87ec7cd44204d87df7672ff72e20199068d21f63b8320335e074a2
 EBUILD memcached-1.4.39.ebuild 2887 BLAKE2B 373162846501fb6d7228f0d72046b01c64dddbc6af0c6442bce84d9d13feb67fcab5bf96a67725ab7e5e971925ea0d0610d1065bb8285325496cd3481d8e3205 SHA512 0726d795ffbaa17ed04b3b307146742bd647ab6c2084a1e0f22b333b293ac6e15a7488d69fd166f2480c49c87b236f14e7d7d7642c40fe853097347e9199e706
 EBUILD memcached-1.5.1.ebuild 2903 BLAKE2B 084d39e32b81980d5fc24b55852e26a95bdf1e319131c2c033411815633651adb79b4a963bbc505f9dd217fac08a6413ab662c39ab4b461388c8dfeb84d19d61 SHA512 3d20f3405b30234652ea9fd75f6ae4842aac4153f4062703b6090cfb2f4691781e5a2e474cfd9b971a7ea2b2cef12cb1d12b3c9fcf18d2b5e7ba2955112085c6
-EBUILD memcached-1.5.2.ebuild 2898 BLAKE2B aad8137980122e3ff16c1140d8197916a76f1708dce092f8a1a0983ad182be27853ea749e922488e438339106d01767cbe2ba541c7ce952598f6b20863a51454 SHA512 6f77d52dd72cc12be893c36df6b1953bef5980e97d2fca15288b9fc5c826c1178ed6d780dfc7bca95606733c63320830a819f05b61f6d034131a42bb4ca98595
+EBUILD memcached-1.5.2.ebuild 2897 BLAKE2B 837909b6345dfe7520f9e95cbe5f36c6823a03fe6291f00983071692b93884d5a9eada4309707e5d9b43a01da882b3646d58af1dd722d5e9eeadcaabad7b5e4c SHA512 14c1f1a0043a10eae7c625f7f2df3d98e430335e1a84a1244159cf703061a425602dab3a31d35ca9f2e421579ba7c31bf61f52ea3117dd0c98f059b2ef3782c3
 EBUILD memcached-1.5.3-r1.ebuild 2947 BLAKE2B 8a4326cc80965c2207d347ede2733d9881832c847d7d4a0f849d935bdb295af0460c5268d21997098c0e159913472e760f8dbc92e48d360b97b4297d7fc2926b SHA512 c34042999c6efe39d94a11175f4050b0ff83aa0b0a8d67f3cc50f0b21fd0590c0120134d22d87e0b28e858ebf4962d88c9c02c919ac4ba3130db25cda2a6a929
 EBUILD memcached-1.5.4.ebuild 2947 BLAKE2B 8a4326cc80965c2207d347ede2733d9881832c847d7d4a0f849d935bdb295af0460c5268d21997098c0e159913472e760f8dbc92e48d360b97b4297d7fc2926b SHA512 c34042999c6efe39d94a11175f4050b0ff83aa0b0a8d67f3cc50f0b21fd0590c0120134d22d87e0b28e858ebf4962d88c9c02c919ac4ba3130db25cda2a6a929
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.5.2.ebuild b/net-misc/memcached/memcached-1.5.2.ebuild
index 6fe4bebf2385..083753b1b871 100644
--- a/net-misc/memcached/memcached-1.5.2.ebuild
+++ b/net-misc/memcached/memcached-1.5.2.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
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 48fe26bd9f8e..ab71513c2973 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,4 +1,6 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
+DIST ModemManager-1.6.12.tar.xz 1402364 BLAKE2B 11335c495cc428936c9b0dd319449a7bf4c58a95ccd53b7a5bb276d78030272a7f29e5f0fa96a96613c5e0cb6a62239d864a23de6260fb55f6ecab09a18e6454 SHA512 2ac72fb2d36530204528cc0cd4815d0b93a1a8c8539ac345101e5e15bbfffd3eda888bbdc54298d3547b9aeacb94c75be5c600e993099671da2f9f27e8ee93cd
 DIST ModemManager-1.6.4.tar.xz 1464276 BLAKE2B 5c5688c678f7b511d8097e47f143c04733b1d8e6624d7b1deb9dad286ccafa3f37455956f19d6d76a00230a044662a7c59275c41f7530b9829a602f968214ca2 SHA512 6b31ce186adce445cec8964df751b6146a86271e6c14d860740ae66cfe296ac2ac4df21079357775ac5f7a5837c80a7f8db21a2680bc6b45802f9928565f1c73
+EBUILD modemmanager-1.6.12.ebuild 3148 BLAKE2B 088a540983c17af299c6678b60bbbb2351d21df18ad9ebdf5d8c5b96f4a066a344b1c6143f1d96bd947887f41cd031415889c11c9ee0df1fdc9d4279e8b0e25b SHA512 45f5a617571e9d50f5df50ac384f327759db17ac821af28f00a3e9fd00dfdf8f9962c3fe4b822b902c4f160bea910f12f90d191d767afc2398460debccbcc9a1
 EBUILD modemmanager-1.6.4.ebuild 3143 BLAKE2B f8aa5e15ddc777b96ae2230a97437ebcefa1f36074e15bc880efa90920fdd4ceb28449e453f3cb39b11589fc0cd5110117b09edd87c1aac1b3d216c518658fce SHA512 edbe21effd6e22319d1f859d0f8c868725d6574633f2b311c191fd57d33ad6930547b84fbab8cc7a39303748b61dbc990fff63181e1710ca17b02ac72352376d
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.6.12.ebuild b/net-misc/modemmanager/modemmanager-1.6.12.ebuild
new file mode 100644
index 000000000000..afa8a83ce23c
--- /dev/null
+++ b/net-misc/modemmanager/modemmanager-1.6.12.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 user readme.gentoo-r1 systemd udev vala
+
+DESCRIPTION="Modem and mobile broadband management libraries"
+HOMEPAGE="https://cgit.freedesktop.org/ModemManager/ModemManager/"
+SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="+introspection mbim policykit +qmi systemd vala"
+REQUIRED_USE="
+	vala? ( introspection )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.36.0:2
+	>=virtual/libgudev-230:=
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	mbim? ( >=net-libs/libmbim-1.14.0 )
+	policykit? ( >=sys-auth/polkit-0.106[introspection] )
+	qmi? ( >=net-libs/libqmi-1.16.0:= )
+	systemd? ( >=sys-apps/systemd-209 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.19.3
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/ModemManager-${PV}"
+
+src_prepare() {
+	DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in,
+		You should install sys-apps/usb_modeswitch which will automatically
+		switch it over to USB modem mode whenever you plug it in.\n"
+
+	if use policykit; then
+		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
+			add your user account to the 'plugdev' group."
+	fi
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-more-warnings \
+		--with-udev-base-dir="$(get_udevdir)" \
+		--disable-static \
+		--with-dist-version=${PVR} \
+		$(use_enable introspection) \
+		$(use_with mbim) \
+		$(use_with policykit polkit) \
+		$(usex systemd --with-suspend-resume=systemd --with-suspend-resume=no) \
+		$(use_with qmi) \
+		$(use_enable vala)
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Allow users in plugdev group full control over their modem
+	if use policykit; then
+		insinto /usr/share/polkit-1/rules.d/
+		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	use policykit && enewgroup plugdev
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	systemd_reenable ModemManager.service
+
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 43c7435ffb3e..50326905610f 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,7 +1,5 @@
-DIST owncloudclient-2.3.2.tar.xz 12266008 BLAKE2B 53d08aec4971ae309b4fd07cea4e6ed9643411d4f6921c82213d55ec757abcd61ee64abc81e359ea0808b54d8447e3742fdec5394ed55b2e09805616f5430a75 SHA512 8abe071c28b365c100eb30ed91610640a25a7385f4347f5527289f4664788bda375e9618396ffa3e441c7e473da55bdaf7a5cdd99c8fd5801de78cb945fabb9c
-DIST owncloudclient-2.3.3.tar.xz 33801712 BLAKE2B 7642148a4f503a2702d56f920067202699b4a55bb6216337ecbd9df141e0a7467aaf2db8d7d6871502061d3866294f8c44c791fdbf9597ca8d761f360f7ffda1 SHA512 8cbffd4fdd4bd3bbbfb947498ec9bfbaceac3966ac29d61dea3db82405976230c1067c3a3afc9ddc4ce152c69c530ad44be154615a391f63524dc2fb40d5e5d2
 DIST owncloudclient-2.3.4.tar.xz 33796736 BLAKE2B 3792be4f534c3424a58e83bfacef30a20d089df55de79dbaa51cfc9d20e7558ab65b65bda4ebf691276de050436253ffdb69dcdf7bad397c3dd4a074124e3053 SHA512 2a66182c1f679f4bb6d13c8b21d280dd6b530b8ef82e71a4fa0fecfed9a3f1a55f181ae3d96b24ff040a6f3c0b12777df035ee951264186ad3409e66da05b87b
-EBUILD owncloud-client-2.3.2-r2.ebuild 2091 BLAKE2B 02bb1c906e7ba3a77e5291b3612548875843ba21c3d6904e30b2ff5d1d3205803ca84328cda2c29a0694cea59c60e4c23dba89cde188457d2a82ca13af0ed30a SHA512 2932984e45006b625032674bf5d38d2b3f8decdd70f6c3a307492fc9cafbdf197b03388189d25c7fb848fa019470aa7cd5d65957a01b8ffd0ece20b0c88b5d00
-EBUILD owncloud-client-2.3.3-r1.ebuild 2109 BLAKE2B dc55fa9753dbb3d4c9ece2906d6ee9c9770611912ef4a55524bde25163d3694cbc11a4c040993f53e737e6a783181ac79bc373bba9cbff9c293c2cc0c188d857 SHA512 3723864eddf5fb24d52c778287ed68c5d8f262dd4358bfc484307af5267cfdcd0a89de2d2a48d8dd3cdecffb797a5fd190cd852cad0a372f55eaa0b02bc1b88a
-EBUILD owncloud-client-2.3.4.ebuild 2192 BLAKE2B 2194301f6f5dfb951cdcb57c54bc146724d739bcfca6d19b2cd85e7d983e97e964e1a1df042128fb24b4b4e061e5eaf4f40072f5804554ee0052f0aef302dcb1 SHA512 dab8e6d7ee5d2f5dc529135ba0dbaaecbb0c0140da0f5e37974982baba44e78d69bfa61e2b22a2659c09cb7f042ce4fc48b3f912bb76b82c0198eaa068209522
+DIST owncloudclient-2.4.0.tar.xz 15385568 BLAKE2B 616c4d5ca58a5c7fb4900a7b46df81a13f477c623e590e74be3b14fae2bf51f3f00154707aebb22fe839cba896c41caa6c71aa9d0f481bb8cf2b2b79dc648060 SHA512 b2e8bcc12e4f087d868244e1e453d7d81ab076dfe8b14965d37ef9e4cb05f2237254edd2c261a28bd5ddd9534bd80f0491d476844f4f0a5a69dd42ec52f450f0
+EBUILD owncloud-client-2.3.4.ebuild 2197 BLAKE2B d20496e997884021a7dc5f1fc607691204f81726a77a1a52dac7bb454158d9d0af23ae37fc3505a8a5e7cc40f7fabdfb163072a32a426f613e09e7d631319a59 SHA512 620899cccfee444bb7782cb85821b48c762682519a59c0a11fdd3d3734682e4167980eeef304dfbae7c4327f41d2a6e4db005316d7d55a157a52f125957ddf65
+EBUILD owncloud-client-2.4.0.ebuild 2197 BLAKE2B d20496e997884021a7dc5f1fc607691204f81726a77a1a52dac7bb454158d9d0af23ae37fc3505a8a5e7cc40f7fabdfb163072a32a426f613e09e7d631319a59 SHA512 620899cccfee444bb7782cb85821b48c762682519a59c0a11fdd3d3734682e4167980eeef304dfbae7c4327f41d2a6e4db005316d7d55a157a52f125957ddf65
 MISC metadata.xml 595 BLAKE2B c5e1e40ab739c9c5713804647af8dde5f46743686da261d81523cda8e8f0c89eafd70f59b1b65d165febed25db03f6565a0bc5b345a56cd647476605745170b5 SHA512 3c79d7e86cdd5451171bc649488559cb028dfafbda29e260bb92af2db3ae0c60a486c4643bbe8685b8499be07b51424223b57f8da6437eac948ede96dffc12cc
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.2-r2.ebuild b/net-misc/owncloud-client/owncloud-client-2.3.2-r2.ebuild
deleted file mode 100644
index 6c54b7309917..000000000000
--- a/net-misc/owncloud-client/owncloud-client-2.3.2-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Synchronize files from ownCloud Server with your computer"
-HOMEPAGE="http://owncloud.org/"
-SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
-
-LICENSE="CC-BY-3.0 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus samba +sftp shibboleth test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	virtual/libiconv
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	samba? ( >=net-fs/samba-3.5 )
-	sftp? ( >=net-libs/libssh-0.5 )
-	shibboleth? ( dev-qt/qtwebkit:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-misc/ocsync
-	!net-misc/nextcloud-client
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	doc? (
-		dev-python/sphinx
-		dev-texlive/texlive-latexextra
-		virtual/latex-base
-	)
-	dolphin? ( kde-frameworks/extra-cmake-modules )
-	test? (
-		dev-util/cmocka
-		dev-qt/qttest:5
-	)
-"
-
-S=${WORKDIR}/${P/-}
-
-src_prepare() {
-	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
-
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
-		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DWITH_ICONV=ON
-		-DWITH_DOC=$(usex doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DBUILD_WITH_QT4=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
-		-DNO_SHIBBOLETH=$(usex !shibboleth)
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-}
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.4.ebuild b/net-misc/owncloud-client/owncloud-client-2.3.4.ebuild
index ea90ebbbe5e6..d8fb3b873c2d 100644
--- a/net-misc/owncloud-client/owncloud-client-2.3.4.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.3.4.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
@@ -20,7 +20,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
+	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
diff --git a/net-misc/owncloud-client/owncloud-client-2.3.3-r1.ebuild b/net-misc/owncloud-client/owncloud-client-2.4.0.ebuild
index 4652bd7a7a88..d8fb3b873c2d 100644
--- a/net-misc/owncloud-client/owncloud-client-2.3.3-r1.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.4.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils gnome2-utils
 
 DESCRIPTION="Synchronize files from ownCloud Server with your computer"
 HOMEPAGE="http://owncloud.org/"
@@ -20,7 +20,7 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
+	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
@@ -90,4 +90,9 @@ pkg_postinst() {
 		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/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index bc43735d64f8..d3efff6ae16c 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -3,10 +3,8 @@ AUX rabbitmq-server.init-r3 638 BLAKE2B 56c9116898f480b08fcd8fbfa37af5d1e9d4f9d4
 AUX rabbitmq.service 314 BLAKE2B 5489ba8c773f7eccf335d34e3ead22f240fc12e1d089f33218027f9895e91ebca76ad8ba450ca6ca01568c4c67f035b14a912a2352922f7ed7287e27627f9569 SHA512 8bf25da162ef336f9eb3f69f871b0945f7b02243da8a4d800e759266236ef84740988e2e33f88f4906f08a63cab49dbae87c868f69ee89df995170d7d2ae9457
 DIST rabbitmq-server-3.6.14.tar.xz 1508216 BLAKE2B 1ca3f933e91ce204cc90df7df619742e6d42e211b6350c629015a15a0ea6cdad05ad1e0139db5b2f1f353f314d1709ba468112a4059c6894ef9fb454fd616cf2 SHA512 22874b81fcebfd954e5ee8f4701bd8743bbc9559c1a1c09f8de03e16039153aa6e6b0bea71067770913493299e57da6b3928ff0ade4ee9ffb5ea48a30a154d9f
 DIST rabbitmq-server-3.6.9.tar.xz 1422316 BLAKE2B 08f88cf3b592c2fecf3e2a9c7f9a4a2997f7bea6f14a2d72cb42ad8d3254b2bcd32b0605c7687eeae8e1c39a6d3ad1776f89e84292d508903b956ec05f6cd858 SHA512 a003d2343c97e546ac01a5aadc46e94e2dbcc78349072b362950e5c5e11229e2a6fc4020d281f9fbb5cc0f577d2a166ef09671e931ec1470ab2edcdd98443662
-DIST rabbitmq-server-3.7.1.tar.xz 2466028 BLAKE2B 37bb69dd031bc9f9c345ef00128b8eb2ef719c8f48280b41e30d5cd82ed431430798eabe8eceb88a2edf112d2807bf6465aa19ffd108a5e84d4d8c0ea29fe143 SHA512 66c47f54ab3a725e7caec37e6ef632ab8b367af47431e89893085463c676775a9f42c8f89e7fb9ac174768805790d4cc70a1b964963267cf586de2d13fc55d0c
 DIST rabbitmq-server-3.7.2.tar.xz 2466952 BLAKE2B 99065384e4a8c3362200c1cea9225e243952d1c7eae2e5feb5a5cbe6d17c1a803cb904edc9a1e3f9e23a99b6e5b2f119b4ce226765e97db1310776b19977c00d SHA512 8972efd81c03d5499393ee87000f86373a1e933ce327318122d603ce4e76156f1c8588f3740adccc74c00afa5256ea6a040f1c420bacf3eaec170224259e1c3c
 EBUILD rabbitmq-server-3.6.14.ebuild 2865 BLAKE2B 64a85b0d626e222182a167c5edff69e55802c4a2261a4507a6164dc57cf0d36dddc4db58d3c3aa47152557cbc3bec84fe6701a438ed735ab4b4597ed0f25519c SHA512 bd84518cdee06f69be05ef141ff6d10ffaca2312410621ed35508315878ae7dcbd5ae17f654dd539b6dbd7e0a46850fdbbb3c444564357a352e175107f814ffd
 EBUILD rabbitmq-server-3.6.9.ebuild 2860 BLAKE2B 51d41a29be6986157954f3b675e31b9d813baeff9023c6f6c31ec104039ee2544bd1216ffbed27e0b69437dbe5f396a864fa18b789d33d5f9d8702a32aed4cdd SHA512 17951e227b45b1230bae2992b3f4530e7c2e7dabd62cfd8c9950254cdf0633dace11b45da1ff34934adac1a365032d72e87adf3ad64051e3942d1077b9b59303
-EBUILD rabbitmq-server-3.7.1.ebuild 2957 BLAKE2B 441e49fc8e818d7024403e38186c2c9c7fa685c34dddb2e7103bdd887acea549e9d32ad9f495ca3607d7aaf50f0de76cca81ab972bc4ddc9d0bf385405d16b98 SHA512 aa5e96ae41e1b62d0b78b76a151aa8622a92dc6e0bd586c6f2204d4a9e705e922e917141524c83545e4643f36f028a2e412826ce1b73b9ae25f1c7139b4847be
-EBUILD rabbitmq-server-3.7.2.ebuild 2957 BLAKE2B f68c321491caf442d9ba82ade95dae22184562077cd92523d27a0de7614cf0b17eb4744b9c7271674d3c74934c640b7f0eb97efd907eeca230ce91e1e16ca216 SHA512 cdaf44929a1113b1757a7b076901a74fc49aa8be816eb7de15bcacca191aca4668974f92425390c700f79813980aa64646da20ba88650777bb83e2287cc1b843
+EBUILD rabbitmq-server-3.7.2-r1.ebuild 2977 BLAKE2B dd075c562e355c55b4a9dde74c9365183391f6d8b25b84ac4a6603f9aa7899c84a5e907cd2a4176539f65710c86b93dfc964fbe2214f4586f6fa9c12ac11b96f SHA512 f51cc6066ffe86ddfe34b4514e63ac4e87bb286f7e04348df540bd46744b70064abf82047d1dfb6eb0e34c1f00d78ae7d3b3251e5dd2ccea14386b31c0e0b453
 MISC metadata.xml 243 BLAKE2B 521acfb5d3a435d6280a45018d424779bc562b0de43396d1fbc0bb5950c2e672a0090552e29cafa59a61c07baf9073d466316eb1b43cdafdded443f9e57c3bf7 SHA512 d44d6b045d6b171e487d632935b2ffd1d5c567b28e273aadde4799d45d94f1dfd75873d296d4e9de1e431d5a8de4a0337e9e3fa648545c182f225e4f45652701
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.1.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.1.ebuild
deleted file mode 100644
index 3571bfcc50ca..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1 systemd user
-
-DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="http://www.rabbitmq.com/"
-SRC_URI="https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PV}/rabbitmq-server-${PV}.tar.xz"
-
-LICENSE="GPL-2 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/erlang-19.3[ssl]"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	dev-lang/elixir
-	dev-libs/libxslt
-	$(python_gen_any_dep 'dev-python/simplejson[${PYTHON_USEDEP}]')
-"
-
-pkg_setup() {
-	enewgroup rabbitmq
-	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
-	python-any-r1_pkg_setup
-}
-
-src_compile() {
-	emake all docs dist
-}
-
-src_install() {
-	# erlang module
-	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
-
-	einfo "Setting correct RABBITMQ_HOME in scripts"
-	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
-		-i deps/rabbit/scripts/rabbitmq-env || die
-
-	einfo "Installing Erlang modules to ${targetdir}"
-	insinto "${targetdir}"
-	doins -r deps/rabbit/ebin deps/rabbit/include plugins
-
-	einfo "Installing server scripts to /usr/sbin"
-	for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-defaults rabbitmq-plugins; do
-		exeinto /usr/libexec/rabbitmq
-		doexe deps/rabbit/scripts/${script}
-		newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script}
-	done
-
-	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
-	systemd_dounit "${FILESDIR}/rabbitmq.service"
-
-	# install documentation
-	dodoc deps/rabbit/docs/*.example
-	dodoc deps/rabbit/README.md
-	doman deps/rabbit/docs/*.5
-	doman deps/rabbit/docs/*.8
-
-	# create the directory where our log file will go.
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	keepdir /var/log/rabbitmq /etc/rabbitmq
-
-	# create the mnesia directory
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	dodir /var/lib/rabbitmq{,/mnesia}
-}
-
-pkg_preinst() {
-	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
-		elog "IMPORTANT UPGRADE NOTICE:"
-		elog
-		elog "RabbitMQ is now running as an unprivileged user instead of root."
-		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
-		elog "Please run the following commands as root:"
-		elog
-		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
-		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
-		elog
-	elif has_version "<net-misc/rabbitmq-server-2.1.1"; then
-		elog "IMPORTANT UPGRADE NOTICE:"
-		elog
-		elog "Please read release notes before upgrading:"
-		elog
-		elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
-	fi
-	if has_version "<net-misc/rabbitmq-server-3.3.0"; then
-		elog
-		elog "This release changes the behaviour of the default guest user:"
-		elog
-		elog "http://www.rabbitmq.com/access-control.html"
-	fi
-}
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.7.2.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.7.2-r1.ebuild
index 5f86107a94be..9ab7ab6bcfe3 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.7.2.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.7.2-r1.ebuild
@@ -47,7 +47,7 @@ src_install() {
 
 	einfo "Installing Erlang modules to ${targetdir}"
 	insinto "${targetdir}"
-	doins -r deps/rabbit/ebin deps/rabbit/include plugins
+	doins -r deps/rabbit/ebin deps/rabbit/escript deps/rabbit/include plugins
 
 	einfo "Installing server scripts to /usr/sbin"
 	for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-defaults rabbitmq-plugins; do
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index 3ef1f90c1a80..edd2d87f78e2 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -6,5 +6,5 @@ AUX radvd.tmpfilesd 30 BLAKE2B a1c207296debe31a4fb25c7ec52202b679e41fb9b73658d27
 DIST radvd-2.14.tar.gz 211461 BLAKE2B 0acdd23d1606d7dc5df3a8c8e2d3be7f6178bde866b9463b2a645a78b4ed710e8c60bcd32eff9456b80a993c3544a71721199298fccb184b357bc2ac51651f55 SHA512 8fdfd776f998b82e9dcbb29a13e44b1ba060f2e4b03bae0167549fb58731f16e80e980f9636e0d7614270b8e6457779ac044b433c5c5d26d9fb72ea9e2d3cb02
 DIST radvd-2.17.tar.gz 214937 BLAKE2B 1eec22e09607c0396f9539aef203b76d5beca18d1fdf5aa0ff202dcb2ff0e36ed8af74fc7900eb7b16012bfb0672f9660f17c88c222ac0269947d3cf4a270db3 SHA512 117a42c2c007d730b956cf999ac281f50a1a9b57c9428fe0f860cb211ac234ec62f59fead244a80191aaa15ef4ce96fb7dba9bd1a3cb6c3b29f1b6897d7a6132
 EBUILD radvd-2.14.ebuild 1706 BLAKE2B d9945809543964b856b8d30cbafdad388bf48fe37cc02dbb28b3ba245ab0a581b8d5389582e416f944626218b52c6110c09488fb66259335de0edc276fcf9e25 SHA512 8d0035cb5309556841e87769b6839ded82e0fa17b7664eb7a732c8cc31561ceb0482d2ffe687ff80fc65110e9e6ec6753152c99b9ab6a7722324734137b989b8
-EBUILD radvd-2.17-r1.ebuild 1577 BLAKE2B 77a4d5496140fee2e4f06d1cc23744601a295e2beeef56416bc770683c87b0b954171a179a991b352d32297d74f6c55ac3232dd7822d9aa37ef1c310d9f921ff SHA512 be5ce41b0c0ff16a4848e06659a26f230601793b222b05127fcdad9937fa4861878de3e643fc9df4817b8ffc42328b10eb450f53e7526acf9e4430a7ac6251e3
+EBUILD radvd-2.17-r1.ebuild 1576 BLAKE2B 55cf84f54d4878f49bed713beff06db76aae80bf38981b3b7826ba4eccda5f7d2a9df2b7c33f09df2db5dab84caec38008ecf9f2111769e3c5a2dbac13753752 SHA512 0b93b0a6f4595e58f45ad14c40906f5f25a620f070e06e7f2abdacecbc38b9811f1dd859d8de4d12f246953fa2a5b6c41bebc88a3925528443fc52b8f389a777
 MISC metadata.xml 358 BLAKE2B 70f1eae6d5cf08ab6f32571544ff2a4ae7169bd493a435cf03faf038f7aa1fbe5f14dad4a19e468b2ab6577a18340489f547420bb4551288612b7fe23ea468ca SHA512 3d5a0cff9bc15adc735715969e1d5e5dbb88d1b938f12291b5e1f2b63e5eead0e598b6abb71a740867551f28a50567c4006a77fde240603aded2d956ad784485
diff --git a/net-misc/radvd/radvd-2.17-r1.ebuild b/net-misc/radvd/radvd-2.17-r1.ebuild
index 8b036b6541be..6231fead9f70 100644
--- a/net-misc/radvd/radvd-2.17-r1.ebuild
+++ b/net-misc/radvd/radvd-2.17-r1.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
@@ -11,7 +11,7 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ppc sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~arm64 hppa ppc sparc ~x86 ~x86-fbsd"
 IUSE="kernel_FreeBSD selinux test"
 
 CDEPEND="dev-libs/libdaemon"
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index ae4fafdb78b3..ae3aa8c1c9a6 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -12,5 +12,5 @@ AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aab
 DIST rsync-3.1.2.tar.gz 892724 BLAKE2B e366514ae9835ba7c201a9e09fb9342c5e52fa36d45d46300d080403de25a64ba3ed7a703e56b4f47a743a597694a2d0a50bb4bab6cfa0aa7b59a4f7b93b9f21 SHA512 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b
 DIST rsync-3.1.3pre1.tar.gz 905910 BLAKE2B 1823494a325181773cd14f2b8a9aae4ad6a891d70713e111f43c516a69cb9852103c7bb8ced864aec24b8d2a7a4e791c53f6e868276c6c6cc25f0aaba36ddbf2 SHA512 8e2e4623650985169d4ec2e84549f8b5f060b5544380c5b332998161eb1adcfece48216c343730eb726904079836c2d47dc85fa9707fccc02f09841eb547b597
 EBUILD rsync-3.1.2-r2.ebuild 3079 BLAKE2B da170ff573c25a1c84c615bdc28b69070e66df5a53d7d3045451cf9535f98439a25dbf5a0032b08c9c810f67f2631b44b996015427c334c0d23d2afca9fe9967 SHA512 facf9e9db4212fa57602334def44fe56f869da794e2a0c4e3ed896755d86b9704c4a3b3f76141e8c1eb4750744c77c7e4642266dae9ddff7eb4b2ca427b31b7f
-EBUILD rsync-3.1.3_pre1.ebuild 2853 BLAKE2B 78f5bf6f8dfb345ddb2c12237eaec6acfcee6137fb8e8105d364e59343d384ecccb51f1a062b9f0bc0f1ea9dbe3e7a1679cd3650320bc7ff0a20e617f8198190 SHA512 2b6653219a8c6e1c9e9bd312e819c7071d509465bda02b87ae475f4ffb9a510be16e8de180d5a32696dca7802153721bfaba65e9b2b43ea048027284677a1e65
+EBUILD rsync-3.1.3_pre1.ebuild 2845 BLAKE2B b7503011f44b15f1ff78e3159928df5ac79e2da9ad281a729e3a4ec1bfa37bbf61101ab9ba957640c4012cf8b376d02e1cfe01a9921fc5c3e69bfa455d5707d6 SHA512 8467ea94878109a3d06472227b0c648e77001fb7ac271c5ee43a70f367fb54c68e270cb931b6d3ff2eb99303547937afdee070cd1df8d7d481ced91e6b5a019f
 MISC metadata.xml 449 BLAKE2B 961dae7e8c69c0d452c9eedf67223d14ff8ff481821206d6fe2daed3a23a0da704155d61339b0d32182e5ba9195ff25b3383bd90945ea474b21da7f66f09c77f SHA512 1c0f031c078a7c22b8375b093dcd241e139ca86a61e2d463d9d01946b57b24dff29ab489ac063b70d210d1306106896fe77bd9678331d5954ef3182222d4f920
diff --git a/net-misc/rsync/rsync-3.1.3_pre1.ebuild b/net-misc/rsync/rsync-3.1.3_pre1.ebuild
index a01698246090..2c1a70bd5e11 100644
--- a/net-misc/rsync/rsync-3.1.3_pre1.ebuild
+++ b/net-misc/rsync/rsync-3.1.3_pre1.ebuild
@@ -12,9 +12,8 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-if [[ ${PV} != *_pre ]] ; then
+[[ ${PV} = *_pre* ]] || \
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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"
-fi
 IUSE="acl examples iconv ipv6 static stunnel xattr"
 
 LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
diff --git a/net-misc/rygel/Manifest b/net-misc/rygel/Manifest
index 5e1bf15d7b77..64a325903684 100644
--- a/net-misc/rygel/Manifest
+++ b/net-misc/rygel/Manifest
@@ -1,5 +1,5 @@
 DIST rygel-0.32.1.tar.xz 3977648 BLAKE2B 8d1777bb0092779ca545ee561e80504180cd3aeb4add0f0a41bcd8001a8130b0e52a31216414f9d4ee949fe3aaf4e607faf718c250680085692e0e262dfb0639 SHA512 55aaed85a44496792bf9bc34d150f1f9d79b7c440da4351c730580200cc7e3a19f378dd93fdf2ab5b4c19cd793a25481c2bf15f3e7043595e6971eca983f0767
 DIST rygel-0.34.0.tar.xz 3997364 BLAKE2B 2906bcdea61caddd93a7fa0363c7957ce3c0443581a625b40712d2c75f25d05c693b745f72392c917190f754533c03c524fefa80799a5e8163f44eb22c1d33da SHA512 90e582f42e73376bbe6b06f33d44c6a70969961728dc512523bcc578b5b7c3f826cb425b469ade87d3fdf82117309f8589c30b1cdd8ba74cc14424c7f2efdb21
 EBUILD rygel-0.32.1.ebuild 2473 BLAKE2B 62467c9f94cd0a587a70d41d567cbd19d96fc0955e28c15b713d9a0a0441f5f134bd9d35ee169a9c6bf3d037ad3cbb06b5dac2d099e68099bda9645d3a41d41f SHA512 8388da9196641fa5dc2e744546634718b7e733e80b6eb338828d693f5a1789416355db295da6da3b9ecd9af072b30df1d43e0b48adec9d120c87c9336557fd89
-EBUILD rygel-0.34.0.ebuild 2771 BLAKE2B 0769a7d0f75624918bf9a2a6a9004780e52620773e918e941a6776d602e9806eadd99579abf62c78bbdd5ba3e752b8ab0177248c3398b63e8f4ed13d4ddf3bba SHA512 1caa6463fd6e48da1c6ec0986c68404822d9dcfa1733f64056506c9b4275c70d5fd053d8a32930d6365f7f6a566617b5b09049865dfd45b085cb927a98dcecb3
+EBUILD rygel-0.34.0.ebuild 2770 BLAKE2B 008d8ba0bb2a2437a1e614058c61c99ed227c9c3f20de66eea28401d7d5c4ff8352cdbfc079581d47234e63bc5d3bd8a8ddebaa3e337dfa477fde5a25e2b88f4 SHA512 8d51ef9905c9ac31b81195be2ecc875800e9e90a68721ef6274ca9a33ce05a460a718506b8148cbd0fad4c99af1ac8454c30ac633764ad2a2c546fa0c579fe03
 MISC metadata.xml 431 BLAKE2B 26d8bc725f5e93f39bbc4f3dde70de841cc0cfd407f1c37be3934f25fed17e1d30e1509859e18786baf4af1f502ab420774d6fec95117bba1832f116d1b93274 SHA512 61bc8e851d50b1d47ee5f286aa76e69a9d345514b0a94d643cb6bfc0fe5072f272d0aebcdaa9389734080ef8eda0cbd3a616d90860c88c6ab59309ec05cdc0ce
diff --git a/net-misc/rygel/rygel-0.34.0.ebuild b/net-misc/rygel/rygel-0.34.0.ebuild
index 034de1e2366e..3153ae5b41fc 100644
--- a/net-misc/rygel/rygel-0.34.0.ebuild
+++ b/net-misc/rygel/rygel-0.34.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
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Rygel"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="X +introspection +sqlite tracker test transcode"
 
 # The deps for tracker? and transcode? are just the earliest available
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 667c7e01963d..0526bc04fd5e 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -4,6 +4,9 @@ AUX teamviewerd9.init 482 BLAKE2B 841a1d6894aec1ed1249195613c01df526abb4833f7a81
 DIST teamviewer-9.0.32150.deb 22898922 BLAKE2B 799aa6f48b69247a2695ca745e85d02ffa73df1375203dfc9da339673e6c18d861c4146ddbdc509bdc1114d5a2a7e5fdd4acf3c6e5da61fbba5aaa02fa4e3cfd SHA512 3e72ed5cab7a754a0aa75e533da92292ad004f66c55ac4c386b6f4a65cc41b14a8d9d7a5410dccdb90c1172cd33e52383289339ab44f0847a061655498ab8e4d
 DIST teamviewer_13.0.5693_amd64.tar.xz 9694952 BLAKE2B 650814c3c63897e1024836528c6eaa4cc81064ffa16bece7f8d2fe633457e2795e2cef847175a88dbb389ba61d2597a02292e6bf610da25c92f97152560ea355 SHA512 75886b6d00991968ae0b0d3c55b4c07c6f1b1b24488b2d5ae866e35c26ee6e673e500c87845ba6850ffdc80e4612feff0fc5bbe9e39f2d0a94582e1800471dcc
 DIST teamviewer_13.0.5693_i386.tar.xz 9583892 BLAKE2B 8e477978825431a01b37b61c28b903b36cd81365c7ec5df4ca8d4aec1ce8d24b49af60ed6c99c863acd26405254ae78c4ae4dfef1f8b7a5fb882e281c3c4f125 SHA512 be5e8e00755a38f2c70ceba88d9fb87c2cc8e9e284c86e22f95dddf919a37ee1f24ef1e02f042a339eaf863dbf255c873e3edcb038c04202b4ab0460e50b2503
+DIST teamviewer_13.0.6634_amd64.tar.xz 9316708 BLAKE2B c48aed992de6b23728de155c09dca96258d1a124df34f904bad8ae1fc85777ce9b1606a75ae1d40e32f5e2f8b313f54013205d1711302d2fef8c55a4d0e450d8 SHA512 5f4f662ffc0499d3cbd8b6310999b34e14a324152dd9e75352879d8cf0e53058c035c9bad987af046aa6715d3b579ab3887f339e68db8ca71e11348b1703d78c
+DIST teamviewer_13.0.6634_i386.tar.xz 9258092 BLAKE2B 85a5e169486956cb226ea5cf2a2497ae4de88d3d94a961a819dce0a179fb0cf7959719b784def98d7c7e39151307bc0ec17a21d9d7f7e291c52715a9fbb815d8 SHA512 796ff9c9a39f769b9034875f5dc513a4034c2d10ea832b1a411ab4d576d5f5152a24cd4513a55871d8f59b50f85c9301bbd7ea27c1aeb84d97b22c076b2768f7
 EBUILD teamviewer-13.0.5693-r2.ebuild 3703 BLAKE2B 7a313f3cd58f1535bbfbd522ba5fe093633888134ff406dc1156fb0afa460100c33311b53490327c56fe9ad751f4179209ef1776d7c4a847da85079557e5306c SHA512 0a3c6f8b0cab36cf41ebfd78332451a719ad059f1217d30354addb6ba0264e31fe99ea6aead912ef138feab71de61787224869253a755efb6d83047dcc6bd49b
+EBUILD teamviewer-13.0.6634.ebuild 3703 BLAKE2B 5a6f0fd7fb45b4f79b9fc4be5198aaa0416d709f4d5883c2b7e54bd2158aef15171caf7861cc47986cc773bbe82d9cf14a40975070e9910333850281eb7fbff1 SHA512 af6fa5e352389a40dcd222b9ed6b25d43179d9eecea6f9d87aef2df66543fa26ab5c7e358caf17fe18a6a10f84045fbfe1cce3cf158f114b7ff959b6b3497709
 EBUILD teamviewer-9.0.32150.ebuild 3254 BLAKE2B 42f581bc583d8f825a0f1f54fab320ddfc568f8f95542fed854c291356d24ac2ee9ad0d845671ce67e1e4ce2e9c23d6bdbc74bb7cc53ed340b79445fc6876e26 SHA512 ef00b858f78c0c9aaa0ec95009acd37ea024327a5a861cfa012c2e61a5be413aa5fb075b0860daddbe76c97d1f62da24069c716862322025321f6425335f0a84
 MISC metadata.xml 354 BLAKE2B 5cf40c1225f7adc9c22b0f87d2e5855212411ce09906cd26ed936cb2492bcda1923c2595f749d55864d4e40a41b0d6ae03e0010572b37a3915b12f51a2bec49b SHA512 9b046315374a6a39982c9bbcbb69c9a17b89c3e78ff53201868c67119d0a3cfb134f1d1357d37587f5c3cf6043a527f916f2af330e596d9b06d94249e5654b5d
diff --git a/net-misc/teamviewer/teamviewer-13.0.6634.ebuild b/net-misc/teamviewer/teamviewer-13.0.6634.ebuild
new file mode 100644
index 000000000000..6c3cc7311e7e
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-13.0.6634.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN=${PN}${PV/\.*}
+inherit eutils gnome2-utils systemd
+
+DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
+HOMEPAGE="https://www.teamviewer.com"
+SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
+		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
+
+LICENSE="TeamViewer MIT"
+SLOT="${PV/\.*}"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	sys-apps/dbus
+"
+
+RESTRICT="bindist mirror"
+
+# Silence QA messages
+QA_PREBUILT="opt/${MY_PN}/*"
+
+S="${WORKDIR}"/teamviewer
+
+src_prepare() {
+	default
+
+	# Switch operation mode from 'portable' to 'installed'
+	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
+
+	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
+		-i tv_bin/script/teamviewerd.service || die
+}
+
+src_install() {
+	local dst="/opt/${MY_PN}" # install destination
+
+	# Quirk:
+	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
+	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
+	# when changing the ABI of one of its dependencies. According to the
+	# TeamViewer devs, this binary is an unused remnant of previous Wine-
+	# based builds and will be removed in future releases anyway
+	rm tv_bin/script/libdepend
+
+	insinto ${dst}
+	doins -r tv_bin
+
+	# Set permissions for executables and libraries
+	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
+		fperms 755 ${dst}/${exe}
+	done
+
+	# No slotting here, binary expects this service path
+	newinitd "${FILESDIR}"/teamviewerd13.init teamviewerd
+	systemd_dounit tv_bin/script/teamviewerd.service
+
+	insinto /usr/share/dbus-1/services
+	doins tv_bin/script/com.teamviewer.TeamViewer.service
+	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
+
+	insinto /usr/share/polkit-1/actions
+	doins tv_bin/script/com.teamviewer.TeamViewer.policy
+
+	for size in 16 24 32 48 256; do
+		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
+	done
+
+	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
+	# have the undesired result of installing subdirectory 'doc' in /usr/
+	# share/doc/teamviewer-<version>)
+	for doc in $(find doc -type f); do
+		dodoc ${doc}
+	done
+
+	keepdir /etc/${MY_PN}
+	dosym ../../etc/${MY_PN} ${dst}/config
+
+	# Create directory and symlink for log files (NOTE: according to Team-
+	# Viewer devs, all paths are hard-coded in the binaries; therefore
+	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
+	# <major-version>')
+	keepdir /var/log/${MY_PN}
+	dosym ../../var/log/${MY_PN} ${dst}/logfiles
+
+	dodir /opt/bin
+	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
+	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
+
+	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "Please note that parallel installation of multiple versions of"
+	elog "TeamViewer is currently not supported at runtime. Bug #621818"
+	elog ""
+	elog "Before using TeamViewer, you need to start its daemon:"
+	elog "OpenRC:"
+	elog "# /etc/init.d/teamviewerd start"
+	elog "# rc-update add teamviewerd default"
+	elog
+	elog "Systemd:"
+	elog "# systemctl start teamviewerd.service"
+	elog "# systemctl enable teamviewerd.service"
+	elog
+	elog "To display additional command line options simply run:"
+	elog "$ teamviewer help"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}