gentoo resync : 21.12.2017

17 files changed, 30 insertions, 139 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index b389e2b57530..bcaf7920895f 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 55705468288b..e21588c9a454 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -17,7 +17,7 @@ DIST chromium-63.0.3239.84.tar.xz 534280828 BLAKE2B 08437f625a97ea49f274140a0444
 DIST chromium-64.0.3282.14.tar.xz 482211216 BLAKE2B 0ffc69478719903e39998fd6f908883dadcb32580a64b1e8a93b270dfb221cb89b674c7e288649de24e468a56da78cdbf35af9693cd24f5cba158789db609d30 SHA512 75b851be4bf4814e91a4e7a036b7aa78d0c76e138605a42ebe9ce8d2017a1f95eb2dc67bd73f4fa911ce2a28cec769a699f52c98c2b1b3a037321af517692c28
 DIST chromium-64.0.3282.24.tar.xz 482195676 BLAKE2B fdbe03cd5ee936913300beba18faf2a14b07a28a3904642bb4aef076c69914e1d058bde076e8f093836c4b5c548b7aa33c292b283f2807104ee5f5ebf87d6c91 SHA512 84bf757cf7a5ce08f81c4d2ef7b628b4bc393f457b81df8d86a4420a5cf68b61e01d5add6c6b221cbaf19f85b411228770d2c821e81cd8b0c16e27a455a96dff
 DIST chromium-65.0.3294.5.tar.xz 484687920 BLAKE2B 2d4d30ea83bfa0d5753eecd4ea735ec5d81097867b7c32c190853adee372c5032dac549c064fb22688555ef6231a3e2e43b274735883285f91a0a2d9c7a151ec SHA512 089bcc7eba7d5a2a964b5b6e94c7735653582cd6925325b9bdb2788bd4abb4b3cbc8c71f5c77004600864106a18da3fddda0adaa53ad54a96efe21498e45f23a
-EBUILD chromium-63.0.3239.108.ebuild 19794 BLAKE2B 9f53872a2d9a55447dc1ecc0d84f24108b3b02b047319296147780808c35cbd59e61ab53e7dfe69ce62c634b5cb2d054ab2520aded579efa2566553d6925f72f SHA512 484011ee1466804c6a95094e49a7c8d1023f40efd8e2c1d79a0f6ed588ca276ab5292238f30ee6b556a3962ed4bb0c3a1202239a31b9f54eef358c2122995342
+EBUILD chromium-63.0.3239.108.ebuild 19793 BLAKE2B c308aaa23701593e8f628698eff765716d51127e70d0b35692189b6f1fc4ae9bd6969e6865287637141a94685bce2c0038e4721177f36044003e68056f2290d4 SHA512 e983e0dd6e5d2281c271c620cd42d51c81c268458db17f3bf26fe96fb97b3e541473255dba870541761df05c5ef95d367a34a621591351a5b5f78a87fcce922c
 EBUILD chromium-63.0.3239.84.ebuild 19793 BLAKE2B c308aaa23701593e8f628698eff765716d51127e70d0b35692189b6f1fc4ae9bd6969e6865287637141a94685bce2c0038e4721177f36044003e68056f2290d4 SHA512 e983e0dd6e5d2281c271c620cd42d51c81c268458db17f3bf26fe96fb97b3e541473255dba870541761df05c5ef95d367a34a621591351a5b5f78a87fcce922c
 EBUILD chromium-64.0.3282.14.ebuild 19911 BLAKE2B a72ebcdb2614b0d2597b10cae01d69964df9525fa8417b7a48f0b6e5200eb8d58f25292a88c5fbd4efb3913bc5a21351f1aa3852c71784edb5a3de37935c028e SHA512 25e6f8f937724d751229d7986dd5ee7b82e479ffa95aa1d429f1519ab4db4857277266c97721fea1fe752d3ae5606bc631cefaf43688d7c2f0c9ed5e6e8bcee5
 EBUILD chromium-64.0.3282.24.ebuild 20052 BLAKE2B 6c8983cbba2db73f4cf0d445f39f12dd9e9b880990f701ac695421e9bad1296431747af2b1d3d1f90cd2d21eaf96b910cd274b47bf571af03e0abdb71a1b30b3 SHA512 fbe825d7ceee78a90943c539cfcdcacd33808a7be82180b2397d2ef5c09732e1d40acf1d534ba76fabdad2175bed04e47d23a381b140fc4fa922530a91c93529
diff --git a/www-client/chromium/chromium-63.0.3239.108.ebuild b/www-client/chromium/chromium-63.0.3239.108.ebuild
index c5e75dfa71e9..be37d445c4f1 100644
--- a/www-client/chromium/chromium-63.0.3239.108.ebuild
+++ b/www-client/chromium/chromium-63.0.3239.108.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index cf5ecafb47bf..5f7124a22782 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_64.0.3282.24-1_amd64.deb 52994522 BLAKE2B 9dd60e6bdf6977ced00ba47bc647e0cfe29f45fe30b81d5bfbc0406604c60245d28476da4b74210daf610e1c73ba8115e380a9fd3881f1f89afaa591ff97ebb5 SHA512 89c79bb3d1ee6eae8ed0823f79d6f90c644bb3032610f5b83ab1c8433755ca130e7e6455a479c1afdee70343095c891a0c0b10356a13c95b78b9f4411abf3660
-EBUILD google-chrome-beta-64.0.3282.24.ebuild 3559 BLAKE2B 5a1eb688323640ce81aaebd74215844ffe06ad88c85046aa633f1d412350d97f0c98004b82218c3314a087ddfe571938ccbb417f03d83e0824f0708a7961ab1e SHA512 51df0ed3d1dfab83ec82cf03238ca9d1edda85f647b77c8232b46716ebdb5156c28a0c7d2706efe5b9cca4ab825437ddd9be865ddd99726ef47094d54eda4adf
+DIST google-chrome-beta_64.0.3282.39-1_amd64.deb 52673146 BLAKE2B c7495a93235bce2994940b3ae1288631504b82d60830bed11b35e79ac446a41edaa2bc0a0ebbb832c34cbbe73802f941c934be526bbd76d09f4fb90935a42d5c SHA512 222c1879854c002506e05b28b866b4d2d9ed99fd4d9c9a497bead03a6bf4758966b075c9aad409446dbf9754150c796be1c0c3c03bc552ff97163b5723a18182
+EBUILD google-chrome-beta-64.0.3282.39.ebuild 3559 BLAKE2B 5a1eb688323640ce81aaebd74215844ffe06ad88c85046aa633f1d412350d97f0c98004b82218c3314a087ddfe571938ccbb417f03d83e0824f0708a7961ab1e SHA512 51df0ed3d1dfab83ec82cf03238ca9d1edda85f647b77c8232b46716ebdb5156c28a0c7d2706efe5b9cca4ab825437ddd9be865ddd99726ef47094d54eda4adf
 MISC metadata.xml 624 BLAKE2B 372623c9dbc8036c089252bb38922138513bb8ad9d485fb7ad33618dc531c8c08fa2c3d3ca68acc08cbef8b0b36d902b91ad0411bb75ec4b12a055b44a6eabf9 SHA512 318638d149ddf7c81310b8d1fc6e38525665ea5e3b7fc6830ed3b13547f80635e6a5fba60b60829187742ffc1217beaf7a72bcee2c6b76736316e004ad336786
diff --git a/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.24.ebuild b/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.39.ebuild
index ab556f06a5d3..ab556f06a5d3 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.24.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.39.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index e4c493e3f8d3..81fae8da92a2 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_65.0.3294.5-1_amd64.deb 53115364 BLAKE2B ece7e4f82aca38bca313abe9896393876a73aa2256166bddca407ca1f7dde99d6d8cecd8f8c94c03ce4425cc3b9cba77a10e7dba476f49b17abda05dcc072881 SHA512 3c1eee8e477df2dbed1540af818f76ece0454125cc22ecb8dcf57fad6c499fe4972da61bfdb5e0e77ee15b060db196461bebe183b6b3fb813629a28a997286eb
-EBUILD google-chrome-unstable-65.0.3294.5.ebuild 3585 BLAKE2B ec0a96ad744a6cdb6758e9f12ef046b4bbfd2161f50567ad40221fe723f28ae4fb1faf1603e29c81f829bf0e155755541ff5d0731b5f17559bdaa5eb73a6de08 SHA512 b4403921b9328fc48d59fd7f54a0f3b57e85f6023c7203fa64f86d3cd32fabbaba7cf8dd2c1dce91aa0d1fd814049d2e7b9aa0170eda19be26e818fbceacc5e3
+DIST google-chrome-unstable_65.0.3298.3-1_amd64.deb 52915002 BLAKE2B 47739a459311607d274eabad91b468f5f0bc9ebb9dcfa374359c6705ccdb167d45ebca4006faad9d3143b5bb608ccae0c9dfabc4240fa2c9fc44ca8059180ed5 SHA512 fefe6f12e617fa5fb2cae4e5b1cff72c84a7dc2c3a4d7c9fc4c5acc93892da2fbf57c3e2ffc231704c02d034975672e0f06db720dcf54e8c8f02e38706280e8a
+EBUILD google-chrome-unstable-65.0.3298.3.ebuild 3585 BLAKE2B ec0a96ad744a6cdb6758e9f12ef046b4bbfd2161f50567ad40221fe723f28ae4fb1faf1603e29c81f829bf0e155755541ff5d0731b5f17559bdaa5eb73a6de08 SHA512 b4403921b9328fc48d59fd7f54a0f3b57e85f6023c7203fa64f86d3cd32fabbaba7cf8dd2c1dce91aa0d1fd814049d2e7b9aa0170eda19be26e818fbceacc5e3
 MISC metadata.xml 624 BLAKE2B 372623c9dbc8036c089252bb38922138513bb8ad9d485fb7ad33618dc531c8c08fa2c3d3ca68acc08cbef8b0b36d902b91ad0411bb75ec4b12a055b44a6eabf9 SHA512 318638d149ddf7c81310b8d1fc6e38525665ea5e3b7fc6830ed3b13547f80635e6a5fba60b60829187742ffc1217beaf7a72bcee2c6b76736316e004ad336786
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-65.0.3294.5.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-65.0.3298.3.ebuild
index 22a757fa5892..22a757fa5892 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-65.0.3294.5.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-65.0.3298.3.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 6a963f96c695..dc8ce6163c2c 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,5 @@
-DIST opera-beta_50.0.2762.28_amd64.deb 52741080 BLAKE2B 68d9cd8c90312a1d69f6c9c15d75de7d2cc92d4746f46694f84fb080090382d911a7f14b16c4c24edd88314aa9ac850fb9125a9cf06254cebbf00a77dc471a84 SHA512 74e6f1f8feb7539a2a4c78ede571a6266c7c0a24c2eb33c21b45025b24e3f08b894181525a4d1b2ff96c0e350b5a65c46a55d6c0845f631db1c46f5592bcfb59
 DIST opera-beta_50.0.2762.35_amd64.deb 52040392 BLAKE2B e3f2ad44465dc2b3b1a27889d09bb592ad8346885b17093440bfe34d73af8ce0d5501b6888865387c50bf05321acc8cfe23a6aa1c30cf9a55fd0351e285537bc SHA512 0ef6f6a9c5b66fe1cd2a862a1167eece486bb31ee30016b6764788a27f341af02718868e2d593871d4d49d26981ddf7262e1e97999116e4738828426e02fcd37
-EBUILD opera-beta-50.0.2762.28.ebuild 2316 BLAKE2B 16b9a357d95903194b5f9571ca6c5a79edf67f97a42910f42ceed7dc9e452f97ae73d8f744869e1fcd278b545b5d82b7296a01c2d7b399ddcda9199e7d43f106 SHA512 7ad803b3570811d137781a5ed0345ceb6078cce52d0d689a11fccdcaddf8197edd3bfd14932f5bcfaff25372bc704cde9528d3bb238ced06e14893c3933e0cdf
+DIST opera-beta_50.0.2762.42_amd64.deb 52060614 BLAKE2B a27ec203f1b9b38f3ec21385ac54281c4d4b162a5c1b5d7e3f61fbaf7b472b1c1a9b9d40b142d75f4411c90807de6e395f9ef0569137b22bab6057fb06e50c67 SHA512 fa89268fafff3bc484f4b1031a8ade09efa90b53f20651a110468e07ae03008fa48b7c9177cde905c65d4e2eb566fa9f9c1284f70d737fdacc37d7a8d67cd1db
 EBUILD opera-beta-50.0.2762.35.ebuild 2316 BLAKE2B 16b9a357d95903194b5f9571ca6c5a79edf67f97a42910f42ceed7dc9e452f97ae73d8f744869e1fcd278b545b5d82b7296a01c2d7b399ddcda9199e7d43f106 SHA512 7ad803b3570811d137781a5ed0345ceb6078cce52d0d689a11fccdcaddf8197edd3bfd14932f5bcfaff25372bc704cde9528d3bb238ced06e14893c3933e0cdf
+EBUILD opera-beta-50.0.2762.42.ebuild 2316 BLAKE2B 16b9a357d95903194b5f9571ca6c5a79edf67f97a42910f42ceed7dc9e452f97ae73d8f744869e1fcd278b545b5d82b7296a01c2d7b399ddcda9199e7d43f106 SHA512 7ad803b3570811d137781a5ed0345ceb6078cce52d0d689a11fccdcaddf8197edd3bfd14932f5bcfaff25372bc704cde9528d3bb238ced06e14893c3933e0cdf
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-50.0.2762.28.ebuild b/www-client/opera-beta/opera-beta-50.0.2762.42.ebuild
index 96ac80993a41..96ac80993a41 100644
--- a/www-client/opera-beta/opera-beta-50.0.2762.28.ebuild
+++ b/www-client/opera-beta/opera-beta-50.0.2762.42.ebuild
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
index 4e95a065ef62..699a0675629c 100644
--- a/www-client/qupzilla/Manifest
+++ b/www-client/qupzilla/Manifest
@@ -1,10 +1,8 @@
 AUX qupzilla-2.1.2-openssl-1.1.0.patch 4631 BLAKE2B 27ede6f8ac9f198b147bf3eddecbe9f78c50dff050f3e9bd8565620847eec1cb6fb3c3f8164a51f7220b9365c275ce9ea4321e0e7e99976170748a75ef674c8c SHA512 0171a9d64c4202c3893767c962b7951d6f431d7e70a7de1385e80c097dd6d1e55fd77be8da3621a9d15cb6982a92d4049e0dc6058c00b7bf7fc90439d659479f
 DIST QupZilla-2.1.2.tar.xz 2767560 BLAKE2B 4d012f86618680a112c227d07d71c24d6fc2c517be63fe172abc99eb0c20e8b2756e2cc51049b0dff91e1739357121afe0b1e7328df372370dec969995447eb0 SHA512 d09a394ba70ae0f7f908940a26d6554a3706b6638c197d16b75e1e5855f76015c8e13b7155c40dacee3a38080a0c277d9410eaf07cf912dc4b295eafe1ff6343
-DIST QupZilla-2.2.1.tar.xz 2465248 BLAKE2B def052751ccd5e6947b671140462b7bb3765bc3448d490b76e133335e4da902ab6f704a098ba8bfc770909dc6898d3bd2d27e02abf727e2453559724be03f1ea SHA512 b98754d31657caede8ecd0402d543a5010d3f0c5515932e9c80512f5982400b2065840f1cd9be190cc73460798cb8138d7408c8c08a87541372b68e5b56cee06
 DIST QupZilla-2.2.2.tar.xz 2499180 BLAKE2B 4fda216aa9698e7185ecae6229f511e77c152454c33208966a1def9726ff097cdb198ad368b23606f756985ad8a5fea85269ebc030b49e0d74c48ca53ab044b1 SHA512 15d5b8c9fa1fa88ca8af49527068258eaec49181c3acf2142a6fbc59057e2f2765733fe51bc283bd7ce52c9815520ad5bc5185b5ee284b13139ab9706ea188b3
 DIST qupzilla-plugins-2016.05.02.tar.gz 425314 BLAKE2B c10f9f3fe17f36b91a77b4bdb15b3d0c63160c50b558ba2f180ec83b2d226b15baea51e9125e0c72d3960c2f99f8f3753d90c7eeb4b88eb07381da19bc3ea777 SHA512 b294ecb2372b3267603a43bc7412ab75d2cd29a8c4667331f0d2c74e3b0b99d0c2a005b9e4854c6d777894522bba9fb3b1607e85e8da6dcbaa760c9ddc6288f2
 DIST qupzilla-plugins-2017.03.26.tar.gz 430926 BLAKE2B d5db8c854886b1af8db20aaffe9a244600259d4f8cbc40890bf0f1075f790afe1a6e2ac19abe06c585eff0353127a3a7b1b1b79013bfc1b81bf5df750e5d9d20 SHA512 3b04b41208dddd25fd58937986cf12f2b521cf78a64380b915d46735ada3f4776f914056c5511daa781c89867d0309af7cbf833eb71dfa4b14b6b9ba25d80315
-EBUILD qupzilla-2.1.2.ebuild 3001 BLAKE2B d8e37ac6615f0c047556fe61e4c0d14e00bff8b36a3d24bb9f9d30b142731525ad614fb2d2da967b59645d2a6984ac0d221a20d30fe2991a8feb21b1e111c7ec SHA512 a3e1b61d21a035c8ffed67cd60369e68267778a2611d6ff4a28fc9606742a27c5253e476dd3d74d229ce83cd0293da62ad9da46235ab60d22ef60d27c6b68525
-EBUILD qupzilla-2.2.1.ebuild 3037 BLAKE2B 1fe496f6668b67b1504be621318a7c0a73690b7b5a61b899bd54cb3344f7d9edd50af02c33660b1da16ce9524eed8294f37c2774442a393b81418e850c715c2f SHA512 1083262c01d57a1774514c4ff11733767ab7574207559625b20d418bbf45e0f8e9248610b89f70a7fc66fb4f854ced0851fec845c9818fc752c343cf369fec52
+EBUILD qupzilla-2.1.2.ebuild 3107 BLAKE2B 759e2b8ca800b96a7132986b4c776f260b05c6397999351abaf624d3aeceb46433aa7f6de662b35d7fc4079ac775b379569bd087ed3ecf59ba9b780053a09462 SHA512 d3d945b8fc44e0e7b64867b6cc66f018640791745fbb6e67fe533cb397046ac133a72ddd256d86d232421366ebc6eda90295f22f1cf2279e5fe0707c33e6097d
 EBUILD qupzilla-2.2.2.ebuild 3043 BLAKE2B c93d8f6d4647b14aabf6f7b7585cd271765b2ecf39d5f8ff1315ad7ed3801d6536b1d39757d08bdcbd08fab4469314359dfc9afcbab81e9b730298c281bd1ef1 SHA512 e3aea1e4a26e53b73914a9eb15733b98ca4f59766cff6ac2b46bacb4b00dd54069610ac433dfbe37319c549e5b60e1b13af65e3edca8e7b4714e2cdbc2dc1d2f
 MISC metadata.xml 691 BLAKE2B 242030684387619d08dfc3aa46f7f0c82055bfac4693bf2e5f655d6d2762b026af5bc1f87ec05eb099d80fd48bde8df80f7deb6ac16263c4067fafd0aa389122 SHA512 585fed97ee3390094552cb5350c185dcdfaba1df7d5d3608cddbb6c05812223276b661121518ffce7921456983ee073aea58ada17ee6347d01a9e5559f75388d
diff --git a/www-client/qupzilla/qupzilla-2.1.2.ebuild b/www-client/qupzilla/qupzilla-2.1.2.ebuild
index c17924c3323c..2ea1fc82dbec 100644
--- a/www-client/qupzilla/qupzilla-2.1.2.ebuild
+++ b/www-client/qupzilla/qupzilla-2.1.2.ebuild
@@ -12,7 +12,7 @@ PLOCALES="ar_SA bg_BG ca_ES cs_CZ da_DK de_DE el_GR es_ES es_MX es_VE eu_ES
 PLUGINS_HASH='c332d306c0f6cf645c75eaf198d2fc5e12339e9e'
 PLUGINS_VERSION='2016.05.02' # if there are no updates, we can use the older archive
 
-inherit l10n qmake-utils
+inherit l10n qmake-utils xdg-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -107,3 +107,11 @@ src_install() {
 	emake INSTALL_ROOT="${D}" install
 	einstalldocs
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/www-client/qupzilla/qupzilla-2.2.1.ebuild b/www-client/qupzilla/qupzilla-2.2.1.ebuild
deleted file mode 100644
index 95346a2071bd..000000000000
--- a/www-client/qupzilla/qupzilla-2.2.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar_SA bg_BG ca_ES cs_CZ da_DK de_DE el_GR es_419 es_ES es_MX es_VE
-	eu_ES fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID is it_IT ja_JP
-	ka_GE lg lt lv_LV nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sr
-	sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn
-	zh_CN zh_HK zh_TW"
-
-PLUGINS_HASH="80fea7df7765fdf9c9c64fdb667052b25f1c0a22"
-PLUGINS_VERSION="2017.03.26" # if there are no updates, we can use the older archive
-
-inherit l10n qmake-utils xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/QupZilla/${PN}.git"
-else
-	MY_P=QupZilla-${PV}
-	SRC_URI="https://github.com/QupZilla/${PN}/releases/download/v${PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-DESCRIPTION="A cross-platform web browser using QtWebEngine"
-HOMEPAGE="https://www.qupzilla.com/"
-SRC_URI+=" https://github.com/QupZilla/${PN}-plugins/archive/${PLUGINS_HASH}.tar.gz -> ${PN}-plugins-${PLUGINS_VERSION}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="dbus debug gnome-keyring kwallet libressl nonblockdialogs"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.8:5
-	>=dev-qt/qtdeclarative-5.8:5[widgets]
-	>=dev-qt/qtgui-5.8:5
-	>=dev-qt/qtnetwork-5.8:5[ssl]
-	>=dev-qt/qtprintsupport-5.8:5
-	>=dev-qt/qtsql-5.8:5[sqlite]
-	>=dev-qt/qtwebchannel-5.8:5
-	>=dev-qt/qtwebengine-5.8:5[widgets]
-	>=dev-qt/qtwidgets-5.8:5
-	>=dev-qt/qtx11extras-5.8:5
-	x11-libs/libxcb:=
-	dbus? ( >=dev-qt/qtdbus-5.8:5 )
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	kwallet? ( kde-frameworks/kwallet:5 )
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/linguist-tools-5.8:5
-	>=dev-qt/qtconcurrent-5.8:5
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS BUILDING.md CHANGELOG FAQ README.md )
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_prepare() {
-	# get extra plugins into qupzilla build tree
-	mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_HASH}/plugins/* src/plugins/ || die
-
-	rm_loc() {
-		# remove localizations the user has not specified
-		sed -i -e "/${1}.ts/d" translations/translations.pri || die
-		rm translations/${1}.ts || die
-	}
-
-	# remove outdated prebuilt localizations
-	rm -rf bin/locale || die
-
-	# remove empty locale
-	rm translations/empty.ts || die
-
-	l10n_find_plocales_changes translations '' .ts
-	l10n_for_each_disabled_locale_do rm_loc
-
-	default
-}
-
-src_configure() {
-	# see BUILDING document for explanation of options
-	export \
-		QUPZILLA_PREFIX="${EPREFIX}/usr" \
-		USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)" \
-		DEBUG_BUILD=$(usex debug true '') \
-		DISABLE_DBUS=$(usex dbus '' true) \
-		GNOME_INTEGRATION=$(usex gnome-keyring true '') \
-		KDE_INTEGRATION=$(usex kwallet true '') \
-		NONBLOCK_JS_DIALOGS=$(usex nonblockdialogs true '')
-
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index afc3ca41ffe9..0ef1b934b11e 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,10 +1,10 @@
 AUX vivaldi-snapshot-1.13.997.3_p1-libffmpeg.patch 1164 BLAKE2B f62ac321731ae3237cd5cd67b17cb2027afc751f8d54b46b58f9f060ee5af67cd37501278a279424463d2d6e2b42c728e90f7d94f3cab39b41342decc7778bab SHA512 2a78bae6ee58a415029c0db0c7ebbdc11611d2e167da6fef21a6a76df66b88ac65f803f9aa8b1a22007709f435803a6c967e1a82249c6c42e8d9e1cfb2c114cb
-DIST vivaldi-snapshot-1.14.1038.3_p1-amd64.deb 50280622 BLAKE2B 4aa71d793d2fdfe4d35a4dbb401475a761b69c451bc6729b306f42e548c61b655017a723de0a1d1c114beb9792acac0d497d318d0a452e0ecab85f27f6b26f36 SHA512 e27b00629280dc8535488b6367122ca4416aa1ea27dad8f6cc231c9d05af6a4e3d548032fdd4e854955cddd512cdadef48aa627c10a6b33ae4d31db56598573a
-DIST vivaldi-snapshot-1.14.1038.3_p1-armhf.deb 46065648 BLAKE2B 6442142aafec2db84bff7df1bade96a1918eb3d3ea22c6c4b8585daab5c255ebe7fab2616938816c9fe94d306a3aa1b612e2a82f29af7a59957194b73fda8da7 SHA512 cbf042f97caa4f11281355e237eae1040cee5c7ab274d6a51a1445b4c1916aaca1693ee50b709efbfdbc46d037aaea25846d09f66b62a52849d7dfa99c641c4f
-DIST vivaldi-snapshot-1.14.1038.3_p1-i386.deb 51173448 BLAKE2B 1ade624b0b3de6b808d669290e070a283238269114450064395719705e77c8cccf52bc4cbfb6fff41cb9c000c22f168583ad4e98a5ef4b529f3dcf1cb5125253 SHA512 a3a35ca8bdaa29b63b79c85930a379a31dd9ef7fba877c464d105f9eae140255d4a984bac6a1910396be97c766b14e32529ff8774a24e9bf81ce1102e4068691
 DIST vivaldi-snapshot-1.14.1042.3_p1-amd64.deb 50287094 BLAKE2B 9c89f00576a555c1180d080616f36a9259fc7f00319bccc55150c4a34b11980e7fdf37fcf2ec93319a87666a910238185771ab37bc2c5f79927ebdbf1b6bd4e6 SHA512 ce28ac3a0f9d7767527f919973f3fb1523c4ef4088b873479a969a38b5fcaa7f38bfb100867fbf91f11bce5cfc7b68746bef11874b4696307c526ab4a3156c71
 DIST vivaldi-snapshot-1.14.1042.3_p1-armhf.deb 46091200 BLAKE2B e368823b206ae432659cd23fd349088054df0993ed37e92125f7c48a7229a63530ba145cb0f553aa68f5438ecb6fd70a473ebcfd8de4bc0c90925417147c049d SHA512 51bf9736ac125610242282be493b584dd01e84fd8bbb79b418c739478f04f3d53db949de801b5366b26c2b265c7a98b224420cd169fcd53563c584cd50527c0b
 DIST vivaldi-snapshot-1.14.1042.3_p1-i386.deb 51181200 BLAKE2B ccea3f9ea3d23cb8f944c49b1629b06081db72615216d244316066dd57f18e76e68b6203c0b0355cfc1add114cc7ede3e25e9fb75d3b7f7c635b29dd584fd556 SHA512 0c311577e336c5f95549a3d8d25259d468b6af10bbfb66c30fc7cd5d5837bf33bff9592ba7cdc043d66050e793a21e0e2d670657a397cd3ad132a61bcba4e0ac
-EBUILD vivaldi-snapshot-1.14.1038.3_p1.ebuild 2627 BLAKE2B 69eaf8281f6cd8a3ad729a180492f6ec7bf73a4b9ed3109cd84c5d9bea22bc2dc5ebc9f2e3fb72ef4036b5beb744cefdc32ad145b8429e9cbfed300066ac4f6a SHA512 4b8321a07d5cc427c84bf99aa41eebcb2c137868d3934ca482873702d1e08f50cfc9ddc5aee980fe098b803c7ecd66b573f1bcebb6912fce5a6b597efe11c61a
-EBUILD vivaldi-snapshot-1.14.1042.3_p1.ebuild 2627 BLAKE2B 69eaf8281f6cd8a3ad729a180492f6ec7bf73a4b9ed3109cd84c5d9bea22bc2dc5ebc9f2e3fb72ef4036b5beb744cefdc32ad145b8429e9cbfed300066ac4f6a SHA512 4b8321a07d5cc427c84bf99aa41eebcb2c137868d3934ca482873702d1e08f50cfc9ddc5aee980fe098b803c7ecd66b573f1bcebb6912fce5a6b597efe11c61a
+DIST vivaldi-snapshot-1.14.1047.3_p1-amd64.deb 50460060 BLAKE2B 3e44818b3cfb0b1b201dcdff6a74671c62b2cca682965e97515b87a70d8f3dc2b2acaf1166071190f3747d457532db47b4342b9c2bb838a1f3069147ca8e38d7 SHA512 8127a388ae9cdaf52df27bb99ecddf3d8ffc22b8baa6e57b4bed69bce116dd8cb461430c3432bdc61c28bb967d33ab182156271fd0ac1c22ae3d8b72f6b76840
+DIST vivaldi-snapshot-1.14.1047.3_p1-armhf.deb 46241108 BLAKE2B 83862abdb6e92d836ded87207b4d2602a5a3e347f143b062a926181041d5ae6556962c879b7d03d195946ba0e9625b2126e9ec78215bbe3a2b59c7a16bbc460c SHA512 725e4f05694c2cea36cbe143f62d8f7019c0373004815a0de609ace3f59ac0ca98ac97cb1bc65744f70bdd1d1bd4eec9ff8c0d890e6263de23e9ac67a0ae081e
+DIST vivaldi-snapshot-1.14.1047.3_p1-i386.deb 51347870 BLAKE2B 72dfa577d2f39bebe49a4d834e405bfe5e3b4391aea65639b7535af986ab426214347970f70d460f288fe1c07d2799422e7ae1f262709b22eb7c0cb730f87fc3 SHA512 8bd7e036db5776370276e638c4c42b4e2d89ab11fa3840103bdb68d765b9e52ad65174bb516ac8413b415bbc5aa9da3f5d951d5f83c2e232e35def8b85bcff84
+EBUILD vivaldi-snapshot-1.14.1042.3_p1.ebuild 2630 BLAKE2B 1700bdc47526549ecbf7fee143a2d78ccf8aeb885ed1be9337c2a99a51f4b277e0fc8be1eeca052b8ed7e0ae9e95d8d954447d347779d54d6a2ff85fb36b3a53 SHA512 e4720d81df78ce5e65e4937789f0028613eee03353df3d7c41752f7592df9faf2084354d05d801afc6c05f87c4f81d6fde7650ee386cdad06a03cceaa2eb526b
+EBUILD vivaldi-snapshot-1.14.1047.3_p1.ebuild 2630 BLAKE2B 1700bdc47526549ecbf7fee143a2d78ccf8aeb885ed1be9337c2a99a51f4b277e0fc8be1eeca052b8ed7e0ae9e95d8d954447d347779d54d6a2ff85fb36b3a53 SHA512 e4720d81df78ce5e65e4937789f0028613eee03353df3d7c41752f7592df9faf2084354d05d801afc6c05f87c4f81d6fde7650ee386cdad06a03cceaa2eb526b
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1042.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1042.3_p1.ebuild
index 2297488b834f..7be649a2b851 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1042.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1042.3_p1.ebuild
@@ -28,16 +28,16 @@ DEPEND="
 	virtual/libiconv
 "
 RDEPEND="
+	>=dev-libs/openssl-1.0.1:0
 	dev-libs/expat
 	dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
-	>=dev-libs/openssl-1.0.1:0
 	gnome-base/gconf:2
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/freetype
-	net-misc/curl
+	media-libs/speex
 	net-print/cups
 	sys-apps/dbus
 	sys-libs/libcap
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1038.3_p1.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1047.3_p1.ebuild
index 2297488b834f..7be649a2b851 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1038.3_p1.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-1.14.1047.3_p1.ebuild
@@ -28,16 +28,16 @@ DEPEND="
 	virtual/libiconv
 "
 RDEPEND="
+	>=dev-libs/openssl-1.0.1:0
 	dev-libs/expat
 	dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
-	>=dev-libs/openssl-1.0.1:0
 	gnome-base/gconf:2
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/freetype
-	net-misc/curl
+	media-libs/speex
 	net-print/cups
 	sys-apps/dbus
 	sys-libs/libcap
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 1823c3aa64f0..eefe73b04458 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -2,5 +2,5 @@ AUX vivaldi-1.13.1008.32_p1-libffmpeg.patch 1128 BLAKE2B c6e8dccf5625128ddc6d671
 DIST vivaldi-1.13.1008.36_p1-amd64.deb 49264956 BLAKE2B c262a9e5bf247f69b57def5ebf3422ab82c1d6f1a9a580499ceff95abe1bd14c2ca507bbe4686bd33c6503d7817aa30665660017a4c07578a2c169e8bd955551 SHA512 0a4c51a347a9936a695a815fd303d93a650c967bcc40dde56dc3a278436a38f39643080dff25f702c2acd4338eef79db4e15474c95fb65248c358fd1c346ce62
 DIST vivaldi-1.13.1008.36_p1-armhf.deb 45159082 BLAKE2B a5b2efa5dca3a9a65ee872f793279e5f44cd7c0c3d28310265cbd7241c5bae387b51d5f54070381ed25b634444336273b3a0cdaaf2c9c15d858d6681b875e221 SHA512 b04cc01713c535d8d5efbc11567e900d9f2dbaadec8885082f5bee770093cc024b089d34fc11906cc67171065b1ac2e7f514bbffce9fbfe673dd13b83f4dfc40
 DIST vivaldi-1.13.1008.36_p1-i386.deb 50137690 BLAKE2B 4e4e36bfd830076a5236d5a1a5711672f0235862f74186dcf9e5c1ed43b8727051fe86dd119afb3fc6043309844eddd888daa563c6276b1fff5ccd200f6b77de SHA512 abf2d654678c8194dc6a5ef7a0b856ba81320c90648268ffcd05aed9407053dfc99ce359a6ecfc0f32455fdb60cd76003819a9c900ee51e03baed409685f8af2
-EBUILD vivaldi-1.13.1008.36_p1.ebuild 2979 BLAKE2B 3583d33121aecefa73418e284e5bb32ee883ce4fa9757685c8eb08bebd31e31dce1e212cefc110e98b821a285b931da2c000fc554008cc98eb79e9e981c737fa SHA512 1cadf022023f3a123b6398c6e01acb2e92f8f5cfeb517599faec413739c455a661afc36cef69d6e6ce1988426e166163bda13ffe44abdcccf62ee0283f0b6ddc
+EBUILD vivaldi-1.13.1008.36_p1.ebuild 2982 BLAKE2B 79b9bd6a7a03c6e7afb92418712e79e1de6205afee64125148898c2a1156ba5f8573c1aee6b11356a7820767cfd61aebe6c47d0f67cc338e183e3f9235afb3eb SHA512 311853be92be4e47ee916f2c30884243f8a19d28bbe615b75b567902b311d8c2e01c22fc7488257744f96aa87bf85227efd083f136aeb72d2b28ae8ff60d4535
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/vivaldi/vivaldi-1.13.1008.36_p1.ebuild b/www-client/vivaldi/vivaldi-1.13.1008.36_p1.ebuild
index fd79ed2a7a05..9963ab905637 100644
--- a/www-client/vivaldi/vivaldi-1.13.1008.36_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.13.1008.36_p1.ebuild
@@ -32,16 +32,16 @@ DEPEND="
 	virtual/libiconv
 "
 RDEPEND="
+	>=dev-libs/openssl-1.0.1:0
 	dev-libs/expat
 	dev-libs/glib:2
 	dev-libs/nspr
 	dev-libs/nss
-	>=dev-libs/openssl-1.0.1:0
 	gnome-base/gconf:2
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/freetype
-	net-misc/curl
+	media-libs/speex
 	net-print/cups
 	sys-apps/dbus
 	sys-libs/libcap