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

(Portage version: 2.1.5.2)

3 files changed, 10 insertions, 32 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/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)