diff options
author | Alon Bar-Lev <alonbl@gentoo.org> | 2017-01-18 16:44:00 +0200 |
---|---|---|
committer | Alon Bar-Lev <alonbl@gentoo.org> | 2017-01-18 16:52:15 +0200 |
commit | f1424a382c5967750cc0a7992e45c7197adfd802 (patch) | |
tree | d89bfa7689c0ad2206cd52f988f9803cdcb81ada /app-crypt/pinentry | |
parent | dev-libs/npth: cleanup (diff) | |
download | gentoo-f1424a382c5967750cc0a7992e45c7197adfd802.tar.gz gentoo-f1424a382c5967750cc0a7992e45c7197adfd802.tar.bz2 gentoo-f1424a382c5967750cc0a7992e45c7197adfd802.zip |
app-crypt/pinentry: cleanup
Package-Manager: portage-2.3.0
Diffstat (limited to 'app-crypt/pinentry')
-rw-r--r-- | app-crypt/pinentry/Manifest | 3 | ||||
-rw-r--r-- | app-crypt/pinentry/files/pinentry-0.8.2-texi.patch | 20 | ||||
-rw-r--r-- | app-crypt/pinentry/files/pinentry-0.9.0-accessibility.patch | 82 | ||||
-rw-r--r-- | app-crypt/pinentry/files/pinentry-0.9.5-build.patch | 52 | ||||
-rw-r--r-- | app-crypt/pinentry/files/pinentry-0.9.6-add-disable-pinentry-qt5-option.patch | 55 | ||||
-rw-r--r--[-rwxr-xr-x] | app-crypt/pinentry/files/pinentry-1.0.0-build.patch | 0 | ||||
-rw-r--r-- | app-crypt/pinentry/metadata.xml | 3 | ||||
-rw-r--r-- | app-crypt/pinentry/pinentry-0.9.0-r3.ebuild | 101 | ||||
-rw-r--r-- | app-crypt/pinentry/pinentry-0.9.0.ebuild | 98 | ||||
-rw-r--r-- | app-crypt/pinentry/pinentry-0.9.5.ebuild | 89 | ||||
-rw-r--r-- | app-crypt/pinentry/pinentry-0.9.6-r6.ebuild | 123 | ||||
-rw-r--r-- | app-crypt/pinentry/pinentry-0.9.7.ebuild | 122 |
12 files changed, 0 insertions, 748 deletions
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest index 829fd4ab101d..2fc1e8c8534c 100644 --- a/app-crypt/pinentry/Manifest +++ b/app-crypt/pinentry/Manifest @@ -1,5 +1,2 @@ -DIST pinentry-0.9.0.tar.bz2 464272 SHA256 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab SHA512 2cc53a5c3852edaf6e940228d9b43fe4709344eba5fe230b7afd22b2c0239d0b258917d75661d80590b2d61c6fe9dac8ad15a0b4a0a0e7fba90a9e1c07364edd WHIRLPOOL 3f77a8aa2d44c7206d877e31088ec927473441e61f06e788330545d75ac489e6e9d5bf0026b23d0824304dad54ce8e61c4571d186df7ad0edc2d644ca3af04ac -DIST pinentry-0.9.5.tar.bz2 514677 SHA256 6a57fd3afc0d8aaa5599ffcb3ea4e7c42c113a181e8870122203ea018384688c SHA512 31a190cacf45fd3ff5128a6a1a9f317fb09850fd595d5985392ea306ed65fa9232e2203458a9989eaac3b6e9d07199e01557912051f00a9a395cd1db61b44c39 WHIRLPOOL 52e9664d7cf0e804bb14b9586a89aca4037d3324261ac8931ed26365c32ae038b45eca9b7b6637b46f9231ff2db6a9e0a96a611404e48659c7ba009b84c40727 -DIST pinentry-0.9.6.tar.bz2 432889 SHA256 2a1124e9097f24f866cab7982610677e222cea71be0a71a5566f223177e01e66 SHA512 c9f94e5ce5baf6779f6effc13f82c8c7f99d426dc232114fc4e11a8684eaefbaf4f60363db78cdb9f4c8e91ba7af40779ec1c5d7e01ee15b84c7de77ccf46e72 WHIRLPOOL 954d185ce60eeb28717dd5986c4bdfda0472944b99d52caa213919b4dd1368b2d2b4cff27bfc4158a0fd7f70f7f6549b3415de7ba33239ec9305a2e0e0bdcbc0 DIST pinentry-0.9.7.tar.bz2 432978 SHA256 6398208394972bbf897c3325780195584682a0d0c164ca5a0da35b93b1e4e7b2 SHA512 9c5bc8f7246e8b0affd83fea6e64c47cecf6a12515a82dd2a6712b230306a9c3c97da4dbf6519ea98c85c88bf180a5a2b8c46cedcd594f224e5a08f2f0e35bf0 WHIRLPOOL eb3f72acf6990d61b4279de89a334e68c6052a3edef789aab2a421c2e489c1286b756bf3c9b8e6dd4cee3716e32b53d0e9d41db15a5069e010fe713dfba0596a DIST pinentry-1.0.0.tar.bz2 436930 SHA256 1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62 WHIRLPOOL 182d75e37afc40c02705ed6611354eb3429924df9062e64d42e511a5bdac5f7094b351aae406ef243e4a9d6f7db0eb897820bd23ed925b8787941342bc67d187 diff --git a/app-crypt/pinentry/files/pinentry-0.8.2-texi.patch b/app-crypt/pinentry/files/pinentry-0.8.2-texi.patch deleted file mode 100644 index f036fa93a1c2..000000000000 --- a/app-crypt/pinentry/files/pinentry-0.8.2-texi.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- doc/gpl.texi 2013-06-09 10:50:53.990704797 +1200 -+++ doc/gpl.texi 2013-06-09 10:51:25.310432565 +1200 -@@ -12,7 +12,7 @@ - of this license document, but changing it is not allowed. - @end display - --@appendixsubsec Preamble -+@appendixsec Preamble - - The licenses for most software are designed to take away your - freedom to share and change it. By contrast, the GNU General Public -@@ -63,7 +63,7 @@ - modification follow. - - @iftex --@appendixsubsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION -+@appendixsec TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - @end iftex - @ifinfo - @center TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION diff --git a/app-crypt/pinentry/files/pinentry-0.9.0-accessibility.patch b/app-crypt/pinentry/files/pinentry-0.9.0-accessibility.patch deleted file mode 100644 index 20d6130978b1..000000000000 --- a/app-crypt/pinentry/files/pinentry-0.9.0-accessibility.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/qt4/main.cpp b/qt4/main.cpp -index 106999e..b2a69f2 100644 ---- a/qt4/main.cpp -+++ b/qt4/main.cpp -@@ -217,8 +217,9 @@ qt_cmd_handler (pinentry_t pe) - for ( size_t i = 0 ; i < sizeof buttonLabels / sizeof *buttonLabels ; ++i ) - if ( (buttons & buttonLabels[i].button) && !buttonLabels[i].label.isEmpty() ) { - box.button( buttonLabels[i].button )->setText( buttonLabels[i].label ); -+#ifndef QT_NO_ACCESSIBILITY - box.button( buttonLabels[i].button )->setAccessibleDescription ( buttonLabels[i].label ); -- -+#endif - } - - box.setIconPixmap( icon() ); -diff --git a/qt4/pinentryconfirm.cpp b/qt4/pinentryconfirm.cpp -index dfbd19f..6b3d545 100644 ---- a/qt4/pinentryconfirm.cpp -+++ b/qt4/pinentryconfirm.cpp -@@ -30,8 +30,10 @@ PinentryConfirm::PinentryConfirm(Icon icon, int timeout, const QString &title, - connect(_timer, SIGNAL(timeout()), this, SLOT(slotTimeout())); - _timer->start(timeout*1000); - } -+#ifndef QT_NO_ACCESSIBILITY - setAccessibleDescription (desc); - setAccessibleName (title); -+#endif - raiseWindow (this); - } - -diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp -index 3a6dacc..456f022 100644 ---- a/qt4/pinentrydialog.cpp -+++ b/qt4/pinentrydialog.cpp -@@ -217,7 +217,9 @@ void PinEntryDialog::setDescription( const QString& txt ) - { - _desc->setVisible( !txt.isEmpty() ); - _desc->setText( txt ); -+#ifndef QT_NO_ACCESSIBILITY - _desc->setAccessibleDescription ( txt ); -+#endif - _icon->setPixmap( icon() ); - setError( QString::null ); - } -@@ -231,7 +233,9 @@ void PinEntryDialog::setError( const QString& txt ) - { - if( !txt.isNull() )_icon->setPixmap( icon( QStyle::SP_MessageBoxCritical ) ); - _error->setText( txt ); -+#ifndef QT_NO_ACCESSIBILITY - _error->setAccessibleDescription ( txt ); -+#endif - _error->setVisible( !txt.isEmpty() ); - } - -@@ -264,14 +268,18 @@ QString PinEntryDialog::prompt() const - void PinEntryDialog::setOkText( const QString& txt ) - { - _ok->setText( txt ); -+#ifndef QT_NO_ACCESSIBILITY - _ok->setAccessibleDescription ( txt ); -+#endif - _ok->setVisible( !txt.isEmpty() ); - } - - void PinEntryDialog::setCancelText( const QString& txt ) - { - _cancel->setText( txt ); -+#ifndef QT_NO_ACCESSIBILITY - _cancel->setAccessibleDescription ( txt ); -+#endif - _cancel->setVisible( !txt.isEmpty() ); - } - -@@ -279,7 +287,9 @@ void PinEntryDialog::setQualityBar( const QString& txt ) - { - if (_have_quality_bar) { - _quality_bar_label->setText( txt ); -+#ifndef QT_NO_ACCESSIBILITY - _quality_bar_label->setAccessibleDescription ( txt ); -+#endif - } - } diff --git a/app-crypt/pinentry/files/pinentry-0.9.5-build.patch b/app-crypt/pinentry/files/pinentry-0.9.5-build.patch deleted file mode 100644 index 2ef9a6779ee3..000000000000 --- a/app-crypt/pinentry/files/pinentry-0.9.5-build.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 29384a828ad83644df9093bb292194d1ac6e689b Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev <alon.barlev@gmail.com> -Date: Sat, 18 Jul 2015 10:14:49 +0300 -Subject: [PATCH] build: add pkg-config initialization and modify detection - -add PKG_PROG_PKG_CONFIG as the qt4 detection and curses detection are -already using pkg.m4 which require proper initialization. - -modify the manual detection of pkg-config based on the error value of -the PKG_PROG_PKG_CONFIG and not the manual one as there is a conflict -between empty and 'no'. - -Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> ---- - configure.ac | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b71cb17..7afa318 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -85,6 +85,7 @@ AC_PROG_RANLIB - # for Qt and autoconf does does not allow that. - AC_PROG_CXX - AC_PROG_LN_S -+PKG_PROG_PKG_CONFIG - AC_CHECK_TOOL(WINDRES, windres, :) - AC_CHECK_PROGS(GITLOG_TO_CHANGELOG, gitlog-to-changelog, - [build-aux/gitlog-to-changelog]) -@@ -430,8 +431,7 @@ AC_ARG_ENABLE(pinentry-gnome3, - - dnl check for pkg-config - if test "$pinentry_gtk_2" != "no" -o "$pinentry_gnome_3" != "no"; then -- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -- if test x"${PKG_CONFIG}" = xno ; then -+ if test -z "${PKG_CONFIG}"; then - pinentry_gtk_2=no - pinentry_gnome_3=no - fi -@@ -504,8 +504,7 @@ AC_ARG_ENABLE(libsecret, - - dnl check for pkg-config - if test "$libsecret" != "no"; then -- AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -- if test x"${PKG_CONFIG}" = xno ; then -+ if test -z "${PKG_CONFIG}" ; then - libsecret=no - fi - fi --- -2.3.6 - diff --git a/app-crypt/pinentry/files/pinentry-0.9.6-add-disable-pinentry-qt5-option.patch b/app-crypt/pinentry/files/pinentry-0.9.6-add-disable-pinentry-qt5-option.patch deleted file mode 100644 index 9522c2f4bf74..000000000000 --- a/app-crypt/pinentry/files/pinentry-0.9.6-add-disable-pinentry-qt5-option.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 08ec9556c8a384ea7bb5d42d3f6aab6c2f6a8786 Mon Sep 17 00:00:00 2001 -From: Andre Heinecke <aheinecke@intevation.de> -Date: Fri, 25 Sep 2015 15:56:55 +0200 -Subject: [PATCH] Add option to disable looking for qt5 - -* m4/qt.m4 (FIND_QT): Add --disable-pinentry-qt5 option to -disable qt5 support even if it is available. - --- -As requested by Kristan F. - -GnuPG-bug-id: 2105 ---- - m4/qt.m4 | 23 ++++++++++++++++------- - 1 file changed, 16 insertions(+), 7 deletions(-) - -diff --git a/m4/qt.m4 b/m4/qt.m4 -index 0a7ea99..0e47ec6 100644 ---- a/m4/qt.m4 -+++ b/m4/qt.m4 -@@ -28,15 +28,24 @@ 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"]) -+ AC_ARG_ENABLE(pinentry-qt5, -+ AC_HELP_STRING([--disable-pinentry-qt5], -+ [Don't use qt5 even if it is available.]), -+ enable_pinentry_qt5=$enableval, -+ enable_pinentry_qt5="try") - -- if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then -- PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -fpic" -- fi -+ have_qt5_libs="no"; -+ -+ if test "$enable_pinentry_qt5" != "no"; then -+ 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"]) - -+ if "$PKG_CONFIG" --variable qt_config Qt5Core | grep -q "reduce_relocations"; then -+ PINENTRY_QT_CFLAGS="$PINENTRY_QT_CFLAGS -fpic" -+ fi -+ fi - if test "$have_qt5_libs" = "yes"; then - AC_CHECK_TOOL(MOC, moc) - AC_MSG_CHECKING([moc version]) --- -2.1.4 - diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-build.patch b/app-crypt/pinentry/files/pinentry-1.0.0-build.patch index e367b8566450..e367b8566450 100755..100644 --- a/app-crypt/pinentry/files/pinentry-1.0.0-build.patch +++ b/app-crypt/pinentry/files/pinentry-1.0.0-build.patch diff --git a/app-crypt/pinentry/metadata.xml b/app-crypt/pinentry/metadata.xml index c66920c94e70..46f4637bdd41 100644 --- a/app-crypt/pinentry/metadata.xml +++ b/app-crypt/pinentry/metadata.xml @@ -9,7 +9,4 @@ <email>crypto@gentoo.org</email> <name>Crypto</name> </maintainer> - <use> - <flag name="clipboard">Enable clipboard integration</flag> - </use> </pkgmetadata> diff --git a/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild b/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild deleted file mode 100644 index fae56984ea05..000000000000 --- a/app-crypt/pinentry/pinentry-0.9.0-r3.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit qmake-utils autotools 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="clipboard gtk ncurses qt4 caps static" - -RDEPEND=" - 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 - gtk? ( virtual/pkgconfig ) - qt4? ( virtual/pkgconfig ) - ppc-aix? ( dev-libs/gnulib ) -" -REQUIRED_USE=" - || ( ncurses gtk qt4 ) - gtk? ( !static ) - qt4? ( !static ) - static? ( ncurses ) -" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -src_prepare() { - if use qt4; then - local f - for f in qt4/*.moc; do - "$(qt4_get_bindir)"/moc ${f/.moc/.h} > ${f} || die - done - fi - epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch" - epatch "${FILESDIR}/${PN}-0.8.2-texi.patch" - epatch "${FILESDIR}/${PN}-0.9.0-accessibility.patch" - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 - - if [[ ${CHOST} == *-aix* ]] ; then - append-flags -I"${EPREFIX}/usr/$(get_libdir)/gnulib/include" - append-ldflags -L"${EPREFIX}/usr/$(get_libdir)/gnulib/$(get_libdir)" - append-libs -lgnu - fi - - # Issues finding qt on multilib systems - export QTLIB="${QTDIR}/$(get_libdir)" - - econf \ - --enable-pinentry-tty \ - $(use_enable gtk pinentry-gtk2) \ - $(use_enable ncurses pinentry-curses) \ - $(use_enable ncurses fallback-curses) \ - $(use_enable qt4 pinentry-qt4) \ - $(use qt4 && use_enable clipboard pinentry-qt4-clipboard) \ - $(use_with caps libcap) -} - -src_compile() { - emake AR="$(tc-getAR)" -} - -src_install() { - default - rm -f "${ED}"/usr/bin/pinentry || die -} - -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 -} diff --git a/app-crypt/pinentry/pinentry-0.9.0.ebuild b/app-crypt/pinentry/pinentry-0.9.0.ebuild deleted file mode 100644 index fe2c6afe602d..000000000000 --- a/app-crypt/pinentry/pinentry-0.9.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools multilib eutils flag-o-matic - -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="gtk ncurses qt4 caps static" - -RDEPEND=" - 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 - gtk? ( virtual/pkgconfig ) - qt4? ( virtual/pkgconfig ) - ppc-aix? ( dev-libs/gnulib ) -" -REQUIRED_USE=" - || ( ncurses gtk qt4 ) - gtk? ( !static ) - qt4? ( !static ) - static? ( ncurses ) -" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -src_prepare() { - if use qt4; then - local f - for f in qt4/*.moc; do - "${EPREFIX}"/usr/bin/moc ${f/.moc/.h} > ${f} || die - done - fi - epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch" - epatch "${FILESDIR}/${PN}-0.8.2-texi.patch" - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - - if [[ ${CHOST} == *-aix* ]] ; then - append-flags -I"${EPREFIX}/usr/$(get_libdir)/gnulib/include" - append-ldflags -L"${EPREFIX}/usr/$(get_libdir)/gnulib/$(get_libdir)" - append-libs -lgnu - fi - - # Issues finding qt on multilib systems - export QTLIB="${QTDIR}/$(get_libdir)" - - econf \ - --enable-pinentry-tty \ - $(use_enable gtk pinentry-gtk2) \ - $(use_enable ncurses pinentry-curses) \ - $(use_enable ncurses fallback-curses) \ - $(use_enable qt4 pinentry-qt4) \ - $(use_with caps libcap) -} - -src_compile() { - emake AR="$(tc-getAR)" -} - -src_install() { - default - rm -f "${ED}"/usr/bin/pinentry || die -} - -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 -} diff --git a/app-crypt/pinentry/pinentry-0.9.5.ebuild b/app-crypt/pinentry/pinentry-0.9.5.ebuild deleted file mode 100644 index 4c55e522f564..000000000000 --- a/app-crypt/pinentry/pinentry-0.9.5.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# 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="clipboard 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}-build.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-qt4) \ - $(use qt4 && use_enable clipboard pinentry-qt4-clipboard) \ - $(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 -} - -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 -} diff --git a/app-crypt/pinentry/pinentry-0.9.6-r6.ebuild b/app-crypt/pinentry/pinentry-0.9.6-r6.ebuild deleted file mode 100644 index ea0df559a95b..000000000000 --- a/app-crypt/pinentry/pinentry-0.9.6-r6.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# 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 '<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 -} diff --git a/app-crypt/pinentry/pinentry-0.9.7.ebuild b/app-crypt/pinentry/pinentry-0.9.7.ebuild deleted file mode 100644 index 931d7f2072a1..000000000000 --- a/app-crypt/pinentry/pinentry-0.9.7.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# 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.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" - 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 -} |