Skip the rfc2045 test since it requires the en_US.utf-8 locale. Remove old patch.

(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)

4 files changed, 23 insertions, 45 deletions

diff --git a/mail-client/cone/ChangeLog b/mail-client/cone/ChangeLog
index a4a029fddb35..8719fa5f8ee6 100644
--- a/mail-client/cone/ChangeLog
+++ b/mail-client/cone/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/cone
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/ChangeLog,v 1.31 2010/11/15 02:37:53 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/ChangeLog,v 1.32 2010/11/24 12:57:01 radhermit Exp $
+
+  24 Nov 2010; Tim Harder <radhermit@gentoo.org> cone-0.84.20100819-r1.ebuild,
+  -files/cone-0.84.20100819-rfc2045-tests-lang.patch,
+  +files/cone-0.84.20100819-skip-rfc2045-test.patch:
+  Skip the rfc2045 test since it requires the en_US.utf-8 locale. Remove old
+  patch.
 
   15 Nov 2010; Tim Harder <radhermit@gentoo.org>
   cone-0.84.20100819-r1.ebuild,
diff --git a/mail-client/cone/cone-0.84.20100819-r1.ebuild b/mail-client/cone/cone-0.84.20100819-r1.ebuild
index cb4a94de77ef..583d5f2da25e 100644
--- a/mail-client/cone/cone-0.84.20100819-r1.ebuild
+++ b/mail-client/cone/cone-0.84.20100819-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/cone-0.84.20100819-r1.ebuild,v 1.2 2010/11/15 02:37:53 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/cone-0.84.20100819-r1.ebuild,v 1.3 2010/11/24 12:57:01 radhermit Exp $
 
 EAPI="2"
 
@@ -30,10 +30,13 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-aspell-automagic.patch
-	epatch "${FILESDIR}"/${P}-rfc2045-tests-lang.patch
+	epatch "${FILESDIR}"/${P}-skip-rfc2045-test.patch
 
-	cd cone
+	cd "${S}"/cone
 	LIBTOOLIZE="true" eautoreconf
+
+	cd "${S}"/rfc2045
+	eautomake
 }
 
 src_configure() {
diff --git a/mail-client/cone/files/cone-0.84.20100819-rfc2045-tests-lang.patch b/mail-client/cone/files/cone-0.84.20100819-rfc2045-tests-lang.patch
deleted file mode 100644
index aa00d553b259..000000000000
--- a/mail-client/cone/files/cone-0.84.20100819-rfc2045-tests-lang.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- cone-0.84.20100819/rfc2045/testsuite.orig	2010-11-14 13:37:06.025969423 -0800
-+++ cone-0.84.20100819/rfc2045/testsuite	2010-11-14 13:37:23.489105624 -0800
-@@ -56,7 +56,7 @@
- 
- --aaa---
- EOF
--LANG=en_US.utf-8 ./reformime -i <testsuite.dat | sed 's/^charset:.*/charset: iso-8859-1/'
-+./reformime -i <testsuite.dat | sed 's/^charset:.*/charset: iso-8859-1/'
- 
- echo "foo" >confmdtest
- 
-@@ -65,7 +65,7 @@
- ./makemime -c application/octet-stream -C utf-8 -N footest:1 confmdtest
- ./makemime -c application/octet-stream -C utf-8 -N f:::::::::::::::::::::::::1 confmdtest
- 
--LANG=en_US.utf-8 ./reformime -h '=?iso-8859-1?Q?H=F3la!?= test =?iso-8859-1?Q?H=F3la!_?=  =?iso-8859-1?Q?H=F3la!?=  test'
-+./reformime -h '=?iso-8859-1?Q?H=F3la!?= test =?iso-8859-1?Q?H=F3la!_?=  =?iso-8859-1?Q?H=F3la!?=  test'
- rm -f confmdtest
- 
- cat >testsuite.dat <<EOF
-@@ -77,13 +77,13 @@
- 
- testing
- EOF
--LANG=en_US.utf-8 ./reformime -i <./testsuite.dat
--LANG=en_US.utf-8 ./reformime -H '=?iso-8859-1?Q?H=F3la!?= test <test1@example.com>'
--LANG=en_US.utf-8 ./reformime -H '=?iso-8859-1?Q?H=F3la=22?= test <test1@example.com>'
--LANG=en_US.utf-8 ./reformime -O 'Hóla <user@Hóla.example.com>, user@example.com (Hóla), John Smith <user@example.com>, user2@example.com, "John Smith (Accounting)" <user3@example.com>, "Hóla Smith (Accounting)" <user4@example.com>, john smith <user@hóla.example.com>'
-+./reformime -i <./testsuite.dat
-+./reformime -H '=?iso-8859-1?Q?H=F3la!?= test <test1@example.com>'
-+./reformime -H '=?iso-8859-1?Q?H=F3la=22?= test <test1@example.com>'
-+./reformime -O 'Hóla <user@Hóla.example.com>, user@example.com (Hóla), John Smith <user@example.com>, user2@example.com, "John Smith (Accounting)" <user3@example.com>, "Hóla Smith (Accounting)" <user4@example.com>, john smith <user@hóla.example.com>'
- 
--LANG=en_US.utf-8 ./reformime -H '=?UTF-8?B?SMOzbGE=?= <user@xn--hla-gna.example.com>, =?UTF-8?B?SMOzbGE=?= <user@example.com>, John Smith <user@example.com>, user2@example.com, "John Smith (Accounting)" <user3@example.com>, =?UTF-8?B?SMOzbGE=?= Smith =?UTF-8?B?KEFjY291bnRpbmcp?= <user4@example.com>, john smith <user@xn--hla-gna.example.com>'
-+./reformime -H '=?UTF-8?B?SMOzbGE=?= <user@xn--hla-gna.example.com>, =?UTF-8?B?SMOzbGE=?= <user@example.com>, John Smith <user@example.com>, user2@example.com, "John Smith (Accounting)" <user3@example.com>, =?UTF-8?B?SMOzbGE=?= Smith =?UTF-8?B?KEFjY291bnRpbmcp?= <user4@example.com>, john smith <user@xn--hla-gna.example.com>'
- 
--LANG=en_US.utf-8 ./reformime -H 'list: address1 <address1@example.com>, address2 <address2@example.com>;'
-+./reformime -H 'list: address1 <address1@example.com>, address2 <address2@example.com>;'
- 
--LANG=en_US.utf-8 ./reformime -O 'list: address1 <address1@example.com>, address2 <address2@example.com>;'
-+./reformime -O 'list: address1 <address1@example.com>, address2 <address2@example.com>;'
diff --git a/mail-client/cone/files/cone-0.84.20100819-skip-rfc2045-test.patch b/mail-client/cone/files/cone-0.84.20100819-skip-rfc2045-test.patch
new file mode 100644
index 000000000000..1af7f6fac1c5
--- /dev/null
+++ b/mail-client/cone/files/cone-0.84.20100819-skip-rfc2045-test.patch
@@ -0,0 +1,10 @@
+--- cone-0.84.20100819/rfc2045/Makefile.am.orig	2010-11-24 04:28:50.883207159 -0800
++++ cone-0.84.20100819/rfc2045/Makefile.am	2010-11-24 04:29:03.165333396 -0800
+@@ -73,5 +73,5 @@
+ TESTSUITE=testsuite.txt.noidn
+ endif
+ 
+-check-am:
+-	@SHELL@ $(srcdir)/testsuite | cmp -s - $(srcdir)/$(TESTSUITE)
++#check-am:
++#    @SHELL@ $(srcdir)/testsuite | cmp -s - $(srcdir)/$(TESTSUITE)