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 1796A138350 for ; Sun, 19 Jan 2020 13:38:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D785AE08F5; Sun, 19 Jan 2020 13:38:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 BE2E8E08F5 for ; Sun, 19 Jan 2020 13:38:10 +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 89E8134E293 for ; Sun, 19 Jan 2020 13:38:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 892F699 for ; Sun, 19 Jan 2020 13:38:07 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1579441001.1ecc08102d6b52b6dd98c4f35139d33eba18e111.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/dropbox/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/dropbox/dropbox-89.3.268.ebuild X-VCS-Directories: net-misc/dropbox/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1ecc08102d6b52b6dd98c4f35139d33eba18e111 X-VCS-Branch: master Date: Sun, 19 Jan 2020 13:38:07 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b903a80f-5d28-4902-97f2-96c7fde9812c X-Archives-Hash: c6bacbc7f14005578483efc4ec46337e commit: 1ecc08102d6b52b6dd98c4f35139d33eba18e111 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jan 15 20:47:05 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 19 13:36:41 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ecc0810 net-misc/dropbox: EAPI-7 bump Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> net-misc/dropbox/dropbox-89.3.268.ebuild | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/net-misc/dropbox/dropbox-89.3.268.ebuild b/net-misc/dropbox/dropbox-89.3.268.ebuild index 7a750370139..b08c6c38492 100644 --- a/net-misc/dropbox/dropbox-89.3.268.ebuild +++ b/net-misc/dropbox/dropbox-89.3.268.ebuild @@ -1,20 +1,21 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils gnome2-utils pax-utils systemd +inherit desktop pax-utils systemd xdg DESCRIPTION="Dropbox daemon (pretends to be GUI-less)" HOMEPAGE="https://www.dropbox.com/" SRC_URI=" - x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz ) - amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )" + amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz ) + x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )" LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox" SLOT="0" KEYWORDS="amd64 x86 ~x86-linux" IUSE="+librsync-bundled selinux X" + RESTRICT="mirror strip" QA_PREBUILT="opt/.*" @@ -23,7 +24,8 @@ QA_EXECSTACK="opt/dropbox/dropbox" DEPEND="librsync-bundled? ( dev-util/patchelf )" # Be sure to have GLIBCXX_3.4.9, #393125 -RDEPEND="X? ( +RDEPEND=" + X? ( dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -65,7 +67,7 @@ src_unpack() { } src_prepare() { - eapply_user + default rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die # tray icon doesnt load when removing libQt5* (bug 641416) @@ -102,15 +104,3 @@ src_install() { dodoc "${T}"/{README,ACKNOWLEDGEMENTS} } - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -}