From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-507988-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 28225138010
	for <garchives@archives.gentoo.org>; Sat, 22 Sep 2012 15:54:59 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id F1D5CE052E;
	Sat, 22 Sep 2012 15:54:06 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id B1694E052E
	for <gentoo-commits@lists.gentoo.org>; Sat, 22 Sep 2012 15:54:06 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id EB4DE33D738
	for <gentoo-commits@lists.gentoo.org>; Sat, 22 Sep 2012 15:54:05 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id ABBDAE5452
	for <gentoo-commits@lists.gentoo.org>; Sat, 22 Sep 2012 15:54:03 +0000 (UTC)
From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" <nirbheek@gentoo.org>
Message-ID: <1348329201.0af1c3cbb8ac56daa6a1df8b8b907d6a191faf8c.nirbheek@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: app-crypt/libsecret/
X-VCS-Repository: proj/gnome
X-VCS-Files: app-crypt/libsecret/libsecret-0.10.ebuild app-crypt/libsecret/libsecret-0.9.ebuild app-crypt/libsecret/libsecret-9999.ebuild
X-VCS-Directories: app-crypt/libsecret/
X-VCS-Committer: nirbheek
X-VCS-Committer-Name: Nirbheek Chauhan
X-VCS-Revision: 0af1c3cbb8ac56daa6a1df8b8b907d6a191faf8c
X-VCS-Branch: master
Date: Sat, 22 Sep 2012 15:54:03 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: ee88d804-d982-47cf-b246-7ce8b8e29199
X-Archives-Hash: d4edc2a3457dd3428a8be0ec5aa22d10

commit:     0af1c3cbb8ac56daa6a1df8b8b907d6a191faf8c
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 21 05:41:04 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 15:53:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0af1c3cb

app-crypt/libsecret: 0.9 → 0.10

---
 ...{libsecret-0.9.ebuild => libsecret-0.10.ebuild} |   33 +++++++++++++++-----
 app-crypt/libsecret/libsecret-9999.ebuild          |   33 +++++++++++++++-----
 2 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/app-crypt/libsecret/libsecret-0.9.ebuild b/app-crypt/libsecret/libsecret-0.10.ebuild
similarity index 66%
rename from app-crypt/libsecret/libsecret-0.9.ebuild
rename to app-crypt/libsecret/libsecret-0.10.ebuild
index f7e2069..cd457a3 100644
--- a/app-crypt/libsecret/libsecret-0.9.ebuild
+++ b/app-crypt/libsecret/libsecret-0.10.ebuild
@@ -3,10 +3,12 @@
 # $Header: $
 
 EAPI="4"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.18"
 
 inherit gnome2 virtualx
 if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
+	inherit gnome2-live vala
 fi
 
 DESCRIPTION="libsecret is a library for storing and retrieving secrets such as passwords"
@@ -29,23 +31,38 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	sys-devel/gettext
 	virtual/pkgconfig
+	dev-util/gdbus-codegen
 	>=dev-util/intltool-0.35.0
-	>=dev-lang/vala-0.17.2.12:0.18
 	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"
-	# VALAC is used by tests
-	# VAPIGEN is used by libsecret
 	G2CONF="
-		--disable-maintainer-mode
 		--enable-manpages
 		--disable-strict
 		--disable-coverage
 		--disable-static
-		$(use_enable crypt gcrypt)
-		VALAC=$(type -P valac-0.18)
-		VAPIGEN=$(type -P vapigen-0.18)"
+		$(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() {

diff --git a/app-crypt/libsecret/libsecret-9999.ebuild b/app-crypt/libsecret/libsecret-9999.ebuild
index f7e2069..cd457a3 100644
--- a/app-crypt/libsecret/libsecret-9999.ebuild
+++ b/app-crypt/libsecret/libsecret-9999.ebuild
@@ -3,10 +3,12 @@
 # $Header: $
 
 EAPI="4"
+VALA_USE_DEPEND="vapigen"
+VALA_MIN_API_VERSION="0.18"
 
 inherit gnome2 virtualx
 if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
+	inherit gnome2-live vala
 fi
 
 DESCRIPTION="libsecret is a library for storing and retrieving secrets such as passwords"
@@ -29,23 +31,38 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	sys-devel/gettext
 	virtual/pkgconfig
+	dev-util/gdbus-codegen
 	>=dev-util/intltool-0.35.0
-	>=dev-lang/vala-0.17.2.12:0.18
 	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"
-	# VALAC is used by tests
-	# VAPIGEN is used by libsecret
 	G2CONF="
-		--disable-maintainer-mode
 		--enable-manpages
 		--disable-strict
 		--disable-coverage
 		--disable-static
-		$(use_enable crypt gcrypt)
-		VALAC=$(type -P valac-0.18)
-		VAPIGEN=$(type -P vapigen-0.18)"
+		$(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() {