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 180C31382C5 for ; Thu, 17 Dec 2020 17:33:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6157DE0886; Thu, 17 Dec 2020 17:33:57 +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 4A118E0886 for ; Thu, 17 Dec 2020 17:33:57 +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 4D8BE341282 for ; Thu, 17 Dec 2020 17:33:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E2AB8BD for ; Thu, 17 Dec 2020 17:33:53 +0000 (UTC) From: "Stephan Hartmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stephan Hartmann" Message-ID: <1608226428.3ee0b3ba75c94642073ecf46981151ccbc684c5c.sultan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/opera-developer/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/opera-developer/opera-developer-74.0.3904.0-r1.ebuild www-client/opera-developer/opera-developer-74.0.3904.0.ebuild X-VCS-Directories: www-client/opera-developer/ X-VCS-Committer: sultan X-VCS-Committer-Name: Stephan Hartmann X-VCS-Revision: 3ee0b3ba75c94642073ecf46981151ccbc684c5c X-VCS-Branch: master Date: Thu, 17 Dec 2020 17:33:53 +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: 6055a180-2740-4b12-9eca-474fa804d546 X-Archives-Hash: 69258bbf1a08d6f1a5e6cd1cc6c6ea14 commit: 3ee0b3ba75c94642073ecf46981151ccbc684c5c Author: Stephan Hartmann gentoo org> AuthorDate: Thu Dec 17 17:33:05 2020 +0000 Commit: Stephan Hartmann gentoo org> CommitDate: Thu Dec 17 17:33:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee0b3ba www-client/opera-developer: fix widevine installation Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Stephan Hartmann gentoo.org> ....3904.0.ebuild => opera-developer-74.0.3904.0-r1.ebuild} | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/www-client/opera-developer/opera-developer-74.0.3904.0.ebuild b/www-client/opera-developer/opera-developer-74.0.3904.0-r1.ebuild similarity index 89% rename from www-client/opera-developer/opera-developer-74.0.3904.0.ebuild rename to www-client/opera-developer/opera-developer-74.0.3904.0-r1.ebuild index bbe796e0b00..fcc98f28db8 100644 --- a/www-client/opera-developer/opera-developer-74.0.3904.0.ebuild +++ b/www-client/opera-developer/opera-developer-74.0.3904.0-r1.ebuild @@ -93,12 +93,12 @@ src_install() { # move to /opt, bug #573052 mkdir -p "${OPERA_HOME%${PN}}" mv "usr/lib/x86_64-linux-gnu/${PN}" "${OPERA_HOME%${PN}}" || die - rm -rf "usr/lib" || die + rm -r "usr/lib" || die # disable auto update rm "${OPERA_HOME}/${PN%-*}_autoupdate"{,.licenses,.version} || die - rm -rf "usr/share/lintian" || die + rm -r "usr/share/lintian" || die # fix docs mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die @@ -115,19 +115,20 @@ src_install() { popd > /dev/null || die # setup opera symlink - rm -f "usr/bin/${PN}" || die + rm "usr/bin/${PN}" || die dosym "../../${OPERA_HOME}/${PN}" "/usr/bin/${PN}" # install proprietary codecs - rm -f "resources/ffmpeg_preload_config.json" || die + rm "${OPERA_HOME}/resources/ffmpeg_preload_config.json" || die if use proprietary-codecs; then mv lib_extra "${OPERA_HOME}" fi # symlink widevine - rm -f "resources/widevine_config.json" || die + rm "${OPERA_HOME}/resources/widevine_config.json" || die if use widevine; then - dosym "../../usr/$(get_libdir)/chromium-browser/WidevineCdm" "${OPERA_HOME}/WidevineCdm" + echo "[\"${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm\"]" > \ + "${OPERA_HOME}/resources/widevine_config.json" || die fi # pax mark opera, bug #562038