Fix missing dependencies (#522526 by Rick Farina (Zero_Chaos)), drop old

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 14 insertions, 64 deletions

diff --git a/gnome-base/libgnome-keyring/ChangeLog b/gnome-base/libgnome-keyring/ChangeLog
index ea83bae5f11c..98e567033ebc 100644
--- a/gnome-base/libgnome-keyring/ChangeLog
+++ b/gnome-base/libgnome-keyring/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/libgnome-keyring
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.64 2014/10/11 12:09:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/ChangeLog,v 1.65 2014/10/14 07:51:26 pacho Exp $
+
+  14 Oct 2014; Pacho Ramos <pacho@gentoo.org> -libgnome-keyring-3.10.1.ebuild,
+  libgnome-keyring-3.12.0.ebuild:
+  Fix missing dependencies (#522526 by Rick Farina (Zero_Chaos)), drop old
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org> libgnome-keyring-3.12.0.ebuild:
   arm stable, bug #512012
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
index b7c3bb45dd8c..33aaa15747a5 100644
--- a/gnome-base/libgnome-keyring/Manifest
+++ b/gnome-base/libgnome-keyring/Manifest
@@ -5,17 +5,15 @@ AUX libgnome-keyring-2.32.0-drop-test.patch 3415 SHA256 4928c561f46b6dabab93d19a
 AUX libgnome-keyring-2.32.0-hang-tests.patch 607 SHA256 d48a03c9c241c2e23e6abc32627ee0c454aad50ab0287793895b5af784dc11c0 SHA512 6c842e018253841b5ea2138f19fae6a8cecafddb9b697f4ad8cdc287774d4db292f686e58ab0be47e66da72914a3205a3676819553ca5eda3708fee8a6b734ab WHIRLPOOL 3f7c92558aed3b013d7e8756c18be6e81756634dec7f9e4dde1b63e359e23929ed2f4177db259f352b97f2749e1f609fe69f32a194c3fe659678510a3d96b0ea
 AUX libgnome-keyring-2.32.0-run-test.patch 2090 SHA256 cdcbd565a4508b3f7211e69617b66442248414c1486cba70d59bc0bf93b21740 SHA512 3b002273d3655efca39f343eaeda1806420739041cd71ad4af6023dacae55e8d7f7ea6d25e482c64436005754dec4362005d03242792df01866a27f55c92ae0c WHIRLPOOL 7b4edfcc610fdd6bcb1a8b3c1d38966ea5c03c6efffed37823969fe19e78a6f19e59ff671d914cebb0691f1ce7ded76165d55e5b5cbae4640628a4cb66ed457d
 DIST libgnome-keyring-2.32.0.tar.bz2 412592 SHA256 56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c SHA512 e143d470484e06152741f0ae5266b36b69062bed268066b612eac66a20e38d7b7613896eff9a76933abef8a631bbcb1629532202e443dda46c800460602ddab4 WHIRLPOOL afb3c852d980dd05ad9f4b3490582de2eba0e4967b5b7bcd82cbe0cd47f0a712dd40c9b80da8ca4a6ab054a719198496c9887b69d2b506c0c5a736d10d41d15b
-DIST libgnome-keyring-3.10.1.tar.xz 428336 SHA256 052cf1121ba823359afe534c425f7e216c6a2b1a2b316dee279dcf9032423772 SHA512 447f24792cf75c746e72f7e714e815f289820ae47f37458e8276eee148529d42f7a2f0a759ca466736e9f6ec46d998c3f7a735aa856db9bbfdf602e369138d7e WHIRLPOOL 7521fb48f5a3e7a5ef1e7421ec082ec864a0314d09783137dad14b36ad42f48dab52e90632d030028e5a80e802ce1d489b8242c1e71e7577876305431890acc8
 DIST libgnome-keyring-3.12.0.tar.xz 435092 SHA256 c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd WHIRLPOOL 8494913559cf057a77457bdafdff90099075421e88fa247e0215bd0dbb3f79ef41552c5825cfb99857b4f1bf9bc9d677facca779f9d6ed0892eabe9291e0d9a5
 EBUILD libgnome-keyring-2.32.0.ebuild 1653 SHA256 31872e6ceecca914861e5e39727fcb77463362ed805a70b6c9737bf52759af03 SHA512 4e0f25f3dd4eec04a20b6729e84bbdb834766435e47b4dfd60be7aba8c30dd8d6bd3e13e4d0e2f03ad41e0712a4895b5fd88b9b786ee83843dd323aa85060e03 WHIRLPOOL 1201dbacbbe5a00c9e6aeb0cb31b9cec0392071be9841e9f961ecbff9fab8947870f8cb5e81f2c3dd473c82c0b34a23aa2990107e0f10fc3697900714053a8f4
-EBUILD libgnome-keyring-3.10.1.ebuild 1484 SHA256 89e7d9626e03e751722523953cf7c52fc0f8c298db20b222730198a791a5e3fd SHA512 4ed4a48148f46ce7bb4eb76f6e6f7666aff6ae8a7c6b00489f95f4f880fde47927e7c759afcb5336bc29d486e34a5b63c1606f7efd750de44e05258c3e0aa1cf WHIRLPOOL bcb51b4e4e74f3ebe3cd95b24a3c29a1f932ac9628b97c8cd891cd085fef2ace9cb17bbdad62cb592f12a83b32733157738b4d1765a8322f6b0a4967fed1ecac
-EBUILD libgnome-keyring-3.12.0.ebuild 1486 SHA256 3cfcae7d66a0656ddb41353e1d7eb10b14fce2469fe176bbf465b5667ae9a4ee SHA512 b122f413285ab4ca2dbba733186ae492480bec56d12e3528d88f9721c48d48ed23acdee5892c749350e67a40d5d8d98a490421bcd636ead2d32e02553278d2fe WHIRLPOOL ebfac8678d332b5f9a93b2727f7c00037b244d077df916258ac7230bf438e52389092083135636ad02edb5e70c33ed47148674354339885e2d0dc6f35d197de7
-MISC ChangeLog 9747 SHA256 48130fc3a8dcc3c74083044eb4dc386d6fbfb6e3b0b37cc94c4de3d197c7b027 SHA512 0b7bbcad9b8d901ec5481fa0c81df0784afa5dffbc9031c7c11e3b76d2a99d82a9b8803c40809ffd800d793c509a5dcb1dfcbab88ab7aafa4108c5f5cdb8d275 WHIRLPOOL 310d595c1ec6c1218842c1db577ddf6a7d8569a28328b6f96451e4922b4bee11987a935aa3cfb3d092fed0307c5a3e44215d80e07a586c05b56b1b197e40b3e0
+EBUILD libgnome-keyring-3.12.0.ebuild 1553 SHA256 b99ba89b2d75c6d1f8cf2bf7e2a9c6a414c6c34584c4cc92b2539fa54fc3abe2 SHA512 e2855a35eaabf76ab972984745ae47f7b84904dd44b5d6bc6df32fedbc53cf96565dcd9587387fc73eea3ffd708ad690530c9ef92c13f563a551c45b316d9314 WHIRLPOOL 73bc222c4a8358c89fb2fa1d89e82fa769a2b86a23ab8d4cccfd16b2237d51027c5b2f97c5f054d87e9fa800f3655e61addf715a8371e8858b40e81693fc3403
+MISC ChangeLog 9935 SHA256 8537c19e388b91bfb723d7421ba0aa11c24f503978a6320daa0aeab71c99f029 SHA512 7b98f858a9da29b76ecbfeda7c43e62bc19157c58856d8d5819bd8921642f78755bb84ce0d321aa505ed5607342d5c07ca7d5976d3c1dcba4eb7d1adee1e39d2 WHIRLPOOL d6b9eb398959542ca9e7829bfb3a817610490207abd87a4a3c97daae061ce2997f69afb48a23bc8b1f24ec59ff1d33195403f28a469827566a9e91f4ec70c8d8
 MISC metadata.xml 242 SHA256 11f4b4bb23bb0e880a44b0f3efb5b4b0eeebaccd23956c72cd0cd9d386739c48 SHA512 686291088cb59735ff7df03fc5f11e43110039e74b8b24a9a8a517ed0f490f5694b873177e1ee808c4576ca26027add8324c6ee4e57b6b44d680a2522ec40b5f WHIRLPOOL f7bdc3a5208e0173deca7b15b26b967b61c3cb33e01b8f16fb87e32870e6c4deae514ac6af3fc91c300f960f2113e663eea02a9c599935072aad91459caf5277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQ5HhUACgkQkKaRLQcq0GJPNQCeN9ul0VCDF200sBounxO2PZvn
-314AnRGofThW+0Tn0JHmjn+M2OSluy0K
-=pmX6
+iEYEAREIAAYFAlQ81f8ACgkQCaWpQKGI+9SG1wCfSyLBOhpF5VScbMs4uTfHjhIc
+iW4AnjEs3b3uWzEzjWqQZ8LmZK26RxKv
+=XFoM
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.10.1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.10.1.ebuild
deleted file mode 100644
index 49d4488fc761..000000000000
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.10.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 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.10.1.ebuild,v 1.11 2014/04/21 10:29:18 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.16"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit gnome2 python-any-r1 vala
-
-DESCRIPTION="Compatibility library for accessing secrets"
-HOMEPAGE="http://live.gnome.org/GnomeKeyring"
-
-LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
-SLOT="0"
-IUSE="debug +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris"
-
-RDEPEND="
-	>=sys-apps/dbus-1
-	>=gnome-base/gnome-keyring-3.1.92
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-
-	# FIXME: Remove silly CFLAGS, report upstream
-	sed -e 's:CFLAGS="$CFLAGS -g:CFLAGS="$CFLAGS:' \
-		-e 's:CFLAGS="$CFLAGS -O0:CFLAGS="$CFLAGS:' \
-		-i configure.ac configure || die "sed failed"
-}
-
-src_configure() {
-	gnome2_src_configure $(use_enable vala)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	dbus-launch emake check || die "tests failed"
-}
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0.ebuild
index 8744fea65b1e..1a2ddb8dac1d 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.12.0.ebuild,v 1.9 2014/10/11 12:09:55 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0.ebuild,v 1.10 2014/10/14 07:51:26 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -12,7 +12,7 @@ PYTHON_COMPAT=( python{2_6,2_7} )
 inherit gnome2 python-any-r1 vala
 
 DESCRIPTION="Compatibility library for accessing secrets"
-HOMEPAGE="http://live.gnome.org/GnomeKeyring"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
 
 LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
 SLOT="0"
@@ -21,6 +21,8 @@ REQUIRED_USE="vala? ( introspection )"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris"
 
 RDEPEND="
+	>=dev-libs/glib-2.16.0:2
+	>=dev-libs/libgcrypt-1.2.2:0=
 	>=sys-apps/dbus-1
 	>=gnome-base/gnome-keyring-3.1.92
 	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )