Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/networkmanager-strongswan/files/, net-vpn/networkmanager-strongswan/
Date: Sun, 10 May 2020 16:22:50
Message-Id: 1589127732.53b25c3e726f129ecdef45a29ea6c16182f89e24.conikost@gentoo
1 commit: 53b25c3e726f129ecdef45a29ea6c16182f89e24
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 10 15:14:35 2020 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun May 10 16:22:12 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53b25c3e
7
8 net-vpn/networkmanager-strongswan: bump to version 1.5.1
9
10 Closes: https://bugs.gentoo.org/717484
11 Closes: https://bugs.gentoo.org/719624
12 Package-Manager: Portage-2.3.99, Repoman-2.3.22
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 net-vpn/networkmanager-strongswan/Manifest | 1 +
16 ...-strongswan-1.5.1-change-appdata-location.patch | 29 +++++++++++
17 .../networkmanager-strongswan-1.5.1.ebuild | 59 ++++++++++++++++++++++
18 3 files changed, 89 insertions(+)
19
20 diff --git a/net-vpn/networkmanager-strongswan/Manifest b/net-vpn/networkmanager-strongswan/Manifest
21 index a3b829ecb52..9a577fafa9b 100644
22 --- a/net-vpn/networkmanager-strongswan/Manifest
23 +++ b/net-vpn/networkmanager-strongswan/Manifest
24 @@ -1 +1,2 @@
25 DIST NetworkManager-strongswan-1.4.5.tar.bz2 306689 BLAKE2B c00a45eede846b927ea63c97d8fec75ceae296fe0f32aa61c87438adbb4bb0108c61c5b6e056dc8973f8bab6a51f8c63443695816a03b9c360565cb880b2d6f5 SHA512 b1c8958ec40065ec251f625ac69707d3e86e2d3b0466bd33a23edbdabefa952582ee066fc7e61bfd5921ed8340a7233353a219cff50fdc279a67c8269920cb86
26 +DIST NetworkManager-strongswan-1.5.1.tar.bz2 300700 BLAKE2B 543cdf340eafcaa6690f6ecf6ef9c3de944ceb47d867c2b8835285fd324ca2212b824665b194b2589ad8dbb3f3b1e89cdf24d554d2531da1d8bb800d7c0ef41a SHA512 3ef305dd5d95f377784db3069d5af4f60df2ce2fd8459577a20f99fd0cef43a973610acffa5b305c79e7d1754dfa138ea1ba1d59e57b2826ff5f85c97100fb06
27
28 diff --git a/net-vpn/networkmanager-strongswan/files/networkmanager-strongswan-1.5.1-change-appdata-location.patch b/net-vpn/networkmanager-strongswan/files/networkmanager-strongswan-1.5.1-change-appdata-location.patch
29 new file mode 100644
30 index 00000000000..13f329b97e6
31 --- /dev/null
32 +++ b/net-vpn/networkmanager-strongswan/files/networkmanager-strongswan-1.5.1-change-appdata-location.patch
33 @@ -0,0 +1,29 @@
34 +From 24791dab2deb6beb064b7c0a2f23de4a37690374 Mon Sep 17 00:00:00 2001
35 +From: Conrad Kostecki <conrad@××××××××.com>
36 +Date: Sun, 10 May 2020 17:04:41 +0200
37 +Subject: [PATCH] Makefile.am: store appdata to /usr/share/metainfo
38 +
39 +The path '/usr/share/appdata' is deprecated and
40 +should be changed to '/usr/share/metainfo'.
41 +
42 +See section: 2.1.2. Filesystem locations
43 +https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
44 +
45 +Signed-off-by: Conrad Kostecki <conrad@××××××××.com>
46 +---
47 + Makefile.am | 2 +-
48 + 1 file changed, 1 insertion(+), 1 deletion(-)
49 +
50 +diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am
51 +index 9b8c6765a3..e9fa5ca4af 100644
52 +--- a/Makefile.am
53 ++++ b/Makefile.am
54 +@@ -6,7 +6,7 @@ nmvpnservice_DATA = nm-strongswan-service.name
55 +
56 + @INTLTOOL_DESKTOP_RULE@
57 +
58 +-appdatadir = $(datadir)/appdata
59 ++appdatadir = $(datadir)/metainfo
60 + appdata_DATA = $(appdata_in_files:.xml.in=.xml)
61 + appdata_in_files = NetworkManager-strongswan.appdata.xml.in
62 + @INTLTOOL_XML_RULE@
63
64 diff --git a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.5.1.ebuild b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.5.1.ebuild
65 new file mode 100644
66 index 00000000000..9392a19c691
67 --- /dev/null
68 +++ b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.5.1.ebuild
69 @@ -0,0 +1,59 @@
70 +# Copyright 1999-2020 Gentoo Authors
71 +# Distributed under the terms of the GNU General Public License v2
72 +
73 +EAPI=7
74 +
75 +inherit autotools
76 +
77 +MY_PN="NetworkManager"
78 +MY_P="${P/networkmanager/${MY_PN}}"
79 +
80 +DESCRIPTION="NetworkManager StrongSwan plugin"
81 +HOMEPAGE="https://www.strongswan.org/"
82 +SRC_URI="https://download.strongswan.org/${MY_PN}/${MY_P}.tar.bz2"
83 +
84 +LICENSE="GPL-2+"
85 +SLOT="0"
86 +KEYWORDS="~amd64 ~x86"
87 +
88 +RDEPEND="
89 + app-crypt/libsecret
90 + >=net-libs/libnma-1.1.0
91 + net-misc/networkmanager
92 + >=net-vpn/strongswan-5.8.3[networkmanager]
93 + x11-libs/gtk+:3
94 +"
95 +
96 +DEPEND="${RDEPEND}"
97 +
98 +BDEPEND="
99 + dev-util/intltool
100 + virtual/pkgconfig
101 +"
102 +
103 +S="${WORKDIR}/${MY_P}"
104 +
105 +PATCHES="${FILESDIR}/${P}-change-appdata-location.patch"
106 +
107 +src_prepare() {
108 + default
109 +
110 + eautoreconf
111 +}
112 +
113 +src_configure() {
114 + local myeconfargs=(
115 + # Don't enable all warnings, as some are treated as errors and the compilation will fail
116 + --disable-more-warnings
117 + --disable-static
118 + --without-libnm-glib
119 + )
120 +
121 + econf "${myeconfargs[@]}"
122 +}
123 +
124 +src_install() {
125 + default
126 +
127 + find "${D}" -name '*.la' -delete || die
128 +}