From 7b9cde717e93f73eb9a8671134be2fd31efff4ab Mon Sep 17 00:00:00 2001
From: Sven Eden <sven.eden@gmx.de>
Date: Thu, 18 Aug 2016 11:04:35 +0200
Subject: net-misc/teamviewer : Upgrade to EAPI=6

---
 net-misc/teamviewer/Manifest                       |   2 +-
 net-misc/teamviewer/teamviewer-8.0.20931-r1.ebuild | 158 --------------------
 net-misc/teamviewer/teamviewer-8.0.20931-r2.ebuild | 160 +++++++++++++++++++++
 3 files changed, 161 insertions(+), 159 deletions(-)
 delete mode 100644 net-misc/teamviewer/teamviewer-8.0.20931-r1.ebuild
 create mode 100644 net-misc/teamviewer/teamviewer-8.0.20931-r2.ebuild

(limited to 'net-misc')

diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 45eba76..414789a 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -4,5 +4,5 @@ AUX teamviewer-8.0.17147-gentoo.patch 3506 SHA256 858c886f92a9f52591403722afbf43
 AUX teamviewer.service 135 SHA256 0a87001124d4f3f48aa7863a42dd39fec5e61ebf3e499f0622c932adcdfc11cd SHA512 4ab468ef72d08bd29bc0ac142fdb8d55c5264026941c2eaff36a89972cf2810b3e4e1d9b0709c2cf320c0dc62d3fb211f5dd9250923dfb4b518d15b6ed2f0b58 WHIRLPOOL 1922d1bfa6b3c2520954299eadb8975ea9854c8d026537e8e65f5090a55ed6bfcf77035cdcb7156f5b782d39103f5fc459a7c75e0cd862f6a27d9d6077d48f32
 AUX teamviewerd.init 600 SHA256 769f1455cb9b43d9a8907bd7b594db2af7d3905ca40c795ce0bbb4e016219bd8 SHA512 c79d8abb0c3f8623b6c063cd6775aacd362bce6ad245f11bba7fc868e601d62f163e1a2d0e9ec2d748565c031ce471e42a70aab88f8276aa74e22a44b7a7d46d WHIRLPOOL 7bf69e2c0b4e578b5b029265686f416d57d12ea6130c169846bd5843cb8b5e3ac337fe971883803f11ad90b87671b84b1f3132041087fedddea2d9d866086ec8
 DIST teamviewer-8.0.20931.deb 19567090 SHA256 6ad27b106a125c51075597c526b7b84fa9637af1aef6ee0514faa49694bf70dd SHA512 991fb4e572b312289097062577c9dfd9189d8405902e6965b224b1ad7e883de2dca99aa18b4ae2e333ce1cab65eade0f86eddccc32ed045140a34037c1a129d0 WHIRLPOOL e7ec1544e13b6cdc161783e36589b1cf07bbe60dd32f811d29e8c7b266477840550a08382c3b4683fbf00a6433305c135714bb30fb260c202a1bb828f0da8d45
-EBUILD teamviewer-8.0.20931-r1.ebuild 3921 SHA256 a3aaaebe232fc2c05dc568a0977cf557dff5cbaf82b179ece8608d864de381db SHA512 1716aaf12bd07743dcc8f2329a7dcb1259ec86fcfe6b2d29c2dd080b2552a5f74277ace55295e15074fe55e9ccaccf553eba36621032067c43de6230ea5d9ccc WHIRLPOOL a4fd6c6f8c51b5d06059504e49cf158a24c8e2ea6565c0d213aeb63711ab7d6ee10da173ee22c1b4b4c5b5ceb263587df926023508a25c3722c7d16d5a4650c0
+EBUILD teamviewer-8.0.20931-r2.ebuild 3933 SHA256 35667bcd9a46bcc489d26b6048d713ddbea0b20b474a4830c6ab661d1ee04e7c SHA512 90b9d05af2a51374088b708bf2c6edff16b69d72b46f5d46786e57500e18b5149f770bd7659ef05ab8d63bfaa88b7e7a9090e96261f0c1a7c08470cad0348a41 WHIRLPOOL 4a22a5488e6de340799b6b155077c61a80b6d51c8720a7a56b7c26ed1c6366145ca9cbf90568a59704af11c94797edf8cca171133dfe96fb52591d9ff6eaed18
 MISC metadata.xml 444 SHA256 639cdfda43bf7e000721768a1ea21f4f28b465aae9fc0f4b4ff46c1b55f6538a SHA512 a3b75ae69a85bd9eadeb0b58564b39486cc3f27b2588b76ed54529b03d3bd049ddeca4bf1552ceb26b58285e99fbd7b850814007365bb1e70d0c6c59aa64fea5 WHIRLPOOL 64614b52256d2dfdb9a7b94b33aaff022ceb52631bce602467422d7971339e26c5aef255c2f057d8157f00b53351f3a4f96dabbc6967f904611bf9853634ebbb
diff --git a/net-misc/teamviewer/teamviewer-8.0.20931-r1.ebuild b/net-misc/teamviewer/teamviewer-8.0.20931-r1.ebuild
deleted file mode 100644
index 4b28bb4..0000000
--- a/net-misc/teamviewer/teamviewer-8.0.20931-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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="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"
-IUSE="-system-wine"
-
-RESTRICT="mirror"
-
-RDEPEND="
-	app-shells/bash
-	x11-misc/xdg-utils
-	!system-wine? (
-		|| (
-			(
-				media-libs/alsa-lib[abi_x86_32(-)]
-				media-libs/freetype[abi_x86_32(-)]
-				sys-libs/zlib[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/libXrandr[abi_x86_32(-)]
-				x11-libs/libXrender[abi_x86_32(-)]
-				x11-libs/libSM[abi_x86_32(-)]
-				x11-libs/libXtst[abi_x86_32(-)]
-			)
-			(
-				app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-				app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
-				app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
-			)
-
-		)
-	)
-	system-wine? ( app-emulation/wine )"
-
-QA_PREBUILT="opt/teamviewer${MV}/*"
-
-S=${WORKDIR}/opt/teamviewer${MV}/tv_bin
-
-make_winewrapper() {
-	cat << EOF > "${T}/${MY_PN}"
-#!/bin/sh
-export WINEDLLPATH=/opt/${MY_PN}
-exec wine "/opt/${MY_PN}/TeamViewer.exe" "\$@"
-EOF
-	chmod go+rx "${T}/${MY_PN}"
-	exeinto /opt/bin
-	doexe "${T}/${MY_PN}"
-}
-
-src_prepare() {
-	#FIXME
-	#epatch "${FILESDIR}"/${PN}-8.0.17147-POSIX.patch \
-	#	"${FILESDIR}"/${PN}-8.0.17147-gentoo.patch
-
-	sed \
-		-e "s/@TVV@/${MV}/g" \
-		"${FILESDIR}"/${PN}d.init > "${T}"/${PN}d${MV} || die
-}
-
-src_install () {
-	if use system-wine ; then
-		make_winewrapper
-		exeinto /opt/${MY_PN}
-		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,daemon}
-
-		# install internal wine
-		insinto /opt/${MY_PN}
-		doins -r wine
-		dosym /opt/${MY_PN}/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
-		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}
-	doexe ${PN}d
-
-	# 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
-
-	doinitd "${T}"/${PN}d${MV}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	newicon -s 48 desktop/${PN}.png ${MY_PN}.png
-
-	#NODOCS...
-	#dodoc ../linux_FAQ_{EN,DE}.txt
-	make_desktop_entry ${MY_PN} TeamViewer ${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
-
-	eerror "STARTUP NOTICE:"
-	elog "You cannot start the daemon via \"teamviewer --daemon start\"."
-	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."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-8.0.20931-r2.ebuild b/net-misc/teamviewer/teamviewer-8.0.20931-r2.ebuild
new file mode 100644
index 0000000..3862f93
--- /dev/null
+++ b/net-misc/teamviewer/teamviewer-8.0.20931-r2.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=6
+
+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"
+IUSE="-system-wine"
+
+RESTRICT="mirror"
+
+RDEPEND="
+	app-shells/bash
+	x11-misc/xdg-utils
+	!system-wine? (
+		|| (
+			(
+				media-libs/alsa-lib[abi_x86_32(-)]
+				media-libs/freetype[abi_x86_32(-)]
+				sys-libs/zlib[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/libXrandr[abi_x86_32(-)]
+				x11-libs/libXrender[abi_x86_32(-)]
+				x11-libs/libSM[abi_x86_32(-)]
+				x11-libs/libXtst[abi_x86_32(-)]
+			)
+			(
+				app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+				app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+			)
+
+		)
+	)
+	system-wine? ( app-emulation/wine )"
+
+QA_PREBUILT="opt/teamviewer${MV}/*"
+
+S=${WORKDIR}/opt/teamviewer${MV}/tv_bin
+
+make_winewrapper() {
+	cat << EOF > "${T}/${MY_PN}"
+#!/bin/sh
+export WINEDLLPATH=/opt/${MY_PN}
+exec wine "/opt/${MY_PN}/TeamViewer.exe" "\$@"
+EOF
+	chmod go+rx "${T}/${MY_PN}"
+	exeinto /opt/bin
+	doexe "${T}/${MY_PN}"
+}
+
+src_prepare() {
+	#FIXME
+	#epatch "${FILESDIR}"/${PN}-8.0.17147-POSIX.patch \
+	#	"${FILESDIR}"/${PN}-8.0.17147-gentoo.patch
+
+	sed \
+		-e "s/@TVV@/${MV}/g" \
+		"${FILESDIR}"/${PN}d.init > "${T}"/${PN}d${MV} || die
+
+	eapply_user
+}
+
+src_install () {
+	if use system-wine ; then
+		make_winewrapper
+		exeinto /opt/${MY_PN}
+		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,daemon}
+
+		# install internal wine
+		insinto /opt/${MY_PN}
+		doins -r wine
+		dosym /opt/${MY_PN}/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
+		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}
+	doexe ${PN}d
+
+	# 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
+
+	doinitd "${T}"/${PN}d${MV}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	newicon -s 48 desktop/${PN}.png ${MY_PN}.png
+
+	#NODOCS...
+	#dodoc ../linux_FAQ_{EN,DE}.txt
+	make_desktop_entry ${MY_PN} TeamViewer ${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
+
+	eerror "STARTUP NOTICE:"
+	elog "You cannot start the daemon via \"teamviewer --daemon start\"."
+	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."
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
-- 
cgit v1.2.3-65-gdbad