gentoo resync : 25.01.2018

4 files changed, 10 insertions, 37 deletions

diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 82d9a19895bd..c6dea194ad1b 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,12 +1,11 @@
-AUX vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch 1164 BLAKE2B f62ac321731ae3237cd5cd67b17cb2027afc751f8d54b46b58f9f060ee5af67cd37501278a279424463d2d6e2b42c728e90f7d94f3cab39b41342decc7778bab SHA512 2a78bae6ee58a415029c0db0c7ebbdc11611d2e167da6fef21a6a76df66b88ac65f803f9aa8b1a22007709f435803a6c967e1a82249c6c42e8d9e1cfb2c114cb
 AUX vivaldi-snapshot-1.14.1072.3_p1-desktop.patch 347 BLAKE2B f54dcdac06c3011d0fd73d0b8c6576a94c77121c488aa103f856afa0cde4a0cf7c5f6249936fd189469179e14c05e192bce9f426e2c7f6f2978b5f8e2171b47a SHA512 946d7bb5875280a98fba1caf48174b3eb3891cc079879a5f76bc74d6f301064437faf6cbe65acbaa9c6528925e4741205bc8f64fb41ace379be9a8f1d39690a4
 AUX vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch 1271 BLAKE2B 51c020903f801608f2515df7f9efb125353d42b61e2126c8858d22237eccf21dcc1571b46be74dc65546544cb985b0d4f2e023ea23dd18ef336f5b3ea0f03eea SHA512 1fb9e60240ec5bdf8d422290c9676b3fd3c7dacd88a26b0bd5f19cd160e3ef63d46fd5697ed0798ed3fab9db79da76d9068d36f2760681b53dad89775e12aad4
-DIST vivaldi-snapshot-1.14.1064.3_p1-amd64.deb 50482824 BLAKE2B 08a25b11a9ba63ff731a27acaaaa83411342e94a249d3ef6b74ff8e69e877b3c6d2ccd2724469beafb81d462c5fc927ba049a42971fa854833676e2086259b62 SHA512 6930048690a6baa081a243558eea7fa70cc583b809b7d36b5f5331a5d17f62cd7f672c3c36100fb865e2fd536ab146480f28bdb75c08c3e8563c7e6b10028bfc
-DIST vivaldi-snapshot-1.14.1064.3_p1-armhf.deb 46248122 BLAKE2B e3cdaca603c1c6a9ca34fa50b12fc225d8e7fbac5966c2aeb8b36c4224af12c882d84f40a6213ccd966ad16b4eae93eee8dcf53ec8324d5c564ff42b90f5b0ac SHA512 46e4724c727f78d355e32e7d8dc482ec240dff2f42b10a16ea3549d83fa24149093dc4e5f85626b0059b71bdbc83323a1cdbc064e3ed63c4b29f24bbf3661960
-DIST vivaldi-snapshot-1.14.1064.3_p1-i386.deb 51362530 BLAKE2B 7ce16ba32329d5428ea4c4ccc84ff9bc7a450ef3765c1c6c8929884fdce41cc1a842b3ce70881c02f4f30e5a49f90df99e40fe6e6256a0aba7aa7803f75d6e1c SHA512 c3ecb7b61a036d9e99fbe5a0bf46a87d06c73cb9be3fc1429c89bf173044c53db9c5a1d367dc38b26aeceb83ad802c70a7ada7e91cefaac80fd083c7731e52e6
-DIST vivaldi-snapshot-1.14.1072.3_p1-amd64.deb 53508988 BLAKE2B 5c9f61f6b29e507c8a2f3368f8d6154dbf1a302075af7af8a8f5ec253c44ecdf7b57d6e6c4d26818ccb41d9ec25986389487506258aaa8e26cfe2cc0077f4412 SHA512 067bb347c2064b1709bb8af2995182f659fb4dbc4199bc942e2005025aac6672ec0af9944f0692a5cfbc96b78ea42b3e268c96a72b189ffea5cc0bebc1038115
-DIST vivaldi-snapshot-1.14.1072.3_p1-armhf.deb 47312872 BLAKE2B 3581fb6a727bb6e26e92b3509d5a96536a2a16ab8d4972f84146daae945f28ac1f80962e0b0023a03053d177c8b56ee7f8ebf162db79d13344802aa3f56eb7ee SHA512 3b61f07cc7258634028f27b1a00aa44b95c3618b8b36803ecdf8e17af9ca0f432456fd758efe1ba8bacffe247e2dfa08b5092776c8f4c9a2aac963553d115293
-DIST vivaldi-snapshot-1.14.1072.3_p1-i386.deb 53069774 BLAKE2B 4f3f60cd1c3019d1c947146e90a9a1325a2c14777cf43cb3394078483d47cc8eb417c3bcd2e37db457f11eede3dd7e131b08923a6a2b79f3bb85a809c513aed2 SHA512 6983060e0db5313dee69297e50b5df256d7856440fa44f1e8074dfb3d28e43bac2f04391d6698bd1334d9d407326ffa7e8b1c550bcd0ef8ee151ff48367df794
-EBUILD vivaldi-snapshot-1.14.1064.3_p1.ebuild 2630 BLAKE2B 13500ad0e1f7b1c6318fd71d5cc34f31fedd1d50721e813c6fef1084a1816bc561f8f357a39c119abf0dee5131815e2c1c686c580e8f4ad79379eb7ce53c2332 SHA512 64178f4cd30ab2ac966baef01a4259863438bd7d5b913fbe322c0ef5477df5de78e721926c071e6b0b13afedeca8f7de6f99cef2ba518fd039a346ec547a9dc2
-EBUILD vivaldi-snapshot-1.14.1072.3_p1.ebuild 2699 BLAKE2B 13e7fd0f14311826104f46fb9be09acf28a5f7ba4a52911ed419cec5fa6edd278acf48d92d05f93b8298b135048c866da3bb858a8c2d0b9deac1a42ceb5c0a20 SHA512 529426c9360ded9436efaa7a8dc9894b2a670e4c700c1a396f3742c15f91b02be380066ba70bc3fee2ace0e556d31bb54042213aee4b62a4bb3a81ea89a83a99
+DIST vivaldi-snapshot-1.14.1077.25_p1-amd64.deb 53368116 BLAKE2B fabdfbd05333a60aab0bbf718955c68e75be5d4f95a901bd849661a301c1cd9f9a5948d137d63d08f980f00d2cea263713b5c8a1ee28dc0c593bbb6f9bf40ea8 SHA512 cbcf50adf3abbd4e45ab954833aff4f02e0dc995388ba48aee9925220c18e25506ee1aca79367647c52b4c8a2d4f5ab2666389ad9e27dd79abe6ecb77ba001f9
+DIST vivaldi-snapshot-1.14.1077.25_p1-armhf.deb 47210996 BLAKE2B 7436078249d4d54effca2181066508dbeeaaa361dce2a3163a228ec074493a43cd4bebba866252cbadc1c404dfe85fc6b28dfac6cd7e75f087b538ffca8c61b9 SHA512 bf32501b1b2d47dbab872a7fd7f8152abcdd328f72167772a4aa197666d16d65ad47f4a883e027add168d131dda82fc4badbd357c592614e6ee3b2956b163a61
+DIST vivaldi-snapshot-1.14.1077.25_p1-i386.deb 52951982 BLAKE2B 27463fd7c558bf15777dc483c66ce0427f70c4ab02c6b0e83ff587dca4d8ab1fa467b6b6b7f362b0ba996a67e6781c9217fca8e513324392a1df47e742bc2ef0 SHA512 097f9136be58facc911ad9b88d8486e89320d57b140ab8ed6cf9d0a2bd2750aff5829eb4b66b682b7bb9b1877cb8e8077daac869d261412be79b57c0304359c7
+DIST vivaldi-snapshot-1.14.1077.3_p1-amd64.deb 53411180 BLAKE2B e04cfee2c6ab7fd4d81942a3232c878be37c5d768f95e1588e007d305e6a050241daa3297a0c069cfeeee4190611594f282a1a233d64e49deb429b6d8adca558 SHA512 cab5853cad74f111d47f9611d7a18a8deee99608aa241eff85988bfb42792b1e642a35ad5847fa09d374b7baeadb7f5afc64655418e5dfbdbf2ff8eee141857e
+DIST vivaldi-snapshot-1.14.1077.3_p1-armhf.deb 47215650 BLAKE2B 3e148d2d05236929a958c6a782f921b9cf82e861a4760db6615daac3d07595bd1393ffdee639cf513cf4d1073f0a350a2277af5a44a0eaec9ef9602698b51a29 SHA512 d782191a9f0d7287a65146df552e18a3cdb32a6bc9972bab6a9e7377cfd88685d0c0e8763c39a870b0031c1f7b10777a98bc3691b6a5c1781cafe7da11c22c6e
+DIST vivaldi-snapshot-1.14.1077.3_p1-i386.deb 52959064 BLAKE2B 4bd5df973212ec0d0e2009e96472deb7c831b2455907c7bd9e7e40ac6a5d6e5aa7d02b6a10e954106ec206404f4055ae0977e1829d58713de7594109aa6514f7 SHA512 8f070e0e00bf9acf2d6b3f1bbb79768b1d460f2a2860bb45122551883ae38aa6efb1e283bdc853c4135e9936f399f0b8656f247102d406e8b861a924f0b2977d
+EBUILD vivaldi-snapshot-1.14.1077.25_p1.ebuild 2699 BLAKE2B 13e7fd0f14311826104f46fb9be09acf28a5f7ba4a52911ed419cec5fa6edd278acf48d92d05f93b8298b135048c866da3bb858a8c2d0b9deac1a42ceb5c0a20 SHA512 529426c9360ded9436efaa7a8dc9894b2a670e4c700c1a396f3742c15f91b02be380066ba70bc3fee2ace0e556d31bb54042213aee4b62a4bb3a81ea89a83a99
+EBUILD vivaldi-snapshot-1.14.1077.3_p1.ebuild 2699 BLAKE2B 13e7fd0f14311826104f46fb9be09acf28a5f7ba4a52911ed419cec5fa6edd278acf48d92d05f93b8298b135048c866da3bb858a8c2d0b9deac1a42ceb5c0a20 SHA512 529426c9360ded9436efaa7a8dc9894b2a670e4c700c1a396f3742c15f91b02be380066ba70bc3fee2ace0e556d31bb54042213aee4b62a4bb3a81ea89a83a99
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch b/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
deleted file mode 100644
index 807164299ac4..000000000000
--- a/www-client/vivaldi-snapshot/files/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/opt/vivaldi-snapshot/vivaldi-snapshot
-+++ b/opt/vivaldi-snapshot/vivaldi-snapshot
-@@ -32,14 +32,14 @@
-       # Chromium's FFMpeg version N-82746-g6bb7ea7 is the oldest known working version
-       # chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h
-       if [ -r "$1" ]; then
--        if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "82746" ]; then
-+#        if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "82746" ]; then
-           if [[ -n "$LD_PRELOAD" ]]; then
-             export LD_PRELOAD="$LD_PRELOAD:$1"
-           else
-             export LD_PRELOAD="$1"
-           fi
-           export VIVALDI_FFMPEG_FOUND=YES
--        fi
-+#        fi
-       fi
-     fi
-   fi
-@@ -54,6 +54,7 @@
- # Check for libs in preferred order.
- # Where possible, use other files/directories to confirm it's the correct variant.
- VIVALDI_FFMPEG_FOUND=NO
-+checkffmpeg "/usr/lib64/chromium/libffmpeg.so"
- checkffmpeg '/usr/lib/chromium-browser/libffmpeg.so' '/usr/share/doc/chromium-codecs-ffmpeg-extra'
- checkffmpeg "/usr/lib/$DEBARCH/oxide-qt/libffmpeg.so" '/usr/share/doc/oxideqt-codecs-extra'
- 
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1072.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1077.25_p1.ebuild
index 7998894a831b..7998894a831b 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1072.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1077.25_p1.ebuild
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1064.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1077.3_p1.ebuild
index a3680124874c..7998894a831b 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1064.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1077.3_p1.ebuild
@@ -93,7 +93,8 @@ src_prepare() {
 	chromium_remove_language_paks
 	popd > /dev/null || die
 
-	epatch "${FILESDIR}"/vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch
+	epatch "${FILESDIR}"/vivaldi-snapshot-1.14.1072.3_p1-desktop.patch
+	epatch "${FILESDIR}"/vivaldi-snapshot-1.14.1072.3_p1-libffmpeg.patch
 
 	epatch_user
 }