commit: 2b97b37e5a9f90e05b4675025332b1854462fe19 Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org> AuthorDate: Mon Sep 21 17:16:26 2015 +0000 Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org> CommitDate: Mon Sep 21 17:18:17 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b97b37e
app-crypt/pinentry: Completely remove Qt5 detection Revision bump that removes more of the Qt5 automagic that resulted in failed builds in 0.9.6-r1 Bug: 560786 Package-Manager: portage-2.2.20.1 .../pinentry-0.9.6-Remove-detection-of-Qt5.patch | 60 ++++++++++++++ app-crypt/pinentry/pinentry-0.9.6-r2.ebuild | 93 ++++++++++++++++++++++ 2 files changed, 153 insertions(+) diff --git a/app-crypt/pinentry/files/pinentry-0.9.6-Remove-detection-of-Qt5.patch b/app-crypt/pinentry/files/pinentry-0.9.6-Remove-detection-of-Qt5.patch new file mode 100644 index 0000000..0ab9160 --- /dev/null +++ b/app-crypt/pinentry/files/pinentry-0.9.6-Remove-detection-of-Qt5.patch @@ -0,0 +1,60 @@ +From eb2cd9487749be01a1ad34ce6036366208147290 Mon Sep 17 00:00:00 2001 +From: Kristian Fiskerstrand <kristian.fiskerstr...@sumptuouscapital.com> +Date: Mon, 21 Sep 2015 19:09:04 +0200 +Subject: [PATCH] m4/qt.m4: Remove detection of Qt5 + +--- + m4/qt.m4 | 36 +----------------------------------- + 1 file changed, 1 insertion(+), 35 deletions(-) + +diff --git a/m4/qt.m4 b/m4/qt.m4 +index 0a7ea99..2982bb8 100644 +--- a/m4/qt.m4 ++++ b/m4/qt.m4 +@@ -28,42 +28,8 @@ dnl The moc lookup code is based on libpoppler (rev. d821207) + + AC_DEFUN([FIND_QT], + [ +- PKG_CHECK_MODULES(PINENTRY_QT, +- Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Widgets >= 5.0.0, +- [have_qt5_libs="yes"], +- [have_qt5_libs="no"]) ++ have_qt5_libs="no" + +- if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then +- PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -fpic" +- fi +- +- if test "$have_qt5_libs" = "yes"; then +- AC_CHECK_TOOL(MOC, moc) +- AC_MSG_CHECKING([moc version]) +- mocversion=`$MOC -v 2>&1` +- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"` +- if test x"$mocversiongrep" != x"$mocversion"; then +- AC_MSG_RESULT([no]) +- # moc was not the qt5 one, try with moc-qt5 +- AC_CHECK_TOOL(MOC2, moc-qt5) +- mocversion=`$MOC2 -v 2>&1` +- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"` +- if test x"$mocversiongrep" != x"$mocversion"; then +- AC_CHECK_TOOL(QTCHOOSER, qtchooser) +- qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2` +- mocversion=`$qt5tooldir/moc -v 2>&1` +- mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"` +- if test x"$mocversiongrep" != x"$mocversion"; then +- # no valid moc found +- have_qt5_libs="no"; +- else +- MOC=$qt5tooldir/moc +- fi +- else +- MOC=$MOC2 +- fi +- fi +- fi + if test "$have_qt5_libs" != "yes"; then + PKG_CHECK_MODULES(PINENTRY_QT, + QtCore >= 4.4.0 QtGui >= 4.4.0, +-- +2.4.6 + diff --git a/app-crypt/pinentry/pinentry-0.9.6-r2.ebuild b/app-crypt/pinentry/pinentry-0.9.6-r2.ebuild new file mode 100644 index 0000000..fe19fd0 --- /dev/null +++ b/app-crypt/pinentry/pinentry-0.9.6-r2.ebuild @@ -0,0 +1,93 @@ +# 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 caps gnome-keyring static" + +RDEPEND=" + >=dev-libs/libgpg-error-1.17 + >=dev-libs/libassuan-2 + app-eselect/eselect-pinentry + caps? ( sys-libs/libcap ) + gtk? ( x11-libs/gtk+:2 ) + ncurses? ( sys-libs/ncurses:0= ) + qt4? ( >=dev-qt/qtgui-4.4.1:4 ) + static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) +" +DEPEND="${RDEPEND} + sys-devel/gettext + virtual/pkgconfig + gnome-keyring? ( app-crypt/libsecret ) +" +REQUIRED_USE=" + || ( ncurses gtk qt4 ) + gtk? ( !static ) + qt4? ( !static ) + static? ( ncurses ) +" + +DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) + +src_prepare() { + epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch" + epatch "${FILESDIR}/${P}-Remove-detection-of-Qt5.patch" + eautoreconf +} + +src_configure() { + use static && append-ldflags -static + [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 + + # Issues finding qt on multilib systems + export QTLIB="${QTDIR}/$(get_libdir)" + + 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_enable qt4 pinentry-qt) \ + $(use_with caps libcap) \ + $(use_enable gnome-keyring libsecret) \ + $(use_enable gnome-keyring pinentry-gnome3) \ + MOC="$(qt4_get_bindir)"/moc +} + +src_install() { + default + rm -f "${ED}"/usr/bin/pinentry || die + + if use_enable qt4; then + dosym pinentry-qt /usr/bin/pinentry-qt4 + fi +} + +pkg_postinst() { + if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then + elog "We no longer install pinentry-curses and pinentry-qt SUID root by default." + elog "Linux kernels >=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 +}
