gentoo resync : 13.10.2019

14 files changed, 11 insertions, 257 deletions

diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 8e1680d967f1..7c666f4b1607 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index aab41c088ddd..b3a1cd464ec8 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,9 +1,9 @@
 AUX mms.cfg 4420 BLAKE2B 4557315bfa6f8edb6c8b28907065cdac3771175bd36a8ce2b6e72f0e1f0af20a7bb1ea8abb67f5c7b16fcaa7dd81c3eb89f926957d2ae5fffd499a7e6e709354 SHA512 597380071a06176f09df1a56cba24e83a74990c175fe9f167f026eacbf01e66a083d2389ff399ead0a39654a40ae636f8459feed2d6012e51e65c5407fe7fdbd
 AUX pepper-flash 151 BLAKE2B ab58f8d7dd307fea0d53b7f58887e3caeef8913940d6bfb662a42cc1f475ec59009998898e991d7a82d55a26ec1b2fbbc8b2a626fb8c9ba0d2da1e1735ab26ac SHA512 f20176b9567097482c3b1fdd062affb33a69b671f6298a98cd58e03ca80dd01bada4126ac5fd940fddc53a097669f52d4b8bba7850daf211e11dc24cc4d97eb1
 AUX pepper-flash-r1 143 BLAKE2B 049f7ec4e3df5fbdaa62e40acf8d21d42f61789c6d9ecde64f300df3d3c51f2b5580fb571ebbf172d590799801c632a2eb4daa01dd86e318441719ff6412f3ed SHA512 e4e1c1f204af1e5ce531dd43a22b4cd08e8def1099bba88ac96af09bd0879dfbb6383653ec85d5d199d418098e4b17d71998bee5a9fb5bb7bd8873432a4f66ee
-DIST adobe-flash-32.0.0.255-npapi.i386.tar.gz 8538367 BLAKE2B 2a2a1ee2afe690b78a7ef3ce8af26db823b7299ae46bc66ee6a2d0940262ca6c2b3b42c319321bcf5e91bca2f133d9d1d3faa64637dcb8a5a5fbb26bfb0fee04 SHA512 3f9f42e3eb07b7667e9b0da8582ad3687c1e082cceda34eb855c4b9a9a17b925d0d75eb2e4819fae9138e6b8313165a55fa474a45147fa907fc6286302f4bb88
-DIST adobe-flash-32.0.0.255-npapi.x86_64.tar.gz 9053852 BLAKE2B 4305ca7cf9171270162aed537cf8308eb4bcb6d80621a93c4c80af4093c681b84febf7927b9dba0f8b19a6f9237d4be349ef3029892e0d8166f2c59e6b841bcf SHA512 28817f6d3d2f618f750cd56f98ef0bac04e2a35498f1b259f61df1001efa4d0b1f49cd9975c8641fb4bc6c6ef32b97484d5f9ab0095261f58454b3f1d0bab7ec
-DIST adobe-flash-32.0.0.255-ppapi.i386.tar.gz 8574530 BLAKE2B ce413404762b43fa020bca9e7e404bdb4a8f3c8f1325824e8aca18aca6ed8256c0995229df2b693f87725869f4a45fe86dfb2624ff07046e16d309dad63fdab8 SHA512 c39377f3aabf5e7cd9838eb848021296968153cde93d50d9bc46205926ebda96bb5048be1ee0fce99d364d74548d57e77096371afe51bbb4cc4c98131169865c
-DIST adobe-flash-32.0.0.255-ppapi.x86_64.tar.gz 9491821 BLAKE2B 4d1a03f90413b0183d9560199e24383e252628cf6ca4a96a4da47206503461f00188647f3acb4e3715af62707bc98259654ab7b7a32ddba577fdd54fc388a9a0 SHA512 e17ba6499f823fdd7a11a805abba1655ac8683b292ce198124123ca3e2cf6cf36c5948c01b69fbd6ca7671d06e532983b31e3000a24f27ff75e62776b6b201e4
-EBUILD adobe-flash-32.0.0.255.ebuild 3667 BLAKE2B 99fb07d369e316547ac2109da1c6b6aa73b4f7279f051258033b6e17f17673e94dea76806bf500684b8bc592928980871aca769695ef46ad133da4308087ecc7 SHA512 1db4624f7810765e9ac22f462136d979a02ae8e28e6b01096208a8cf8f0e6f04f7d88ebb7cd38ebdd81f9f025b8cf3a2e0b6fd6fb41e2ffeda1a67f876e6e55c
+DIST adobe-flash-32.0.0.270-npapi.i386.tar.gz 8537431 BLAKE2B 807148ed3b307dfaac2ca2fbfff0f699426fb04c4fa25b635e7c9595452deae6c1479bc6d595b4ce5ea55af429004273fc47af21678140cc69743568b181834c SHA512 f26a48a0d3d29d2b6dd4e02f8a0ddf8633c72d4a9556ad65def61ec7f498c3c6ac79276d7ab16eb95c79f501dc8e38a460e7d63a5cd73bf9cf31630deda1f64c
+DIST adobe-flash-32.0.0.270-npapi.x86_64.tar.gz 9053678 BLAKE2B ad4a4d89c0da9cedcfa30d8175e1e66c4e01f338fb708b2bcaf19671d624fcc222222c6315ebabf7dc524ab3b4c540a5f8f4237e0b5dcab2d3f472bb8abe6c70 SHA512 b7170a28a271d2080824727d1e2500633cef6798d38a4937656de8be99e7829a6fd8033491abe874c74c913336ab19dc013329aa51511c5a4ca9c31574b72ccf
+DIST adobe-flash-32.0.0.270-ppapi.i386.tar.gz 8574381 BLAKE2B 83e5f472e296bb32a27ff3de273fa5b81811488b7caf574b64840910ff76b85d9860e44c952539a105ec3706a7e278fc8d3a943a74c03c329be1a974ad4bb14d SHA512 6c283b5d73f78689b465cf2302f3516059d82a0dc4542e21994dc9ff775fb8a993bd40d883919a620462b47866b38740da8f778a6c8e0b7b074fa72570d27ec2
+DIST adobe-flash-32.0.0.270-ppapi.x86_64.tar.gz 9491644 BLAKE2B 11f0af7a9f08072cf9e6014e5f567aa29bd6d061a5f19907563944270ce41dcdfc296ea996d165ed579acfa792e6207191e8bc4a3e4ec035187942289badab23 SHA512 6245f03e72a06e912ca8cf514f7a6cec1aee1dfc1f26208ac0c8dcf60939253320cfe565de9470a64cc0a2a0cc271cdb21e9c24a4b4669ec746252e9a1fbe6a1
+EBUILD adobe-flash-32.0.0.270.ebuild 3667 BLAKE2B 99fb07d369e316547ac2109da1c6b6aa73b4f7279f051258033b6e17f17673e94dea76806bf500684b8bc592928980871aca769695ef46ad133da4308087ecc7 SHA512 1db4624f7810765e9ac22f462136d979a02ae8e28e6b01096208a8cf8f0e6f04f7d88ebb7cd38ebdd81f9f025b8cf3a2e0b6fd6fb41e2ffeda1a67f876e6e55c
 MISC metadata.xml 552 BLAKE2B 56ec8c5f43e9624c4102f52834b63855be35d064ce05bfbc866af225fb8e60cf1b83e02c9917b474183b81cad9e4ecfba7595d8de7fa94974824d2a7f4de302d SHA512 0f84cf3e517eb92f73629e6a157a2999f409fa6dea40682e2248edeb957e5bc6f5228c49aebdc3b5d434d0fd8f717a19c793aee8776397871e1bc5ebf8cf7fa1
diff --git a/www-plugins/adobe-flash/adobe-flash-32.0.0.255.ebuild b/www-plugins/adobe-flash/adobe-flash-32.0.0.270.ebuild
index 49306f98b320..49306f98b320 100644
--- a/www-plugins/adobe-flash/adobe-flash-32.0.0.255.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-32.0.0.270.ebuild
diff --git a/www-plugins/browserpass/Manifest b/www-plugins/browserpass/Manifest
index 506bb1ed9dcb..fc7f5108ccbe 100644
--- a/www-plugins/browserpass/Manifest
+++ b/www-plugins/browserpass/Manifest
@@ -1,7 +1,3 @@
-DIST browserpass-2.0.13.tar.gz 180424 BLAKE2B e2a1796edf3b037553cb9bd33f072cd25953d8262fa584c371c3df638c77fc352953c698963325a5cee9b29c81cc010ded72bb31abac9460603796f4a95267ed SHA512 8d28144aef061770f11d7ba288dfa82f8873a263b8ccff235e26e83c55700e5ed0210dec2c2fb45751f3ad15d1894503407ec901d272783b98c466d74d9156f0
-DIST browserpass-2.0.22.tar.gz 49730 BLAKE2B a37d55a7b2a162a54931a3dde53b16e6c4d067f92dad129e92664dac726c3171938d5da94fe45c64227f4e4a860a12d0cdbb1aa147942f0199c2f4b9bed5fd7a SHA512 f3c19df72afd1387d7142b5e818dfe95a730c906277be0f16522986f387f659eb4a9decaf54eef5b6649ddc618d93b055c99b594fc4b949ce09a38cf2e6d9525
 DIST browserpass-3.0.6.tar.gz 17055 BLAKE2B aa2881631db8cc7f54f690cd56101c3e470528d990eed51b15aab6b834f63d4b9f576ee4e101dd61a6013ce25644058bfcc3673aaa037ce182c331754b27bddb SHA512 48cc93843afed5dc0df4f72956df44b325d6c772ad232d8faa2315c4d8b716eda9b030601e011b280445e0b01528f413e5b19818ad89cd7bcb06f4a1f4f9d3f4
-EBUILD browserpass-2.0.13.ebuild 1267 BLAKE2B 1e6c1480fd6d34c5e7c3f29fe81e354c69d3772f46a286e533341a5b67bc0417c28d80d0d8e714ff0003eda2f059d212264d088b8616f239a8de2471d584d60c SHA512 ccd9d82e7bd208b1149c08e599bd17cead1dfe65fc6614475e9a08196b96e00294d3c9e56690126716a6c6be15f49889f6dabefdad33bca6115b07bb6f0281b8
-EBUILD browserpass-2.0.22.ebuild 1377 BLAKE2B 417aede03579d7acc5cd984d777f68e03df21f67874e2d45fbbc261b77eeea0b6d4051c911a0cb3c169da38b745609b581a3d74d8e72b51c7d5248d58bfa1bde SHA512 4e68e4225979f9209d6b055b1fd2559be64a7032a663d0a6ff5c7bc86ae7cbc30f41084d533c598d646134381647728944f9283ac7c404bc81d1a0b42c6a6e1d
 EBUILD browserpass-3.0.6.ebuild 1452 BLAKE2B d7125291725c1b5580c2d790e9294cfb69dae8fc0b69fd7eb9473ff2a74b5122b2b96fb224122e8365a017346d1a37ebeb5982f193fef6164a6301255bbfef16 SHA512 4f12769490c6bd3efad5ab211de01c1fa1387a0b9905fe792500c92bb504a8f22aae40bf152176a5edeea4a9cd6eaf49939772891b171f22164b5dea5493693b
 MISC metadata.xml 246 BLAKE2B c7559c694569e2eb079aa44ab82aac05dd7218624519133b1d1de233f6d4bce0872ada012e00dc369051e9685d9a25d314c05318d1b109ee81945dd739da51df SHA512 0d07f784095273f14c7d63a215a76c84fec302e6e52717f0e47c29916aa90149239dfe7ed3227a42e2863226e4448d8a2e8321ccc589ad6d9f725731b45559a2
diff --git a/www-plugins/browserpass/browserpass-2.0.13.ebuild b/www-plugins/browserpass/browserpass-2.0.13.ebuild
deleted file mode 100644
index 773137f96685..000000000000
--- a/www-plugins/browserpass/browserpass-2.0.13.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/dannyvankooten/browserpass
-
-if [[ ${PV} == 9999 ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="WebExtension host binary for pass, a UNIX password manager"
-HOMEPAGE="https://github.com/dannyvankooten/browserpass"
-LICENSE="MIT"
-SLOT="0"
-RDEPEND="app-crypt/gnupg"
-DEPEND="${RDEPEND}
-	dev-go/fuzzy:=
-	dev-go/twofactor:=
-	dev-go/zglob:="
-
-DOCS=( CONTRIBUTING.md README.md )
-
-src_compile() {
-	EGO_PN="${EGO_PN}/cmd/browserpass" golang-build_src_compile
-
-	pushd "src/${EGO_PN}" >/dev/null || die
-	sed -e 's|%%replace%%|'${EPREFIX}'/usr/libexec/browserpass|' \
-		-i firefox/host.json chrome/host.json || die
-	popd >/dev/null || die
-}
-
-src_install() {
-	exeinto /usr/libexec
-	doexe browserpass
-
-	pushd "src/${EGO_PN}" >/dev/null || die
-	insinto /usr/$(get_libdir)/mozilla/native-messaging-hosts
-	newins firefox/host.json com.dannyvankooten.browserpass.json
-
-	insinto /etc/chromium/native-messaging-hosts
-	newins chrome/host.json com.dannyvankooten.browserpass.json
-
-	einstalldocs
-	popd >/dev/null || die
-}
diff --git a/www-plugins/browserpass/browserpass-2.0.22.ebuild b/www-plugins/browserpass/browserpass-2.0.22.ebuild
deleted file mode 100644
index 7107e7c52538..000000000000
--- a/www-plugins/browserpass/browserpass-2.0.22.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGO_PN=github.com/dannyvankooten/browserpass
-
-if [[ ${PV} == 9999 ]]; then
-	inherit golang-vcs
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	inherit golang-vcs-snapshot
-fi
-inherit golang-build
-
-DESCRIPTION="WebExtension host binary for pass, a UNIX password manager"
-HOMEPAGE="https://github.com/dannyvankooten/browserpass"
-LICENSE="MIT"
-SLOT="0"
-RDEPEND="app-crypt/gnupg"
-DEPEND="${RDEPEND}
-	dev-go/fuzzy:=
-	dev-go/twofactor:=
-	dev-go/zglob:="
-
-DOCS=( CONTRIBUTING.md README.md )
-
-src_compile() {
-	EGO_PN="${EGO_PN}/cmd/browserpass" golang-build_src_compile
-
-	pushd "src/${EGO_PN}" >/dev/null || die
-	sed -e 's|%%replace%%|'${EPREFIX}'/usr/libexec/browserpass|' \
-		-i firefox/host.json chrome/host.json || die
-	popd >/dev/null || die
-}
-
-src_install() {
-	exeinto /usr/libexec
-	doexe browserpass
-
-	pushd "src/${EGO_PN}" >/dev/null || die
-	insinto /usr/$(get_libdir)/mozilla/native-messaging-hosts
-	newins firefox/host.json com.dannyvankooten.browserpass.json
-
-	insinto /etc/chromium/native-messaging-hosts
-	newins chrome/host.json com.dannyvankooten.browserpass.json
-
-	insinto /etc/opt/chrome/native-messaging-hosts
-	newins chrome/host.json com.dannyvankooten.browserpass.json
-
-	einstalldocs
-	popd >/dev/null || die
-}
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 7e1439b2193c..9318ff026430 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,16 +1,7 @@
-<<<<<<< HEAD
-DIST google-chrome-beta_78.0.3904.21-1_amd64.deb 64127558 BLAKE2B 6be143cdfeed71a2af35bb3e899fe274d35ea85c735ed4e8b4ed249c15d06379a496668de060c25c95043e4675dc8e45922ef6de4f9468c837864fd39b1124b3 SHA512 70f86d835b181edfe7a350ccb5b6c7813744cf900521c589e8c45434ec4c5540e2ef21f2b77f169c918f817f921d874b2e70c2502e1b2412f2b89ebfbb7cddce
-DIST google-chrome-stable_77.0.3865.90-1_amd64.deb 61065690 BLAKE2B 7a0895b23ab0a09a090485445db794a11168e89730ccff0f2bf3b9415d161c57fa46966df08e70e831de59ba98935c4b673cdfab3aec79f91de95f41ef3797de SHA512 24555110d9638bb090fae97feffb5ff57b1322b101017bc1ac65be67fe5db8508105876cd6b6ea3fcb569d018a79e00511810019b2a36a1a8f59465b30939e5f
-DIST google-chrome-unstable_78.0.3904.17-1_amd64.deb 64972850 BLAKE2B 88812fa32376b4dbc85b8dfbd38d30ab592c5eb01c57a4230d451b5855565addeb3b2bfb7e59b7cb622dc24bea67d0ab58db51ba6e38642d54f62f9b9ff3fc4e SHA512 edd2599acea92b73e912b8d8ec95549a29af16c636b6ec38a74ca464dcdbe6e46e63c34a74d0135a4d34fc6c91d3e89eee25d078f0b130b905cac67c1ed4037f
-EBUILD chrome-binary-plugins-77.0.3865.90.ebuild 1359 BLAKE2B f5e24182c82dcc28b0d9b5de2d98a21d553b2d07e741842313fe580401dfaa9e035106b4b33f829936a987af013a81fa0286d1091779b7cd30c2793057150866 SHA512 cc16adb46e9082046c34789f3980dfcc421c683112ba12b9ca22cf314660b0dec298a3dd6ecd0e55e4430cf0f8a9d817b4663a71bd29665da7689ddf8c8a92fb
-EBUILD chrome-binary-plugins-78.0.3904.17_alpha.ebuild 1210 BLAKE2B d8984746fbd7b44f301211b11ddeba263a2e161f1f3b92092ce9f8df6a10a0b9f3917d02a8b89a036f432c0370d4ecba0575aade245d0502bdf533ae08161e64 SHA512 2fbc95ef6c45317ba2dff47e04faa7a52710c5b9e020518b3e05329b28dffd49c00dc1210b6954cbb9bb1a0ae650c54716cdaacaeca5997f9edba53b6ac5cacd
-EBUILD chrome-binary-plugins-78.0.3904.21_beta.ebuild 1210 BLAKE2B d8984746fbd7b44f301211b11ddeba263a2e161f1f3b92092ce9f8df6a10a0b9f3917d02a8b89a036f432c0370d4ecba0575aade245d0502bdf533ae08161e64 SHA512 2fbc95ef6c45317ba2dff47e04faa7a52710c5b9e020518b3e05329b28dffd49c00dc1210b6954cbb9bb1a0ae650c54716cdaacaeca5997f9edba53b6ac5cacd
-=======
-DIST google-chrome-beta_78.0.3904.34-1_amd64.deb 64476112 BLAKE2B c7a97ac3c6035101cc98b15f1df006267e9cd6d6449e35f50832db3df26781a6adf4c38e3ae8bce22673f99a61aed7cbfe26caec6aec84dd1654f4401be2051e SHA512 5fb7bc112d10c0909d9c4cb5e9432bd4fbb4384d29cd509d87f6041ab6dd61ebdb7dbd2526602aef01ae67a05e569a2e884e1cea1c9f298ee9529d4618ea5e3e
-DIST google-chrome-stable_77.0.3865.90-1_amd64.deb 61065690 BLAKE2B 7a0895b23ab0a09a090485445db794a11168e89730ccff0f2bf3b9415d161c57fa46966df08e70e831de59ba98935c4b673cdfab3aec79f91de95f41ef3797de SHA512 24555110d9638bb090fae97feffb5ff57b1322b101017bc1ac65be67fe5db8508105876cd6b6ea3fcb569d018a79e00511810019b2a36a1a8f59465b30939e5f
-DIST google-chrome-unstable_79.0.3921.0-1_amd64.deb 65310386 BLAKE2B dbab67768d7fd0fe5fcef6073dbb6ad6891831812e2adf04974ed7820ab01201104889992df4c491a497be2ceda16b858f9b916358b55f3e58b547489c3ee97a SHA512 71c1bd003aa0bc80b477d1b47e33890f26f8c6a8aa2822d4da5f70c736384e884f04be1583daa2b27ecbb21b79d9b16eabceffdf0f98d691f84ec64bbf4fa73a
-EBUILD chrome-binary-plugins-77.0.3865.90.ebuild 1359 BLAKE2B f5e24182c82dcc28b0d9b5de2d98a21d553b2d07e741842313fe580401dfaa9e035106b4b33f829936a987af013a81fa0286d1091779b7cd30c2793057150866 SHA512 cc16adb46e9082046c34789f3980dfcc421c683112ba12b9ca22cf314660b0dec298a3dd6ecd0e55e4430cf0f8a9d817b4663a71bd29665da7689ddf8c8a92fb
-EBUILD chrome-binary-plugins-78.0.3904.34_beta.ebuild 1210 BLAKE2B d8984746fbd7b44f301211b11ddeba263a2e161f1f3b92092ce9f8df6a10a0b9f3917d02a8b89a036f432c0370d4ecba0575aade245d0502bdf533ae08161e64 SHA512 2fbc95ef6c45317ba2dff47e04faa7a52710c5b9e020518b3e05329b28dffd49c00dc1210b6954cbb9bb1a0ae650c54716cdaacaeca5997f9edba53b6ac5cacd
-EBUILD chrome-binary-plugins-79.0.3921.0_alpha.ebuild 1210 BLAKE2B d8984746fbd7b44f301211b11ddeba263a2e161f1f3b92092ce9f8df6a10a0b9f3917d02a8b89a036f432c0370d4ecba0575aade245d0502bdf533ae08161e64 SHA512 2fbc95ef6c45317ba2dff47e04faa7a52710c5b9e020518b3e05329b28dffd49c00dc1210b6954cbb9bb1a0ae650c54716cdaacaeca5997f9edba53b6ac5cacd
->>>>>>> next
+DIST google-chrome-beta_78.0.3904.50-1_amd64.deb 64518778 BLAKE2B 3f41a7ec429ab7447fdab4d6b9fd434d0eb1875bdd4a481684a8f77c1796117f686a8d664f0fcf9ee992749f8ca296ca67126940323aefe23987211bcc48e96e SHA512 6994da44680b9b58d00d7b35b8bdcbda9dff33dbbc3654e26d7686c5fac38c0fd40a2e728af44a826dc0a3a0ba32c8629819b7a6955faedd9b1e3adfbc6d8f74
+DIST google-chrome-stable_77.0.3865.120-1_amd64.deb 61063428 BLAKE2B 00027ec599a331f662187206f147ecbebea03ef5d77aff6fa5ab3ada25731de254647df41abe592b68de7ff50671fea6bed9a64edb9203889155d5deff6a7921 SHA512 5df8ce8270197d6531ddd4372fd370bccaee0a95edb85887aea010fe55bfb415039bcd2b9c234906b23b7d81a3b97ea4d9199f03b48b9c6c4303f1ae2c7f9818
+DIST google-chrome-unstable_79.0.3938.0-1_amd64.deb 65411420 BLAKE2B 5d478bf212a1815b3f6e6dc7b1f2c33b20f50001acec500a1345c60a88c0e8d5f1c4c17f68d3b720cf045fd506217a0f83b518d5ce345d703e8eb033c75a9caa SHA512 bb8d34cecc4af86042da69eba6dea30c594f611666a4d7f8c75096dba3c6879b6ebff355cfa114629147fcc7e2b525372268fd74855039f540a2a22d622831fc
+EBUILD chrome-binary-plugins-77.0.3865.120.ebuild 1359 BLAKE2B f5e24182c82dcc28b0d9b5de2d98a21d553b2d07e741842313fe580401dfaa9e035106b4b33f829936a987af013a81fa0286d1091779b7cd30c2793057150866 SHA512 cc16adb46e9082046c34789f3980dfcc421c683112ba12b9ca22cf314660b0dec298a3dd6ecd0e55e4430cf0f8a9d817b4663a71bd29665da7689ddf8c8a92fb
+EBUILD chrome-binary-plugins-78.0.3904.50_beta.ebuild 1210 BLAKE2B d8984746fbd7b44f301211b11ddeba263a2e161f1f3b92092ce9f8df6a10a0b9f3917d02a8b89a036f432c0370d4ecba0575aade245d0502bdf533ae08161e64 SHA512 2fbc95ef6c45317ba2dff47e04faa7a52710c5b9e020518b3e05329b28dffd49c00dc1210b6954cbb9bb1a0ae650c54716cdaacaeca5997f9edba53b6ac5cacd
+EBUILD chrome-binary-plugins-79.0.3938.0_alpha.ebuild 1210 BLAKE2B d8984746fbd7b44f301211b11ddeba263a2e161f1f3b92092ce9f8df6a10a0b9f3917d02a8b89a036f432c0370d4ecba0575aade245d0502bdf533ae08161e64 SHA512 2fbc95ef6c45317ba2dff47e04faa7a52710c5b9e020518b3e05329b28dffd49c00dc1210b6954cbb9bb1a0ae650c54716cdaacaeca5997f9edba53b6ac5cacd
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.90.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.120.ebuild
index c60abbfa5a56..c60abbfa5a56 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.90.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.120.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.34_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.34_beta.ebuild
deleted file mode 100644
index 44a588dd47fa..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.34_beta.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2012-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib unpacker
-
-DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
-HOMEPAGE="https://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*)
-		SLOT="unstable"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_alpha}-1
-		;;
-	*_beta*)
-		SLOT="beta"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_beta}-1
-		;;
-	*)
-		SLOT="stable"
-		CHROMEDIR="opt/google/chrome"
-		MY_PV=${PV}-1
-		;;
-esac
-
-MY_PN="google-chrome-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-KEYWORDS="-* ~amd64"
-
-LICENSE="google-chrome"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	!<www-client/chromium-57[widevine(-)]
-"
-
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-S="${WORKDIR}/${CHROMEDIR}"
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
-}
-
-src_install() {
-	insinto "/usr/$(get_libdir)/chromium-browser"
-	doins -r WidevineCdm
-}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.17_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.50_beta.ebuild
index 44a588dd47fa..44a588dd47fa 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.17_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.50_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-79.0.3921.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-79.0.3921.0_alpha.ebuild
deleted file mode 100644
index 44a588dd47fa..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-79.0.3921.0_alpha.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2012-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib unpacker
-
-DESCRIPTION="Binary plugins from Google Chrome for use in Chromium"
-HOMEPAGE="https://www.google.com/chrome"
-
-case ${PV} in
-	*_alpha*)
-		SLOT="unstable"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_alpha}-1
-		;;
-	*_beta*)
-		SLOT="beta"
-		CHROMEDIR="opt/google/chrome-${SLOT}"
-		MY_PV=${PV%_beta}-1
-		;;
-	*)
-		SLOT="stable"
-		CHROMEDIR="opt/google/chrome"
-		MY_PV=${PV}-1
-		;;
-esac
-
-MY_PN="google-chrome-${SLOT}"
-MY_P="${MY_PN}_${MY_PV}"
-
-SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb"
-KEYWORDS="-* ~amd64"
-
-LICENSE="google-chrome"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	!<www-client/chromium-57[widevine(-)]
-"
-
-for x in 0 beta stable unstable; do
-	if [[ ${SLOT} != ${x} ]]; then
-		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
-	fi
-done
-
-S="${WORKDIR}/${CHROMEDIR}"
-QA_PREBUILT="*"
-
-pkg_nofetch() {
-	eerror "Please wait 24 hours and sync your portage tree before reporting fetch failures."
-}
-
-src_install() {
-	insinto "/usr/$(get_libdir)/chromium-browser"
-	doins -r WidevineCdm
-}
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.21_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-79.0.3938.0_alpha.ebuild
index 44a588dd47fa..44a588dd47fa 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.21_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-79.0.3938.0_alpha.ebuild
diff --git a/www-plugins/pdfjs/Manifest b/www-plugins/pdfjs/Manifest
index 92036610fc07..4337b9596446 100644
--- a/www-plugins/pdfjs/Manifest
+++ b/www-plugins/pdfjs/Manifest
@@ -1,9 +1,5 @@
 DIST pdfjs-1.9.426.zip 3510568 BLAKE2B dbeaa51fea45c6bb0a538e96c39cabb096720aa41d882fe01f0e11ec26d23ead918f4d2c09c9cce37606be9b059abe5902c9eb9ff018755cb2278a55481bc1ec SHA512 4c6a7ac613755a73d694a80ccea0d0d3d100fb0c7039ae5d866059d39e58b650092a733c7bea6d302cfa196f439d28f59055443ab96443161d1770462d8976ef
 DIST pdfjs-2.1.266.zip 4181305 BLAKE2B 2dd23d90ce660535b7abb8defce0788295e5a35093ec10afcad9d884f82a734c39363ad0607e00a24abf8e688153124d25b0c373d125226a2c8167880dc22bba SHA512 46695b0ebd000c75025fac96088bfe99b3a54f77908735084094759d82384b3348986211d536e8e80ded9a8497498bb1669579dfd9f653746ac5d9a80245a6a4
 EBUILD pdfjs-1.9.426.ebuild 470 BLAKE2B dffb9f5f7de94cdfc699cb851dd2fb60ab57de7d4dea089ab16d02482428f6b830a16728b2b911e97995e30d35a1af5ad0a018596757268ad062d17c3a68604d SHA512 6812318355cf55de8a3759db67c6dbe7d763eb83e545522eb80656d9cda7836f6f9f4067c6a95987a0dd988407434663381e5e643fbb85f1c9e223e0a213d288
-<<<<<<< HEAD
-MISC metadata.xml 246 BLAKE2B c4ea887d57d4eef8e9e4028e86fa7415ec4e7eeeddf5b5670abb3c2b57d462f46b37edb6032560fbb4b6c27ab05ecc7d4efa339204a41c670d9aa33b6f609212 SHA512 4b51afd80a40f98e559b28c0c2114d61ce0407c682000fe04a54361f0b086829cd8b37efabdec44a88f9e34243810d7aac96fb03f21ac5c16f0ed5427ef0f199
-=======
 EBUILD pdfjs-2.1.266.ebuild 467 BLAKE2B 004f2d2c25efc7e7eba7c0137704ff8ebb27de34a32cecd658905b346012475d3fadba54fc2f9743139356f8ecfdc33b2089126dd2caaa49ee4983592e51add5 SHA512 0f52aec97ceb2f690ae422cededb5ef004b130efa01bd1aee1021c7dda7c0da4792c5e121fb9812191692b16b90f1ec0606e4d3f22aa58902be3c4a0a694e354
 MISC metadata.xml 331 BLAKE2B fc3a794b98cf26bb6266d522c3e691ef1ab71777a3734b6a741daf12fc61d16622e32c53bea01e25fd2cd16e69cb09879265aa3f3ecd23ce8fa0f2be662a3553 SHA512 22fba83c246ffcedf389605f232d0fff0608a46a245c0e0f4a3ff2f010a9a509f4e38bbad681c9030ad3220f63e460dd8965ca1c985ccd6e1c36f0e87eacc0cc
->>>>>>> next
diff --git a/www-plugins/pdfjs/metadata.xml b/www-plugins/pdfjs/metadata.xml
index 5f7f4b246990..e8a87e7193f0 100644
--- a/www-plugins/pdfjs/metadata.xml
+++ b/www-plugins/pdfjs/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<<<<<<< HEAD
-	<!-- maintainer-needed -->
-=======
 	<maintainer type="person">
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
->>>>>>> next
 	<upstream>
 		<remote-id type="github">mozilla/pdf.js</remote-id>
 	</upstream>