gentoo resync : 25.09.2021

3 files changed, 14 insertions, 8 deletions

diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index a3ffa3c426e6..2854c550ce2c 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,8 +1,8 @@
 AUX pinentry-0.8.2-ncurses.patch 824 BLAKE2B 922bb9a7079d4a3bc307a441f3f884f764f78819a16b57cde3dcb000ae7a23b592b390f53c528358818087c2c313716289b829c307f07dbee3c9580bd174cd0d SHA512 415ad55fd7a4ab66e87e5db76b1314b00f5a86552804f1f431a533ba1e7ec3f2c7136096106688b572639ceb637fdf0c3e25d96aa2e07fd1f6f295d39e1d4901
 AUX pinentry-1.0.0-AR.patch 326 BLAKE2B 2a05565287d2a3ff9423db1365af6ac1d2d0e0e5b3b7db49ee927eacd480cfbd29abd2313d84eb764e9d7eccd4654e2173fbf8be4508dd88f14bf12f0f9dab39 SHA512 3a8b13ddaa2af8c793586cd73e44b59828e769c3861b2d328273bac991e7e171c8714e2098674a9ae8a77c9a68098012d217e67dde8872df154a1e499837de52
 AUX pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch 1606 BLAKE2B bebea23f44a0512dad873f693a8343a47684c983ca37faba908bee62a7f87d1eaf2a097672df45fcfabb28911b55bc3b02177f910137f50d9c97a6939a1f7047 SHA512 15e6b86015bbf9f199bfa9e68f2a1b9f3fc14105313e1dbfb303d76b1949092ec2671b8d2a90fa8b05e0196da81e9f20875656dc11fdd96b48a14d79e4becdf7
-DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1bfe0458b973ed9d84479f8de9ee69ef309b518b40aa340434d64d37793cf97c94f78f99820bc5c71ecd2aac7a49 SHA512 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd
 DIST pinentry-1.1.1.tar.bz2 515723 BLAKE2B f257fe552852e6d1ff2c23aeb0c1127b43e3a60e44c78dfa764d569e659ccb78528ce3ee863114af273a4b6f6c24686cda2cb14bb04995eb8c41ccd4541a9fbd SHA512 d6ab5af8ac2f3c9c05e09703e95d8e2676f9b2b7ceb97f6a31d101d0e9da7a1e106a6d3eabe86cab1bb35a4b119a7cba1380ac64bf13c61af0b3c48803116c12
-EBUILD pinentry-1.1.0-r4.ebuild 2239 BLAKE2B f0bf43fd9a1d9d8bdcade2398e07ef5f960d13c20884965439cd90f5e08b0e8bc8d065f9d08d67bfaeff2759e62e99271fce5466f8cb60f19ef08d3e7a65fcf8 SHA512 da10a565ab8b921ab9a6097cd319183e0cdb278d56cb3c60d41eb4ee996e9f09fb6d9d1b80f14e8bff98e132a978df6df7c6e8ec1899bf73b6c647e35692b5da
+DIST pinentry-1.2.0.tar.bz2 498390 BLAKE2B 6e97b55fe39e9c17f8a87fa669d23fca56c1095c2533a9eebe459fafc95a3fcb0a5ea502077aae5480b5259a3096c5f85e05d4872c0b19ad33f3d9084a220cc7 SHA512 19cea79aa3982d1f0d75220c8e24ca38d6c49475c6f4c5aa7101151b4690db23ed316096a4a411136e716ba4eb471f48f9b09556e5c9837533c2356b9b384b63
 EBUILD pinentry-1.1.1-r1.ebuild 2312 BLAKE2B a195bb8d27f3f9af602dee69f329b712165ebc6f9bdb74736514e3ba6a8388fad1e26cce3fd45868033fd2b8d686aa973c6190c634f0fff20bc8d303be6bc2b5 SHA512 29bef11fe06782dba8e0776098a0eb9ba813778008b66e4442af545dcd0c91cda7852bc7a9b729c6ad049ea1c4f72bdf4467f6cb34ee92c78ced1ebf9e6d37dd
-MISC metadata.xml 334 BLAKE2B 9d136a24e5c50afb29aa6e1a94706c42bfe4c9323efa31b5011f018e2e44a83d3bb506e5a0889ad0454efc650e25ab89507a3d365c33ec839576bab918834554 SHA512 0a163be530c3070feff545958424a2f328be99c3f358c60df9fcf93e74b5f93e1be6b1ecceda8f06780f6d50f0556e97c83689432380368bbfc5d080318d8710
+EBUILD pinentry-1.2.0.ebuild 2320 BLAKE2B 8651c5ba8d9eb73b75b9390d69c9dddc531a3ddeaebf6c5c8ea6f3950759a02b54b51df5f0cd9661b06759aee072ff56f06e52e06e98fd369a885e422aca9311 SHA512 8b64420f9f1f0d28d7254293d6e4274216a8d1cf7164eb853256419af5052e7889e460acf9dfe0866c4128761d0f0d32b4b13cb5465ca2ccf767e8182d374bad
+MISC metadata.xml 452 BLAKE2B a2aef88d14b75ddb8f8cced6ee2dc1d0d66ac52ac5c686bd8d230bd9291146fa3fc0411682488e0a45c05b20640cf8b4093ee71a0ec60e02fe507dda2910c5fa SHA512 0517e56cd5cb905f4951205f4f7db6d01a14d28e1578612f91bfaee5dfc93a56eff4896201cf3c02f9ca02329b8597d6469187f60f429f7c5f6995fa0023aaf7
diff --git a/app-crypt/pinentry/metadata.xml b/app-crypt/pinentry/metadata.xml
index ec3e1208303b..6d11bc523c76 100644
--- a/app-crypt/pinentry/metadata.xml
+++ b/app-crypt/pinentry/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<use>
 		<flag name="efl">Build <pkg>dev-libs/efl</pkg> based pinentry</flag>
 	</use>
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r4.ebuild b/app-crypt/pinentry/pinentry-1.2.0.ebuild
index 4a7e89129558..14485afa8415 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r4.ebuild
+++ b/app-crypt/pinentry/pinentry-1.2.0.ebuild
@@ -6,20 +6,21 @@ EAPI=7
 inherit autotools flag-o-matic qmake-utils toolchain-funcs
 
 DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="https://gnupg.org/aegypten2/index.html"
+HOMEPAGE="https://gnupg.org/aegypten2"
 SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps emacs gnome-keyring gtk ncurses qt5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="caps efl emacs gnome-keyring gtk ncurses qt5"
 
 DEPEND="
-	app-eselect/eselect-pinentry
+	>=app-eselect/eselect-pinentry-0.7.2
 	>=dev-libs/libassuan-2.1
 	>=dev-libs/libgcrypt-1.6.3
 	>=dev-libs/libgpg-error-1.17
 	caps? ( sys-libs/libcap )
+	efl? ( dev-libs/efl[X] )
 	gnome-keyring? ( app-crypt/libsecret )
 	ncurses? ( sys-libs/ncurses:0= )
 	qt5? (
@@ -29,7 +30,7 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	gtk? ( app-crypt/gcr )
+	gtk? ( app-crypt/gcr[gtk] )
 "
 BDEPEND="
 	sys-devel/gettext
@@ -56,6 +57,7 @@ src_configure() {
 	export QTLIB="$(qt5_get_libdir)"
 
 	econf \
+		$(use_enable efl pinentry-efl) \
 		$(use_enable emacs pinentry-emacs) \
 		$(use_enable gnome-keyring libsecret) \
 		$(use_enable gtk pinentry-gnome3) \