From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7B6761382C5 for ; Fri, 9 Feb 2018 09:33:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 624A0E0A60; Fri, 9 Feb 2018 09:33:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4058FE0A60 for ; Fri, 9 Feb 2018 09:33:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DCA12335C4E for ; Fri, 9 Feb 2018 09:33:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34ED01E5 for ; Fri, 9 Feb 2018 09:33:02 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1518168763.0be003699372b4da0912aa7a6ab97ec9d03b65e7.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/slack-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/slack-bin/slack-bin-3.0.5.ebuild X-VCS-Directories: net-im/slack-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0be003699372b4da0912aa7a6ab97ec9d03b65e7 X-VCS-Branch: master Date: Fri, 9 Feb 2018 09:33:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7f43eb3c-76c6-4438-bb14-4577672096cc X-Archives-Hash: 79531138179c9cf32af0f2a49665077a commit: 0be003699372b4da0912aa7a6ab97ec9d03b65e7 Author: Vladimir Pavljuchenkov (SpiderX) spiderx dp ua> AuthorDate: Tue Feb 6 16:32:38 2018 +0000 Commit: Michał Górny gentoo 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