gentoo resync : 12.05.2022

4 files changed, 206 insertions, 1 deletions

diff --git a/net-vpn/networkmanager-sstp/Manifest b/net-vpn/networkmanager-sstp/Manifest
index d5353e5f2890..34cffa103119 100644
--- a/net-vpn/networkmanager-sstp/Manifest
+++ b/net-vpn/networkmanager-sstp/Manifest
@@ -1,5 +1,8 @@
+AUX networkmanager-sstp-1.3.0-fix-configure.ac-bashisms.patch 5579 BLAKE2B f47cdac48099067340ae0723b011dca385711ed9f7651105e14541f2f799d96d8476604d20c747f43651ece043e11c857edf86acb5b99fd7a37db544020a953d SHA512 c9ef2c096d887f9a06c0bf64fe78d4dd2713997ecf5cf103c154f95465b40bf706b842483979df86ffa4efda208788bdfeb5015a39110568fd05ce951cca1672
 DIST NetworkManager-sstp-1.2.0.tar.bz2 440695 BLAKE2B 170221842c25945da09f94364642be94993ac4ef7bbaffebefc463e18eeff78f3a58d95607a6f0be9fb5ecdabee244d64abb02eb56deb213ac089019089821f4 SHA512 31c7f61c2d0326c2ddc681690d4a9e0a25f29b3b5f51c44ea196cd74aab1002a6eb66bd06bddd8218961b18e666d5c28e57cfe0b2694a686ea8eb4195fcd9776
 DIST NetworkManager-sstp-1.2.6.tar.bz2 450813 BLAKE2B 9eefc73a676c825fd56b36085385fc382616059b82f8c14394e315b657162baa608f15046cad584d088774af1432a4e4d3751ecbecc6e779af7080c4bec9034f SHA512 60f5636e73d40ad3e16e5751a22ec12616e8d1fcffe63cba2ae1d04a13edd553c8c72a336ec52d353be6df5431a8a27a74e6e056b1a1a18ed050d5ec226bbe8e
+DIST NetworkManager-sstp-1.3.0.tar.bz2 548907 BLAKE2B 97248268a781033bc960f930c5a55102e9fa76efa4be6477ffd277fd334649625b6c88418f00d678afa4412fb088cd201ef6711ef6f48b516daaa38fac02caa9 SHA512 9a26c737601990b913d9506ecaac957c4f6d2a4c64a3a0eb8beaf93eaef797ed134b2ddfe2421006a7ffe0dbd18800d49501836f3671f798132a1df707da138a
 EBUILD networkmanager-sstp-1.2.0-r1.ebuild 1218 BLAKE2B 119d67bc269a808cbc0c6c29f90ce8f0de9140376eba85519746903154551ca6475aaebc0360ac044106edcf7e9d51a5652e45c75f984024bb090217ed6cf1be SHA512 fd8156aee6ab86c21f73216b0efc2c910c263149b679ab261533af456579f1929e223cdba29331a321ac4f318d9ad0f818464a654380faf1dc3adbde909363a6
 EBUILD networkmanager-sstp-1.2.6.ebuild 1331 BLAKE2B 331a5d08bc755700906e57d1b7b3bee2d1a20cce4d28a610d4030e13c9a0e31a13b34ba59d7f3b917c459bd592f0a903883cf653dbf7cdd05ba3fe25ac8816f8 SHA512 3278c9f7efef3aff1b911e12fbb65a75b9a6158074e90bc678c4d20e54af94361db915a3c96e8da372c72a64a6a576e68e041cc87977c31479684988ac0221fb
-MISC metadata.xml 247 BLAKE2B a0b253d860c7d4849a5a4ebf3a2226aa436b2cc9ac36a9328e7f7da57b89a0f7fd0accd3ddc5813f32889b6dd97ab37bc584eb1fcb1a65d7cb52b8f36390f6df SHA512 d11ea44f09fadcb14c74695c5e9f548623ea6281f5bfb32aca976e1bab298af23e2e194a1c1d90330ddc344a6135bb8f0461e65cbbbd4bdd927869ab04eaa6b1
+EBUILD networkmanager-sstp-1.3.0.ebuild 1908 BLAKE2B 65db01a396d8586734dae6633b2e08b5f57481b62edbb1491eeeaa5e8c9df77a4f66bc8cc531868696ff70b12de5828cb6333d7230dac05e101aa19f7b019e27 SHA512 3783edf78594d49a4f0765822929918bd12a2acde2dd6a317632bc4c7f5115e140b19c2f87d9c02e024949a49c99fb8d2a70645714dc6da140a338e82bc3e39e
+MISC metadata.xml 334 BLAKE2B fb4c9de0fe5f5bd6fa7ffd7786b3f29386a5071e8d52cbbea5f0c92c32e8104b40f9d569e5c2d4201a10a477afebc4f49a82529d54e06b541edb06d5ecac88b3 SHA512 3d0a617092ceafe03e1aca6a044c0e4b1f5e80f319932be820472d2a8fb81bcdddf763a5649578786d8296d33cb57b955bd19ba273b92c15f78c120ee2687801
diff --git a/net-vpn/networkmanager-sstp/files/networkmanager-sstp-1.3.0-fix-configure.ac-bashisms.patch b/net-vpn/networkmanager-sstp/files/networkmanager-sstp-1.3.0-fix-configure.ac-bashisms.patch
new file mode 100644
index 000000000000..7f603028e639
--- /dev/null
+++ b/net-vpn/networkmanager-sstp/files/networkmanager-sstp-1.3.0-fix-configure.ac-bashisms.patch
@@ -0,0 +1,114 @@
+https://gitlab.gnome.org/GNOME/network-manager-sstp/-/merge_requests/44
+
+From abe1e3aa7e2cd71e979035168ffa54268bb26b9b Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 10 May 2022 19:29:26 +0000
+Subject: [PATCH] configure.ac: fix bashism, use x prefix
+
+configure scripts are expected to work with POSIX compliant shells providing
+/bin/sh so use = instead of == to work with both Bash and other shells.
+
+Also, throw in x"$var" == xvar guards (x) because it's a lot easier to just
+have them and avoid pitfalls when a variable ends up not defined and having
+a syntax error, even though it's not needed in every context depending
+on shell.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,7 +59,7 @@ AC_CACHE_CHECK([if pppd/mppe.h defines mppe_keys_xyz() functions], ac_cv_working
+             return 0;]])],
+     [ac_cv_working_mppe_h=yes],
+     [ac_cv_working_mppe_h=no])])
+-if test $ac_cv_working_mppe_h = yes; then
++if test $ac_cv_working_mppe_h = xyes; then
+     AC_DEFINE(HAVE_MPPE_KEYS_FUNCTIONS, 1,
+         [Define to 1 if you have <pppd/mppe.h> and it declares the mppe_keys_xyz() functions])
+ fi
+@@ -70,11 +70,11 @@ dnl  Support for the auth notify callback in pppd >= 2.4.9
+ AC_ARG_WITH([pppd-auth-notify-support],
+     [AS_HELP_STRING([--with-pppd-auth-notify-support], [is the auth-notifier supported by pppd])])
+ if test x"$with_pppd_auth_notify_support" != xyes; then
+-    if test x"$pppd_pkgconfig_support" == xyes; then        # pkgconfig implies pppd > 2.4.9
++    if test x"$pppd_pkgconfig_support" = xyes; then        # pkgconfig implies pppd > 2.4.9
+         AS_VAR_SET([with_pppd_auth_notify_support],[yes])
+     fi
+ fi
+-if test x"$with_pppd_auth_notify_support" == xyes; then
++if test x"$with_pppd_auth_notify_support" = xyes; then
+     AC_DEFINE(USE_PPPD_AUTH_HOOK,1,[Define if pppd has support for client side authentication complete notification])
+ else
+     AS_VAR_SET([with_pppd_auth_notify_support],[no])
+@@ -85,11 +85,11 @@ dnl Enable support for extended tls settings in pppd > 2.4.9
+ AC_ARG_WITH([pppd-ext-tls-settings-suppport],
+     [AS_HELP_STRING([--with-pppd-ext-tls-settings-support], [is settings such as pkcs12, tls-verify-method, tls-verify-key-usage and max-tls-version supported in by pppd])])
+ if test x"$with_pppd_ext_tls_settings_support" != xyes; then
+-    if test x"$pppd_pkgconfig_support" == xyes; then        # pkgconfig implies pppd > 2.4.9
++    if test x"$pppd_pkgconfig_support" = xyes; then        # pkgconfig implies pppd > 2.4.9
+         AS_VAR_SET([with_pppd_ext_tls_settings_support],[yes])
+     fi
+ fi
+-if test x"$with_pppd_ext_tls_settings_support" == xyes; then
++if test x"$with_pppd_ext_tls_settings_support" = xyes; then
+     AC_DEFINE(USE_PPP_EXT_TLS_SETTINGS,1,[Define if pppd has support for extended tls-settings like pkcs12, tls-verify-method, tls-verify-key-usage, max-tls-version])
+ else
+     AS_VAR_SET([with_pppd_ext_tls_settings_support],[no])
+@@ -102,7 +102,7 @@ AC_ARG_WITH([pppd-plugin-dir],
+ if test -n "$with_pppd_plugin_dir" ; then
+ 	PPPD_PLUGIN_DIR="$with_pppd_plugin_dir"
+ else
+-    if test x"$pppd_pkgconfig_support" == xyes; then
++    if test x"$pppd_pkgconfig_support" = xyes; then
+         PKG_CHECK_VAR(PPPD_PLUGIN_DIR, [pppd], [plugindir])
+     else
+ 	    PPPD_PLUGIN_DIR="${libdir}/pppd/2.4.7"
+@@ -134,29 +134,29 @@ dnl
+ AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-sstp without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no])
+ AC_ARG_WITH(gtk4, AS_HELP_STRING([--with-gtk4], [Build NetworkManager-sstp with libnma-gtk4 support]), [], [with_gtk4_specified=no])
+ AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-sstp with libnm-glib comatibility (deprecated)]), [], [with_libnm_glib_specified=no])
+-if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then
+-	if test "$with_gnome_specified" != no -a "$with_gnome" == no; then
++if test x"$with_libnm_glib_specified" != xno -a x"$with_libnm_glib" != xno; then
++	if test x"$with_gnome_specified" != xno -a x"$with_gnome" = xno; then
+ 		AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome)
+ 	fi
+ fi
+-if test "$with_gnome" != no; then
++if test x"$with_gnome" != xno; then
+ 	with_gnome=yes
+ fi
+-if test "$with_gtk4_specified" == no; then
++if test x"$with_gtk4_specified" = xno; then
+ 	with_gtk4=no
+ fi
+-if test "$with_gtk4" != yes; then
++if test x"$with_gtk4" != xyes; then
+ 	with_gtk4=no
+ fi
+-if test "$with_libnm_glib_specified" == no; then
++if test x"$with_libnm_glib_specified" = xno; then
+ 	with_libnm_glib=no
+ fi
+-if test "$with_libnm_glib" != yes; then
++if test x"$with_libnm_glib" != xyes; then
+ 	with_libnm_glib=no
+ fi
+-AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
+-AM_CONDITIONAL(WITH_GTK4, test "$with_gtk4" != no)
+-AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no)
++AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno)
++AM_CONDITIONAL(WITH_GTK4, test x"$with_gtk4" != xno)
++AM_CONDITIONAL(WITH_LIBNM_GLIB, test x"$with_libnm_glib" != xno)
+ AC_ARG_ENABLE(absolute-paths, AS_HELP_STRING([--enable-absolute-paths], [Use absolute paths to in .name files. Useful for development. (default is no)]))
+ 
+ GETTEXT_PACKAGE=NetworkManager-sstp
+@@ -223,7 +223,7 @@ NM_COMPILER_WARNINGS([yes])
+ 
+ NM_PLUGIN_DIR="$libdir/NetworkManager"
+ AC_SUBST(NM_PLUGIN_DIR)
+-if test x"$enable_absolute_paths" == x"yes"; then
++if test x"$enable_absolute_paths" = x"yes"; then
+ 	NM_PLUGIN_DIR_NAME_FILE="$NM_PLUGIN_DIR/"
+ else
+ 	enable_absolute_paths=no
+GitLab
diff --git a/net-vpn/networkmanager-sstp/metadata.xml b/net-vpn/networkmanager-sstp/metadata.xml
index 334a1211764a..2b6abde9ed92 100644
--- a/net-vpn/networkmanager-sstp/metadata.xml
+++ b/net-vpn/networkmanager-sstp/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!--maintainer-needed-->
+	<use>
+		<flag name="gtk4">Use <pkg>gui-libs/gtk</pkg> for GUI support.</flag>
+	</use>
 	<upstream>
 		<remote-id type="sourceforge">sstp-client</remote-id>
 	</upstream>
diff --git a/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.0.ebuild b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.0.ebuild
new file mode 100644
index 000000000000..c6d18ab9057c
--- /dev/null
+++ b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="NetworkManager-sstp"
+MY_P="${MY_PN}-${PV}"
+
+inherit autotools
+
+DESCRIPTION="Client for the proprietary Microsoft Secure Socket Tunneling Protocol(SSTP)"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/network-manager-sstp https://sourceforge.net/projects/sstp-client/"
+SRC_URI="mirror://sourceforge/project/sstp-client/network-manager-sstp//${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui gtk4"
+
+# As of 1.3.0, if want GUI support, GTK 3 is always needed, even with GTK 4.
+# atk/graphene/harfbuzz/cairo/gdk-pixbuf/pango are all standard "dragged in by gtk/glib"
+# deps.
+RDEPEND=">=dev-libs/glib-2.32:2
+	net-misc/sstp-client
+	>=net-misc/networkmanager-1.1.0
+	net-dialup/ppp:=
+	net-libs/gnutls:=
+	gui? (
+		>=net-libs/libnma-1.2.0
+		>=app-crypt/libsecret-0.18
+		>=x11-libs/gtk+-3.4:3
+
+		gtk4? (
+			dev-libs/atk
+			media-libs/graphene
+			media-libs/harfbuzz:=
+			x11-libs/cairo
+			x11-libs/gdk-pixbuf:2
+			x11-libs/pango
+
+			gui-libs/gtk:4
+		)
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/gdbus-codegen
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-apps/file
+	sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-configure.ac-bashisms.patch
+)
+
+src_prepare() {
+	default
+
+	# Bug #741108
+	sed -i 's|/appdata|/metainfo|g' Makefile.{in,am} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local PPPD_VER="$(best_version net-dialup/ppp)"
+	# Reduce it to ${PV}-${PR}
+	PPPD_VER=${PPPD_VER#*/*-}
+	# Main version without beta/pre/patch/revision
+	PPPD_VER=${PPPD_VER%%[_-]*}
+
+	econf \
+		--disable-more-warnings \
+		--with-dist-version=Gentoo \
+		--with-pppd-plugin-dir="${EPREFIX}/usr/$(get_libdir)/pppd/${PPPD_VER}" \
+		$(use_with gui gnome) \
+		$(use_with gtk4) \
+		--without-libnm-glib
+}
+
+src_install() {
+	default
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}