From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A8BF2138334 for ; Sun, 16 Sep 2018 10:18:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9997CE0C97; Sun, 16 Sep 2018 10:18:54 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5B3E7E0C97 for ; Sun, 16 Sep 2018 10:18:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 59EEE335CE7 for ; Sun, 16 Sep 2018 10:18:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 66D193C6 for ; Sun, 16 Sep 2018 10:18:50 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1537093125.169caaccf530b0c7f09003dc16707e5097aec8e6.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/teamviewer/files/, net-misc/teamviewer/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/teamviewer/Manifest net-misc/teamviewer/files/teamviewer-9.0.32150-gentoo.patch net-misc/teamviewer/files/teamviewerd9.init net-misc/teamviewer/metadata.xml net-misc/teamviewer/teamviewer-9.0.32150.ebuild X-VCS-Directories: net-misc/teamviewer/files/ net-misc/teamviewer/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 169caaccf530b0c7f09003dc16707e5097aec8e6 X-VCS-Branch: master Date: Sun, 16 Sep 2018 10:18:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4361d276-f386-40cf-9a41-05e7225f57c2 X-Archives-Hash: 8632538f74a82e00d9c23fb6f668ae36 commit: 169caaccf530b0c7f09003dc16707e5097aec8e6 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Sep 16 10:18:24 2018 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Sun Sep 16 10:18:45 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=169caacc net-misc/teamviewer: Drop old Package-Manager: Portage-2.3.40, Repoman-2.3.9 net-misc/teamviewer/Manifest | 1 - .../files/teamviewer-9.0.32150-gentoo.patch | 138 --------------------- net-misc/teamviewer/files/teamviewerd9.init | 25 ---- net-misc/teamviewer/metadata.xml | 3 - net-misc/teamviewer/teamviewer-9.0.32150.ebuild | 132 -------------------- 5 files changed, 299 deletions(-) diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest index 2dc6af9be0c..a84e0ba8f8a 100644 --- a/net-misc/teamviewer/Manifest +++ b/net-misc/teamviewer/Manifest @@ -1,4 +1,3 @@ -DIST teamviewer-9.0.32150.deb 22898922 BLAKE2B 799aa6f48b69247a2695ca745e85d02ffa73df1375203dfc9da339673e6c18d861c4146ddbdc509bdc1114d5a2a7e5fdd4acf3c6e5da61fbba5aaa02fa4e3cfd SHA512 3e72ed5cab7a754a0aa75e533da92292ad004f66c55ac4c386b6f4a65cc41b14a8d9d7a5410dccdb90c1172cd33e52383289339ab44f0847a061655498ab8e4d DIST teamviewer_13.1.3026_amd64.tar.xz 11500188 BLAKE2B 98dab12224ea65cdb7c45f01a835cb50fd052e044cb2908a27e0324d5647c1bcc38565eca0c1e70e86fd96a9f70ddd4b6250f13cde1fd3c381be9af8ecb1805c SHA512 30914b761833dd2720458eb3a3076f59e521bdf4fd50489e1cb7c0c80a05ef73c2fd5a9a59a33644e73b96d8db1616665a130e2781c39f35f6c5bfb64c7c7b9a DIST teamviewer_13.1.3026_i386.tar.xz 11343300 BLAKE2B c0170acf9c67f34755800a0200016dacb6f93f3f3805932fbf467dc19bb0213fce74363a0bc703af1c62b4c1bafda2257bd0cc2c52aad4dd1f22ae5a9fb2d486 SHA512 f7dac040de4a0ac3489ee5e911c3c278723cee2372bd42a4a929d3cb268f735eb73cccc514a8d72cc49c82277869533289e3195936218be6db323e732c9c380e DIST teamviewer_13.1.8286_amd64.tar.xz 11574812 BLAKE2B 9941a3c1894e4b1a285ac61bdeffb47629c7972d19a573016c357275b3fc5ede51838f35acb2debe36ccd96c20cab6478868b78c831ab7137cb1196440e62297 SHA512 76b10c1df368f4c639ff60a69dc541f791b82b73a19accce4c60fdfcff2922a4a674e08da73df570587e840088b466f4791f8da0691582451259965044a18ccb 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 1df4632795b..00000000000 --- 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 3a625c95d3b..00000000000 --- 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}" -} diff --git a/net-misc/teamviewer/metadata.xml b/net-misc/teamviewer/metadata.xml index d3f49802a30..468f2c9086f 100644 --- a/net-misc/teamviewer/metadata.xml +++ b/net-misc/teamviewer/metadata.xml @@ -5,8 +5,5 @@ maksbotan@gentoo.org Maxim Koltsov - - Use virtual/wine instead of bundled wine. - diff --git a/net-misc/teamviewer/teamviewer-9.0.32150.ebuild b/net-misc/teamviewer/teamviewer-9.0.32150.ebuild deleted file mode 100644 index 3481c9c27e6..00000000000 --- a/net-misc/teamviewer/teamviewer-9.0.32150.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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(-)] - ) - system-wine? ( virtual/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}/tv_bin#g" \ - "${FILESDIR}"/${PN}d${MV}.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}/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} - - dosym /opt/${MY_PN}/tv_bin/script/${PN} /opt/bin/${MY_PN} - - # fix permissions - 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 - - # install daemon binary - exeinto /opt/${MY_PN}/tv_bin - 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_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 - 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/teamviewer${MV}\"" -} - -pkg_postrm() { - gnome2_icon_cache_update -}