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.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 25 insertions, 87 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/Manifest b/app-crypt/libsecret/Manifest
index 3f5f26e8a709..c80929634daf 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libsecret-0.12.tar.xz 476552 SHA256 323db75a5e73058d3eb95597d9f798fd715ec7d58f500be84628b8f9a0617c01 SHA512 920da07b8674816b9f139dc71e79721d1767025e799e99dea7458c3c3b54c81ae2f4aa55ad55194e0c151fa23d13eae12928c9bbfac1c67d9ae6eed3d8a1efa4 WHIRLPOOL 1bcc96a175519f2d24ec8c5f8ee61ae0ca851511c540d69230ab05a67d7192ac5827d407c06aa054820ee1ea714efee7ee15927b4fcc152fae73ef66bb768f24
-DIST libsecret-0.14.tar.xz 483620 SHA256 58a5b9370c093a7a2788869ed59bc56351797a775e100a9644e637851f9713b5 SHA512 63b8fd947d63f178f48a79aa195f4b6a9eb1e802134779436981ab8aa00b268a449709139704843656f8b4616cc13a2dbc79a4ba4460b09cf250cef3478fd172 WHIRLPOOL 301d88c4fcf35038456800748b349c303edf96323d96cf7b80324d85fe97ca3be22ce4b79ef07dc6d42a7fb6050dedf51d3d409f9e514eac7685d0139e407c63
 DIST libsecret-0.15.tar.xz 484532 SHA256 33e728b843efbe099483376ff5a3469260ee4b6ce035c7730909ac3793cb0fb8 SHA512 d89f3b52c5300306b92b222a56c976e5c42f761c2a8691b0dbac9f533853a54f6dd91f9f22f577e336c77e9771dd3cb098963dab086759ead2750f2a8fce5dca WHIRLPOOL 23eb06d6ed09023704b73cd9c1927bed09e38a58ec9694e43f8838879ce4f34ac67efb7a8f0b7770b26260ccb474c2f4e7c398f326b94dd08b63d7fe22e03ff1
 DIST libsecret-0.16.tar.xz 499888 SHA256 b859406c490a2011b35f5940235304315b343f2efd554800285f24b95e14f218 SHA512 2223861439733bf0e97d59236327aded8d17f89ce81aff17bd18c632960e7024c43be1480cd4591495401ac161dcb725d3d5fcd0b43120bfc6472c4a021ed770 WHIRLPOOL 32c7edafa67d0b26c9ec1d87d42ee4ff47abd134f34189a1b22d5c89b7386fa4403321c8595f587f6c02da36c5ce6e313e8ef7841527ddc1990efe8323194183
-EBUILD libsecret-0.12.ebuild 1852 SHA256 df7262c3b6e7c5af3829a83affa3fcc92779a46c0a98f5f2afdb695e01248358 SHA512 5cbb419d4bfebdb3ec04d2c9e9aa6d96b4308677df23429b38b0745ce90fc4ae05544f3b1306ba820b82031dae403d1895e491a45791e1cc5e10a806c840da4b WHIRLPOOL 1c4ee7a74aadbdfc35436b70c99dba3706e169aa0651758a76cbbf0e679bbf20a4bd96899e596d6ad48b12fc5f1e9ee6cd72406ea45ef51d14d5e6d4ebfbb6ca
-EBUILD libsecret-0.14.ebuild 1772 SHA256 5c01a30a85f9efb8799e75665f430921e34aa769e6f38c102e9774fc491e1ff5 SHA512 3e39f5bdafdd622f0d1c03b71c88c8db6f4680abf68030ffe6cbac7f6cabdb7313fa456de18a8f386259045f74bd51b9e444d600e4ac595b5551f1c2cbbd8038 WHIRLPOOL 729c196c6ece7a7e908ebffa6dc47e0503d9ab512a24cc07a4d4b9c37e06834cff6c08228fd0d093d5d1d19085f1217918f8dfa82c72c3cda885153a8a4b72b5
-EBUILD libsecret-0.15.ebuild 1772 SHA256 0bc4e0b5d41af5c2ddf55ca1b17ac6aebad4143fad1311ab63e0a7db70cb950a SHA512 26b46b5a759b564026e2f7821b505b7ead984cf330052debadbe4a62cf829ecc25b009ce0900f6bc0b09080033af51f2230b2797e3680e6bb215a04275bc5dec WHIRLPOOL 4ab9d2dc86a5ae649fc29d699d682273f733915cb7de761acf9969fd4909b8199b81906dbbcb8c47eb7143a3d3079840c5c0f5cce844886888fe909104a771bc
+EBUILD libsecret-0.15-r1.ebuild 1781 SHA256 95b860cd145bcf2ca21fb3766c102053af5f6734e0e06031c6c5e2d374de7ba1 SHA512 d1ea7409d1dcd4e23c9f4ffa12e792f4960c80f391836aef2051ce7e60e5871749364bd40739863340209e10c2e8bf4ebc64e25b9ae783e2f63cf0c9cdf520f8 WHIRLPOOL 9130e5f42587ac9a9029fa05e2a93cab82f14124d7be756cad417ed6783698432bd16260e5c9140484bf1c737df07a34a4900ae9256d9413f87dcbd0500b9a51
+EBUILD libsecret-0.15.ebuild 1838 SHA256 26bfe647eb67866c156f74357ef80e1cf027de2c599f1ef39e1527ee0115cd56 SHA512 9ed4023fd715d6bb721f0f42c06f8be2c61fcb9aee89cf38a38e0acfa6b6699552131bbee39fb2612cb9b23fc66c8d29224761c041d68110275846928fadab4b WHIRLPOOL 16019ae66dd299435dca10ee6cdb27c2e2c8d5f351d6aab57a01d7d80a988536e6c7e969b57cdb63f042d586a3b49abbf29c50f19071549b54bceb8d602cdab0
 EBUILD libsecret-0.16.ebuild 1772 SHA256 3a0449e8fae800cfd18e9d668e7589cbd94156e6610df164261e345a21acf59b SHA512 42f69c97f915a3ea7aa83e7aabd1aab0220361971851e29ad49037176a9a7e789eb4e6cbefb09ecf3cdaa200e6132ae417562738bc77c0b64b19a2fa4dc4e5fd WHIRLPOOL 4e385dd84fb824abdfbe6dd29d40422dd9349391102545a0f41f1aeb1f548f116b4d619fb3d402d60a26dd3d4f85a515211332882418f12ebd9b58c01730bcd1
-MISC ChangeLog 2989 SHA256 75094576b81a28607e81d553b3ddcd21467188e700b9d3700552a74df12350b7 SHA512 45ab77f7c94a0889d51f070d2b51457091c6b2a9c346ab9aa7150c30f96c4636b26a0f31304e302e8f85467df323ea25fd9aa3ed82694c3cbe6150cede3e1fdb WHIRLPOOL 4741343d65b80011249f2decf3fb800f7056d791967afc41aaceba98962831ffc6450266b28a013f6934ca1f4bf50f5d4d4ffd63962d9cf3e69a3caed2a1524f
+MISC ChangeLog 3405 SHA256 67c5181a93f356dd6f83cd7ee76dc3d9a68a90536fb8f505e2836f9507443f3e SHA512 93e4ef561a80aeb811335a146b56345b0570406b89a7a960a328270ac6f55ccfc8e04c2b39cc523630ed17d7d2e4bae92e398c0e0c3ceecadaf2fd84d8d35748 WHIRLPOOL fe1ed9abdbe0ecc0025bf7cde29d6d0f8d6e80ceac04b20f28886749f18a12448c45f6749b194b24c15a726a7400c2e7407d8e7c93de35399718e88bf51f79a4
 MISC metadata.xml 242 SHA256 11f4b4bb23bb0e880a44b0f3efb5b4b0eeebaccd23956c72cd0cd9d386739c48 SHA512 686291088cb59735ff7df03fc5f11e43110039e74b8b24a9a8a517ed0f490f5694b873177e1ee808c4576ca26027add8324c6ee4e57b6b44d680a2522ec40b5f WHIRLPOOL f7bdc3a5208e0173deca7b15b26b967b61c3cb33e01b8f16fb87e32870e6c4deae514ac6af3fc91c300f960f2113e663eea02a9c599935072aad91459caf5277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlIjsgIACgkQ1fmVwcYIWAYjoQCgjjSNaXvX4lmmqyfZKs+elD8J
-IOYAnAnfNvOXdTN1ZGmX8SjiOBXgsJSt
-=6e++
+iQEcBAEBCAAGBQJSTNW2AAoJEJ0WA1zPCt1he5MH/0L7X420M9ZbEGspgGw1wEjL
+x+AFvMFa0vEbRu74U+B2coKGpic/hYkADffQu4zEW0ksvKNym7/I/vpoipU6Ju1f
+hMsCwjJ8DWd/NhhKJWpkLou4tfINpvxsJrPSd/pt+pgZjyW4KOuhVw6uvIMGHCaz
+z3Mf0Dut70umsmu6BMNKADec+dih8lqeWyYJs2ZhOVCypxawFV1EEx7TWM6hXpgM
+KzyhXvDdnaZc/tJSYW1ECau3ByrE2GeSw3tqH3wk2/Fb7m1F/v/7CL970jpZuh7S
+Hui16zMYmZYK8mihWgV5keEGZ32cmu/jK7bab223aOPEm7pJEqIz8x8Jde/9onQ=
+=vVSQ
 -----END PGP SIGNATURE-----
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