Version bump for Gnome 3.6. Drop old revision. Re-add keywords that were dropped due to gcr keywording issues.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)

4 files changed, 43 insertions, 28 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index fbed475c4c51..0d909b45e667 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.156 2012/05/28 00:56:02 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.157 2012/12/16 14:49:32 eva Exp $
+
+*seahorse-3.6.3 (16 Dec 2012)
+
+  16 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> -seahorse-3.2.2.ebuild,
+  seahorse-3.4.1.ebuild, +seahorse-3.6.3.ebuild, metadata.xml:
+  Version bump for Gnome 3.6. Drop old revision. Re-add keywords that were
+  dropped due to gcr keywording issues.
 
   28 May 2012; Matt Turner <mattst88@gentoo.org> seahorse-3.2.2.ebuild:
   Added ~alpha, bug 390345.
diff --git a/app-crypt/seahorse/metadata.xml b/app-crypt/seahorse/metadata.xml
index d5ac32b7394b..06955307321c 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 
diff --git a/app-crypt/seahorse/seahorse-3.4.1.ebuild b/app-crypt/seahorse/seahorse-3.4.1.ebuild
index 2feb3d1381f0..43bb8a1498c4 100644
--- a/app-crypt/seahorse/seahorse-3.4.1.ebuild
+++ b/app-crypt/seahorse/seahorse-3.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.4.1.ebuild,v 1.1 2012/05/13 18:18:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.4.1.ebuild,v 1.2 2012/12/16 14:49:32 eva Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="avahi debug ldap"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 COMMON_DEPEND="
 	>=app-crypt/gcr-3.3.4
diff --git a/app-crypt/seahorse/seahorse-3.2.2.ebuild b/app-crypt/seahorse/seahorse-3.6.3.ebuild
index e93aca80abb7..fbf2b6a3c2a6 100644
--- a/app-crypt/seahorse/seahorse-3.2.2.ebuild
+++ b/app-crypt/seahorse/seahorse-3.6.3.ebuild
@@ -1,25 +1,33 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.2.2.ebuild,v 1.3 2012/05/28 00:56:02 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.6.3.ebuild,v 1.1 2012/12/16 14:49:32 eva Exp $
 
 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 doc ldap test"
-KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
+IUSE="avahi debug ldap"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
 
 COMMON_DEPEND="
+	>=app-crypt/gcr-3.3.4
 	>=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-2.90.0:3
-	>=gnome-base/gnome-keyring-3.1.5
+	>=x11-libs/gtk+-3.4:3
+	>=app-crypt/libsecret-0.5
 	net-libs/libsoup:2.4
 	x11-misc/shared-mime-info
 
@@ -33,39 +41,41 @@ COMMON_DEPEND="
 	ldap? ( net-nds/openldap )
 "
 DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.35
 	sys-devel/gettext
-	>=app-text/gnome-doc-utils-0.3.2
-	>=app-text/scrollkeeper-0.3
 	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.9 )
 "
 # Need seahorse-plugins git snapshot
 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
 		--enable-pkcs11
 		--disable-static
-		--disable-scrollkeeper
-		--disable-update-mime-database
 		--enable-hkp
 		$(use_enable avahi sharing)
 		$(use_enable debug)
-		$(use_enable ldap)
-		$(use_enable test tests)"
-	DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
-}
-
-src_prepare() {
-	# FIXME: Do not mess with CFLAGS with USE="debug"
-	sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
-		-e 's/-Werror//' \
-		-i configure.ac configure || die "sed 1 failed"
+		$(use_enable ldap)"
+	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
 
-	gnome2_src_prepare
+	gnome2_src_configure
 }