1 |
commit: ffef7263386b2cafebe4eda082a9b95fbab85af9 |
2 |
Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 21 17:17:51 2015 +0000 |
4 |
Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 21 17:18:22 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffef7263 |
7 |
|
8 |
app-crypt/pinentry: Remove flawed revision 0.9.6-r1 |
9 |
|
10 |
Package-Manager: portage-2.2.20.1 |
11 |
|
12 |
...ry-0.9.6-Disable-Qt5-support-to-force-Qt4.patch | 27 ------- |
13 |
app-crypt/pinentry/pinentry-0.9.6-r1.ebuild | 93 ---------------------- |
14 |
2 files changed, 120 deletions(-) |
15 |
|
16 |
diff --git a/app-crypt/pinentry/files/pinentry-0.9.6-Disable-Qt5-support-to-force-Qt4.patch b/app-crypt/pinentry/files/pinentry-0.9.6-Disable-Qt5-support-to-force-Qt4.patch |
17 |
deleted file mode 100644 |
18 |
index 802e6ff..0000000 |
19 |
--- a/app-crypt/pinentry/files/pinentry-0.9.6-Disable-Qt5-support-to-force-Qt4.patch |
20 |
+++ /dev/null |
21 |
@@ -1,27 +0,0 @@ |
22 |
-From 41aa99a1886fa07aad5716fb4905843ecfcbffb2 Mon Sep 17 00:00:00 2001 |
23 |
-From: Kristian Fiskerstrand <kristian.fiskerstrand@××××××××××××××××.com> |
24 |
-Date: Fri, 18 Sep 2015 17:22:11 +0200 |
25 |
-Subject: [PATCH] Disable Qt5 support to force Qt4 for now |
26 |
- |
27 |
-Automagic applies in detecting Qt5 which makes dependency specification |
28 |
-difficult. Disabling the auto-detection for Qt5 and keeping Qt4 for now |
29 |
---- |
30 |
- m4/qt.m4 | 2 +- |
31 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
32 |
- |
33 |
-diff --git a/m4/qt.m4 b/m4/qt.m4 |
34 |
-index 0a7ea99..e7abfcc 100644 |
35 |
---- a/m4/qt.m4 |
36 |
-+++ b/m4/qt.m4 |
37 |
-@@ -30,7 +30,7 @@ AC_DEFUN([FIND_QT], |
38 |
- [ |
39 |
- PKG_CHECK_MODULES(PINENTRY_QT, |
40 |
- Qt5Core >= 5.0.0 Qt5Gui >= 5.0.0 Qt5Widgets >= 5.0.0, |
41 |
-- [have_qt5_libs="yes"], |
42 |
-+ [have_qt5_libs="no"], |
43 |
- [have_qt5_libs="no"]) |
44 |
- |
45 |
- if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then |
46 |
--- |
47 |
-2.4.6 |
48 |
- |
49 |
|
50 |
diff --git a/app-crypt/pinentry/pinentry-0.9.6-r1.ebuild b/app-crypt/pinentry/pinentry-0.9.6-r1.ebuild |
51 |
deleted file mode 100644 |
52 |
index 95a660f..0000000 |
53 |
--- a/app-crypt/pinentry/pinentry-0.9.6-r1.ebuild |
54 |
+++ /dev/null |
55 |
@@ -1,93 +0,0 @@ |
56 |
-# Copyright 1999-2015 Gentoo Foundation |
57 |
-# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $Id$ |
59 |
- |
60 |
-EAPI=5 |
61 |
- |
62 |
-inherit autotools qmake-utils multilib eutils flag-o-matic toolchain-funcs |
63 |
- |
64 |
-DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol" |
65 |
-HOMEPAGE="http://gnupg.org/aegypten2/index.html" |
66 |
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" |
67 |
- |
68 |
-LICENSE="GPL-2" |
69 |
-SLOT="0" |
70 |
-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" |
71 |
-IUSE="emacs gtk ncurses qt4 caps gnome-keyring static" |
72 |
- |
73 |
-RDEPEND=" |
74 |
- >=dev-libs/libgpg-error-1.17 |
75 |
- >=dev-libs/libassuan-2 |
76 |
- app-eselect/eselect-pinentry |
77 |
- caps? ( sys-libs/libcap ) |
78 |
- gtk? ( x11-libs/gtk+:2 ) |
79 |
- ncurses? ( sys-libs/ncurses:0= ) |
80 |
- qt4? ( >=dev-qt/qtgui-4.4.1:4 ) |
81 |
- static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) |
82 |
-" |
83 |
-DEPEND="${RDEPEND} |
84 |
- sys-devel/gettext |
85 |
- virtual/pkgconfig |
86 |
- gnome-keyring? ( app-crypt/libsecret ) |
87 |
-" |
88 |
-REQUIRED_USE=" |
89 |
- || ( ncurses gtk qt4 ) |
90 |
- gtk? ( !static ) |
91 |
- qt4? ( !static ) |
92 |
- static? ( ncurses ) |
93 |
-" |
94 |
- |
95 |
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) |
96 |
- |
97 |
-src_prepare() { |
98 |
- epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch" |
99 |
- epatch "${FILESDIR}/${P}-Disable-Qt5-support-to-force-Qt4.patch" |
100 |
- eautoreconf |
101 |
-} |
102 |
- |
103 |
-src_configure() { |
104 |
- use static && append-ldflags -static |
105 |
- [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 |
106 |
- |
107 |
- # Issues finding qt on multilib systems |
108 |
- export QTLIB="${QTDIR}/$(get_libdir)" |
109 |
- |
110 |
- econf \ |
111 |
- --enable-pinentry-tty \ |
112 |
- $(use_enable emacs pinentry-emacs) \ |
113 |
- $(use_enable gtk pinentry-gtk2) \ |
114 |
- $(use_enable ncurses pinentry-curses) \ |
115 |
- $(use_enable ncurses fallback-curses) \ |
116 |
- $(use_enable qt4 pinentry-qt) \ |
117 |
- $(use_with caps libcap) \ |
118 |
- $(use_enable gnome-keyring libsecret) \ |
119 |
- $(use_enable gnome-keyring pinentry-gnome3) \ |
120 |
- MOC="$(qt4_get_bindir)"/moc |
121 |
-} |
122 |
- |
123 |
-src_install() { |
124 |
- default |
125 |
- rm -f "${ED}"/usr/bin/pinentry || die |
126 |
- |
127 |
- if use_enable qt4; then |
128 |
- dosym pinentry-qt /usr/bin/pinentry-qt4 |
129 |
- fi |
130 |
-} |
131 |
- |
132 |
-pkg_postinst() { |
133 |
- if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then |
134 |
- elog "We no longer install pinentry-curses and pinentry-qt SUID root by default." |
135 |
- elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes." |
136 |
- elog "The soft resource limit for memory locking specifies the limit an" |
137 |
- elog "unprivileged process may lock into memory. You can also use POSIX" |
138 |
- elog "capabilities to allow pinentry to lock memory. To do so activate the caps" |
139 |
- elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" |
140 |
- elog "your users." |
141 |
- fi |
142 |
- |
143 |
- eselect pinentry update ifunset |
144 |
-} |
145 |
- |
146 |
-pkg_postrm() { |
147 |
- eselect pinentry update ifunset |
148 |
-} |