[gentoo-commits] repo/gentoo:master commit in: www-client/opera/

[Stephan Hartmann]

commit:     7bff7b3270fda37788798f67d233a58d2d716417
Author:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 16:36:17 2020 +0000
Commit:     Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 17:26:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bff7b32

www-client/opera: fix widevine installation

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>

 ...a-73.0.3856.284.ebuild => opera-73.0.3856.284-r1.ebuild} | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/www-client/opera/opera-73.0.3856.284.ebuild 
b/www-client/opera/opera-73.0.3856.284-r1.ebuild
similarity index 89%
rename from www-client/opera/opera-73.0.3856.284.ebuild
rename to www-client/opera/opera-73.0.3856.284-r1.ebuild
index a604819847f..8dd3db97412 100644
--- a/www-client/opera/opera-73.0.3856.284.ebuild
+++ b/www-client/opera/opera-73.0.3856.284-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