gentoo resync : 25.04.2020

3 files changed, 137 insertions, 1 deletions

diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 808c4d381c58..5729cd925c42 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,5 +1,6 @@
+AUX 1.8.24-fix-bashisms.patch 5304 BLAKE2B d564e84e12033826ed4e1663336d20a0591058a0d50201b3d91180f26f9d46380dea35cd95fc2b0e3bb94dbda70d8f55b7885c13c73f14a526a3e6473863d7d6 SHA512 c8acde4a746d83666671aa0bd1c64b24710219dd932d28eae7ddc56de2e430ef745f92953608ef277ff5d4d94270876ca4d1b6c8ac338571a0af6cef6516b804
 DIST network-manager-applet-1.8.24.tar.xz 2062132 BLAKE2B fed75ab78e05b59a4f20c7570b84ac6fe3dd2cf6f8ad060f6c65bc9e2a32e29d295fc919de1037ba30c2609d35079dccb3f625ffc019150c9c69cfa94388e2c8 SHA512 76e914ec4f2e6eadd21ccc3e1f613fb97cb72d9551730a1dc09454177365dcaa2cdeea4b855c53732ad6a22cfa5e62e03f09fc8b04a277ce213dcf8c3beaf77c
 DIST network-manager-applet-1.8.25-dev.tar.bz2 1795238 BLAKE2B 2cdf81b1395dc69fa35ed19d5410dc94b8a7ea5cf99a3a8b81e7d4f0b0852f883d8a0c4fbe42e0088ba79e5473c6c01e332feb6f78a3526bb21237f6fe17719e SHA512 3441b8c3c195c0ff9528d219d5769bcc56d7fac92030af75ae2d16e3c91accb2350286c18c2c46cc12a20e87099d05183f0510398519c6fcd8520d0ab56850a2
-EBUILD nm-applet-1.8.24.ebuild 1728 BLAKE2B 40fd22bbf9026619a4cbb38760e03b7fb498e3e9e13baf93df8b369e4cb22c9cc0677cb96122d14d621af443f6ddef4496910a88320e84129923774b5281f3e6 SHA512 196335486adbb889e21b4abb5332a7aaa664f0515b7090473a9b369a03614232304e9d7507c7e86c0eef340f018377f35284cd42bbc4bc6f2a19bd9fca2ea5fe
+EBUILD nm-applet-1.8.24.ebuild 1806 BLAKE2B b6ed9e016e7a9b91f7d0c8a884aadc5541c1266fcdd479ed7232d2b707782a69160bc323d68a96965eaf40214a15ce4175dea62609dcf8ec95c734cfcbdf1fae SHA512 6f94b1fe3b6f07002c7782e7011550bf1149803d39551c6b4931956a6680146e9b8ac9b3331e9a310086be61b9f119dc7da80b2dee5c580bb0f73b58979517f1
 EBUILD nm-applet-1.8.25.ebuild 1774 BLAKE2B cc259671e2b77a821e533e27eee8f0b17f2738d841dee25b126787e598dfc74f86c3ad5bbbc3167b3df23ef8f4847c7f4451a61e0a30886f40b94fbb50418832 SHA512 dd32925a9aeed3637d5ea88f02d292cb446da2d3ceace191b0d23dee6794439e9694aeb186072154ef5c8322daf934b33644016ff7cc5baeffbcaff60fbb415a
 MISC metadata.xml 709 BLAKE2B c5ee0c7c876b849c7f640a64d5d6ae3325b693be9b7733e9757ccb0418f6d6b4ad2f85afe033ebfd6f3f4cfd6f907160095141998ce5c01e2faa87456ab58856 SHA512 0449bc9810e4b7b85307bcd8bde24746697641cf82e34790d7a8c280951c5814646c2a6bc7a3e8e0245d1deb24f9b8a0890d1d5d8227dbaf6c92dd966e5ea1c8
diff --git a/gnome-extra/nm-applet/files/1.8.24-fix-bashisms.patch b/gnome-extra/nm-applet/files/1.8.24-fix-bashisms.patch
new file mode 100644
index 000000000000..36851e1ca3af
--- /dev/null
+++ b/gnome-extra/nm-applet/files/1.8.24-fix-bashisms.patch
@@ -0,0 +1,130 @@
+From 64143dc3da8f04478acc7a875b7e9d6cb0d653b9 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 19 Apr 2020 15:08:20 +0200
+Subject: [PATCH] Remove subshells and fix invalid test syntax
+
+---
+ configure.ac        | 22 +++++++++++-----------
+ m4/introspection.m4 |  4 ++--
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 22f34589..56a56fee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -126,7 +126,7 @@ dnl
+ GTK_DOC_CHECK(1.0)
+ 
+ AC_ARG_WITH(libnm-gtk, AS_HELP_STRING([--with-libnm-gtk], [build legacy library libnm-gtk which depends on libnm-glib/libnm-util/dbus-glib (deprecated)]))
+-if test "$with_libnm_gtk" == yes; then
++if test "$with_libnm_gtk" = yes; then
+ 	PKG_CHECK_MODULES(LIBNM_GLIB,
+ 			[gio-2.0 >= 2.38
+ 			 NetworkManager >= 1.7
+@@ -145,7 +145,7 @@ Configure without --with-libnm-gtk if you do not need the legacy library])])
+ else
+ 	with_libnm_gtk=no
+ fi
+-AM_CONDITIONAL(WITH_LIBNM_GTK, test "$with_libnm_gtk" == "yes")
++AM_CONDITIONAL(WITH_LIBNM_GTK, test "$with_libnm_gtk" = "yes")
+ 
+ PKG_CHECK_MODULES(LIBNM, [libnm >= 1.7 gio-2.0 >= 2.38 gmodule-export-2.0])
+ LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
+@@ -166,7 +166,7 @@ PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.10)
+ GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_10 -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_10"
+ 
+ AC_ARG_WITH(libnma-gtk4, AS_HELP_STRING([--with-libnma-gtk4], [build EXPERIMENTAL libnma-gtk4 library for use with GTK4]))
+-if test "$with_libnma_gtk4" == yes; then
++if test "$with_libnma_gtk4" = yes; then
+ 	PKG_CHECK_MODULES(GTK4, gtk4 >= 3.94)
+ 	GTK4_CFLAGS="$GTK4_CFLAGS -DGTK_VERSION_MIN_REQUIRED=GTK_VERSION_3_96 -DGTK_VERSION_MAX_ALLOWED=GTK_VERSION_3_96"
+ else
+@@ -214,7 +214,7 @@ AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
+ 
+ dnl ModemManager1 with libmm-glib for WWAN support
+ AC_ARG_WITH(wwan, AS_HELP_STRING([--with-wwan], [Enable WWAN support (default: yes)]))
+-if (test "${with_wwan}" == "no"); then
++if test "${with_wwan}" = "no"; then
+     AC_DEFINE(WITH_WWAN, 0, [Define if you have ModemManager/WWAN support])
+ else
+     PKG_CHECK_MODULES(MM_GLIB,
+@@ -229,7 +229,7 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147)
+ 
+ dnl SELinux
+ AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux], [Enable support for adjusting SELinux labels in configuration editor (default: yes)]))
+-if (test "${with_selinux}" == "no"); then
++if test "${with_selinux}" = "no"; then
+     AC_DEFINE(WITH_SELINUX, 0, [Define if libselinux is available])
+ else
+     PKG_CHECK_MODULES(SELINUX,
+@@ -241,7 +241,7 @@ AM_CONDITIONAL(WITH_SELINUX, test "${with_selinux}" != "no")
+ 
+ dnl Jansson for team configuration editing
+ AC_ARG_WITH(team, AS_HELP_STRING([--with-team], [Enable team configuration editor (default: yes)]))
+-if (test "${with_team}" == "no"); then
++if test "${with_team}" = "no"; then
+     AC_DEFINE(WITH_JANSSON, 0, [Define if Jansson is available])
+ else
+     PKG_CHECK_MODULES(JANSSON,
+@@ -253,7 +253,7 @@ AM_CONDITIONAL(WITH_JANSSON, test "${with_team}" != "no")
+ 
+ dnl GCR for PKCS#11 enabled certificate chooser
+ AC_ARG_WITH(gcr, AS_HELP_STRING([--with-gcr], [Enable advanced certificate chooser (default: auto)]))
+-if (test "${with_gcr}" == "no"); then
++if test "${with_gcr}" = "no"; then
+     have_gcr=no
+ else
+     PKG_CHECK_MODULES(GCR,
+@@ -311,15 +311,15 @@ else
+                       have_gcr=no);
+ fi
+ 
+-if (test "${have_gcr}" == "yes"); then
++if test "${have_gcr}" = "yes"; then
+      AC_DEFINE(WITH_GCR, 1, [Define if Gcr is available])
+ else
+-    if (test "${with_gcr}" == "yes"); then
++    if test "${with_gcr}" = "yes"; then
+         AC_MSG_ERROR([gcr support was requested, but the gcr library is not available.])
+     fi
+     AC_DEFINE(WITH_GCR, 0, [Define if Gcr is available])
+ fi
+-AM_CONDITIONAL(WITH_GCR, test "${have_gcr}" == "yes")
++AM_CONDITIONAL(WITH_GCR, test "${have_gcr}" = "yes")
+ 
+ dnl Check for gobject introspection
+ GOBJECT_INTROSPECTION_CHECK([0.9.6])
+@@ -334,7 +334,7 @@ NM_LD_GC
+ 
+ # Disable extra compiler warning until GTK4 doesn't trigger it via graphene
+ # https://github.com/ebassi/graphene/issues/134
+-if test "$with_libnma_gtk4" == yes; then
++if test "$with_libnma_gtk4" = yes; then
+ 	_CFLAGS_SAVED="$CFLAGS"
+ 	CFLAGS="$CFLAGS $GTK4_CFLAGS"
+ 	NM_COMPILER_WARNING([_CFLAGS], [float-equal], [#include <gtk/gtk.h>])
+diff --git a/m4/introspection.m4 b/m4/introspection.m4
+index f3bda0e7..8c64bd04 100644
+--- a/m4/introspection.m4
++++ b/m4/introspection.m4
+@@ -31,7 +31,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
+     INTROSPECTION_GIRDIR=
+     INTROSPECTION_TYPELIBDIR=
+ 
+-    if test "x$enable_introspection" == "xno"; then
++    if test "x$enable_introspection" = "xno"; then
+       found_introspection="no"
+     else
+        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], [
+@@ -53,7 +53,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
+            AC_MSG_RESULT([$found_introspection])
+        ], [found_introspection="no (not installed)"])
+ 
+-       if test "x$enable_introspection" == "xyes"; then
++       if test "x$enable_introspection" = "xyes"; then
+           if test "x$found_introspection" != "xyes"; then
+               AC_MSG_ERROR([introspection enabled but can't be used])
+           fi
+-- 
+2.26.0
+
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
index f8af43807f49..09b643ef42f0 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 GNOME2_LA_PUNT="yes"
 GNOME_ORG_MODULE="network-manager-applet"
+GNOME2_EAUTORECONF="yes"
 
 inherit gnome2
 
@@ -48,6 +49,10 @@ DEPEND="${RDEPEND}
 
 PDEPEND="virtual/notification-daemon" #546134
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-bashisms.patch
+)
+
 src_configure() {
 	local myconf=(
 		--with-appindicator=$(usex ayatana ubuntu no)