gentoo resync : 25.08.2020

2 files changed, 21 insertions, 21 deletions

diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index ca36d27bc4c8..56991656ad71 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,8 +1,8 @@
 AUX remmina-1.4.5-with-examples.patch 1845 BLAKE2B 0da938e4f9c6ce8f0dc094449477d030c4b26c05b0758d9669d6f29311ee4c3273374addd92c2e191cb86c91dbce7ebb7681ebec46462986696c746e0dcd03ec SHA512 7a4c09378238a675e76eadeaa29215d32ea5f6afa618bdb60569b30ed9fba0dcbf7ae7cf3a1de47a05d25c5b61a3bd14313930dc02967477c20e212483af1e59
-DIST Remmina-v1.4.3.tar.gz 1705751 BLAKE2B 4d49b5d5da4017cc1870a5e37a73db767862997cffdd58b080ab5707eeb293eed7e756ca974a4f4922bb9417e94610fe07b1e774f5ad7e269e797362ff264e83 SHA512 9f555f9ff60e2a136f6379a0f2828d091aa972dcff7ebd09eaf1834dc10f506d218e5cb6856c17f625c1040a11240da2ed5ebe9f4fe32a083494cfcbbdef1a41
 DIST Remmina-v1.4.5.tar.gz 1787506 BLAKE2B 095a01cca168daaef9ef59ff5adb9bb475467e8e8c42cac74a1a605627b09aa7246aa941b514b0de29739516aa988148f377040ed8629df3d5b17f0b1158cf76 SHA512 fec07b488db8d438aa6a0263e13557c10f1401a81b3371a2da03a1037d51f8e58e88652a15c6d6ce9e02535ef93ed0f9c5b674ab5efab430380f4b7dd57c4d9d
 DIST Remmina-v1.4.7.tar.gz 1908687 BLAKE2B a6656821d727914f70bafe50d5c3764e3c36a4753c618048b91eadc1fa27b8f03bcd313b99cfd46cadc446b85b583994528895f9fb755d6c8ee28e0b0bab66d1 SHA512 ebe1e62e090062107ed6674d494255bac9e3d175553bc5ae949aa1bfc9e1de4b59f35f523ee36b08bb02580513d3b585344b9864001dd991cac656f1c13116e9
-EBUILD remmina-1.4.3.ebuild 2614 BLAKE2B e87cb2e5c2e626fbc8309bfeaddf385b9dd47fae9d0244ac3a79a631ebda8df235d3dfd59009b5882520fef7e697b6d75fb6fc16204cb6c747608a58b9092684 SHA512 855a700ce278a7385e5240c7767fa37b2478d227aa5fa9f899c08c1012e7669a94efb27a2bbce3d3f25d7fcc3047778141e56739524d4d72960175a5bdb545a3
+DIST Remmina-v1.4.8.tar.gz 1998851 BLAKE2B 80427d06c041d6315fa8fabe90aa8a52ebd2cd1a76ab0e74672f54328d5fa9d0d287e551a5027e5ef60471ce4d934cfe745742058f26e7b93a95e2a1f85dbfd9 SHA512 cf8ea93904a1643f480d7de72bc4154570bcf184150ffc4b3b06699c95f354bc2f4f595c3b00c6c87e9797dc60bcb9993913647b2073f1e85977026f290d81bf
 EBUILD remmina-1.4.5.ebuild 2522 BLAKE2B a860efa261252c4c559df6c4977c22bf56fef998b498dceea2e493d650a5ff2085259031c9f23df9d20fc81fc90e8ae85dd950f799213cc30884b4689c9ca5b3 SHA512 74d25d7c19ec7c9d68ce8ba06579d62608d47086874c1a4161ce52a393c7f24414c33033c088d4e41df6ba30e5d9356662c0a56702bc9115ced79af7381b720e
 EBUILD remmina-1.4.7.ebuild 2525 BLAKE2B 6c7d02fa36bb644ac179976d4d624a41deb3dd2c8e0c2d3cb13fa18892bf0cd06c40a64b5bb388146988872ee535a6d446365b7bb45616582169d12b0708b244 SHA512 a8adacebd610b10af5239d1e17ceddcf4763f642a91cb7240f887e76d0d206b80b37296ff85bbef8cf9eeb3651c6fe8c021707ddd8efb735459a893f8db4ec19
+EBUILD remmina-1.4.8.ebuild 2525 BLAKE2B 6c7d02fa36bb644ac179976d4d624a41deb3dd2c8e0c2d3cb13fa18892bf0cd06c40a64b5bb388146988872ee535a6d446365b7bb45616582169d12b0708b244 SHA512 a8adacebd610b10af5239d1e17ceddcf4763f642a91cb7240f887e76d0d206b80b37296ff85bbef8cf9eeb3651c6fe8c021707ddd8efb735459a893f8db4ec19
 MISC metadata.xml 1084 BLAKE2B e4bb4c696f1ef71959b779ccad19d3ee380a6e846e42b1e02caf2a772df07d168bb9623b8f29cfdcc7fb37f60523e6c1fc471f016ea3437c18b3e7512a4bcad4 SHA512 c0b50eca7d4cdd6dfa201aabec7c195b7dca44938ee627919a000bdc47fc95acd4107936a61399fab2c78dfcd3b97ce06753e97fc6bb21015758afe91337a346
diff --git a/net-misc/remmina/remmina-1.4.3.ebuild b/net-misc/remmina/remmina-1.4.8.ebuild
index 2daffd642361..f73e076ebcd8 100644
--- a/net-misc/remmina/remmina-1.4.3.ebuild
+++ b/net-misc/remmina/remmina-1.4.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eutils gnome2-utils xdg-utils
+inherit cmake eutils xdg
 
 MY_P="${PN^}-v${PV}"
 
@@ -13,10 +13,10 @@ 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="ayatana crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
+KEYWORDS="~amd64 ~x86"
+IUSE="appindicator crypt cups examples gnome-keyring kwallet libressl nls spice ssh rdp telemetry telepathy vnc webkit zeroconf"
 
-CDEPEND="
+DEPEND="
 	dev-libs/glib:2
 	dev-libs/json-glib
 	dev-libs/libsodium:=
@@ -25,7 +25,7 @@ CDEPEND="
 	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/libxkbfile
-	ayatana? ( dev-libs/libappindicator:3 )
+	appindicator? ( dev-libs/libappindicator:3 )
 	crypt? ( dev-libs/libgcrypt:0= )
 	rdp? ( >=net-misc/freerdp-2.0.0_rc4_p1129
 		<net-misc/freerdp-3
@@ -42,12 +42,14 @@ CDEPEND="
 	webkit? ( net-libs/webkit-gtk:4 )
 	zeroconf? ( || ( >=net-dns/avahi-0.8-r2[dbus,gtk] <net-dns/avahi-0.8-r2[dbus,gtk3] ) )
 "
-DEPEND="${CDEPEND}
+BDEPEND="
 	dev-util/intltool
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
-RDEPEND="${CDEPEND}
+
+RDEPEND="
+	${DEPEND}
 	virtual/freedesktop-icon-theme
 "
 
@@ -55,9 +57,14 @@ DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	xdg_environment_reset
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex ayatana)
+		-DWITH_APPINDICATOR=$(usex appindicator)
 		-DWITH_GCRYPT=$(usex crypt)
 		-DWITH_EXAMPLES=$(usex examples)
 		-DWITH_LIBSECRET=$(usex gnome-keyring)
@@ -73,16 +80,15 @@ src_configure() {
 		-DWITH_LIBVNCSERVER=$(usex vnc)
 		-DWITH_WWW=$(usex webkit)
 		-DWITH_AVAHI=$(usex zeroconf)
+		-DWITH_NEWS=$(usex telemetry)
 		-DWITH_ICON_CACHE=OFF
 		-DWITH_UPDATE_DESKTOP_DB=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 
 	elog "To get additional features, some optional runtime dependencies"
 	elog "may be installed:"
@@ -90,9 +96,3 @@ pkg_postinst() {
 	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
 	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
 }
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}