gnome-base/gnome-keyring: force revbump and clean up

Package-Manager: portage-2.1.3.12

6 files changed, 19 insertions, 60 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/Manifest b/gnome-base/gnome-keyring/Manifest
index 12862d777fc2..f4cde31d675b 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -26,18 +26,14 @@ EBUILD gnome-keyring-0.8.1.ebuild 669 RMD160 e3c6a29aaa43379e9bf957f2192273d15f0
 MD5 def1b954068ff19137b2b7a21a439e9a gnome-keyring-0.8.1.ebuild 669
 RMD160 e3c6a29aaa43379e9bf957f2192273d15f0ead56 gnome-keyring-0.8.1.ebuild 669
 SHA256 7b295a365439abbc0fd17ea54c8aa46f3440009e96e9b308ea17ab3ad984bdee gnome-keyring-0.8.1.ebuild 669
-EBUILD gnome-keyring-2.20.0-r1.ebuild 1177 RMD160 e720fe3422c0b8b661f4c2927fef466f9562fb49 SHA1 dcc906ea20b0fbdbe609760c5669284c056833e4 SHA256 491d3e42007a99a5c7773710b270d59dbf4f280d087e2c1dd95b199ce097f329
-MD5 1f123f700d50a5293ef022e38cca53b2 gnome-keyring-2.20.0-r1.ebuild 1177
-RMD160 e720fe3422c0b8b661f4c2927fef466f9562fb49 gnome-keyring-2.20.0-r1.ebuild 1177
-SHA256 491d3e42007a99a5c7773710b270d59dbf4f280d087e2c1dd95b199ce097f329 gnome-keyring-2.20.0-r1.ebuild 1177
-EBUILD gnome-keyring-2.20.0.ebuild 961 RMD160 1a94c40272f6caa55d0618f426cce9189d0e1b5d SHA1 e01a425e76e98a5546bb58cdcac10df87974b454 SHA256 0d2acf4850b90f278fd8ac3a80ccf027e3fdddd4f446f3ee59f93c50a0d24b00
-MD5 fb87758151d7a4cb17bfd6fb174341ea gnome-keyring-2.20.0.ebuild 961
-RMD160 1a94c40272f6caa55d0618f426cce9189d0e1b5d gnome-keyring-2.20.0.ebuild 961
-SHA256 0d2acf4850b90f278fd8ac3a80ccf027e3fdddd4f446f3ee59f93c50a0d24b00 gnome-keyring-2.20.0.ebuild 961
-MISC ChangeLog 12043 RMD160 44791bdaa146ffd1c2e9f5df2e2ba63a9f79f6d0 SHA1 863c238fbf2dc257a1b13441c602f6d8b4790000 SHA256 e5ea7b99c6959fb01d6944be121e8200d309e979102f78513d40c3045908a25e
-MD5 aa736c517b4d3016e1205c3e18930e81 ChangeLog 12043
-RMD160 44791bdaa146ffd1c2e9f5df2e2ba63a9f79f6d0 ChangeLog 12043
-SHA256 e5ea7b99c6959fb01d6944be121e8200d309e979102f78513d40c3045908a25e ChangeLog 12043
+EBUILD gnome-keyring-2.20.0-r2.ebuild 1177 RMD160 7a09e47f1ee29b0eb120c5838cd9af26e85fa3f9 SHA1 0b04d6cb7451892a1d87396ea96b5de406a6a8a2 SHA256 c0327f096b251b9c60e0a7103c71d2c9193ff93af6777cb2eddc760b505ae49f
+MD5 e02fd7748486cb1ec79458ee968ff0dc gnome-keyring-2.20.0-r2.ebuild 1177
+RMD160 7a09e47f1ee29b0eb120c5838cd9af26e85fa3f9 gnome-keyring-2.20.0-r2.ebuild 1177
+SHA256 c0327f096b251b9c60e0a7103c71d2c9193ff93af6777cb2eddc760b505ae49f gnome-keyring-2.20.0-r2.ebuild 1177
+MISC ChangeLog 12258 RMD160 bb6ff1599a62a16a8e1257564d05c33d5ead0748 SHA1 012598da82f632e4f63b9464c2bb27eeaccae028 SHA256 ec4b089af9d4511c69090d604dfeea3e4dc6f9535b0aa514cbd70dc26baef150
+MD5 78c84c40bb12f2866780e472a8d6dbc5 ChangeLog 12258
+RMD160 bb6ff1599a62a16a8e1257564d05c33d5ead0748 ChangeLog 12258
+SHA256 ec4b089af9d4511c69090d604dfeea3e4dc6f9535b0aa514cbd70dc26baef150 ChangeLog 12258
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -51,9 +47,6 @@ SHA256 c05189f869ad876daad2f33c9ed9126db57a822c79f897fba786b758e6889e75 files/di
 MD5 a47cec36a7d2da7f058b1536d8a16422 files/digest-gnome-keyring-0.8.1 262
 RMD160 b4fa93f9571ac051507f1d1283f5e063c8d8674e files/digest-gnome-keyring-0.8.1 262
 SHA256 76e112c978f80806f7b2c9766275a7751d9a0979fb482232a2e47de4186c55fe files/digest-gnome-keyring-0.8.1 262
-MD5 6c2b356738e60100666ea02b1ef7d705 files/digest-gnome-keyring-2.20.0 265
-RMD160 4350876a0bd58b442f62c3e33fc2b370c4076362 files/digest-gnome-keyring-2.20.0 265
-SHA256 a95192a627a301e482f5e027f7f366812a06ca00b941fff0bdaa5e34f6bed7c9 files/digest-gnome-keyring-2.20.0 265
-MD5 6c2b356738e60100666ea02b1ef7d705 files/digest-gnome-keyring-2.20.0-r1 265
-RMD160 4350876a0bd58b442f62c3e33fc2b370c4076362 files/digest-gnome-keyring-2.20.0-r1 265
-SHA256 a95192a627a301e482f5e027f7f366812a06ca00b941fff0bdaa5e34f6bed7c9 files/digest-gnome-keyring-2.20.0-r1 265
+MD5 6c2b356738e60100666ea02b1ef7d705 files/digest-gnome-keyring-2.20.0-r2 265
+RMD160 4350876a0bd58b442f62c3e33fc2b370c4076362 files/digest-gnome-keyring-2.20.0-r2 265
+SHA256 a95192a627a301e482f5e027f7f366812a06ca00b941fff0bdaa5e34f6bed7c9 files/digest-gnome-keyring-2.20.0-r2 265
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)"
-}