[gentoo-commits] repo/gentoo:master commit in: net-vpn/networkmanager-fortisslvpn/, net-vpn/networkmanager-fortisslvpn/files/

[gentoo-commits] repo/gentoo:master commit in: net-vpn/networkmanager-fortisslvpn/, net-vpn/networkmanager-fortisslvpn/files/

[Mart Raudsepp]

commit:     a46564d7604afc41eaad09e01af6964b26705827
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 19 18:05:26 2020 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Apr 19 18:14:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a46564d7

net-vpn/networkmanager-fortisslvpn: remove old

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 net-vpn/networkmanager-fortisslvpn/Manifest        |  1 -
 ...workmanager-fortisslvpn-1.2.6-location-fix.diff | 37 ----------------
 ...-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff | 21 ----------
 .../networkmanager-fortisslvpn-1.2.6-r1.ebuild     | 49 ----------------------
 4 files changed, 108 deletions(-)

diff --git a/net-vpn/networkmanager-fortisslvpn/Manifest b/net-vpn/networkmanager-fortisslvpn/Manifest
index 27c862cd0d8..a69c61d0874 100644
--- a/net-vpn/networkmanager-fortisslvpn/Manifest
+++ b/net-vpn/networkmanager-fortisslvpn/Manifest
@@ -1,2 +1 @@
-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

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 c0439bf0e39..00000000000
--- 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 f882679954f..00000000000
--- 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 a9f1c000252..00000000000
--- 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)
-}