gentoo resync : 14.05.2020

5 files changed, 53 insertions, 18 deletions

diff --git a/net-vpn/networkmanager-strongswan/Manifest b/net-vpn/networkmanager-strongswan/Manifest
index 9d40b973dd4c..d88c0aac0493 100644
--- a/net-vpn/networkmanager-strongswan/Manifest
+++ b/net-vpn/networkmanager-strongswan/Manifest
@@ -1,4 +1,6 @@
+AUX networkmanager-strongswan-1.5.1-change-appdata-location.patch 993 BLAKE2B 9451e326976ab31790868fe8c7e41d458f5e49b069e3e829d207807377f861d70408636bb3c1f7926f2bb978059a7449819b2eb4913d8edf7e8d2b024b55f665 SHA512 aa06591d5b9444d8c0ec7130f39af0f69dbb0a9f59e461caa392874227e0f2dea4967054be0472e9c6c1809d5550538f61c8a1d847dcfbd4061447ae046373fd
 DIST NetworkManager-strongswan-1.4.5.tar.bz2 306689 BLAKE2B c00a45eede846b927ea63c97d8fec75ceae296fe0f32aa61c87438adbb4bb0108c61c5b6e056dc8973f8bab6a51f8c63443695816a03b9c360565cb880b2d6f5 SHA512 b1c8958ec40065ec251f625ac69707d3e86e2d3b0466bd33a23edbdabefa952582ee066fc7e61bfd5921ed8340a7233353a219cff50fdc279a67c8269920cb86
-EBUILD networkmanager-strongswan-1.4.5-r1.ebuild 1006 BLAKE2B 0a2f15fd65e58d5cc9d6010f173fe522260cfee428a7cf8f45ad8a756c990b508e7fca85c56fb883cfc33a4421fc666d3fec12c96296bcc310fab4146d7a44e3 SHA512 36024d9b44be4eb9dc60470f271a14aa4717d4660af1a47eca1f7d178d63232ace708727811be1a3794aaa63fe1cbe87dd3758eed9d755d325b878930c522368
-EBUILD networkmanager-strongswan-1.4.5-r2.ebuild 918 BLAKE2B aa9fc33976555dcf368f4aac5b0a7bb2bee49bf7be09a4a0e4b91572565bc0950a1e65df0cfca8368bcb106a69edd9d6e526826b84cd80fc86d9bba601a9d095 SHA512 2a3f007fc4c95480deec9174c2e615ef4660a12e72bba3a70ebe5a89b3833c6eb9ee849be2bac6aa4a1bb2dc16276c35a5d66b3332c43523d4dddd5c4851aec3
-MISC metadata.xml 325 BLAKE2B da2fbfdaf5a51c3c6513f31b232b157bffe4864190935c363f54df5389d044b0ed0829db75703a297ef85dd123301e68296d868317d294f9356cd6e9dba94a66 SHA512 74543db61d0c4222e3e36d41d18b0da04b440b2b13e42d78cb202d36366842569c6af971c48d2b97043b4e7c9f37bf12e1d15e074f5b97f31e3a120c614233d9
+DIST NetworkManager-strongswan-1.5.1.tar.bz2 300700 BLAKE2B 543cdf340eafcaa6690f6ecf6ef9c3de944ceb47d867c2b8835285fd324ca2212b824665b194b2589ad8dbb3f3b1e89cdf24d554d2531da1d8bb800d7c0ef41a SHA512 3ef305dd5d95f377784db3069d5af4f60df2ce2fd8459577a20f99fd0cef43a973610acffa5b305c79e7d1754dfa138ea1ba1d59e57b2826ff5f85c97100fb06
+EBUILD networkmanager-strongswan-1.4.5-r2.ebuild 917 BLAKE2B 8163558c167b08e633ef46a30e5b1b664fc7e6121a2724b1fb65f301efe0de10ad4c46b7d7576b1765cd11ff42ba58f2efb2f73300582a64ddf5b1b567e26539 SHA512 83930fd4237db1d9771d6f8e80daab49baaa299d15b95fd7c4bc7bfee263d1a94dadfb86a442667fc629a34fee7a600bf3c96aac82311639c4d5966f5219125c
+EBUILD networkmanager-strongswan-1.5.1.ebuild 1038 BLAKE2B a039a8c9f9481529b85fadf243abb4ecc17bd6b1803a4b7b05fefccd144c7a28a9a2f121baf400c75c8e9044048ed9183e0b5706970c0d751fb92b8c67499965 SHA512 7c75556f52d12c65b728704c7f189cc69792e321d0e6f310dad996dd717ea73638729f3d3b01cc782a7546fe412166e7e40f237f8783feaf58e4e32d1e85c347
+MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
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
new file mode 100644
index 000000000000..13f329b97e69
--- /dev/null
+++ b/net-vpn/networkmanager-strongswan/files/networkmanager-strongswan-1.5.1-change-appdata-location.patch
@@ -0,0 +1,29 @@
+From 24791dab2deb6beb064b7c0a2f23de4a37690374 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Sun, 10 May 2020 17:04:41 +0200
+Subject: [PATCH] Makefile.am: store appdata to /usr/share/metainfo
+
+The path '/usr/share/appdata' is deprecated and
+should be changed to '/usr/share/metainfo'.
+
+See section: 2.1.2. Filesystem locations
+https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/frontends/gnome/Makefile.am b/src/frontends/gnome/Makefile.am
+index 9b8c6765a3..e9fa5ca4af 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,7 +6,7 @@ nmvpnservice_DATA = nm-strongswan-service.name
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ 
+-appdatadir = $(datadir)/appdata
++appdatadir = $(datadir)/metainfo
+ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+ appdata_in_files = NetworkManager-strongswan.appdata.xml.in
+ @INTLTOOL_XML_RULE@
diff --git a/net-vpn/networkmanager-strongswan/metadata.xml b/net-vpn/networkmanager-strongswan/metadata.xml
index c61eaedb88a0..3e3880cf1051 100644
--- a/net-vpn/networkmanager-strongswan/metadata.xml
+++ b/net-vpn/networkmanager-strongswan/metadata.xml
@@ -5,7 +5,4 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<use>
-		<flag name="glib">Enable libnm-glib compatibility.</flag>
-	</use>
 </pkgmetadata>
diff --git a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r2.ebuild b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r2.ebuild
index 186623723a20..334738c79eeb 100644
--- a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r2.ebuild
+++ b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.strongswan.org/${MY_PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r1.ebuild b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.5.1.ebuild
index 9946b63c9bba..9392a19c6911 100644
--- a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r1.ebuild
+++ b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.5.1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit autotools
+
 MY_PN="NetworkManager"
 MY_P="${P/networkmanager/${MY_PN}}"
 
@@ -12,34 +14,39 @@ SRC_URI="https://download.strongswan.org/${MY_PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+glib"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	app-crypt/libsecret
-	gnome-extra/nm-applet
+	>=net-libs/libnma-1.1.0
 	net-misc/networkmanager
-	net-vpn/strongswan[networkmanager]
+	>=net-vpn/strongswan-5.8.3[networkmanager]
 	x11-libs/gtk+:3
-	glib? ( gnome-extra/nm-applet[gtk]
-		<net-misc/networkmanager-1.19 )
 "
 
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+
+BDEPEND="
 	dev-util/intltool
+	virtual/pkgconfig
 "
 
-BDEPEND="virtual/pkgconfig"
-
 S="${WORKDIR}/${MY_P}"
 
+PATCHES="${FILESDIR}/${P}-change-appdata-location.patch"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
 src_configure() {
 	local myeconfargs=(
 		# Don't enable all warnings, as some are treated as errors and the compilation will fail
 		--disable-more-warnings
 		--disable-static
-		$(usex glib '' --without-libnm-glib)
+		--without-libnm-glib
 	)
 
 	econf "${myeconfargs[@]}"