bump and patch for bug #217637

(Portage version: 2.1.5.4)

6 files changed, 237 insertions, 104 deletions

diff --git a/mail-client/cone/ChangeLog b/mail-client/cone/ChangeLog
index 57ffc82d57ce..30fc401ae9e4 100644
--- a/mail-client/cone/ChangeLog
+++ b/mail-client/cone/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/cone
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/ChangeLog,v 1.16 2007/03/03 18:37:40 dirtyepic Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/ChangeLog,v 1.17 2008/06/09 09:27:29 loki_val Exp $
+
+*cone-0.74 (09 Jun 2008)
+
+  09 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/cone-0.74-gcc43.patch, -cone-0.57-r1.ebuild, -cone-0.63.ebuild,
+  -cone-0.66.ebuild, -cone-0.69.ebuild, +cone-0.74.ebuild:
+  bump and patch for bug #217637
 
 *cone-0.69 (03 Mar 2007)
 
diff --git a/mail-client/cone/cone-0.57-r1.ebuild b/mail-client/cone/cone-0.57-r1.ebuild
deleted file mode 100644
index b28529a003ed..000000000000
--- a/mail-client/cone/cone-0.57-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/cone-0.57-r1.ebuild,v 1.5 2004/12/26 18:35:45 iggy Exp $
-
-inherit eutils
-
-DESCRIPTION="COnsole News reader and Emailer"
-HOMEPAGE="http://www.courier-mta.org/cone/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~sparc x86"
-IUSE="crypt fam spell"
-
-RDEPEND="virtual/libc
-	>=dev-libs/openssl-0.9.6
-	dev-libs/libxml2
-	fam? ( virtual/fam )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )
-	spell? ( virtual/aspell-dict )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/cone-dotsignature.patch
-}
-
-src_compile() {
-	econf --with-devel || die
-	emake || die
-}
-
-src_install() {
-	make check DESTDIR=${D} || die
-	make install DESTDIR=${D} || die
-	DESTDIR=${D} make install-configure || die
-	dosed "3i export LANG=en_US" /usr/bin/cone
-}
diff --git a/mail-client/cone/cone-0.63.ebuild b/mail-client/cone/cone-0.63.ebuild
deleted file mode 100644
index 13379663c808..000000000000
--- a/mail-client/cone/cone-0.63.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/cone-0.63.ebuild,v 1.3 2005/06/05 11:50:01 hansmi Exp $
-
-DESCRIPTION="CONE: COnsole News reader and Emailer"
-HOMEPAGE="http://www.courier-mta.org/cone/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc ~sparc x86"
-IUSE="crypt fam spell"
-
-RDEPEND="virtual/libc
-	>=dev-libs/openssl-0.9.6
-	dev-libs/libxml2
-	fam? ( virtual/fam )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )
-	spell? ( virtual/aspell-dict )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-src_install() {
-	make check DESTDIR=${D} || die
-	make install DESTDIR=${D} || die
-	DESTDIR=${D} make install-configure || die
-
-	dosed "3i export LANG=en_US" /usr/bin/cone
-}
diff --git a/mail-client/cone/cone-0.66.ebuild b/mail-client/cone/cone-0.66.ebuild
deleted file mode 100644
index 4592240127f6..000000000000
--- a/mail-client/cone/cone-0.66.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/cone-0.66.ebuild,v 1.1 2006/04/26 20:11:26 ticho Exp $
-
-DESCRIPTION="CONE: COnsole News reader and Emailer"
-HOMEPAGE="http://www.courier-mta.org/cone/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86"
-IUSE="crypt fam spell"
-
-RDEPEND="virtual/libc
-	>=dev-libs/openssl-0.9.6
-	dev-libs/libxml2
-	fam? ( virtual/fam )
-	crypt? ( >=app-crypt/gnupg-1.0.4 )
-	spell? ( virtual/aspell-dict )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-src_install() {
-	make check DESTDIR=${D} || die
-	make install DESTDIR=${D} || die
-	DESTDIR=${D} make install-configure || die
-
-	dosed "3i export LANG=en_US" /usr/bin/cone
-}
diff --git a/mail-client/cone/cone-0.69.ebuild b/mail-client/cone/cone-0.74.ebuild
index 28b552c0c0a0..2835af74333f 100644
--- a/mail-client/cone/cone-0.69.ebuild
+++ b/mail-client/cone/cone-0.74.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/cone-0.69.ebuild,v 1.1 2007/03/03 18:37:40 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/cone-0.74.ebuild,v 1.1 2008/06/09 09:27:29 loki_val Exp $
+
+inherit eutils
 
 DESCRIPTION="CONE: COnsole News reader and Emailer"
 HOMEPAGE="http://www.courier-mta.org/cone/"
@@ -19,8 +21,13 @@ RDEPEND=">=dev-libs/openssl-0.9.6
 DEPEND="${RDEPEND}
 	dev-lang/perl"
 
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+}
+
 src_install() {
-	emake install DESTDIR=${D} || die
+	emake install DESTDIR="${D}" || die
 	DESTDIR=${D} emake install-configure || die
 
 	dosed "3i export LANG=en_US" /usr/bin/cone
diff --git a/mail-client/cone/files/cone-0.74-gcc43.patch b/mail-client/cone/files/cone-0.74-gcc43.patch
new file mode 100644
index 000000000000..939e9d1802ff
--- /dev/null
+++ b/mail-client/cone/files/cone-0.74-gcc43.patch
@@ -0,0 +1,218 @@
+diff -up cone-0.74/cone/nntpcommand.C.gcc43 cone-0.74/cone/nntpcommand.C
+--- cone-0.74/cone/nntpcommand.C.gcc43	2008-03-28 23:58:51.000000000 -0400
++++ cone-0.74/cone/nntpcommand.C	2008-03-28 23:59:10.000000000 -0400
+@@ -9,9 +9,10 @@
+ #include "nntpcommand.H"
+ #include "libmail/addmessage.H"
+ #include "gettext.H"
+-#include <errno.h>
+-#include <stdio.h>
++#include <cerrno>
++#include <cstdio>
+ #include <cstdlib>
++#include <cstring>
+ 
+ #include <sys/types.h>
+ #if HAVE_UNISTD_H
+diff -up cone-0.74/cone/tags.C.gcc43 cone-0.74/cone/tags.C
+--- cone-0.74/cone/tags.C.gcc43	2008-03-28 23:59:32.000000000 -0400
++++ cone-0.74/cone/tags.C	2008-03-28 23:59:44.000000000 -0400
+@@ -9,6 +9,7 @@
+ #include "tags.H"
+ #include "gettext.H"
+ #include <sstream>
++#include <cstring>
+ 
+ using namespace std;
+ 
+diff -up cone-0.74/cone/spellcheckerAspell.C.gcc43 cone-0.74/cone/spellcheckerAspell.C
+--- cone-0.74/cone/spellcheckerAspell.C.gcc43	2008-03-29 00:00:31.000000000 -0400
++++ cone-0.74/cone/spellcheckerAspell.C	2008-03-29 00:00:49.000000000 -0400
+@@ -9,7 +9,8 @@
+ #include "spellcheckerAspell.H"
+ #include "libmail/mail.H"
+ 
+-#include <errno.h>
++#include <cerrno>
++#include <cstring>
+ 
+ #if HAVE_ASPELL_CONFIG_HH
+ #include "aspell/suggest.hh"
+diff -up cone-0.74/cone/gettext.C.gcc43 cone-0.74/cone/gettext.C
+--- cone-0.74/cone/gettext.C.gcc43	2008-03-28 23:57:20.000000000 -0400
++++ cone-0.74/cone/gettext.C	2008-03-28 23:57:49.000000000 -0400
+@@ -6,14 +6,15 @@
+ */
+ 
+ #include "gettext.H"
+-#include <ctype.h>
+-#include <stdlib.h>
++#include <cctype>
++#include <cstdlib>
+ #include <unistd.h>
+ #include <sstream>
+ #include <algorithm>
+ #include "unicode/unicode.h"
+ #include "libmail/mail.H"
+-#include <errno.h>
++#include <cerrno>
++#include <cstring>
+ 
+ #if HAVE_LANGINFO_H
+ #include <langinfo.h>
+diff -up cone-0.74/cone/spellcheckerPspell.C.gcc43 cone-0.74/cone/spellcheckerPspell.C
+--- cone-0.74/cone/spellcheckerPspell.C.gcc43	2008-03-29 00:00:00.000000000 -0400
++++ cone-0.74/cone/spellcheckerPspell.C	2008-03-29 00:00:15.000000000 -0400
+@@ -9,7 +9,8 @@
+ #include "spellcheckerPspell.H"
+ #include "libmail/mail.H"
+ 
+-#include <errno.h>
++#include <cerrno>
++#include <cstring>
+ 
+ using namespace std;
+ 
+diff -up cone-0.74/libmail/attachments.C.gcc43 cone-0.74/libmail/attachments.C
+--- cone-0.74/libmail/attachments.C.gcc43	2008-03-28 23:46:09.000000000 -0400
++++ cone-0.74/libmail/attachments.C	2008-03-29 00:02:57.000000000 -0400
+@@ -11,10 +11,11 @@
+ #include "rfc2045/rfc2045charset.h"
+ #include <sys/time.h>
+ #include "attachments.H"
+-#include <stdio.h>
+-#include <stdlib.h>
++#include <cstring>
++#include <cstdlib>
++#include <cstdio>
+ #include <unistd.h>
+-#include <errno.h>
++#include <cerrno>
+ #include <sstream>
+ #include <iomanip>
+ 
+diff -up cone-0.74/libmail/fd.C.gcc43 cone-0.74/libmail/fd.C
+--- cone-0.74/libmail/fd.C.gcc43	2008-03-28 23:47:28.000000000 -0400
++++ cone-0.74/libmail/fd.C	2008-03-28 23:47:57.000000000 -0400
+@@ -21,6 +21,7 @@
+ 
+ #include	<iostream>
+ #include	<sstream>
++#include	<cstdlib>
+ 
+ using namespace std;
+ 
+diff -up cone-0.74/libmail/mimetypes.C.gcc43 cone-0.74/libmail/mimetypes.C
+--- cone-0.74/libmail/mimetypes.C.gcc43	2008-03-28 23:50:35.000000000 -0400
++++ cone-0.74/libmail/mimetypes.C	2008-03-28 23:51:28.000000000 -0400
+@@ -8,7 +8,8 @@
+ #include "mimetypes.H"
+ #include "namespace.H"
+ #include <fstream>
+-#include <ctype.h>
++#include <cctype>
++#include <cstring>
+ 
+ using namespace std;
+ 
+diff -up cone-0.74/libmail/addmessageimport.C.gcc43 cone-0.74/libmail/addmessageimport.C
+--- cone-0.74/libmail/addmessageimport.C.gcc43	2008-03-28 23:43:31.000000000 -0400
++++ cone-0.74/libmail/addmessageimport.C	2008-03-29 00:03:19.000000000 -0400
+@@ -7,7 +7,8 @@
+ #include "libmail_config.h"
+ #include "addmessage.H"
+ #include "attachments.H"
+-#include <errno.h>
++#include <cerrno>
++#include <cstring>
+ 
+ using namespace std;
+ 
+diff -up cone-0.74/libmail/addressbookadd.C.gcc43 cone-0.74/libmail/addressbookadd.C
+--- cone-0.74/libmail/addressbookadd.C.gcc43	2008-03-28 23:45:33.000000000 -0400
++++ cone-0.74/libmail/addressbookadd.C	2008-03-29 00:04:00.000000000 -0400
+@@ -13,9 +13,10 @@
+ #include "rfcaddr.H"
+ #include "misc.H"
+ #include "unicode/unicode.h"
+-#include <ctype.h>
++#include <cctype>
+ #include <vector>
+-#include <errno.h>
++#include <cerrno>
++#include <cstring>
+ 
+ using namespace std;
+ 
+diff -up cone-0.74/libmail/rfc2047decode.C.gcc43 cone-0.74/libmail/rfc2047decode.C
+--- cone-0.74/libmail/rfc2047decode.C.gcc43	2008-03-28 23:52:50.000000000 -0400
++++ cone-0.74/libmail/rfc2047decode.C	2008-03-28 23:53:00.000000000 -0400
+@@ -9,6 +9,7 @@
+ #include "rfc2047decode.H"
+ #include "rfc822/rfc2047.h"
+ #include "mail.H"
++#include <cstring>
+ 
+ using namespace std;
+ 
+diff -up cone-0.74/libmail/addmessageremoveattachments.C.gcc43 cone-0.74/libmail/addmessageremoveattachments.C
+--- cone-0.74/libmail/addmessageremoveattachments.C.gcc43	2008-03-28 23:44:28.000000000 -0400
++++ cone-0.74/libmail/addmessageremoveattachments.C	2008-03-29 00:04:43.000000000 -0400
+@@ -8,7 +8,8 @@
+ #include "addmessage.H"
+ #include "attachments.H"
+ #include "headers.H"
+-#include <errno.h>
++#include <cerrno>
++#include <cstring>
+ #include <vector>
+ 
+ using namespace std;
+diff -up cone-0.74/libmail/sortfolders.C.gcc43 cone-0.74/libmail/sortfolders.C
+--- cone-0.74/libmail/sortfolders.C.gcc43	2008-03-28 23:55:00.000000000 -0400
++++ cone-0.74/libmail/sortfolders.C	2008-03-28 23:55:11.000000000 -0400
+@@ -6,6 +6,7 @@
+ */
+ #include "libmail_config.h"
+ #include "mail.H"
++#include <cstring>
+ 
+ mail::folder::sort::sort(bool foldersFirstArg) // TRUE: sort folders first
+ 	: foldersFirst(foldersFirstArg)
+diff -up cone-0.74/libmail/addressbook.C.gcc43 cone-0.74/libmail/addressbook.C
+--- cone-0.74/libmail/addressbook.C.gcc43	2008-03-28 23:45:00.000000000 -0400
++++ cone-0.74/libmail/addressbook.C	2008-03-29 00:05:01.000000000 -0400
+@@ -13,7 +13,8 @@
+ #include "addressbooksearch.H"
+ #include "rfc2047decode.H"
+ #include "misc.H"
+-#include <errno.h>
++#include <cerrno>
++#include <cstring>
+ 
+ using namespace std;
+ 
+diff -up cone-0.74/libmail/fdtls.C.gcc43 cone-0.74/libmail/fdtls.C
+--- cone-0.74/libmail/fdtls.C.gcc43	2008-03-28 23:48:21.000000000 -0400
++++ cone-0.74/libmail/fdtls.C	2008-03-28 23:48:32.000000000 -0400
+@@ -6,6 +6,7 @@
+ */
+ #include "libmail_config.h"
+ #include "fdtls.H"
++#include <cstdlib>
+ 
+ #if HAVE_LIBCOURIERTLS
+ 
+diff -up cone-0.74/libmail/addmessage.C.gcc43 cone-0.74/libmail/addmessage.C
+--- cone-0.74/libmail/addmessage.C.gcc43	2004-06-22 20:55:25.000000000 -0400
++++ cone-0.74/libmail/addmessage.C	2008-03-29 00:05:15.000000000 -0400
+@@ -7,7 +7,8 @@
+ #include "libmail_config.h"
+ #include "addmessage.H"
+ #include "attachments.H"
+-#include <errno.h>
++#include <cerrno>
++#include <cstring>
+ 
+ // Default method implementation.
+