gentoo resync : 21.09.2018

8 files changed, 24 insertions, 20 deletions

diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 2266250f80d4..2c7cda5fe147 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/browserpass/Manifest b/www-plugins/browserpass/Manifest
index 17e6dc9660dd..4d07a612152a 100644
--- a/www-plugins/browserpass/Manifest
+++ b/www-plugins/browserpass/Manifest
@@ -1,5 +1,5 @@
-DIST browserpass-2.0.11.tar.gz 176787 BLAKE2B 271c3cf340ecc78c3358f21bc0e6bbcaf857b4ca39c7b0dcf58b1fcef62ea5df4f48adb4ac0bf7c884853f359fdb9ca00300e2f99efa48a1fdc0ba99ce7bd172 SHA512 baa362b63c1743273f56cb7576f96c29ca365fb217d3016824cdb1ce215e36b7f98fc7c3340a5a34853bde7c25283c84ceda570d149a8119bc54be2f0194034b
 DIST browserpass-2.0.13.tar.gz 180424 BLAKE2B e2a1796edf3b037553cb9bd33f072cd25953d8262fa584c371c3df638c77fc352953c698963325a5cee9b29c81cc010ded72bb31abac9460603796f4a95267ed SHA512 8d28144aef061770f11d7ba288dfa82f8873a263b8ccff235e26e83c55700e5ed0210dec2c2fb45751f3ad15d1894503407ec901d272783b98c466d74d9156f0
-EBUILD browserpass-2.0.11.ebuild 1225 BLAKE2B dc24b26dd3d0ae9e99b1ddb6d2355c4d4642f3a9372f4c4c167dd95a1f97d476d0038b9f737b2ad2d6549aa9f379a24f34c877380892d3a97b22c11952e367e0 SHA512 465b10576f8edf09bc606ba6285fd4d11180a8cbfbfae021a1cb73cea700d7a9abfa420c38e0fab8adfbab0537e1ceecb64b2e3857564348b8a28804e75f4b11
+DIST browserpass-2.0.22.tar.gz 49730 BLAKE2B a37d55a7b2a162a54931a3dde53b16e6c4d067f92dad129e92664dac726c3171938d5da94fe45c64227f4e4a860a12d0cdbb1aa147942f0199c2f4b9bed5fd7a SHA512 f3c19df72afd1387d7142b5e818dfe95a730c906277be0f16522986f387f659eb4a9decaf54eef5b6649ddc618d93b055c99b594fc4b949ce09a38cf2e6d9525
 EBUILD browserpass-2.0.13.ebuild 1267 BLAKE2B 1e6c1480fd6d34c5e7c3f29fe81e354c69d3772f46a286e533341a5b67bc0417c28d80d0d8e714ff0003eda2f059d212264d088b8616f239a8de2471d584d60c SHA512 ccd9d82e7bd208b1149c08e599bd17cead1dfe65fc6614475e9a08196b96e00294d3c9e56690126716a6c6be15f49889f6dabefdad33bca6115b07bb6f0281b8
-MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
+EBUILD browserpass-2.0.22.ebuild 1377 BLAKE2B 417aede03579d7acc5cd984d777f68e03df21f67874e2d45fbbc261b77eeea0b6d4051c911a0cb3c169da38b745609b581a3d74d8e72b51c7d5248d58bfa1bde SHA512 4e68e4225979f9209d6b055b1fd2559be64a7032a663d0a6ff5c7bc86ae7cbc30f41084d533c598d646134381647728944f9283ac7c404bc81d1a0b42c6a6e1d
+MISC metadata.xml 246 BLAKE2B c7559c694569e2eb079aa44ab82aac05dd7218624519133b1d1de233f6d4bce0872ada012e00dc369051e9685d9a25d314c05318d1b109ee81945dd739da51df SHA512 0d07f784095273f14c7d63a215a76c84fec302e6e52717f0e47c29916aa90149239dfe7ed3227a42e2863226e4448d8a2e8321ccc589ad6d9f725731b45559a2
diff --git a/www-plugins/browserpass/browserpass-2.0.11.ebuild b/www-plugins/browserpass/browserpass-2.0.22.ebuild
index 6abafb5c2130..7107e7c52538 100644
--- a/www-plugins/browserpass/browserpass-2.0.11.ebuild
+++ b/www-plugins/browserpass/browserpass-2.0.22.ebuild
@@ -19,6 +19,7 @@ LICENSE="MIT"
 SLOT="0"
 RDEPEND="app-crypt/gnupg"
 DEPEND="${RDEPEND}
+	dev-go/fuzzy:=
 	dev-go/twofactor:=
 	dev-go/zglob:="
 
@@ -28,13 +29,14 @@ 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/bin/browserpass|' \
+	sed -e 's|%%replace%%|'${EPREFIX}'/usr/libexec/browserpass|' \
 		-i firefox/host.json chrome/host.json || die
 	popd >/dev/null || die
 }
 
 src_install() {
-	dobin browserpass
+	exeinto /usr/libexec
+	doexe browserpass
 
 	pushd "src/${EGO_PN}" >/dev/null || die
 	insinto /usr/$(get_libdir)/mozilla/native-messaging-hosts
@@ -43,6 +45,9 @@ src_install() {
 	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/browserpass/metadata.xml b/www-plugins/browserpass/metadata.xml
index 585b0dc75dda..b58e8386fcb2 100644
--- a/www-plugins/browserpass/metadata.xml
+++ b/www-plugins/browserpass/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	</pkgmetadata>
+	<maintainer type="person">
+		<email>mattst88@gentoo.org</email>
+		<name>Matt Turner</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index bcacb7e4cf50..f6ccae6b44b7 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
 DIST google-chrome-beta_70.0.3538.16-1_amd64.deb 57099040 BLAKE2B dab3af9632b910a8ecda659aae0b7c64760298ad35a4a96ca484940f04d09cc09ed2251305d28789431054c5aaf333271fec7266d9b366ca8e862a56a28400a2 SHA512 b8a3f94fbc9144a158a280f3c72a989e3929bf75cbdc37c02e2f97b1664c7cd956bab75f5c57d953cb7ede7667cb3c49a9ac48db94f4a6a52fc8eaa187772ea1
-DIST google-chrome-stable_69.0.3497.92-1_amd64.deb 54808378 BLAKE2B dae6939fe4bf46d2e773ad90df2229ef4b914d26e0a4b4e2114fadcd0e42f9a3609f864b7240fb2bbf2b0ef3aeb0b73bf37a102a633ba725ab0fee6db0a88907 SHA512 6bb1cc4612157e8416c9a39874772eb18ff7da28f86cb2e409a6be4d50495932b12aac9ce7973a6e85659cd8f3f65101738677d0135ce3f0d5854729dcaac98e
+DIST google-chrome-stable_69.0.3497.100-1_amd64.deb 54675966 BLAKE2B 7043eca541b3dd75ed45ffd7bd06b26f2c3561378be913bc3988274ac1adc98ac05df7e7d42ec24402dea482131494f939578b5b1fde87224caa3e59bad25e96 SHA512 6566fefd13ef3013368d3f9edb7aa967d83fa888bec429beca16c0cab6398eaef5c07c31f399417baebeb7d0f79f5eebd651a31d0bca34eaa6ec729798b430e4
 DIST google-chrome-unstable_71.0.3551.3-1_amd64.deb 57396928 BLAKE2B 2cfdc4f7cfb0b1c934b132481fd8b38d2bbc6a981cbdfa5e8073714b3bd7890681acbe39604bca83dca273e4e742cc0afcbef7e07afea50a4712e0787aa48be9 SHA512 ce2da74e3460ffd372081549b73537e28eddf5ad69c1b67ec8fc98db9982777a87b7c7bf994046a78d6d82eab0f231aa54eab604c65f0245dfc0897cdc5df800
-EBUILD chrome-binary-plugins-69.0.3497.92.ebuild 1362 BLAKE2B c75ab3b0c0744543f6c0bb7716b1ff5eb0a7163fd91ac1e1b378588d1ebfc0ba57cae2ce8024315eac3d6a0b3a5ead6ae69a026e6c5e82724904f1fc524858f9 SHA512 c21c2bdf6845456d3f9cb47a5225f9962cf7897194c7f2c670010c5eec3fe33f88051c6a4000ebaac14313c1b630c0590fa8fb2b5b255f23fc75232f53cc6609
+EBUILD chrome-binary-plugins-69.0.3497.100.ebuild 1362 BLAKE2B c75ab3b0c0744543f6c0bb7716b1ff5eb0a7163fd91ac1e1b378588d1ebfc0ba57cae2ce8024315eac3d6a0b3a5ead6ae69a026e6c5e82724904f1fc524858f9 SHA512 c21c2bdf6845456d3f9cb47a5225f9962cf7897194c7f2c670010c5eec3fe33f88051c6a4000ebaac14313c1b630c0590fa8fb2b5b255f23fc75232f53cc6609
 EBUILD chrome-binary-plugins-70.0.3538.16_beta.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
 EBUILD chrome-binary-plugins-71.0.3551.3_alpha.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3497.92.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3497.100.ebuild
index 8dcc557fdf85..8dcc557fdf85 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3497.92.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-69.0.3497.100.ebuild
diff --git a/www-plugins/passff-host/Manifest b/www-plugins/passff-host/Manifest
index 1f8f3a7b772e..2ce8e6503fc9 100644
--- a/www-plugins/passff-host/Manifest
+++ b/www-plugins/passff-host/Manifest
@@ -1,4 +1,4 @@
-DIST passff-host-1.0.1.json 176 BLAKE2B 8eddc19cd0c072d25afff5cfa86a95d960ae7b986727099a04a1d983b887922f9ad77e940a2c80e0838a169afe81fa3f6529a901998bb98a6750ac888a09c264 SHA512 e4a4b90fb5323c6dbec339b9e67a7d546c6d7a95754fe03b3a4d96396c28de1caba3068b4e936ee0ce0997f865c8b5e53a3da1fb34f0123a04c5889302c28911
-DIST passff-host-1.0.1.py 3432 BLAKE2B f45054bf9323608b515de559c36ad28705fb9c75de00824b0ed8e05d21545b861ba61194cf25a4db84b55d64f7d08abec27d56bb8d098961e94fbbcb9d7f3707 SHA512 168b4d3cdc9f463a7969adc851c878b5b7ddad7d05415770273510c99d8fa7c80015611df1554f24c8b8cd0f256d3a8f687a325e34105e029487eb4fc5ea7290
-EBUILD passff-host-1.0.1.ebuild 1498 BLAKE2B 683642b6cb148399c2e90b2e439ea379bb2760aaee4cae7695f1001a15e912fefdcde4aefdfc1174cd365785e6b707fee50d9e6017eba0155f2e4d28c8d34b2c SHA512 ed9e8d65cf46cccf71279c9d46461f6ec78de6607fa568fd54934a179917659836f49b8c899550a324aa3db7df18ad331c6a31330d7467efbe8900ed4cec56aa
+DIST passff-host-1.0.2.json 176 BLAKE2B 8eddc19cd0c072d25afff5cfa86a95d960ae7b986727099a04a1d983b887922f9ad77e940a2c80e0838a169afe81fa3f6529a901998bb98a6750ac888a09c264 SHA512 e4a4b90fb5323c6dbec339b9e67a7d546c6d7a95754fe03b3a4d96396c28de1caba3068b4e936ee0ce0997f865c8b5e53a3da1fb34f0123a04c5889302c28911
+DIST passff-host-1.0.2.py 3153 BLAKE2B 54cc951628f18a0e8c88dc7404a6c035473c1a8d5974a26e0d6c48692cf29a8d507bf89d11a1247eb0705418719601d2bbcdfca77018d3480fb97f13d660b58d SHA512 d7818055e5cee6b3fc270d7a84f342ba68b8c1f5e5e01e120cff173b1cc50f2e6189121f4d258d470885de9ba0c06b687ccdbe6b3de653d2274954a4777b2a6b
+EBUILD passff-host-1.0.2.ebuild 1353 BLAKE2B 554e910af6d9417fdc0e9db065efd87c3634103a3da899300e13423455f387f159f61fffc79d40bb420386b4bba8292cb90c035cc13002d6f7dedd4e3a8d57b5 SHA512 17a99b9727258696cdb58a1b2434366667f0d9ef9624f6a539ffe1d09c91261d04d69865ad9fa96ec9d75c0bc0089b238c878b116ef8170eeb0408e109220683
 MISC metadata.xml 675 BLAKE2B 1db912c207b9b70e56ac1256af5d600ba8f3aa97ce22d2de3c56e752442a757c2cb32dd871c62cd96bca2f2c4016f8efd6853eb2c173b7123012ad26a9f32b6b SHA512 6da18aa19b6c64a80e7197e9a2cd22fc2f72c178890ac413237422b73df5360754cbe00da559c121f4482c53b2b6aa6decd6cbbcf7ff3f868d2b6cf314d964df
diff --git a/www-plugins/passff-host/passff-host-1.0.1.ebuild b/www-plugins/passff-host/passff-host-1.0.2.ebuild
index ddcae5e621f0..a2509be3e2c9 100644
--- a/www-plugins/passff-host/passff-host-1.0.1.ebuild
+++ b/www-plugins/passff-host/passff-host-1.0.2.ebuild
@@ -1,20 +1,18 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
 
 inherit python-single-r1
 
 DESCRIPTION="Host app for the PassFF WebExtension"
 HOMEPAGE="https://github.com/passff/passff-host"
 
-# Using raw because of difference between git and release
-# See https://github.com/passff/passff-host/issues/18
 SRC_URI="
-	https://github.com/passff/passff-host/raw/${PV}/src/passff.py -> ${P}.py
-	https://github.com/passff/passff-host/raw/${PV}/src/passff.json -> ${P}.json
+	https://github.com/passff/passff-host/releases/download/${PV}/passff.py -> ${P}.py
+	https://github.com/passff/passff-host/releases/download/${PV}/passff.json -> ${P}.json
 "
 
 LICENSE="GPL-2"
@@ -32,8 +30,6 @@ src_unpack() {
 
 src_prepare() {
 	default
-
-	sed -i "s/_VERSIONHOLDER_/${PV}/" "${P}.py" || die
 	python_fix_shebang "${P}.py"
 }