New version for GNOME-2.22.2. Build, crash and bug fixes. Clean up old revisions.

Package-Manager: portage-2.1.5.2

4 files changed, 17 insertions, 41 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 80c49be7920e..56b8b995d70e 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.120 2008/04/07 20:34:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.121 2008/05/31 12:13:47 eva Exp $
+
+*gnome-keyring-2.22.2 (31 May 2008)
+
+  31 May 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-keyring-0.8.1.ebuild, -gnome-keyring-2.22.0-r2.ebuild,
+  +gnome-keyring-2.22.2.ebuild:
+  New version for GNOME-2.22.2. Build, crash and bug fixes.
+  Clean up old revisions.
 
 *gnome-keyring-2.22.1 (07 Apr 2008)
 
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
index be308569f545..abf09ec79142 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST gnome-keyring-0.8.1.tar.bz2 448558 RMD160 7f9b100aa59b26fee7b761d2705ad9725b87a031 SHA1 6473106b3621c5e6b7cbc16f5955ec704a1a39c2 SHA256 ad28558e2c0e5496cdfec3f8badf84d64af3aebc3fc9f5632066591e20ce3943
 DIST gnome-keyring-2.20.3.tar.bz2 541431 RMD160 8e85220492cd87b15bb3f1fadbb6673cea3a684c SHA1 e6518a9521bc240ac4fb55185747c80ac41739e1 SHA256 5bfb69897c9042968637c33beca098a4bbabcb4b9863f3f49504bc82089fa970
-DIST gnome-keyring-2.22.0.tar.bz2 882416 RMD160 bf74249b5d1c2d68ca97281eeec249af5f9ec126 SHA1 2a7887bfb1438d1baf1f22dd557d7958052510ce SHA256 d5aa2c467fcb842b035a4fc424031dcc5a67ece01bc8f1c38fe10cbc3adbbd42
 DIST gnome-keyring-2.22.1.tar.bz2 960392 RMD160 83dddadb1c133931151de302e8f33ff1d99ed496 SHA1 59956194b110a4e4576db0791e2d2371b39ff49c SHA256 83983786ac5273fa7341f2b43db8759534d2516704ab1165682c9afcd0f8b4d0
-EBUILD gnome-keyring-0.8.1.ebuild 670 RMD160 9ba173670c357b45666b97e44fb2289d411f3fdf SHA1 97ac2872364ba5c8eb1eaf695c3b3e85e3d96f2c SHA256 4abd0e48c25fddc04cb0abc6ac99549f76c88f464c6c5928fe84c067813cc9cb
+DIST gnome-keyring-2.22.2.tar.bz2 904890 RMD160 9fcf9bee654050ca7f762b5d50e98ef690e8409e SHA1 b3276e2c349b761d167df9bdbb9c19268af2bd4b SHA256 750d49e7ded79a8685704a732d284973150df1c02e6ff12d003a6486966d5b5c
 EBUILD gnome-keyring-2.20.3.ebuild 942 RMD160 3a23a066f3604fc36cc3536c411601be5d33b547 SHA1 f03afbdc8f2d7ce0e8b02cb5079904cb617ad749 SHA256 42b463b36673021bde2389aad8cadca8588663ae2308ad1156d3e8fb7d2e7de2
-EBUILD gnome-keyring-2.22.0-r2.ebuild 1209 RMD160 0e936d45d3d948f6cdfab67e561f57ad16238ae3 SHA1 d1bd511ce0246fc1d601f1f24a4785ea4cab5ae2 SHA256 2483c6e40614e1ff080b3e5eb0cc95b0a9f0fe0a9341bf24accd878634f6f61c
 EBUILD gnome-keyring-2.22.1.ebuild 1077 RMD160 b6b9f4fdf8a1578d5009096a4b34f9b7a31bae10 SHA1 f253f5eb9562ff71427568eff59acfbae55dc2b6 SHA256 355b9c02b68b284d3b22c16f0d958ca18523f2a59936cdd773b6f1448f383933
-MISC ChangeLog 14812 RMD160 1fcfcf118a442b5e9e3387ba1091c2ad635dd58e SHA1 e8e61010737eae6f6c3189905ecccab22b154999 SHA256 573989073355efa741dc69489e432e0770f525e4841acb371aafdaef6f26542e
+EBUILD gnome-keyring-2.22.2.ebuild 1077 RMD160 e97801410d3f00f67573a84bdacc6f926b8efd59 SHA1 7971cb061ab69fd8bac9fbad5f0e81cb25c6ea61 SHA256 15e8ba4e440938f1b2fbc962eba0e9e20a9a409b44d95d076496414598eadf26
+MISC ChangeLog 15086 RMD160 d2fbe0cfe5eeb03b5873b91a55f605c557a19cd4 SHA1 ce71d7dcb0c2622e36f27f94ffce2db2d761db6c SHA256 bdfc77e59729cc85df52d3025428c7d9b5086b25924842e41abd4c906d04fb15
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFICp4pj9hvisErhMIRAondAKC94pd+1TpDrahUyhlnG1cUxsmFUACgl32H
-Hdqcryo/0S9bLg+e2M4oLGg=
-=kF5U
+iEYEARECAAYFAkhBQQQACgkQ1fmVwcYIWAbfcQCdGV8hoN5CtHDZ2Bce1y4hPyrG
+wZIAoLddec9KKhF24MaoImUr3v88iT7l
+=vjRp
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-keyring/gnome-keyring-0.8.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-0.8.1.ebuild
deleted file mode 100644
index 551fa77a2eba..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-0.8.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-0.8.1.ebuild,v 1.11 2008/03/31 04:32:04 ricmm 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=""
-
-RDEPEND=">=dev-libs/glib-2.6
-		>=x11-libs/gtk+-2.6
-		>=sys-apps/dbus-1.0"
-DEPEND="${RDEPEND}
-		sys-devel/gettext
-		>=dev-util/intltool-0.35
-		>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.22.0-r2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.22.2.ebuild
index a75fcca819f3..97cfb1c71588 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.22.0-r2.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.22.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.22.0-r2.ebuild,v 1.1 2008/03/23 11:24:03 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.22.2.ebuild,v 1.1 2008/05/31 12:13:47 eva Exp $
 
 inherit gnome2 eutils pam
 
@@ -28,13 +28,6 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README TODO"
 
-src_unpack() {
-	gnome2_src_unpack
-
-	echo "gkr-pk-object-storage.c" >> po/POTFILES.in
-	echo "gkr-ask-tool.c" >> po/POTFILES.in
-}
-
 pkg_setup() {
 	G2CONF="${G2CONF}
 		$(use_enable debug)