bump to 2.22.1. Remove more dead code that is now in gnome-keyring.

Package-Manager: portage-2.1.5_rc1

3 files changed, 131 insertions, 6 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index 470ecb461cb7..bd038c03836d 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.95 2008/04/05 08:56:22 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.96 2008/04/07 20:45:40 eva Exp $
+
+*seahorse-2.22.1 (07 Apr 2008)
+
+  07 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +seahorse-2.22.1.ebuild:
+  bump to 2.22.1. Remove more dead code that is now in gnome-keyring.
 
   05 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
   +files/70-seahorse-agent:
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 9f2f00a1cbef..8a159f07ab7a 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -5,14 +5,16 @@ AUX 70-seahorse-agent 241 RMD160 d28490016ed259ef29416cb101ccddd76e195ed5 SHA1 2
 AUX seahorse-0.9.10-update-mime.patch 545 RMD160 f7531dcd900f46b0208226cd1e3806a7bc75231b SHA1 57f486c216b922d5d52cc24ba5925bd854a15518 SHA256 ffa4324d3ec4c4019839f2663758dacd1bb97396582398fdfc241e24dfff549a
 DIST seahorse-2.20.3.tar.bz2 2273106 RMD160 e19c4d51b09511b570e90aa37a5b437a95a7404f SHA1 1946c0b6ff6f1dcd2c7d95e446d620592b129d32 SHA256 26aadb8fbd03c2971fdbcbf686dffd93a1f7fe82495510a64f38e53a49ce8442
 DIST seahorse-2.22.0.tar.bz2 2126861 RMD160 a36c41094449cb3bfa9670fc14d205145c3f3967 SHA1 36602d7afe3a4638ea98b72aa274675a2b2eb532 SHA256 31284f8d5a22d4af263fceb7bef4fc3d1df91ad8821d3dbef507111ef84a5275
+DIST seahorse-2.22.1.tar.bz2 2195121 RMD160 be97418841c14ef132af650e81c41032c7b15b52 SHA1 c6a96ac670540522c6ec0d6a3871a6ed711fb082 SHA256 e9791ad2d5ca9013db14310340227f8e5b1a519f2525066d10061c6d1b6f9c47
 EBUILD seahorse-2.20.3.ebuild 2698 RMD160 e4b3ea03aa8eb09e95f0dc184011c53d0fdf70e8 SHA1 c36017dfe292b81bca91f05a339dd5f44f79a429 SHA256 cc37db022ec215d74ab438a3841b4e907320d85d2687dcf01df56b667018f617
 EBUILD seahorse-2.22.0.ebuild 2968 RMD160 6db19bf97e30af19ac5515ccffde92ce4c3840a0 SHA1 5901c710b57c6ccd410a77928c3b77890fec0922 SHA256 05ff9e6cc60db0221564cb57d647b3121ad8d3cf1226a1b0360cc97a42308ea4
-MISC ChangeLog 13968 RMD160 7165994cdc781b0936cbc5a0f88642a79af117f0 SHA1 8224332a961456a911490c1a14cb65f40c2ad71e SHA256 e739ff8f397fd9c9a0c63d77914de7512a460e54974211be49529571b265ac77
+EBUILD seahorse-2.22.1.ebuild 2967 RMD160 bd886dbc5fdb08a533474a3b38330edd7464f83b SHA1 1609120e41852c1278fd6ff92d694ac489f20da0 SHA256 645969f0e123bcdecaab0ca7c24465a621268d036d8e310d3656c6a1ae9d5c81
+MISC ChangeLog 14152 RMD160 dda85c0e0b8984ccad8b5a04df8a6c49a335b2e1 SHA1 6fa79c5b6864776add48ad75ab3912fb94496600 SHA256 27378ae23160f8dd5441b324cfd94724f3789616f6609069669fd175a7c0b45b
 MISC metadata.xml 1321 RMD160 4c3a01dc58f4ace98ff1b0a075ae37a490a94062 SHA1 69e3fd2ce09b312f92bf67db9092b97bf765878b SHA256 39d9c9dfa7ce9e175fc349876b992b8600d43b4bd3bf1edf014c0975459ade5d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH9z7C1fmVwcYIWAYRAowwAJ4v36+x2wQl0fxR0fVIpG1/0VRbfwCg2ehx
-7tG6KVJUYytaMHSSIV3ZH0c=
-=FwSB
+iEYEARECAAYFAkf6iBkACgkQ1fmVwcYIWAZSngCgoQ6FOaiTtiDsewTHl2B4gGVF
+RasAoIycsRdlQwenkMLr/K3cno0SJyrr
+=Mibe
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse/seahorse-2.22.1.ebuild b/app-crypt/seahorse/seahorse-2.22.1.ebuild
new file mode 100644
index 000000000000..28c00f90df31
--- /dev/null
+++ b/app-crypt/seahorse/seahorse-2.22.1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.22.1.ebuild,v 1.1 2008/04/07 20:45:40 eva Exp $
+
+EAPI="1"
+
+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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="applet avahi dbus debug epiphany 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.4
+		 >=dev-libs/libxml2-2.6.0
+		 || (
+				=app-crypt/gnupg-1.4*
+				=app-crypt/gnupg-2.0*
+			)
+		 >=app-crypt/gpgme-1.0.0
+		   net-misc/openssh
+		   x11-misc/shared-mime-info
+		 avahi? ( >=net-dns/avahi-0.6 )
+		 dbus?	(
+		 	>=dev-libs/dbus-glib-0.72
+			applet? ( >=gnome-base/gnome-panel-2.10 )
+			epiphany? ( >=www-client/epiphany-2.14 )
+			gedit? ( >=app-editors/gedit-2.16 )
+		 )
+		 keyring? ( >=gnome-base/gnome-keyring-2.21.3.2 )
+		 ldap? ( net-nds/openldap )
+		 libnotify? ( >=x11-libs/libnotify-0.3.2 )
+		 nautilus? ( >=gnome-base/nautilus-2.12 )"
+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
+
+		if use epiphany ; then
+			elog
+			elog "The epiphany 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-scrollkeeper
+		--disable-update-mime-database
+		--enable-hkp --with-keyserver --enable-agent
+		$(use_enable applet)
+		$(use_enable avahi sharing)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable epiphany)
+		$(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}
+
+	chmod -s "${D}/usr/bin/seahorse-agent"
+	chmod -s "${D}/usr/bin/seahorse-daemon"
+
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}/70-seahorse-agent"
+}