Bump to 2.26.2. Translation updates. Clean up old revisions.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 103 insertions, 106 deletions

diff --git a/app-crypt/seahorse-plugins/Manifest b/app-crypt/seahorse-plugins/Manifest
index ed9d509d00d8..ddc0be79b58e 100644
--- a/app-crypt/seahorse-plugins/Manifest
+++ b/app-crypt/seahorse-plugins/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 70-seahorse-agent 241 RMD160 d28490016ed259ef29416cb101ccddd76e195ed5 SHA1 2b40525f543741dc0a453a8241e3b7c83f45da6f SHA256 2e70cbb034fde8ddd5c69baf97570ad706bec2e04bd7dd2c86f462b9a594e3c6
 DIST seahorse-plugins-2.24.1.tar.bz2 1843996 RMD160 6f47438b98ba957550cf34f5ee163c28b6e061a6 SHA1 88a144999f55e82d5fe8eee3c251371589e82ed9 SHA256 0a9ee63adc7ad01e9c3d9a3432d467a4df24889b7bd41b065e89bec74ccd7676
 DIST seahorse-plugins-2.26.1.tar.bz2 1311443 RMD160 c7244d626874beb1e54ecb4037e052b69998ac49 SHA1 881655b46da21efd755f81b0449ec776ceb3f710 SHA256 898acf0009beff402875378483460436d64104c11235ed3a3c3ff43b5229b752
+DIST seahorse-plugins-2.26.2.tar.bz2 1318153 RMD160 99659c47d880a02b5ab25289f1d459c7d1472c51 SHA1 df5cae9c19cd106fafc65d95b8d0d57bbd6a12db SHA256 c98fd6c0cf35b1628fa758d31da3f4f53d8861ec41ddee361256ff27f7b2cdb0
 EBUILD seahorse-plugins-2.24.1.ebuild 1857 RMD160 0eb506c375ceec39af0a1c66a167662b413c08c4 SHA1 82cf26fa08c8918865d5f4840416fd50a3242a3b SHA256 9259e7fdff86f0b0cd19a5bccfa8f9eeb66f125a3f122f5d7419370f08f02e3c
 EBUILD seahorse-plugins-2.26.1.ebuild 2107 RMD160 4688a77d000e38c0af30f893abe5f21138c1e958 SHA1 cd0f7f8a42c01f3ee53807921eee23a21a45d76c SHA256 d63458ac8141ae3d5dea32765eaa82cb8fc4eb433eb5190b1250515770ca85d8
-MISC ChangeLog 702 RMD160 6b8a675ae5da867f783fa7935dcffe49afd53cbd SHA1 4dc50506cf9de0dd0dca09303f69aee12d7b499e SHA256 11912a63cf15318cf9cc5ac0ac77093b3baaa9f87bcb2e1e89d0bd2f5d65b78c
+EBUILD seahorse-plugins-2.26.2.ebuild 2013 RMD160 c23b281fa1a06da8b8fa753610e86248cafdd6ad SHA1 a4e20f32db5f99240395352731b33890f6db8485 SHA256 ceddb479aa0be65df81b3c377552ffc54ec10902610dc3526d0e0ee7c9ee2ede
+MISC ChangeLog 895 RMD160 e2759a4370c381e6a18142b6d17b43a5cc3c6382 SHA1 ef7e6f09b68bf59dcfb23c784040b17c86f3f24f SHA256 1fbf5ce655b195315461a1d42143d8de3779ed0a0d92b4ed8247bc77e9723a43
 MISC metadata.xml 635 RMD160 9e4ce86f6c12e7c519fcea74ed7dfd646b7458ca SHA1 2a6ec6e8f12bb2e887ebf8c9c38b105012f0a2af SHA256 3e1c53ae9351ecbdcbf7bf930f12d4eb9176acc408094f222babba1ed7b95aa5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoYWxsACgkQ1fmVwcYIWAYnlQCdE9UEtnzVOnr7iois5YH6kRPT
+Yk4AnizK1siJcQX0vZyEnkxRBaBj07/q
+=Tm5g
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index 2f6fb5f30bb5..6bce1f6fb216 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.115 2009/05/14 08:53:16 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.116 2009/05/23 20:21:23 eva Exp $
+
+*seahorse-2.26.2 (23 May 2009)
+
+  23 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -seahorse-2.20.3.ebuild, +seahorse-2.26.2.ebuild:
+  Bump to 2.26.2. Translation updates. Clean up old revisions.
 
 *seahorse-2.26.1 (14 May 2009)
 
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index e6bb24acd48d..61739b640240 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,13 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 70-seahorse-agent 241 RMD160 d28490016ed259ef29416cb101ccddd76e195ed5 SHA1 2b40525f543741dc0a453a8241e3b7c83f45da6f SHA256 2e70cbb034fde8ddd5c69baf97570ad706bec2e04bd7dd2c86f462b9a594e3c6
 AUX seahorse-0.9.10-update-mime.patch 545 RMD160 f7531dcd900f46b0208226cd1e3806a7bc75231b SHA1 57f486c216b922d5d52cc24ba5925bd854a15518 SHA256 ffa4324d3ec4c4019839f2663758dacd1bb97396582398fdfc241e24dfff549a
 AUX seahorse-2.22.2-fbsd.patch 305 RMD160 e6d12d63383007b8b2b5064cc317e3b0d491908b SHA1 8440145139ace9b98cf7d16bb329395c5ba5479f SHA256 fd3e7be3c5af9b7e4c831ca6590b68582f671f4033693d1c2253f220dc6c57b2
-DIST seahorse-2.20.3.tar.bz2 2273106 RMD160 e19c4d51b09511b570e90aa37a5b437a95a7404f SHA1 1946c0b6ff6f1dcd2c7d95e446d620592b129d32 SHA256 26aadb8fbd03c2971fdbcbf686dffd93a1f7fe82495510a64f38e53a49ce8442
 DIST seahorse-2.22.3.tar.bz2 2121204 RMD160 63acdec4f689734bcf36bd0ef4a9fbc09fcba12a SHA1 11a5c4a641e3419e022f3c8e733b49a1139a52ed SHA256 245ff3752f72d14615937ef03d5a5e6f1a3abdf12a907af775ce31aa337e95d1
 DIST seahorse-2.24.1.tar.bz2 2197087 RMD160 0cf99ed7de4eeb7100f0de346dc82a8d74b3ff36 SHA1 66a993a5a24e2e2637db6964c39c0a6cc432e0ec SHA256 b86c045fe1d8cf7a3fd56e078175e32cd94154eb77f9fe2a4a4e1f1aa13a5d04
 DIST seahorse-2.26.1.tar.bz2 2197974 RMD160 75e58a0c5cced19aefa3290bf39df5f8a88329d8 SHA1 b1d6a94797895690c034ba0016930a56694877d5 SHA256 2e42d760a241ca764dddd3f3ec3b023edf57f024c8d728e7b3a3f8d06e1a5011
-EBUILD seahorse-2.20.3.ebuild 2617 RMD160 539dec59cd6b9f1eb368e511db8bd0f371c40a28 SHA1 2e55bf2bdb9cd3106141cc7839bad3b7b0b7a0cf SHA256 d791b4a3cec1bc7eddfc90503daad1dd16e431afb1f5798288765b94622d79df
+DIST seahorse-2.26.2.tar.bz2 2196810 RMD160 9193e5c14244f1a1463c6479bf31bb7d20a1a1bb SHA1 04484352e92fc2faa6f06ee6f4eb21828931f173 SHA256 ab73a7c918afd9f111b6078750328d0a4b82f2f6644e3fa04582f58d81238dce
 EBUILD seahorse-2.22.3.ebuild 3208 RMD160 6c72f9c5d1b2664082cd940f005369efd6c922fd SHA1 f478d1294da78ebb4cfe75b3d3527f29038783a7 SHA256 6d80aaa09e1703ffabfdcf953848917f477b93d0bcb30ad3dc5c4a5f30a7c016
 EBUILD seahorse-2.24.1.ebuild 1568 RMD160 2d1063c548012047ab82df5c84a3ef072b2c9015 SHA1 c9023c6b4f7e071c4f6d9bfd88c377c375aad718 SHA256 55ab70f36ab79d15378d86fce413479060a2d691b119cc6be7da6acd05ebc0f4
 EBUILD seahorse-2.26.1.ebuild 1904 RMD160 5e70cc78c1acb08a25cd3160295ed273067522a2 SHA1 c90ef0eae4c2ee0684926a069e0fa2d64aa1dac2 SHA256 8d82544e346d087106841a0c475cd154b2e2ed85fa251f3373d3638f7e11e2d9
-MISC ChangeLog 16836 RMD160 858ae8ec2ffbf505c10e177b0f910687b2946cb6 SHA1 6ff17ca0f0b9799eb19d33f29c362d03038fb6fe SHA256 7b078c6ee9afaf74842f74a553cdc2ae6821a727d7bc6f1cc5542e1c44608be8
+EBUILD seahorse-2.26.2.ebuild 1800 RMD160 0a76aee9862a6d7d4aa13c8a6e2a302954774e32 SHA1 406abc754254124288662ec748b08ad70d48a3ec SHA256 b7be68a2d430c368dad453a365febc19cb4490a72c122302140c8cb6c4bc1fa0
+MISC ChangeLog 17033 RMD160 96baed691a146e3a6359d5b860d44f3a8798f536 SHA1 3f73c566082ec3eb01d57afc0740ea1a526d0e33 SHA256 a5d6a2a3628c16954344f0a72d5befe20856e6104e79cd174a196035bd680027
 MISC metadata.xml 1350 RMD160 e23a60042c52e9e0003640c72792ec1db5d18d69 SHA1 13acdf926fb2fe87157d5ea1e5d5db124f14ad05 SHA256 b51ea5d45e0689c5c8670a5949f58b412adf02f70d814073c6ea942b87903e0e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoYWskACgkQ1fmVwcYIWAY2RgCgw0d4ckiNNVN3KFd+qg/6r8YU
+wQgAn3rTr5Zk/lA0DGpDY+0c3Vs/HkSU
+=F9B1
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse/seahorse-2.20.3.ebuild b/app-crypt/seahorse/seahorse-2.20.3.ebuild
deleted file mode 100644
index 48280e3b4aeb..000000000000
--- a/app-crypt/seahorse/seahorse-2.20.3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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.20.3.ebuild,v 1.12 2008/06/15 12:24:26 eva Exp $
-
-EAPI="1"
-
-inherit eutils gnome2
-
-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 gedit gnome-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.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 )
-		 gnome-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 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_install() {
-	gnome2_src_install
-
-	# remove conflicts with x11-misc/shared-mime-info
-	rm -rf "${D}/usr/share/mime/"{application,magic,globs,XMLnamespaces}
-}
diff --git a/app-crypt/seahorse/seahorse-2.26.2.ebuild b/app-crypt/seahorse/seahorse-2.26.2.ebuild
new file mode 100644
index 000000000000..2e4710f6786e
--- /dev/null
+++ b/app-crypt/seahorse/seahorse-2.26.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.26.2.ebuild,v 1.1 2009/05/23 20:21:23 eva Exp $
+
+EAPI="2"
+
+inherit gnome2
+
+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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="avahi debug doc ldap libnotify test"
+
+RDEPEND=">=gnome-base/libglade-2.0
+	>=gnome-base/gconf-2.0
+	>=dev-libs/glib-2.10
+	>=x11-libs/gtk+-2.10
+	>=dev-libs/dbus-glib-0.72
+	>=gnome-base/gnome-keyring-2.25.5
+	net-libs/libsoup:2.4
+	x11-misc/shared-mime-info
+
+	net-misc/openssh
+	>=app-crypt/gpgme-1.0.0
+	|| (
+		=app-crypt/gnupg-1.4*
+		=app-crypt/gnupg-2.0* )
+
+	avahi? ( >=net-dns/avahi-0.6 )
+	ldap? ( net-nds/openldap )
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )"
+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
+	doc? ( >=dev-util/gtk-doc-1.9 )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--enable-pgp
+		--enable-ssh
+		--enable-pkcs11
+		--disable-scrollkeeper
+		--disable-update-mime-database
+		--enable-hkp
+		$(use_enable avahi sharing)
+		$(use_enable debug)
+		$(use_enable ldap)
+		$(use_enable libnotify)
+		$(use_enable test tests)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+}
+
+pkg_postinst() {
+	einfo "The seahorse-agent tool has been moved to app-crypt/seahorse-plugins"
+	einfo "Use that if you want seahorse to manage your terminal SSH keys"
+}