public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/slack-bin/
Date: Fri,  9 Feb 2018 09:33:02 +0000 (UTC)	[thread overview]
Message-ID: <1518168763.0be003699372b4da0912aa7a6ab97ec9d03b65e7.mgorny@gentoo> (raw)

commit:     0be003699372b4da0912aa7a6ab97ec9d03b65e7
Author:     Vladimir Pavljuchenkov (SpiderX) <spiderx <AT> spiderx <DOT> dp <DOT> ua>
AuthorDate: Tue Feb  6 16:32:38 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb  9 09:32:43 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0be00369

net-im/slack-bin: fix 645918 (support for ayatana)

Closes: https://bugs.gentoo.org/645918
Closes: https://github.com/gentoo/gentoo/pull/7051
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-im/slack-bin/slack-bin-3.0.5.ebuild | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/net-im/slack-bin/slack-bin-3.0.5.ebuild b/net-im/slack-bin/slack-bin-3.0.5.ebuild
index 6f2f809380d..711f490d302 100644
--- a/net-im/slack-bin/slack-bin-3.0.5.ebuild
+++ b/net-im/slack-bin/slack-bin-3.0.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~amd64 -*"
-IUSE="pax_kernel"
+IUSE="ayatana pax_kernel"
 RESTRICT="bindist mirror"
 
 RDEPEND="app-crypt/libsecret:0[${MULTILIB_USEDEP}]
@@ -47,7 +47,8 @@ RDEPEND="app-crypt/libsecret:0[${MULTILIB_USEDEP}]
 	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
 	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
 	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
-	x11-libs/pango:0[${MULTILIB_USEDEP}]"
+	x11-libs/pango:0[${MULTILIB_USEDEP}]
+	ayatana? ( dev-libs/libappindicator:2[${MULTILIB_USEDEP}] )"
 
 QA_PREBUILT="opt/slack/slack
 	opt/slack/resources/app.asar.unpacked/node_modules/*
@@ -57,6 +58,16 @@ QA_PREBUILT="opt/slack/slack
 
 S="${WORKDIR}"
 
+src_prepare() {
+	default
+
+	if use ayatana ; then
+		sed -i '/Exec/s|=|=env XDG_CURRENT_DESKTOP=Unity |' \
+			usr/share/applications/slack.desktop \
+			|| die "sed failed for slack.desktop"
+	fi
+}
+
 src_install() {
 	insinto /usr/share/pixmaps
 	doins usr/share/pixmaps/${MY_PN}.png


             reply	other threads:[~2018-02-09  9:33 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-09  9:33 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-03-14  9:55 [gentoo-commits] repo/gentoo:master commit in: net-im/slack-bin/ Joonas Niilola
2020-02-08 16:25 David Seifert
2020-02-06  6:20 Joonas Niilola
2020-02-06  6:20 Joonas Niilola
2020-02-06  6:20 Joonas Niilola
2020-02-06  2:06 Andreas Sturmlechner
2020-02-05 11:55 Jason A. Donenfeld
2020-02-05 11:55 Jason A. Donenfeld
2020-02-05 11:55 Jason A. Donenfeld
2019-09-05 18:28 Joonas Niilola
2019-09-05 18:28 Joonas Niilola
2019-06-09 10:50 Michał Górny
2019-05-09  1:19 Georgy Yakovlev
2019-05-09  1:19 Georgy Yakovlev
2019-05-09  1:19 Georgy Yakovlev
2019-03-18 22:53 Patrice Clement
2019-01-18 15:49 Matthew Thode
2019-01-15 18:43 Matthew Thode
2018-10-13 13:43 Michał Górny
2018-10-13 13:43 Michał Górny
2018-09-09 15:46 Amy Liffey
2018-07-08 19:23 Andreas Sturmlechner
2018-07-08 19:23 Andreas Sturmlechner
2018-06-17 21:32 Michał Górny
2018-05-13 19:25 Aaron Bauman
2018-05-13 19:25 Aaron Bauman
2018-05-13 19:25 Aaron Bauman
2018-03-30 18:16 Michał Górny
2018-02-09  9:33 Michał Górny
2018-01-14  9:17 Michael Palimaka
2017-10-28 13:37 Patrice Clement
2017-09-22 13:54 Patrice Clement
2017-07-15 11:25 Michał Górny
2017-07-11 20:01 Michał Górny
2017-07-11 20:01 Michał Górny
2017-07-11 20:01 Michał Górny
2017-07-11 20:01 Michał Górny
2017-07-11 20:01 Michał Górny
2017-03-16 19:13 David Seifert
2017-01-21 21:14 Patrice Clement
2017-01-15  2:26 Göktürk Yüksek
2016-09-27 20:29 Patrice Clement

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1518168763.0be003699372b4da0912aa7a6ab97ec9d03b65e7.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox