gentoo auto-resync : 22:05:2023 - 20:57:18

4 files changed, 93 insertions, 0 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index b1d22e7abb38..669080058537 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-openconnect/Manifest b/net-vpn/networkmanager-openconnect/Manifest
index d1f9739218b1..f19123594d38 100644
--- a/net-vpn/networkmanager-openconnect/Manifest
+++ b/net-vpn/networkmanager-openconnect/Manifest
@@ -1,3 +1,6 @@
+AUX networkmanager-openconnect-1.2.10-check-webkit-if-gtk.patch 1060 BLAKE2B e6d380e9040dcb8737f59c3302e51d31faffb85a0779ad149c620075a1e1b80a03cc67aa14b8065d079974011c56361e078821fd86bcbe372106c365790365a9 SHA512 d8c243914b5d53570f50064d0e13a675f2c0baf0605615a858b809d9cab27552f346137dd82e0528156f475adb6c948a6bc1a3572807fc4364fa5c2613d7b576
+DIST NetworkManager-openconnect-1.2.10.tar.xz 920560 BLAKE2B 8e631bacf7ac99bf3abec6eeea9bfda070dfeac4572280b74771746942bf9700f8d943501fc63933052bf07735751f5353fcc6ccd6654b57a893ed87a442650f SHA512 c61f5edee04475b013afbb91ba11e102cf4c925a0b2e16477473e0de9528d793121c1324f2c4d5ae03e0c8fb00dd9de444130c22e681f7a3408bc9a179ad7509
 DIST NetworkManager-openconnect-1.2.8.tar.xz 857808 BLAKE2B b9dd1f75eb34b3149b1d8520fa34caec9547c581affd8065116376f5ee9b0332dc8791af63a88b918445b17b9fd5655b5c154a32c150da62a015ae94221c4634 SHA512 5209fb15ce22511f9b9ccde5e19c86136c3236490c4793afcc2d4081ad87dc4c5fde7f6335db1f50cbbb674b1afc7c42a8c89a6d046ba3945691b2dfb3691d38
+EBUILD networkmanager-openconnect-1.2.10.ebuild 1195 BLAKE2B 30c8d2ab67aa12f850865c5dd7a35388b87b111fe1e61fe64ac5f236d49ea244ee9c2a58c01b9ee5b97159527f4e08d7b92387c98d9105f96ed534897e433d6b SHA512 f6df4d1f91dd8653f99e2052a50fa2ceed0df9735d38be084a68e0ba7c9ca2992664d652e0c9d6c94357554e001657dd0d30e35714327fd9754195e2e75d026b
 EBUILD networkmanager-openconnect-1.2.8-r1.ebuild 1171 BLAKE2B 263f7923455bcc4e000c1f1a1e0a6c2baaa74a60e743f72211ac6f7c0cb54fc80d22a5a2575d93c241bca7ee722e0f8698b84518b7fcbaa1a797d4fe81507263 SHA512 c4331a332b158e0f5ae609564e0621908ce9feca06b29ab1a0f2a10988c31744eb8287d7ad6ec7811977c922084679c0d802f8f10341568c6947dea6c476f8af
 MISC metadata.xml 367 BLAKE2B 8c8ffe5ee3afd7b5ed558d27e396416f66fcd42e981a4e40ba737e96baa94ef41c8cda9a3f46efece9acc4ce724233dcafa7106722e461601a58f1b3e40411e5 SHA512 6ec9eda5753bf693fc162bb70cba3d4a2065d293c250bc4c4c04d40446597039b9ad5406919c489c4a02eed5ee17d81ebac41867b328660794dfa71a39b9291e
diff --git a/net-vpn/networkmanager-openconnect/files/networkmanager-openconnect-1.2.10-check-webkit-if-gtk.patch b/net-vpn/networkmanager-openconnect/files/networkmanager-openconnect-1.2.10-check-webkit-if-gtk.patch
new file mode 100644
index 000000000000..5f9c8578d9d7
--- /dev/null
+++ b/net-vpn/networkmanager-openconnect/files/networkmanager-openconnect-1.2.10-check-webkit-if-gtk.patch
@@ -0,0 +1,26 @@
+# https://gitlab.gnome.org/GNOME/NetworkManager-openconnect/-/issues/99
+# diff --git a/configure.ac b/configure.ac
+--- a/configure.ac	2023-05-21 14:05:26.029361118 -0300
++++ b/configure.ac	2023-05-21 14:07:12.505617426 -0300
+@@ -145,10 +145,6 @@
+ 	PKG_CHECK_MODULES(LIBNMA_GTK4, libnma-gtk4 >= 1.8.33)
+ fi
+ 
+-PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.1, [wekbit=4.1],
+-			  [PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.0,
+-			  [webkit=4.0], AC_MSG_ERROR(Neither webkit2gtk-4.0 nor wekit2gtk-4.1 found))])
+-
+ PKG_CHECK_MODULES(LIBNM, libnm >= 1.2.0)
+ LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2"
+ LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_4"
+@@ -166,6 +162,10 @@
+ fi
+ if test x"$with_authdlg" != xno; then
+ 	PKG_CHECK_MODULES(OPENCONNECT, openconnect >= 3.02)
++	PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.1, [wekbit=4.1],
++			  [PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.0,
++			  [webkit=4.0], AC_MSG_ERROR(Neither webkit2gtk-4.0 nor wekit2gtk-4.1 found))])
++
+ fi
+ AM_CONDITIONAL(WITH_AUTHDLG, test x"$with_authdlg" != xno)
+ 
diff --git a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.10.ebuild b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.10.ebuild
new file mode 100644
index 000000000000..0ee4f08b5ebe
--- /dev/null
+++ b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.10.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager OpenConnect plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager https://gitlab.gnome.org/GNOME/NetworkManager-openconnect"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="gtk"
+
+DEPEND="
+	>=net-misc/networkmanager-1.2:=
+	>=dev-libs/glib-2.34:2
+	>=dev-libs/dbus-glib-0.74
+	dev-libs/libxml2:2
+	dev-libs/glib:2
+	>=net-vpn/openconnect-3.02:=
+	gtk? (
+		>=app-crypt/libsecret-0.18
+
+		>=app-crypt/gcr-3.4:0=
+		>=x11-libs/gtk+-3.12:3
+
+		>=gui-libs/gtk-4.0:4
+		>=net-libs/libnma-1.8.36
+		net-libs/webkit-gtk:4.1
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	acct-group/nm-openconnect
+	acct-user/nm-openconnect
+"
+
+BDEPEND="
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+PATCHES+=(
+	"${FILESDIR}"/${P}-check-webkit-if-gtk.patch
+)
+
+src_configure() {
+	local myconf=(
+	gnome2_src_configure
+		--disable-more-warnings
+		--disable-static
+		--without-libnm-glib
+		$(use_with gtk gnome)
+		$(use_with gtk authdlg)
+		$(use_with gtk gtk4)
+	)
+	econf "${myconf[@]}"
+}