Bump to 3.2.0 from the gnome overlay. Requires gnome-keyring-3.2 (due to changes in gnome-keyring's internal dbus protocol), hence drop alpha, arm, ia64, ppc, ppc64, sparc keywords to match gnome-keyring-3.2.1. Keywording bug will be filed later for all of gnome-3.2.

(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)

2 files changed, 60 insertions, 1 deletions

diff --git a/gnome-base/libgnome-keyring/ChangeLog b/gnome-base/libgnome-keyring/ChangeLog
index b505e97aa95e..3719a963f552 100644
--- a/gnome-base/libgnome-keyring/ChangeLog
+++ b/gnome-base/libgnome-keyring/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/libgnome-keyring
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.28 2011/09/12 08:41:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.29 2011/10/30 07:28:17 tetromino Exp $
+
+*libgnome-keyring-3.2.0 (30 Oct 2011)
+
+  30 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +libgnome-keyring-3.2.0.ebuild:
+  Bump to 3.2.0 from the gnome overlay. Requires gnome-keyring-3.2 (due to
+  changes in gnome-keyring's internal dbus protocol), hence drop alpha, arm,
+  ia64, ppc, ppc64, sparc keywords to match gnome-keyring-3.2.1.
 
   12 Sep 2011; Pacho Ramos <pacho@gentoo.org> libgnome-keyring-2.32.0.ebuild,
   +files/libgnome-keyring-2.32.0-drop-test.patch,
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.2.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.2.0.ebuild
new file mode 100644
index 000000000000..a79a43237e3f
--- /dev/null
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.2.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.2.0.ebuild,v 1.1 2011/10/30 07:28:17 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Compatibility library for accessing secrets"
+HOMEPAGE="http://live.gnome.org/GnomeKeyring"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE="debug doc test"
+
+RDEPEND=">=sys-apps/dbus-1.0
+	gnome-base/gconf
+	>=gnome-base/gnome-keyring-3.1.92[test?]"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		$(use_enable test tests full)"
+	DOCS="AUTHORS ChangeLog NEWS README"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# FIXME: Remove silly CFLAGS
+	sed -e 's:CFLAGS="$CFLAGS -Werror:CFLAGS="$CFLAGS:' \
+		-e 's:CFLAGS="$CFLAGS -g -O0:CFLAGS="$CFLAGS:' \
+		-i configure.ac configure || die "sed failed"
+
+	# FIXME: Remove DISABLE_DEPRECATED flags
+	sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' \
+		-i configure.ac configure || die "sed 2 failed"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	dbus-launch emake check || die "tests failed"
+}