From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 14D3C13888F for ; Mon, 26 Oct 2015 17:14:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75611E081D; Mon, 26 Oct 2015 17:14:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0638FE081D for ; Mon, 26 Oct 2015 17:14:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A2C5F340BB0 for ; Mon, 26 Oct 2015 17:14:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 14EF01712 for ; Mon, 26 Oct 2015 17:14:13 +0000 (UTC) From: "Kristian Fiskerstrand" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kristian Fiskerstrand" Message-ID: <1445879428.70b692fe8698ada3cb642dd7b956fe519adf6191.k_f@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/pinentry/pinentry-0.9.6-r6.ebuild X-VCS-Directories: app-crypt/pinentry/ X-VCS-Committer: k_f X-VCS-Committer-Name: Kristian Fiskerstrand X-VCS-Revision: 70b692fe8698ada3cb642dd7b956fe519adf6191 X-VCS-Branch: master Date: Mon, 26 Oct 2015 17:14:13 +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-Archives-Salt: 4b10604a-fc95-42cf-9ff1-e0bfeb62c3de X-Archives-Hash: 5de6ad161afc7820145ef7742b69ef05 commit: 70b692fe8698ada3cb642dd7b956fe519adf6191 Author: Kristian Fiskerstrand gentoo org> AuthorDate: Mon Oct 26 17:10:09 2015 +0000 Commit: Kristian Fiskerstrand gentoo org> CommitDate: Mon Oct 26 17:10:28 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70b692fe app-crypt/pinentry: Enable qt5 as possible single backend and fix symlink Enable qt5 as the only single backend and fix issue where pinentry-qt4 symlink was created unconditionally Bug: 564000 Bug: 563520 Package-Manager: portage-2.2.20.1 app-crypt/pinentry/pinentry-0.9.6-r6.ebuild | 123 ++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) diff --git a/app-crypt/pinentry/pinentry-0.9.6-r6.ebuild b/app-crypt/pinentry/pinentry-0.9.6-r6.ebuild new file mode 100644 index 0000000..ea0df55 --- /dev/null +++ b/app-crypt/pinentry/pinentry-0.9.6-r6.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs + +DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" +HOMEPAGE="http://gnupg.org/aegypten2/index.html" +SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="emacs gtk ncurses qt4 qt5 caps gnome-keyring static" + +CDEPEND=" + >=dev-libs/libgpg-error-1.17 + >=dev-libs/libassuan-2 + >=dev-libs/libgcrypt-1.6.3 + ncurses? ( sys-libs/ncurses:0= ) + gtk? ( x11-libs/gtk+:2 ) + qt4? ( + >=dev-qt/qtgui-4.4.1:4 + ) + qt5? ( + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + caps? ( sys-libs/libcap ) + static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) + app-eselect/eselect-pinentry + gnome-keyring? ( app-crypt/libsecret ) +" + +DEPEND="${CDEPEND} + sys-devel/gettext + virtual/pkgconfig +" + +RDEPEND=" + ${CDEPEND} + gnome-keyring? ( app-crypt/gcr ) +" + +REQUIRED_USE=" + || ( ncurses gtk qt4 qt5 ) + gtk? ( !static ) + qt4? ( !static ) + qt5? ( !static ) + static? ( ncurses ) + ?? ( qt4 qt5 ) +" + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + +src_prepare() { + epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch" + epatch "${FILESDIR}/${P}-add-disable-pinentry-qt5-option.patch" + eautoreconf +} + +src_configure() { + local myconf=() + use static && append-ldflags -static + [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 + + QT_MOC="" + if use qt4; then + myconf+=( --enable-pinentry-qt + --disable-pinentry-qt5 + ) + QT_MOC="$(qt4_get_bindir)"/moc + # Issues finding qt on multilib systems + export QTLIB="$(qt4_get_libdir)" + elif use qt5; then + myconf+=( --enable-pinentry-qt ) + QT_MOC="$(qt5_get_bindir)"/moc + export QTLIB="$(qt5_get_libdir)" + else + myconf+=( --disable-pinentry-qt ) + fi + + econf \ + --enable-pinentry-tty \ + $(use_enable emacs pinentry-emacs) \ + $(use_enable gtk pinentry-gtk2) \ + $(use_enable ncurses pinentry-curses) \ + $(use_enable ncurses fallback-curses) \ + $(use_with caps libcap) \ + $(use_enable gnome-keyring libsecret) \ + $(use_enable gnome-keyring pinentry-gnome3) \ + "${myconf[@]}" \ + MOC="${QT_MOC}" +} + +src_install() { + default + rm -f "${ED}"/usr/bin/pinentry || die + + if use qt4 || use qt5; then + dosym pinentry-qt /usr/bin/pinentry-qt4 + fi +} + +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 +} + +pkg_postrm() { + eselect pinentry update ifunset +}