New version for GNOME 2.28. Clean up old revision.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

4 files changed, 37 insertions, 76 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index 9faa78bb82e9..0d7213434798 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.160 2009/10/24 16:29:00 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.161 2009/10/29 22:09:54 eva Exp $
+
+*gnome-keyring-2.28.1 (29 Oct 2009)
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-keyring-2.24.1.ebuild, -gnome-keyring-2.26.1-r1.ebuild,
+  +files/gnome-keyring-2.27.92-as-needed.patch,
+  +gnome-keyring-2.28.1.ebuild:
+  New version for GNOME 2.28. Clean up old revision.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> gnome-keyring-2.26.3.ebuild:
   ppc stable #281427
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.27.92-as-needed.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.27.92-as-needed.patch
new file mode 100644
index 000000000000..f56635c45f18
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-2.27.92-as-needed.patch
@@ -0,0 +1,25 @@
+Fix linking with --as-needed -- "undefined reference to `g_thread_init'"
+
+GNOME Bug 595767
+
+---
+--- tool/gkr-tool.c
++++ tool/gkr-tool.c
+@@ -25,6 +25,7 @@
+ 
+ #include "gkr-tool.h"
+ 
++#include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ 
+--- tool/Makefile.am
++++ tool/Makefile.am
+@@ -20,6 +20,7 @@
+ 	$(top_builddir)/gp11/libgp11.la \
+ 	$(top_builddir)/gcr/libgcr.la \
+ 	$(top_builddir)/egg/libegg.la \
++	$(GTHREAD_LIBS) \
+ 	$(GTK_LIBS) \
+ 	$(GCRYPT_LIBS) \
+ 	$(LIBTASN1_LIBS) \
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.24.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.24.1.ebuild
deleted file mode 100644
index bdbfc05f484a..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-2.24.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2009 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.24.1.ebuild,v 1.2 2009/04/27 22:00:09 eva Exp $
-
-EAPI="2"
-
-inherit gnome2 pam eutils autotools
-
-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="debug doc hal pam test"
-
-RDEPEND=">=dev-libs/glib-2.16
-	 >=x11-libs/gtk+-2.6
-	 gnome-base/gconf
-	 >=sys-apps/dbus-1.0
-	 hal? ( >=sys-apps/hal-0.5.7 )
-	 pam? ( virtual/pam )
-	 >=dev-libs/libgcrypt-1.2.2
-	 >=dev-libs/libtasn1-0.3.4"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9
-	dev-util/gtk-doc-am
-	doc? ( dev-util/gtk-doc )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-# upstream bug: http://bugzilla.gnome.org/show_bug.cgi?id=553164
-RESTRICT="test"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		$(use_enable debug)
-		$(use_enable hal)
-		$(use_enable test tests)
-		$(use_enable pam)
-		$(use_with pam pam-dir $(getpam_mod_dir))
-		--with-root-certs=/usr/share/ca-certificates/
-		--enable-acl-prompts
-		--enable-ssh-agent"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix configure with recent libtasn1, bug #266554
-	epatch "${FILESDIR}/${PN}-2.22.3-pkg-libtasn1.patch"
-
-	intltoolize --force --copy --automake || die "inltoolize failed"
-	eautoreconf
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.28.1.ebuild
index 7de0c6e13e42..86b2d531f332 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.28.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 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.26.1-r1.ebuild,v 1.2 2009/06/30 07:50:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.28.1.ebuild,v 1.1 2009/10/29 22:09:54 eva Exp $
 
 EAPI="2"
 
-inherit gnome2 pam virtualx eutils autotools
+inherit gnome2 pam virtualx
 
 DESCRIPTION="Password and keyring managing daemon"
 HOMEPAGE="http://www.gnome.org/"
@@ -19,7 +19,6 @@ RDEPEND=">=dev-libs/glib-2.16
 	>=x11-libs/gtk+-2.6
 	gnome-base/gconf
 	>=sys-apps/dbus-1.0
-	hal? ( >=sys-apps/hal-0.5.7 )
 	pam? ( virtual/pam )
 	>=dev-libs/libgcrypt-1.2.2
 	>=dev-libs/libtasn1-1"
@@ -30,12 +29,11 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
 	doc? ( >=dev-util/gtk-doc-1.9 )"
 
-DOCS="AUTHORS ChangeLog NEWS README TODO"
+DOCS="AUTHORS ChangeLog NEWS README TODO keyring-intro.txt"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
 		$(use_enable debug)
-		$(use_enable hal)
 		$(use_enable test tests)
 		$(use_enable pam)
 		$(use_with pam pam-dir $(getpam_mod_dir))
@@ -51,22 +49,9 @@ src_prepare() {
 	# Remove silly CFLAGS
 	sed 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
 		-i configure.in configure || die "sed failed"
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-
-	# Detect where dlopen functions are rather than hardcoding -ldl
-	# Fixes build on BSD
-	# Bug #271359
-	# Gnome bug #584307
-	epatch "${FILESDIR}/${P}-dlopen.patch"
-	eautoreconf
-
 }
 
 src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	Xemake check || die "emake check failed!"
-
-	Xemake -C tests run || die "running tests failed!"
 }