summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-12-21 15:58:29 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2017-12-21 15:59:02 +0100
commitcec537a1e49f84fbd3ec055fcbf7e80fd825ecf4 (patch)
tree930eb0a44f169109b20eb1fddbdabd2613d6f729 /app-crypt/pinentry
parentapp-backup/burp: set more restrictive permissions on /etc/burp (diff)
downloadgentoo-cec537a1e49f84fbd3ec055fcbf7e80fd825ecf4.tar.gz
gentoo-cec537a1e49f84fbd3ec055fcbf7e80fd825ecf4.tar.bz2
gentoo-cec537a1e49f84fbd3ec055fcbf7e80fd825ecf4.zip
app-crypt/pinentry: Drop 0.9.7-r1
Bug: https://bugs.gentoo.org/632293 Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'app-crypt/pinentry')
-rw-r--r--app-crypt/pinentry/Manifest1
-rw-r--r--app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches48
-rw-r--r--app-crypt/pinentry/pinentry-0.9.7-r1.ebuild122
3 files changed, 0 insertions, 171 deletions
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 4388ca003ba8..4740ef28c919 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,2 +1 @@
-DIST pinentry-0.9.7.tar.bz2 432978 BLAKE2B fffeaa5548a4f4fc60a2adef51d1b8c74be910e0c377afd223aeb1de00f59cf84b376562d0a8e5b8d59a144ac3cdab0a260c5b15cacf1a7d9d5508d8b413ce3e SHA512 9c5bc8f7246e8b0affd83fea6e64c47cecf6a12515a82dd2a6712b230306a9c3c97da4dbf6519ea98c85c88bf180a5a2b8c46cedcd594f224e5a08f2f0e35bf0
DIST pinentry-1.0.0.tar.bz2 436930 BLAKE2B 949be8de8504a42cd5bd6ffebe331a825db7ff3c2ccc5fc554155b7621fddf9df957aa92063eb1a06c6964826a296bf60a4cc46cf2886552e37703a62042f35a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62
diff --git a/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches b/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches
deleted file mode 100644
index 406571cdd3a0..000000000000
--- a/app-crypt/pinentry/files/pinentry-0.9.7-require-CPP11-for-qt-5-7.patches
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7384e2a575dde2809784d9f182fd1d247064c8a2 Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
-Date: Thu, 11 Aug 2016 14:44:37 +0200
-Subject: [PATCH] Qt: Append -std=c++11 if building against Qt 5.7
-
- * m4/qt.m4: Append -std=c++11 to CFLAGS if building against Qt 5.7
-
---
-Qt 5.7 enables C++11 for Qt modules, and any app relying on it require to be
-compiled with at least this standard.
-
-This patch adds detection for Qt 5.7 and make sure -std=c++11 is passed if
-building against Qt 5.7 or higher.
----
- m4/qt.m4 | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/m4/qt.m4 b/m4/qt.m4
-index 093f428..90c4a6e 100644
---- a/m4/qt.m4
-+++ b/m4/qt.m4
-@@ -35,6 +35,7 @@ AC_DEFUN([FIND_QT],
- enable_pinentry_qt5="try")
-
- have_qt5_libs="no";
-+ require_qt_cpp11="no";
-
- if test "$enable_pinentry_qt5" != "no"; then
- PKG_CHECK_MODULES(PINENTRY_QT,
-@@ -47,6 +48,15 @@ AC_DEFUN([FIND_QT],
- fi
- fi
- if test "$have_qt5_libs" = "yes"; then
-+ PKG_CHECK_MODULES(PINENTRY_QT_REQUIRE_CPP11,
-+ Qt5Core >= 5.7.0,
-+ [require_qt_cpp11="yes"],
-+ [require_qt_cpp11="no"])
-+
-+ if test "${require_qt_cpp11}" = "yes"; then
-+ PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -std=c++11"
-+ fi
-+
- AC_CHECK_TOOL(MOC, moc)
- AC_MSG_CHECKING([moc version])
- mocversion=`$MOC -v 2>&1`
---
-2.7.3
-
diff --git a/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild b/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild
deleted file mode 100644
index 82a509210995..000000000000
--- a/app-crypt/pinentry/pinentry-0.9.7-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Simple 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 ~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.1
- >=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"\
- "${FILESDIR}/${P}-require-CPP11-for-qt-5-7.patches"
- 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 '<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
-}