gentoo resync : 18.12.2020

3 files changed, 14 insertions, 10 deletions

diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 3f565b98a3e8..b07c4c50024e 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,11 +1,7 @@
-DIST vivaldi-stable_3.5.2115.73-1_amd64.deb 76802208 BLAKE2B 1421a38a20fc1c25c5e8cebe5eeddf4a991759c325675538c2fc31c2d0001a9846a31a785f8f3f508a6cabc5e52d4365feb2e0a58d60d4cf160b86fc0333eae3 SHA512 f43ac8ebe8c86e244366160bcd5c2c33d22d0cd44602eaa8a4fa512cfc255ee0cfefd6e865eb12ed0f711c182d0f4313836e865cde416890bc694c2835e21bf7
-DIST vivaldi-stable_3.5.2115.73-1_arm64.deb 69054028 BLAKE2B fc17e2d84900d101d5a716fa79990cd6501e741c2e3c80889e3b4b5c057a2ea0dad29b9b22fc71768a14ad75677666ab6755ca3babd29cd9babbf72b15b3830d SHA512 af84e3d1719cfa0f19ccae17af48c375a03e676e68be92a8ab5babb6bec3d36d6cd1ce4b13daeeffd5f0117e2614d4c1da53f5c2690c7f373003cf805b7ca99d
-DIST vivaldi-stable_3.5.2115.73-1_armhf.deb 68138412 BLAKE2B 22c061ac3112d2e8f81b3b9ad0e6fb3d852245f5ba15ca24a6a914d5fe5e8216e973b22e80cb3c94812eb7b02ed7a3b165390bd7651498c9149bfee07994664b SHA512 e1997250bec3f1591000b88a3e08446a8e2d1ffea057cb5faf101e048a1adad1db5d240ee6e12d959ad8d5172de8710ef969c407363b1693b9da83cd39091799
-DIST vivaldi-stable_3.5.2115.73-1_i386.deb 73581952 BLAKE2B 4cc3bc2109056dfcfab741ebee15337fc01213379c258ade99d460ab2e0f588eb54c34ac2596f8f6bc16761e69f43132ca2a8c1e81785f79238668f44be7de22 SHA512 65a25d67ec6decfbfb57fcfaead79600d6eabe3c7278b25c9c5103648e3dfff80d36838f210076bb85cdccf7ca3f4dbc9ef764cb449e76fd8ba54f05f9ed3ed2
 DIST vivaldi-stable_3.5.2115.81-1_amd64.deb 76800924 BLAKE2B f284db01815f2045f338ae05313c3ecc760c358f396d3a5b178f7b78958217929cca5b4565ab5cf886b66674392cd247e1e550b204789b7f82e75a612d0e73c4 SHA512 6586cb7b2aa481c131792e317181f7089bcce6fe2a9682eedd6dbcb957cecf79facd984c5003c23e028a9c8aea5b822f16d8716fe377fc9b9eca03628599f29a
 DIST vivaldi-stable_3.5.2115.81-1_arm64.deb 69060656 BLAKE2B 980c9057d58ffb76f16ff460d507b0d1d4af698b45448be201a6da4b0332f9e10505c0e0cb377670b4f0e2e170467a753f0b694d07277af344908f72182f0f95 SHA512 aa4664f7dc7cb2f2c90a62f555d77ac5232d87205660a626cb6b391735d231e01c76318931607ebb763bb15fe61e6b5b76b9f8136899296db87084ceada38c86
 DIST vivaldi-stable_3.5.2115.81-1_armhf.deb 68138676 BLAKE2B 800424a447f968b73804dfb57505b7ba6f3d422f76e35b1260178fa3b1e8056d6452f9a131f0216d3b6e156e47c84e39bd95a436cccd0c3c44a4600e2378ea9d SHA512 9bdc9a697fe255d5435ea9435c2a5bcd7eabbcc8f013af573fc4b6903f367a14a5cd140ed9141a856bd4c16446fffad1582cf5f3701828a654459a65b1480a0f
 DIST vivaldi-stable_3.5.2115.81-1_i386.deb 73600472 BLAKE2B fad4bbef97173f39446277b1ace8b8bf421cd979f02c490879f7b4b8ba3b82cfb6024c8ebad60aaaf436e755a69151883cbb0108212cce7f0274baa969f3f923 SHA512 8634d8a4ee9f0b240f5c8ab59599918f5e0f830e38f8caa6a24afcdf0e6c3291f447834e6262121ec0e484f098ee17be9fb4ed493b81ecba7e0551ee7a31fa96
-EBUILD vivaldi-3.5.2115.73.ebuild 3117 BLAKE2B fb8f547a924c8c3ce37587307faa723a897c354929193d65bc4efbac2f043b25e82c61ca4e2dfbb65133746c793e87b6781050fbbb887aa2f0b3f5193aa1c193 SHA512 6875e61344d5148d4e65de901512b7a02d03ac9a3aa5513a7c38dbb89efcbe96d7ec81391c0988bf503566e7c7528130204c97915f1321d0c595391139352319
-EBUILD vivaldi-3.5.2115.81.ebuild 3119 BLAKE2B 2280d8cb71ddda8d59bacd6b1302e2096ac7a74b5754f962bd8492ee321b5916ce3ebf999d12f6d0be52620a362bcb40d86d87ea31aea236eb0f8e4a13dd08ed SHA512 2a5c2b58435f1f871c6a7c83a82d642dda5e7b8d96d98f509b6c2b11573829cd58f5ccf64a3fee74c692d11921bed361791b3e6d304502a97c89efafb8bd02dd
+EBUILD vivaldi-3.5.2115.81-r1.ebuild 3320 BLAKE2B 01865e8c01b9ed8c35162eb6a00b5a025969d594fa4c9d576ca24a10890e7b117a2d22572014360c247f06cb1f9d1c3135790040f882760d28c8e8d6e06749d6 SHA512 0ec9ba75dfb638495fc442b011292521b5d9978c997dd8a1bc4fff2ac98db26591f008748ce35a2378e71778570898354a093ff3763f592ac33a7d6b05080bef
+EBUILD vivaldi-3.5.2115.81.ebuild 3117 BLAKE2B fb8f547a924c8c3ce37587307faa723a897c354929193d65bc4efbac2f043b25e82c61ca4e2dfbb65133746c793e87b6781050fbbb887aa2f0b3f5193aa1c193 SHA512 6875e61344d5148d4e65de901512b7a02d03ac9a3aa5513a7c38dbb89efcbe96d7ec81391c0988bf503566e7c7528130204c97915f1321d0c595391139352319
 MISC metadata.xml 484 BLAKE2B d42a35d2fe225a512c00ca9eaad5c30dc5f214f3ef90c25190b098b804cea3879c68bdcfa31add4253f9ffa37bc3514d26ae5ba89f8beb3c9727f201263e7329 SHA512 e5745b041627b0ee9242ae8e65bf3c065c6fa82cc45c93de3d1e41e1f53e7412b1d13b06f6dab1bc45ebcfd1861b5709a09c960f2bb4d0c221ae0d51b6e3b252
diff --git a/www-client/vivaldi/vivaldi-3.5.2115.73.ebuild b/www-client/vivaldi/vivaldi-3.5.2115.81-r1.ebuild
index 9915e12fccfc..1ab5bd8c7d61 100644
--- a/www-client/vivaldi/vivaldi-3.5.2115.73.ebuild
+++ b/www-client/vivaldi/vivaldi-3.5.2115.81-r1.ebuild
@@ -101,7 +101,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64 x86"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
 IUSE="proprietary-codecs widevine"
 RESTRICT="bindist mirror"
 
@@ -165,6 +165,11 @@ src_prepare() {
 	chromium_remove_language_paks
 	popd > /dev/null || die
 
+	if use proprietary-codecs; then
+		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
+		rmdir ${VIVALDI_HOME}/lib || die
+	fi
+
 	eapply_user
 }
 
@@ -181,8 +186,8 @@ src_install() {
 	done
 
 	if use proprietary-codecs; then
-		dosym ../../../usr/$(get_libdir)/chromium/libffmpeg.so \
-			  /${VIVALDI_HOME}/lib/libffmpeg.so
+		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so \
+			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
 	fi
 
 	if use widevine; then
@@ -191,4 +196,7 @@ src_install() {
 	else
 		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
 	fi
+
+	[[ ${PN} = vivaldi-snapshot ]] &&
+		dosym ${PN} /${VIVALDI_HOME}/vivaldi
 }
diff --git a/www-client/vivaldi/vivaldi-3.5.2115.81.ebuild b/www-client/vivaldi/vivaldi-3.5.2115.81.ebuild
index f69da1d681b9..9915e12fccfc 100644
--- a/www-client/vivaldi/vivaldi-3.5.2115.81.ebuild
+++ b/www-client/vivaldi/vivaldi-3.5.2115.81.ebuild
@@ -101,7 +101,7 @@ SRC_URI="
 
 LICENSE="Vivaldi"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="-* amd64 ~arm ~arm64 x86"
 IUSE="proprietary-codecs widevine"
 RESTRICT="bindist mirror"