Bump to EAPI 2 and fix build w/ GCC 4.5 (bug #321659).

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 34 insertions, 10 deletions

diff --git a/mail-client/cone/ChangeLog b/mail-client/cone/ChangeLog
index e1c838d15d50..aa41dcdb9700 100644
--- a/mail-client/cone/ChangeLog
+++ b/mail-client/cone/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/cone
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/ChangeLog,v 1.22 2009/07/11 11:47:54 tove Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/ChangeLog,v 1.23 2010/08/01 22:04:13 dirtyepic Exp $
+
+  01 Aug 2010; Ryan Hill <dirtyepic@gentoo.org> cone-0.79.ebuild,
+  +files/cone-0.79-gcc45.patch:
+  Bump to EAPI 2 and fix build w/ GCC 4.5 (bug #321659).
 
   11 Jul 2009; Torsten Veller <tove@gentoo.org> -cone-0.64.ebuild,
   -files/cone-dotsignature.patch:
diff --git a/mail-client/cone/Manifest b/mail-client/cone/Manifest
index 58f5eff77d85..f9bb7adb673f 100644
--- a/mail-client/cone/Manifest
+++ b/mail-client/cone/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX cone-0.74-gcc43.patch 6762 RMD160 609dc4a645a63a7d727b31e24bdf9cf2bd14d83a SHA1 65df012722d8c7d2a8720948422240787497ab74 SHA256 dcfccd97c0c8fafe4f71fe5427a930828285a4d1732814691846a412985e090f
+AUX cone-0.79-gcc45.patch 380 RMD160 c52b9c706e39abed142da4d02d0afcd3ab42566f SHA1 0055302bf293571c51a2b9ba2ca079328df73471 SHA256 f30efabc11341ed7d7cb8ccc816796af7a8fed705f7585d0f224f37a28479183
 DIST cone-0.74.tar.bz2 4150864 RMD160 30a7d64d04426d975a602999db28e47caaa97e80 SHA1 74a68e8468494bb020da7f7fd4dc3abd1ef67b83 SHA256 a94a994b7a4996991d456a86bc5bc48e7961cc52ea30ad87115958baf24ef941
 DIST cone-0.79.tar.bz2 4120869 RMD160 7d48955e95a792d5b3e55c207c81a0911b53085e SHA1 621a6ef628de355223882212f2eac3daa5f21607 SHA256 8f0cf2ddd19e8ce2a1243a427d315a4a91cf6d6affe75c57e8b60f91583e5182
 EBUILD cone-0.74.ebuild 856 RMD160 ac4a99ef582859c1bf73f94f57c6b887ff029da2 SHA1 f42571ceb3dcfd7386c7b727f18ee04aba0b1400 SHA256 02669aed5f3330ec4182a9970b9b38d252d4e30d2d76a5c6002afb4cb9d03936
-EBUILD cone-0.79.ebuild 849 RMD160 31fe563fd0912a8c6f3002afcc23f672bcb921eb SHA1 0d71aeb7f654bc48b05eae063c0cc7edb794a17f SHA256 16fe7d02de3ad9ed133964906423ebce07608aba49068251200c8e8c69951416
-MISC ChangeLog 3470 RMD160 b42c9bfd2034003d438983910c976da4abf9bd04 SHA1 46bcb48ba14d75fc7aacc98de0594e8faf22a219 SHA256 033f88ce289a5fcf946d0d2f619308380abe27e1aab5bdcb20b76aedb26f26ed
+EBUILD cone-0.79.ebuild 927 RMD160 97293d64d71cff1ddbb9bbf3b32be06f29de9a7c SHA1 b6c78acf21dc2db00875a3220dc5c9b4c9131dea SHA256 e12b66597474696692434eb1a13eebdc9d23b46136b15f5dc6a6638e21aead21
+MISC ChangeLog 3631 RMD160 23ad0dbe0cad9e48a61bd49150c4ef733dd4ece6 SHA1 3141aaaff393de289c1ae822d2066a8b410ccd6f SHA256 15cb24312264d60841fe1fd23da5fdf66d70b58f158280eed21c4c39604f857d
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkpYe/AACgkQV3J2n04Eauw7VgCeJaqrM3QyFZvYJDNE3n0Q7GVy
-++kAoJdJJq2G3XvyV/A70FKHcKgdWXkN
-=0WAx
+iEYEARECAAYFAkxV8FIACgkQiqiDRvmkBmJ8JwCgnmA92DU7d2e4zBcC0SPWl1nV
+DJAAn3XUBU5O5E4c/P2t9QgJ/EmpQoDw
+=h7El
 -----END PGP SIGNATURE-----
diff --git a/mail-client/cone/cone-0.79.ebuild b/mail-client/cone/cone-0.79.ebuild
index 8cd032ec29f8..e1ebae33e98f 100644
--- a/mail-client/cone/cone-0.79.ebuild
+++ b/mail-client/cone/cone-0.79.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.79.ebuild,v 1.1 2009/07/11 11:44:01 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/cone/cone-0.79.ebuild,v 1.2 2010/08/01 22:04:13 dirtyepic Exp $
+
+EAPI="2"
 
 inherit eutils
 
@@ -21,6 +23,10 @@ RDEPEND=">=dev-libs/openssl-0.9.6
 DEPEND="${RDEPEND}
 	dev-lang/perl"
 
+src_prepare() {
+	epatch "${FILESDIR}"/cone-0.79-gcc45.patch
+}
+
 src_install() {
 	emake install DESTDIR="${D}" || die
 	DESTDIR="${D}" emake install-configure || die
diff --git a/mail-client/cone/files/cone-0.79-gcc45.patch b/mail-client/cone/files/cone-0.79-gcc45.patch
new file mode 100644
index 000000000000..50f09b05bee0
--- /dev/null
+++ b/mail-client/cone/files/cone-0.79-gcc45.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/321659
+
+--- a/libmail/headers.C
++++ b/libmail/headers.C
+@@ -86,7 +86,7 @@ string mail::Header::encoded::encode(string text, string charset, string lang)
+ 	if (lang.size() > 0)
+ 		charset += "*" + lang;
+ 
+-	return mail::rfc2047::encode::encode(text, charset);
++	return mail::rfc2047::encode(text, charset);
+ }
+ 
+ mail::Header::encoded::encoded(string name,