gentoo resync : 28.09.2019

6 files changed, 167 insertions, 0 deletions

diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index c7cad5ee8ef0..7e1439b2193c 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,16 @@
+<<<<<<< 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
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
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
new file mode 100644
index 000000000000..44a588dd47fa
--- /dev/null
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-78.0.3904.34_beta.ebuild
@@ -0,0 +1,61 @@
+# 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-79.0.3921.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-79.0.3921.0_alpha.ebuild
new file mode 100644
index 000000000000..44a588dd47fa
--- /dev/null
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-79.0.3921.0_alpha.ebuild
@@ -0,0 +1,61 @@
+# 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/pdfjs/Manifest b/www-plugins/pdfjs/Manifest
index e65b413f8b1e..92036610fc07 100644
--- a/www-plugins/pdfjs/Manifest
+++ b/www-plugins/pdfjs/Manifest
@@ -1,3 +1,9 @@
 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 435535a613a5..5f7f4b246990 100644
--- a/www-plugins/pdfjs/metadata.xml
+++ b/www-plugins/pdfjs/metadata.xml
@@ -1,7 +1,14 @@
 <?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>
diff --git a/www-plugins/pdfjs/pdfjs-2.1.266.ebuild b/www-plugins/pdfjs/pdfjs-2.1.266.ebuild
new file mode 100644
index 000000000000..8cf32af52960
--- /dev/null
+++ b/www-plugins/pdfjs/pdfjs-2.1.266.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A PDF reader in JavaScript"
+HOMEPAGE="https://mozilla.github.io/pdf.js/"
+SRC_URI="https://github.com/mozilla/pdf.js/releases/download/v${PV}/${P}-dist.zip -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/pdf.js/
+
+	doins -r build
+	doins -r web
+}