bump to 2.20.1

(Portage version: 2.1.3.13)

7 files changed, 128 insertions, 15 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index fed301e804c5..cf030afd57b7 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.77 2007/10/03 00:57:02 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.78 2007/10/17 22:11:45 eva Exp $
+
+  17 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org> seahorse-0.8.1.ebuild,
+  seahorse-0.8.2-r1.ebuild, seahorse-1.0.ebuild, seahorse-1.0.1.ebuild:
+  fix some QA warnings
+
+*seahorse-2.20.1 (17 Oct 2007)
+
+  17 Oct 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  +seahorse-2.20.1.ebuild:
+  bump to 2.20.1
 
 *seahorse-2.20.0 (03 Oct 2007)
 
diff --git a/app-crypt/seahorse/files/digest-seahorse-2.20.1 b/app-crypt/seahorse/files/digest-seahorse-2.20.1
new file mode 100644
index 000000000000..6ccfb24b3cad
--- /dev/null
+++ b/app-crypt/seahorse/files/digest-seahorse-2.20.1
@@ -0,0 +1,3 @@
+MD5 e4266963ee9d2ffc6185938a7eaf474d seahorse-2.20.1.tar.bz2 2287702
+RMD160 a2508bac5ad9df42edb52ab619abf6320e76d76a seahorse-2.20.1.tar.bz2 2287702
+SHA256 718ff187c1951d0a2baa6dd1b9e97ddf9c5d845ebd356b502437a83582843dbf seahorse-2.20.1.tar.bz2 2287702
diff --git a/app-crypt/seahorse/seahorse-0.8.1.ebuild b/app-crypt/seahorse/seahorse-0.8.1.ebuild
index b06be2c49435..65628a4a18b8 100644
--- a/app-crypt/seahorse/seahorse-0.8.1.ebuild
+++ b/app-crypt/seahorse/seahorse-0.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.8.1.ebuild,v 1.8 2007/07/13 21:47:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.8.1.ebuild,v 1.9 2007/10/17 22:11:45 eva Exp $
 
 inherit gnome2 eutils autotools flag-o-matic
 
@@ -47,6 +47,5 @@ src_install() {
 	gnome2_src_install
 
 	# remove conflicts with x11-misc/shared-mime-info
-	rm -rf ${D}/usr/share/mime/application ${D}/usr/share/mime/magic ${D}/usr/share/mime/globs \
-		${D}/usr/share/mime/XMLnamespaces
+	rm -rf "${D}"/usr/share/mime/{application,magic,globs,XMLnamespaces}
 }
diff --git a/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild b/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild
index 13ce43f192cf..cf6532a3d1d7 100644
--- a/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild
+++ b/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild,v 1.1 2007/01/03 13:42:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild,v 1.2 2007/10/17 22:11:45 eva Exp $
 
 inherit gnome2 eutils autotools flag-o-matic
 
@@ -47,7 +47,7 @@ pkg_setup() {
 
 src_unpack() {
 	gnome2_src_unpack
-	epatch ${FILESDIR}/${PN}-0.8.2-gpg2.0.patch
+	epatch "${FILESDIR}"/${PN}-0.8.2-gpg2.0.patch
 }
 
 src_compile() {
@@ -59,6 +59,5 @@ src_install() {
 	gnome2_src_install
 
 	# remove conflicts with x11-misc/shared-mime-info
-	rm -rf ${D}/usr/share/mime/application ${D}/usr/share/mime/magic \
-		   ${D}/usr/share/mime/globs ${D}/usr/share/mime/XMLnamespaces
+	rm -rf "${D}"/usr/share/mime/{application,magic,globs,XMLnamespaces}
 }
diff --git a/app-crypt/seahorse/seahorse-1.0.1.ebuild b/app-crypt/seahorse/seahorse-1.0.1.ebuild
index a02d38db07e1..e5e643a0600c 100644
--- a/app-crypt/seahorse/seahorse-1.0.1.ebuild
+++ b/app-crypt/seahorse/seahorse-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-1.0.1.ebuild,v 1.7 2007/08/02 04:58:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-1.0.1.ebuild,v 1.8 2007/10/17 22:11:45 eva Exp $
 
 inherit gnome2 eutils flag-o-matic
 
@@ -78,8 +78,8 @@ pkg_setup() {
 
 src_unpack() {
 	gnome2_src_unpack
-	epatch ${FILESDIR}/${PN}-0.9.10-update-mime.patch
-	epatch ${FILESDIR}/${PN}-1.0.1-setuid-agent.patch
+	epatch "${FILESDIR}"/${PN}-0.9.10-update-mime.patch
+	epatch "${FILESDIR}"/${PN}-1.0.1-setuid-agent.patch
 }
 
 src_compile() {
@@ -91,5 +91,5 @@ src_install() {
 	gnome2_src_install
 
 	# remove conflicts with x11-misc/shared-mime-info
-	rm -rf ${D}/usr/share/mime/{application,magic,globs,XMLnamespaces}
+	rm -rf "${D}"/usr/share/mime/{application,magic,globs,XMLnamespaces}
 }
diff --git a/app-crypt/seahorse/seahorse-1.0.ebuild b/app-crypt/seahorse/seahorse-1.0.ebuild
index c2e4b8e35cc5..04a043600481 100644
--- a/app-crypt/seahorse/seahorse-1.0.ebuild
+++ b/app-crypt/seahorse/seahorse-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-1.0.ebuild,v 1.7 2007/08/02 04:58:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-1.0.ebuild,v 1.8 2007/10/17 22:11:45 eva Exp $
 
 inherit gnome2 eutils flag-o-matic
 
@@ -77,7 +77,7 @@ pkg_setup() {
 
 src_unpack() {
 	gnome2_src_unpack
-	epatch ${FILESDIR}/${PN}-0.9.10-update-mime.patch
+	epatch "${FILESDIR}"/${PN}-0.9.10-update-mime.patch
 }
 
 src_compile() {
diff --git a/app-crypt/seahorse/seahorse-2.20.1.ebuild b/app-crypt/seahorse/seahorse-2.20.1.ebuild
new file mode 100644
index 000000000000..fa4c68992023
--- /dev/null
+++ b/app-crypt/seahorse/seahorse-2.20.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.20.1.ebuild,v 1.1 2007/10/17 22:11:45 eva Exp $
+
+inherit gnome2 eutils flag-o-matic
+
+GNOME_TARBALL_SUFFIX="gz"
+
+DESCRIPTION="A GNOME application for managing encryption keys"
+HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="applet avahi dbus debug gedit keyring ldap libnotify nautilus"
+
+RDEPEND=">=gnome-base/libgnome-2.14
+		 >=gnome-base/libgnomeui-2.10
+		 >=gnome-base/gnome-vfs-2.0
+		 >=gnome-base/libglade-2.0
+		 >=gnome-base/gconf-2.0
+		 >=dev-libs/glib-2.10
+		 >=x11-libs/gtk+-2.10
+		 >=net-libs/libsoup-2.2
+		 >=dev-libs/libxml2-2.6.0
+		 || (
+				=app-crypt/gnupg-1.2*
+				=app-crypt/gnupg-1.4*
+				=app-crypt/gnupg-2.0*
+		 	)
+		 >=app-crypt/gpgme-1.0.0
+		   net-misc/openssh
+		   x11-misc/shared-mime-info
+		 applet? ( >=gnome-base/gnome-panel-2.10 )
+		 avahi? ( >=net-dns/avahi-0.6 )
+		 dbus?	( ||	(
+							>=dev-libs/dbus-glib-0.72
+							( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.60 )
+		 				)
+				)
+		 gedit? ( >=app-editors/gedit-2.16 )
+		 keyring? ( gnome-base/gnome-keyring )
+		 ldap? ( net-nds/openldap )
+		 libnotify? ( >=x11-libs/libnotify-0.3.2 )
+		 nautilus? ( >=gnome-base/nautilus-2.10 )"
+DEPEND="${RDEPEND}
+		sys-devel/gettext
+		>=app-text/gnome-doc-utils-0.3.2
+		>=app-text/scrollkeeper-0.3
+		>=dev-util/pkgconfig-0.20
+		>=dev-util/intltool-0.35"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
+
+pkg_setup() {
+	if ! use dbus ; then
+		if use applet ; then
+			elog
+			elog "The panel applet requires that you build seahorse with DBUS support."
+			elog
+		fi
+
+		if use gedit ; then
+			elog
+			elog "The GEdit plugin requires that you build seahorse with DBUS support."
+			elog
+		fi
+
+		eerror "Please add dbus to your USE flags and re-emerge seahorse"
+		eerror "plugins require dbus support"
+	fi
+
+	G2CONF="${G2CONF} --enable-ssh --disable-update-mime-database \
+			--enable-hkp --with-keyserver --enable-agent \
+			--localstatedir=${D}/var/lib/scrollkeeper/ --disable-epiphany \
+			$(use_enable applet) \
+			$(use_enable avahi sharing) \
+			$(use_enable dbus) \
+			$(use_enable debug) \
+			$(use_enable gedit) \
+			$(use_enable keyring gnome-keyring) \
+			$(use_enable ldap) \
+			$(use_enable libnotify) \
+			$(use_enable nautilus)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+	epatch "${FILESDIR}/${PN}-0.9.10-update-mime.patch"
+}
+
+src_compile() {
+	append-ldflags $(bindnow-flags)
+	gnome2_src_compile
+}
+
+src_install() {
+	gnome2_src_install
+
+	# remove conflicts with x11-misc/shared-mime-info
+	rm -rf "${D}/usr/share/mime/"{application,magic,globs,XMLnamespaces}
+}