gentoo resync : 03.11.2019

6 files changed, 14 insertions, 23 deletions

diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 7c666f4b1607..2a641a510097 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 9318ff026430..a3c6971e614d 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-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
+DIST google-chrome-beta_79.0.3945.16-1_amd64.deb 64771552 BLAKE2B bd49950382a82ff28365caa1c83d1838d0ee51ccf078ab11d0465a9469f8553bab9459ac0b9420d8eef1eda70196afa5583fc9506eed953886572b7fd84b6d4a SHA512 666012cbff66ae82835fc6545e50ae1b44595eb92562126bc8da40d71b4ac33ff8c059b13a158273905d6bf5456d0890c1e69894bb89e2526539c6fb4468fc80
+DIST google-chrome-stable_78.0.3904.87-1_amd64.deb 62927822 BLAKE2B de333c8ba5f2b3f4ceaf6b8b4878f02d298e2b873c47298f4491c5759df590ffa36a753a0fa837bdf87e65560adf528d872b5f164f957a98c5814abc1bf4c065 SHA512 02e9ac58a8922e576ceeff6093480449d99b5d93fa6537bc96f5fc01abc7d58f5f3add7b432ef85608184acc9f002d8b16d8bf02fdd95177b857946492ea9e60
+DIST google-chrome-unstable_79.0.3945.16-1_amd64.deb 64760390 BLAKE2B 4b7eb4067c793376a6af4c5fd10671172c1f65ccd6b2f278dc84322462fc356c7112d637b1ee7d09e519a62c6097f1df70a1229d7e015833210eac2ce94883f8 SHA512 0b66f7503896426759be08f0a3b32ce49d0794a7ccf56a64dd25638574374f18cd2f2c4b034700b3201a1bef5d3423086373402a2f9d3ff8c5c1ff0db0449a60
+EBUILD chrome-binary-plugins-78.0.3904.87.ebuild 1210 BLAKE2B d8984746fbd7b44f301211b11ddeba263a2e161f1f3b92092ce9f8df6a10a0b9f3917d02a8b89a036f432c0370d4ecba0575aade245d0502bdf533ae08161e64 SHA512 2fbc95ef6c45317ba2dff47e04faa7a52710c5b9e020518b3e05329b28dffd49c00dc1210b6954cbb9bb1a0ae650c54716cdaacaeca5997f9edba53b6ac5cacd
+EBUILD chrome-binary-plugins-79.0.3945.16_alpha.ebuild 1210 BLAKE2B d8984746fbd7b44f301211b11ddeba263a2e161f1f3b92092ce9f8df6a10a0b9f3917d02a8b89a036f432c0370d4ecba0575aade245d0502bdf533ae08161e64 SHA512 2fbc95ef6c45317ba2dff47e04faa7a52710c5b9e020518b3e05329b28dffd49c00dc1210b6954cbb9bb1a0ae650c54716cdaacaeca5997f9edba53b6ac5cacd
+EBUILD chrome-binary-plugins-79.0.3945.16_beta.ebuild 1210 BLAKE2B d8984746fbd7b44f301211b11ddeba263a2e161f1f3b92092ce9f8df6a10a0b9f3917d02a8b89a036f432c0370d4ecba0575aade245d0502bdf533ae08161e64 SHA512 2fbc95ef6c45317ba2dff47e04faa7a52710c5b9e020518b3e05329b28dffd49c00dc1210b6954cbb9bb1a0ae650c54716cdaacaeca5997f9edba53b6ac5cacd
+MISC metadata.xml 262 BLAKE2B 6958ab33a832169dbd6b7077bfeae3f398c5d825430d3d85f7f37d732951fa0585a75d28766111d82e5103fa4078cfb3e3d16b98a4520b268d4fd6b670ce811e SHA512 b440c405c25f905f11aeaab1ee3721846ac26502b1e02656f773a3b3be4bc636e85af6185c043c8e94205a3297476d3d2230d6c519d477b5c7d42268916e1128
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.50_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.87.ebuild
index 44a588dd47fa..44a588dd47fa 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.50_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.87.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-79.0.3938.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-79.0.3945.16_alpha.ebuild
index 44a588dd47fa..44a588dd47fa 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-79.0.3938.0_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-79.0.3945.16_alpha.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.120.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-79.0.3945.16_beta.ebuild
index c60abbfa5a56..44a588dd47fa 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-77.0.3865.120.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-79.0.3945.16_beta.ebuild
@@ -30,19 +30,16 @@ 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"
+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(-)]
-	)
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	!<www-client/chromium-57[widevine(-)]
 "
 
 for x in 0 beta stable unstable; do
@@ -59,9 +56,6 @@ pkg_nofetch() {
 }
 
 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
+	insinto "/usr/$(get_libdir)/chromium-browser"
+	doins -r WidevineCdm
 }
diff --git a/www-plugins/chrome-binary-plugins/metadata.xml b/www-plugins/chrome-binary-plugins/metadata.xml
index 1cfb788aa968..05cb12853e0c 100644
--- a/www-plugins/chrome-binary-plugins/metadata.xml
+++ b/www-plugins/chrome-binary-plugins/metadata.xml
@@ -5,7 +5,4 @@
 		<email>chromium@gentoo.org</email>
 		<name>Chromium in Gentoo Project</name>
 	</maintainer>
-	<use>
-		<flag name="widevine">Install the Widevine DRM library</flag>
-	</use>
 </pkgmetadata>