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 34E5D138359 for ; Fri, 20 Nov 2020 22:21:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56017E07F1; Fri, 20 Nov 2020 22:21:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 3E6EDE07F1 for ; Fri, 20 Nov 2020 22:21:48 +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 2E959340F9F for ; Fri, 20 Nov 2020 22:21:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 471B5468 for ; Fri, 20 Nov 2020 22:21:44 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1605910881.5bf1f7164689ec8919b7f8baf5d0d76207bf0f8c.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/vivaldi-snapshot/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2110.3.ebuild X-VCS-Directories: www-client/vivaldi-snapshot/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 5bf1f7164689ec8919b7f8baf5d0d76207bf0f8c X-VCS-Branch: master Date: Fri, 20 Nov 2020 22:21:44 +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: 1ed403c6-723d-4c29-a49d-f0efb0f73243 X-Archives-Hash: 3dae8e21fe5fb526ad387e4edc6a1fea commit: 5bf1f7164689ec8919b7f8baf5d0d76207bf0f8c Author: James Le Cuirot gentoo org> AuthorDate: Fri Nov 20 22:15:29 2020 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Fri Nov 20 22:21:21 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bf1f716 www-client/vivaldi-snapshot: Other miscellaneous cleanups Package-Manager: Portage-3.0.9, Repoman-3.0.1 Signed-off-by: James Le Cuirot gentoo.org> .../vivaldi-snapshot-3.5.2110.3.ebuild | 32 ++++++++-------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2110.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2110.3.ebuild index 73a74a24df6..f69da1d681b 100644 --- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2110.3.ebuild +++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2110.3.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + CHROMIUM_LANGS=" af am @@ -76,7 +77,8 @@ CHROMIUM_LANGS=" zh-CN zh-TW " -inherit chromium-2 desktop multilib unpacker toolchain-funcs xdg + +inherit chromium-2 desktop unpacker xdg VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}" VIVALDI_HOME="opt/${PN}" @@ -103,9 +105,6 @@ KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86" IUSE="proprietary-codecs widevine" RESTRICT="bindist mirror" -DEPEND=" - virtual/libiconv -" RDEPEND=" dev-libs/expat dev-libs/glib:2 @@ -136,33 +135,27 @@ RDEPEND=" proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] ) widevine? ( www-plugins/chrome-binary-plugins ) " + QA_PREBUILT="*" -S=${WORKDIR} +S="${WORKDIR}" src_unpack() { unpack_deb ${A} } src_prepare() { - iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die - mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die - - mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die - chmod 0755 usr/share/doc/${PF} || die + # Rename docs directory to our needs. + mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die + # Decompress the docs. gunzip usr/share/doc/${PF}/changelog.gz || die # The appdata directory is deprecated. mv usr/share/{appdata,metainfo}/ || die - rm \ - _gpgbuilder \ - etc/cron.daily/${PN} \ - || die - rmdir \ - etc/cron.daily/ \ - etc/ \ - || die + # Remove cron job for updating from Debian repos. + rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die + rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die # Remove scripts that will most likely break things. rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die @@ -176,9 +169,8 @@ src_prepare() { } src_install() { - mv * "${D}" || die + mv */ "${D}" || die dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN} - fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox local logo size