commit: 93159f2109256a8b6b6a694f13d0d0f6ce3ffc02
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 6 20:44:32 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Apr 15 22:00:29 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=93159f21
app-crypt/seahorse: 3.10.2-r1 → 3.12.0
---
...seahorse-9999.ebuild => seahorse-3.12.0.ebuild} | 31 +++++-----------------
app-crypt/seahorse/seahorse-9999.ebuild | 10 ++++---
2 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/app-crypt/seahorse/seahorse-9999.ebuild
b/app-crypt/seahorse/seahorse-3.12.0.ebuild
similarity index 68%
copy from app-crypt/seahorse/seahorse-9999.ebuild
copy to app-crypt/seahorse/seahorse-3.12.0.ebuild
index 358dae0..e681e3d 100644
--- a/app-crypt/seahorse/seahorse-9999.ebuild
+++ b/app-crypt/seahorse/seahorse-3.12.0.ebuild
@@ -1,30 +1,22 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="yes"
-VALA_MIN_API_DEPEND="0.18"
inherit gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live vala
-fi
DESCRIPTION="A GNOME application for managing encryption keys"
-HOMEPAGE="http://projects.gnome.org/seahorse/index.html";
+HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse";
LICENSE="GPL-2+ FDL-1.1+"
SLOT="0"
IUSE="avahi debug ldap"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
COMMON_DEPEND="
- >=app-crypt/gcr-3.9.1:=
+ >=app-crypt/gcr-3.11.91:=
>=dev-libs/glib-2.10:2
>=x11-libs/gtk+-3.4:3
>=app-crypt/libsecret-0.16
@@ -49,11 +41,6 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!<app-crypt/seahorse-plugins-2.91.0_pre20110114
"
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- $(vala_depend)
- app-text/yelp-tools"
-fi
src_prepare() {
# FIXME: Do not mess with CFLAGS with USE="debug"
@@ -61,16 +48,11 @@ src_prepare() {
-e '/CFLAGS="$CFLAGS -O0/d' \
-i configure.ac configure || die "sed 1 failed"
+ vala_src_prepare
gnome2_src_prepare
}
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 \
@@ -80,5 +62,6 @@ src_configure() {
$(use_enable avahi sharing) \
$(use_enable debug) \
$(use_enable ldap) \
- ${myconf}
+ 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 358dae0..0d74c6d 100644
--- a/app-crypt/seahorse/seahorse-9999.ebuild
+++ b/app-crypt/seahorse/seahorse-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="yes"
-VALA_MIN_API_DEPEND="0.18"
+VALA_MIN_API_DEPEND="0.22"
inherit gnome2
if [[ ${PV} = 9999 ]]; then
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
fi
DESCRIPTION="A GNOME application for managing encryption keys"
-HOMEPAGE="http://projects.gnome.org/seahorse/index.html";
+HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse";
LICENSE="GPL-2+ FDL-1.1+"
SLOT="0"
@@ -24,7 +24,7 @@ else
fi
COMMON_DEPEND="
- >=app-crypt/gcr-3.9.1:=
+ >=app-crypt/gcr-3.11.91:=
>=dev-libs/glib-2.10:2
>=x11-libs/gtk+-3.4:3
>=app-crypt/libsecret-0.16
@@ -52,6 +52,7 @@ RDEPEND="${COMMON_DEPEND}
if [[ ${PV} = 9999 ]]; then
DEPEND="${DEPEND}
$(vala_depend)
+ app-crypt/gcr[vala]
app-text/yelp-tools"
fi
@@ -61,6 +62,7 @@ src_prepare() {
-e '/CFLAGS="$CFLAGS -O0/d' \
-i configure.ac configure || die "sed 1 failed"
+ vala_src_prepare
gnome2_src_prepare
}
