gentoo resync : 04.01.2022

6 files changed, 13 insertions, 66 deletions

diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index d7aa48850ccf..9aebca912966 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 01662ba4eda4..40c53284689b 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_97.0.4692.56-1_amd64.deb 90818156 BLAKE2B d099fdd76e71d1140fe423853204e365f49a4dd5d94695b7e6482c6613383f2913e7254eada42b4783831bbec740d7fb596b9223a955d289f30e21a252600455 SHA512 27785efebc55bf24649aac6dd8def4c0f679fec1cf433c4e925e949f95dce62c31343a681b9c06b8e3e29cf666407a5b71505cfad9c6fa1cfffe33af99bb6dee
+DIST google-chrome-beta_97.0.4692.71-1_amd64.deb 89843732 BLAKE2B 2c3f5503e39dab49bf40bcebd120a817e45a0bb4448b739c9b4de5c57942b687d30a073eec7dc20063a7768772cc7e2c58efe25130969146bc1dcb066c77a895 SHA512 0b14190d1168818a1d63995e0366a7efd4421bc44507969da03b42f8a0bc2d73f538be48c9137484a71043bb83cf9a2bb3c828593937883dfc68fa1668bcf3c8
 DIST google-chrome-stable_96.0.4664.110-1_amd64.deb 89348996 BLAKE2B 5a5bcf7adad3351b6b45b375f5a03a8b50045733b14762bd5209d2423a1a0fdc95053356e3f0891445b61a6bc9dd6e0ecea1070f1ef247deb876a9f11f71da38 SHA512 b68f4d36321b026696ba15775164ad262e0a699f7e31bdfc414cedbf937fd5f4039528aa1d90d5efae0067720ddd00c783b98335d2f8e4b99f364525d85f31c6
 DIST google-chrome-unstable_98.0.4758.9-1_amd64.deb 89832144 BLAKE2B 639635452a9e5f2bd70c33f16ca9f66ad390c4d48632b877c3661c7be0b69112194b563012e3cbbd43dd5476801c5aca38746094eaa5c378c4242fe6e1cc8ec2 SHA512 4405a921172e6625c6645b030268157b4d54111d9da206d3e565f3cc3d3d6f415e0113ab0632a7dd5af93ac97fe849d68def61c9ad043905a44f198a2856c899
 EBUILD chrome-binary-plugins-96.0.4664.110.ebuild 1162 BLAKE2B 42cef63e0c49460e11b95cfe4383999f466204cc75069085ce15e435f9662e0d7eb143708334503c7c30df0144e5aa7bd378677ce36c4cfb5c9ccd82eea98b21 SHA512 d3d92b3333fae312d1ff0505368d67a9395f7aa19b4d89daa9241c844284c9465780639b485f9f132b1e85929f1f7713d8d4f86557b10c83e695002c0ec58c49
-EBUILD chrome-binary-plugins-97.0.4692.56_beta.ebuild 1163 BLAKE2B a8d31ca9c6a10536e4219032cf883e4b680faa33ecb455d50f49d2b6efa6fe494d718389183e680b80e517c9fbb6f0323513fb8e3a6e2f8427111a6e634b97d6 SHA512 0e048050229da9932403f5e05c859aa56237b06503d6745aa2e70ecd9d68d48568a63018f5c646096fd0d69bb2d35aa1f00302ee0c66e1b529fa1d6830094112
+EBUILD chrome-binary-plugins-97.0.4692.71_beta.ebuild 1163 BLAKE2B a8d31ca9c6a10536e4219032cf883e4b680faa33ecb455d50f49d2b6efa6fe494d718389183e680b80e517c9fbb6f0323513fb8e3a6e2f8427111a6e634b97d6 SHA512 0e048050229da9932403f5e05c859aa56237b06503d6745aa2e70ecd9d68d48568a63018f5c646096fd0d69bb2d35aa1f00302ee0c66e1b529fa1d6830094112
 EBUILD chrome-binary-plugins-98.0.4758.9_alpha.ebuild 1163 BLAKE2B a8d31ca9c6a10536e4219032cf883e4b680faa33ecb455d50f49d2b6efa6fe494d718389183e680b80e517c9fbb6f0323513fb8e3a6e2f8427111a6e634b97d6 SHA512 0e048050229da9932403f5e05c859aa56237b06503d6745aa2e70ecd9d68d48568a63018f5c646096fd0d69bb2d35aa1f00302ee0c66e1b529fa1d6830094112
 MISC metadata.xml 263 BLAKE2B 63f20710af1b20f01824544c06058c4bef7c4b6e1b66a2bcd17c2dde8f48e6b30a074ec6c3940976d652bb8885a80495914a3ddf4de5766c04f5913780c85668 SHA512 85a03d35084d8d81e038c8065fe58a36f3dd1f5355aaf62033ba590636fa4855ee993ec5f3d10645a55754debddf0b57b4403172f3808e4575b3b2d8d7f180c0
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-97.0.4692.56_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-97.0.4692.71_beta.ebuild
index e11c8c2a2bb2..e11c8c2a2bb2 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-97.0.4692.56_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-97.0.4692.71_beta.ebuild
diff --git a/www-plugins/passff-host/Manifest b/www-plugins/passff-host/Manifest
index 1f2057fddacc..a0363fa826ee 100644
--- a/www-plugins/passff-host/Manifest
+++ b/www-plugins/passff-host/Manifest
@@ -1,7 +1,4 @@
-DIST passff-host-1.2.2.json 176 BLAKE2B 8eddc19cd0c072d25afff5cfa86a95d960ae7b986727099a04a1d983b887922f9ad77e940a2c80e0838a169afe81fa3f6529a901998bb98a6750ac888a09c264 SHA512 e4a4b90fb5323c6dbec339b9e67a7d546c6d7a95754fe03b3a4d96396c28de1caba3068b4e936ee0ce0997f865c8b5e53a3da1fb34f0123a04c5889302c28911
-DIST passff-host-1.2.2.py 3691 BLAKE2B 3fb64c6ca0d512d61f7bd3884ff5714f5a1b93095ab1c99043645d8253b5128d3d054faec6bff0f560f536b10ffa1cd523dc440b19d90cfff3bac6009f0ce86e SHA512 407be35359e987f355f04a45bf8a0c1023ee04d3c6d7c4ea9cce29955957cd514302ca04aeda4367e8560e8d765159b5fddad2e51ea089f9eb2947564605b5cf
 DIST passff-host-1.2.3.json 176 BLAKE2B 8eddc19cd0c072d25afff5cfa86a95d960ae7b986727099a04a1d983b887922f9ad77e940a2c80e0838a169afe81fa3f6529a901998bb98a6750ac888a09c264 SHA512 e4a4b90fb5323c6dbec339b9e67a7d546c6d7a95754fe03b3a4d96396c28de1caba3068b4e936ee0ce0997f865c8b5e53a3da1fb34f0123a04c5889302c28911
 DIST passff-host-1.2.3.py 3691 BLAKE2B 428573d2493f9ff8ef1dc6c8971508a05afa1bef7e06831462106e8daa98c9bedf63489e6630ff9c441ef981164656932c404ffd47e12a2e1e77a55c3ec4955e SHA512 be01e5ed3974bc0967e0dd102593ea8b4f62a5b4ca3f8f2fa2743f9abb4118334cfd27ecd595ce31dd079831614ebf8d91c5b504ad5ead067c245b921d756ceb
-EBUILD passff-host-1.2.2.ebuild 1545 BLAKE2B cc3522ae73d1dc949f6b5595cdda26a02265d357655da4172fb73c0defeb74f6e0e573cba89b690dffedfd1a40a6942668bf4f60763ba6807ac7c457a6b7ce6a SHA512 35cb3ba625c187eef187301b3ba13a219082925167614be29672f7d17ddcc5db14f2ae0b271d523715f55eaa2a5cf5fed54fd0ae3e82e4808941111e4169d9ad
-EBUILD passff-host-1.2.3.ebuild 1545 BLAKE2B cc3522ae73d1dc949f6b5595cdda26a02265d357655da4172fb73c0defeb74f6e0e573cba89b690dffedfd1a40a6942668bf4f60763ba6807ac7c457a6b7ce6a SHA512 35cb3ba625c187eef187301b3ba13a219082925167614be29672f7d17ddcc5db14f2ae0b271d523715f55eaa2a5cf5fed54fd0ae3e82e4808941111e4169d9ad
+EBUILD passff-host-1.2.3-r1.ebuild 1781 BLAKE2B c096baf3fbfdff83ee3ceec514a19cdf112198da92d5017100cf1e17f73d5628c976419a346fe3856442c79d6f4368be1fab93d67d1b0c9f8659be2967ea9e93 SHA512 4f14b856dec0ee944dedd1af474128d27f67ab19bca06e16ebc5c2c5198344f8e9d137ac2cde460624645f89d7d6ca5c0222c6a42e568d4d7409f19fe9405854
 MISC metadata.xml 606 BLAKE2B a5d49f8a42512b029523ca6a6bd7381de2c8d55bba920eecb63b76936edd6a1821f3a89665e9e5aa934c94a4ec14d4ac6751f4e3085b9b953e0b02ef801e3329 SHA512 13da163e895654c551434f0765cb55e45209af882e822cbcf6a664fb6ce88b4ae8f64cf832c38a6e2827b0d0cccd945059196c7b8fff125ce25e3f0b6e283eb5
diff --git a/www-plugins/passff-host/passff-host-1.2.2.ebuild b/www-plugins/passff-host/passff-host-1.2.3-r1.ebuild
index 3c481e7e23ec..0f40d6776d69 100644
--- a/www-plugins/passff-host/passff-host-1.2.2.ebuild
+++ b/www-plugins/passff-host/passff-host-1.2.3-r1.ebuild
@@ -24,7 +24,10 @@ REQUIRED_USE="
 	|| ( chrome chromium firefox vivaldi )
 "
 
-RDEPEND="${PYTHON_DEPS}"
+RDEPEND="
+	${PYTHON_DEPS}
+	app-crypt/pinentry
+"
 
 S="${WORKDIR}"
 
@@ -57,3 +60,9 @@ src_install() {
 		newexe "${P}.py" passff.py
 	done
 }
+
+pkg_postinst() {
+	elog "Make sure to use graphical version of pinentry for ${PN} to work properly"
+	elog "Run 'eselect pinentry list'"
+	elog "And select 'pinentry-qt5' or 'pinentry-gnome'. efl might work too."
+}
diff --git a/www-plugins/passff-host/passff-host-1.2.3.ebuild b/www-plugins/passff-host/passff-host-1.2.3.ebuild
deleted file mode 100644
index 3c481e7e23ec..000000000000
--- a/www-plugins/passff-host/passff-host-1.2.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit python-single-r1
-
-DESCRIPTION="Host app for the PassFF WebExtension"
-HOMEPAGE="https://github.com/passff/passff-host"
-
-SRC_URI="
-	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"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="chrome chromium +firefox vivaldi"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( chrome chromium firefox vivaldi )
-"
-
-RDEPEND="${PYTHON_DEPS}"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${P}.json" . || die
-	cp "${DISTDIR}/${P}.py" . || die
-}
-
-src_prepare() {
-	default
-	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/$(get_libdir)/mozilla/native-messaging-hosts" )
-	# www-client/firefox-bin compile-time dir is under /usr/lib/
-	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}/passff.py;g" "${P}.json" > "passff.json" || die
-
-		insinto "${target_dir}"
-		doins passff.json
-		exeinto "${target_dir}"
-		newexe "${P}.py" passff.py
-	done
-}