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

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     30b4bad0de7e7bd39e3ed254840839a6458025f8
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 16 14:51:43 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 14:51:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=30b4bad0

app-crypt/seahorse: moved to gx86

    * Resync live ebuild.
    * Drop introspection from metadata.xml, it is now a global use flag.

---
 app-crypt/seahorse/metadata.xml          |    4 +-
 app-crypt/seahorse/seahorse-3.6.3.ebuild |   75 ------------------------------
 app-crypt/seahorse/seahorse-9999.ebuild  |   29 +++++++----
 3 files changed, 19 insertions(+), 89 deletions(-)

diff --git a/app-crypt/seahorse/metadata.xml b/app-crypt/seahorse/metadata.xml
index 380a237..3a3eec1 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 7341220..0000000
--- 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 4234d7a..28028d1 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
 }