Drop older.

(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)

5 files changed, 6 insertions, 240 deletions

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index 4692206b0a79..295e590823d5 100644
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/pinentry
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.127 2012/09/09 15:20:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.128 2012/10/29 10:52:56 scarabeus Exp $
+
+  29 Oct 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  -files/pinentry-0.7.5-grab.patch, -files/pinentry-0.8.0-qt-fix.patch,
+  -pinentry-0.8.0-r1.ebuild, -pinentry-0.8.0.ebuild:
+  Drop older.
 
   09 Sep 2012; Raúl Porcel <armin76@gentoo.org> pinentry-0.8.1.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #421593
diff --git a/app-crypt/pinentry/files/pinentry-0.7.5-grab.patch b/app-crypt/pinentry/files/pinentry-0.7.5-grab.patch
deleted file mode 100644
index 7cd3d96cdc9e..000000000000
--- a/app-crypt/pinentry/files/pinentry-0.7.5-grab.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- pinentry/gtk+-2/pinentry-gtk-2.c
-+++ pinentry/gtk+-2/pinentry-gtk-2.c
-@@ -261,10 +261,10 @@ create_window (int confirm_mode)
-   if (!confirm_mode)
-     {
-       g_signal_connect (G_OBJECT (win),
--			pinentry->grab ? "map-event" : "focus-in-event",
-+			"focus-in-event",
- 			G_CALLBACK (grab_keyboard), NULL);
-       g_signal_connect (G_OBJECT (win),
--			pinentry->grab ? "unmap-event" : "focus-out-event",
-+			"focus-out-event",
- 			G_CALLBACK (ungrab_keyboard), NULL);
-     }
-   gtk_window_add_accel_group (GTK_WINDOW (win), acc);
diff --git a/app-crypt/pinentry/files/pinentry-0.8.0-qt-fix.patch b/app-crypt/pinentry/files/pinentry-0.8.0-qt-fix.patch
deleted file mode 100644
index 42cef7635712..000000000000
--- a/app-crypt/pinentry/files/pinentry-0.8.0-qt-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: qt/pinentrydialog.cpp
-===================================================================
---- qt/pinentrydialog.cpp	(revision 233)
-+++ qt/pinentrydialog.cpp	(working copy)
-@@ -33,7 +33,7 @@
- 
- PinEntryDialog::PinEntryDialog( QWidget* parent, const char* name, 
-                                 bool modal, bool enable_quality_bar )
--  : QDialog( parent, name, modal ), _grabbed( false )
-+  : QDialog( parent, name, modal, Qt::WStyle_StaysOnTop ), _grabbed( false )
- {
-   QBoxLayout* top = new QVBoxLayout( this, 6 );
-   QBoxLayout* upperLayout = new QHBoxLayout( top );
-Index: qt4/pinentrydialog.cpp
-===================================================================
---- qt4/pinentrydialog.cpp	(revision 233)
-+++ qt4/pinentrydialog.cpp	(working copy)
-@@ -83,7 +83,7 @@
- 
- PinEntryDialog::PinEntryDialog( QWidget* parent, const char* name, bool modal,
-                                 bool enable_quality_bar )
--  : QDialog( parent ), _grabbed( false )
-+  : QDialog( parent, Qt::WindowStaysOnTopHint ), _grabbed( false )
- {
-   setWindowFlags( windowFlags() & ~Qt::WindowContextHelpButtonHint );
- 
diff --git a/app-crypt/pinentry/pinentry-0.8.0-r1.ebuild b/app-crypt/pinentry/pinentry-0.8.0-r1.ebuild
deleted file mode 100644
index 5e24d9b50924..000000000000
--- a/app-crypt/pinentry/pinentry-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.0-r1.ebuild,v 1.5 2012/09/03 13:53:02 kensington Exp $
-
-EAPI=3
-inherit 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.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-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-admin/eselect-pinentry
-	static? ( >=sys-libs/ncurses-5.7-r5[static-libs] )
-	!static? (
-		gtk? ( x11-libs/gtk+:2 )
-		ncurses? ( sys-libs/ncurses )
-		qt4? ( >=x11-libs/qt-gui-4.4.1:4 )
-		!gtk? ( !qt4? ( !ncurses? ( sys-libs/ncurses ) ) )
-	)
-	caps? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
-	!static? (
-		gtk? ( virtual/pkgconfig )
-		qt4? ( virtual/pkgconfig )
-	)"
-
-pkg_setup() {
-	use static && append-ldflags -static
-
-	if use static && { use gtk || use qt4; }; then
-		ewarn
-		ewarn "The static USE flag is only supported with the ncurses USE flags, disabling the gtk and qt4 USE flags."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.5-grab.patch
-
-	# https://bugs.g10code.com/gnupg/issue1162
-	epatch "${FILESDIR}"/${P}-qt-fix.patch
-
-	if use qt4; then
-		local file
-		for file in qt4/*.moc; do
-			"${EPREFIX}"/usr/bin/moc ${file/.moc/.h} > ${file} || die
-		done
-	fi
-}
-
-src_configure() {
-	local myconf=""
-
-	if ! { use qt4 || use gtk || use ncurses; }
-	then
-		myconf="--enable-pinentry-curses --enable-fallback-curses"
-	elif use static
-	then
-		myconf="--enable-pinentry-curses --enable-fallback-curses --disable-pinentry-gtk2 --disable-pinentry-qt4"
-	fi
-
-	# Issues finding qt on multilib systems
-	export QTLIB="${QTDIR}/$(get_libdir)"
-
-	econf \
-		--disable-dependency-tracking \
-		--enable-maintainer-mode \
-		--disable-pinentry-gtk \
-		$(use_enable gtk pinentry-gtk2) \
-		--disable-pinentry-qt \
-		$(use_enable ncurses pinentry-curses) \
-		$(use_enable ncurses fallback-curses) \
-		$(use_enable qt4 pinentry-qt4) \
-		$(use_with caps libcap) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	rm -f "${D}"/usr/bin/pinentry || die
-}
-
-pkg_postinst() {
-	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."
-	eselect pinentry update ifunset
-}
-
-pkg_postrm() {
-	eselect pinentry update ifunset
-}
diff --git a/app-crypt/pinentry/pinentry-0.8.0.ebuild b/app-crypt/pinentry/pinentry-0.8.0.ebuild
deleted file mode 100644
index 8cbb5214c033..000000000000
--- a/app-crypt/pinentry/pinentry-0.8.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.8.0.ebuild,v 1.16 2012/09/03 13:53:02 kensington Exp $
-
-EAPI=3
-
-inherit 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.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="gtk ncurses qt4 caps static"
-
-RDEPEND="static? ( sys-libs/ncurses )
-	!static? (
-		gtk? ( x11-libs/gtk+:2 )
-		ncurses? ( sys-libs/ncurses )
-		qt4? ( >=x11-libs/qt-gui-4.4.1:4 )
-		!gtk? ( !qt4? ( !ncurses? ( sys-libs/ncurses ) ) )
-	)
-	caps? ( sys-libs/libcap )"
-DEPEND="${RDEPEND}
-	!static? (
-		gtk? ( virtual/pkgconfig )
-		qt4? ( virtual/pkgconfig )
-	)"
-
-pkg_setup() {
-	use static && append-ldflags -static
-
-	if use static && { use gtk || use qt4; }; then
-		ewarn
-		ewarn "The static USE flag is only supported with the ncurses USE flags, disabling the gtk and qt4 USE flags."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.7.5-grab.patch"
-
-	# https://bugs.g10code.com/gnupg/issue1162
-	epatch "${FILESDIR}/${P}-qt-fix.patch"
-
-	if use qt4; then
-		local file
-		for file in qt4/*.moc; do
-			"${EPREFIX}"/usr/bin/moc ${file/.moc/.h} > ${file} || die
-		done
-	fi
-}
-
-src_configure() {
-	local myconf=""
-
-	if ! { use qt4 || use gtk || use ncurses; }
-	then
-		myconf="--enable-pinentry-curses --enable-fallback-curses"
-	elif use static
-	then
-		myconf="--enable-pinentry-curses --enable-fallback-curses --disable-pinentry-gtk2 --disable-pinentry-qt --disable-pinentry-qt4"
-	fi
-
-	# Issues finding qt on multilib systems
-	export QTLIB="${QTDIR}/$(get_libdir)"
-
-	econf \
-		--disable-dependency-tracking \
-		--enable-maintainer-mode \
-		--disable-pinentry-gtk \
-		$(use_enable gtk pinentry-gtk2) \
-		--disable-pinentry-qt \
-		$(use_enable ncurses pinentry-curses) \
-		$(use_enable ncurses fallback-curses) \
-		$(use_enable qt4 pinentry-qt4) \
-		$(use_with caps libcap) \
-		${myconf} || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die
-}
-
-pkg_postinst() {
-	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."
-}