gentoo resync : 25.11.2020

4 files changed, 10 insertions, 110 deletions

diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index f504115477ac..e456983afcd0 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,8 +1,6 @@
 AUX remmina-1.4.5-with-examples.patch 1845 BLAKE2B 0da938e4f9c6ce8f0dc094449477d030c4b26c05b0758d9669d6f29311ee4c3273374addd92c2e191cb86c91dbce7ebb7681ebec46462986696c746e0dcd03ec SHA512 7a4c09378238a675e76eadeaa29215d32ea5f6afa618bdb60569b30ed9fba0dcbf7ae7cf3a1de47a05d25c5b61a3bd14313930dc02967477c20e212483af1e59
-DIST Remmina-v1.4.5.tar.gz 1787506 BLAKE2B 095a01cca168daaef9ef59ff5adb9bb475467e8e8c42cac74a1a605627b09aa7246aa941b514b0de29739516aa988148f377040ed8629df3d5b17f0b1158cf76 SHA512 fec07b488db8d438aa6a0263e13557c10f1401a81b3371a2da03a1037d51f8e58e88652a15c6d6ce9e02535ef93ed0f9c5b674ab5efab430380f4b7dd57c4d9d
-DIST Remmina-v1.4.7.tar.gz 1908687 BLAKE2B a6656821d727914f70bafe50d5c3764e3c36a4753c618048b91eadc1fa27b8f03bcd313b99cfd46cadc446b85b583994528895f9fb755d6c8ee28e0b0bab66d1 SHA512 ebe1e62e090062107ed6674d494255bac9e3d175553bc5ae949aa1bfc9e1de4b59f35f523ee36b08bb02580513d3b585344b9864001dd991cac656f1c13116e9
 DIST Remmina-v1.4.8.tar.gz 1998851 BLAKE2B 80427d06c041d6315fa8fabe90aa8a52ebd2cd1a76ab0e74672f54328d5fa9d0d287e551a5027e5ef60471ce4d934cfe745742058f26e7b93a95e2a1f85dbfd9 SHA512 cf8ea93904a1643f480d7de72bc4154570bcf184150ffc4b3b06699c95f354bc2f4f595c3b00c6c87e9797dc60bcb9993913647b2073f1e85977026f290d81bf
-EBUILD remmina-1.4.5.ebuild 2526 BLAKE2B ba26b2f4e3bcd9f272b0c5acd7d97f387809dc0db5a3c07b24ecf9b4f556ab9c8d4a6d7f51221e5d15f17fc436197a766c7b5a28c0fa98fb1e12b234baab07c9 SHA512 d3f39ff7c4d8d32fb175e03f796c3ccb482a32e726216201a2c114cb16ef373eec731aa9fdea3ff273c2928c377275d73494f666ae9cbfa19edc0b724300c7a0
-EBUILD remmina-1.4.7.ebuild 2529 BLAKE2B b703d493b3234c0f131e5407f5affca72795f4450a27cbcef99a684d2a80403b296c6bee0b42c199d25c59fd9d5e57bf658ea073f5fb7408105e04eabb8c1996 SHA512 a806170ef86f63ceb1c5bdb51817c0415a003c759ce0487c69dee69e581035e7f8cea05e2b2f894121600e882bb16d06b2e1aeade956a6b712f0da6e663a23e7
-EBUILD remmina-1.4.8.ebuild 2529 BLAKE2B b703d493b3234c0f131e5407f5affca72795f4450a27cbcef99a684d2a80403b296c6bee0b42c199d25c59fd9d5e57bf658ea073f5fb7408105e04eabb8c1996 SHA512 a806170ef86f63ceb1c5bdb51817c0415a003c759ce0487c69dee69e581035e7f8cea05e2b2f894121600e882bb16d06b2e1aeade956a6b712f0da6e663a23e7
+DIST Remmina-v1.4.9.tar.gz 2033555 BLAKE2B 901e0118f8231a6bf021a0389a1db9462f19527b21954f3deba24e92e3c04d0d323efa3aeb475f0ec915e8cdc4b55cf331ba2010598e8a58567cba0f353b5177 SHA512 21c5141619874a3d90fd1e2ee9ae87dd4ca4b7dc14c0e16f06bca01b38f84db6e7ab178b0f6e9db703bf5d1ddcb17db45553786bb047cf814b1ff67f4aa6139f
+EBUILD remmina-1.4.8-r1.ebuild 2493 BLAKE2B 444297b0607ae73a1a8868ddb5c5af4c58484adc944ad29d2c983b70c5ca482e20a7782d4681b59330183c074acc4d138517eb6e5bf702d5e2daa361ca96d2fa SHA512 95a1c2cf34f5039268cc58afbc36e6bc872f740a1ec2465ef95aa4c703b1592fd89ff86d7b1ef817ac184ac0b6202585f96bfab5e7a53c35b3018cc6f8a72b82
+EBUILD remmina-1.4.9.ebuild 2495 BLAKE2B eb98f41f1abc9e1ad47cd576a60b68b97f43dfbb57a3cf5d10354cf4cbfbf0e720b7d9eeca14bf22182461f63b2fbae185c85a96ebfd35f86ae51ff721729668 SHA512 0b860aaaf18815fcfd10293f14810c9948fea66636b1360bafce7a5335a239527b84a70aa70339fe54b46391a0fdf06a1e61b2284b141b667e5b733ab84f325f
 MISC metadata.xml 1084 BLAKE2B e4bb4c696f1ef71959b779ccad19d3ee380a6e846e42b1e02caf2a772df07d168bb9623b8f29cfdcc7fb37f60523e6c1fc471f016ea3437c18b3e7512a4bcad4 SHA512 c0b50eca7d4cdd6dfa201aabec7c195b7dca44938ee627919a000bdc47fc95acd4107936a61399fab2c78dfcd3b97ce06753e97fc6bb21015758afe91337a346
diff --git a/net-misc/remmina/remmina-1.4.5.ebuild b/net-misc/remmina/remmina-1.4.5.ebuild
deleted file mode 100644
index 496031854c5b..000000000000
--- a/net-misc/remmina/remmina-1.4.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libsodium:=
-	net-libs/libsoup
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	appindicator? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129
-		<net-misc/freerdp-3
-		cups? ( net-print/cups:= ) )
-	gnome-keyring? ( app-crypt/libsecret )
-	kwallet? ( kde-frameworks/kwallet )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) )
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-with-examples.patch
-	cmake_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex appindicator)
-		-DWITH_GCRYPT=$(usex crypt)
-		-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_CUPS=$(usex cups)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "To get additional features, some optional runtime dependencies"
-	elog "may be installed:"
-	elog ""
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
-}
diff --git a/net-misc/remmina/remmina-1.4.8.ebuild b/net-misc/remmina/remmina-1.4.8-r1.ebuild
index 8c06917c5d43..4222860b8986 100644
--- a/net-misc/remmina/remmina-1.4.8.ebuild
+++ b/net-misc/remmina/remmina-1.4.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
 
 DEPEND="
@@ -27,8 +27,8 @@ DEPEND="
 	x11-libs/libxkbfile
 	appindicator? ( dev-libs/libappindicator:3 )
 	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129
-		<net-misc/freerdp-3
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
+		<net-misc/freerdp-3[X]
 		cups? ( net-print/cups:= ) )
 	gnome-keyring? ( app-crypt/libsecret )
 	kwallet? ( kde-frameworks/kwallet )
@@ -40,7 +40,7 @@ DEPEND="
 	telepathy? ( net-libs/telepathy-glib )
 	vnc? ( net-libs/libvncserver[jpeg] )
 	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) )
+	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
 "
 BDEPEND="
 	dev-util/intltool
diff --git a/net-misc/remmina/remmina-1.4.7.ebuild b/net-misc/remmina/remmina-1.4.9.ebuild
index 8c06917c5d43..518563f4af8c 100644
--- a/net-misc/remmina/remmina-1.4.7.ebuild
+++ b/net-misc/remmina/remmina-1.4.9.ebuild
@@ -27,8 +27,8 @@ DEPEND="
 	x11-libs/libxkbfile
 	appindicator? ( dev-libs/libappindicator:3 )
 	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129
-		<net-misc/freerdp-3
+	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129[X]
+		<net-misc/freerdp-3[X]
 		cups? ( net-print/cups:= ) )
 	gnome-keyring? ( app-crypt/libsecret )
 	kwallet? ( kde-frameworks/kwallet )
@@ -40,7 +40,7 @@ DEPEND="
 	telepathy? ( net-libs/telepathy-glib )
 	vnc? ( net-libs/libvncserver[jpeg] )
 	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) )
+	zeroconf? ( >=net-dns/avahi-0.8-r2[dbus,gtk] )
 "
 BDEPEND="
 	dev-util/intltool