new upstream release. fixes bug #354963.

Package-Manager: portage-2.1.9.42/cvs/Linux i686

4 files changed, 20 insertions, 27 deletions

diff --git a/mail-client/sylpheed/ChangeLog b/mail-client/sylpheed/ChangeLog
index 96865b4594b9..d84470b1347c 100644
--- a/mail-client/sylpheed/ChangeLog
+++ b/mail-client/sylpheed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/sylpheed
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.288 2011/03/23 20:44:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.289 2011/05/07 14:51:33 hattya Exp $
+
+*sylpheed-3.1.1 (07 May 2011)
+
+  07 May 2011; Akinori Hattori <hattya@gentoo.org> -sylpheed-3.1.0.ebuild,
+  +sylpheed-3.1.1.ebuild, metadata.xml:
+  new upstream release. fixes bug #354963.
 
   23 Mar 2011; Tim Harder <radhermit@gentoo.org> sylpheed-2.6.0.ebuild,
   sylpheed-3.0.2.ebuild, sylpheed-3.0.3.ebuild, sylpheed-3.1.0.ebuild:
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index b2ed24bdb16c..ad5d2ecd047a 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX sylpheed-2.1-shared-mime-info.diff 1637 RMD160 8439c41dbd570dfc37f7a0c268a47c1d263c6dcc SHA1 851f35dd097a26fc245a43117f95839c01f1ff1d SHA256 f1a8ee5c6597a8b31eb8abfdcd5775a56d0c2b4f1fe180abf9c04805d067ea72
 AUX sylpheed-2.4-firefox.diff 612 RMD160 67c11c67c4c4b506215780a28d462f729d28fd21 SHA1 499d8de33f4daf252efeadb362ebceb52217b648 SHA256 cc9b955cb5f6b0276265caff123a13345439ee5a5ca6ab49303f5e141ba359d8
 AUX sylpheed-2.5-enchant.diff 657 RMD160 60a9f01e855283860606ff39d7efceab24f94f22 SHA1 8c2a0b08ab739dc35d57edcbb6a3a29f5c25f6b0 SHA256 b47b4829cfe20215c6daf3a80a2b3ba1afbf529ca3212986246316e9655fefab
@@ -9,21 +6,10 @@ AUX sylpheed-3.0-enchant.diff 1048 RMD160 8f92c0558d3feb95c2f9d7ae114dcd577a9480
 DIST sylpheed-2.6.0.tar.bz2 2833188 RMD160 a4eb3b11d297dce1c42c23ceb553680b0942d75c SHA1 122fe608b5a7cb5a262da65908b1f5cf67a0123f SHA256 121b9f69d5501be2caa8419d5cf1351436db4b43af9f2083b07e59f1def31f51
 DIST sylpheed-3.0.2.tar.bz2 2975854 RMD160 3c12d934ad87997939d1002b978f688e45ae939e SHA1 7001053b540db3ff48c3304699d9a622de5f5f85 SHA256 e9596434c5ed25c08867c8bec5f2a3b7d160b4c807f374403bec6844910b1e62
 DIST sylpheed-3.0.3.tar.bz2 2988634 RMD160 bf235147f660d5301623941f86c3680b63c24620 SHA1 b12f7dbe40de408717229e2b6a4a2ac3218c5985 SHA256 9625525564542cdf65cf929a691a80513a549baf0f9b89c37e26948255648f75
-DIST sylpheed-3.1.0.tar.bz2 3130795 RMD160 1e2f3f3f78df61e7907b59e27153acc1362f8ba4 SHA1 07606305e3fa6503f9db7daeba269e5f63eea949 SHA256 c176aa5c8f46b5f8fba6ee7d903f2687e9ddf5d5f4124da0bcee87c365d01b2b
+DIST sylpheed-3.1.1.tar.bz2 3234408 RMD160 c341b8cba926d9e7bc60e07398f0766da6774e73 SHA1 1217c528f2362311922518a89b4d4866bfa09cd0 SHA256 c4801601013326dcf53512552f8a903dc7289aa56ae9bd7e28e103c5aae19b9f
 EBUILD sylpheed-2.6.0.ebuild 1636 RMD160 6aae94fd381e972363ea7da15c9da41eb24e6e9d SHA1 02a4480502b407acd5f0be84ced46c905dd7270f SHA256 1e2a69e4ad97c6e3f19be2d229bf25c5b6cfc65a7689ba64f65c06ccaadf093f
 EBUILD sylpheed-3.0.2.ebuild 1649 RMD160 62feb88a6803abf02f41b888b11da4d1b2c4104c SHA1 5b8add78f2f693cefa260aa6475dd8e0ae1d1c3b SHA256 1ed6353a7b7e1ccc64bcc605bdbeaa8b0eb117da79d3b2a64082a636480911ac
 EBUILD sylpheed-3.0.3.ebuild 1647 RMD160 d08f89ef733216ebf3591dd4f23eb3a0c405464a SHA1 26d255634c69ab84034cf8aa96c3f108cf3aa9a4 SHA256 e0bb2219e05f322a00d4b7b0bd27c1359d6470448bf4a8e6f740a537a8315785
-EBUILD sylpheed-3.1.0.ebuild 1647 RMD160 72517acee400d989d78f98aaa3d30c71c32b8684 SHA1 86245bf4c9cf491a8140e6a4b2a29dc4ed3a002c SHA256 cb43fd6d9af89b983253119d5342adcc65b782ff5da01565bc0fca632bf01fcc
-MISC ChangeLog 45473 RMD160 2718001561d0e244e0c5f32489187709d20b27b9 SHA1 4387609c47f841e6c05387236d26b744d053ecb3 SHA256 9873a808ce208e35171bb14c2ebe407551e12677b489756728432580ef4a887a
-MISC metadata.xml 231 RMD160 648d342021559d00b487c6f2e0ca5036a0fcb84e SHA1 7ff44c36cd72cd2d6ab274e27b69a6f45ceed124 SHA256 aa52ef57f5156d5eb6abdb1e41b28cafdb6218a6738807d9e3797f99f344b5fb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBAgAGBQJNilvGAAoJEEqz6FtPBkyjOPQH/RiWBj6YlpDRYQq5/xIcL35D
-g3Yr1dyJvPae24+kZlavx7wtUdEq55/a/UPfZf3/V3ArOzJtpLgAzQIWiX9vO9Se
-VQfMVKA/7hzWVn18F64aSVkJRwc0HhAlmmkB5xHO0kmh3eWThfiRD5ABoEROYmEO
-wBJSCILhtYdoBPPa9rRxejX8yNy0WnEOtrmBfms1vMCmlgDYpHel69v0sQPRkuXE
-RJfKPNS21pkOSN91PG8UPb0LrWa3iCp03cHzVFS5Ywm1+2SYGbACYDtnCZ8wPzEa
-xXK0IWsn94VKtgc8OKVcSxkjjzdq0yl9VBbNKclusiDXlc07KDK2gUB0pRkdBL4=
-=ETpc
------END PGP SIGNATURE-----
+EBUILD sylpheed-3.1.1.ebuild 1613 RMD160 5f5edb44514279d25d1abbb10772c7d2c09d3ca1 SHA1 9a4a761c51ba49b2ed45ce3e1c3a86cfa4c6cdbb SHA256 88ac3a52cf40104cb873ebb0c9e4e50025290e6b11e14e19dde8dafb444eae78
+MISC ChangeLog 45660 RMD160 ad30868c5d1395d0e07f824cd3035755cb6217cf SHA1 1b2a818fbea0a7e1df3c95b51c39c5b4bb3ef84c SHA256 a711c24d8b82323f71abb82cc710f64e76e3b6e02a1d994350b563dbff4452e1
+MISC metadata.xml 339 RMD160 a2956f18abd8c76fa16702bbbd18052b17eef412 SHA1 955fea53cc8a0e171611a3ef0301ac4a8f4381c6 SHA256 ba4beec56bd0eaed052b930e04b2a31aec70c619a91fdee00ecfa33f2d4c8c1d
diff --git a/mail-client/sylpheed/metadata.xml b/mail-client/sylpheed/metadata.xml
index 01f3621f3cda..a619498bd13f 100644
--- a/mail-client/sylpheed/metadata.xml
+++ b/mail-client/sylpheed/metadata.xml
@@ -5,4 +5,7 @@
   <maintainer>
     <email>hattya@gentoo.org</email>
   </maintainer>
+  <use>
+    <flag name="oniguruma">Use <pkg>dev-libs/oniguruma</pkg> for regular expression</flag>
+  </use>
 </pkgmetadata>
diff --git a/mail-client/sylpheed/sylpheed-3.1.0.ebuild b/mail-client/sylpheed/sylpheed-3.1.1.ebuild
index af7f8bb5d28f..aff4b7af293a 100644
--- a/mail-client/sylpheed/sylpheed-3.1.0.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.1.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-3.1.0.ebuild,v 1.2 2011/03/23 20:44:48 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-3.1.1.ebuild,v 1.1 2011/05/07 14:51:33 hattya Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit autotools eutils
 
-IUSE="crypt ipv6 ldap nls pda spell ssl xface"
+IUSE="crypt ipv6 ldap nls oniguruma pda spell ssl xface"
 
 DESCRIPTION="A lightweight email client and newsreader"
 HOMEPAGE="http://sylpheed.sraoss.jp/"
@@ -20,6 +20,7 @@ COMMON_DEPEND=">=x11-libs/gtk+-2.4:2
 	nls? ( >=sys-devel/gettext-0.12.1 )
 	crypt? ( >=app-crypt/gpgme-1 )
 	ldap? ( net-nds/openldap )
+	oniguruma? ( dev-libs/oniguruma )
 	pda? ( app-pda/jpilot )
 	spell? ( app-text/gtkspell )
 	ssl? ( dev-libs/openssl )"
@@ -28,16 +29,12 @@ DEPEND="${COMMON_DEPEND}
 	xface? ( >=media-libs/compface-1.4 )"
 RDEPEND="${COMMON_DEPEND}
 	app-misc/mime-types
-	net-misc/curl
-	x11-misc/shared-mime-info"
+	net-misc/curl"
 
 AT_M4DIR="ac"
 
 src_prepare() {
 
-	epatch "${FILESDIR}"/${PN}-2.7-*.diff
-	epatch "${FILESDIR}"/${PN}-3.*.diff
-
 	use crypt || cp ac/missing/gpgme.m4 ac
 
 	eautoreconf
@@ -52,6 +49,7 @@ src_configure() {
 		$(use_enable crypt gpgme) \
 		$(use_enable ipv6) \
 		$(use_enable ldap) \
+		$(use_enable oniguruma) \
 		$(use_enable pda jpilot) \
 		$(use_enable spell gtkspell) \
 		$(use_enable ssl) \