net-vpn/networkmanager-l2tp: fix bashism in configure, avoid maintainer mode

Oops, gnome.org != gnome-2.

Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 45 insertions, 3 deletions

diff --git a/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-bashism-configure.patch b/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-bashism-configure.patch
new file mode 100644
index 000000000000..d4a672815cd3
--- /dev/null
+++ b/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-bashism-configure.patch
@@ -0,0 +1,35 @@
+https://github.com/nm-l2tp/NetworkManager-l2tp/pull/208
+
+From bf46aec299c58321703f5431ebafcce561a98cef Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 23 Apr 2023 09:16:24 +0100
+Subject: [PATCH] configure.ac: fix bashisms in configure.ac
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+--- a/configure.ac
++++ b/configure.ac
+@@ -197,7 +197,7 @@ fi
+ AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no)
+ 
+ AC_ARG_WITH(gtk4, AS_HELP_STRING([--with-gtk4], [Build NetworkManager-l2tp with libnma-gtk4 support]), [], [with_gtk4_specified=no])
+-if test "$with_gtk4_specified" == no; then
++if test "$with_gtk4_specified" = no; then
+ 	with_gtk4=no
+ fi
+ if test "$with_gtk4" != yes; then
+@@ -256,7 +256,7 @@ NM_LD_GC
+ 
+ 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
+
diff --git a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8-r2.ebuild b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8-r3.ebuild
index b8c745b85590..a8dc957d7e74 100644
--- a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8-r2.ebuild
+++ b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-1.20.8-r3.ebuild
@@ -5,8 +5,7 @@ EAPI=8
 
 MY_PN="NetworkManager-l2tp"
 MY_P="${MY_PN}-${PV}"
-GNOME2_EAUTORECONF="yes"
-inherit gnome.org
+inherit autotools gnome.org
 
 DESCRIPTION="NetworkManager L2TP plugin"
 HOMEPAGE="https://github.com/nm-l2tp/NetworkManager-l2tp"
@@ -50,9 +49,17 @@ BDEPEND="dev-util/gdbus-codegen
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.20.8-ppp-2.5.0-{1,2}.patch
+	"${FILESDIR}"/${P}-ppp-2.5.0-{1,2}.patch
+	"${FILESDIR}"/${PN}-1.20.8-bashism-configure.patch
 )
 
+src_prepare() {
+	default
+
+	# For ppp-2.5.0 patch & bashism patch
+	eautoreconf
+}
+
 src_configure() {
 	local PPPD_VER=$(best_version net-dialup/ppp)
 	PPPD_VER=${PPPD_VER#*/*-} # reduce it to ${PV}-${PR}