[gentoo-commits] proj/gnome:master commit in: app-crypt/libsecret/

["Alexandre Rostovtsev" <tetromino@gentoo.org>]

commit:     2f8e994fdefcd57b444f05256e29e7051007beb4
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 25 15:44:16 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Tue Sep 25 15:44:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2f8e994f

app-crypt/libsecret: 0.10 now in gx86

Sync live ebuild with gx86. Avoid unnecessary rebuilding of docs that
come in the tarball. Use a less generic description.

---
 app-crypt/libsecret/libsecret-0.10.ebuild |   75 -----------------------------
 app-crypt/libsecret/libsecret-9999.ebuild |   17 ++++---
 2 files changed, 10 insertions(+), 82 deletions(-)

diff --git a/app-crypt/libsecret/libsecret-0.10.ebuild b/app-crypt/libsecret/libsecret-0.10.ebuild
deleted file mode 100644
index cd457a3..0000000
--- a/app-crypt/libsecret/libsecret-0.10.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.18"
-
-inherit gnome2 virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live vala
-fi
-
-DESCRIPTION="libsecret is a library for storing and retrieving secrets such as passwords"
-HOMEPAGE="https://live.gnome.org/Libsecret"
-
-LICENSE="LGPL-2.1 Apache-2.0"
-SLOT="0"
-IUSE="+crypt debug doc +introspection"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
-
-RDEPEND="
-	>=dev-libs/glib-2.31.0:2
-	crypt? ( >=dev-libs/libgcrypt-1.2.2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.29 )"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	sys-devel/gettext
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.35.0
-	doc? ( >=dev-util/gtk-doc-1.9 )"
-
-# Only needed while regenerating from *.vala *.vapi
-if [[ ${PV} = 9999 ]]; then
-	DEPEND+="
-		$(vala_depend)"
-fi
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="
-		--enable-manpages
-		--disable-strict
-		--disable-coverage
-		--disable-static
-		$(use_enable crypt gcrypt)"
-
-	# Only needed while regenerating from *.vala *.vapi
-	# VALAC is used by tests
-	# VAPIGEN is used by libsecret
-	if [[ ${PV} = 9999 ]]; then
-		local vala_version="$(vala_best_api_version)"
-		G2CONF="
-			VALAC=$(type -P valac-${vala_version})
-			VAPIGEN=$(type -P vapigen-${vala_version})"
-	fi
-}
-
-src_prepare() {
-	gnome2_src_prepare
-}
-
-src_test() {
-	Xemake check
-}
-
-src_install() {
-	gnome2_src_install
-	prune_libtool_files --all
-}

diff --git a/app-crypt/libsecret/libsecret-9999.ebuild b/app-crypt/libsecret/libsecret-9999.ebuild
index cd457a3..58a0466 100644
--- a/app-crypt/libsecret/libsecret-9999.ebuild
+++ b/app-crypt/libsecret/libsecret-9999.ebuild
@@ -11,10 +11,10 @@ if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live vala
 fi
 
-DESCRIPTION="libsecret is a library for storing and retrieving secrets such as passwords"
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
 HOMEPAGE="https://live.gnome.org/Libsecret"
 
-LICENSE="LGPL-2.1 Apache-2.0"
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
 SLOT="0"
 IUSE="+crypt debug doc +introspection"
 if [[ ${PV} = 9999 ]]; then
@@ -23,22 +23,25 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-RDEPEND="
+COMMON_DEPEND="
 	>=dev-libs/glib-2.31.0:2
 	crypt? ( >=dev-libs/libgcrypt-1.2.2 )
 	introspection? ( >=dev-libs/gobject-introspection-1.29 )"
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	>=gnome-base/gnome-keyring-3"
+# Add ksecrets to RDEPEND when it's added to portage
+DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	sys-devel/gettext
-	virtual/pkgconfig
 	dev-util/gdbus-codegen
 	>=dev-util/intltool-0.35.0
-	doc? ( >=dev-util/gtk-doc-1.9 )"
+	virtual/pkgconfig"
 
 # Only needed while regenerating from *.vala *.vapi
 if [[ ${PV} = 9999 ]]; then
 	DEPEND+="
-		$(vala_depend)"
+		$(vala_depend)
+		doc? ( >=dev-util/gtk-doc-1.9 )"
 fi
 
 pkg_setup() {