From 1b9514918e9ea77626226dbf7860736cd2cb557c Mon Sep 17 00:00:00 2001
From: Ben Kohler <bkohler@gentoo.org>
Date: Sat, 11 Dec 2021 07:48:54 -0600
Subject: [PATCH] net-misc/remmina: bump to 1.4.22, drop old

Package-Manager: Portage-3.0.29, Repoman-3.0.3
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
---
 net-misc/remmina/Manifest                     |  2 +-
 ...1.4.20-r1.ebuild => remmina-1.4.22.ebuild} | 38 ++++++++++---------
 2 files changed, 21 insertions(+), 19 deletions(-)
 rename net-misc/remmina/{remmina-1.4.20-r1.ebuild => remmina-1.4.22.ebuild} (94%)

diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 823c045aef460..1647dce987156 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,2 +1,2 @@
-DIST Remmina-v1.4.20.tar.gz 2489535 BLAKE2B 8d557dfc8629572d3fc930aea85e62fdc6294521c4997e1d211b8aac385f1bab3a13f082cff7f40e3add839d3922b4884736a9a50eb3e043df4c6314d3e456c5 SHA512 27a4bfbcb77f1cebe527bdcdd78f1dedb703c888c9452bdac7162e18e7eee0bf2e49143f3a3f98d451d4c1cf7cd6b9f89ae9fb67755930501e4f08e08d311892
 DIST Remmina-v1.4.21.tar.gz 2982350 BLAKE2B d076db92290ead724e6b5c13beba2ef94d16e8209c5095e5db754a8b25ee236ed7a87b5ce29ac0b9424d3c55e5443467b1cc628fb80a0f63c59d915d9fc7839e SHA512 3fb7a29bf9e001203bdc5c176a0cf11a5c98638d605a02e2edbb16669b9e85526706c11e15bd2c308919ee6ef14217356bbafa0328ce337053bba20da6f2905a
+DIST Remmina-v1.4.22.tar.gz 3277782 BLAKE2B d9502406e9a534de18358d9d6a7790a5bb25a5be79ee9bfa390cc2c7de01e0852337834fbe1213b5f683bb948f124d44e4006a6650dd3794ee8a1f707307ed53 SHA512 8b5b8c92d5d732aec1530fdd5c1c7f74b9bfe9a9e8e990f21e92780d57b3642508c6a8c36c741bad8caa765a9709afbd577b26fe196cf71d883f924237212551
diff --git a/net-misc/remmina/remmina-1.4.20-r1.ebuild b/net-misc/remmina/remmina-1.4.22.ebuild
similarity index 94%
rename from net-misc/remmina/remmina-1.4.20-r1.ebuild
rename to net-misc/remmina/remmina-1.4.22.ebuild
index 0d23b7a13176c..5c9f28ce599d6 100644
--- a/net-misc/remmina/remmina-1.4.20-r1.ebuild
+++ b/net-misc/remmina/remmina-1.4.22.ebuild
@@ -13,8 +13,8 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit zeroconf"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="crypt cups examples gnome-keyring gvnc kwallet nls spice ssh rdp telemetry vnc webkit x2go zeroconf"
 
 DEPEND="
 	dev-libs/glib:2
@@ -29,17 +29,18 @@ DEPEND="
 	x11-libs/libX11
 	x11-libs/libxkbfile
 	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
-		<net-misc/freerdp-3[X]
-		cups? ( net-print/cups:= ) )
 	gnome-keyring? ( app-crypt/libsecret )
 	gvnc? ( net-libs/gtk-vnc )
 	kwallet? ( kde-frameworks/kwallet )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
+		<net-misc/freerdp-3[X]
+		cups? ( net-print/cups:= ) )
 	spice? ( net-misc/spice-gtk[gtk3] )
 	ssh? ( net-libs/libssh:0=[sftp]
 		x11-libs/vte:2.91 )
 	vnc? ( net-libs/libvncserver[jpeg] )
 	webkit? ( net-libs/webkit-gtk:4 )
+	x2go? ( net-misc/pyhoca-cli )
 	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
 "
 BDEPEND="
@@ -64,24 +65,25 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_CUPS=$(usex cups)
 		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_TRANSLATIONS=$(usex nls)
 		-DWITH_FREERDP=$(usex rdp)
 		-DWITH_FREERDP3=OFF
-		-DWITH_CUPS=$(usex cups)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_NEWS=$(usex telemetry)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_GETTEXT=$(usex nls)
 		-DWITH_ICON_CACHE=OFF
+		-DWITH_KF5WALLET=$(usex kwallet)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_NEWS=$(usex telemetry)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_TRANSLATIONS=$(usex nls)
 		-DWITH_UPDATE_DESKTOP_DB=OFF
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_WWW=$(usex webkit)
+		-DWITH_X2GO=$(usex x2go)
 		# when this feature is stable, add python eclass usage to optionally enable
 		-DWITH_PYTHON=OFF
 	)