5 files changed, 8 insertions, 42 deletions
diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 97e416d3a5db..10d65e3a4c1d 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.101 2007/10/07 21:47:01 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.102 2007/10/08 08:53:11 remi Exp $
+
+*gnome-keyring-2.20.0-r2 (08 Oct 2007)
+
+  08 Oct 2007; Rémi Cardona <remi@gentoo.org> -gnome-keyring-2.20.0.ebuild,
+  -gnome-keyring-2.20.0-r1.ebuild, +gnome-keyring-2.20.0-r2.ebuild:
+  force revbump and clean up
 
   07 Oct 2007; Rémi Cardona <remi@gentoo.org>
   files/gnome-keyring-2.20.0-fix_gtk_doc.patch,
diff --git a/gnome-base/gnome-keyring/files/digest-gnome-keyring-2.20.0-r1 b/gnome-base/gnome-keyring/files/digest-gnome-keyring-2.20.0-r1
deleted file mode 100644
index 441b928e628d..000000000000
--- a/gnome-base/gnome-keyring/files/digest-gnome-keyring-2.20.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 effc946bf3fa05d70b1251801383efd2 gnome-keyring-2.20.0.tar.bz2 572938
-RMD160 e6af5c03eef1a972f5b6d42da8360f2faade253f gnome-keyring-2.20.0.tar.bz2 572938
-SHA256 6fadcd85a16672381857de0e1cf2b6fe16ec3393931f92427deb13153eeabe1c gnome-keyring-2.20.0.tar.bz2 572938
diff --git a/gnome-base/gnome-keyring/files/digest-gnome-keyring-2.20.0 b/gnome-base/gnome-keyring/files/digest-gnome-keyring-2.20.0-r2
index 441b928e628d..441b928e628d 100644
--- a/gnome-base/gnome-keyring/files/digest-gnome-keyring-2.20.0
+++ b/gnome-base/gnome-keyring/files/digest-gnome-keyring-2.20.0-r2
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.20.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.20.0-r2.ebuild
index ba79ad9f019a..0e77fd05e674 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.20.0-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.20.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.20.0-r1.ebuild,v 1.3 2007/10/07 21:47:01 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.20.0-r2.ebuild,v 1.1 2007/10/08 08:53:11 remi Exp $
 
 inherit gnome2 eutils autotools pam
 
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.20.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.20.0.ebuild
deleted file mode 100644
index 112494f8136a..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-2.20.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.20.0.ebuild,v 1.1 2007/10/01 09:13:05 leio Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="hal pam test"
-
-RDEPEND=">=dev-libs/glib-2.6
-		>=x11-libs/gtk+-2.6
-		>=sys-apps/dbus-1.0
-		hal? ( >=sys-apps/hal-0.5.7 )
-		pam? ( sys-libs/pam )
-		>=dev-libs/libgcrypt-1.2.2"
-DEPEND="${RDEPEND}
-		sys-devel/gettext
-		>=dev-util/intltool-0.35
-		>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix tests
-	echo "gkr-ask-tool.c" >> ${S}/po/POTFILES.in
-}
-
-pkg_setup() {
-	G2CONF="$(use_enable hal) $(use_enable pam) $(use_enable test tests)"
-}