From 1e1a804922b8518f578619116c9084a08b24844d Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Fri, 19 Mar 2021 02:50:26 +0000
Subject: dev-libs/libindicator: fix nonbash for both slots

Bug: https://bugs.gentoo.org/776670
Signed-off-by: Sam James <sam@gentoo.org>
---
 .../files/libindicator-12.10.1-nonbash.patch       | 23 ++++++++++++++++++++++
 .../libindicator/libindicator-12.10.1-r201.ebuild  |  4 +++-
 .../libindicator/libindicator-12.10.1-r301.ebuild  |  2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch

(limited to 'dev-libs/libindicator')

diff --git a/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch b/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch
new file mode 100644
index 000000000000..eac1e73aa288
--- /dev/null
+++ b/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/777087
+https://bugs.launchpad.net/libindicator/+bug/1502925
+Thanks-to: orbea <orbea@riseup.net>
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,7 +15,7 @@ AM_INIT_AUTOMAKE([1.11 -Wall tar-pax])
+ 
+ AM_MAINTAINER_MODE([enable])
+ 
+-AM_SILENT_RULES([yes])]
++AM_SILENT_RULES([yes])
+ 
+ # Check for programs
+ AC_PROG_CC
+@@ -66,7 +66,7 @@ AS_IF([test "x$with_gtk" = x3],
+ AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
+ 
+ LT_LIB_M
+-LIBINDICATOR_LIBS+="$LIBM"
++LIBINDICATOR_LIBS="${LIBINDICATOR_LIBS} $LIBM"
+ 
+ ##############################
+ # Custom Junk
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
index f470b6ff84b5..3b0aa709944d 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
@@ -27,9 +27,11 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-ldflags-spacing.patch
+	# Fixed version of https://bugs.launchpad.net/libindicator/+bug/1502925
+	"${FILESDIR}"/${PN}-12.10.1-nonbash.patch
 )
 
+
 src_prepare() {
 	default
 
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
index 18d09e5d5118..12baf401ad25 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@@ -27,7 +27,7 @@ BDEPEND="
 
 PATCHES=(
 	# Fixed version of https://bugs.launchpad.net/libindicator/+bug/1502925
-	"${FILESDIR}"/${PN}-12.10.1-r301-nonbash.patch
+	"${FILESDIR}"/${PN}-12.10.1-nonbash.patch
 )
 
 src_prepare() {
-- 
cgit v1.2.3-65-gdbad