Drop older.

Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

6 files changed, 20 insertions, 249 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/Manifest b/app-crypt/pinentry/Manifest
index 39605bf37433..56c71788e643 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,21 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX pinentry-0.7.5-grab.patch 536 SHA256 149fadfa505e55fa4f4e1fb5536066b87290566df4d890e6f4087d86f213188a SHA512 e440859a9ef46d675ff43a07e51f22e9f449601f76a9241e858bd7641d600fc841fff75b874139fd8d8c6ccbd4071fb3d2c53222aaa6ede6637922869419d6e8 WHIRLPOOL c840e173f98efd43111e57a3016909ab0dfac3c6146227e2a14d6bf2776c67cb69d072218ae9a2062367400e3fcd365c6625de7e4869999fcc148aaf1701ff14
-AUX pinentry-0.8.0-qt-fix.patch 1104 SHA256 1375d5675f9c1ba050a0bcf9853df01b73110fffa8580cb90a2095db522c7dbc SHA512 d69144ae5bb7454fc61ce15a4665e6f5e2432fe83c71746925f6293172df0dff63489e3b9167653cc746498d87ad3a34656dd5e595d572a0b14b6a8b72df86be WHIRLPOOL 7dc821cc9c972606c57680c79f39b7c6fb4c7fb329040540f559347d0e2b0850fa0e1640774ad7e56ec2d9ca9d4ba20f48b9016054b209e99ae0370227e72152
-DIST pinentry-0.8.0.tar.gz 487629 SHA256 426c7ff9ca7d147d21243dffd72e844d84c1f593e323f1d207ee19bdded0f01a SHA512 2c850f060e7d65a7d4cc19d1fb3b0eed97e1e1f091098a1278a66d9338494f15d07c1ef851fbbfa66ec26e0886675af3941b991c926bb23bc7672e440075d568 WHIRLPOOL bf4085c03f0000b2511a52f5468df41d283785b2b6f18db374b3319760dd9a0003ab7a365ae6261dd3539c4065c5d0a2cef001babc9ca77e9207a72b1ec23af3
 DIST pinentry-0.8.1.tar.gz 504101 SHA256 3e17e1d410686d197f96b61b04e3fad28bd6bcb029077bdfd902780934de9132 SHA512 a7f9a582b1d9c347c65f4a842dc4f3270199dc23eab2487e5150e37b71d666628a8a60d44f85d64bba5b1a7018379dd181e810bc373994c9a94fafe706adf76a WHIRLPOOL ee6ea273cf1307c9d6946f9dabaca076ea563f57e64a044d169200a95944173ae8ac60d9fe167bf5e9e1a21216ac41ff680f8097d5a6431e9e80a0a4ec77d024
 DIST pinentry-0.8.2.tar.bz2 428514 SHA256 5084b7b6aac5725303f3b0185f126daa8b33ee78ade538edf1e20034594a39b1 SHA512 f012ed163b8905e10714e8667a4434eb192e9519e0fa91a686b097224252bf2e73c3b35d682b6fd4a9df80eefcb3afbf2ec763aef58a3ab5a1e71268fd83e158 WHIRLPOOL 0a17bf30390895dddbaad14bcf07b3064fb7e3c1ed97ba22231e13201f24cfc194a8ef110da7316f137ed3942c094c1990aa51a80b352c5572748b42f40a77d7
-EBUILD pinentry-0.8.0-r1.ebuild 3093 SHA256 7dfa4e28d45c73056f12f9c79ad5bb2d5eb9393aa586b2c04d9be65381a93c5f SHA512 9ab4974753b64eb2041ba0776563a474a64f12d7d758913d93c943229736712c4676791324a68398bbf6719afd84e15f63c251a1054f4468c2d4564fe5710df4 WHIRLPOOL 8c0a10da72a1365ec59405565193c8f9c1bb2525aabe339b869226b741f9d4ac36df7d35a0dc1071f7bf77660ac51294fe8cc55baf187170254f261b6dc37d49
-EBUILD pinentry-0.8.0.ebuild 2945 SHA256 c072e34e94a6dee2036bfa9a226c8babd99048a4b1a7d50e6d0598482a073eb4 SHA512 76084a08c7119f2bf304e6626ec79aaf6d9edbc227fdd703acfb640ed0b27696f599f60dbd1fff08611f2a8fce80aada029eccb5fe2caf436f9b91991f8f155b WHIRLPOOL 5fc3e3e8d3c6b5897837c8563be15b80fc0219a8e682560b709ecc853560e808cae1d6038bfe5abc4fe295a9228efe9bb31fce1aa12265befc5e919612b2d9a4
 EBUILD pinentry-0.8.1.ebuild 2976 SHA256 6d0b40950df094c43ab4534f44dc7fbded607562af42447a3953ce4b23c6ee59 SHA512 9dc24d522d5634badae37aeb7dce8b407ef4a484e0438d024bb0a3973976d7a7f2a3963e82b2ac4698ba76ddf11162c1b20aa1221e17661c5924cf79c237c964 WHIRLPOOL e2f04fe49dc76f0a93e5167dac1f1b438a86dfa4ddc37809d47e11c05606d3625f9aeea53325f31ae5a69d0dbbfffb1d69977bacab4540484bfe971b9ad63adf
 EBUILD pinentry-0.8.2.ebuild 2990 SHA256 d622b4d1e7958ac0ebd133de82fc537745cc8144f83d50ca5f2b208d2dc7bc3b SHA512 c64c49f46dbfab8de94c59fe96a9ee89cccf8e35bc67fef9c45387e467a3624542d61526383195db1063200b42dd2037f116476ce55e2196bc2d0f43206ccc99 WHIRLPOOL c0661816505641b7a411266ab46db0efe0b9f85844c65520d743d633c3a22a3644897c5f8f85c1b7742e82ac4deee8be1e702241d80a267361fab98ef5124c4d
-MISC ChangeLog 17163 SHA256 18b89a683e3771dc9396f0b9e962c6cf9b0b80d6048ff8943a8d491d1695cda7 SHA512 7715e7b67a1633ef328b25c261b3839ec438fe6d78ae18f8ded35c1639bec506ebca745962bcac0a88c601bc6253456ee121df6433c0738ca16fb314bdaa26c5 WHIRLPOOL b9fcef49ae3d589ec9d777e227660c47e373b865242997077c6e0ac5ef1c4e900ea2802acf17adff5d5441cad057ad6a1ac94824cd4a5db1297f26f9a927029a
+MISC ChangeLog 17360 SHA256 62114612172cee5307131d59ac2659468a01a2dd38c35496409c7b6285800a30 SHA512 eef7f6c0e81c1b6c85b80125514c7095d05bed69ee7d8b946bfc3a720f93c09d651ed71fd7714e1ec884a0f460f3acf7e1d765a7ec121f60b43b45d18d147e0d WHIRLPOOL a10f7dfe2efd64f6ae2d02d05a3687b3754a00e0b08c2aa8dc98158e68502dd2337b2c61ad823584668ac54471747f5fe5c608dac3c50c912536e9e998375b37
 MISC metadata.xml 253 SHA256 2fba4104c545c30062d3a1ff0bd60ab0ca161820464ed8591113009d0497adbf SHA512 6d95b4ce1f38639a811d66f7ea3b2b5f509a78e8f8401deb2ecbbfde63a651f7161f8b5a64bf0657dbe5e8ef725f6fc1c8b79ccc2f6f373f9bcb1b32b8830f48 WHIRLPOOL 335828c341d9ae0c768cadd787e6def4736778c6b59c3bc3cece9eb4d8973d5b13aac2313f31447bba0d8b9f3593e0b16ed1262a4d8200054e9c01614c63e448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBMs7YACgkQuQc30/atMkB/nwCgokEySJuABP86YsnfkFA2doN7
-p3AAoLGaaE7xPtiOEHzqdPzbIaVAAj+2
-=PEW7
+iQIcBAEBCAAGBQJQjl/qAAoJEOSiRoyO7jvoPwEP/1zCEgDNMXPuQd5wikt7xlbn
+UharH7NI6YL3NJNP3FrVlIhDnkxQflci4ZUM0nzAq7NkRSXyPAEgbXbQymurFpRa
+HQ6jKZYIcUVBOTqhdm0j7OHoEx0N/6MyLwmQsaH29WiX7ba7LJM5xP2Acm1rx7/X
+ztB+/lycYpaDjyS6oBibUeYEuinmrUV21wy9j1nkjo80aQUomfDOHEL44d6tbfeM
+pb8rK/zCL6LOKTxyZet38lQ0/8zE13jOdC1B3qsT/LXkJecBmzhmj+/w+QYnCLCT
+BBP9YdRxKVsM0DqSoaFAnR9nlwQnjXS9V2TDV960Oe07f+YEZNXOblXB3AjxDD9/
+1TH6yP2vnCsszICElZxCq7Vnftr05F3gwpIXD0KWqaWkTrbD1RNwoeT8ThehixFH
+3JdXo7msBxzq72E9QelUN5a2adUmvxk7t4gnFiKteVf46RRn/fR58XdNDwulVwUr
+jDcaPOVfvEGRE8lmJtEktYEryKOVNVGjKCu98GU+lTnf5a4k9+/eOROss9ZgPqrE
+NVN7U1SxA13T9ZwHdGAqD99i+LvVZ3qLUlxQO6Eu6BrlgftFdc5Y3mQqMF+LBqCf
+MB1y/EGpzIRfd7PLhUd8Wf+jsS4gcMkgamL0eEfssuAOxYMauBIqyjCGmEmWT3DR
+iZ/oXXvVf8G4pV0oxRxq
+=vOx/
 -----END PGP SIGNATURE-----
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."
-}