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

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 9 insertions, 57 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/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 )