bump and patch for bug #217637

Package-Manager: portage-2.1.5.4

7 files changed, 241 insertions, 113 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/Manifest b/mail-client/cone/Manifest
index 8508336550d6..61e98cf8ed13 100644
--- a/mail-client/cone/Manifest
+++ b/mail-client/cone/Manifest
@@ -1,13 +1,8 @@
+AUX cone-0.74-gcc43.patch 6762 RMD160 609dc4a645a63a7d727b31e24bdf9cf2bd14d83a SHA1 65df012722d8c7d2a8720948422240787497ab74 SHA256 dcfccd97c0c8fafe4f71fe5427a930828285a4d1732814691846a412985e090f
 AUX cone-dotsignature.patch 2127 RMD160 b58cf5b59f4221128f44dd5e86656bb5fa9e3991 SHA1 3912e3d7c17e3e1ff6f5adb58c91adde6936d2b9 SHA256 ec41279f615a23e4ee2a7b8317f475e0a516c4bb9e140cf5189bba1354541dbf
-DIST cone-0.57.tar.bz2 1835675 RMD160 a9fe6493d021ba1322d83f12b491c36286b4d8a3 SHA1 2594e2c571e791a754f2e5ca1556117bd47c50fe SHA256 51c4b59753f826f9d23d6109c6a98ebdd19b93b68c487c4eee07a538e88f344a
-DIST cone-0.63.tar.bz2 3564253 RMD160 e3cc1eb1f653a7b31f1934c302818d013ab895aa SHA1 e74a3dc612ca13096209abe11b8395a9fb8ed7f1 SHA256 84e3f331e15b40123db919b7d600ebe938aa8d918cd0dfd490165613491aa491
 DIST cone-0.64.tar.bz2 3569902 RMD160 c7932e1c7c8148e850c58dbca761eca28dd90556 SHA1 6731d58ed4bb8a95d55a7bd6bb6638229f355038 SHA256 c65a343988941d591aef4657022c0c1359002e2a7ac73e72a9f9b9793452cefa
-DIST cone-0.66.tar.bz2 3873931 RMD160 9f00f4752b0a7984b57eefd94a92a7f98cdd6e43 SHA1 3f05a160612af28b3f960db3fbaddecda82dda71 SHA256 2fc6e7076342f29e02777767a8efcde630039b8ae89aa46a993c2054b4606429
-DIST cone-0.69.tar.bz2 4033426 RMD160 d27d03935924eacc6b2c8467406379d406903f19 SHA1 36c5ec7d5e2ebf380f0484c34a00adced1e58f85 SHA256 bc538bf404e69dac4a3eeae54d5e4682932b09007f3617907a60f37bd74f0d07
-EBUILD cone-0.57-r1.ebuild 961 RMD160 0ba4b55613cda3e01939a6655b901f4c2a7d84a7 SHA1 1d4cc032caa096b85805bfe45cd064119773c1f6 SHA256 a570e0663291a46245fe084db764494934601198ad5da59a7df28ca4f446c477
-EBUILD cone-0.63.ebuild 806 RMD160 a1c536bfff9ce23981def89b107090450e046393 SHA1 cc484bae93613fd9db2295c42b1d89e5ead047e1 SHA256 849f358a47b92b7ddcc3d66da640dcbdf7465b534d05e77dfffaa6c5921e0384
+DIST cone-0.74.tar.bz2 4150864 RMD160 30a7d64d04426d975a602999db28e47caaa97e80 SHA1 74a68e8468494bb020da7f7fd4dc3abd1ef67b83 SHA256 a94a994b7a4996991d456a86bc5bc48e7961cc52ea30ad87115958baf24ef941
 EBUILD cone-0.64.ebuild 806 RMD160 71fe5bf4bafbbc3100a49ef96c1e0966671e0ef1 SHA1 d57a43818a7ecf591928fae95504afe4e5ff8423 SHA256 eaca794565f017201af8d1290281f2106b352db00f8dc5c11ed9e7bfafe57c90
-EBUILD cone-0.66.ebuild 807 RMD160 21d13cfdf630d04c11124d37ac023cef12975e9f SHA1 ab2dcb89568a46db627c17f39c462365c6097e59 SHA256 42bccf09835bc5e4e439cf59586d273efae41e979be424127a8239e4aa658fac
-EBUILD cone-0.69.ebuild 767 RMD160 1bd713087884e0f661bf185a2e971eae9542b097 SHA1 b8456ecbba85ad90d04f8d50d8729fa56bed0725 SHA256 1ffa81e621203c2e8b007981cc92cefe8e3746f7f05876ada2c762b6c17c16f6
-MISC ChangeLog 2680 RMD160 e6f94f0aa9cd057f28b0e0c159081d85d4579dc3 SHA1 efc9d958e40c37f51fdb0525ddc13a5e9eaaa04b SHA256 3e28e39f84e9d801991a7fa0edddb11e3538a9a0cac7d9aa682aa01d3fde378a
+EBUILD cone-0.74.ebuild 854 RMD160 49a707380dffda4bffcbf7c08f33a6411512434b SHA1 cede3ac5f7619b24e792d68c47246590fe3cbe85 SHA256 ae7e305f7f681fc5a3787af7dec61b44e1ee7b4c7b655a2f067920fdc1a09e88
+MISC ChangeLog 2924 RMD160 bb3180f19dcd798f493890d81bf30bc8d6e0bd78 SHA1 db0fe7976a033b08d8bf9c1e28dc6046edc48e8c SHA256 8c778d3a9c6ec38b453db4b54ee62bc9f8bb655ae9a555ad64701fe624e3016c
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
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.
+