gentoo resync : 09.06.2018

12 files changed, 133 insertions, 50 deletions

diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 45b4e2fd97b1..44995d72c2cb 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 02012ac4c45e..2dffe57c5d24 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_67.0.3396.62-1_amd64.deb 53717682 BLAKE2B 4b9e81029a1941625e4b8d1201d4fdc01c73c2b5cffb9c78faba8a0d3e70985a1c4571153ee291dc8c9f3743d78fa0f12d8342482cca6440712dfa72bf4b7619 SHA512 040694582940e776f74fc8644eeb04f3cb3016be246b385c20870f10dc6bef2278469f135eb83f9329a9a14fbdcba8ef99430c98b83e6af9326fed397f30a519
-DIST google-chrome-stable_67.0.3396.62-1_amd64.deb 52532020 BLAKE2B 6b0a9aae756dbc7dafcd1e1479a0ac9f630c7c888549c54bef6f295d9649812bab4471e4c3e4716aec729d2d83d75e501f01b2ca7fb63399f7c113af761ac1f2 SHA512 78e27742d9f9568b3c3aae2e46052466a2386b772fb04f8a55bb38cf030cc8c24561b5c3d7670d8bbdc56d7f9e43986122dc4035a0607836ebfcdcd454597c86
-DIST google-chrome-unstable_68.0.3440.7-1_amd64.deb 55550866 BLAKE2B 27bac60cb261aaadca187e35857f39be13a89dfaab5889a4af8c63139e02c6740c5c36621fc68ffd60de69e5e7db18ff8fdbef5aac62b911b6cc5c1d383b9feb SHA512 31ac59aa77546cc80e49f0f18a8e37ad43316b2192df1225459ebef855c27755c4323656911909b153e71538754967ea0437c1d580957788a483c82db2d2c52a
-EBUILD chrome-binary-plugins-67.0.3396.62.ebuild 1362 BLAKE2B c75ab3b0c0744543f6c0bb7716b1ff5eb0a7163fd91ac1e1b378588d1ebfc0ba57cae2ce8024315eac3d6a0b3a5ead6ae69a026e6c5e82724904f1fc524858f9 SHA512 c21c2bdf6845456d3f9cb47a5225f9962cf7897194c7f2c670010c5eec3fe33f88051c6a4000ebaac14313c1b630c0590fa8fb2b5b255f23fc75232f53cc6609
-EBUILD chrome-binary-plugins-67.0.3396.62_beta.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
-EBUILD chrome-binary-plugins-68.0.3440.7_alpha.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
+DIST google-chrome-beta_68.0.3440.17-1_amd64.deb 55432196 BLAKE2B 436c6ac74d48463353f9a7822fd33363326945c0bc7d6dbcf7b87d44563ced7ebc68c5d523f51fac3d2f9c77c3b2692b74516bd8884ac1260a2abb93a614210f SHA512 c51f0e774039c6e6a9b853195749807534ad8d602fa1537fcf8b4e7dafe21cb6cac668f697fb7aece6a7a02929c453e03e60b628139129a276a93ab655f3fe49
+DIST google-chrome-stable_67.0.3396.79-1_amd64.deb 52529522 BLAKE2B 2d8b7e5613b6130571e7f2fd6f54d20645553e448b7ba37efc9758da1ba93c6eba23d805a922ac283c1da5dc1b97f4f525bd85197668a0d90c69365b1a5a5eae SHA512 692f16d7b5a6d9a1f6e84dc21059d1b30a69be48cc3c057345ad9d475c3563a91fc19339c3cf93731ed4991eb78c0d9462ec94835ecac6a22a9cac51b7a95a12
+DIST google-chrome-unstable_68.0.3440.15-1_amd64.deb 55268120 BLAKE2B be6fd557cd764693ce1259280bb207a0d6290c809c47ad4f57b0f8af2c2f08164e0ee60169de8a09d2694362207e9bd2494e8ec618d48f247ee1b7bb25c6809e SHA512 6cb5b349ace24a59ded0d1b7af97b921191e8a6b070447b49345d819e1990868a201fddc778a30c3f93ec80a158075eb84efe9e244131d43103bbbf26eec60c6
+EBUILD chrome-binary-plugins-67.0.3396.79.ebuild 1362 BLAKE2B c75ab3b0c0744543f6c0bb7716b1ff5eb0a7163fd91ac1e1b378588d1ebfc0ba57cae2ce8024315eac3d6a0b3a5ead6ae69a026e6c5e82724904f1fc524858f9 SHA512 c21c2bdf6845456d3f9cb47a5225f9962cf7897194c7f2c670010c5eec3fe33f88051c6a4000ebaac14313c1b630c0590fa8fb2b5b255f23fc75232f53cc6609
+EBUILD chrome-binary-plugins-68.0.3440.15_alpha.ebuild 1363 BLAKE2B d187db8909cb0f2a0d456fea51268756c7ac4350711f445c9bf215b45d96ddb560dee8000ea2746c95239001f7a64b2e2ab42f2e541e324a97b0fcc75407db7c SHA512 3f97ed97b94ef6cd965ee74a76c38c93bfe58cc964823183a927c26c82bd844ab1e97efd75ae1c74111d08c87db2034a10a93122e575ba05a8a3eca0a0a0331d
+EBUILD chrome-binary-plugins-68.0.3440.17_beta.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-67.0.3396.62.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.79.ebuild
index 8dcc557fdf85..8dcc557fdf85 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.62.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.79.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.62_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.15_alpha.ebuild
index 08f94544e0a3..08f94544e0a3 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-67.0.3396.62_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.15_alpha.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.7_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.17_beta.ebuild
index 08f94544e0a3..08f94544e0a3 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.7_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.17_beta.ebuild
diff --git a/www-plugins/passff-host/Manifest b/www-plugins/passff-host/Manifest
new file mode 100644
index 000000000000..d708e992b72c
--- /dev/null
+++ b/www-plugins/passff-host/Manifest
@@ -0,0 +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 1488 BLAKE2B ba55903bbe95db37e78179f18062253858de30ea879f8f02e0981257c331f73aa85a54d630bb7577e7ec3919cb2ad969593328cdaf97852582ffa670c3be72c4 SHA512 c47d8cf091ddab940cb4e595cc195e65e40a4d03cc426d608b3e5eafd295e7afd98a084a8469fbc5633b02ee01cb2435a17fb16225845be12077fee92221cd5d
+MISC metadata.xml 675 BLAKE2B 1db912c207b9b70e56ac1256af5d600ba8f3aa97ce22d2de3c56e752442a757c2cb32dd871c62cd96bca2f2c4016f8efd6853eb2c173b7123012ad26a9f32b6b SHA512 6da18aa19b6c64a80e7197e9a2cd22fc2f72c178890ac413237422b73df5360754cbe00da559c121f4482c53b2b6aa6decd6cbbcf7ff3f868d2b6cf314d964df
diff --git a/www-plugins/passff-host/metadata.xml b/www-plugins/passff-host/metadata.xml
new file mode 100644
index 000000000000..1e9cea82ee0e
--- /dev/null
+++ b/www-plugins/passff-host/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>contact@hacktivis.me</email>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<use>
+	<flag name="chrome">Install plugin for chrome (which also includes opera)</flag>
+	<flag name="chromium">Install plugin for chromium</flag>
+	<flag name="firefox">Install plugin for firefox</flag>
+	<flag name="vivaldi">Install plugin for vivaldi</flag>
+</use>
+<upstream>
+	<remote-id type="github">passff/passff-host</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/www-plugins/passff-host/passff-host-1.0.1.ebuild b/www-plugins/passff-host/passff-host-1.0.1.ebuild
new file mode 100644
index 000000000000..9b984afdc45a
--- /dev/null
+++ b/www-plugins/passff-host/passff-host-1.0.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 python3_6 )
+
+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
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="chrome chromium firefox vivaldi"
+REQUIRED_USE="|| ( chrome chromium firefox vivaldi )"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp "${DISTDIR}/${P}.json" . || die
+	cp "${DISTDIR}/${P}.py" . || die
+}
+
+src_prepare() {
+	default
+
+	sed -i "s/_VERSIONHOLDER_/${PV}/" "${P}.py" || die
+	python_fix_shebang "${P}.py"
+}
+
+src_install() {
+	local target_dirs=()
+
+	use chrome   && target_dirs+=( "/etc/opt/chrome/native-messaging-hosts" )
+	use chromium && target_dirs+=( "/etc/chromium/native-messaging-hosts" )
+	use firefox  && target_dirs+=( "/usr/lib/mozilla/native-messaging-hosts" )
+	use vivaldi  && target_dirs+=( "/etc/vivaldi/native-messaging-hosts" )
+
+	for target_dir in "${target_dirs[@]}"; do
+		sed "s;PLACEHOLDER;${target_dir};g" "${P}.json" > "passff.json" || die
+
+		insinto "${target_dir}"
+		doins passff.json
+		exeinto "${target_dir}"
+		newexe "${P}.py" passff.py
+	done
+}
diff --git a/www-plugins/passff/Manifest b/www-plugins/passff/Manifest
index cdc9ac78e6b8..968618a85eff 100644
--- a/www-plugins/passff/Manifest
+++ b/www-plugins/passff/Manifest
@@ -1,4 +1,3 @@
-DIST passff-1.1.json 176 BLAKE2B 8eddc19cd0c072d25afff5cfa86a95d960ae7b986727099a04a1d983b887922f9ad77e940a2c80e0838a169afe81fa3f6529a901998bb98a6750ac888a09c264 SHA512 e4a4b90fb5323c6dbec339b9e67a7d546c6d7a95754fe03b3a4d96396c28de1caba3068b4e936ee0ce0997f865c8b5e53a3da1fb34f0123a04c5889302c28911
-DIST passff-1.1.py 2256 BLAKE2B fcde1a8d1fe4e8793df46c182a8d717931e7b5ee98ae39a6a03bf32c51528dd7036beefc47dd5839bede47a78bcb7904a745fa38522183057dd7b29e20eae726 SHA512 b5d4aa3d3a9455adece3d291a6e1e05178296e72828ec708cd33541f30e4fbef2385978f24ba27eaefc739e4792f4cbac1830e8dcd15380c7243e11ddbcafe9d
-EBUILD passff-1.1.ebuild 914 BLAKE2B 6ed1b603a4a39926e81e0efc2243c5fdd6feacd35b3a5ae874bd6cc74787791c959e015837a9e2baccd438bfc89970926ab27851a8f5127825d758ccf4cc7b17 SHA512 9d926c76b7232322ead013112b78cab6bac3179c5036c61deaf2bcf6d65fa226b9841fe935b63c69e9ce5bc9fd351c0ded12c78117ad4a03a1d207b129c420ae
-MISC metadata.xml 330 BLAKE2B 87fadecd45f680ccf29dbc736eac6c8d5c5da5dc6f15749b42abf6d4d6a5b1d466818b32d996198a0a7534365bf31a5773b8ae358330ee36e365a26e90789ba1 SHA512 c33841e96737f16de6ee6a4f7e2dba04df4dddb26d502d55df8be637ed668a5c8593fef76a2b24a00da335a59cac5f534f89e8cf917d8b1d4ffa9d3d9c0c6d57
+DIST passff-1.3-an+fx-linux.xpi 59512 BLAKE2B 48eb41e8be2e090aa32137fe93eb6cb7a22218f865f1ade4e6f4516ea3fedc34333f43438fd7c96817ec695ca1d0ced9cff0dd53157e06442e000c12a4bff33c SHA512 d5e5c29fda852c08908ce27e55bb2cd3daaacedf4f1375eb626cf4228d9b8c5113d2210578d80420c1df3846cbb948c184702274ece851c9e8279000e38989a6
+EBUILD passff-1.3.ebuild 831 BLAKE2B cf8093b9af8109f91a27b92f9bd200db63829caa7f45c2e4d056add9b2717e1b00dfa63291899f1eda0e65d36a404b73feb95c4e4e2ced40d71226ef1d642999 SHA512 d98c4bc17703894cecc9f6a09df8de055d4bd2524b6b0fa5fff187f665732b8f0fa57d09f405428c9d23c2cbff491c48276952ca0fe85f2e0b05737d8605566e
+MISC metadata.xml 582 BLAKE2B 44a227f047995fcfb3ffba141ed22c632c5be62d9c3526874cfc6bfb66a3dc001f2a0820b877c7f6a582c05f4f03a548e2cee98b7160e433a4c722217414dbe0 SHA512 3ae829aacd4a82e81b25f4b58f7a142d4d43e26bec35143f642f3a069591eb6546389b7e7758641ecf3a360ddbf0129611b669b20a290ea5b72c2462d3b517ca
diff --git a/www-plugins/passff/metadata.xml b/www-plugins/passff/metadata.xml
index 764e78624bc3..234e183d237e 100644
--- a/www-plugins/passff/metadata.xml
+++ b/www-plugins/passff/metadata.xml
@@ -8,4 +8,11 @@
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
+<use>
+	<flag name="firefox">Install plugin for <pkg>www-client/firefox</pkg></flag>
+	<flag name="firefox-bin">Install plugin for <pkg>www-client/firefox-bin</pkg></flag>
+</use>
+<upstream>
+	<remote-id type="github">passff/passff</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/www-plugins/passff/passff-1.1.ebuild b/www-plugins/passff/passff-1.1.ebuild
deleted file mode 100644
index 3c07171aa77c..000000000000
--- a/www-plugins/passff/passff-1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 )
-
-inherit python-single-r1
-
-DESCRIPTION="zx2c4 pass manager extension for Firefox (Host Binary)"
-HOMEPAGE="https://github.com/passff/passff"
-SRC_URI="
-	https://github.com/passff/passff/releases/download/${PV}/passff.json -> ${P}.json
-	https://github.com/passff/passff/releases/download/${PV}/passff.py -> ${P}.py
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-TARGET_DIR="/usr/lib/mozilla/native-messaging-hosts"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${P}.json" passff.json || die
-	cp "${DISTDIR}/${P}.py" passff.py || die
-}
-
-src_compile() {
-	sed -i "s|PLACEHOLDER|${EPREFIX}${TARGET_DIR}/${PN}.py|" passff.json || die
-	python_fix_shebang passff.py
-}
-
-src_install() {
-	insinto "${TARGET_DIR}"
-	doins passff.json
-	exeinto "${TARGET_DIR}"
-	doexe passff.py
-}
diff --git a/www-plugins/passff/passff-1.3.ebuild b/www-plugins/passff/passff-1.3.ebuild
new file mode 100644
index 000000000000..2cc136021db6
--- /dev/null
+++ b/www-plugins/passff/passff-1.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mozextension
+
+DESCRIPTION="zx2c4 pass manager extension for Firefox"
+HOMEPAGE="https://github.com/passff/passff"
+SRC_URI="https://addons.mozilla.org/firefox/downloads/file/914592/passff-1.3-an+fx-linux.xpi"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="firefox firefox-bin"
+
+RDEPEND="www-plugins/passff-host[firefox]"
+REQUIRED_USE="|| ( firefox firefox-bin )"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	xpi_unpack "passff-1.3-an+fx-linux.xpi"
+}
+
+src_install() {
+	local MOZILLA_FIVE_HOME
+	if use firefox; then
+		MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
+		xpi_install "passff-1.3-an+fx-linux"
+	fi
+
+	if use firefox-bin; then
+		MOZILLA_FIVE_HOME="/opt/firefox"
+		xpi_install "passff-1.3-an+fx-linux"
+	fi
+}