From a2001bfd4ac23e983328ff4372877d23f65fa81d Mon Sep 17 00:00:00 2001
From: Joonas Niilola <juippis@gentoo.org>
Date: Thu, 12 Mar 2020 13:15:49 +0200
Subject: net-vpn/networkmanager-strongswan: prepare for nm-1.22 bump

... and removal of libnm-glib from future releases.

Closes: https://github.com/gentoo/gentoo/pull/14935
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
---
 .../networkmanager-strongswan-1.4.5-r1.ebuild      | 51 ++++++++++++++++++++++
 .../networkmanager-strongswan-1.4.5.ebuild         | 50 ---------------------
 2 files changed, 51 insertions(+), 50 deletions(-)
 create mode 100644 net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r1.ebuild
 delete mode 100644 net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5.ebuild

diff --git a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r1.ebuild b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r1.ebuild
new file mode 100644
index 000000000000..40b060fd4cd9
--- /dev/null
+++ b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="NetworkManager"
+MY_P="${P/networkmanager/${MY_PN}}"
+
+DESCRIPTION="NetworkManager StrongSwan plugin"
+HOMEPAGE="https://www.strongswan.org/"
+SRC_URI="https://download.strongswan.org/${MY_PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+glib"
+
+RDEPEND="
+	app-crypt/libsecret
+	gnome-extra/nm-applet
+	net-misc/networkmanager
+	net-vpn/strongswan[networkmanager]
+	x11-libs/gtk+:3
+	glib? ( gnome-extra/nm-applet[gtk] )
+"
+
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+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)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5.ebuild b/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5.ebuild
deleted file mode 100644
index 9b4aaeb44e99..000000000000
--- a/net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.4.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="NetworkManager"
-MY_P="${P/networkmanager/${MY_PN}}"
-
-DESCRIPTION="NetworkManager StrongSwan plugin"
-HOMEPAGE="https://www.strongswan.org/"
-SRC_URI="https://download.strongswan.org/${MY_PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+glib"
-
-RDEPEND="
-	app-crypt/libsecret
-	gnome-extra/nm-applet
-	net-misc/networkmanager
-	net-vpn/strongswan[networkmanager]
-	x11-libs/gtk+:3
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-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)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
-- 
cgit v1.2.3-65-gdbad