Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager-fortisslvpn/, net-misc/networkmanager-fortisslvpn/files/
Date: Sun, 03 Sep 2017 22:47:57
Message-Id: 1504478834.34ab84120999a02734608a641431f45e24510332.eva@gentoo
1 commit: 34ab84120999a02734608a641431f45e24510332
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 3 20:38:25 2017 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 3 22:47:14 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ab8412
7
8 net-misc/networkmanager-fortisslvpn: version bump 1.2.2 → 1.2.4
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.3
11
12 net-misc/networkmanager-fortisslvpn/Manifest | 1 +
13 ...workmanager-fortisslvpn-1.2.6-location-fix.diff | 37 +++++++++++++++++
14 .../networkmanager-fortisslvpn-1.2.6.ebuild | 47 ++++++++++++++++++++++
15 3 files changed, 85 insertions(+)
16
17 diff --git a/net-misc/networkmanager-fortisslvpn/Manifest b/net-misc/networkmanager-fortisslvpn/Manifest
18 index 9a9d2070e97..a5e0ad34d2d 100644
19 --- a/net-misc/networkmanager-fortisslvpn/Manifest
20 +++ b/net-misc/networkmanager-fortisslvpn/Manifest
21 @@ -1 +1,2 @@
22 DIST NetworkManager-fortisslvpn-1.2.2.tar.xz 294576 SHA256 d7d9e396bee90df73ecaa3e49ef55308cab2666771ee1dd72060701eeb11a04f SHA512 db9660107e3ce9dec436ad0aeaba922b1a883a016ad19bb1946b310f2b97168451c72803f5f6fceec68ca766fd30720dc8b6d5fcdcd8f52543bc707341c30737 WHIRLPOOL 77355c2cc0af80e7e4974e82ebdda91b2daa787f8dbd8375eda5760d26d9ca1ccf45b6d24fb95af8642569e252a503e1e63ad444e5fc8d695395c8cdc7e1b606
23 +DIST NetworkManager-fortisslvpn-1.2.6.tar.xz 324048 SHA256 8ec489c37c92ca2d382e889ade109caac11737d448c9c64f7bc5848d5e512b17 SHA512 5f1bd180a810ca778bfc4d58522e827281a941f6a9b63bcbcadf42f94edadbe556db6693d77a55f42422fa657b37fc64df9480f4ae691151fa65688247bce69d WHIRLPOOL d4428c163ff643a2da5ee710818d2ff1397c7e6fa8575cf90520bfa9497bfba3d85ef7b56c7a75eb681c691dbb3e64f4a0957ee8bbfb1dda74c74e28846f7902
24
25 diff --git a/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff b/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff
26 new file mode 100644
27 index 00000000000..c0439bf0e39
28 --- /dev/null
29 +++ b/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff
30 @@ -0,0 +1,37 @@
31 +diff --git a/Makefile.am b/Makefile.am
32 +index 59ba94121..6419e9f57 100644
33 +--- a/Makefile.am
34 ++++ b/Makefile.am
35 +@@ -26,6 +26,8 @@ dbusservice_DATA = nm-fortisslvpn-service.conf
36 + nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
37 + nmvpnservice_DATA = nm-fortisslvpn-service.name
38 +
39 ++fortisslvpn_statedir = $(localstatedir)/lib/$(PACKAGE)
40 ++
41 + BUILT_SOURCES =
42 +
43 + ###############################################################################
44 +@@ -276,7 +278,7 @@ auth_dialog_nm_fortisslvpn_auth_dialog_LDADD = \
45 + if WITH_LIBNM_GLIB
46 + # Install a file with full path to plugins for an old gnome-shell
47 + # https://bugzilla.gnome.org/show_bug.cgi?id=693590
48 +-install-data-hook:
49 ++install-compat-name-file:
50 + mkdir -p $(DESTDIR)$(sysconfdir)/NetworkManager/VPN
51 + sed -e "1s|^|# This file is obsoleted by a file in $(NM_VPN_SERVICE_DIR)\n\n|" \
52 + -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
53 +@@ -286,8 +288,14 @@ install-data-hook:
54 +
55 + uninstall-hook:
56 + rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-fortisslvpn-service.name
57 ++else
58 ++install-compat-name-file:
59 ++ @:
60 + endif
61 +
62 ++install-data-hook: install-compat-name-file
63 ++ $(mkinstalldirs) -m 0700 $(DESTDIR)$(fortisslvpn_statedir)
64 ++
65 + appdatadir = $(datadir)/appdata
66 + appdata_files = $(appdata_in_files:.xml.in=.xml)
67 + if WITH_GNOME
68
69 diff --git a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild
70 new file mode 100644
71 index 00000000000..98442620baa
72 --- /dev/null
73 +++ b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild
74 @@ -0,0 +1,47 @@
75 +# Copyright 1999-2017 Gentoo Foundation
76 +# Distributed under the terms of the GNU General Public License v2
77 +
78 +EAPI=6
79 +GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
80 +GNOME2_LA_PUNT="yes"
81 +GNOME2_EAUTORECONF="yes"
82 +
83 +inherit gnome2
84 +
85 +DESCRIPTION="NetworkManager Fortinet SSLVPN compatible plugin"
86 +HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
87 +
88 +LICENSE="GPL-2+"
89 +SLOT="0"
90 +KEYWORDS="~amd64"
91 +IUSE="gtk"
92 +
93 +RDEPEND="
94 + >=net-misc/networkmanager-1.2:=
95 + >=dev-libs/glib-2.32:2
96 + net-dialup/ppp:=
97 + >=net-vpn/openfortivpn-1.2.0
98 + gtk? (
99 + >=app-crypt/libsecret-0.18
100 + >=gnome-extra/nm-applet-1.2.0
101 + >=x11-libs/gtk+-3.4:3
102 + )
103 +"
104 +DEPEND="${RDEPEND}
105 + sys-devel/gettext
106 + >=dev-util/intltool-0.35
107 + virtual/pkgconfig
108 +"
109 +
110 +PATCHES=(
111 + # Upstream patch e5d476076e068f58ef4fa938f09945159fce36a6
112 + "${FILESDIR}"/${P}-location-fix.diff
113 +)
114 +
115 +src_configure() {
116 + gnome2_src_configure \
117 + --disable-static \
118 + --with-dist-version=Gentoo \
119 + --localstatedir=/var \
120 + $(use_with gtk gnome)
121 +}