commit: 9a4004a95cf858f084e08a912607263e66ceebf4
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 19:22:47 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue May 12 19:22:47 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9a4004a9
app-crypt/seahorse: 3.14.1 → 3.16.0
...seahorse-9999.ebuild => seahorse-3.16.0.ebuild} | 43 ++++++----------------
app-crypt/seahorse/seahorse-9999.ebuild | 15 ++++----
2 files changed, 18 insertions(+), 40 deletions(-)
diff --git a/app-crypt/seahorse/seahorse-9999.ebuild
b/app-crypt/seahorse/seahorse-3.16.0.ebuild
similarity index 60%
copy from app-crypt/seahorse/seahorse-9999.ebuild
copy to app-crypt/seahorse/seahorse-3.16.0.ebuild
index e4979f2..2b7f973 100644
--- a/app-crypt/seahorse/seahorse-9999.ebuild
+++ b/app-crypt/seahorse/seahorse-3.16.0.ebuild
@@ -1,27 +1,19 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
-GCONF_DEBUG="yes"
-VALA_MIN_API_DEPEND="0.22"
+GCONF_DEBUG="no"
inherit gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live vala
-fi
DESCRIPTION="A GNOME application for managing encryption keys"
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
+IUSE="debug ldap zeroconf"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
COMMON_DEPEND="
>=app-crypt/gcr-3.11.91:=
@@ -33,12 +25,10 @@ COMMON_DEPEND="
net-misc/openssh
>=app-crypt/gpgme-1
- || (
- =app-crypt/gnupg-2.0*
- =app-crypt/gnupg-1.4* )
+ >=app-crypt/gnupg-1.4
- avahi? ( >=net-dns/avahi-0.6:= )
ldap? ( net-nds/openldap:= )
+ zeroconf? ( >=net-dns/avahi-0.6:= )
"
DEPEND="${COMMON_DEPEND}
>=dev-util/intltool-0.35
@@ -49,38 +39,27 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
!<app-crypt/seahorse-plugins-2.91.0_pre20110114
"
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- $(vala_depend)
- app-crypt/gcr[vala]
- app-text/yelp-tools"
-fi
src_prepare() {
- # FIXME: Do not mess with CFLAGS with USE="debug"
+ # 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"
- 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
# bindir is needed due to bad macro expansion in desktop file, bug
#508610
gnome2_src_configure \
+ --bindir=/usr/bin \
--enable-pgp \
--enable-ssh \
--enable-pkcs11 \
--enable-hkp \
- $(use_enable avahi sharing) \
$(use_enable debug) \
$(use_enable ldap) \
- ${myconf}
+ $(use_enable zeroconf sharing) \
+ 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 e4979f2..8c18f3b 100644
--- a/app-crypt/seahorse/seahorse-9999.ebuild
+++ b/app-crypt/seahorse/seahorse-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
-GCONF_DEBUG="yes"
+GCONF_DEBUG="no"
VALA_MIN_API_DEPEND="0.22"
inherit gnome2
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse";
LICENSE="GPL-2+ FDL-1.1+"
SLOT="0"
-IUSE="avahi debug ldap"
+IUSE="debug ldap zeroconf"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -33,12 +33,10 @@ COMMON_DEPEND="
net-misc/openssh
>=app-crypt/gpgme-1
- || (
- =app-crypt/gnupg-2.0*
- =app-crypt/gnupg-1.4* )
+ >=app-crypt/gnupg-1.4
- avahi? ( >=net-dns/avahi-0.6:= )
ldap? ( net-nds/openldap:= )
+ zeroconf? ( >=net-dns/avahi-0.6:= )
"
DEPEND="${COMMON_DEPEND}
>=dev-util/intltool-0.35
@@ -75,12 +73,13 @@ src_configure() {
fi
# bindir is needed due to bad macro expansion in desktop file, bug
#508610
gnome2_src_configure \
+ --bindir=/usr/bin \
--enable-pgp \
--enable-ssh \
--enable-pkcs11 \
--enable-hkp \
- $(use_enable avahi sharing) \
$(use_enable debug) \
$(use_enable ldap) \
+ $(use_enable zeroconf sharing) \
${myconf}
}
