Check for en_US.utf8 locale. If not available, donot run tests that fail without it - bug #376667

Package-Manager: portage-2.1.10.9/cvs/Linux x86_64

4 files changed, 92 insertions, 20 deletions

diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index 74e0358d1106..9ce2800a2501 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/maildrop
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.111 2011/07/27 18:24:29 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.112 2011/07/30 11:56:42 eras Exp $
+
+  30 Jul 2011; Eray Aslan <eras@gentoo.org> maildrop-2.5.4.ebuild,
+  +files/maildrop-testsuite.patch:
+  Check for en_US.utf8 and run tests accordingly - bug #376667
 
 *maildrop-2.4.2-r1 (27 Jul 2011)
 
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index 5ef7e9b84b16..949660c219c7 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX maildrop-1.8.1-disable-fam.patch 2511 RMD160 3fc7bf21d425c6e676475458c99a5ed2d4e93469 SHA1 7b6148b485bbc0379fa849a8af2706b93ea22432 SHA256 e4621bbe990d7a90d703e7a8b8cf07bb59655a22a96e62c275352d28c79684a3
 AUX maildrop-2.2.0-db4.patch 2509 RMD160 15d213da460130f30cdfae26686883f127dd20c9 SHA1 2a46020bd957c198306acbb695d9b92ac3c48282 SHA256 d42b04c4d8557d2c82f9dea6f176b3cd935c839bcc2ccc2212f0356cf42edecb
 AUX maildrop-2.5.1-db.patch 2498 RMD160 c39895d8df8cad8fa1a5a82657d115bb950c30af SHA1 1c7f5a3c1eae47186684a6833b3653710119bccb SHA256 9740a68669d31e7b7a234f0ddeec8604bd72dff63006ebd98018e955d94d5f8c
+AUX maildrop-testsuite.patch 2141 RMD160 3011d0fcef89cb5ca1b2e566c85b3f95a0daee5b SHA1 b7002eb05132a6dde2e5561f3437f59f5fdd0322 SHA256 ab1fc5d152bf59a1063ea51a3a25e68b0ba096c6a8842fddb7d9f2fd735c3ec2
 AUX maildroprc 58 RMD160 1d53d6c05cb809bb9d637ae347d9dee1362f1b09 SHA1 a2fd605991606a3bf89296f2d3f3a5f7a7327aba SHA256 2feec7b63d9b3fae442ddab96810929ce4080871c31a1f23401cd3b61d00add1
 DIST maildrop-2.4.2.tar.bz2 2413925 RMD160 8f7a93ab242ea83f7c9cc07abd13c0e3acae52f0 SHA1 191f580cc05a4935d9061514017713f025437c73 SHA256 e020bfebb8287ff81f9d8668e871c3c252c0e6f2a7d3c5ec21e8377131635303
 DIST maildrop-2.5.1.tar.bz2 2422151 RMD160 0ff5483790e10cc0a4658278c1154b82f2533d03 SHA1 0d44027e4a19195ab92fbb2d4b3480058690882e SHA256 3bf0d63345b5736b82720fdf0ef1b975b502749c9aed968cae4a51e1d2c3e1e9
@@ -13,23 +14,23 @@ EBUILD maildrop-2.4.2-r1.ebuild 3150 RMD160 8c362e9cb8e4092301b4d157df223e4de43c
 EBUILD maildrop-2.4.2.ebuild 2843 RMD160 949aa62027ded33663700dea267b60c3e9094f37 SHA1 04a8fe51df3bccd3cc21381a1785f34633721d00 SHA256 3780da207704b88d6fe75e049aa34a3746bded8a328427dabc2e1d20961686e8
 EBUILD maildrop-2.5.1.ebuild 2891 RMD160 32c81f58c8a46dc388487c006aeaf3b28e217a65 SHA1 872e7718a1260efb0bee45543fa19a65604f33da SHA256 b7ab48048d48ac1d7988fbe0691aa2aa7891067fc71ecf80c76f51cf1ad456a9
 EBUILD maildrop-2.5.3.ebuild 2978 RMD160 c4f9f698af140adabd1afdc5fab3bac62165535e SHA1 a1ce6c7183da491271316691e0d030d2ff3337af SHA256 9819725773e66a16be7838353fc5abc52a979f2f3e6e35c6309dd912f159e747
-EBUILD maildrop-2.5.4.ebuild 3677 RMD160 19e4b9a035bab3045515c7817dde83b2b73ce9ff SHA1 04e28ff4bd3d8d07e7988d9a5424244cb4cd918c SHA256 a39262cc6c8495f0c1a27fffcbd6cc5b4168882ad6fc12c14a2f2d9ea0ab9ebe
-MISC ChangeLog 21670 RMD160 39fecd7678dae33d9f7a1c3dfcf9c59b28e5cc9f SHA1 86c1c064a4b920e923971b938e468b1a029d26af SHA256 d64fc90c35ea00d2995ae601ced2acda6689d52330ffe28e6a8e1a271d21f0e8
+EBUILD maildrop-2.5.4.ebuild 3747 RMD160 ed14dfcbb40e4232317637dc6fab79d6d214e335 SHA1 884bb25909eda153c6cd46a3b231bae24eee1dc1 SHA256 ce9de2375398a0ab259d5a882f11d4125fb69e624539a8ace58d086045ac10cb
+MISC ChangeLog 21836 RMD160 32b4d79030d36f7298570eadc3e01373b112baa4 SHA1 466b179def496588b21354795a0f6ab1c9595ad0 SHA256 107f3096522d8299f598451d8c9504ad9bc72fde2c6789b99f76361e71b78a32
 MISC metadata.xml 313 RMD160 a54c7c17c1fb1708ba9987cdad3e1f91bafd5e7e SHA1 c030dc401f831ea71224dbec6685200e34798962 SHA256 8e4845f749808afe7959162a14069b0eb59436401ee3a2ed8661a3bdc18fb5fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOMFfrAAoJEHfx8XVYajsfzyMP/2VaWjQKCYHdkAIuOGxxOfev
-St8N5gb5xkmsomRsPW3n+ucTyDb7giGnih4S+f/zOtvHXROuFq7WQ2eRLMMY44X0
-uWcRe80AYD13zOYurcuu5iY1CVk2gKeW9nMjfu9ePBCkVceN7luYZtc9qF2LARS3
-pWQpk77suNTjhyx7VvBvJpFysGeUT1VBGnyKEvgzMMbj7wTZS6NVNRslm2x3prnR
-XUlIHdOybXHbRtVFnFmuwYL4FiHvyxWy+C+Fim6dtXQzYXs6x7whZ1BY8I1lEF5L
-a5WGCkPHqALyysH7XcjhTttVv8WXRp6tcx+7ywEzWDdYRkMWSciZBm9Fn8PflMh0
-KrBfX4dVovw/ukHwWmx9JjrwC8FNTfBFGICPh+PCRmt+UDuVekmxzfHPfA5v0yom
-AfqbgEPJ1zUtlvpZwqG01DEZ/pd6d7P16wfGrk3KbJsX9loDE18npPcQl7sDUlKY
-9VAXTP8/JiInMFv6gf5XeuhPp3sh4AEgASprcD8bJCRh3Zfr/VqxJhCB2M9/6aoY
-HB6NP7UQfQghnbQpRJm2vror2aKS9ay7vhQCLUO5knt58yiN+buWDExQfN9rRWRq
-fzQLlJbThbaa0HX/Z5qSxB8t920/n9Qx/6gHyyxJUZnHx6mN1NZ7zayx7ctz6F5M
-43Xy1n3G4WY3Z5/mpZrU
-=chDx
+iQIcBAEBCAAGBQJOM/GKAAoJEHfx8XVYajsfimsP/0VSldjrXQbPedjxxGnMQpNi
+ooGGCYKaWcf+Qg8H01jcsqayqmEmJxAES+xXbdguQkpC3mUAg3tyIAMVRoGA4L/g
+F07tUg2yx25E0XOeFtz8ofDnxwk/OuPNWpOJZdM99izKo/XoPxVPSDjoKrILw5Tp
+izm7OGv6o+DEoP3gZBXP66exv4xq7R5OWdDIlIcs+xp0cYWC7nWP1pJK6aLLQekw
+nQ9fDjA62/w879LvQSYu58931YMCZmopn6GmGJ3xCe2brUnELb113Fzi1JRFdUEO
+31bXSoBrpzlhpv2Bcb4ddweaGpweu0g8tuhBTJKVn+NmHU/Wvrs1+hA/viA1RgaL
+qHl7EtjHKtaWoUSE6+be2N8XJ249Uziu7dgzMLaJOYQG51I4AGz69xJ8wHL/Wv3o
+4CXWyDYmuuLqDAIkcQUZku2t3UKHGG8g8ZIG415CQFxrLpCipqgizIC1HZ23M7v+
+2jVTvwA3XY1eKHTTlv+/iLNjCkm2WKT1jVCCPlG82aunm4UPWI1/zOzXT2myD0hu
+klPPmWJnh8a8NkVlK2tEwdE3O1C8NvRtLBa3MJo8J8/i3ZYyR5JM/79RqSu/1PEC
+AxPXhrzCBJqh0RyjQU5y1B0WYl9vH6kPJNZKhUYHxJz9SYX0yFG/Q5OcDWm8qogs
+Okui6pY9N+bR7Xt69Xxx
+=dnyv
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/maildrop/files/maildrop-testsuite.patch b/mail-filter/maildrop/files/maildrop-testsuite.patch
new file mode 100644
index 000000000000..377fb19d151c
--- /dev/null
+++ b/mail-filter/maildrop/files/maildrop-testsuite.patch
@@ -0,0 +1,67 @@
+Need en_US.utf8 to run some tests - bug #376667
+
+--- maildrop/Makefile.am	2011-04-04 15:58:58.000000000 +0000
++++ maildrop/Makefile.am	2011-07-28 10:29:43.000000000 +0000
+@@ -75,8 +75,12 @@
+ 	maildrop.lsm testsuite.txt.idn testsuite.txt.noidn
+ 
+ check-am:
++if HAS_EN_US
+ 	@chmod +x testsuite
+ 	./testsuite | cmp -s - $(srcdir)/$(TESTSUITE)
++else
++	echo ' Need en_US.utf8 to run tests'
++endif
+ 
+ noinst_DATA=maildrop.html maildrop.1 maildropfilter.html maildropfilter.7 \
+ 	maildropgdbm.html maildropgdbm.7
+--- maildrop/configure.in	2011-05-17 20:36:04.000000000 +0000
++++ maildrop/configure.in	2011-07-28 10:58:57.000000000 +0000
+@@ -200,6 +200,15 @@
+ AC_TYPE_SIGNAL
+ AC_CHECK_FUNCS(setgroups setlocale)
+ 
++check_en_US() {
++locale -a | grep en_US.utf8 > /dev/null
++return $?
++}
++
++AC_MSG_CHECKING([for en_US.utf8])
++AM_CONDITIONAL([HAS_EN_US], [check_en_US])
++AM_COND_IF([HAS_EN_US],[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([not found])])
++
+ AC_CHECK_FUNC(getpgrp, HAS_GETPGRP=1, HAS_GETPGRP=0)
+ AC_DEFINE_UNQUOTED(HAS_GETPGRP,$HAS_GETPGRP,
+ 	[ Whether getpgrp() is available ])
+--- rfc2045/Makefile.am	2011-04-04 15:59:47.000000000 +0000
++++ rfc2045/Makefile.am	2011-07-29 09:28:41.000000000 +0000
+@@ -76,7 +76,11 @@
+ TESTSUITE=testsuite.txt.noidn
+ endif
+ 
++if HAS_EN_US
+ check-am:
+ 	@SHELL@ $(srcdir)/testsuite | cmp -s - $(srcdir)/$(TESTSUITE)
+ 	@SHELL@ $(srcdir)/testsuitemm | cmp -s - $(srcdir)/testsuitemm.txt
+ 	@SHELL@ $(srcdir)/testrfc3676parsersuite | diff -U 3 $(srcdir)/testrfc3676parsersuite.txt -
++else
++	echo ' Need en_US.utf8 to run tests'
++endif
+--- rfc2045/configure.in	2011-04-04 15:59:47.000000000 +0000
++++ rfc2045/configure.in	2011-07-29 09:28:34.000000000 +0000
+@@ -59,6 +59,15 @@
+ AC_CHECK_FUNC(strncasecmp,,CFLAGS="$CFLAGS -Dstrncasecmp=strnicmp")
+ AC_CHECK_FUNC(strcasecmp,,CFLAGS="$CFLAGS -Dstrcasecmp=stricmp")
+ 
++check_en_US() {
++locale -a | grep en_US.utf8 > /dev/null
++return $?
++}
++
++AC_MSG_CHECKING([for en_US.utf8])
++AM_CONDITIONAL([HAS_EN_US], [check_en_US])
++AM_COND_IF([HAS_EN_US],[AC_MSG_RESULT([yes])],[AC_MSG_RESULT([not found])])
++
+ AC_ARG_WITH(package, [], package="$withval",
+ 	[
+ 		package="$PACKAGE"
diff --git a/mail-filter/maildrop/maildrop-2.5.4.ebuild b/mail-filter/maildrop/maildrop-2.5.4.ebuild
index ccecb0c46b98..6f99f515be1a 100644
--- a/mail-filter/maildrop/maildrop-2.5.4.ebuild
+++ b/mail-filter/maildrop/maildrop-2.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.5.4.ebuild,v 1.4 2011/07/27 15:35:26 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.5.4.ebuild,v 1.5 2011/07/30 11:56:42 eras Exp $
 
 EAPI=4
 
@@ -60,8 +60,8 @@ src_prepare() {
 	# no need to error out if no default - it will be given to configure anyway
 	sed -i -e \
 		's~AC_MSG_ERROR(Cannot determine default mailbox)~SPOOLDIR="./.maildir"~' \
-		"${S}"/maildrop/configure.in
-
+		"${S}"/maildrop/configure.in || die "sed failed"
+	epatch "${FILESDIR}"/${PN}-testsuite.patch
 	eautoreconf
 }
 
@@ -127,7 +127,7 @@ src_install() {
 	fi
 
 	dodir "/usr/share/doc/${PF}"
-	mv "${D}/usr/share/maildrop/html" "${D}/usr/share/doc/${PF}/"
+	mv "${D}/usr/share/maildrop/html" "${D}/usr/share/doc/${PF}/" || die
 	rm -rf "${D}"/usr/share/maildrop
 
 	dohtml *.html maildir/*.html