From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DA5001581FD for ; Sat, 06 Sep 2025 21:20:04 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 45DE1340D0A for ; Sat, 06 Sep 2025 21:20:04 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id ADE1C11056F; Sat, 06 Sep 2025 21:19:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id A3C1411056F for ; Sat, 06 Sep 2025 21:19:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2FD97340E15 for ; Sat, 06 Sep 2025 21:19:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CCC66306C for ; Sat, 06 Sep 2025 21:19:57 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1757193428.cff0a38faf832c83cf9e4f84b48a7f1cb99c6544.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/pinentry/pinentry-1.3.2-r1.ebuild X-VCS-Directories: app-crypt/pinentry/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: cff0a38faf832c83cf9e4f84b48a7f1cb99c6544 X-VCS-Branch: master Date: Sat, 06 Sep 2025 21:19:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 22beabc1-aa83-451d-a315-18b3a4f1be8f X-Archives-Hash: 35025cff62951479c28992df6e56ffb9 commit: cff0a38faf832c83cf9e4f84b48a7f1cb99c6544 Author: Sam James gentoo org> AuthorDate: Sat Sep 6 21:16:56 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sat Sep 6 21:17:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff0a38f app-crypt/pinentry: depend on gnome-keyring with USE=gtk With USE=gtk and only app-crypt/gcr:4 installed, I get: ``` $ G_MESSAGES_DEBUG=all G_DEBUG=all pinentry-gnome3 (process:503360): Gcr-DEBUG: 09:38:27.242: opening prompt (process:503360): Gcr-DEBUG: 09:38:27.242: connecting to bus (process:503360): Gcr-DEBUG: 09:38:27.245: connected to bus (process:503360): Gcr-DEBUG: 09:38:27.245: calling BeginPrompting method on prompter (process:503360): Gcr-DEBUG: 09:38:27.251: failed to register prompt org.gnome.keyring.SystemPrompter: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: The name org.gnome.keyring.SystemPrompter was not provided by any .service files (process:503360): Gcr-DEBUG: 09:38:27.251: closing prompt ``` If I install app-crypt/gcr:0, it starts to work, but that's because app-crypt/gcr:0 depends on gnome-base/gnome-keyring. We could switch the dep in pinentry to gcr:0 so we don't pull in 2 gcr slots, but then we'd have to modify configure to avoid automagic on gcr:4, and my hope is that the issue here will be fixed upstream at some point (though it's not clear to me whose fault it is, see e.g. https://gitlab.gnome.org/GNOME/gnome-keyring/-/issues/139 too). TL;DR: depend on gnome-base/gnome-keyring to make pinentry-gnome3 work again. Closes: https://bugs.gentoo.org/960307 Signed-off-by: Sam James gentoo.org> app-crypt/pinentry/pinentry-1.3.2-r1.ebuild | 122 ++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/app-crypt/pinentry/pinentry-1.3.2-r1.ebuild b/app-crypt/pinentry/pinentry-1.3.2-r1.ebuild new file mode 100644 index 000000000000..8591f2188a61 --- /dev/null +++ b/app-crypt/pinentry/pinentry-1.3.2-r1.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH=/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/related_software/pinentry/" +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 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="caps efl emacs gtk keyring ncurses qt6 wayland X" + +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:= ) + qt6? ( + dev-qt/qtbase:6[gui,widgets] + wayland? ( + kde-frameworks/kguiaddons:6 + kde-frameworks/kwindowsystem:6 + ) + ) +" +RDEPEND=" + ${DEPEND} + gtk? ( + app-crypt/gcr:4[gtk] + gnome-base/gnome-keyring + ) +" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-gnupg ) +" +PDEPEND="emacs? ( app-emacs/pinentry )" +IDEPEND=">=app-eselect/eselect-pinentry-0.7.4" + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + +PATCHES=( + "${FILESDIR}/${PN}-1.0.0-AR.patch" + "${FILESDIR}/${PN}-1.3.0-automagic.patch" # bug #819939, bug #837719 +) + +src_prepare() { + default + + eautoreconf +} + +src_configure() { + unset FLTK_CONFIG + + 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 qt6 pinentry-qt) + $(use_with X x) + + --enable-pinentry-tty + --disable-kf5-wayland + --disable-pinentry-fltk + --disable-pinentry-gtk2 + --disable-pinentry-qt5 + --disable-qtx11extras + + ac_cv_path_GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config" + + $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') + ) + + if use qt6 ; then + export PATH="$(qt6_get_bindir):${PATH}" + export QTLIB="$(qt6_get_libdir):${QTLIB}" + export MOC="$(qt6_get_libdir)/qt6/libexec/moc" + + myeconfargs+=( + $(use_enable wayland kf6-wayland) + ) + else + myeconfargs+=( + --disable-kf6-wayland + ) + fi + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + rm "${ED}"/usr/bin/pinentry || die + + # The preferred Qt implementation upstream gets installed as just 'qt'. + # Make a symlink for eselect-pinentry and friends. + if use qt6 ; then + dosym pinentry-qt /usr/bin/pinentry-qt6 + fi +} + +pkg_postinst() { + eselect pinentry update ifunset +} + +pkg_postrm() { + eselect pinentry update ifunset +}