From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E04331382C5 for ; Mon, 25 Jan 2021 16:09:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08C31E09D0; Mon, 25 Jan 2021 16:09:15 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D7238E09D0 for ; Mon, 25 Jan 2021 16:09:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8DEF9340F4B for ; Mon, 25 Jan 2021 16:09:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C5E9B9 for ; Mon, 25 Jan 2021 16:09:12 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1611590949.acad5327d6e44f7f4b2dd8a5eb6a563a1297aac3.zlogene@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.1.0-r3.ebuild app-crypt/pinentry/pinentry-1.1.0-r4.ebuild X-VCS-Directories: app-crypt/pinentry/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: acad5327d6e44f7f4b2dd8a5eb6a563a1297aac3 X-VCS-Branch: master Date: Mon, 25 Jan 2021 16:09:12 +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: 926260e9-5b20-46d5-af6c-55ffce5cb4fc X-Archives-Hash: bb5a177bf484bac7f3ef90c1dba6ef02 commit: acad5327d6e44f7f4b2dd8a5eb6a563a1297aac3 Author: Mikle Kolyada gentoo org> AuthorDate: Mon Jan 25 15:58:03 2021 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Mon Jan 25 16:09:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acad5327 app-crypt/pinentry: major rework - disable fltk (was not used) - disable gtk2 (obsolete) - fix qt5 symlink - link gnome3-pinentry under gtk USE Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> ...ry-1.1.0-r3.ebuild => pinentry-1.1.0-r4.ebuild} | 28 +++++++--------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r4.ebuild similarity index 66% rename from app-crypt/pinentry/pinentry-1.1.0-r3.ebuild rename to app-crypt/pinentry/pinentry-1.1.0-r4.ebuild index a86c83d4d9f..967f928b26f 100644 --- a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild +++ b/app-crypt/pinentry/pinentry-1.1.0-r4.ebuild @@ -12,7 +12,7 @@ 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 fltk gtk ncurses qt5" +IUSE="caps emacs gnome-keyring gtk ncurses qt5" DEPEND=" app-eselect/eselect-pinentry @@ -20,9 +20,7 @@ DEPEND=" >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 caps? ( sys-libs/libcap ) - fltk? ( x11-libs/fltk ) gnome-keyring? ( app-crypt/libsecret ) - gtk? ( x11-libs/gtk+:2 ) ncurses? ( sys-libs/ncurses:0= ) qt5? ( dev-qt/qtcore:5 @@ -31,7 +29,7 @@ DEPEND=" ) " RDEPEND="${DEPEND} - gnome-keyring? ( app-crypt/gcr ) + gtk? ( app-crypt/gcr ) " BDEPEND=" sys-devel/gettext @@ -48,6 +46,7 @@ PATCHES=( src_prepare() { default + unset FLTK_CONFIG eautoreconf } @@ -58,16 +57,15 @@ src_configure() { econf \ $(use_enable emacs pinentry-emacs) \ - $(use_enable fltk pinentry-fltk) \ $(use_enable gnome-keyring libsecret) \ - $(use_enable gnome-keyring pinentry-gnome3) \ - $(use_enable gtk pinentry-gtk2) \ + $(use_enable gtk pinentry-gnome3) \ $(use_enable ncurses fallback-curses) \ $(use_enable ncurses pinentry-curses) \ $(use_enable qt5 pinentry-qt) \ $(use_with caps libcap) \ --enable-pinentry-tty \ - FLTK_CONFIG="${ESYSROOT}/usr/bin/fltk-config" \ + --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" \ @@ -76,22 +74,12 @@ src_configure() { src_install() { default - rm -f "${ED}"/usr/bin/pinentry + rm "${ED}"/usr/bin/pinentry || die - use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4 + use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5 } pkg_postinst() { - if ! has_version 'app-crypt/pinentry' || has_version '=2.6.9 support memory locking for unprivileged processes." - elog "The soft resource limit for memory locking specifies the limit an" - elog "unprivileged process may lock into memory. You can also use POSIX" - elog "capabilities to allow pinentry to lock memory. To do so activate the caps" - elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" - elog "your users." - fi - eselect pinentry update ifunset }