bump; ebuild and new gentoo.patch submitted by newly designated proxy maintainer, herd re-assigned to proxy-maint, all wrt bug #533452. Being a binary package, runtested for install, bugs and runtime issues addressed in the course of bug #533452. 2 oldest versions and corresponding patches removed to prevent build up

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

7 files changed, 200 insertions, 490 deletions

diff --git a/net-misc/teamviewer/ChangeLog b/net-misc/teamviewer/ChangeLog
index f7cd46c3ebbc..bb85ff88024f 100644
--- a/net-misc/teamviewer/ChangeLog
+++ b/net-misc/teamviewer/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-misc/teamviewer
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/ChangeLog,v 1.15 2014/11/25 22:51:02 hasufell Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/ChangeLog,v 1.16 2015/03/09 05:29:03 idella4 Exp $
+
+*teamviewer-10.0.36281 (09 Mar 2015)
+
+  09 Mar 2015; Ian Delaney <idella4@gentoo.org>
+  +files/teamviewer-10.0.36281-gentoo.patch, +teamviewer-10.0.36281.ebuild,
+  -files/teamviewer-7.0.9377-POSIX.patch,
+  -files/teamviewer-8.0.20931-gentoo.patch, -teamviewer-7.0.9377.ebuild,
+  -teamviewer-8.0.20931.ebuild, metadata.xml:
+  bump; ebuild and new gentoo.patch submitted by newly designated proxy
+  maintainer, herd re-assigned to proxy-maint, all wrt bug #533452.  Being a
+  binary package, runtested for install, bugs and runtime issues addressed in
+  the course of bug #533452.  2 oldest versions and corresponding patches
+  removed to prevent build up
 
   25 Nov 2014; Julian Ospald <hasufell@gentoo.org> metadata.xml:
   drop maintainership
diff --git a/net-misc/teamviewer/files/teamviewer-10.0.36281-gentoo.patch b/net-misc/teamviewer/files/teamviewer-10.0.36281-gentoo.patch
new file mode 100644
index 000000000000..b3243908eb96
--- /dev/null
+++ b/net-misc/teamviewer/files/teamviewer-10.0.36281-gentoo.patch
@@ -0,0 +1,150 @@
+diff --git a/opt/teamviewer9/tv_bin/script/tvw_extra b/opt/teamviewer9/tv_bin/script/tvw_extra
+index 71164aa..848cd25 100644
+--- a/opt/teamviewer9/tv_bin/script/tvw_extra
++++ b/opt/teamviewer9/tv_bin/script/tvw_extra
+@@ -16,13 +16,6 @@
+   isInstalledTV || return
+   ABecho "teamviewer --passwd [PASSWD]"	"set a password (useful when installing remote (ssh)"
+   echo
+-  ABecho "teamviewer --daemon status"	"show current status of the TeamViewer daemon"
+-  ABecho "teamviewer --daemon start"	"start		TeamViewer daemon"
+-  ABecho "teamviewer --daemon stop"		"stop		TeamViewer daemon"
+-  ABecho "teamviewer --daemon restart"	"stop/start	TeamViewer daemon"
+-  ABecho "teamviewer --daemon disable"	"disable	TeamViewer daemon - don't start daemon on system startup"
+-  ABecho "teamviewer --daemon enable"	"enable		TeamViewer daemon - start daemon on system startup (default)"
+-  echo
+ }
+ 
+ function PrintVersion()
+@@ -37,19 +30,6 @@
+   PrintDaemonStatus
+   echo
+   PrintTeamViewerID
+-}
+-
+-function PrintDaemonStatus()
+-{
+-  local cmd="$(daemonCtl 'status')"
+-  local txt="n/a"
+-
+-  if [ isInstalledTV ] ; then
+-    txt="$(eval "$cmd")"
+-    [ $? = 0 ] || txt='n/a (error)'
+-  fi
+-  
+-  ABecho "teamviewerd status" "$txt"
+ }
+ 
+ function PrintTeamViewerID()
+@@ -64,20 +44,21 @@
+   ABecho "TeamViewer ID:" "$tvid"
+ 
+   if [ -z "$tvid" ] && isInstalledTV; then
+-    echo "Try restarting the TeamViewer daemon (e.g. teamviewer --daemon restart)"
++    echo "Try restarting the TeamViewer daemon."
+   fi
+ }
+ 
+ function SetPasswd()
+ {
++  echo "Stop your teamviewer daemon first, then press enter."
++  read
++
+   local pwd="$1"
+   [ -n "$pwd" ] || die 'no password specified'
+ 
+   installedTVorDie
+   isSuperUser || die 'You need root permissions for this operation'
+ 
+-  Run_Daemon 'stop' > /dev/null
+-  
+   "$TV_BIN_DIR/teamviewerd" --passwd "$pwd"
+   case $? in
+     0  ) echo 'ok'	;;
+@@ -88,12 +69,14 @@
+     *  ) echo 'unknown response'	;;
+    esac
+   
+-  Run_Daemon 'start' > /dev/null || die 'failed to restart the daemon'
+-  echo
++  echo "You may start your teamviewer daemon again."
+ }
+ 
+ function ExportLicense()
+ {
++  echo "Stop your teamviewer daemon first, then press enter."
++  read
++
+   local license="$1"
+   local path='/tmp/tv_global.conf'
+ 
+@@ -101,8 +84,6 @@
+ 
+   isSuperUser || die 'You need root permissions for this operation'
+ 
+-  Run_Daemon 'stop' > /dev/null
+-  
+   "$TV_BIN_DIR/teamviewerd" --export-license "$license" "$path"
+   case $? in
+     0  ) echo "ok - license exported to '$path'"		;;
+@@ -110,8 +91,7 @@
+     *  ) echo 'unknown response'	;;
+    esac
+   
+-  Run_Daemon 'start' > /dev/null || die 'failed to restart the daemon'
+-  echo
++  echo "You may start your teamviewer daemon again."
+ }
+ 
+ function StripPersonalInformation()
+diff --git a/opt/teamviewer9/tv_bin/script/tvw_main b/opt/teamviewer9/tv_bin/script/tvw_main
+index 8984db0..c6dff8d 100644
+--- a/opt/teamviewer9/tv_bin/script/tvw_main
++++ b/opt/teamviewer9/tv_bin/script/tvw_main
+@@ -4,7 +4,6 @@
+ source "$TV_SCRIPT_DIR/tvw_config"
+ source "$TV_SCRIPT_DIR/tvw_exec"
+ source "$TV_SCRIPT_DIR/tvw_extra"
+-source "$TV_SCRIPT_DIR/tvw_daemon"
+ source "$TV_SCRIPT_DIR/tvw_profile"
+ 
+ function Main()
+@@ -18,7 +17,6 @@
+     --help )			PrintHelp				;;
+     --version )			PrintVersion			;;
+     --info )			PrintInfo				;;
+-    --daemon )			Run_Daemon $opt			;;
+     --winecfg )	shift;	Run_WineCfg "$@"		;;
+     --regedit )	shift;	Run_RegEdit "$@"		;;
+     --kill )			Run_KillTeamViewer		;;
+@@ -170,18 +168,3 @@
+   Init
+   wine regedit "$@"
+ }
+-
+-function Run_Daemon()
+-{
+-  local opt="$1"
+-  
+-  installedTVorDie
+-
+-  case "$opt" in
+-    ( disable )					removeDaemon	|| rootSuggest	;;
+-    ( enable  )					installDaemon	|| rootSuggest	;;
+-    ( start | stop | restart )	cmdDaemon $opt	|| rootSuggest	;;
+-    ( status )					cmdDaemon $opt					;;
+-    ( * )						echo "unknown option '$opt'"	;;
+-  esac
+-}
+--- /opt/teamviewer10/tv_bin/script/teamviewerd.service	2015-01-15 12:55:57.000000000 -0500
++++ /opt/teamviewer10/tv_bin/script/teamviewerd.service	2015-03-08 19:00:17.297108541 -0400
+@@ -6,7 +6,7 @@
+ [Service]
+ Type = forking
+ PIDFile = /var/run/teamviewerd.pid
+-ExecStart = /opt/teamviewer/tv_bin/teamviewerd -d
++ExecStart = /opt/teamviewer10/tv_bin/teamviewerd -d
+ Restart = on-abort
+ StartLimitInterval = 60
+ StartLimitBurst = 10
+
diff --git a/net-misc/teamviewer/files/teamviewer-7.0.9377-POSIX.patch b/net-misc/teamviewer/files/teamviewer-7.0.9377-POSIX.patch
deleted file mode 100644
index ebbe5cd71894..000000000000
--- a/net-misc/teamviewer/files/teamviewer-7.0.9377-POSIX.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Feb 19 21:24:39 UTC 2013
-Subject: make scripts POSIX compliant
-
---- teamviewer7/.tvscript/.regedit
-+++ teamviewer7/.tvscript/.regedit
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- TV_script_dir="$(dirname "$(readlink -f "$0")")"
- "$TV_script_dir/wrapper" wine regedit "$@"
---- teamviewer7/.tvscript/.winecfg
-+++ teamviewer7/.tvscript/.winecfg
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- TV_script_dir="$(dirname "$(readlink -f "$0")")"
- "$TV_script_dir/wrapper" wine winecfg "$@"
---- teamviewer7/.tvscript/killteamviewer
-+++ teamviewer7/.tvscript/killteamviewer
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #  execute wineserver -k for all users running a TeamViewer
- #  (if not called by root, only successful for the current user)
- 
---- teamviewer7/.tvscript/teamviewer
-+++ teamviewer7/.tvscript/teamviewer
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- TV_script_dir="$(dirname "$(readlink -f "$0")")"
- "$TV_script_dir/wrapper" wine "c:\Program Files\TeamViewer\Version7\TeamViewer.exe" "$@"
---- teamviewer7/.tvscript/wrapper
-+++ teamviewer7/.tvscript/wrapper
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- TV_script_dir="$(dirname "$(readlink -f "$0")")"
- TV_base_dir="$(dirname "$TV_script_dir")"
-@@ -23,7 +23,7 @@
- export WINESERVER="$TV_Wine_bin/wineserver"
- 
- 
--function tv_Prepare()
-+tv_Prepare()
- {
-   exec 2>&1				# redirect stderr
- 
-@@ -33,7 +33,7 @@
-   setup_env
- }
- 
--function tv_Run()
-+tv_Run()
- {
-   exec 2>&1				# redirect stderr
- 
-@@ -43,7 +43,7 @@
-   "$TV_Wine_bin/$binary" "$@"
- }
- 
--function tv_LogInfo()
-+tv_LogInfo()
- {
-   exec 2>&1					# redirect stderr
- 
-@@ -71,7 +71,7 @@
-   echo " "
- }
- 
--function setup_wine()
-+setup_wine()
- {
-   # setup dosdevices and symlinks
-   local c_sym="$WINEPREFIX/dosdevices/c:"
-@@ -88,14 +88,14 @@
- }
- 
- # ensure path exists
--function make_path()
-+make_path()
- {
-   local path="$1"
-   [ -d "$path" ] || mkdir -p "$path" || die "Could not create $path"
- }
- 
- # setup/validate drive symlinks
--function setup_drive_symlink()
-+setup_drive_symlink()
- {
-   local sym="$1"
-   local dst="$2"
-@@ -107,7 +107,7 @@
- }
- 
- # setup logfile symlinks
--function setup_log_symlink
-+setup_log_symlink()
- {
-   local cuser=$(id -un)
-   local basepath="$WINEPREFIX/drive_c/users/$cuser"
-@@ -129,7 +129,7 @@
- }
- 
- # setup/validate win symlinks
--function setup_win_symlink()
-+setup_win_symlink()
- {
-   local sym="$WINEPREFIX/$1"
-   local dst="$TV_Wine_dir/$1"
-@@ -141,7 +141,7 @@
-   [ -d $(readlink -f "$sym") ] || ln -s "$dst" "$sym" || die "Could not create $sym (link to $dst)"
- }
- 
--function setup_prog_dir()
-+setup_prog_dir()
- {
-   local progdir="$WINEPREFIX/drive_c/Program Files/TeamViewer/Version7"
-   local progsrc="$TV_Wine_dir/drive_c/Program Files/TeamViewer/Version7"
-@@ -158,7 +158,7 @@
-   done
- }
- 
--function setup_wine_tweaks()
-+setup_wine_tweaks()
- {
-   # Enable Subpixel Hinting
-   if ! [ -e "$WINEPREFIX/.set_fontsmooth" ] ; then
-@@ -191,7 +191,7 @@
-   fi
- }
- 
--function setup_tar_env()
-+setup_tar_env()
- {
-   local dsrc="$TV_script_dir/teamviewer.desktop.template"
-   local ddst="$TV_script_dir/teamviewer.desktop"
-@@ -210,7 +210,7 @@
-   fi
- }
- 
--function setup_env()
-+setup_env()
- {
-   local tvwine="$TV_Wine_dir/drive_c/Program Files/TeamViewer/Version7/tvwine.dll.so"
- 
-@@ -227,7 +227,7 @@
-   (cd /etc; ls -m *-release *-version *_version > "$TV_profile/drive_c/distrelease" 2> /dev/null)
- }
- 
--function validate_user()
-+validate_user()
- {
-   local userid=$(id -un)
- 
-@@ -236,7 +236,7 @@
-   fi
- }
- 
--function validate_binary()
-+validate_binary()
- {
-   local binary="$1"
- 
-@@ -245,9 +245,11 @@
-   fi
- }
- 
--function die()
-+die()
- {
--  echo -e "\nError: $@\n"
-+  echo
-+  echo "Error: $@"
-+  echo
-   exit 1
- }
- 
diff --git a/net-misc/teamviewer/files/teamviewer-8.0.20931-gentoo.patch b/net-misc/teamviewer/files/teamviewer-8.0.20931-gentoo.patch
deleted file mode 100644
index 48c3712e8e74..000000000000
--- a/net-misc/teamviewer/files/teamviewer-8.0.20931-gentoo.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-commit d3060b46b357c399d522e8346dd6c9b99c322343
-Author: hasufell <hasufell@gentoo.org>
-Date:   Sat Sep 21 20:08:07 2013 +0200
-
-    remove all daemon/systemd related bits
-
-diff --git a/script/tvw_main b/script/tvw_main
-index bdff58b..1058d47 100644
---- a/script/tvw_main
-+++ b/script/tvw_main
-@@ -2,7 +2,6 @@
- 
- source "$TV_SCRIPT_DIR/tvw_config"
- source "$TV_SCRIPT_DIR/tvw_aux"
--source "$TV_SCRIPT_DIR/tvw_daemon"
- source "$TV_SCRIPT_DIR/tvw_profile"
- 
- 
-@@ -17,7 +16,6 @@ function Main()
-     --help )		PrintHelp			;;
-     --version )		PrintVersion			;;
-     --info )		PrintInfo			;;
--    --daemon )		Run_Daemon $opt			;;
-     --winecfg )		shift; Run_WineCfg "$@"		;;
-     --regedit )		shift; Run_RegEdit "$@"		;;
-     --kill )		Run_KillTeamViewer		;;
-@@ -174,26 +172,14 @@ function Run_RegEdit()
-   wine regedit "$@"
- }
- 
--function Run_Daemon()
--{
--  local opt="$1"
--
--  case "$opt" in
--    ( disable )				removeDaemon	|| rootSuggest	;;
--    ( enable  )				installDaemon	|| rootSuggest	;;
--    ( start | stop | restart )		cmdDaemon $opt	|| rootSuggest	;;
--    ( status )				cmdDaemon $opt			;;
--    ( * )				echo "unknown option '$opt'"	;;
--  esac
--}
--
- function SetPasswd()
- {
-+  echo "Stop your teamviewer daemon first, then press enter."
-+  read
-+
-   local pwd="$1"
-   [ -n "$pwd" ] || die 'no password specified'
- 
--  Run_Daemon 'stop' > /dev/null
--  
-   $TV_BIN_DIR/teamviewerd --passwd "$pwd"
-   case $? in
-     0  ) echo 'ok'	;;
-@@ -203,19 +189,19 @@ function SetPasswd()
-     *  ) echo 'unknown response'	;;
-    esac
-   
--  Run_Daemon 'start' || die 'failed to restart the daemon'
--  echo
-+   echo "You may start your teamviewer daemon again."
- }
- 
- function ExportLicense()
- {
-+  echo "Stop your teamviewer daemon first, then press enter."
-+  read
-+
-   local license="$1"
-   local path='/tmp/tv_global.conf'
- 
-   [ -n "$license" ] || die 'no license specified'
- 
--  Run_Daemon 'stop' > /dev/null
--  
-   $TV_BIN_DIR/teamviewerd --export-license "$license" "$path"
-   case $? in
-     0  ) echo "ok - license exported to '$path'"		;;
-@@ -223,8 +209,7 @@ function ExportLicense()
-     *  ) echo 'unknown response'	;;
-    esac
-   
--  Run_Daemon 'start' || die 'failed to restart the daemon'
--  echo
-+   echo "You may start your teamviewer daemon again."
- }
- 
- function CreateZipLog()
-@@ -265,20 +250,12 @@ function PrintHelp()
-   ABecho "teamviewer --passwd [PASSWD]"	"set a password (useful when installing remote (ssh)"
-   ABecho "teamviewer --ziplog"		"create a zip containing all teamviewer logs (useful when contacting support)"
-   echo
--  ABecho "teamviewer --daemon status"	"show current status of the TeamViewer daemon"
--  ABecho "teamviewer --daemon start"	"start		TeamViewer daemon"
--  ABecho "teamviewer --daemon stop"	"stop		TeamViewer daemon"
--  ABecho "teamviewer --daemon restart"	"stop/start	TeamViewer daemon"
--  ABecho "teamviewer --daemon disable"	"disable	TeamViewer daemon - don't start daemon on system startup"
--  ABecho "teamviewer --daemon enable"	"enable		TeamViewer daemon - start daemon on system startup (default)"
- }
- 
- function PrintInfo()
- {
-   PrintVersion
-   echo
--  PrintDaemonStatus
--  echo
-   PrintTeamViewerID
- }
- 
-@@ -287,15 +264,6 @@ function PrintVersion()
-   ABecho "TeamViewer" "$TV_VERSION"
- }
- 
--function PrintDaemonStatus()
--{
--  local cmd="$(daemonCtl 'status')"
--  local txt="$(eval "$cmd")"
--  [ $? = 0 ] || txt='n/a (error)'
--  
--  ABecho "teamviewerd status" "$txt"
--}
--
- function PrintTeamViewerID()
- {
-   local config="$TV_BASE_DIR/config/global.conf"
-@@ -307,6 +275,6 @@ function PrintTeamViewerID()
-     ABecho "TeamViewer ID:" "$tvid"
-   else
-     echo "TeamViewer ID: not found"
--    echo "Try restarting the TeamViewer daemon (e.g. teamviewer --daemon restart)"
-+    echo "Try restarting the TeamViewer daemon."
-   fi
- }
diff --git a/net-misc/teamviewer/metadata.xml b/net-misc/teamviewer/metadata.xml
index a89b1f8b3a31..b31fed4f87b0 100644
--- a/net-misc/teamviewer/metadata.xml
+++ b/net-misc/teamviewer/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
+<herd>proxy-maintainers</herd>
+        <maintainer>
+                <email>dct23@cornell.edu</email>
+                <name>Devrin Talen</name>
+                <description>Proxy maintainer. Assign bugs to him</description>
+        </maintainer>
 	<use>
 		<flag name="system-wine">Use <pkg>app-emulation/wine</pkg> instead of bundled one.</flag>
 	</use>
diff --git a/net-misc/teamviewer/teamviewer-8.0.20931.ebuild b/net-misc/teamviewer/teamviewer-10.0.36281.ebuild
index 7c1eb5bc070a..ac0b1696569e 100644
--- a/net-misc/teamviewer/teamviewer-8.0.20931.ebuild
+++ b/net-misc/teamviewer/teamviewer-10.0.36281.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/teamviewer-8.0.20931.ebuild,v 1.2 2014/06/18 20:40:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/teamviewer-10.0.36281.ebuild,v 1.1 2015/03/09 05:29:03 idella4 Exp $
 
 EAPI=5
 
@@ -9,13 +9,14 @@ 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="http://www.teamviewer.com"
 SRC_URI="http://www.teamviewer.com/download/version_${MV}x/teamviewer_linux.deb -> ${P}.deb"
 
 LICENSE="TeamViewer !system-wine? ( LGPL-2.1 )"
 SLOT=${MV}
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~*"
 IUSE="system-wine"
 
 RESTRICT="mirror"
@@ -27,15 +28,14 @@ RDEPEND="
 		amd64? (
 			app-emulation/emul-linux-x86-baselibs
 			app-emulation/emul-linux-x86-soundlibs
-			|| (
-				(
-					>=x11-libs/libSM-1.2.1-r1[abi_x86_32]
-					>=x11-libs/libX11-1.6.2[abi_x86_32]
-					>=x11-libs/libXau-1.0.7-r1[abi_x86_32]
-					>=x11-libs/libXdamage-1.1.4-r1[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXfixes-5.0.1[abi_x86_32]
-					>=x11-libs/libXtst-1.2.1-r1[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/libXext[abi_x86_32]
+				x11-libs/libXfixes[abi_x86_32]
+				x11-libs/libXtst[abi_x86_32]
 				)
 				app-emulation/emul-linux-x86-xlibs
 			)
@@ -55,7 +55,7 @@ RDEPEND="
 
 QA_PREBUILT="opt/teamviewer${MV}/*"
 
-S=${WORKDIR}/opt/teamviewer${MV}/tv_bin
+S=${WORKDIR}/opt/teamviewer/tv_bin
 
 make_winewrapper() {
 	cat << EOF > "${T}/${MY_PN}"
@@ -69,15 +69,10 @@ EOF
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 	sed \
-		-e "s/@TVV@/${MV}/g" \
+		-e "s#@TVV@#${MV}/tv_bin#g" \
 		"${FILESDIR}"/${PN}d.init > "${T}"/${PN}d${MV} || die
-
-	sed -i \
-		-e "s#/opt/teamviewer8/tv_bin/teamviewerd#/opt/${MY_PN}/teamviewerd#" \
-		script/${PN}d.service || die
 }
 
 src_install () {
@@ -87,28 +82,24 @@ src_install () {
 		doexe wine/drive_c/TeamViewer/*
 	else
 		# install scripts and .reg
-		insinto /opt/${MY_PN}/script
-		doins script/*.reg
-		exeinto /opt/${MY_PN}/script
-		doexe script/teamviewer{,_desktop} script/tvw_{aux,config,main,profile}
+		insinto /opt/${MY_PN}/tv_bin
+		doins -r *
+
+		exeinto /opt/${MY_PN}/tv_bin
+		doexe TeamViewer_Desktop
+		exeinto /opt/${MY_PN}/tv_bin/script
+		doexe script/teamviewer script/tvw_{aux,config,exec,extra,main,profile}
 
-		# install internal wine
-		insinto /opt/${MY_PN}
-		doins -r wine
-		dosym /opt/${MY_PN}/script/${PN} /opt/bin/${MY_PN}
+		dosym /opt/${MY_PN}/tv_bin/script/${PN} /opt/bin/${MY_PN}
 
 		# fix permissions
-		fperms 755 /opt/${MY_PN}/wine/bin/wine{,-preloader,server}
-		fperms 755 /opt/${MY_PN}/wine/drive_c/TeamViewer/TeamViewer{,_Desktop}.exe
+		fperms 755 /opt/${MY_PN}/tv_bin/wine/bin/wine{,-preloader,server}
+		fperms 755 /opt/${MY_PN}/tv_bin/wine/drive_c/TeamViewer/TeamViewer.exe
 		find "${D}"/opt/${MY_PN} -type f -name "*.so*" -execdir chmod 755 '{}' \;
 	fi
 
-	# necessary symlinks
-	dosym ./script/teamviewer /opt/${MY_PN}/TeamViewer
-	dosym ./script/teamviewer_desktop /opt/${MY_PN}/TeamViewer_Desktop
-
 	# install daemon binary
-	exeinto /opt/${MY_PN}
+	exeinto /opt/${MY_PN}/tv_bin
 	doexe ${PN}d
 
 	# set up logdir
@@ -120,10 +111,10 @@ src_install () {
 	dosym /etc/${MY_PN} /opt/${MY_PN}/config
 
 	doinitd "${T}"/${PN}d${MV}
-	systemd_dounit script/${PN}d.service
+	systemd_newunit script/${PN}d.service ${PN}d${MV}.service
 
 	newicon -s 48 desktop/${PN}.png ${MY_PN}.png
-	dodoc ../doc/linux_FAQ_{EN,DE}.txt
+#dodoc ../doc/linux_FAQ_{EN,DE}.txt
 	make_desktop_entry ${MY_PN} TeamViewer ${MY_PN}
 }
 
@@ -147,14 +138,7 @@ pkg_postinst() {
 	elog "Instead use the provided gentoo initscript:"
 	elog "  /etc/init.d/${PN}d${MV} start"
 	elog
-	elog "Logs are written to \"/var/log/teamviewer8\""
-
-	echo
-
-	eerror "UPDATE NOTICE!"
-	ewarn "If you update from teamviewer-8.0.17147"
-	ewarn "then you might have to remove \"~/.config/teamviewer8\", because"
-	ewarn "the install destination changed and the config might be invalid."
+	elog "Logs are written to \"/var/log/teamviewer${MV}\""
 }
 
 pkg_postrm() {
diff --git a/net-misc/teamviewer/teamviewer-7.0.9377.ebuild b/net-misc/teamviewer/teamviewer-7.0.9377.ebuild
deleted file mode 100644
index b42d7f0365aa..000000000000
--- a/net-misc/teamviewer/teamviewer-7.0.9377.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/teamviewer-7.0.9377.ebuild,v 1.5 2014/11/12 23:18:50 axs Exp $
-
-EAPI=5
-
-inherit eutils gnome2-utils
-
-# Major version
-MV=${PV/\.*}
-MY_PN=${PN}-${MV}
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="http://www.teamviewer.com"
-SRC_URI="http://download.teamviewer.com/download/version_${MV}x/teamviewer_linux.tar.gz -> ${P}.tar.gz"
-
-LICENSE="TeamViewer !system-wine? ( LGPL-2.1 )"
-SLOT=${MV}
-KEYWORDS="~amd64 ~x86"
-IUSE="system-wine"
-
-RESTRICT="mirror"
-
-RDEPEND="
-	x11-misc/xdg-utils
-	!system-wine? (
-		amd64? (
-			app-emulation/emul-linux-x86-baselibs
-			app-emulation/emul-linux-x86-soundlibs
-			|| (
-				(
-					>=x11-libs/libSM-1.2.1-r1[abi_x86_32]
-					>=x11-libs/libX11-1.6.2[abi_x86_32]
-					>=x11-libs/libXau-1.0.7-r1[abi_x86_32]
-					>=x11-libs/libXdamage-1.1.4-r1[abi_x86_32]
-					>=x11-libs/libXext-1.3.2[abi_x86_32]
-					>=x11-libs/libXfixes-5.0.1[abi_x86_32]
-					>=x11-libs/libXtst-1.2.1-r1[abi_x86_32]
-				)
-				app-emulation/emul-linux-x86-xlibs
-			)
-		)
-		x86? (
-			sys-libs/zlib
-			x11-libs/libSM
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXdamage
-			x11-libs/libXext
-			x11-libs/libXfixes
-			x11-libs/libXtst
-		)
-	)
-	system-wine? ( app-emulation/wine )"
-
-QA_PREBUILT="opt/teamviewer-${MV}/*"
-
-S=${WORKDIR}/teamviewer${MV}
-
-make_winewrapper() {
-	cat << EOF > "${T}/${MY_PN}"
-#!/bin/sh
-exec wine "/opt/${MY_PN}/bin/TeamViewer.exe" "\$@"
-EOF
-	chmod go+rx "${T}/${MY_PN}"
-	exeinto /opt/bin
-	doexe "${T}/${MY_PN}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-POSIX.patch
-}
-
-src_install () {
-	if use system-wine ; then
-		make_winewrapper
-		exeinto /opt/${MY_PN}/bin
-		doexe "${S}/.wine/drive_c/Program Files/TeamViewer/Version7/"*
-	else
-		# install scripts and .reg
-		insinto /opt/${MY_PN}/bin
-		find ".tvscript" -type f \( \! -name "${PN}.desktop*" -a \! -name "${PN}.png" \) \
-			-maxdepth 1 -execdir doins '{}' \;
-
-		# install wine
-		insinto /opt/${MY_PN}/wine
-		doins -r "${S}"/.wine/*
-		dosym /opt/${MY_PN}/bin/${PN} /opt/bin/${MY_PN}
-
-		# fix permissions
-		fperms 755 /opt/${MY_PN}/bin/{${PN},wrapper,killteamviewer}
-		fperms 755 /opt/${MY_PN}/wine/bin/wine{,-preloader,server}
-		fperms 755 "/opt/${MY_PN}/wine/drive_c/Program Files/TeamViewer/Version${MV}"/TeamViewer{,_Desktop}.exe
-		find "${D}"/opt/${MY_PN} -type f -name "*.so*" -execdir chmod 755 '{}' \;
-	fi
-
-	newicon -s 48 "${S}"/.tvscript/${PN}.png ${MY_PN}.png
-	dodoc 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
-
-	if use system-wine ; then
-		echo
-		eerror "IMPORTANT NOTICE!"
-		elog "Using ${PN} with system wine is not supported and experimental."
-		elog "Do not report gentoo bugs while using this version."
-		echo
-	fi
-
-	elog "Logs are written to:"
-	elog "  ~/.teamviewer/7"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}