Do not pull in gnome-keyring-3 in libsecret-0.15 to allow partial stabilization of some gnome-3.6 era libraries. And add libsecret-0.15-r1 which is identical, but properly pulls in gnome-keyring-3. Drop old.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

4 files changed, 15 insertions, 78 deletions

diff --git a/app-crypt/libsecret/ChangeLog b/app-crypt/libsecret/ChangeLog
index 20374d8d676f..64718d458997 100644
--- a/app-crypt/libsecret/ChangeLog
+++ b/app-crypt/libsecret/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/libsecret
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/ChangeLog,v 1.19 2013/09/01 21:30:41 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/ChangeLog,v 1.20 2013/10/03 02:25:29 tetromino Exp $
+
+*libsecret-0.15-r1 (03 Oct 2013)
+
+  03 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -libsecret-0.12.ebuild, -libsecret-0.14.ebuild, libsecret-0.15.ebuild,
+  +libsecret-0.15-r1.ebuild:
+  Do not pull in gnome-keyring-3 in libsecret-0.15 to allow partial
+  stabilization of some gnome-3.6 era libraries. And add libsecret-0.15-r1
+  which is identical, but properly pulls in gnome-keyring-3. Drop old.
 
 *libsecret-0.16 (01 Sep 2013)
 
diff --git a/app-crypt/libsecret/libsecret-0.12.ebuild b/app-crypt/libsecret/libsecret-0.12.ebuild
deleted file mode 100644
index caede2dbabf7..000000000000
--- a/app-crypt/libsecret/libsecret-0.12.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.12.ebuild,v 1.9 2013/01/28 14:56:10 aballier Exp $
-
-EAPI="5"
-VALA_MIN_API_VERSION=0.18
-VALA_USE_DEPEND=vapigen
-
-inherit eutils gnome2 python vala virtualx
-
-DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
-HOMEPAGE="https://live.gnome.org/Libsecret"
-
-LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
-SLOT="0"
-IUSE="+crypt debug +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31.0:2
-	crypt? ( >=dev-libs/libgcrypt-1.2.2:= )
-	introspection? ( >=dev-libs/gobject-introspection-1.29 )"
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-keyring-3"
-# Add ksecrets to RDEPEND when it's added to portage
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		dev-python/mock
-		introspection? (
-			=dev-lang/python-2*
-			>=dev-libs/gjs-1.32
-			dev-python/pygobject:3 )
-	)
-	vala? ( $(vala_depend) )"
-
-pkg_setup() {
-	# python is only needed for tests
-	if use test && use introspection; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--enable-manpages
-		--disable-strict
-		--disable-coverage
-		--disable-static
-		$(use_enable crypt gcrypt)
-		$(use_enable introspection)
-		$(use_enable vala)"
-
-	# FIXME: disable failing test
-	sed -e '/test_get_sync);/d' \
-		-e '/test_get_async);/d' \
-		-i libsecret/tests/test-service.c || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_test() {
-	Xemake check
-}
diff --git a/app-crypt/libsecret/libsecret-0.14.ebuild b/app-crypt/libsecret/libsecret-0.15-r1.ebuild
index e125995d8ace..cdd366852973 100644
--- a/app-crypt/libsecret/libsecret-0.14.ebuild
+++ b/app-crypt/libsecret/libsecret-0.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.14.ebuild,v 1.2 2013/03/30 23:16:06 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.15-r1.ebuild,v 1.1 2013/10/03 02:25:29 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
diff --git a/app-crypt/libsecret/libsecret-0.15.ebuild b/app-crypt/libsecret/libsecret-0.15.ebuild
index 66b57769e6dd..290ea3e9ec19 100644
--- a/app-crypt/libsecret/libsecret-0.15.ebuild
+++ b/app-crypt/libsecret/libsecret-0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.15.ebuild,v 1.1 2013/03/31 16:06:16 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.15.ebuild,v 1.2 2013/10/03 02:25:29 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@@ -22,8 +22,9 @@ COMMON_DEPEND="
 	>=dev-libs/glib-2.32.0:2
 	crypt? ( >=dev-libs/libgcrypt-1.2.2:= )
 	introspection? ( >=dev-libs/gobject-introspection-1.29 )"
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-keyring-3"
+RDEPEND="${COMMON_DEPEND}"
+# Temporarily removed from RDEPEND to allow stabilization:
+#	>=gnome-base/gnome-keyring-3
 # Add ksecrets to RDEPEND when it's added to portage
 DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt