Clean up old revisions, bug #340349.

Package-Manager: portage-2.2_rc89/cvs/Linux x86_64

5 files changed, 17 insertions, 126 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index 380fadf2fe58..29b613558f27 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.137 2010/10/09 10:02:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.138 2010/10/11 21:04:23 eva Exp $
+
+  11 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/70-seahorse-agent, -seahorse-2.26.2.ebuild,
+  -files/seahorse-2.26.2-gpgme-lfs.patch:
+  Clean up old revisions, bug #340349.
 
   09 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
   seahorse-2.30.1.ebuild:
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index aadc65d6f235..dff879c5b32c 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,11 +1,17 @@
-AUX 70-seahorse-agent 241 RMD160 d28490016ed259ef29416cb101ccddd76e195ed5 SHA1 2b40525f543741dc0a453a8241e3b7c83f45da6f SHA256 2e70cbb034fde8ddd5c69baf97570ad706bec2e04bd7dd2c86f462b9a594e3c6
-AUX seahorse-2.26.2-gpgme-lfs.patch 1210 RMD160 7aaa3cae7c31154331cd9eb92a6643d7bd6a00a9 SHA1 8ffe6667fe7d33f440a3e154a1cbd320963b5beb SHA256 a0cd874dc4e2a79559eb4a4a65349c88e4c9925871493041d662e33b6a53a57d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX seahorse-2.28.0-as-needed.patch 381 RMD160 2756cc4440f36b2a206b07710f5bc9b60037a564 SHA1 390204f347f89b3c0dcebbe8cb1f154090b22aa4 SHA256 243d49dd613a19d569e8fa5560d4f4d1618c9c067b00588cd61ccf6dc7516d3c
-DIST seahorse-2.26.2.tar.bz2 2196810 RMD160 9193e5c14244f1a1463c6479bf31bb7d20a1a1bb SHA1 04484352e92fc2faa6f06ee6f4eb21828931f173 SHA256 ab73a7c918afd9f111b6078750328d0a4b82f2f6644e3fa04582f58d81238dce
 DIST seahorse-2.28.1.tar.bz2 2397687 RMD160 40e33550233f81a7adf152d8ba72a095c3a822bd SHA1 8d849f9e95241be3eefb54f3b64a18017c7bb8fc SHA256 67a1ae5eaceca6306a6a740c8753c5a6c4b511cfbf8a8031a78ae61297ced0a0
 DIST seahorse-2.30.1.tar.bz2 2422214 RMD160 70cdcc18798e405deb0164d098c57d22adc2f5f5 SHA1 1754a447d48837bc8a0a657a6bcdd65666704ccb SHA256 1b97064ee91f87494040313a0a2fe813473ec4dba15b5781245080e8fea8e7c3
-EBUILD seahorse-2.26.2.ebuild 1888 RMD160 2a9d0b7a6fbbb0bf4252af467ae35167b3207d8d SHA1 5e7fffe4a3643edab99848208b81fe70c2cd82d0 SHA256 15f7aa55ec82af10c003f70c6d0664763122e7555ac97b16ad6a4b2459865fdd
 EBUILD seahorse-2.28.1.ebuild 2057 RMD160 e893fce64bef4f2793cfa68a24f7626de0d670b8 SHA1 146135afac2c7d54bb55d558bec966ff30bacf1f SHA256 cefdc352bee839deb666ad6dfdd421520ad2c87275d112d40bcd2aae4f67184b
 EBUILD seahorse-2.30.1.ebuild 2020 RMD160 d8c0452198faab0923bc75deb6f94eb39c3fe9f4 SHA1 84e12bbcb29dee76282dc4b0992ee086f32d551c SHA256 f6df537608fef49bc6a11eae2a8cb677ac65258ea2d0807624796f3c2ce20a07
-MISC ChangeLog 19744 RMD160 57a826e19276e88bccae6c6fa16697d9521058f5 SHA1 a658e5f0490bb0cf5abf9ff0c9f68aca82097467 SHA256 5c23b08b900d1c0c7f6c464f5ea167c4f7c264514143b20b26180f86802855ef
+MISC ChangeLog 19927 RMD160 e7a7a640a3a25284f2e8e4fd20ddc320d0cc7a37 SHA1 3c18e45b5ee5d3da3d270db78a5ea0ae5260ce50 SHA256 d15f91d1cd6c4ddc296110bd8a95d76f268c203b653f82046a5ec6c64515dbf2
 MISC metadata.xml 780 RMD160 9dad8a330968df7735c6282e8eced82566e7d3fb SHA1 121dfaa0d1f829738e7e43ae6efdaa33da7d2462 SHA256 a451d0176823370754ceaaa2bd6d5e372523008eaf29410541378392241d20d6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyze+EACgkQ1fmVwcYIWAasMwCfRuwDOBVTXWkdspSDSJUW2THf
+2oQAoIP3rVZXr5Zn9HAfWAt+YNAhk1xm
+=yIf1
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse/files/70-seahorse-agent b/app-crypt/seahorse/files/70-seahorse-agent
deleted file mode 100644
index 492878e0ebf1..000000000000
--- a/app-crypt/seahorse/files/70-seahorse-agent
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# launches a seahorse-agent instance
-
-seahorseagent=`which seahorse-agent 2> /dev/null`
-if [ -n "$seahorseagent" ] && [ -x "$seahorseagent" ] && [ -z "$GPG_AGENT_INFO" ] ;  then
-   command="$seahorseagent --execute $command"
-fi
diff --git a/app-crypt/seahorse/files/seahorse-2.26.2-gpgme-lfs.patch b/app-crypt/seahorse/files/seahorse-2.26.2-gpgme-lfs.patch
deleted file mode 100644
index 1c72b39d7dae..000000000000
--- a/app-crypt/seahorse/files/seahorse-2.26.2-gpgme-lfs.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --exclude-from=/opt/home/dang/.scripts/diffrc -up -ruN seahorse-2.26.2.orig/pgp/seahorse-gpg-op.c seahorse-2.26.2/pgp/seahorse-gpg-op.c
---- seahorse-2.26.2.orig/pgp/seahorse-gpg-op.c	2009-04-20 11:35:00.000000000 -0400
-+++ seahorse-2.26.2/pgp/seahorse-gpg-op.c	2009-07-10 09:43:31.550476889 -0400
-@@ -18,7 +18,9 @@
-  * 59 Temple Place, Suite 330,
-  * Boston, MA 02111-1307, USA.
-  */
-- 
-+
-+#include "config.h"
-+
- #include <glib.h>
- #include <gpgme.h>
- #include <string.h>
-diff --exclude-from=/opt/home/dang/.scripts/diffrc -up -ruN seahorse-2.26.2.orig/pgp/seahorse-gpg-options.c seahorse-2.26.2/pgp/seahorse-gpg-options.c
---- seahorse-2.26.2.orig/pgp/seahorse-gpg-options.c	2009-04-20 11:35:00.000000000 -0400
-+++ seahorse-2.26.2/pgp/seahorse-gpg-options.c	2009-07-10 09:36:16.012409729 -0400
-@@ -19,6 +19,11 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#include "config.h"
-+
-+#include "seahorse-util.h"
-+#include "seahorse-context.h"
-+
- #include <sys/param.h>
- #include <sys/wait.h>
- #include <sys/file.h>
-@@ -31,9 +36,6 @@
- #include <unistd.h>
- #include <sys/stat.h>
- 
--#include "seahorse-util.h"
--#include "seahorse-context.h"
--
- #include "pgp/seahorse-gpgme.h"
- #include "pgp/seahorse-gpg-options.h"
- 
diff --git a/app-crypt/seahorse/seahorse-2.26.2.ebuild b/app-crypt/seahorse/seahorse-2.26.2.ebuild
deleted file mode 100644
index 37bc161f5de5..000000000000
--- a/app-crypt/seahorse/seahorse-2.26.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.26.2.ebuild,v 1.10 2010/10/08 23:36:11 eva Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils
-
-DESCRIPTION="A GNOME application for managing encryption keys"
-HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="avahi debug doc ldap libnotify test"
-
-RDEPEND=">=gnome-base/libglade-2.0
-	>=gnome-base/gconf-2.0
-	>=dev-libs/glib-2.10
-	>=x11-libs/gtk+-2.10
-	>=dev-libs/dbus-glib-0.72
-	>=gnome-base/gnome-keyring-2.25.5
-	net-libs/libsoup:2.4
-	x11-misc/shared-mime-info
-
-	net-misc/openssh
-	>=app-crypt/gpgme-1.0.0
-	|| (
-		=app-crypt/gnupg-2.0*
-		=app-crypt/gnupg-1.4* )
-
-	avahi? ( >=net-dns/avahi-0.6 )
-	ldap? ( net-nds/openldap )
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=app-text/gnome-doc-utils-0.3.2
-	>=app-text/scrollkeeper-0.3
-	>=dev-util/pkgconfig-0.20
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-pgp
-		--enable-ssh
-		--enable-pkcs11
-		--disable-scrollkeeper
-		--disable-update-mime-database
-		--enable-hkp
-		$(use_enable avahi sharing)
-		$(use_enable debug)
-		$(use_enable ldap)
-		$(use_enable libnotify)
-		$(use_enable test tests)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-
-	# fix building with gpgme with lfs  Bug #275445
-	epatch "${FILESDIR}"/${P}-gpgme-lfs.patch
-}
-
-pkg_postinst() {
-	einfo "The seahorse-agent tool has been moved to app-crypt/seahorse-plugins"
-	einfo "Use that if you want seahorse to manage your terminal SSH keys"
-}