From 265dbe5dbc14c199299496c6db8fce3f76647015 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 21 Sep 2018 18:00:10 +0100 Subject: gentoo resync : 21.09.2018 --- .../files/teamviewer-9.0.32150-gentoo.patch | 138 --------------------- net-misc/teamviewer/files/teamviewerd9.init | 25 ---- 2 files changed, 163 deletions(-) delete mode 100644 net-misc/teamviewer/files/teamviewer-9.0.32150-gentoo.patch delete mode 100644 net-misc/teamviewer/files/teamviewerd9.init (limited to 'net-misc/teamviewer/files') diff --git a/net-misc/teamviewer/files/teamviewer-9.0.32150-gentoo.patch b/net-misc/teamviewer/files/teamviewer-9.0.32150-gentoo.patch deleted file mode 100644 index 1df4632795bc..000000000000 --- a/net-misc/teamviewer/files/teamviewer-9.0.32150-gentoo.patch +++ /dev/null @@ -1,138 +0,0 @@ -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 --} diff --git a/net-misc/teamviewer/files/teamviewerd9.init b/net-misc/teamviewer/files/teamviewerd9.init deleted file mode 100644 index 3a625c95d3b7..000000000000 --- a/net-misc/teamviewer/files/teamviewerd9.init +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="daemon for TeamViewer" - -PIDFILE="/var/run/teamviewerd.pid" - -start() { - ebegin "Starting Teamviewer Daemon" - - start-stop-daemon \ - --start \ - --pidfile "${PIDFILE}" \ - --background \ - --exec /opt/teamviewer@TVV@/teamviewerd -- -d -} - -stop() { - ebegin "Stopping Teamviewer Daemon" - - start-stop-daemon \ - --stop \ - --pidfile "${PIDFILE}" -} -- cgit v1.2.3