Merge branch 'next'

4 files changed, 4 insertions, 73 deletions

diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 2dc80d97dfae..f00071d07500 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,5 @@
-DIST google-chrome-beta_77.0.3865.70-1_amd64.deb 64112516 BLAKE2B a4739181ce829858d460d88e8864c611ef8a945dde87225cf4e80a5dd6cb04da373cc1043598cec96ea7f5750a6dcc102ca1e5a3eb85ad05894ff17ba958a59e SHA512 b043975754ebbf92aecd553935a73ac7f1b2fe5ab2154fff18996597a5682d208496c63c230cec9e5ff5a506c93168ecfc3acd07ad25a68e350678d85b9870f0
-DIST google-chrome-stable_76.0.3809.132-1_amd64.deb 59170956 BLAKE2B 3eea5ff9c3bafa4c4e7f0dd27a8f85a505f2c8a7260f6c517264343c57ddddeb0694e66203622c01d19f89f01c90a384255eaabf2c43e62c7a510e379f3c0a73 SHA512 c93aa39776ae5ca3f24092668c5d3e7fd873ce1b0ce05fa9a5d8a4a164981cf9cb4724a368026cab2475467bc0c85247626ac4f859d6e71f3072af9b7f8f1393
-DIST google-chrome-unstable_78.0.3902.4-1_amd64.deb 62088460 BLAKE2B 45fbcdf6664266179f0a1404e573b04b947899b6b3fc8c1463c1ccdddcee09e3102a6813686f9131918adab2bf41906b9d0c3032517c53677e6ae6582d6e29cb SHA512 4b98a0deeaa4a3c5266a7a1eafd84dc7ec6d21219abf095750aaba067db1877ee91ac30190954a746db313c07e9c55e90e67ab25d9cb2266c5bc5db160ea66e5
-EBUILD chrome-binary-plugins-76.0.3809.132.ebuild 1359 BLAKE2B f5e24182c82dcc28b0d9b5de2d98a21d553b2d07e741842313fe580401dfaa9e035106b4b33f829936a987af013a81fa0286d1091779b7cd30c2793057150866 SHA512 cc16adb46e9082046c34789f3980dfcc421c683112ba12b9ca22cf314660b0dec298a3dd6ecd0e55e4430cf0f8a9d817b4663a71bd29665da7689ddf8c8a92fb
-EBUILD chrome-binary-plugins-77.0.3865.70_beta.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
-EBUILD chrome-binary-plugins-78.0.3902.4_alpha.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
+DIST google-chrome-beta_77.0.3865.75-1_amd64.deb 64103536 BLAKE2B 443200b8c821ed9c239fef08a8d97338033629bf2c5227240056d35a3a946fb97fe2b538a2e2d9fb14c01364c6ce59a82dc684eb522107dc129540c093d158b1 SHA512 524924bb88d601e86824067c6f4deca436e0af9d7d30ba68d2f2a857625c75ada8808dc3907dadd87a7a44ce88efb9dd058084be1a70c0f93142c041f4736d7a
+DIST google-chrome-stable_77.0.3865.75-1_amd64.deb 62302944 BLAKE2B d4231928ff823e5c89339ff8327d9851b89f52761d9a8998f077535183476b6f39b948ac2604e4e3631b20ef25f985fb1d3fad0f7ea00ca97aba5fb58868a80d SHA512 b239fbf5549da67d900a605a62999900f9f3c8cd2f4ad9c55dcc91b20fda351ba82845ee908cc17daa8678ddacc01a3b2795adccf075ce22c9811667c3ca3216
+EBUILD chrome-binary-plugins-77.0.3865.75.ebuild 1359 BLAKE2B f5e24182c82dcc28b0d9b5de2d98a21d553b2d07e741842313fe580401dfaa9e035106b4b33f829936a987af013a81fa0286d1091779b7cd30c2793057150866 SHA512 cc16adb46e9082046c34789f3980dfcc421c683112ba12b9ca22cf314660b0dec298a3dd6ecd0e55e4430cf0f8a9d817b4663a71bd29665da7689ddf8c8a92fb
+EBUILD chrome-binary-plugins-77.0.3865.75_beta.ebuild 1360 BLAKE2B 4519cec3b74ffe939dccb7d00fa4051a494a58f89dc386ae23d3a7881bf2696d90eb909a9d68b140b71d14b92f553cca2ec7303697009ae252cb6f039b5384dc SHA512 9eed4cdb84e79b845d5f294291c326b4b071c157122ef755fa2532607cac2f6a031942dfc182fc5b944722ab1ec9da6e4e9467cebc9120e087d2ba887af32a1c
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-76.0.3809.132.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.75.ebuild
index c60abbfa5a56..c60abbfa5a56 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-76.0.3809.132.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.75.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.70_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.75_beta.ebuild
index 3fd84e77d226..3fd84e77d226 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.70_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.75_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3902.4_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3902.4_alpha.ebuild
deleted file mode 100644
index 3fd84e77d226..000000000000
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3902.4_alpha.ebuild
+++ /dev/null
@@ -1,67 +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"
-IUSE="+widevine"
-RESTRICT="bindist mirror strip"
-
-RDEPEND="
-	widevine? (
-		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
-	if use widevine; then
-		doins libwidevinecdm.so
-		dosym ../chromium/libwidevinecdm.so /usr/$(get_libdir)/chromium-browser/libwidevinecdm.so
-	fi
-}