commit: 58b439378dc04d7e71446ce296e9c2391b7e8172 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Wed Aug 9 06:52:00 2017 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Wed Aug 9 06:52:30 2017 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=58b43937
app-crypt/seahorse: sync with gentoo repository Package-Manager: Portage-2.3.6, Repoman-2.3.3 Manifest-Sign-Key: 0x5A56C8CD0C13248A app-crypt/seahorse/seahorse-3.20.0.ebuild | 67 ------------------------------- app-crypt/seahorse/seahorse-9999.ebuild | 19 ++++----- 2 files changed, 8 insertions(+), 78 deletions(-) diff --git a/app-crypt/seahorse/seahorse-3.20.0.ebuild b/app-crypt/seahorse/seahorse-3.20.0.ebuild deleted file mode 100644 index b8ec00dc..00000000 --- a/app-crypt/seahorse/seahorse-3.20.0.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="A GNOME application for managing encryption keys" -HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"; - -LICENSE="GPL-2+ FDL-1.1+" -SLOT="0" -IUSE="debug ldap zeroconf" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" - -COMMON_DEPEND=" - >=app-crypt/gcr-3.11.91:= - >=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.12 - - ldap? ( net-nds/openldap:= ) - zeroconf? ( >=net-dns/avahi-0.6:= ) -" -DEPEND="${COMMON_DEPEND} - app-text/yelp-tools - dev-util/gdbus-codegen - >=dev-util/intltool-0.35 - dev-util/itstool - sys-devel/gettext - virtual/pkgconfig -" -# Need seahorse-plugins git snapshot -RDEPEND="${COMMON_DEPEND} - !<app-crypt/seahorse-plugins-2.91.0_pre20110114 -" - -src_prepare() { - # 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() { - # 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 debug) \ - $(use_enable ldap) \ - $(use_enable zeroconf sharing) \ - VALAC=$(type -P true) -} diff --git a/app-crypt/seahorse/seahorse-9999.ebuild b/app-crypt/seahorse/seahorse-9999.ebuild index ecc9563f..fed4e9ae 100644 --- a/app-crypt/seahorse/seahorse-9999.ebuild +++ b/app-crypt/seahorse/seahorse-9999.ebuild @@ -1,10 +1,7 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="5" -GCONF_DEBUG="no" -VALA_MIN_API_DEPEND="0.22" +EAPI=6 inherit gnome2 if [[ ${PV} = 9999 ]]; then @@ -33,14 +30,16 @@ COMMON_DEPEND=" net-misc/openssh >=app-crypt/gpgme-1 - >=app-crypt/gnupg-1.4 - <app-crypt/gnupg-2.1 + >=app-crypt/gnupg-2.0.12 ldap? ( net-nds/openldap:= ) zeroconf? ( >=net-dns/avahi-0.6:= ) " DEPEND="${COMMON_DEPEND} + app-text/yelp-tools + dev-util/gdbus-codegen >=dev-util/intltool-0.35 + dev-util/itstool sys-devel/gettext virtual/pkgconfig " @@ -56,7 +55,7 @@ if [[ ${PV} = 9999 ]]; then 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" @@ -68,9 +67,7 @@ src_prepare() { src_configure() { local myconf="" if [[ ${PV} != 9999 ]]; then - myconf="${myconf} - ITSTOOL=$(type -P true) - VALAC=$(type -P true)" + myconf="${myconf} VALAC=$(type -P true)" fi # bindir is needed due to bad macro expansion in desktop file, bug #508610 gnome2_src_configure \
