[gentoo-commits] repo/gentoo:master commit in: app-crypt/pinentry/

[Kristian Fiskerstrand]

commit:     1bb32c78038453a25d9c4ec819437d237864465f
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 19:46:09 2015 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 19:46:51 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bb32c78

app-crypt/pinentry: Cleanup some older versions

 app-crypt/pinentry/pinentry-0.9.6-r4.ebuild | 101 -----------------------
 app-crypt/pinentry/pinentry-0.9.6-r5.ebuild | 123 ----------------------------
 2 files changed, 224 deletions(-)

diff --git a/app-crypt/pinentry/pinentry-0.9.6-r4.ebuild b/app-crypt/pinentry/pinentry-0.9.6-r4.ebuild
deleted file mode 100644
index 20fc85f..0000000
--- a/app-crypt/pinentry/pinentry-0.9.6-r4.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 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"
-
-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 )
-	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 )
-	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
-}

diff --git a/app-crypt/pinentry/pinentry-0.9.6-r5.ebuild b/app-crypt/pinentry/pinentry-0.9.6-r5.ebuild
deleted file mode 100644
index 6e10cf8..0000000
--- a/app-crypt/pinentry/pinentry-0.9.6-r5.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 )
-	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_enable qt4 || use_enable 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
-}