7 files changed, 110 insertions, 14 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index ba5480a2dca6..aaa23b96ecb9 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index cd11eed9c106..c77890dcbe80 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,5 +1,6 @@
 AUX pinentry-1.0.0-AR.patch 326 BLAKE2B 2a05565287d2a3ff9423db1365af6ac1d2d0e0e5b3b7db49ee927eacd480cfbd29abd2313d84eb764e9d7eccd4654e2173fbf8be4508dd88f14bf12f0f9dab39 SHA512 3a8b13ddaa2af8c793586cd73e44b59828e769c3861b2d328273bac991e7e171c8714e2098674a9ae8a77c9a68098012d217e67dde8872df154a1e499837de52
 DIST pinentry-1.2.1.tar.bz2 547698 BLAKE2B aa47612aa3a6f74c3676bf4018780356cb22ed4078792c1f466f9e0465199428c151c0e20dfbe6c784ef93c2b42b673daff0b6adc74c8c98fed9921e65ed42ea SHA512 a665315628f4dcf07e16a22db3f3be15d7e7e93b3deec0546c7275b71b0e3bd65535a08af5e12d6339fd6595132df86529401d9d12bd17c428a3466e8dfafab6
 DIST pinentry-1.2.1.tar.bz2.sig 238 BLAKE2B 01ba3dc296a8e76c546d21d0bb0cd13778476d5d5b3ef55a3401c6a0353a56d79250d11555afb31c77c5a77e63847ded0f8eaef395bb0dc2ee3ff1d6a4ed83bd SHA512 d0e8435dc169a58f111f057f1c9fbb6c70da32a850f1107d6abdf41357c1714832728109ae61507db313d7eaef9596e5faf92fd21bed78adcc46a8c8a590430b
-EBUILD pinentry-1.2.1-r1.ebuild 2339 BLAKE2B 22e871265bbf50cc1b8b8b81d186e28a402056a9c1d24c70d1359bfcca8fea68bb5e36bae5640de52f17b33af84a420efc622e2323c913566ba673b3a1855099 SHA512 523d10f838c8208b06b3a403706095ab3101999b1a94089710c6a66a136cf585c4984ecd6c89e24eb16bbbc1e8e0141ab77f2685ddead05cc12367cbb06341c7
+EBUILD pinentry-1.2.1-r1.ebuild 2125 BLAKE2B 71de119a34c46d0a1e9e26b2fdd3f7e43ed9b059e8b979e19807b6230c87e7ec1bbb3c07c3f680e7e4d824ed0658a367da1fc1f44db2d9187d4578632fc2e0b6 SHA512 70bcca087e22cee71035a70bc0c593383df7b2f52797327660bcd8a4d20d62d10d44ddb69c8ee2fcc028d601f9767bebf1764c40fc8a1b0a2a7502805aa24b07
+EBUILD pinentry-1.2.1-r2.ebuild 2380 BLAKE2B 334b300075d817bedfd7b1c3f288ab76a228ee39b8a3b9680d5deb48af36edb87a69bad6cdccc21ffb1863611cf398298f9e8776f8498ba0a9d203ffc0c65d2a SHA512 c0880df7f2c706e5596bd5b4e5846795348ded0452e2a2ab2307138c07c45a20c58d71bd7126142e1d8a37def4a7fcd75086ed478eafb4fb1095ece598c3432f
 MISC metadata.xml 344 BLAKE2B d71f184ae783d215e32dc94e346c1f753f158b298cc2df87c14d5b73454ff3b4bf0ce4744d2aa0359bc68cb993cd35d2d6f77a09769853fda5b66e1cc1da3580 SHA512 0ae1c64980d4d94b8bbc04040a17b358b7138bf4022dcd97b6d2c464bc5fac0911c9522bea253586f69c8d137b75fe3e302d7cd9802290c2720c77706d9a935f
diff --git a/app-crypt/pinentry/pinentry-1.2.1-r1.ebuild b/app-crypt/pinentry/pinentry-1.2.1-r1.ebuild
index ee27968fb852..290f55094cd8 100644
--- a/app-crypt/pinentry/pinentry-1.2.1-r1.ebuild
+++ b/app-crypt/pinentry/pinentry-1.2.1-r1.ebuild
@@ -13,15 +13,15 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps efl emacs gnome-keyring gtk ncurses qt5"
+KEYWORDS="arm hppa ppc ppc64"
+IUSE="caps efl emacs keyring gtk ncurses qt5"
 
 DEPEND="
 	>=dev-libs/libassuan-2.1
 	>=dev-libs/libgcrypt-1.6.3
 	>=dev-libs/libgpg-error-1.17
 	efl? ( dev-libs/efl[X] )
-	gnome-keyring? ( app-crypt/libsecret )
+	keyring? ( app-crypt/libsecret )
 	ncurses? ( sys-libs/ncurses:= )
 	qt5? (
 		dev-qt/qtcore:5
@@ -61,7 +61,7 @@ src_configure() {
 	local myeconfargs=(
 		$(use_enable efl pinentry-efl)
 		$(use_enable emacs pinentry-emacs)
-		$(use_enable gnome-keyring libsecret)
+		$(use_enable keyring libsecret)
 		$(use_enable gtk pinentry-gnome3)
 		$(use_enable ncurses fallback-curses)
 		$(use_enable ncurses pinentry-curses)
diff --git a/app-crypt/pinentry/pinentry-1.2.1-r2.ebuild b/app-crypt/pinentry/pinentry-1.2.1-r2.ebuild
new file mode 100644
index 000000000000..a86907023716
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-1.2.1-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit autotools qmake-utils verify-sig
+
+DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="https://gnupg.org/aegypten2"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~m68k ~mips ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="caps efl emacs gtk keyring ncurses qt5"
+
+DEPEND="
+	>=dev-libs/libassuan-2.1
+	>=dev-libs/libgcrypt-1.6.3
+	>=dev-libs/libgpg-error-1.17
+	efl? ( dev-libs/efl[X] )
+	keyring? ( app-crypt/libsecret )
+	ncurses? ( sys-libs/ncurses:= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		kde-frameworks/kwayland:5
+		x11-libs/libX11
+	)
+"
+RDEPEND="${DEPEND}
+	gtk? ( app-crypt/gcr:0[gtk] )
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )
+"
+IDEPEND=">=app-eselect/eselect-pinentry-0.7.2"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+PATCHES=( "${FILESDIR}/${PN}-1.0.0-AR.patch" )
+
+src_prepare() {
+	default
+
+	unset FLTK_CONFIG
+
+	eautoreconf
+}
+
+src_configure() {
+	export PATH="$(qt5_get_bindir):${PATH}"
+	export QTLIB="$(qt5_get_libdir)"
+
+	local myeconfargs=(
+		$(use_enable efl pinentry-efl)
+		$(use_enable emacs pinentry-emacs)
+		$(use_enable keyring libsecret)
+		$(use_enable gtk pinentry-gnome3)
+		$(use_enable ncurses fallback-curses)
+		$(use_enable ncurses pinentry-curses)
+		$(use_enable qt5 pinentry-qt)
+
+		--enable-pinentry-tty
+		--disable-pinentry-fltk
+		--disable-pinentry-gtk2
+
+		MOC="$(qt5_get_bindir)"/moc
+		GPG_ERROR_CONFIG="${ESYSROOT}"/usr/bin/${CHOST}-gpg-error-config
+		LIBASSUAN_CONFIG="${ESYSROOT}"/usr/bin/libassuan-config
+
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	rm "${ED}"/usr/bin/pinentry || die
+
+	use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5
+}
+
+pkg_postinst() {
+	eselect pinentry update ifunset
+}
+
+pkg_postrm() {
+	eselect pinentry update ifunset
+}
diff --git a/app-crypt/zulucrypt/Manifest b/app-crypt/zulucrypt/Manifest
index 7a854be1100f..bbc85dcecd59 100644
--- a/app-crypt/zulucrypt/Manifest
+++ b/app-crypt/zulucrypt/Manifest
@@ -1,4 +1,4 @@
 AUX zulucrypt-5.5.0_pre20180223-fno-common.patch 524 BLAKE2B 7abdc51e78c112ac8787c16278903e02bc05c7066f03fb2fe821311c6830000b81531bb9bdb19d7ca2d3c91b7d85642c943ed839012f612170a4da7466150361 SHA512 71808d1dce262ac0ccd834c5461e01115d80153f3b4ad6274575bb190e89a64ddb34a3c5c66701c5f2b1a83e1ccfcb495df1772dd1a13c6155b55188acc3cfb2
 DIST zulucrypt-5.5.0_pre20180223.tar.gz 2162535 BLAKE2B 7d098ec20b7f355be6ad863121f7016d6b1ccbcc133438b616cfbd805110b24ae91dc74b0c2daf3137511fcb72e0338663c3c743c6c3d2b761883c57c590c0e5 SHA512 38ea9442a48c02741e11e59759b745ce3d6d6ca5f37d8b685526be76308a8fa1f7db7fd38038e5ce50e2a8afd8740b0a683a3458cb1df6f0b70c41fbf8035c15
-EBUILD zulucrypt-5.5.0_pre20180223.ebuild 1132 BLAKE2B 1245f868fd6fff5c010d03ac6c41b441de23b6d8a5db046d8748a2827ff0f64c84338006d8a95bfe27799c9e44c747de8577f099eff9ad3415586c22df418964 SHA512 ef29713207100695fc5e5b5c4d49707d165f01ef2e823818f9ba1c561b4cd6428c58bc74606bb662230fac48634b368083b300ffd2310bc6de02bf8150ffc0ba
-MISC metadata.xml 620 BLAKE2B e2bab6922c8f34ef68b76ae4ffde3eacda3ff19c5b24267c972e7f6cbecada181eef2e12077fb49902f1e9786e90e4d1b63d8bf74f87606c0a6b14d0226dc295 SHA512 399ca0d7a6427d5f0cb25c319dcb605f176c5aec47cdd9b54dcd56321fe106b3455b17793ccf3b13c5506d18c61864be46197ad780dae24983e4e6fd8f9f99ef
+EBUILD zulucrypt-5.5.0_pre20180223.ebuild 1138 BLAKE2B e074d771dad027eaf172d92d333572f229a5e3bcfadcb3b62dab1777089ecce82d7aaf0422cdc8b04696d83d5401a1da450bbce5d85f5b998d40beb4c226a5dd SHA512 3323a043dfaf30ab3c50a86a11d68eac69ffc0ab7d3ed9292dabd354823a3d5bbf5938e62843acf6836592ce210274cef490a1450c5030bad4c126357997f34f
+MISC metadata.xml 492 BLAKE2B 9caf25777cc4332115a0633a8d48981c407655b1f10b3f7d808079bb1f184c00ef91d9c728edcb60fa94aaed6c6b546d6a90e2b29d4788f68142efe3adda1eb4 SHA512 6e0b059e926329a1ff798e1a4c670d83ad34edb24243bc6c88fb314ca661b7c0c18013f6ad987720f32899bcc761266bd47e55acd3522e396b767f6ce6758869
diff --git a/app-crypt/zulucrypt/metadata.xml b/app-crypt/zulucrypt/metadata.xml
index 91676ea4813e..61d20bbc00aa 100644
--- a/app-crypt/zulucrypt/metadata.xml
+++ b/app-crypt/zulucrypt/metadata.xml
@@ -3,9 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
-		<flag name="gnome">
-			Enable support for the freedesktop.org Secret Service API via <pkg>app-crypt/libsecret</pkg>
-		</flag>
 		<flag name="kwallet">
 			Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg>
 		</flag>
diff --git a/app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild b/app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild
index c037845c99d6..cf3c4dd206ba 100644
--- a/app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild
+++ b/app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,13 +13,13 @@ SRC_URI="https://github.com/mhogomchungu/zuluCrypt/archive/${EGIT_COMMIT}.tar.gz
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gnome kwallet +qt5 udev"
+IUSE="keyring kwallet +qt5 udev"
 REQUIRED_USE="kwallet? ( qt5 )"
 
 DEPEND="
 	dev-libs/libgcrypt:0=
 	sys-fs/cryptsetup:=
-	gnome? ( app-crypt/libsecret )
+	keyring? ( app-crypt/libsecret )
 	qt5? (
 		dev-libs/libpwquality
 		dev-qt/qtcore:5
@@ -39,7 +39,7 @@ PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 src_configure() {
 	local mycmakeargs=(
 		-DLIB_SUFFIX="$(get_libdir)"
-		-DNOGNOME=$(usex !gnome)
+		-DNOGNOME=$(usex !keyring)
 		-DNOKDE=$(usex !kwallet)
 		-DNOGUI=$(usex !qt5)
 		-DQT5=true