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 2CA44139694 for ; Tue, 11 Jul 2017 20:01:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84912274094; Tue, 11 Jul 2017 20:01:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 50B55274094 for ; Tue, 11 Jul 2017 20:01:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 1ADF0341BC8 for ; Tue, 11 Jul 2017 20:01:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA32074AD for ; Tue, 11 Jul 2017 20:01:26 +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: <1499803270.a6e31f1e13db9a790faf16f9938ebac9299a61c9.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-2.1.2.ebuild X-VCS-Directories: net-im/slack-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a6e31f1e13db9a790faf16f9938ebac9299a61c9 X-VCS-Branch: master Date: Tue, 11 Jul 2017 20:01:26 +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: c2c30c9c-ce4b-411b-b0d5-3a40360064ed X-Archives-Hash: 0068257bf3723668ad3f86524911c97c commit: a6e31f1e13db9a790faf16f9938ebac9299a61c9 Author: Vladimir Pavljuchenkov (SpiderX) spiderx dp ua> AuthorDate: Mon Jul 3 16:18:31 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Jul 11 20:01:10 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6e31f1e net-im/slack-bin: backport ebuild fixes to 2.1.2 Package-Manager: Portage-2.3.6, Repoman-2.3.1 net-im/slack-bin/slack-bin-2.1.2.ebuild | 94 ++++++++++++++++++--------------- 1 file changed, 50 insertions(+), 44 deletions(-) diff --git a/net-im/slack-bin/slack-bin-2.1.2.ebuild b/net-im/slack-bin/slack-bin-2.1.2.ebuild index 533580ad790..9899c64e0f3 100644 --- a/net-im/slack-bin/slack-bin-2.1.2.ebuild +++ b/net-im/slack-bin/slack-bin-2.1.2.ebuild @@ -1,63 +1,61 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit unpacker gnome2-utils +MY_PN="${PN/-bin/}" +BASE_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-_arch_.deb" -QA_PREBUILT=" - opt/slack/slack - opt/slack/resources/app.asar.unpacked/node_modules/* - opt/slack/libnode.so - opt/slack/libgcrypt.so.11 - opt/slack/libffmpeg.so - opt/slack/libCallsCore.so -" +inherit eutils gnome2-utils unpacker DESCRIPTION="Team collaboration tool" HOMEPAGE="http://www.slack.com/" +SRC_URI="x86? ( ${BASE_URI/_arch_/i386} ) + amd64? ( ${BASE_URI/_arch_/amd64} )" -MY_PN="${PN/-bin/}" -BASE_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-_arch_.deb" - -SRC_URI=" - x86? ( ${BASE_URI/_arch_/i386} ) - amd64? ( ${BASE_URI/_arch_/amd64} ) -" - -LICENSE="MIT Apache-2.0 BSD ISC LGPL-2 AFL-2.1 public-domain WTFPL-2 Artistic-2 no-source-code" +LICENSE="all-rights-reserved" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -RESTRICT="mirror" +RESTRICT="bindist mirror" -RDEPEND="x11-libs/gtk+:2 - x11-libs/libnotify - x11-libs/libXtst - x11-libs/pango - x11-libs/cairo[xcb] - media-libs/alsa-lib - media-libs/harfbuzz[graphite] - media-libs/libcanberra[gtk] - dev-libs/nss +RDEPEND="dev-libs/atk:0 + dev-libs/expat:0 dev-libs/glib:2 - dev-libs/atk - gnome-base/libgnome-keyring + dev-libs/nspr:0 + dev-libs/nss:0 gnome-base/gconf:2 - sys-apps/dbus - net-print/cups[ssl] - net-misc/curl - virtual/udev - virtual/libc - virtual/libffi -" -DEPEND="${RDEPEND}" + gnome-base/libgnome-keyring:0 + media-libs/alsa-lib:0 + media-libs/fontconfig:1.0 + media-libs/freetype:2 + net-misc/curl:0 + net-print/cups:0 + sys-apps/dbus:0 + x11-libs/cairo:0 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/libX11:0 + x11-libs/libXcomposite:0 + x11-libs/libXcursor:0 + x11-libs/libXdamage:0 + x11-libs/libXext:0 + x11-libs/libXfixes:0 + x11-libs/libXi:0 + x11-libs/libXrandr:0 + x11-libs/libXrender:0 + x11-libs/libXScrnSaver:0 + x11-libs/libXtst:0 + x11-libs/pango:0" -S="${WORKDIR}" +QA_PREBUILT="opt/slack/slack + opt/slack/resources/app.asar.unpacked/node_modules/* + opt/slack/libnode.so + opt/slack/libgcrypt.so.11 + opt/slack/libffmpeg.so + opt/slack/libCallsCore.so" -pkg_preinst() { - gnome2_icon_savelist -} +S="${WORKDIR}" src_install() { insinto /usr/share/pixmaps @@ -67,11 +65,19 @@ src_install() { domenu usr/share/applications/${MY_PN}.desktop insinto /opt/${MY_PN} - doins -r usr/lib/${MY_PN}/* + doins -r usr/lib/${MY_PN}/. fperms +x /opt/${MY_PN}/${MY_PN} dosym /opt/${MY_PN}/${MY_PN} /usr/bin/${MY_PN} } +pkg_preinst() { + gnome2_icon_savelist +} + pkg_postinst() { gnome2_icon_cache_update } + +pkg_postrm() { + gnome2_icon_cache_update +}