gentoo resync : 25.04.2020

5 files changed, 4 insertions, 114 deletions

diff --git a/net-vpn/networkmanager-fortisslvpn/Manifest b/net-vpn/networkmanager-fortisslvpn/Manifest
index 53c9ecf9de36..5f513f09b6e1 100644
--- a/net-vpn/networkmanager-fortisslvpn/Manifest
+++ b/net-vpn/networkmanager-fortisslvpn/Manifest
@@ -1,7 +1,3 @@
-AUX networkmanager-fortisslvpn-1.2.6-location-fix.diff 1257 BLAKE2B 1ea633c11ec59a634c570873cac3f6c9203cfeb66a60d1056613e794b7dfa9d21331a0abca7ef1f1aff4f8c1317808431a318042963153ee93c92d596fb5440c SHA512 586e408a65cc83cc3e0e8238eab673b484188eb7e7d62c8bc14abaf05a82acff24f9281a904624fe45aae08b0804e7516c393d7ef52f1c2dcbb4949f23873bca
-AUX networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff 747 BLAKE2B c12251887128e21f7025f6a111aa9d022899ace86000ba84e8e139ca02500e60c584b21d101f74c4326a422a299badd62647e1779059fe0425652eebb4b973b2 SHA512 a1701ddb5fcc49ceafd8d87c4a5e50dd7aeebfe32ba589f28c931dc93274531a16a0414db6e79fecfa4c03c182c7824cd3504d76234d544d488a5fdb3b34b9c4
-DIST NetworkManager-fortisslvpn-1.2.6.tar.xz 324048 BLAKE2B 1e3aeab2df0b91b09fba1678861215f164251dc1f51c12c0cdbb4c53c939849d75c5f70552e608a11a0c9c7890a15d5dd4b218c7c440c92bfa8df157ff20babf SHA512 5f1bd180a810ca778bfc4d58522e827281a941f6a9b63bcbcadf42f94edadbe556db6693d77a55f42422fa657b37fc64df9480f4ae691151fa65688247bce69d
 DIST NetworkManager-fortisslvpn-1.2.8.tar.xz 325100 BLAKE2B 9449bbec99ee50c2c0b9cc1a74d8714e71995c17d2c1fa206134b71a1ea448be8fd86711ce0743f38e86ccd330eb7bc7e4cb57c2093001ac1b301b00e5c8f25e SHA512 5a602b872b1efbd8d9ed2f32d05ec8560f0a923dfdf58e7a775010ee2182790b8cbe7c2a6c8d1198eba47c66fddecf178e1c454d1ac74c10a63c75c603eeafc8
-EBUILD networkmanager-fortisslvpn-1.2.6-r1.ebuild 1064 BLAKE2B 774cafc5d2344ad1739f9fc64d97abf13bf081960a65c2c5549be6f287fb35712370bca93d47a8d97d6de4b2ee12114a60a09708a183ff8205b7a841f5e54907 SHA512 23809bbb17d53a081376797fcc6b5a0ec147b4434282a5df4eb87864313fb3c1a2dd14ab6ce1b181cef017b8e5070e40baa4a00c8b646e8b78169142c14b4e8a
-EBUILD networkmanager-fortisslvpn-1.2.8-r1.ebuild 870 BLAKE2B 52d052e48664566fe7fb774ee9f937a960193d2b9be5138cede344a2ae1fdad531e8cd5634d8c92c0f538e0390524021e05ae54ad07d32cc4823908a2f539efe SHA512 1b5eb9caaefb21a495a213e9007dd5889acd02c1e2c09960145eb3c89ec1dd5204eb5a2abb7b1e2afc567cb0796d116ed7ee240fd7696e56b473dd6e7091319c
+EBUILD networkmanager-fortisslvpn-1.2.8-r2.ebuild 884 BLAKE2B 52e053b236facdd5eb8ff392b40d7f90e95402b458d5eefacff9605dff8de252ac3a8d9cc6e7266e04a6e7f9588516da2cd8bb3e1cd6aef142a7d0380645e78a SHA512 1298ade8a40e7c0790b7682431f7895ad729c4bc94308a8851a6777f4b34d2691a1dbd52a3c9f804df918e60f5806da8177ff1a5f56aa298aed87293d2cc1c6a
 MISC metadata.xml 380 BLAKE2B 68402a902953176bf28ebc6521a06c109cbf2a448c184665cef3ab42ec6b1f7f426a31b7714275e215ae742ff79b2fc7b5c4d80046f8a15b5a73fa5d6a05ebf1 SHA512 ebbe00af25885a8178a56f6b8341a75125c506dd8e374cb061acaefb8f0bddd0678d7231cc2eb13a319b1fb8a080f6c2d66fdbdd8aa022a7dc1216dac6c53c89
diff --git a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff
deleted file mode 100644
index c0439bf0e394..000000000000
--- a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 59ba94121..6419e9f57 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -26,6 +26,8 @@ dbusservice_DATA = nm-fortisslvpn-service.conf
- nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
- nmvpnservice_DATA = nm-fortisslvpn-service.name
- 
-+fortisslvpn_statedir = $(localstatedir)/lib/$(PACKAGE)
-+
- BUILT_SOURCES =
- 
- ###############################################################################
-@@ -276,7 +278,7 @@ auth_dialog_nm_fortisslvpn_auth_dialog_LDADD = \
- if WITH_LIBNM_GLIB
- # Install a file with full path to plugins for an old gnome-shell
- # https://bugzilla.gnome.org/show_bug.cgi?id=693590
--install-data-hook:
-+install-compat-name-file:
- 	mkdir -p $(DESTDIR)$(sysconfdir)/NetworkManager/VPN
- 	sed -e "1s|^|# This file is obsoleted by a file in $(NM_VPN_SERVICE_DIR)\n\n|" \
- 	    -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
-@@ -286,8 +288,14 @@ install-data-hook:
- 
- uninstall-hook:
- 	 rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-fortisslvpn-service.name
-+else
-+install-compat-name-file:
-+	@:
- endif
- 
-+install-data-hook: install-compat-name-file
-+	$(mkinstalldirs) -m 0700 $(DESTDIR)$(fortisslvpn_statedir)
-+
- appdatadir = $(datadir)/appdata
- appdata_files = $(appdata_in_files:.xml.in=.xml)
- if WITH_GNOME
diff --git a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff
deleted file mode 100644
index f882679954f7..000000000000
--- a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 6bef38ed5..951b829e3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -95,6 +95,7 @@ pppd_plugindir = $(PPPD_PLUGIN_DIR)
- pppd_plugin_LTLIBRARIES = src/nm-fortisslvpn-pppd-plugin.la
- 
- src_nm_fortisslvpn_pppd_plugin_la_SOURCES = \
-+	shared/nm-utils/nm-shared-utils.c \
- 	src/nm-fortisslvpn-pppd-plugin.c \
- 	src/nm-ppp-status.h
- src_nm_fortisslvpn_pppd_plugin_la_CPPFLAGS = $(src_cppflags)
-@@ -102,7 +103,7 @@ src_nm_fortisslvpn_pppd_plugin_la_LDFLAGS = \
- 	-module -avoid-version
- src_nm_fortisslvpn_pppd_plugin_la_LIBADD = \
- 	src/libnm-fortisslvpn-pppd-service-dbus.la \
--	$(GLIB_LIBS)
-+	$(GLIB_LIBS) \
- 	$(LIBNM_LIBS)
- 
- ###############################################################################
diff --git a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6-r1.ebuild b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6-r1.ebuild
deleted file mode 100644
index a9f1c000252b..000000000000
--- a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="NetworkManager Fortinet SSLVPN compatible plugin"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gtk"
-
-RDEPEND="
-	>=net-misc/networkmanager-1.2:=
-	>=dev-libs/glib-2.32:2
-	net-dialup/ppp:=
-	>=net-vpn/openfortivpn-1.2.0
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.2.0[gtk]
-		>=x11-libs/gtk+-3.4:3
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Upstream patch e5d476076e068f58ef4fa938f09945159fce36a6
-	"${FILESDIR}"/${P}-location-fix.diff
-	# Upstream patch 4195187fbe5be348222c9a8472f7c9cf0e51d346
-	"${FILESDIR}"/${P}-nm-utils-dependency-fix.diff
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-dist-version=Gentoo \
-		--localstatedir=/var \
-		$(use_with gtk gnome)
-}
diff --git a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8-r1.ebuild b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8-r2.ebuild
index 5c9130e5118c..e66f115f32ca 100644
--- a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8-r1.ebuild
+++ b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8-r2.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=net-vpn/openfortivpn-1.2.0
 	gtk? (
 		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.2.0[gtk]
+		>=net-libs/libnma-1.2.0
 		>=x11-libs/gtk+-3.4:3
 	)
 "
@@ -39,5 +39,6 @@ src_configure() {
 		--disable-static \
 		--with-dist-version=Gentoo \
 		--localstatedir=/var \
-		$(use_with gtk gnome)
+		$(use_with gtk gnome) \
+		--without-libnm-glib
 }