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

[Gilles Dartiguelongue]

commit:     1e574210cd4669f93f49ce9f7cb8b2f21464002a
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 10:18:51 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Nov 20 23:07:01 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1e574210

app-crypt/seahorse: 3.8.2 → 3.10.1

---
 app-crypt/seahorse/seahorse-3.10.1.ebuild | 66 +++++++++++++++++++++++++++++++
 app-crypt/seahorse/seahorse-9999.ebuild   | 55 ++++++++++++++------------
 2 files changed, 95 insertions(+), 26 deletions(-)

diff --git a/app-crypt/seahorse/seahorse-3.10.1.ebuild b/app-crypt/seahorse/seahorse-3.10.1.ebuild
new file mode 100644
index 0000000..cf17971
--- /dev/null
+++ b/app-crypt/seahorse/seahorse-3.10.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit gnome2
+
+DESCRIPTION="A GNOME application for managing encryption keys"
+HOMEPAGE="http://projects.gnome.org/seahorse/index.html"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+IUSE="avahi debug ldap"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+COMMON_DEPEND="
+	>=app-crypt/gcr-3.9.1:=
+	>=dev-libs/glib-2.10:2
+	>=x11-libs/gtk+-3.4:3
+	>=app-crypt/libsecret-0.16
+	>=net-libs/libsoup-2.33.92:2.4
+	x11-misc/shared-mime-info
+
+	net-misc/openssh
+	>=app-crypt/gpgme-1
+	|| (
+		=app-crypt/gnupg-2.0*
+		=app-crypt/gnupg-1.4* )
+
+	avahi? ( >=net-dns/avahi-0.6:= )
+	ldap? ( net-nds/openldap:= )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# Need seahorse-plugins git snapshot
+RDEPEND="${COMMON_DEPEND}
+	!<app-crypt/seahorse-plugins-2.91.0_pre20110114
+"
+
+src_prepare() {
+	# FIXME: Do not mess with CFLAGS with USE="debug"
+	sed -e '/CFLAGS="$CFLAGS -g/d' \
+		-e '/CFLAGS="$CFLAGS -O0/d' \
+		-i configure.ac configure || die "sed 1 failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-pgp \
+		--enable-ssh \
+		--enable-pkcs11 \
+		--disable-static \
+		--enable-hkp \
+		$(use_enable avahi sharing) \
+		$(use_enable debug) \
+		$(use_enable ldap) \
+		ITSTOOL=$(type -P true) \
+		VALAC=$(type -P true)
+}

diff --git a/app-crypt/seahorse/seahorse-9999.ebuild b/app-crypt/seahorse/seahorse-9999.ebuild
index 28028d1..358dae0 100644
--- a/app-crypt/seahorse/seahorse-9999.ebuild
+++ b/app-crypt/seahorse/seahorse-9999.ebuild
@@ -1,34 +1,34 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
+VALA_MIN_API_DEPEND="0.18"
 
 inherit gnome2
 if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
+	inherit gnome2-live vala
 fi
 
 DESCRIPTION="A GNOME application for managing encryption keys"
-HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
+HOMEPAGE="http://projects.gnome.org/seahorse/index.html"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="avahi debug ldap"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 fi
 
 COMMON_DEPEND="
-	>=app-crypt/gcr-3.3.4
+	>=app-crypt/gcr-3.9.1:=
 	>=dev-libs/glib-2.10:2
 	>=x11-libs/gtk+-3.4:3
-	>=app-crypt/libsecret-0.5
-	net-libs/libsoup:2.4
+	>=app-crypt/libsecret-0.16
+	>=net-libs/libsoup-2.33.92:2.4
 	x11-misc/shared-mime-info
 
 	net-misc/openssh
@@ -37,11 +37,10 @@ COMMON_DEPEND="
 		=app-crypt/gnupg-2.0*
 		=app-crypt/gnupg-1.4* )
 
-	avahi? ( >=net-dns/avahi-0.6 )
-	ldap? ( net-nds/openldap )
+	avahi? ( >=net-dns/avahi-0.6:= )
+	ldap? ( net-nds/openldap:= )
 "
 DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -52,6 +51,7 @@ RDEPEND="${COMMON_DEPEND}
 "
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
+		$(vala_depend)
 		app-text/yelp-tools"
 fi
 
@@ -65,17 +65,20 @@ src_prepare() {
 }
 
 src_configure() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
-	G2CONF="${G2CONF}
-		--enable-pgp
-		--enable-ssh
-		--enable-pkcs11
-		--disable-static
-		--enable-hkp
-		$(use_enable avahi sharing)
-		$(use_enable debug)
-		$(use_enable ldap)"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-
-	gnome2_src_configure
+	local myconf=""
+	if [[ ${PV} != 9999 ]]; then
+		myconf="${myconf}
+			ITSTOOL=$(type -P true)
+			VALAC=$(type -P true)"
+	fi
+	gnome2_src_configure \
+		--enable-pgp \
+		--enable-ssh \
+		--enable-pkcs11 \
+		--disable-static \
+		--enable-hkp \
+		$(use_enable avahi sharing) \
+		$(use_enable debug) \
+		$(use_enable ldap) \
+		${myconf}
 }