From 0e3d3c67b801bb02dec91ecf7696b9623589f84b Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sat, 21 Sep 2013 19:52:25 +0000 Subject: version bump, remove old Package-Manager: portage-2.2.6/cvs/Linux x86_64 Manifest-Sign-Key: 0xE73C35B3 --- net-misc/teamviewer/ChangeLog | 10 +- net-misc/teamviewer/Manifest | 34 +- .../files/teamviewer-8.0.17147-POSIX.patch | 399 --------------------- .../files/teamviewer-8.0.17147-gentoo.patch | 135 ------- .../files/teamviewer-8.0.20931-gentoo.patch | 135 +++++++ net-misc/teamviewer/files/teamviewer.service | 9 - net-misc/teamviewer/teamviewer-8.0.17147-r2.ebuild | 158 -------- net-misc/teamviewer/teamviewer-8.0.20931.ebuild | 162 +++++++++ 8 files changed, 318 insertions(+), 724 deletions(-) delete mode 100644 net-misc/teamviewer/files/teamviewer-8.0.17147-POSIX.patch delete mode 100644 net-misc/teamviewer/files/teamviewer-8.0.17147-gentoo.patch create mode 100644 net-misc/teamviewer/files/teamviewer-8.0.20931-gentoo.patch delete mode 100644 net-misc/teamviewer/files/teamviewer.service delete mode 100644 net-misc/teamviewer/teamviewer-8.0.17147-r2.ebuild create mode 100644 net-misc/teamviewer/teamviewer-8.0.20931.ebuild (limited to 'net-misc/teamviewer') diff --git a/net-misc/teamviewer/ChangeLog b/net-misc/teamviewer/ChangeLog index 750115484076..4e226ed43ecb 100644 --- a/net-misc/teamviewer/ChangeLog +++ b/net-misc/teamviewer/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-misc/teamviewer # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/ChangeLog,v 1.6 2013/04/21 20:37:28 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/ChangeLog,v 1.7 2013/09/21 19:52:20 hasufell Exp $ + +*teamviewer-8.0.20931 (21 Sep 2013) + + 21 Sep 2013; Julian Ospald + -teamviewer-8.0.17147-r2.ebuild, -files/teamviewer-8.0.17147-POSIX.patch, + -files/teamviewer-8.0.17147-gentoo.patch, +teamviewer-8.0.20931.ebuild, + +files/teamviewer-8.0.20931-gentoo.patch, -files/teamviewer.service: + version bump, remove old 21 Apr 2013; Michał Górny teamviewer-7.0.9377.ebuild, teamviewer-8.0.17147-r2.ebuild: diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest index 5477f0ced158..2ebb14b1ec0b 100644 --- a/net-misc/teamviewer/Manifest +++ b/net-misc/teamviewer/Manifest @@ -2,32 +2,22 @@ Hash: SHA256 AUX teamviewer-7.0.9377-POSIX.patch 3698 SHA256 fd595f395e0a66407c4bad2ee0d75a8f44bb39e89efc2b3ceaa5c71023024fd9 SHA512 67e9e82a606303501c0f8d4e06f06772322117b54c486c0516a593ce257961f866a4852ad677eef2a15e5714946a83d380e467519f4cc660a219f44abf8ca795 WHIRLPOOL 030ca9ee795eee371d9338fb2826b3f24617b0307c4f7a94127c921338ba335fe261bfc389cae12827b8f68deafb6852baa84664a7b3c16946670704521d49a7 -AUX teamviewer-8.0.17147-POSIX.patch 7930 SHA256 c90cc6e387ee7dde6af5bccead0d8e83a1eaad9fd4160849794e581b31561a63 SHA512 0064b53a4ddc6a75f9b498998487ec3e9eb7759a0634bbe52e5dd703cfe1cac1be1bd79576433f051f8646e679ea191c15851328fb4dc974ef2d9f54eeccbedf WHIRLPOOL 4a332445ce6e49495bc0e51911065b7f391346b57fb329b823c9497e6d0e034f3e884ddab1f6d142026715ea4078a4cf920c3a7fea0dfbd58e56c48034115e07 -AUX teamviewer-8.0.17147-gentoo.patch 3506 SHA256 858c886f92a9f52591403722afbf4324591cc5748c40c1d17706b71592bf2e5b SHA512 6fe0b44c758d8d77a7e0f5da2812c3c7c568687e771c8cf6a64e47aa832da6f82737e8b1dc69f2cab8073a7cb7b021d2e69ce3dc39ff62428fa87311467768c9 WHIRLPOOL 92d5aaf16e1bb44809c9747050fb6c859c3565069180701e25b2e28aed5a139494155fc7482a5bab39f421b864aa1a409617c9ccf6b36420b21bf34a474f2572 -AUX teamviewer.service 135 SHA256 0a87001124d4f3f48aa7863a42dd39fec5e61ebf3e499f0622c932adcdfc11cd SHA512 4ab468ef72d08bd29bc0ac142fdb8d55c5264026941c2eaff36a89972cf2810b3e4e1d9b0709c2cf320c0dc62d3fb211f5dd9250923dfb4b518d15b6ed2f0b58 WHIRLPOOL 1922d1bfa6b3c2520954299eadb8975ea9854c8d026537e8e65f5090a55ed6bfcf77035cdcb7156f5b782d39103f5fc459a7c75e0cd862f6a27d9d6077d48f32 +AUX teamviewer-8.0.20931-gentoo.patch 3786 SHA256 560d0ec32bae1493e2a64ffbd61f42ef7f57ee6961175cee6e0a80de683a04c2 SHA512 6395c088d8cb99d8f0067296166170b6353a8c5a3b4b3a0390a7781dd0ee2d6cf7cd48e884ab286d5c87a9a4423227f6cff8b7c2fa7d591897c4657cbca19574 WHIRLPOOL 5ca33f345fe4315a89f944056bd1df73362d005e4c75b2a8d58d35990709eab223a6c82198bd5e7e621af2a6085a250bafd3bac8e7b9a61cdf7b52edbf63437f AUX teamviewerd.init 600 SHA256 769f1455cb9b43d9a8907bd7b594db2af7d3905ca40c795ce0bbb4e016219bd8 SHA512 c79d8abb0c3f8623b6c063cd6775aacd362bce6ad245f11bba7fc868e601d62f163e1a2d0e9ec2d748565c031ce471e42a70aab88f8276aa74e22a44b7a7d46d WHIRLPOOL 7bf69e2c0b4e578b5b029265686f416d57d12ea6130c169846bd5843cb8b5e3ac337fe971883803f11ad90b87671b84b1f3132041087fedddea2d9d866086ec8 DIST teamviewer-7.0.9377.tar.gz 18102617 SHA256 3eaa78cbbd49449f2dbe5be6f0af99535a039598867a537ea8230189251909b9 SHA512 cc959dc9d243be499dbd5781c979305787659fbc95f72f5cb5e05dc042006cf05e670e8feb88322a1adf74f1c58cdf8883c11945a5baff26b0a7a2a4e8b08a8b WHIRLPOOL 68cc97298d8f98b5021e39954f45167eb2b32ff3bd32aa38733120574dafcf13884e452823ccec9d73f3244989433919395ba6d357f714635a1a6276bd8fa855 -DIST teamviewer-8.0.17147.deb 18248582 SHA256 417891f49ecfb89c4b45d7c67294de71519a2c7693fe1a7b720123e44455653a SHA512 cd809e312cb8019a7ba9e1a22b3a182ae3f22bc8ac695f3569a258bb098d7f8851d5564150a75386ffdf8f94363edbac26d2ccfe2b3625bc34cd8a74dcbf86f8 WHIRLPOOL c75ea8682e9617cbac41a1664298728bbd85407d611c968bf640e58d8fb0fa5ae719aa529b564b2952f0fc39b10abb05ee7377fbae418eeba0535ab4b58331c5 +DIST teamviewer-8.0.20931.deb 19567090 SHA256 6ad27b106a125c51075597c526b7b84fa9637af1aef6ee0514faa49694bf70dd SHA512 991fb4e572b312289097062577c9dfd9189d8405902e6965b224b1ad7e883de2dca99aa18b4ae2e333ce1cab65eade0f86eddccc32ed045140a34037c1a129d0 WHIRLPOOL e7ec1544e13b6cdc161783e36589b1cf07bbe60dd32f811d29e8c7b266477840550a08382c3b4683fbf00a6433305c135714bb30fb260c202a1bb828f0da8d45 EBUILD teamviewer-7.0.9377.ebuild 2963 SHA256 e9fe01c94352d4cac21b588bac2692bb89550995457604a67355083b95d57485 SHA512 f39c5de904ee4714c787d7f3925416286ed3c31f10fb5d9b30bfc3d36496124d33fecb51c390c9f005c7c26ab44b10b533206c77e0e7b860df58156bab8f12bf WHIRLPOOL db701719e7c3c9f50f5f52c750906d77ee7f269e6f7e562c3e4924f5b7b378f0c3d648aa1cc4c04004696dff0b550ccccec38a2e085cf883e75d2ade5a980425 -EBUILD teamviewer-8.0.17147-r2.ebuild 3887 SHA256 d900d3cef592bce92959fb880c068b3aea5d69d013a3a99c30bb09c3aa913c18 SHA512 d9b2f62c1789b05efa34883d8c36c535d364d5344a2b3b8ce4b4cd1388e2c00272cf39c7f69b78331a5673b1445da6860241fd4d423e7917a6dfeb21b30ec1dc WHIRLPOOL 08ff54227f56831be69fd12c1a1f0cd2d8e3de6d040b29439ffb80e8714280d41066b5f8376bca0d27c3ec40bd620d7b035d830a751d23893109aebbb6bca6a2 -MISC ChangeLog 1485 SHA256 c8e52f89630c2149cba43a0b3537b4a96a404d63a0616a4ac28db38264dc90ec SHA512 c2172c42582a78ff29982a20de2efb411e1b7cd163c949a0ab4245cfa38300f7a5a487d20576badb9a9ffb9fa0fdc2705854313706ad6f388baa0c6333ac2b6a WHIRLPOOL 1f882c37f9e2e99417d94e55d2aebd2b780a50022460a325e0c0a901f6851bc6c9b8b3291ca52f1589fb9643f04dd27f26d131d6a906f46deb1d0653e9c74dd3 +EBUILD teamviewer-8.0.20931.ebuild 3982 SHA256 352c4592a694deb7264b731f81b7e32daa3c2ef5d62d579ef1dc722fdc5ad4c1 SHA512 8c9311e84bd6b2462979b8a84ccb4698d023cfea028e17dd6cc2e0ecb999762f525c37933880512901aeda52b2c98f1622e7174890311b602493eb50ebbb3412 WHIRLPOOL 85510b1f4c4317ef19cf1fa05b11653039f6512cab0bf949d90e0b040e5ec1fd751d43982b7d37d26966627bd7b08d622051eff4e4062434ad958c28e816fe7e +MISC ChangeLog 1824 SHA256 323ca89a56c72e096531c2e4f8e49f631b80140801332dc131feb06ea469018f SHA512 04679917a6946681f4ff0b609879ec0ac57b2cb09341d81b230e531ff5f64ed22decada0f38920f432ed12df577f0018cdee9c974b0fe74ddf3c94aecfeaaf9c WHIRLPOOL 3e145ea6ad168eb016556be18d6c76ddf067e3962bf31c7abae09310087dd63cf01a890055e82404dc87eb4f5076c93836a5e05f8caed9d24abfa1d96f91802b MISC metadata.xml 444 SHA256 639cdfda43bf7e000721768a1ea21f4f28b465aae9fc0f4b4ff46c1b55f6538a SHA512 a3b75ae69a85bd9eadeb0b58564b39486cc3f27b2588b76ed54529b03d3bd049ddeca4bf1552ceb26b58285e99fbd7b850814007365bb1e70d0c6c59aa64fea5 WHIRLPOOL 64614b52256d2dfdb9a7b94b33aaff022ceb52631bce602467422d7971339e26c5aef255c2f057d8157f00b53351f3a4f96dabbc6967f904611bf9853634ebbb -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iQJ8BAEBCABmBQJRdE5eXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5 -NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD9cEP/if5DmUHCaEoCwcQ1mbrH6r0 -SzQYwXqmh3p/Dh52eXOizbRlcTLPPM3Q9l5nCjoigvp+x05rlncXJsHBrCQ+i6LA -dzI/oqbo0Yp3vo/4aY5u4hk2Wu60KgJZ4I7GLejBzvT9QsqPBRIqir7JC/taST1k -Gg4UP0TUfnYDhplIejHxZbvatf9AHiVh3N6QBst3xbuhqGdbCvmigo4dDdUIv1hW -XTMaDcK5GnPoep12oVjHFK+7fFPL1QKUgevgJ3xo6jdKHi/vEuxSIOrDKd3U3K5Q -66CcAYqES21/Eo4i1mjuvVGMo60OwhfnHnOB9FVyTSkzIJHCo9RLq7OLk8CxocYH -TtMGxiOIHWZsXsRKGcfVAQUmm2bui0KVhMdJEee84ivTS6r6FMer7UtrJyv8M8ns -5rOa4s5qaB26E06YqwTL6TvPmm9lLVbmbTX41bcwP8/knx6MyrRe1wfRVCwy/BWj -lJA2TCTvnkaV2sgwkDhmpjPOJoIHHWg+diw6wK9FLtI++LhNovWPiSDr1z6u6HMH -JpcBG7gkE2E8WpJ5yYA6Ygivo360FrjYZSTbNMllD8C0ZS0woeMRRSHPM3pkfZZO -djoRFsMUyMjw3+XfpOL2v0rpHTQ2laOM9ArM4K5FUmZ8SKF1bOBn/fhaSqfbzWOQ -8fcnseU9tZYvXu98HG/h -=3MEc +iQEcBAEBCAAGBQJSPfj5AAoJEFpvPKfnPDWznl4H/iOAnNnt/S9p1TDLlfMt0b6V +sV7W7VSFlx5cspAlgbJmZSIE8v7B0wexO0I5AgUXeA5uJI5eJrEQuQmDmbdrfcm0 +Ec1jHz+mkjA3IEOOWq8zo9Mo1UHKKEKLttMC7sWIbk0w/FqvQwNgQ3vYvQ7lbdDs +EtgPro0753JDjWx3zcGc1/aEJbYKcs2Xkr4u4gaJAgArQztq8ozqpz3a+5XXTG3R +7ABV3yqsvHexB6M7ekee7ATBh4/mdYt/oAYU320YSU+JXj3YEjz3xhXWGwALGLy9 +vr8ubcHyXzzJgZq4UMmBP3xzeCQ6FSYrfd91qoytnjATgValJXkYG/TEZnbctXM= +=9O/1 -----END PGP SIGNATURE----- diff --git a/net-misc/teamviewer/files/teamviewer-8.0.17147-POSIX.patch b/net-misc/teamviewer/files/teamviewer-8.0.17147-POSIX.patch deleted file mode 100644 index b8c1413ffd78..000000000000 --- a/net-misc/teamviewer/files/teamviewer-8.0.17147-POSIX.patch +++ /dev/null @@ -1,399 +0,0 @@ -From: Julian Ospald -Date: Tue Feb 19 22:58:46 UTC 2013 -Subject: make scripts POSIX compliant - ---- teamviewer8/tv_bin/script/teamviewer -+++ teamviewer8/tv_bin/script/teamviewer -@@ -1,6 +1,6 @@ --#!/bin/bash -+#!/bin/sh - - TV_SCRIPT_DIR="$(dirname "$(readlink -e "$0")")" --source "$TV_SCRIPT_DIR/tvw_main" -+. "$TV_SCRIPT_DIR/tvw_main" - - Main "$@" ---- teamviewer8/tv_bin/script/teamviewer_desktop -+++ teamviewer8/tv_bin/script/teamviewer_desktop -@@ -1,6 +1,6 @@ --#!/bin/bash -+#!/bin/sh - - TV_SCRIPT_DIR="$(dirname "$(readlink -e "$0")")" --source "$TV_SCRIPT_DIR/tvw_main" -+. "$TV_SCRIPT_DIR/tvw_main" - - Run_TeamViewer_Desktop "$@" ---- teamviewer8/tv_bin/script/tvw_aux -+++ teamviewer8/tv_bin/script/tvw_aux -@@ -1,30 +1,34 @@ --#!/bin/bash -+#!/bin/sh - - - # die with message --function die() -+die() - { -- echo -e "\nError: $@\n" -+ echo -+ echo "Error: $@" -+ echo - exit 1 - } - --function ABecho() -+ABecho() - { - printf "\E[1m %-30s \E[0m %s \n" "$1" "$2" - } - --function fail() -+fail() - { -- echo -e "\nError: $@\n" -+ echo -+ echo "Error: $@" -+ echo - false - } - --function cmdExists() -+cmdExists() - { - command -v "$1" >/dev/null 2>&1 - } - --function getInitCmd() -+getInitCmd() - { - #exec 2> /dev/null - readlink /proc/1/exe 2> /dev/null -@@ -32,7 +36,7 @@ - } - - # ensure path exists --function make_path() -+make_path() - { - local path="$1" - [ -d "$path" ] || mkdir -p "$path" || fail "Could not create $path" -@@ -40,34 +44,37 @@ - - # real and effective user id should be the same - or the wine-profile could become useless - # TODO: gracefully solve the issue by using su to run wine --function validateUser() -+validateUser() - { - local userid=$(id -un) - - if [ "$userid" != "$USER" ] ; then -- echo -e "\n\n *** TeamViewer can not be executed with sudo! ***\n Either use your normal user account without sudo\n or use a the real root account to log in to your desktop (not recommended!)." -- -+ echo -+ echo "*** TeamViewer can not be executed with sudo! ***" -+ echo "Either use your normal user account without sudo" -+ echo "or use a the real root account to log in to your desktop (not recommended!)." -+ - return 1 - fi - } - --function isSuperUser # root or sudo -+isSuperUser() # root or sudo - { - local userid=$(id -u) -- [ "$userid" == 0 ] -+ [ "$userid" = 0 ] - } - --function rootSuggest() -+rootSuggest() - { -- isSuperUser || echo -e "\nTry with root / sudo ?" -+ isSuperUser || { echo ; echo "Try with root / sudo ?" ;} - false - } - --function updateMenuEntries() -+updateMenuEntries() - { - local action="$1" # install / uninstall - xdg-desktop-menu $action --mode system "$TV_DESKTOP_FILE" # prefer installed xdg script (tvw_config) - - cmdExists update-menus && update-menus - cmdExists update-icon-caches && update-icon-caches /usr/share/icons/hicolor --} -\ No newline at end of file -+} ---- teamviewer8/tv_bin/script/tvw_config -+++ teamviewer8/tv_bin/script/tvw_config -@@ -1,4 +1,4 @@ --#!/bin/bash -+#!/bin/sh - - TV_VERSION="8.0.17147" - TV_PKGTYPE="DEB" ---- teamviewer8/tv_bin/script/tvw_main -+++ teamviewer8/tv_bin/script/tvw_main -@@ -1,11 +1,11 @@ --#!/bin/bash -+#!/bin/sh - --source "$TV_SCRIPT_DIR/tvw_config" --source "$TV_SCRIPT_DIR/tvw_aux" --source "$TV_SCRIPT_DIR/tvw_daemon" --source "$TV_SCRIPT_DIR/tvw_profile" -+. "$TV_SCRIPT_DIR/tvw_config" -+. "$TV_SCRIPT_DIR/tvw_aux" -+. "$TV_SCRIPT_DIR/tvw_daemon" -+. "$TV_SCRIPT_DIR/tvw_profile" - --function Init() -+Init() - { - local startLog="$TV_LOG_DIR/startup.log" - -@@ -17,7 +17,7 @@ - InitProfile >> "$startLog" || die "InitProfile failed. Please check '$startLog'" - } - --function LogStartupInfo() -+LogStartupInfo() - { - exec 2>&1 # redirect stderr - -@@ -45,7 +45,7 @@ - } - - --function Main() -+Main() - { - local param="$1" - local opt="$2" -@@ -72,7 +72,7 @@ - echo - } - --function Run_TeamViewer -+Run_TeamViewer() - { - Init - echo "Launching TeamViewer..." -@@ -82,7 +82,7 @@ - exec wine "c:\TeamViewer\TeamViewer.exe" "$@" - } - --function Run_TeamViewer_Desktop -+Run_TeamViewer_Desktop() - { - [ "$1" = "--desktop" ] && shift - -@@ -94,7 +94,7 @@ - exec wine "c:\TeamViewer\TeamViewer_Desktop.exe" "$@" - } - --function Run_KillTeamViewer -+Run_KillTeamViewer() - { - local this="$0" # ps: allow user names with more than 8 characters... - local userlist=$(ps -e -o "user:25,command" | grep -v "^root" | grep TeamViewer | cut --delimiter=' ' -f 1) -@@ -111,19 +111,19 @@ - fi - } - --function Run_WineCfg -+Run_WineCfg() - { - Init - wine winecfg "$@" - } - --function Run_RegEdit -+Run_RegEdit() - { - Init - wine regedit "$@" - } - --function Run_Daemon() -+Run_Daemon() - { - local opt="$1" - -@@ -136,7 +136,7 @@ - esac - } - --function SetPasswd() -+SetPasswd() - { - local pwd="$1" - [ -n "$pwd" ] || die 'no password specified' -@@ -156,7 +156,7 @@ - echo - } - --function ExportLicense() -+ExportLicense() - { - local license="$1" - local path='/tmp/tv_global.conf' -@@ -176,7 +176,7 @@ - echo - } - --function CreateZipLog() -+CreateZipLog() - { - local cfg_dir="config" - local log_dir="logfiles" -@@ -202,7 +202,7 @@ - echo 'done' - } - --function PrintHelp() -+PrintHelp() - { - PrintVersion - echo -@@ -222,7 +222,7 @@ - ABecho "teamviewer --daemon enable" "enable TeamViewer daemon - start daemon on system startup (default)" - } - --function PrintInfo() -+PrintInfo() - { - PrintVersion - echo -@@ -231,12 +231,12 @@ - PrintTeamViewerID - } - --function PrintVersion() -+PrintVersion() - { - ABecho "TeamViewer" "$TV_VERSION" - } - --function PrintDaemonStatus() -+PrintDaemonStatus() - { - local cmd="$(daemonCtl 'status')" - local txt="$(eval "$cmd")" -@@ -245,7 +245,7 @@ - ABecho "teamviewerd status" "$txt" - } - --function PrintTeamViewerID -+PrintTeamViewerID() - { - local config="$TV_BASE_DIR/config/global.conf" - local tvid -@@ -258,4 +258,4 @@ - echo "TeamViewer ID: not found" - echo "Try restarting the TeamViewer daemon (e.g. teamviewer --daemon restart)" - fi --} -\ No newline at end of file -+} ---- teamviewer8/tv_bin/script/tvw_profile -+++ teamviewer8/tv_bin/script/tvw_profile -@@ -1,6 +1,6 @@ --#!/bin/bash -+#!/bin/sh - --function InitProfile() -+InitProfile() - { - exec 2>&1 # redirect stderr - -@@ -12,7 +12,7 @@ - echo "ok" - } - --function SetupWine() -+SetupWine() - { - # setup dosdevices and symlinks - local c_sym="$WINEPREFIX/dosdevices/c:" -@@ -32,7 +32,7 @@ - - - # setup/validate drive symlinks --function setup_drive_symlink() -+setup_drive_symlink() - { - local sym="$1" - local dst="$2" -@@ -44,7 +44,7 @@ - } - - # setup logfile symlinks --function setup_log_symlink -+setup_log_symlink() - { - local cuser=$(id -un) - local basepath="$WINEPREFIX/drive_c/users/$cuser" -@@ -66,7 +66,7 @@ - } - - # TODO simplify by using a different Log dir --function setup_prog_dir() -+setup_prog_dir() - { - local progdir="$WINEPREFIX/drive_c/TeamViewer" - local progsrc="$TV_WINE_DIR/drive_c/TeamViewer" -@@ -83,7 +83,7 @@ - done - } - --function setup_winemenubuilder() -+setup_winemenubuilder() - { - local sysdir="$WINEPREFIX/drive_c/windows/system32" - local syssrc="$TV_WINE_DIR/drive_c/windows/system32" -@@ -93,7 +93,7 @@ - [ -e "$sysdir/winemenubuilder.exe" ] || die "Could not copy winemenubuilder" - } - --function SetupWineTweaks() -+SetupWineTweaks() - { - [ "$USE_LOCAL_WINE" = "yes" ] && return - [ -d "$WINEPREFIX/.tweak" ] || mkdir "$WINEPREFIX/.tweak" -@@ -105,7 +105,7 @@ - # winetweak setwinver # Set Win2k mode for TeamViewer - } - --function winetweak() -+winetweak() - { - local tweak="$1" - local tweakmark="$WINEPREFIX/.tweak/$tweak" -@@ -118,7 +118,7 @@ - - } - --function SetupTarEnv() -+SetupTarEnv() - { - echo " - " - # TODO for tar - if [ "$TV_PKGTYPE" = "TAR" ] ; then -@@ -139,7 +139,7 @@ - # fi - } - --function SetupEnv() -+SetupEnv() - { - echo " - " - # TODO remove -@@ -159,4 +159,4 @@ - uname -m > "$WINEPREFIX/drive_c/distarch" - (cd /etc; ls -m *-release *-version *_version > "$WINEPREFIX/drive_c/distrelease" 2> /dev/null) - true --} -\ No newline at end of file -+} diff --git a/net-misc/teamviewer/files/teamviewer-8.0.17147-gentoo.patch b/net-misc/teamviewer/files/teamviewer-8.0.17147-gentoo.patch deleted file mode 100644 index b3fe411c359a..000000000000 --- a/net-misc/teamviewer/files/teamviewer-8.0.17147-gentoo.patch +++ /dev/null @@ -1,135 +0,0 @@ -From: Julian Ospald -Date: Tue Feb 19 23:01:44 UTC 2013 -Subject: remove all daemon/systemd related bits - ---- teamviewer8/tv_bin/script/tvw_main -+++ teamviewer8/tv_bin/script/tvw_main -@@ -2,7 +2,6 @@ - - . "$TV_SCRIPT_DIR/tvw_config" - . "$TV_SCRIPT_DIR/tvw_aux" --. "$TV_SCRIPT_DIR/tvw_daemon" - . "$TV_SCRIPT_DIR/tvw_profile" - - Init() -@@ -57,7 +56,6 @@ - --help ) PrintHelp ;; - --version ) PrintVersion ;; - --info ) PrintInfo ;; -- --daemon ) Run_Daemon $opt ;; - --winecfg ) Run_WineCfg "$@" ;; - --regedit ) Run_RegEdit "$@" ;; - --kill ) Run_KillTeamViewer ;; -@@ -123,26 +121,14 @@ - wine regedit "$@" - } - --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 --} -- - 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' ;; -@@ -151,29 +137,28 @@ - 13 ) echo 'password not accepted - illegal char detected' ;; - * ) echo 'unknown response' ;; - esac -- -- Run_Daemon 'start' || die 'failed to restart the daemon' -- echo -+ -+ echo "You may start your teamviewer daemon again." - } - - 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'" ;; - 11 ) echo "destination '$path' not accessible" ;; - * ) echo 'unknown response' ;; - esac -- -- Run_Daemon 'start' || die 'failed to restart the daemon' -- echo -+ -+ echo "You may start your teamviewer daemon again." - } - - CreateZipLog() -@@ -214,35 +199,18 @@ - 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)" - } - - PrintInfo() - { - PrintVersion - echo -- PrintDaemonStatus -- echo - PrintTeamViewerID - } - - PrintVersion() - { - ABecho "TeamViewer" "$TV_VERSION" --} -- --PrintDaemonStatus() --{ -- local cmd="$(daemonCtl 'status')" -- local txt="$(eval "$cmd")" -- [ $? = 0 ] || txt='n/a (error)' -- -- ABecho "teamviewerd status" "$txt" - } - - PrintTeamViewerID -@@ -256,6 +224,6 @@ - ABecho "TeamViewer ID:" "$tvid" - else - echo "TeamViewer ID: not found" -- echo "Try restarting the TeamViewer daemon (e.g. teamviewer --daemon restart)" -- fi --} -+ echo "Try restarting the TeamViewer daemon." -+ fi -+} diff --git a/net-misc/teamviewer/files/teamviewer-8.0.20931-gentoo.patch b/net-misc/teamviewer/files/teamviewer-8.0.20931-gentoo.patch new file mode 100644 index 000000000000..48c3712e8e74 --- /dev/null +++ b/net-misc/teamviewer/files/teamviewer-8.0.20931-gentoo.patch @@ -0,0 +1,135 @@ +commit d3060b46b357c399d522e8346dd6c9b99c322343 +Author: hasufell +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/files/teamviewer.service b/net-misc/teamviewer/files/teamviewer.service deleted file mode 100644 index 2ec1f1ee23f1..000000000000 --- a/net-misc/teamviewer/files/teamviewer.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Daemon for TeamViewer-8 - -[Service] -ExecStart=/opt/teamviewer8/teamviewerd -f - -[Install] -WantedBy=multi-user.target - diff --git a/net-misc/teamviewer/teamviewer-8.0.17147-r2.ebuild b/net-misc/teamviewer/teamviewer-8.0.17147-r2.ebuild deleted file mode 100644 index a2b093ac86ab..000000000000 --- a/net-misc/teamviewer/teamviewer-8.0.17147-r2.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/teamviewer-8.0.17147-r2.ebuild,v 1.2 2013/04/21 20:37:28 mgorny Exp $ - -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=" - x11-misc/xdg-utils - !system-wine? ( - amd64? ( - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-soundlibs - || ( - ( - 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 - ) - ) - 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}/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() { - epatch "${FILESDIR}"/${P}-POSIX.patch \ - "${FILESDIR}"/${P}-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} - - # 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 - 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.ebuild b/net-misc/teamviewer/teamviewer-8.0.20931.ebuild new file mode 100644 index 000000000000..275edb2d5848 --- /dev/null +++ b/net-misc/teamviewer/teamviewer-8.0.20931.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2013 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.1 2013/09/21 19:52:20 hasufell Exp $ + +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? ( + amd64? ( + app-emulation/emul-linux-x86-baselibs + app-emulation/emul-linux-x86-soundlibs + || ( + ( + 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 + ) + ) + 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}/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() { + epatch "${FILESDIR}"/${P}-gentoo.patch + + sed \ + -e "s/@TVV@/${MV}/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 () { + 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} + + # 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 script/${PN}d.service + + newicon -s 48 desktop/${PN}.png ${MY_PN}.png + dodoc ../doc/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