commit: d61c886dcefb0374d142e44ae3723671c879d829
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 19 19:34:05 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 19 21:13:56 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d61c886d
gnome-base/libgnome-keyring: sync with gentoo-x86
---
.../libgnome-keyring-3.12.0.ebuild | 54 ----------------------
.../libgnome-keyring/libgnome-keyring-9999.ebuild | 4 +-
2 files changed, 3 insertions(+), 55 deletions(-)
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0.ebuild
b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0.ebuild
deleted file mode 100644
index f8dbd03..0000000
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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-9999.ebuild
b/gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild
index fd09b39..707c052 100644
--- a/gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild
+++ b/gnome-base/libgnome-keyring/libgnome-keyring-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} = 9999 ]]; then
fi
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"
@@ -29,6 +29,8 @@ else
fi
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 )
