Update license, EAPI5-ize and de-9999-ize ebuild. Drop keywords due to libsecret dependency (bug #447426).

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

3 files changed, 17 insertions, 25 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index 0d909b45e667..2347d22832d2 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,11 @@
 # 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.157 2012/12/16 14:49:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.158 2012/12/16 19:16:05 tetromino Exp $
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  seahorse-3.4.1.ebuild, seahorse-3.6.3.ebuild:
+  Update license, EAPI5-ize and de-9999-ize ebuild. Drop keywords due to
+  libsecret dependency (bug #447426).
 
 *seahorse-3.6.3 (16 Dec 2012)
 
diff --git a/app-crypt/seahorse/seahorse-3.4.1.ebuild b/app-crypt/seahorse/seahorse-3.4.1.ebuild
index 43bb8a1498c4..7ac7b141747e 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.2 2012/12/16 14:49:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.4.1.ebuild,v 1.3 2012/12/16 19:16:05 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -11,7 +11,7 @@ inherit eutils gnome2
 DESCRIPTION="A GNOME application for managing encryption keys"
 HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="avahi debug ldap"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
diff --git a/app-crypt/seahorse/seahorse-3.6.3.ebuild b/app-crypt/seahorse/seahorse-3.6.3.ebuild
index fbf2b6a3c2a6..69d940d1276d 100644
--- a/app-crypt/seahorse/seahorse-3.6.3.ebuild
+++ b/app-crypt/seahorse/seahorse-3.6.3.ebuild
@@ -1,30 +1,23 @@
 # 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.6.3.ebuild,v 1.1 2012/12/16 14:49:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.6.3.ebuild,v 1.2 2012/12/16 19:16:05 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 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"
+LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="avahi debug ldap"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 
 COMMON_DEPEND="
-	>=app-crypt/gcr-3.3.4
+	>=app-crypt/gcr-3.3.4:=
 	>=dev-libs/glib-2.10:2
 	>=x11-libs/gtk+-3.4:3
 	>=app-crypt/libsecret-0.5
@@ -37,11 +30,10 @@ COMMON_DEPEND="
 		=app-crypt/gnupg-2.0*
 		=app-crypt/gnupg-1.4* )
 
-	avahi? ( >=net-dns/avahi-0.6 )
-	ldap? ( net-nds/openldap )
+	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
@@ -50,10 +42,6 @@ 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"
@@ -65,7 +53,6 @@ src_prepare() {
 }
 
 src_configure() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
 	G2CONF="${G2CONF}
 		--enable-pgp
 		--enable-ssh
@@ -74,8 +61,8 @@ src_configure() {
 		--enable-hkp
 		$(use_enable avahi sharing)
 		$(use_enable debug)
-		$(use_enable ldap)"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+		$(use_enable ldap)
+		ITSTOOL=$(type -P true)"
 
 	gnome2_src_configure
 }