commit: 1e1a804922b8518f578619116c9084a08b24844d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Mar 19 02:50:26 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Mar 19 02:50:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e1a8049
dev-libs/libindicator: fix nonbash for both slots Bug: https://bugs.gentoo.org/776670 Signed-off-by: Sam James <sam <AT> 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(-) 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 00000000000..eac1e73aa28 --- /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 <or...@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 f470b6ff84b..3b0aa709944 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 18d09e5d511..12baf401ad2 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() {
