Fix fix_nonexistent_mailbox_test (#296657)

Package-Manager: portage-2.2.0_alpha15/cvs/Linux x86_64

4 files changed, 55 insertions, 6 deletions

diff --git a/net-mail/grepmail/ChangeLog b/net-mail/grepmail/ChangeLog
index f7640b30532e..f6576673f0c9 100644
--- a/net-mail/grepmail/ChangeLog
+++ b/net-mail/grepmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/grepmail
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/grepmail/ChangeLog,v 1.31 2008/03/07 19:08:28 armin76 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/grepmail/ChangeLog,v 1.32 2011/01/14 13:21:02 tove Exp $
+
+  14 Jan 2011; Torsten Veller <tove@gentoo.org>
+  +files/5.30.33-fix_nonexistent_mailbox_test.patch, grepmail-5.30.33.ebuild:
+  Fix fix_nonexistent_mailbox_test (#296657)
 
   07 Mar 2008; Raúl Porcel <armin76@gentoo.org> grepmail-5.30.33.ebuild:
   sparc stable wrt #212470
diff --git a/net-mail/grepmail/Manifest b/net-mail/grepmail/Manifest
index 9fa58fa47464..3fa8b8a95d8c 100644
--- a/net-mail/grepmail/Manifest
+++ b/net-mail/grepmail/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 5.30.33-fix_nonexistent_mailbox_test.patch 1138 RMD160 d3980210f281875dc874c17d0a6b93f3df4661c8 SHA1 e21a8cfd052083b32799a4b3097f135976ccc031 SHA256 6ac814335b1f54e11ef2f99810b7ad5b17b2cb125ab5eb094982aca420707daa
 DIST grepmail-5.3032.tar.gz 527481 RMD160 a6e17930b7e37e25f1f0ed052b389cb261b45178 SHA1 94b98bce7f361e03d640d5c5ae550a32c3572a2f SHA256 38ba25363b3eaed395a25cef90140bcc46ae09ded2c01c7554718c5f9abe2561
 DIST grepmail-5.3033.tar.gz 536791 RMD160 03b81605f48c325733be1d2f5a6fe312e39c891c SHA1 1e83dbb8067fe3a2afb6698a19a2a6e9328df825 SHA256 2ba3ed6839b62bbee5e52a5caafe0700fe27ca31473d32ba062e4736a8f7b6b5
 EBUILD grepmail-5.30.32.ebuild 710 RMD160 8d34b37b478d866dbad149ff83f33e56307eb507 SHA1 a2a9380d2c0cac87838cb0655201b20880a317e0 SHA256 b2f18e5244bc8a6a8411f6fb895cd488bb567a127d472c011f24a4216d2853b1
-EBUILD grepmail-5.30.33.ebuild 723 RMD160 d1e3fb74b928912286520751df69543e1e2aef87 SHA1 f46da84f39073693d7ee822ed61c00a2a89a73af SHA256 ae304b319bcf40a1baf7733b57f8fdf6cd14d10f00b0093ce97eaa5479e9795a
-MISC ChangeLog 4085 RMD160 d1d30c389c425ca22a47f9b87a42c995e23ef18d SHA1 893c86c88c2f2a34a83cae47fb8cb33f6a5ff540 SHA256 94ddd0f41e9d8ea80e7deba39828e1c0a9685817fdecffe4d014d9a6264ed7f6
+EBUILD grepmail-5.30.33.ebuild 789 RMD160 38469097360a64dcf3517825f2fb2c34112125e9 SHA1 d8ab32bf21fa0501b309be28da21187535614206 SHA256 55d7d50398a0c9bfe3467df1dec78dfa0911fc79072d6ad64230585b5ab95f19
+MISC ChangeLog 4254 RMD160 ef50f963eaa0d4dc80ab88eac1e6333046ec97de SHA1 9012803a39efa7655d07413131b4cf9f23fccce3 SHA256 1e32e6e14378611ae0be0dc7c91381955100150eaefa655abb0d2a3c990b2bf5
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0wTcQACgkQV3J2n04Eauy3GQCcCvV63wwomc04V73Zw2qKDw5t
+0/UAmgN9HDCbNDQ8r96qgn2aSQYSd803
+=LGtM
+-----END PGP SIGNATURE-----
diff --git a/net-mail/grepmail/files/5.30.33-fix_nonexistent_mailbox_test.patch b/net-mail/grepmail/files/5.30.33-fix_nonexistent_mailbox_test.patch
new file mode 100644
index 000000000000..cdab28bb635c
--- /dev/null
+++ b/net-mail/grepmail/files/5.30.33-fix_nonexistent_mailbox_test.patch
@@ -0,0 +1,33 @@
+Description: Fix FTBFS with libmail-mbox-messageparser-perl 1.5002
+ From 1.5002, it does not return "No data on standard input" anymore.
+Author: Vincent Legout <vincent@legout.info>
+Last-Update: 2010-04-28
+Bug-Debian: http://bugs.debian.org/549782
+Bug-Gentoo: https://bugs.gentoo.org/296657
+
+--- grepmail/t/nonexistent_mailbox.t
++++ grepmail/t/nonexistent_mailbox.t
+@@ -13,21 +13,15 @@
+   => ['none','no_such_file'],
+ "$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() .
+   " | grepmail pattern"
+-  => ['none','no_data'],
++  => ['none','none'],
+ "grepmail -E $single_quote\$email =~ /pattern/$single_quote no_such_file"
+   => ['none','no_such_file'],
+ "$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() .
+   " | grepmail -E $single_quote\$email =~ /pattern/$single_quote"
+-  => ['none','no_data'],
++  => ['none','none'],
+ );
+ 
+ my %expected_errors = (
+-"$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() .
+-  " | grepmail pattern"
+-  => 1,
+-"$^X -MExtUtils::Command -e cat no_such_file 2>" . devnull() .
+-  " | grepmail -E $single_quote\$email =~ /pattern/$single_quote"
+-  => 1,
+ );
+ 
+ my %localization = (
diff --git a/net-mail/grepmail/grepmail-5.30.33.ebuild b/net-mail/grepmail/grepmail-5.30.33.ebuild
index 21b42c81a8b9..ee35a00f7a82 100644
--- a/net-mail/grepmail/grepmail-5.30.33.ebuild
+++ b/net-mail/grepmail/grepmail-5.30.33.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/grepmail/grepmail-5.30.33.ebuild,v 1.4 2008/03/07 19:08:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/grepmail/grepmail-5.30.33.ebuild,v 1.5 2011/01/14 13:21:02 tove Exp $
 
 inherit versionator perl-app
 
@@ -23,3 +23,4 @@ DEPEND="dev-perl/Inline
 	>=dev-perl/Mail-Mbox-MessageParser-1.40.01"
 
 SRC_TEST="do"
+PATCHES=( "${FILESDIR}"/5.30.33-fix_nonexistent_mailbox_test.patch )