gentoo resync : 20.12.2017

8 files changed, 16 insertions, 495 deletions

diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 35428abbe77c..7285d614eb18 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -1,18 +1,9 @@
 AUX teamviewer-9.0.32150-gentoo.patch 3876 BLAKE2B 3989e1b27851217910ca76e834d7df1449c46aea16077d9048183113a77f01ab58aec151d3f225c5bb0e080fb040faa5c66447ebc197c1dc294c2ca1ae23ca5f SHA512 7eef0090c836ca304554dd064ef105a8ed141e8300a829ebeb6b73e233413efdbdf8662a48da340c11f4e8cddeb00d4cfe7d761e3adf532e48f61fccf642752f
-AUX teamviewer.sh 1329 BLAKE2B 4f2c25dd47a5b9d73f335d04e62095d2031854156db9cbbde477619ac12a160958908ba3d3099e1391718b85a2d572fc5cd56044d2189dc77243764c97d05857 SHA512 44e9e519ed3056438952c448b40a0c231238379fc1a5737f0f4ae28860fb3cfa2d9abffbb7e2b9682dbd62a67ad672f4406c2696359ace8fc42d6d0171b0bab0
-AUX teamviewerd.conf 230 BLAKE2B 721573965b2dca1559140284b1a61c5e0a5aa7ca08e6e39e7e825f640a7a18f7e1842008191c28effcfcb5cc0befeb4301dda8b71bb4ef44c37c2f93be9121da SHA512 31d412278f61fc943f474a02db6de802f53da8b2b424adb5c8a1720bff4316ccb36d5bfbb505c056ef031dcfd52fef5ea28da96b348a76ddf9c624ca1c3cf78f
-AUX teamviewerd.init 785 BLAKE2B 760a0abf4b8a517d88e19e9e27eb4df0efde9b4e35aaabf67081435e388c0849806c7b46c5d1c4ec140ba501759d0d5ec2555d37e40c6349efd0590e09911fe0 SHA512 79f0f5a274e53e6d058e6f0d24f9f9964992391e36a06264aaaba8e219238be9f24ebf64bb3b0aac91dc9e8625835b243e51fb6325d1b0e42242d7b7186ff20d
 AUX teamviewerd13.init 285 BLAKE2B 7e81248f94f173569a76ec0a87926302b621c2086eb61796313d2fb4ea6decb26561398f6b435a7b55f93b22f7b9b64a6f996f7c3964af4de8e4271bff283c59 SHA512 2dc110140dc89b649cfd6ebc4312f23406a911b19b6aa59e877d8206f242c6ec8143cdbe63317909001becf253be216e081f31bcc667dc6a8b176cc31b79517d
 AUX teamviewerd9.init 482 BLAKE2B 841a1d6894aec1ed1249195613c01df526abb4833f7a81d266d708d39a0324197db46b433aa4cd937f1b5579ff7e66beee7272463429d9c99e99d9eadb1a2d0c SHA512 a229cf976e5ce7142dbb57989bb0e802a5b8cdf222f52ad768dfaaacb3ba160ab05d3e1ff1ca7770daf37d9c06e391c6a3c1843ec2be78a86450bcf2a3e4fca9
 DIST teamviewer-9.0.32150.deb 22898922 BLAKE2B 799aa6f48b69247a2695ca745e85d02ffa73df1375203dfc9da339673e6c18d861c4146ddbdc509bdc1114d5a2a7e5fdd4acf3c6e5da61fbba5aaa02fa4e3cfd SHA512 3e72ed5cab7a754a0aa75e533da92292ad004f66c55ac4c386b6f4a65cc41b14a8d9d7a5410dccdb90c1172cd33e52383289339ab44f0847a061655498ab8e4d
-DIST teamviewer_10.0.46203_i386.deb 43326592 BLAKE2B 874bad1cf2efdb7f4c1da69a625549b2c46e6a710ca3cf871dd21fd804b1b1b8294981d8f6e27c58231e51e41fb0dcd8f42f08adcefc4e2ded61c15fdc068425 SHA512 2133194b180648685a9e179df1a2888277f3038d9098d0d12b72de92026bdb969d90262514996df60dfcf6986e291ecb756fde9e0781fca5c872b5c82e5494ea
-DIST teamviewer_11.0.67687_i386.deb 47341822 BLAKE2B 3aa7d9af2c0c39fad22cec8391921d1034e2dc4bab70f9fb04c7dd7a9a8c23ae484717b3cf71856734bec08a26b4f409c205dde2b9b511b6d0fe78dc6182dc75 SHA512 3fbb0a2fc1bccd41ba9798305fada7e8266e1c9ed8509492ccb75e6f85995538ddc05ad72648e9f6c31cd5f17ad34f1ed3a300eeb38a4a703d3414c113d3e5a9
-DIST teamviewer_12.0.85001_i386.deb 46549564 BLAKE2B d3b821376c9385a1090e12708e17b8ad76f29f27c9d76ae140654eed7eca44d115275cd587462e52845260bd6616c88260c767350944730c30eac7c14467ae39 SHA512 4db490568936ec58a37157019071cf61ed5dde8b5951f6e524d1f64aa23f46dd40c8eda1e96a9d47c756c1427d82ccb9c58773b53dfa0ae60bbb94e03b4522a0
 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
-EBUILD teamviewer-10.0.46203.ebuild 3520 BLAKE2B 3e38979fb0b258e669c8997187a14c1b64440323b2d536da9102eebafc525e0b4f1d280870f9170eb5b62e5900dce9b3869e82c4e71c352ceb533fb6d613b8e2 SHA512 a2b9587b4c9fafaab23d67ca0dce7c99b8769f9663e865762fb95269e825c2ab269cf1b54d69949566c1cb04d5fd9df93e0fec4c4d5e455268f24752a11dfebe
-EBUILD teamviewer-11.0.67687.ebuild 3610 BLAKE2B 580a0593e67cbe750669cba76762a5577ea6ae77b245a047aea66996be4e84c493521b3f5afbc3d751e3fe1e87ef0d378248e860d6dfa5978f8ac92bb95815f1 SHA512 df84cf8082d6626e5e2e212c7b9910bd953ac4346d06a74181813a4b0bcafcb2691912064d5a0cba6facca253f2782bbb99ad9103ed68a4ed3e8429561229f67
-EBUILD teamviewer-12.0.85001.ebuild 3610 BLAKE2B cb5c04a0cd3afdb3d37342d682703ee164e78e2640c9ec46c3ea91a354b317aa7125695b278eabc29ef14df03d9dfdc29c1fe8282a4b58ed5256b89ce1bf200a SHA512 2a6876746bb249e6e1e7ea6d215a74eb98cd4d323dd9a40cbd1a8eff4784568dda16521a163fa4c511479d95188b8fe649da55f92520579bcffe1c61299921e7
-EBUILD teamviewer-13.0.5693.ebuild 3549 BLAKE2B 8c72a12ce76a77bda683a0c48f29f174100d12f6de595ded438b4f4fd4279310407e5260a88e764787c4423537bba11ecea7c422bfee86e455108b2cd9c2b49c SHA512 7a6698156b57f3077049724c7a1ae7eb149882b59274d45310acae4ddfc1bf07df25fce17893177d379dad6131873927244812d2c8ee5060ce408b6cb9d9f315
+EBUILD teamviewer-13.0.5693-r2.ebuild 3703 BLAKE2B 7a313f3cd58f1535bbfbd522ba5fe093633888134ff406dc1156fb0afa460100c33311b53490327c56fe9ad751f4179209ef1776d7c4a847da85079557e5306c SHA512 0a3c6f8b0cab36cf41ebfd78332451a719ad059f1217d30354addb6ba0264e31fe99ea6aead912ef138feab71de61787224869253a755efb6d83047dcc6bd49b
 EBUILD teamviewer-9.0.32150.ebuild 3260 BLAKE2B c81782a09b0512cce296c3774f300b870a1631ab395d55eb023543ac54338fd5218e9a2de33fecfefdc81281136ee692b1c82e61db8e676e2e769895ed2de917 SHA512 29b18f606daf48400ad770603ad735a917ad7aa50ce86b280f21ae6e36f978c5baa5ed34749a26206563f0d37c67a144365134d5ee61d8b8e21f61a996223c3c
 MISC metadata.xml 360 BLAKE2B 8262ba7d586d5c333960c11f37fb8fc74099c73d05da6f99e33d3f7ede2eb8daf02e06fda33006124f0bbb1c2b9721da5b82e2a4ca4a5fd72944fbd4a5eadac8 SHA512 b4c800d41aef54f33463e7c4351f3484c4be4806c3a5d0ba6687f5fbf68d17d428fd87eb9929aefaf997e76b5b8a25cfa83a695e03c9dd727c1f3da121da4836
diff --git a/net-misc/teamviewer/files/teamviewer.sh b/net-misc/teamviewer/files/teamviewer.sh
deleted file mode 100644
index 70fc4e8a80af..000000000000
--- a/net-misc/teamviewer/files/teamviewer.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-tv="$(basename $0)"
-tvdir="/opt/${tv}"
-version="@TVV@"
-tvw_version=""
-prefix="${HOME}/.wine-${tv}"
-arch="win32"
-native=true
-
-if $native; then
-	export WINEDLLPATH="${prefix}/drive_c/TeamViewer"
-else
-	export WINEDLLPATH="${tvdir}/tv_bin/wine/lib:${tvdir}/tv_bin/wine/lib/wine:${prefix}/drive_c/TeamViewer"
-	export PATH="${tvdir}/tv_bin/wine/bin:${PATH}"
-fi
-export WINEARCH="${arch}"
-export WINEPREFIX="${prefix}"
-
-if [ ! -d "${prefix}" ]; then
-	echo "Creating prefix..."
-	wineboot -i &> /dev/null
-	mkdir -p "${prefix}/drive_c/TeamViewer"
-fi
-
-if [ -e "${prefix}/tvw-version" ]; then
-	tvw_version=$(<"${prefix}/tvw-version")
-fi
-
-#If version has changed or new instance
-if [ "${version}" != "${tvw_version}" ]; then
-	echo "Copying TeamViewer files to prefix..."
-	cp -R "/opt/${tv}/wine/drive_c/TeamViewer" "${prefix}/drive_c/"
-	echo "Creating config and log directories in ~/.config/teamviewer@TVMV@"
-	mkdir -p "${HOME}"/.config/teamviewer@TVMV@/{config,logfiles}
-	echo "${version}" > "${prefix}/tvw-version"
-fi
-
-TV_BASE_DIR="${tvdir}"
-TV_BIN_DIR="${TV_BASE_DIR}/tv_bin"
-TV_PROFILE="${prefix}"
-TV_LOG_DIR="${TV_PROFILE}/logfiles"
-TV_CFG_DIR="${TV_PROFILE}/config"
-TV_USERHOME="${HOME}"
-
-wine "C:\\TeamViewer\\TeamViewer.exe" "\${[@]}" &> \
-	"${HOME}/.config/teamviewer@TVMV@/logfiles/$(date +%Y.%m.%d-%H:%M:%S)-wine.log"
diff --git a/net-misc/teamviewer/files/teamviewerd.conf b/net-misc/teamviewer/files/teamviewerd.conf
deleted file mode 100644
index e949660678be..000000000000
--- a/net-misc/teamviewer/files/teamviewerd.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# This entry can be used to specify a default daemon password.
-# It is set by running /etc/init.d/teamviewerd@TVV@ passwd.
-# The password must be between 8 and 12 characters, and special characters should
-# be avoided.
-
-PASSWD=""
diff --git a/net-misc/teamviewer/files/teamviewerd.init b/net-misc/teamviewer/files/teamviewerd.init
deleted file mode 100644
index 3ca37da3ebc4..000000000000
--- a/net-misc/teamviewer/files/teamviewerd.init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command=/opt/teamviewer@TVV@/tv_bin/teamviewerd
-command_args=-d
-description="daemon for TeamViewer"
-pidfile=/var/run/teamviewerd.pid
-
-extra_stopped_commands="passwd"
-
-passwd() {
-	if [ -z "${PASSWD}" ]; then
-		eerror "No password specified."
-		exit 1
-	fi
-
-	ebegin "Attempting to change password."
-	/opt/teamviewer@TVV@/tv_bin/teamviewerd --passwd "${PASSWD}"
-	retr=$?
-	case $retr in
-		0)	einfo "Password successfully set." ;;
-		11|12)	eerror "Password must be between 8 and 12 characters.";;
-		13)	eerror "Invalid characters detected.";;
-		14)	eerror "Password invalid. Validation failed.";;
-		*)	eerror "Unknown error code";;
-	esac
-	eend $retr
-	exit $retr
-}
diff --git a/net-misc/teamviewer/teamviewer-10.0.46203.ebuild b/net-misc/teamviewer/teamviewer-10.0.46203.ebuild
deleted file mode 100644
index 3950aeb34533..000000000000
--- a/net-misc/teamviewer/teamviewer-10.0.46203.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils gnome2-utils systemd unpacker
-
-# Major version
-MV=${PV/\.*}
-MY_PN=${PN}${MV}
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="https://download.teamviewer.com/download/version_${MV}x/${PN}_${PV}_i386.deb"
-
-IUSE="+system-wine"
-
-LICENSE="TeamViewer LGPL-2.1" #LGPL for bundled wine
-SLOT=${MV}
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	system-wine? ( app-emulation/wine[abi_x86_32(-)] )
-	dev-qt/qtcore:4[abi_x86_32(-)]
-	dev-qt/qtgui:4[abi_x86_32(-)]
-	dev-qt/qtwebkit:4[abi_x86_32(-)]
-	media-libs/alsa-lib[abi_x86_32(-)]
-	x11-libs/libICE[abi_x86_32(-)]
-	x11-libs/libSM[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXau[abi_x86_32(-)]
-	x11-libs/libXdamage[abi_x86_32(-)]
-	x11-libs/libXdmcp[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/libXfixes[abi_x86_32(-)]
-	x11-libs/libXrandr[abi_x86_32(-)]
-	x11-libs/libXtst[abi_x86_32(-)]"
-
-QA_PREBUILT="opt/teamviewer${MV}/*"
-
-S=${WORKDIR}/opt/teamviewer/tv_bin
-
-src_prepare() {
-	#epatch "${FILESDIR}/${P}-gentoo.patch"
-	sed \
-		-e "s/@TVV@/${MV}/g" \
-		"${FILESDIR}"/${PN}d.init > "${T}"/init || die
-	sed \
-		-e "s:/opt/teamviewer:/opt/teamviewer${MV}:g" \
-		"script//${PN}d.service" > "${T}/${PN}d.service" || die
-	sed \
-		-e "s/@TVV@/${PV}/g" \
-		-e "s/@TVMV@/${MV}/g" \
-		"${FILESDIR}"/${PN}.sh > "${T}"/sh || die
-	if ! use system-wine; then
-		sed -i "s/native=true/native=false/g" "${T}/sh" || die
-	fi
-}
-
-src_install () {
-	local destdir="/opt/${MY_PN}"
-
-	# install wine prefix skeleton and reg keys
-	insinto "${destdir}/wine/drive_c/"
-	doins -r wine/drive_c/TeamViewer/
-	# install bundled wine if necessary
-	if ! use system-wine; then
-		insinto "${destdir}/tv_bin/wine"
-		doins -r wine/{lib,share}
-		exeinto "${destdir}/tv_bin/wine/bin"
-		doexe wine/bin/{wine,wine-preloader,wineserver}
-	fi
-	# fix permissions
-	fperms 755 ${destdir}/wine/drive_c/TeamViewer/TeamViewer.exe
-
-	# install wine wrapper
-	exeinto "/opt/bin"
-	newexe "${T}/sh" "${MY_PN}"
-
-	# install teamviewer linux binaries
-	exeinto "${destdir}/tv_bin"
-	doexe TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32
-	use amd64 && doexe TVGuiSlave.64
-
-	# install daemon binary and scripts
-	exeinto "${destdir}/tv_bin"
-	doexe ${PN}d
-	newinitd "${T}/init" ${PN}d${MV}
-	newconfd "${FILESDIR}/${PN}d.conf" ${PN}d${MV}
-	systemd_newunit "${T}/${PN}d.service" ${PN}d${MV}.service
-
-	# set up logdir
-	keepdir /var/log/${MY_PN}
-	dosym /var/log/${MY_PN} /opt/${MY_PN}/logfiles
-
-	# set up config dir
-	keepdir /etc/${MY_PN}
-	dosym /etc/${MY_PN} /opt/${MY_PN}/config
-
-	newicon -s 48 desktop/${PN}.png ${MY_PN}.png
-	#dodoc ../doc/linux_FAQ_{EN,DE}.txt
-	make_desktop_entry ${MY_PN} "TeamViewer ${MV}" ${MY_PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "TeamViewer from upstream uses an overly-complicated set of bash"
-	elog "scripts to start the program.  This has been simplified for Gentoo"
-	elog "use.  Any issues should be reported via bugzilla."
-	if use system-wine; then
-		elog
-		elog "Due to bug #552016, when using system wine, one is not able to"
-		elog "share one's own screen.  At this time, this may be remedied by"
-		elog "toggling the system-wine USE flag."
-	fi
-	elog
-	elog "The end-user client requires running the accompanying daemon,"
-	elog "available via init-scripts."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-11.0.67687.ebuild b/net-misc/teamviewer/teamviewer-11.0.67687.ebuild
deleted file mode 100644
index 07243d0be1e6..000000000000
--- a/net-misc/teamviewer/teamviewer-11.0.67687.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils gnome2-utils systemd unpacker
-
-# Major version
-MV=${PV/\.*}
-MY_PN=${PN}${MV}
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="https://download.teamviewer.com/download/version_${MV}x/${PN}_${PV}_i386.deb"
-
-IUSE="+system-wine"
-
-LICENSE="TeamViewer LGPL-2.1" #LGPL for bundled wine
-SLOT=${MV}
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	system-wine? ( app-emulation/wine[abi_x86_32(-),png] )
-	!system-wine? ( media-libs/libpng:1.2[abi_x86_32(-)] )
-	sys-apps/dbus[abi_x86_32(-)]
-	dev-qt/qtcore:4[abi_x86_32(-)]
-	dev-qt/qtgui:4[abi_x86_32(-)]
-	dev-qt/qtwebkit:4[abi_x86_32(-)]
-	media-libs/alsa-lib[abi_x86_32(-)]
-	x11-libs/libICE[abi_x86_32(-)]
-	x11-libs/libSM[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXau[abi_x86_32(-)]
-	x11-libs/libXdamage[abi_x86_32(-)]
-	x11-libs/libXdmcp[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/libXfixes[abi_x86_32(-)]
-	x11-libs/libXrandr[abi_x86_32(-)]
-	x11-libs/libXtst[abi_x86_32(-)]"
-
-QA_PREBUILT="opt/teamviewer${MV}/*"
-
-S=${WORKDIR}/opt/teamviewer/tv_bin
-
-src_prepare() {
-	#epatch "${FILESDIR}/${P}-gentoo.patch"
-	sed \
-		-e "s/@TVV@/${MV}/g" \
-		"${FILESDIR}"/${PN}d.init > "${T}"/init || die
-	sed \
-		-e "s:/opt/teamviewer:/opt/teamviewer${MV}:g" \
-		"script//${PN}d.service" > "${T}/${PN}d.service" || die
-	sed \
-		-e "s/@TVV@/${PV}/g" \
-		-e "s/@TVMV@/${MV}/g" \
-		"${FILESDIR}"/${PN}.sh > "${T}"/sh || die
-	if ! use system-wine; then
-		sed -i "s/native=true/native=false/g" "${T}/sh" || die
-	fi
-}
-
-src_install () {
-	local destdir="/opt/${MY_PN}"
-
-	# install wine prefix skeleton and reg keys
-	insinto "${destdir}/wine/drive_c/"
-	doins -r wine/drive_c/TeamViewer/
-	# install bundled wine if necessary
-	if ! use system-wine; then
-		insinto "${destdir}/tv_bin/wine"
-		doins -r wine/{lib,share}
-		exeinto "${destdir}/tv_bin/wine/bin"
-		doexe wine/bin/{wine,wine-preloader,wineserver}
-	fi
-	# fix permissions
-	fperms 755 ${destdir}/wine/drive_c/TeamViewer/TeamViewer.exe
-
-	# install wine wrapper
-	exeinto "/opt/bin"
-	newexe "${T}/sh" "${MY_PN}"
-
-	# install teamviewer linux binaries
-	exeinto "${destdir}/tv_bin"
-	doexe TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32
-	use amd64 && doexe TVGuiSlave.64
-
-	# install daemon binary and scripts
-	exeinto "${destdir}/tv_bin"
-	doexe ${PN}d
-	newinitd "${T}/init" ${PN}d${MV}
-	newconfd "${FILESDIR}/${PN}d.conf" ${PN}d${MV}
-	systemd_newunit "${T}/${PN}d.service" ${PN}d${MV}.service
-
-	# set up logdir
-	keepdir /var/log/${MY_PN}
-	dosym /var/log/${MY_PN} /opt/${MY_PN}/logfiles
-
-	# set up config dir
-	keepdir /etc/${MY_PN}
-	dosym /etc/${MY_PN} /opt/${MY_PN}/config
-
-	newicon -s 48 desktop/${PN}.png ${MY_PN}.png
-	#dodoc ../doc/linux_FAQ_{EN,DE}.txt
-	make_desktop_entry ${MY_PN} "TeamViewer ${MV}" ${MY_PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "TeamViewer from upstream uses an overly-complicated set of bash"
-	elog "scripts to start the program.  This has been simplified for Gentoo"
-	elog "use.  Any issues should be reported via bugzilla."
-	if use system-wine; then
-		elog
-		elog "Due to bug #552016, when using system wine, one is not able to"
-		elog "share one's own screen.  At this time, this may be remedied by"
-		elog "toggling the system-wine USE flag."
-	fi
-	elog
-	elog "The end-user client requires running the accompanying daemon,"
-	elog "available via init-scripts."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-12.0.85001.ebuild b/net-misc/teamviewer/teamviewer-12.0.85001.ebuild
deleted file mode 100644
index 28819fde7126..000000000000
--- a/net-misc/teamviewer/teamviewer-12.0.85001.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils gnome2-utils systemd unpacker
-
-# Major version
-MV=${PV/\.*}
-MY_PN=${PN}${MV}
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="https://download.teamviewer.com/download/version_${MV}x/${PN}_${PV}_i386.deb"
-
-IUSE="+system-wine"
-
-LICENSE="TeamViewer LGPL-2.1" #LGPL for bundled wine
-SLOT=${MV}
-KEYWORDS="-* ~amd64 ~x86"
-
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	system-wine? ( app-emulation/wine[abi_x86_32(-),png] )
-	!system-wine? ( media-libs/libpng:1.2[abi_x86_32(-)] )
-	sys-apps/dbus[abi_x86_32(-)]
-	dev-qt/qtcore:4[abi_x86_32(-)]
-	dev-qt/qtgui:4[abi_x86_32(-)]
-	dev-qt/qtwebkit:4[abi_x86_32(-)]
-	media-libs/alsa-lib[abi_x86_32(-)]
-	x11-libs/libICE[abi_x86_32(-)]
-	x11-libs/libSM[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXau[abi_x86_32(-)]
-	x11-libs/libXdamage[abi_x86_32(-)]
-	x11-libs/libXdmcp[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/libXfixes[abi_x86_32(-)]
-	x11-libs/libXrandr[abi_x86_32(-)]
-	x11-libs/libXtst[abi_x86_32(-)]"
-
-QA_PREBUILT="opt/teamviewer${MV}/*"
-
-S=${WORKDIR}/opt/teamviewer/tv_bin
-
-src_prepare() {
-	#epatch "${FILESDIR}/${P}-gentoo.patch"
-	sed \
-		-e "s/@TVV@/${MV}/g" \
-		"${FILESDIR}"/${PN}d.init > "${T}"/init || die
-	sed \
-		-e "s:/opt/teamviewer:/opt/teamviewer${MV}:g" \
-		"script//${PN}d.service" > "${T}/${PN}d.service" || die
-	sed \
-		-e "s/@TVV@/${PV}/g" \
-		-e "s/@TVMV@/${MV}/g" \
-		"${FILESDIR}"/${PN}.sh > "${T}"/sh || die
-	if ! use system-wine; then
-		sed -i "s/native=true/native=false/g" "${T}/sh" || die
-	fi
-}
-
-src_install () {
-	local destdir="/opt/${MY_PN}"
-
-	# install wine prefix skeleton and reg keys
-	insinto "${destdir}/wine/drive_c/"
-	doins -r wine/drive_c/TeamViewer/
-	# install bundled wine if necessary
-	if ! use system-wine; then
-		insinto "${destdir}/tv_bin/wine"
-		doins -r wine/{lib,share}
-		exeinto "${destdir}/tv_bin/wine/bin"
-		doexe wine/bin/{wine,wine-preloader,wineserver}
-	fi
-	# fix permissions
-	fperms 755 ${destdir}/wine/drive_c/TeamViewer/TeamViewer.exe
-
-	# install wine wrapper
-	exeinto "/opt/bin"
-	newexe "${T}/sh" "${MY_PN}"
-
-	# install teamviewer linux binaries
-	exeinto "${destdir}/tv_bin"
-	doexe TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32
-	use amd64 && doexe TVGuiSlave.64
-
-	# install daemon binary and scripts
-	exeinto "${destdir}/tv_bin"
-	doexe ${PN}d
-	newinitd "${T}/init" ${PN}d${MV}
-	newconfd "${FILESDIR}/${PN}d.conf" ${PN}d${MV}
-	systemd_newunit "${T}/${PN}d.service" ${PN}d${MV}.service
-
-	# set up logdir
-	keepdir /var/log/${MY_PN}
-	dosym /var/log/${MY_PN} /opt/${MY_PN}/logfiles
-
-	# set up config dir
-	keepdir /etc/${MY_PN}
-	dosym /etc/${MY_PN} /opt/${MY_PN}/config
-
-	newicon -s 48 desktop/${PN}.png ${MY_PN}.png
-	#dodoc ../doc/linux_FAQ_{EN,DE}.txt
-	make_desktop_entry ${MY_PN} "TeamViewer ${MV}" ${MY_PN}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "TeamViewer from upstream uses an overly-complicated set of bash"
-	elog "scripts to start the program.  This has been simplified for Gentoo"
-	elog "use.  Any issues should be reported via bugzilla."
-	if use system-wine; then
-		elog
-		elog "Due to bug #552016, when using system wine, one is not able to"
-		elog "share one's own screen.  At this time, this may be remedied by"
-		elog "toggling the system-wine USE flag."
-	fi
-	elog
-	elog "The end-user client requires running the accompanying daemon,"
-	elog "available via init-scripts."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-13.0.5693.ebuild b/net-misc/teamviewer/teamviewer-13.0.5693-r2.ebuild
index 01d79a30903e..c8eeedebcf6a 100644
--- a/net-misc/teamviewer/teamviewer-13.0.5693.ebuild
+++ b/net-misc/teamviewer/teamviewer-13.0.5693-r2.ebuild
@@ -66,8 +66,9 @@ src_install() {
 		fperms 755 ${dst}/${exe}
 	done
 
-	newinitd "${FILESDIR}"/teamviewerd13.init teamviewerd${SLOT}
-	systemd_newunit tv_bin/script/${PN}d.service ${PN}d${SLOT}.service
+	# 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
@@ -77,7 +78,7 @@ src_install() {
 	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 ${MY_PN}.png
+		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
 	done
 
 	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
@@ -98,26 +99,29 @@ src_install() {
 	dosym ../../var/log/${MY_PN} ${dst}/logfiles
 
 	dodir /opt/bin
-	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd${SLOT}
-	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/${MY_PN}
+	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
+	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
 
-	make_desktop_entry ${MY_PN} "TeamViewer ${SLOT}" ${MY_PN}
+	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${SLOT} start"
-	elog "# rc-update add teamviewerd${SLOT} default"
+	elog "# /etc/init.d/teamviewerd start"
+	elog "# rc-update add teamviewerd default"
 	elog
 	elog "Systemd:"
-	elog "# systemctl start teamviewerd${SLOT}.service"
-	elog "# systemctl enable teamviewerd${SLOT}.service"
+	elog "# systemctl start teamviewerd.service"
+	elog "# systemctl enable teamviewerd.service"
 	elog
 	elog "To display additional command line options simply run:"
-	elog "$ ${MY_PN} help"
+	elog "$ teamviewer help"
 }
 
 pkg_postrm() {