gentoo resync : 08.08.2018

4 files changed, 5 insertions, 95 deletions

diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 9be509898612..d9480cb8f923 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,7 +1,5 @@
-DIST Remmina-1.2.30.1.tar.gz 1252587 BLAKE2B ac5f60cf0e92585a157d9649904146d5ff17e53297e3cf041c443309c4526a89f9bf54358d6c61a59eed88783feb214397cd9af5d9ce1ad671bbf28c9ce2617b SHA512 c160655dd05d3b7ae7b3545e7f41d5bed80cb39b103f906a51c27f4653c7a13919fc02928097747fd2cceff1adf50c36e4d0ecccf32efbea6e859f24bf1b4294
+DIST Remmina-1.2.31.2.tar.gz 1247378 BLAKE2B 923b131ea2b4cff57d952bcfc2cdac58ad849ce3220dc6e3084b3905f9fe1203443fe0bb2f8a3fa910e7f367299b1b8c1b2373e8b337da7c4ff99ced1951492b SHA512 e66bd77e3b3e8374773e6029a727d814ada09b90a5620452e8ecce19e6f4327aa2e50b8956b292abce2e9329deec79370665a6a6aecbc2d33557381ce5b8db3b
 DIST remmina-1.2.0_rc24.tar.gz 1052140 BLAKE2B 57b3d2ed8a765f98f1ffd3c79df076d07e00329bf95dfddb9094d8bc62838b0f6742b404b4deef0a037bd88259751799e1842fb97313337e11b8f0faed8ad302 SHA512 aab421c580e434ca673be063f3662f1d9128cc83aaee6f9bc6acf6996af0379af6fb99cc63273941c40c6b989653b972de6c43b575ca06bf56ec7c266590c17e
-DIST remmina-1.2.0_rc29.tar.gz 1194267 BLAKE2B c4059ed56f3903f248009eacc20201fc533d47c2ad5d4e053c2ce225e8bc3fe50fc4c01cf912eb77dde220418589d5a85808b7c5e4b6083f6919dc5695aa049d SHA512 ae1190762588857ac59c86c43c66ba0aa3f584820a6e87ea7b7bb81a63f71acc7407d544d9f25edf9be4f45a536d3a2bb8de34e2448de6cd5d0f130de05ff52c
-EBUILD remmina-1.2.0_rc24.ebuild 2007 BLAKE2B 30c5e90c97fa5c9dc329108320e90d82ebcffc846634e727fe0e6e25d32e5febbe68e249bca955c91449da1c3cc4f22f5a6184c4515d1fef4685236573e37857 SHA512 b69b8a14476ed2ccc75ae82e723d0f780a513f8978d2b27f2331b7c0cfd77797bc1351441fcd048338ad33f1a16cffda4e514e43314c782ccd5e8bf846e18b3a
-EBUILD remmina-1.2.0_rc29-r1.ebuild 2151 BLAKE2B 35512e91077ecf103fe3c3d57d60ccea7eff017af4f09daac52e4f94adb4fb85a952d08e24e90d65f95086cdd4b10931ed4fca821060d2d5c932b1ad5c9ed413 SHA512 21c3dbf8cf7566c4a8207c11868d92983f416d78ae4b710835f01f20c6231f0a905109c7f8fe240b5b33ae160353da90bbc8d4539a48f69369abd9ab1bf02cd6
-EBUILD remmina-1.2.30.1.ebuild 2223 BLAKE2B 475810adc6d4769e4ffe6e3763b5f9539dd110ba33d68f7f2a8c7c6cedfd4d1b95d0a221051a49392b9030f51c03252dc3a28180f4aaf634297612e93bf98050 SHA512 f54b5095ddea11519b03258406b5f36db4afb010020abd9c883028e24690dd36f662d0f8259d3247ee652294dcb04d1a6ac508ce361ee2076148b032fc2d8bca
+EBUILD remmina-1.2.0_rc24.ebuild 2035 BLAKE2B 7490ba779c88bf0caf7f1de2398dec1484acf428f3f1ddd06b021965d3ef255927d9637e24c56a71a3737707ef6a2df0257dc1a486c60e665e99721aaa5c1092 SHA512 058740deb4f072b8677fcb5bcedf2c870dccf748c166594cdf24cc09574b1fd1b8fb0157b89c82e43bd3dabcc892e72f561ed4db816ea269c40b2da9b73ce3cf
+EBUILD remmina-1.2.31.2.ebuild 2223 BLAKE2B 475810adc6d4769e4ffe6e3763b5f9539dd110ba33d68f7f2a8c7c6cedfd4d1b95d0a221051a49392b9030f51c03252dc3a28180f4aaf634297612e93bf98050 SHA512 f54b5095ddea11519b03258406b5f36db4afb010020abd9c883028e24690dd36f662d0f8259d3247ee652294dcb04d1a6ac508ce361ee2076148b032fc2d8bca
 MISC metadata.xml 1150 BLAKE2B b75ab4d0b30c602c1bdf2d9bb5701444570ea7cc53a97e3a27dde34044ab69f0f550fb2f8ca3d76ff04b0ff0a30164fc20696443896f3f732c4ce589a4a57b0d SHA512 9ed39584a65811d52192ff8390d02c3630f88a213c998e7990acf74f1aa26cb2abb54f4f75eb01cfe88b1986756eb9d59f2362e1ccfacc9e81c99e044a739809
diff --git a/net-misc/remmina/remmina-1.2.0_rc24.ebuild b/net-misc/remmina/remmina-1.2.0_rc24.ebuild
index b0a238363e90..7d87cd64d66a 100644
--- a/net-misc/remmina/remmina-1.2.0_rc24.ebuild
+++ b/net-misc/remmina/remmina-1.2.0_rc24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ CDEPEND="
 	x11-libs/libxkbfile
 	ayatana? ( dev-libs/libappindicator:3 )
 	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0 )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0 <net-misc/freerdp-2.0.0_rc3 )
 	gnome-keyring? ( app-crypt/libsecret )
 	spice? ( net-misc/spice-gtk[gtk3] )
 	ssh? ( net-libs/libssh[sftp]
diff --git a/net-misc/remmina/remmina-1.2.0_rc29-r1.ebuild b/net-misc/remmina/remmina-1.2.0_rc29-r1.ebuild
deleted file mode 100644
index 6a083c93c027..000000000000
--- a/net-misc/remmina/remmina-1.2.0_rc29-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils gnome2-utils
-
-MY_PV="${PV//_rc/-rcgit.}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ayatana crypt rdp gnome-keyring libressl nls spice ssh telepathy vnc zeroconf"
-
-CDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	ayatana? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0 )
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver )
-	zeroconf? ( net-dns/avahi[gtk3] )
-"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	net-libs/libsoup
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${CDEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/Remmina-${MY_PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex ayatana)
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DGTK_VERSION=3
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	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]
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/remmina/remmina-1.2.30.1.ebuild b/net-misc/remmina/remmina-1.2.31.2.ebuild
index 9c7e1d7fba7c..9c7e1d7fba7c 100644
--- a/net-misc/remmina/remmina-1.2.30.1.ebuild
+++ b/net-misc/remmina/remmina-1.2.31.2.ebuild