[gentoo-commits] repo/gentoo:master commit in: net-misc/anydesk/files/, net-misc/anydesk/

[Joonas Niilola]

commit:     dd20d0926687e9b9616dfa8e1852bc3b64640573
Author:     INODE64 <ffelix <AT> inode64 <DOT> com>
AuthorDate: Tue Feb 14 08:42:59 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 14:23:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd20d092

net-misc/anydesk: hint about optional sound feature

Closes: https://github.com/gentoo/gentoo/pull/29576
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-misc/anydesk/Manifest                          |  1 -
 net-misc/anydesk/anydesk-6.2.0-r1.ebuild           | 99 ----------------------
 ...nydesk-6.2.1.ebuild => anydesk-6.2.1-r1.ebuild} |  2 +
 net-misc/anydesk/files/anydesk-4.0.1.service       |  2 +-
 net-misc/anydesk/files/anydesk.init                |  2 +-
 5 files changed, 4 insertions(+), 102 deletions(-)

diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest
index 1146fa58155c..60ff7c07658a 100644
--- a/net-misc/anydesk/Manifest
+++ b/net-misc/anydesk/Manifest
@@ -1,2 +1 @@
-DIST anydesk-6.2.0-amd64.tar.gz 6216311 BLAKE2B ffdd139e5e67cf9da5eefcd8c261a52d5e556923353baec8d848aea95a6583280845c3d2cf9c34fbcbecf9ddb3991aa59542baf74f2761cc4a7ee69637be0bd4 SHA512 673e5a0a0ca6d2c550c9c01a07edd2096db26416286a5a603adfc7a844d864f327061e0906978c6e4cd0871859f12f281a52b3bceffe8a6014a1bb3c54322ab6
 DIST anydesk-6.2.1-amd64.tar.gz 6634159 BLAKE2B 03abb9c3a990a8e4b53505896ebef253c386f578a275ccbec55e85cbb27e5c0f140863c6dc407b1d0cc2f2975b63bcd13487e27425b16cd3fdb42fd71a646e97 SHA512 2a36eb0698d18d7f779a9c7b8a17b2a9964fc10ba1ce65a68555332e58fd316b8541ef5443c8f8a62a30711e8dd19174d599ac2cdccd581da645c6b6a7e000ae

diff --git a/net-misc/anydesk/anydesk-6.2.0-r1.ebuild b/net-misc/anydesk/anydesk-6.2.0-r1.ebuild
deleted file mode 100644
index f066939a989a..000000000000
--- a/net-misc/anydesk/anydesk-6.2.0-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit desktop optfeature systemd xdg-utils
-
-DESCRIPTION="Feature rich multi-platform remote desktop application"
-HOMEPAGE="https://anydesk.com"
-SRC_URI="https://download.anydesk.com/linux/${P}-amd64.tar.gz
-	https://download.anydesk.com/linux/generic-linux/${P}-amd64.tar.gz"
-
-# OpeSSL/SSLeay, libvpx, zlib, Xiph, xxHash
-LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-RDEPEND="
-	dev-libs/atk
-	dev-libs/glib:2
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	media-libs/glu
-	sys-auth/polkit
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/gtkglext
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-"
-BDEPEND="dev-util/patchelf"
-
-RESTRICT="bindist mirror"
-
-QA_PREBUILT="opt/${PN}/*"
-
-src_install() {
-	local dst="/opt/${PN}"
-
-	exeinto ${dst}
-	doexe ${PN}
-
-	dodir /opt/bin
-	dosym "${dst}/${PN}" "/opt/bin/${PN}"
-
-	newinitd "${FILESDIR}/anydesk.init" anydesk
-	systemd_newunit "${FILESDIR}/anydesk-4.0.1.service" anydesk.service
-
-	insinto /usr/share/polkit-1/actions
-	doins polkit-1/com.anydesk.anydesk.policy
-
-	insinto /usr/share
-	doins -r icons
-
-	domenu "${FILESDIR}/anydesk.desktop"
-
-	dodoc copyright README
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "To run AnyDesk as background service use:"
-		elog
-		elog "OpenRC:"
-		elog "# rc-service anydesk start"
-		elog "# rc-update add anydesk default"
-		elog
-		elog "Systemd:"
-		elog "# systemctl start anydesk.service"
-		elog "# systemctl enable anydesk.service"
-		elog
-		elog "Please see README at /usr/share/doc/${PF}/README.bz2 for"
-		elog "further information about the linux version of AnyDesk."
-		elog
-	fi
-
-	optfeature_header "AnyDesk uses additional tools to query information about the host:"
-	optfeature "lsb_release" sys-apps/lsb-release
-	optfeature "lspci" sys-apps/pciutils
-	optfeature "lsusb" sys-apps/usbutils
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}

diff --git a/net-misc/anydesk/anydesk-6.2.1.ebuild b/net-misc/anydesk/anydesk-6.2.1-r1.ebuild
similarity index 97%
rename from net-misc/anydesk/anydesk-6.2.1.ebuild
rename to net-misc/anydesk/anydesk-6.2.1-r1.ebuild
index 90d3f93c2857..5dad6aaccc1d 100644
--- a/net-misc/anydesk/anydesk-6.2.1.ebuild
+++ b/net-misc/anydesk/anydesk-6.2.1-r1.ebuild
@@ -14,6 +14,7 @@ SRC_URI="https://download.anydesk.com/linux/${P}-amd64.tar.gz
 LICENSE="AnyDesk-TOS BSD BSD-2 openssl ZLIB"
 SLOT="0"
 KEYWORDS="-* ~amd64"
+IUSE="sound"
 
 # x11-libs/gtkglext is required and cannot be mitigated: https://bugs.gentoo.org/868255
 RDEPEND="
@@ -39,6 +40,7 @@ RDEPEND="
 	x11-libs/libXrender
 	x11-libs/libXtst
 	x11-libs/pango
+	sound? ( media-libs/libcanberra[gtk2] )
 "
 BDEPEND="dev-util/patchelf"
 

diff --git a/net-misc/anydesk/files/anydesk-4.0.1.service b/net-misc/anydesk/files/anydesk-4.0.1.service
index e7a3ef008374..38ce50ea938d 100644
--- a/net-misc/anydesk/files/anydesk-4.0.1.service
+++ b/net-misc/anydesk/files/anydesk-4.0.1.service
@@ -6,7 +6,7 @@ After=systemd-user-sessions.service
 [Service]
 Type=simple
 ExecStart=/opt/bin/anydesk --service
-PIDFile=/var/run/anydesk.pid
+PIDFile=/run/anydesk.pid
 KillMode=mixed
 TimeoutStopSec=30
 User=root

diff --git a/net-misc/anydesk/files/anydesk.init b/net-misc/anydesk/files/anydesk.init
index 5b8986ed8d1b..83bc3e58c7e9 100644
--- a/net-misc/anydesk/files/anydesk.init
+++ b/net-misc/anydesk/files/anydesk.init
@@ -6,5 +6,5 @@ name="AnyDesk service"
 description="AnyDesk global service"
 command="/opt/bin/anydesk"
 command_args="--service"
-pidfile="/var/run/anydesk.pid"
+pidfile="/run/anydesk.pid"
 command_background=true