diff options
author | Julian Ospald <hasufell@gentoo.org> | 2014-07-16 16:14:55 +0000 |
---|---|---|
committer | Julian Ospald <hasufell@gentoo.org> | 2014-07-16 16:14:55 +0000 |
commit | 07218ce8bfc96a91ceaedd82fdbbb15a0afe69ad (patch) | |
tree | a49ca7754f8c1a94aabdbd6969ce71a561bd0381 /net-misc/teamviewer | |
parent | EAPI bump. Fix parallel make. Update HOMEPAGE/SRC_URI. Install docs. (diff) | |
download | gentoo-2-07218ce8bfc96a91ceaedd82fdbbb15a0afe69ad.tar.gz gentoo-2-07218ce8bfc96a91ceaedd82fdbbb15a0afe69ad.tar.bz2 gentoo-2-07218ce8bfc96a91ceaedd82fdbbb15a0afe69ad.zip |
version bump wrt #517204
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Diffstat (limited to 'net-misc/teamviewer')
-rw-r--r-- | net-misc/teamviewer/ChangeLog | 10 | ||||
-rw-r--r-- | net-misc/teamviewer/files/teamviewer-9.0.30203-gentoo.patch (renamed from net-misc/teamviewer/files/teamviewer-9.0.27891-gentoo.patch) | 53 | ||||
-rw-r--r-- | net-misc/teamviewer/teamviewer-9.0.30203.ebuild (renamed from net-misc/teamviewer/teamviewer-9.0.27891.ebuild) | 16 |
3 files changed, 46 insertions, 33 deletions
diff --git a/net-misc/teamviewer/ChangeLog b/net-misc/teamviewer/ChangeLog index 34d17d200868..8ca41e368c8c 100644 --- a/net-misc/teamviewer/ChangeLog +++ b/net-misc/teamviewer/ChangeLog @@ -1,6 +1,14 @@ # 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.10 2014/06/18 20:40:59 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/ChangeLog,v 1.11 2014/07/16 16:14:55 hasufell Exp $ + +*teamviewer-9.0.30203 (16 Jul 2014) + + 16 Jul 2014; Julian Ospald <hasufell@gentoo.org> + -teamviewer-9.0.27891.ebuild, +teamviewer-9.0.30203.ebuild, + -files/teamviewer-9.0.27891-gentoo.patch, + +files/teamviewer-9.0.30203-gentoo.patch: + version bump wrt #517204 18 Jun 2014; Michał Górny <mgorny@gentoo.org> teamviewer-7.0.9377.ebuild, teamviewer-8.0.20931.ebuild, teamviewer-9.0.27891.ebuild: diff --git a/net-misc/teamviewer/files/teamviewer-9.0.27891-gentoo.patch b/net-misc/teamviewer/files/teamviewer-9.0.30203-gentoo.patch index 7302ba78ae92..1df4632795bc 100644 --- a/net-misc/teamviewer/files/teamviewer-9.0.27891-gentoo.patch +++ b/net-misc/teamviewer/files/teamviewer-9.0.30203-gentoo.patch @@ -2,7 +2,7 @@ diff --git a/opt/teamviewer9/tv_bin/script/tvw_extra b/opt/teamviewer9/tv_bin/sc index 71164aa..848cd25 100644 --- a/opt/teamviewer9/tv_bin/script/tvw_extra +++ b/opt/teamviewer9/tv_bin/script/tvw_extra -@@ -16,13 +16,6 @@ function PrintHelp() +@@ -16,13 +16,6 @@ isInstalledTV || return ABecho "teamviewer --passwd [PASSWD]" "set a password (useful when installing remote (ssh)" echo @@ -16,10 +16,12 @@ index 71164aa..848cd25 100644 } function PrintVersion() -@@ -39,19 +32,6 @@ function PrintInfo() +@@ -37,19 +30,6 @@ + PrintDaemonStatus + echo PrintTeamViewerID - } - +-} +- -function PrintDaemonStatus() -{ - local cmd="$(daemonCtl 'status')" @@ -31,12 +33,10 @@ index 71164aa..848cd25 100644 - fi - - ABecho "teamviewerd status" "$txt" --} -- + } + function PrintTeamViewerID() - { - local config="$TV_BASE_DIR/config/global.conf" -@@ -64,16 +44,17 @@ function PrintTeamViewerID() +@@ -64,20 +44,21 @@ ABecho "TeamViewer ID:" "$tvid" if [ -z "$tvid" ] && isInstalledTV; then @@ -52,16 +52,20 @@ index 71164aa..848cd25 100644 + 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" +- + "$TV_BIN_DIR/teamviewerd" --passwd "$pwd" case $? in -@@ -84,19 +65,19 @@ function SetPasswd() + 0 ) echo 'ok' ;; +@@ -88,12 +69,14 @@ * ) echo 'unknown response' ;; esac -- Run_Daemon 'start' || die 'failed to restart the daemon' +- Run_Daemon 'start' > /dev/null || die 'failed to restart the daemon' - echo + echo "You may start your teamviewer daemon again." } @@ -74,19 +78,20 @@ index 71164aa..848cd25 100644 local license="$1" local path='/tmp/tv_global.conf' - [ -n "$license" ] || die 'no license specified' -- +@@ -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" + "$TV_BIN_DIR/teamviewerd" --export-license "$license" "$path" case $? in 0 ) echo "ok - license exported to '$path'" ;; -@@ -104,8 +85,7 @@ function ExportLicense() +@@ -110,8 +91,7 @@ * ) echo 'unknown response' ;; esac -- Run_Daemon 'start' || die 'failed to restart the daemon' +- Run_Daemon 'start' > /dev/null || die 'failed to restart the daemon' - echo + echo "You may start your teamviewer daemon again." } @@ -96,15 +101,15 @@ diff --git a/opt/teamviewer9/tv_bin/script/tvw_main b/opt/teamviewer9/tv_bin/scr 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_aux" +@@ -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" - -@@ -19,7 +18,6 @@ function Main() + function Main() +@@ -18,7 +17,6 @@ --help ) PrintHelp ;; --version ) PrintVersion ;; --info ) PrintInfo ;; @@ -112,7 +117,7 @@ index 8984db0..c6dff8d 100644 --winecfg ) shift; Run_WineCfg "$@" ;; --regedit ) shift; Run_RegEdit "$@" ;; --kill ) Run_KillTeamViewer ;; -@@ -166,18 +164,3 @@ function Run_RegEdit() +@@ -170,18 +168,3 @@ Init wine regedit "$@" } diff --git a/net-misc/teamviewer/teamviewer-9.0.27891.ebuild b/net-misc/teamviewer/teamviewer-9.0.30203.ebuild index 67ec02a0fc3b..f8cc715020db 100644 --- a/net-misc/teamviewer/teamviewer-9.0.27891.ebuild +++ b/net-misc/teamviewer/teamviewer-9.0.30203.ebuild @@ -1,6 +1,6 @@ # 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-9.0.27891.ebuild,v 1.3 2014/06/18 20:40:59 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/teamviewer-9.0.30203.ebuild,v 1.1 2014/07/16 16:14:55 hasufell Exp $ EAPI=5 @@ -29,13 +29,13 @@ RDEPEND=" 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 ) |