Remove PID location edit in systemd service file. Resolves bug #552564

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 18F89C67)

3 files changed, 27 insertions, 15 deletions

diff --git a/net-misc/teamviewer/ChangeLog b/net-misc/teamviewer/ChangeLog
index 67208d54bb3b..cad0a75cf341 100644
--- a/net-misc/teamviewer/ChangeLog
+++ b/net-misc/teamviewer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/teamviewer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/ChangeLog,v 1.21 2015/06/21 02:56:05 np-hardass Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/ChangeLog,v 1.22 2015/06/30 19:49:11 np-hardass Exp $
+
+*teamviewer-10.0.41499-r1 (30 Jun 2015)
+
+  30 Jun 2015; NP-Hardass <NP-Hardass@gentoo.org>
+  +teamviewer-10.0.41499-r1.ebuild, -teamviewer-10.0.41499.ebuild,
+  files/teamviewer.sh:
+  Remove PID location edit in systemd service file.  Resolves bug #552564
 
   21 Jun 2015; NP-Hardass <NP-Hardass@gentoo.org> metadata.xml:
   Fix email address in metadata.xml.
diff --git a/net-misc/teamviewer/files/teamviewer.sh b/net-misc/teamviewer/files/teamviewer.sh
index 2fafbdfbc348..70fc4e8a80af 100755
--- a/net-misc/teamviewer/files/teamviewer.sh
+++ b/net-misc/teamviewer/files/teamviewer.sh
@@ -1,15 +1,26 @@
 #!/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..."
-	env WINEARCH="${arch}" WINEPREFIX="${prefix}" wineboot -i &> /dev/null
+	wineboot -i &> /dev/null
+	mkdir -p "${prefix}/drive_c/TeamViewer"
 fi
 
 if [ -e "${prefix}/tvw-version" ]; then
@@ -19,25 +30,18 @@ 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/TeamViewer"
+	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="${tv}"
+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}"
 
-if $native; then
-	export WINEDLLPATH="${prefix}/drive_c/TeamViewer"
-else
-	export WINEDLLPATH="${tv}/tv_bin/wine/lib:${tv}/tv_bin/wine/lib/wine:${prefix}/drive_c/TeamViewer"
-	export PATH="${tv}/tv_bin/wine/bin:${PATH}"
-fi
-export WINEPREFIX="${prefix}"
 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/teamviewer-10.0.41499.ebuild b/net-misc/teamviewer/teamviewer-10.0.41499-r1.ebuild
index 1e3017730cff..6b0d13569bc2 100644
--- a/net-misc/teamviewer/teamviewer-10.0.41499.ebuild
+++ b/net-misc/teamviewer/teamviewer-10.0.41499-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-10.0.41499.ebuild,v 1.1 2015/06/18 08:35:17 np-hardass Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/teamviewer-10.0.41499-r1.ebuild,v 1.1 2015/06/30 19:49:11 np-hardass Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="https://download.teamviewer.com/download/version_${MV}x/${PN}_${PV}_i38
 
 IUSE="+system-wine"
 
-LICENSE="TeamViewer"
+LICENSE="TeamViewer LGPL-2.1" #LGPL for bundled wine
 SLOT=${MV}
 KEYWORDS="-* ~amd64 ~x86"
 
@@ -48,7 +48,6 @@ src_prepare() {
 		-e "s/@TVV@/${MV}/g" \
 		"${FILESDIR}"/${PN}d.init > "${T}"/init || die
 	sed \
-		-e "s/teamviewerd.pid/teamviewerd${MV}.pid/g" \
 		-e "s:/opt/teamviewer:/opt/teamviewer${MV}:g" \
 		"script//${PN}d.service" > "${T}/${PN}d.service" || die
 	sed \
@@ -69,7 +68,9 @@ src_install () {
 	# install bundled wine if necessary
 	if ! use system-wine; then
 		insinto "${destdir}/tv_bin/wine"
-		doins -r wine/{bin,lib}
+		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