diff options
author | Gilles Dartiguelongue <eva@gentoo.org> | 2012-12-16 15:51:43 +0100 |
---|---|---|
committer | Gilles Dartiguelongue <eva@gentoo.org> | 2012-12-16 15:51:43 +0100 |
commit | 30b4bad0de7e7bd39e3ed254840839a6458025f8 (patch) | |
tree | fad43d6e86535233f0eb853a42556f8c0ebbfe88 /app-crypt/seahorse | |
parent | app-crypt/gcr: moved to gx86 (diff) | |
download | gnome-30b4bad0de7e7bd39e3ed254840839a6458025f8.tar.gz gnome-30b4bad0de7e7bd39e3ed254840839a6458025f8.tar.bz2 gnome-30b4bad0de7e7bd39e3ed254840839a6458025f8.zip |
app-crypt/seahorse: moved to gx86
* Resync live ebuild.
* Drop introspection from metadata.xml, it is now a global use flag.
Diffstat (limited to 'app-crypt/seahorse')
-rw-r--r-- | app-crypt/seahorse/Manifest | 11 | ||||
-rw-r--r-- | app-crypt/seahorse/metadata.xml | 4 | ||||
-rw-r--r-- | app-crypt/seahorse/seahorse-3.6.3.ebuild | 75 | ||||
-rw-r--r-- | app-crypt/seahorse/seahorse-9999.ebuild | 29 |
4 files changed, 19 insertions, 100 deletions
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest deleted file mode 100644 index 22da08a7..00000000 --- a/app-crypt/seahorse/Manifest +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -DIST seahorse-3.6.3.tar.xz 1995252 SHA256 9b712da1989725547a8093e638725ee6de74d7870661545a15374c7ebf335cc1 SHA512 e0a48a6391d46fb80f510f7d881fe87d78281db4f00960f54511121068bd9a8347f07cbd56c76a2a7863e34f9fc6043c6dbe73eea93b85eebdfe7bf5c8193a5c WHIRLPOOL cc66e3176c5ac74611dea7aec7fe9e2b31fc51b9b9b6f5421bc6823b55f8eb8a73895c3f375e4bfad1519ed5966b7f77f0f878253e1cf736a4b2d6255cc80541 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iEYEAREKAAYFAlCutbMACgkQ1fmVwcYIWAZSMgCeJjZTFpfnALk3pT3Jtj2uk3Oj -Vo0AoJ+OBO4xpzTv8oBEAs+81UmKcSKK -=fAVF ------END PGP SIGNATURE----- diff --git a/app-crypt/seahorse/metadata.xml b/app-crypt/seahorse/metadata.xml index 380a2371..3a3eec1b 100644 --- a/app-crypt/seahorse/metadata.xml +++ b/app-crypt/seahorse/metadata.xml @@ -3,8 +3,6 @@ <pkgmetadata> <herd>gnome</herd> <use> - <flag name="introspection">Use - <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag> <flag name="ldap">Enable seahorse to manipulate GPG keys on a LDAP server.</flag> </use> <longdescription>Seahorse is a Gnome interface for GnuPG. It's main purpose is to be a PGP/GPG Key Manager, though @@ -28,5 +26,5 @@ Delete Key Plugins: Nautilus Integration Gedit plugin -</longdescription> + </longdescription> </pkgmetadata> diff --git a/app-crypt/seahorse/seahorse-3.6.3.ebuild b/app-crypt/seahorse/seahorse-3.6.3.ebuild deleted file mode 100644 index 73412204..00000000 --- a/app-crypt/seahorse/seahorse-3.6.3.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit gnome2 -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION="A GNOME application for managing encryption keys" -HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html" - -LICENSE="GPL-2" -SLOT="0" -IUSE="avahi debug ldap" -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64 ~x86 ~x86-fbsd" -fi - -COMMON_DEPEND=" - >=app-crypt/gcr-3.3.4 - >=dev-libs/glib-2.10:2 - >=x11-libs/gtk+-3.4:3 - >=app-crypt/libsecret-0.5 - net-libs/libsoup: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} - app-text/yelp-tools - >=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() { - 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)" - gnome2_src_configure -} diff --git a/app-crypt/seahorse/seahorse-9999.ebuild b/app-crypt/seahorse/seahorse-9999.ebuild index 4234d7a4..28028d17 100644 --- a/app-crypt/seahorse/seahorse-9999.ebuild +++ b/app-crypt/seahorse/seahorse-9999.ebuild @@ -20,7 +20,7 @@ IUSE="avahi debug ldap" if [[ ${PV} = 9999 ]]; then KEYWORDS="" else - KEYWORDS="~amd64 ~x86 ~x86-fbsd" + KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" fi COMMON_DEPEND=" @@ -50,8 +50,22 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} !<app-crypt/seahorse-plugins-2.91.0_pre20110114 " +if [[ ${PV} = 9999 ]]; then + DEPEND="${DEPEND} + app-text/yelp-tools" +fi + +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 +} -pkg_setup() { +src_configure() { + DOCS="AUTHORS ChangeLog NEWS README TODO THANKS" G2CONF="${G2CONF} --enable-pgp --enable-ssh @@ -61,14 +75,7 @@ pkg_setup() { $(use_enable avahi sharing) $(use_enable debug) $(use_enable ldap)" - DOCS="AUTHORS ChangeLog NEWS README TODO THANKS" -} - -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" + [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" - gnome2_src_prepare + gnome2_src_configure } |