Cleanup.

(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)

7 files changed, 8 insertions, 218 deletions

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index ae2902fa9916..c3900fbe7d11 100644
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/pinentry
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.90 2008/07/27 19:18:05 carlo Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.91 2009/01/06 21:16:22 swegener Exp $
+
+  06 Jan 2009; Sven Wegener <swegener@gentoo.org>
+  -files/pinentry-0.7.2-grab.patch, -files/0.7.2-info.patch,
+  -files/pinentry-0.7.4-grab.patch, -files/0.7.2-libcap.patch,
+  -pinentry-0.7.3.ebuild, -pinentry-0.7.4-r1.ebuild:
+  Cleanup.
 
   27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> pinentry-0.7.3.ebuild,
   pinentry-0.7.4-r1.ebuild, pinentry-0.7.5.ebuild:
diff --git a/app-crypt/pinentry/files/0.7.2-info.patch b/app-crypt/pinentry/files/0.7.2-info.patch
deleted file mode 100644
index c96956dd7044..000000000000
--- a/app-crypt/pinentry/files/0.7.2-info.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-iff -ur pinentry-0.7.2.orig/doc/pinentry.info pinentry-0.7.2/doc/pinentry.info
---- pinentry-0.7.2.orig/doc/pinentry.info       2005-01-27 02:06:25.000000000 -0600
-+++ pinentry-0.7.2/doc/pinentry.info    2006-05-11 12:27:06.000000000 -0500
-@@ -3,7 +3,7 @@
-
- INFO-DIR-SECTION GNU Utilities
- START-INFO-DIR-ENTRY
--* pinentry::               Ask securely for a passphrase or PIN.
-+* pinentry: (pinentry).               Ask securely for a passphrase or PIN.
- END-INFO-DIR-ENTRY
-    This file documents the use and the internals of the PINENTRY.
-
diff --git a/app-crypt/pinentry/files/0.7.2-libcap.patch b/app-crypt/pinentry/files/0.7.2-libcap.patch
deleted file mode 100644
index 5d0829059a05..000000000000
--- a/app-crypt/pinentry/files/0.7.2-libcap.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: pinentry-0.7.2/configure.ac
-===================================================================
---- pinentry-0.7.2.orig/configure.ac
-+++ pinentry-0.7.2/configure.ac
-@@ -116,11 +116,16 @@ dnl Checks for libsecmem.
- GNUPG_CHECK_TYPEDEF(byte, HAVE_BYTE_TYPEDEF)
- GNUPG_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF)
- 
--AC_PATH_PROG(SETCAP, setcap, :, "$PATH:/sbin:/usr/sbin")
--AC_CHECK_LIB(cap, cap_set_proc, [
--  AC_DEFINE(USE_CAPABILITIES,1,[The capabilities support library is installed])
--  LIBCAP=-lcap
--])
-+dnl Check for libcap
-+AC_ARG_WITH([libcap], AC_HELP_STRING([--without-libcap], [Disable support for capabilities library]))
-+
-+if test "x$with_libcap" != "xno"; then
-+  AC_PATH_PROG(SETCAP, setcap, :, "$PATH:/sbin:/usr/sbin")
-+  AC_CHECK_LIB(cap, cap_set_proc, [
-+    AC_DEFINE(USE_CAPABILITIES,1,[The capabilities support library is installed])
-+    LIBCAP=-lcap
-+  ])
-+fi
- AC_SUBST(LIBCAP)
- 
- dnl
diff --git a/app-crypt/pinentry/files/pinentry-0.7.2-grab.patch b/app-crypt/pinentry/files/pinentry-0.7.2-grab.patch
deleted file mode 100644
index c88aa62f3115..000000000000
--- a/app-crypt/pinentry/files/pinentry-0.7.2-grab.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- pinentry-0.7.2/gtk+-2/pinentry-gtk-2.c	2007-06-15 15:53:28.000000000 +0200
-+++ pinentry-0.7.2/gtk+-2/pinentry-gtk-2.c	2007-06-15 16:01:57.000000000 +0200
-@@ -207,10 +207,10 @@
-   if (!confirm_mode)
-     {
-       g_signal_connect (G_OBJECT (win),
--			pinentry->grab ? "map-event" : "focus-in-event",
-+			pinentry->grab ? "expose-event" : "focus-in-event",
- 			G_CALLBACK (grab_keyboard), NULL);
-       g_signal_connect (G_OBJECT (win),
--			pinentry->grab ? "unmap-event" : "focus-out-event",
-+			pinentry->grab ? "no-expose-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.7.4-grab.patch b/app-crypt/pinentry/files/pinentry-0.7.4-grab.patch
deleted file mode 100644
index 118745b33807..000000000000
--- a/app-crypt/pinentry/files/pinentry-0.7.4-grab.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -urNp pinentry-0.7.4/gtk+-2/pinentry-gtk-2.c pinentry-0.7.4.new/gtk+-2/pinentry-gtk-2.c
---- pinentry-0.7.4/gtk+-2/pinentry-gtk-2.c	2007-11-29 00:57:55.000000000 +0200
-+++ pinentry-0.7.4.new/gtk+-2/pinentry-gtk-2.c	2007-12-20 22:38:05.000000000 +0200
-@@ -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/pinentry-0.7.3.ebuild b/app-crypt/pinentry/pinentry-0.7.3.ebuild
deleted file mode 100644
index 7f4dbbb28dd7..000000000000
--- a/app-crypt/pinentry/pinentry-0.7.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.3.ebuild,v 1.11 2008/07/27 19:18:05 carlo Exp $
-
-#WANT_AUTOCONF="2.5"
-#WANT_AUTOMAKE="1.9"
-
-EAPI=1
-
-inherit qt3 multilib eutils autotools
-
-DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="http://www.gnupg.org/aegypten/"
-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"
-IUSE="gtk ncurses qt3 caps"
-
-DEPEND="gtk? ( =x11-libs/gtk+-2* )
-	ncurses? ( sys-libs/ncurses )
-	qt3? ( x11-libs/qt:3 )
-	!gtk? ( !qt3? ( !ncurses? ( sys-libs/ncurses ) ) )
-	caps? ( sys-libs/libcap )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/0.7.2-libcap.patch"
-	epatch "${FILESDIR}/0.7.2-info.patch"
-	epatch "${FILESDIR}/${PN}-0.7.2-grab.patch"
-	epatch "${FILESDIR}/${PN}-gmem.patch"
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	local myconf=""
-
-	if ! ( use qt3 || use gtk || use ncurses )
-	then
-		myconf="--enable-pinentry-curses --enable-fallback-curses"
-	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) \
-		$(use_enable qt3 pinentry-qt) \
-		$(use_enable ncurses pinentry-curses) \
-		$(use_enable ncurses fallback-curses) \
-		$(use_with caps libcap) \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "dodoc failed"
-}
-
-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."
-}
diff --git a/app-crypt/pinentry/pinentry-0.7.4-r1.ebuild b/app-crypt/pinentry/pinentry-0.7.4-r1.ebuild
deleted file mode 100644
index 91ac4be40a88..000000000000
--- a/app-crypt/pinentry/pinentry-0.7.4-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.4-r1.ebuild,v 1.9 2008/10/27 05:42:41 vapier Exp $
-
-EAPI=1
-
-inherit qt3 multilib eutils
-
-DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="http://www.gnupg.org/aegypten/"
-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"
-IUSE="gtk ncurses qt3 caps"
-
-DEPEND="gtk? ( =x11-libs/gtk+-2* )
-	ncurses? ( sys-libs/ncurses )
-	qt3? ( x11-libs/qt:3 )
-	!gtk? ( !qt3? ( !ncurses? ( sys-libs/ncurses ) ) )
-	caps? ( sys-libs/libcap )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-grab.patch"
-	epatch "${FILESDIR}/${PN}-gmem.patch"
-}
-
-src_compile() {
-	local myconf=""
-
-	if ! ( use qt3 || use gtk || use ncurses )
-	then
-		myconf="--enable-pinentry-curses --enable-fallback-curses"
-	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) \
-		$(use_enable qt3 pinentry-qt) \
-		$(use_enable ncurses pinentry-curses) \
-		$(use_enable ncurses fallback-curses) \
-		$(use_with caps libcap) \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "dodoc failed"
-}
-
-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."
-}