bump; ebuild and new gentoo.patch submitted by newly designated proxy maintainer, herd re-assigned to proxy-maint, all wrt bug #533452. Being a binary package, runtested for install, bugs and runtime issues addressed in the course of bug #533452. 2 oldest versions and corresponding patches removed to prevent build up

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

8 files changed, 209 insertions, 514 deletions

diff --git a/net-misc/teamviewer/ChangeLog b/net-misc/teamviewer/ChangeLog
index f7cd46c3ebbc..bb85ff88024f 100644
--- a/net-misc/teamviewer/ChangeLog
+++ b/net-misc/teamviewer/ChangeLog
@@ -1,6 +1,19 @@
 # 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.15 2014/11/25 22:51:02 hasufell Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/ChangeLog,v 1.16 2015/03/09 05:29:03 idella4 Exp $
+
+*teamviewer-10.0.36281 (09 Mar 2015)
+
+  09 Mar 2015; Ian Delaney <idella4@gentoo.org>
+  +files/teamviewer-10.0.36281-gentoo.patch, +teamviewer-10.0.36281.ebuild,
+  -files/teamviewer-7.0.9377-POSIX.patch,
+  -files/teamviewer-8.0.20931-gentoo.patch, -teamviewer-7.0.9377.ebuild,
+  -teamviewer-8.0.20931.ebuild, metadata.xml:
+  bump; ebuild and new gentoo.patch submitted by newly designated proxy
+  maintainer, herd re-assigned to proxy-maint, all wrt bug #533452.  Being a
+  binary package, runtested for install, bugs and runtime issues addressed in
+  the course of bug #533452.  2 oldest versions and corresponding patches
+  removed to prevent build up
 
   25 Nov 2014; Julian Ospald <hasufell@gentoo.org> metadata.xml:
   drop maintainership
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 28b4829f04c5..f9fdbec00fe3 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -1,37 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX teamviewer-7.0.9377-POSIX.patch 3698 SHA256 fd595f395e0a66407c4bad2ee0d75a8f44bb39e89efc2b3ceaa5c71023024fd9 SHA512 67e9e82a606303501c0f8d4e06f06772322117b54c486c0516a593ce257961f866a4852ad677eef2a15e5714946a83d380e467519f4cc660a219f44abf8ca795 WHIRLPOOL 030ca9ee795eee371d9338fb2826b3f24617b0307c4f7a94127c921338ba335fe261bfc389cae12827b8f68deafb6852baa84664a7b3c16946670704521d49a7
-AUX teamviewer-8.0.20931-gentoo.patch 3786 SHA256 560d0ec32bae1493e2a64ffbd61f42ef7f57ee6961175cee6e0a80de683a04c2 SHA512 6395c088d8cb99d8f0067296166170b6353a8c5a3b4b3a0390a7781dd0ee2d6cf7cd48e884ab286d5c87a9a4423227f6cff8b7c2fa7d591897c4657cbca19574 WHIRLPOOL 5ca33f345fe4315a89f944056bd1df73362d005e4c75b2a8d58d35990709eab223a6c82198bd5e7e621af2a6085a250bafd3bac8e7b9a61cdf7b52edbf63437f
+AUX teamviewer-10.0.36281-gentoo.patch 4311 SHA256 7d53322d926a0673164c3836b966c869cdad6a7d1d276a6118c8a180544956dc SHA512 9252da33624bc7e97c759e11c73bffed4c646ea9e3b44e0e45c47a25a1b7259cffbeb3ef745926ed4b75e57c14eb479f4bfbe30365ce8836c86e6f32dc65785c WHIRLPOOL 5ce24ea6decf7efd118d1e5d6c02bc4d8a4645051243596e18ed9b8ebc1186ca6b9ad9b37336c0b8848b55955c2bea20390a3fb98295baca85c777eefa92a958
 AUX teamviewer-9.0.30203-gentoo.patch 3876 SHA256 c8a9ee6772df79076c68bd3b47654d42d87fa5846e7f812fbf756d26ccc4fe65 SHA512 7eef0090c836ca304554dd064ef105a8ed141e8300a829ebeb6b73e233413efdbdf8662a48da340c11f4e8cddeb00d4cfe7d761e3adf532e48f61fccf642752f WHIRLPOOL 2f68646f536cff27becc20aab89e70a136a5b4f576026cb4e22e184e59cdc0449f322965e8649630ebc36c7cefb4cf089d896c685a8910752013dc6633de11a3
 AUX teamviewer-9.0.32150-gentoo.patch 3876 SHA256 c8a9ee6772df79076c68bd3b47654d42d87fa5846e7f812fbf756d26ccc4fe65 SHA512 7eef0090c836ca304554dd064ef105a8ed141e8300a829ebeb6b73e233413efdbdf8662a48da340c11f4e8cddeb00d4cfe7d761e3adf532e48f61fccf642752f WHIRLPOOL 2f68646f536cff27becc20aab89e70a136a5b4f576026cb4e22e184e59cdc0449f322965e8649630ebc36c7cefb4cf089d896c685a8910752013dc6633de11a3
 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.20931.deb 19567090 SHA256 6ad27b106a125c51075597c526b7b84fa9637af1aef6ee0514faa49694bf70dd SHA512 991fb4e572b312289097062577c9dfd9189d8405902e6965b224b1ad7e883de2dca99aa18b4ae2e333ce1cab65eade0f86eddccc32ed045140a34037c1a129d0 WHIRLPOOL e7ec1544e13b6cdc161783e36589b1cf07bbe60dd32f811d29e8c7b266477840550a08382c3b4683fbf00a6433305c135714bb30fb260c202a1bb828f0da8d45
+DIST teamviewer-10.0.36281.deb 43331378 SHA256 f3eb252785d04105d066beeb498fad62c995f67456e52d5213b86766d232cb75 SHA512 39bb933ded0f23e86dd0f757b1b2c904c441a70b3b1470b3cf98bf3204a50e81145cf1c70677550376c6fe91509f9d2adca1857f64d499e7240e74f1a7387a55 WHIRLPOOL 4274fd03946b755860a153169b651360c0f11244c4076e9a032b109d88753957b626234dd3860b6e28a96db543be59db76f2bb53f8222e58a89fba1a7d99a803
 DIST teamviewer-9.0.30203.deb 23460204 SHA256 ef01b63eeec7aa9c046b613d26448b87f6bd00774941730fd26f60bb14f5aa75 SHA512 ead3467bbfb7b29c6c83218271afb9d4a8ac740eaba0d879ec1fe2501199d98b6bb9549a9238153680f978439519fcbd6e85744bdf375a1296c56bb9d13407d9 WHIRLPOOL edc23b23b2ee4961b9d92748460236bb94373b8320c67b1f4ef4055874dbe8d596409dd206ea32c6a20cf593c579943ec8c2f047b01b858ccd50616d49965320
 DIST teamviewer-9.0.32150.deb 22898922 SHA256 66d9a69f7e1523a2e1b41ff2e55adac01b2dae9b8bdfabf9db6080fc21d24451 SHA512 3e72ed5cab7a754a0aa75e533da92292ad004f66c55ac4c386b6f4a65cc41b14a8d9d7a5410dccdb90c1172cd33e52383289339ab44f0847a061655498ab8e4d WHIRLPOOL fa48ff99a5df29072b1073f35e3f27aeba87b2b846813dca612212344a5b8e35f7f1e221e1fb4f7a12464fce4a185b8dad6dd8f48432e4c48ecd61d9cc6b7960
-EBUILD teamviewer-7.0.9377.ebuild 3032 SHA256 49a71b9768241d59928d1307b640f46c569365140ffda8f40385935fd560509c SHA512 2cf2dd0570d903d09d9a93db64a520baca33667ad84626261363bf92bcd059bb73aeb608f2148f05ca08b494e9fed3c86f4a87b2b75f2418af8dff3835da7724 WHIRLPOOL 9d1314e392cede19fb2df097092a4afaf51d306e4fc959b97605b9963bc24c169bc0ddea0fab63a60f8220ff1b28603e98d483b489614c9b270432aeb6b471bf
-EBUILD teamviewer-8.0.20931.ebuild 4048 SHA256 04ca630dd0c14de5699ad69f02286558f016a0329d0089531e6679d370551079 SHA512 b496af5a230defa2ab0415b2ad3c57455d97f895600d6f56da4a6072d754d0605bf2c858234ea9f0b60e169ddc938533bb4bfc769dd2b494d093f043658cce19 WHIRLPOOL 528bce42659086a617aa3303af48920c24a6bf636d40929e9349efc3b8a13d8ff31152c805359f133a1de854d0d439c9225f511f1c5c8a7bb18b0afe1f2630c4
+EBUILD teamviewer-10.0.36281.ebuild 3509 SHA256 d8d416d82d74d44428645d70c90d9a854fa381018166228e2d54f2cbcd10b312 SHA512 f74009debfbd5ba027c7ebfe6311eef1945adfa2b9adeddcd5f16d58c4c03eef2c60c71cd3736a7b7eff7fb0610d76fec93a4b0ccf792a2365eb181d3962be33 WHIRLPOOL 54617df5f6fd1a5509d0f72c725bcefd5b883a4785780a5983ead9fcc232bce9335bca8245a9158fbb117341e420aa69a7a7a7aabdfe88850389e9e43a9a3a92
 EBUILD teamviewer-9.0.30203.ebuild 3534 SHA256 2669e112819b67da3609d5e8c661dda472cfd053184b438380e01b449102c254 SHA512 b517d79a821580fa2ea18f57ff5cdc3a5c2dc99dfe70039d4a6de88895de6aeb3067c85b67c83dc66a9eb1a382ca5a9466fd116f5cbd18732761e77d196e8468 WHIRLPOOL a711ff6ad87727c987fd93ba3a4c3c0b3e3ee792f245018ae00e57f6df090532dfa5efac5258096ced16f1e5ac1ec315cae0e6a63ab304bda08be4667223350f
 EBUILD teamviewer-9.0.32150.ebuild 3602 SHA256 8db11bca416534735e49fabc425333562e60a1a7b899d7eb73438f9b207d5355 SHA512 6e208658a27c4079556d2bc7e05551c3bbd6e7f5a56dafd21b995a9bfaf68d6af42dcdc02b2127b9a2367c342d8dc2a67fc261f733315e70fe072ff13795e825 WHIRLPOOL 3975c0f4e424ee8ab6c3a72fd2847a8276950329af282515f0932f3b913bb20314407b5f5840041a1b83750e85623dd4292a588bd2b68dab803304a433ecc27a
-MISC ChangeLog 3398 SHA256 4ec604ae64a954b365a6abd120f77434f1a620c662ed109d6cd151b7809d686e SHA512 df2f8b544f055585fb7c83288299d80e8e280bee1260644b61d44bb9d45fc48a1cd4a50948c3ad0d79e22a1dcad2ec34828c51a94063410b915cf5742593aae4 WHIRLPOOL 73c513ffa43f67c288549bdf782749ebe36528ec74491adda4fc8aae9c6d3b3cde135268819bf3a465c7c3f86c72d31e7339f5f775c12e5a8078d07c0b9d8c7d
-MISC metadata.xml 322 SHA256 fc8cb65b911df175e539ef34e7324705c3bf3fb812a3f826e01e0e1ab786ac41 SHA512 f9b37602a5bad8f5195a17fd59797730170c0e03eea99ad66586e03140c5e9056a961b4627a01e231ad60cd41b6bf3f78024e1752fa2d11b16f4d78c5362cad9 WHIRLPOOL 7eef95a260a7313d8a4f776f49f66877545c0a0e0999f0d5d607422bbc454e1df614658111a239939bbc0b0c099fd9b285d068f1c8890763e9827e11661c0c0e
+MISC ChangeLog 4052 SHA256 8ca23e30f4439596fc8e6d6027601af958763d94af5ba8f03f9db8ddf5f28dc0 SHA512 6ca3e7b082ee5f3059685ab698b34b08a0cd7f7cbbc58150331d5dc84ed83987fc7d134767d72646593813ccd14a9d23838cc7125820ad32dcd4ee25242380c1 WHIRLPOOL 21eb39d21512c99745c6103fa736299e779d1f9943df7939020e4ac2932921cc71a432bd26dd092e314d9a15f5dd597304733b4d7ae3ae7d3e726b323b18048f
+MISC metadata.xml 492 SHA256 f80dd7dec7ef2cb9752a58ca42351db87c37a89496bfd882be33d14f3143e00d SHA512 e8017bdb515c94ea948c1f3d6b46498cecd2348f145ac59c314091114bff20008c46eefe4124e760819e0136d17973c820994525f3824ea800cc0cf07421e433 WHIRLPOOL 1ac646f11e54a28c0591b00c05c349d8e3d771202b7bc659291f394b067a256a99279b66afbb9d330c817dce3d2b8b0e3f8e76d72c1276e2d2c6330e452f402b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUdQfWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
-MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgG58QAOEbgfuKOed6vz7odpksN9EE
-AWR9yaYtu5dNztha7JBTH/76ydTYJLgy72LH/qp+XTvIf1DM+FT3raWFNAnRf0st
-BFnAGU0npiXYgo34nGTM6/iDz0wxuTQxCnNrs9Hgdus/V160d8DjRRNNLPsFQcb/
-rWi1JFhRU2c/SfiH96Q8Ydx0x12m8CovX8WwUiGT4OF07U0vrlhX+f+Cz7MQ0reY
-tZ5X9lL7k1uheFHW1/0rTYYj/LU0pknzkPslKDIv12414/kMaS4Lk4ixfGwCZ1wY
-5K5Nd64ZKX0RBdL5M1VekqelcfDHENWw6T8C8Qk5+qtbuCzdRC68rSP+XX6TbRk1
-YLcM0SbyQ8XTeaU8UwZvH3ND2EFMy7JxRa0gLBxA+kMVpARta3qpqk4aD52XfZ6Y
-hPo7wOTm0YmkSJE6MEkA2wrQov1sEnsuy/9Ii8h7l9c6cPGeWRvEszjo9ix1An7z
-J+Z914BHULXA2NlMwk6GRTq5shhl6KNvGuRYD44q0jRuIXASwEz5nUz4SwljJBXh
-Ha5n52WJRQv7vMnvYYZfJSKrqq/GzI3b+ZZWB+wOwHvzXPT7JOABIAnTsGB/GRsu
-7Ldvm/thu39x0Zjv8lRAmHU1t4t+AYK5ktUpNzVgA91AfnjjOnkFKTC//XZuqUui
-HXQLsousihZnJJ992uW4
-=NlwC
+iEYEAREIAAYFAlT9L7AACgkQso7CE7gHKw3ixgCgukdkPh+mNnG+n5srv9SH48HQ
+ygUAn0F7Sw4pqRMpB4Zu0e2HeaW3nCia
+=6F9/
 -----END PGP SIGNATURE-----
diff --git a/net-misc/teamviewer/files/teamviewer-10.0.36281-gentoo.patch b/net-misc/teamviewer/files/teamviewer-10.0.36281-gentoo.patch
new file mode 100644
index 000000000000..b3243908eb96
--- /dev/null
+++ b/net-misc/teamviewer/files/teamviewer-10.0.36281-gentoo.patch
@@ -0,0 +1,150 @@
+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
+-}
+--- /opt/teamviewer10/tv_bin/script/teamviewerd.service	2015-01-15 12:55:57.000000000 -0500
++++ /opt/teamviewer10/tv_bin/script/teamviewerd.service	2015-03-08 19:00:17.297108541 -0400
+@@ -6,7 +6,7 @@
+ [Service]
+ Type = forking
+ PIDFile = /var/run/teamviewerd.pid
+-ExecStart = /opt/teamviewer/tv_bin/teamviewerd -d
++ExecStart = /opt/teamviewer10/tv_bin/teamviewerd -d
+ Restart = on-abort
+ StartLimitInterval = 60
+ StartLimitBurst = 10
+
diff --git a/net-misc/teamviewer/files/teamviewer-7.0.9377-POSIX.patch b/net-misc/teamviewer/files/teamviewer-7.0.9377-POSIX.patch
deleted file mode 100644
index ebbe5cd71894..000000000000
--- a/net-misc/teamviewer/files/teamviewer-7.0.9377-POSIX.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Feb 19 21:24:39 UTC 2013
-Subject: make scripts POSIX compliant
-
---- teamviewer7/.tvscript/.regedit
-+++ teamviewer7/.tvscript/.regedit
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- TV_script_dir="$(dirname "$(readlink -f "$0")")"
- "$TV_script_dir/wrapper" wine regedit "$@"
---- teamviewer7/.tvscript/.winecfg
-+++ teamviewer7/.tvscript/.winecfg
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- TV_script_dir="$(dirname "$(readlink -f "$0")")"
- "$TV_script_dir/wrapper" wine winecfg "$@"
---- teamviewer7/.tvscript/killteamviewer
-+++ teamviewer7/.tvscript/killteamviewer
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #  execute wineserver -k for all users running a TeamViewer
- #  (if not called by root, only successful for the current user)
- 
---- teamviewer7/.tvscript/teamviewer
-+++ teamviewer7/.tvscript/teamviewer
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- TV_script_dir="$(dirname "$(readlink -f "$0")")"
- "$TV_script_dir/wrapper" wine "c:\Program Files\TeamViewer\Version7\TeamViewer.exe" "$@"
---- teamviewer7/.tvscript/wrapper
-+++ teamviewer7/.tvscript/wrapper
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- 
- TV_script_dir="$(dirname "$(readlink -f "$0")")"
- TV_base_dir="$(dirname "$TV_script_dir")"
-@@ -23,7 +23,7 @@
- export WINESERVER="$TV_Wine_bin/wineserver"
- 
- 
--function tv_Prepare()
-+tv_Prepare()
- {
-   exec 2>&1				# redirect stderr
- 
-@@ -33,7 +33,7 @@
-   setup_env
- }
- 
--function tv_Run()
-+tv_Run()
- {
-   exec 2>&1				# redirect stderr
- 
-@@ -43,7 +43,7 @@
-   "$TV_Wine_bin/$binary" "$@"
- }
- 
--function tv_LogInfo()
-+tv_LogInfo()
- {
-   exec 2>&1					# redirect stderr
- 
-@@ -71,7 +71,7 @@
-   echo " "
- }
- 
--function setup_wine()
-+setup_wine()
- {
-   # setup dosdevices and symlinks
-   local c_sym="$WINEPREFIX/dosdevices/c:"
-@@ -88,14 +88,14 @@
- }
- 
- # ensure path exists
--function make_path()
-+make_path()
- {
-   local path="$1"
-   [ -d "$path" ] || mkdir -p "$path" || die "Could not create $path"
- }
- 
- # setup/validate drive symlinks
--function setup_drive_symlink()
-+setup_drive_symlink()
- {
-   local sym="$1"
-   local dst="$2"
-@@ -107,7 +107,7 @@
- }
- 
- # setup logfile symlinks
--function setup_log_symlink
-+setup_log_symlink()
- {
-   local cuser=$(id -un)
-   local basepath="$WINEPREFIX/drive_c/users/$cuser"
-@@ -129,7 +129,7 @@
- }
- 
- # setup/validate win symlinks
--function setup_win_symlink()
-+setup_win_symlink()
- {
-   local sym="$WINEPREFIX/$1"
-   local dst="$TV_Wine_dir/$1"
-@@ -141,7 +141,7 @@
-   [ -d $(readlink -f "$sym") ] || ln -s "$dst" "$sym" || die "Could not create $sym (link to $dst)"
- }
- 
--function setup_prog_dir()
-+setup_prog_dir()
- {
-   local progdir="$WINEPREFIX/drive_c/Program Files/TeamViewer/Version7"
-   local progsrc="$TV_Wine_dir/drive_c/Program Files/TeamViewer/Version7"
-@@ -158,7 +158,7 @@
-   done
- }
- 
--function setup_wine_tweaks()
-+setup_wine_tweaks()
- {
-   # Enable Subpixel Hinting
-   if ! [ -e "$WINEPREFIX/.set_fontsmooth" ] ; then
-@@ -191,7 +191,7 @@
-   fi
- }
- 
--function setup_tar_env()
-+setup_tar_env()
- {
-   local dsrc="$TV_script_dir/teamviewer.desktop.template"
-   local ddst="$TV_script_dir/teamviewer.desktop"
-@@ -210,7 +210,7 @@
-   fi
- }
- 
--function setup_env()
-+setup_env()
- {
-   local tvwine="$TV_Wine_dir/drive_c/Program Files/TeamViewer/Version7/tvwine.dll.so"
- 
-@@ -227,7 +227,7 @@
-   (cd /etc; ls -m *-release *-version *_version > "$TV_profile/drive_c/distrelease" 2> /dev/null)
- }
- 
--function validate_user()
-+validate_user()
- {
-   local userid=$(id -un)
- 
-@@ -236,7 +236,7 @@
-   fi
- }
- 
--function validate_binary()
-+validate_binary()
- {
-   local binary="$1"
- 
-@@ -245,9 +245,11 @@
-   fi
- }
- 
--function die()
-+die()
- {
--  echo -e "\nError: $@\n"
-+  echo
-+  echo "Error: $@"
-+  echo
-   exit 1
- }
- 
diff --git a/net-misc/teamviewer/files/teamviewer-8.0.20931-gentoo.patch b/net-misc/teamviewer/files/teamviewer-8.0.20931-gentoo.patch
deleted file mode 100644
index 48c3712e8e74..000000000000
--- a/net-misc/teamviewer/files/teamviewer-8.0.20931-gentoo.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-commit d3060b46b357c399d522e8346dd6c9b99c322343
-Author: hasufell <hasufell@gentoo.org>
-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/metadata.xml b/net-misc/teamviewer/metadata.xml
index a89b1f8b3a31..b31fed4f87b0 100644
--- a/net-misc/teamviewer/metadata.xml
+++ b/net-misc/teamviewer/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
+<herd>proxy-maintainers</herd>
+        <maintainer>
+                <email>dct23@cornell.edu</email>
+                <name>Devrin Talen</name>
+                <description>Proxy maintainer. Assign bugs to him</description>
+        </maintainer>
 	<use>
 		<flag name="system-wine">Use <pkg>app-emulation/wine</pkg> instead of bundled one.</flag>
 	</use>
diff --git a/net-misc/teamviewer/teamviewer-8.0.20931.ebuild b/net-misc/teamviewer/teamviewer-10.0.36281.ebuild
index 7c1eb5bc070a..ac0b1696569e 100644
--- a/net-misc/teamviewer/teamviewer-8.0.20931.ebuild
+++ b/net-misc/teamviewer/teamviewer-10.0.36281.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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-8.0.20931.ebuild,v 1.2 2014/06/18 20:40:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/teamviewer/teamviewer-10.0.36281.ebuild,v 1.1 2015/03/09 05:29:03 idella4 Exp $
 
 EAPI=5
 
@@ -9,13 +9,14 @@ 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"
+KEYWORDS="~*"
 IUSE="system-wine"
 
 RESTRICT="mirror"
@@ -27,15 +28,14 @@ RDEPEND="
 		amd64? (
 			app-emulation/emul-linux-x86-baselibs
 			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
 			)
@@ -55,7 +55,7 @@ RDEPEND="
 
 QA_PREBUILT="opt/teamviewer${MV}/*"
 
-S=${WORKDIR}/opt/teamviewer${MV}/tv_bin
+S=${WORKDIR}/opt/teamviewer/tv_bin
 
 make_winewrapper() {
 	cat << EOF > "${T}/${MY_PN}"
@@ -69,15 +69,10 @@ EOF
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 	sed \
-		-e "s/@TVV@/${MV}/g" \
+		-e "s#@TVV@#${MV}/tv_bin#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 () {
@@ -87,28 +82,24 @@ src_install () {
 		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}
+		insinto /opt/${MY_PN}/tv_bin
+		doins -r *
+
+		exeinto /opt/${MY_PN}/tv_bin
+		doexe TeamViewer_Desktop
+		exeinto /opt/${MY_PN}/tv_bin/script
+		doexe script/teamviewer script/tvw_{aux,config,exec,extra,main,profile}
 
-		# install internal wine
-		insinto /opt/${MY_PN}
-		doins -r wine
-		dosym /opt/${MY_PN}/script/${PN} /opt/bin/${MY_PN}
+		dosym /opt/${MY_PN}/tv_bin/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
+		fperms 755 /opt/${MY_PN}/tv_bin/wine/bin/wine{,-preloader,server}
+		fperms 755 /opt/${MY_PN}/tv_bin/wine/drive_c/TeamViewer/TeamViewer.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}
+	exeinto /opt/${MY_PN}/tv_bin
 	doexe ${PN}d
 
 	# set up logdir
@@ -120,10 +111,10 @@ src_install () {
 	dosym /etc/${MY_PN} /opt/${MY_PN}/config
 
 	doinitd "${T}"/${PN}d${MV}
-	systemd_dounit script/${PN}d.service
+	systemd_newunit script/${PN}d.service ${PN}d${MV}.service
 
 	newicon -s 48 desktop/${PN}.png ${MY_PN}.png
-	dodoc ../doc/linux_FAQ_{EN,DE}.txt
+#dodoc ../doc/linux_FAQ_{EN,DE}.txt
 	make_desktop_entry ${MY_PN} TeamViewer ${MY_PN}
 }
 
@@ -147,14 +138,7 @@ pkg_postinst() {
 	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."
+	elog "Logs are written to \"/var/log/teamviewer${MV}\""
 }
 
 pkg_postrm() {
diff --git a/net-misc/teamviewer/teamviewer-7.0.9377.ebuild b/net-misc/teamviewer/teamviewer-7.0.9377.ebuild
deleted file mode 100644
index b42d7f0365aa..000000000000
--- a/net-misc/teamviewer/teamviewer-7.0.9377.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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-7.0.9377.ebuild,v 1.5 2014/11/12 23:18:50 axs Exp $
-
-EAPI=5
-
-inherit eutils gnome2-utils
-
-# 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://download.teamviewer.com/download/version_${MV}x/teamviewer_linux.tar.gz -> ${P}.tar.gz"
-
-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-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]
-				)
-				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}/teamviewer${MV}
-
-make_winewrapper() {
-	cat << EOF > "${T}/${MY_PN}"
-#!/bin/sh
-exec wine "/opt/${MY_PN}/bin/TeamViewer.exe" "\$@"
-EOF
-	chmod go+rx "${T}/${MY_PN}"
-	exeinto /opt/bin
-	doexe "${T}/${MY_PN}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-POSIX.patch
-}
-
-src_install () {
-	if use system-wine ; then
-		make_winewrapper
-		exeinto /opt/${MY_PN}/bin
-		doexe "${S}/.wine/drive_c/Program Files/TeamViewer/Version7/"*
-	else
-		# install scripts and .reg
-		insinto /opt/${MY_PN}/bin
-		find ".tvscript" -type f \( \! -name "${PN}.desktop*" -a \! -name "${PN}.png" \) \
-			-maxdepth 1 -execdir doins '{}' \;
-
-		# install wine
-		insinto /opt/${MY_PN}/wine
-		doins -r "${S}"/.wine/*
-		dosym /opt/${MY_PN}/bin/${PN} /opt/bin/${MY_PN}
-
-		# fix permissions
-		fperms 755 /opt/${MY_PN}/bin/{${PN},wrapper,killteamviewer}
-		fperms 755 /opt/${MY_PN}/wine/bin/wine{,-preloader,server}
-		fperms 755 "/opt/${MY_PN}/wine/drive_c/Program Files/TeamViewer/Version${MV}"/TeamViewer{,_Desktop}.exe
-		find "${D}"/opt/${MY_PN} -type f -name "*.so*" -execdir chmod 755 '{}' \;
-	fi
-
-	newicon -s 48 "${S}"/.tvscript/${PN}.png ${MY_PN}.png
-	dodoc linux_FAQ_{EN,DE}.txt
-	make_desktop_entry ${MY_PN} TeamViewer-${MV} ${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
-
-	elog "Logs are written to:"
-	elog "  ~/.teamviewer/7"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}