Fix by Martin von Gagern for building w/readline-6.3 #503954.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 64 insertions, 19 deletions

diff --git a/net-mail/mailutils/ChangeLog b/net-mail/mailutils/ChangeLog
index 96279e7577f5..15c222ffdd60 100644
--- a/net-mail/mailutils/ChangeLog
+++ b/net-mail/mailutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/mailutils
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.68 2013/10/28 13:27:50 eras Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.69 2014/03/10 00:33:37 vapier Exp $
+
+  10 Mar 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/mailutils-2.99.98-readline-6.3.patch, mailutils-2.99.98.ebuild:
+  Fix by Martin von Gagern for building w/readline-6.3 #503954.
 
   28 Oct 2013; Eray Aslan <eras@gentoo.org>
   -files/mailutils-2.99.97-gsasl.patch, -mailutils-2.99.97.ebuild:
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 44bda5dcefdd..4ee3826b4baa 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -5,26 +5,27 @@ AUX comsatd.initd 568 SHA256 8b22fb61477e7c1f20ca8b6913c5ce34a38c48a9b31b6020f90
 AUX imap4d.initd 565 SHA256 0f9908e69ce20c4de3f7ec9eab2df765e1854264b04eee6c9f314ccb2f08f432 SHA512 d867a4206bea3059d1bf1f6d0672c582d7e428fad3688598162b3e8cd728bc59230dba1031668f68a48915fe161e14fb3b68883595e3a45f192803d3a9917e28 WHIRLPOOL f52ae4a9b090add8d6b92753d91a41de84d30030f8b182094592ba738436ab11a10e4c4bac9e77ddfb7129c2c277851452f2d968370d161d10e839e1f1fd9fa3
 AUX mail 82 SHA256 639caffcadbe11530f2296cf22f155b1204b7cb51b952b868467be40fb4dfa85 SHA512 80080a3118ed66cfde44ad3663e4b07bcd5fe756b86a213ea4e1ab86e27f8485dcf02af3ee6b7f6f12105a267b9619376668e0cb6e60743ffb7664d2dbea9144 WHIRLPOOL 3205ffeb942b2d89d639baa219a2c40395ba85430aba8a347dc65b109a3a52f0e4eb3c67219bef22d6fa2adc88647eee34ebdaac694e21645d260d7a905f1c81
 AUX mailutils-2.99.98-array_bounds.patch 271 SHA256 51e146ed31205d565d6a7357de4977b02af7979e17467e31dc88210ee2fce448 SHA512 01de8bdaa7af244434fdbc5df9652f0127865d96b1e5f7b3495d4191c6dc53383d5246d8183efc913ae606b609141e9440d37afd8028278cc054840f039c5c5c WHIRLPOOL 1f6334678eabe598a622164334ff13f9e0452442b610de8b333c4e7695151985b9c3ae971f7cfe49be28462b7a895df56e48294608f9f260d0fc7a28cb08d095
+AUX mailutils-2.99.98-readline-6.3.patch 1321 SHA256 616b40e493496d8a7d9224e84b27c572c7bee51a789bbd687aa3e0f11665cd41 SHA512 cba6cd29af43b84bb9f13c6850756408e942b5cdf512f04582b3b3ae8e5532c615f8ed71cd8c19088aff4ef30f41861efab6e419d2300f99ad85f8b6abf30fa5 WHIRLPOOL 30312962f103bb2f10c43467d78a763826a1f27acf5932bb00b17f3ee0aa86f96ae0a4215c09361a3ac5ebbc76771a75688c3970b9f3a0d8403099cdfe138761
 AUX mailutils.rc 258 SHA256 a8618dcea1117d62e728ad8036018063a59e20bba0e6e23ce17ec9f498fa9220 SHA512 691bcc81fd355d8f2776e72006c149996273579e099f24970ff0c5dd6bdf65cd64e31597f8b3d8e0a900a91c3325b8d2a1a96682a9b3ff53acd41218fe8721fe WHIRLPOOL fb690a12d7b9687b3f9b785fab3c849b8bb8170f1c313fe5bd580bb3a9783f105da7c131d3e8fca659de01c7d6924bde42a15ab77ab88701ca373a186bb835dd
 AUX pop3d.initd 562 SHA256 769aa3a795ab795d2dde78446001e9fc042d49507cd843603dbb95bd214f40c4 SHA512 b114666cbc399597d3fd8e8beb36845778828c5ec7fb6bac7e17e173886bc958fea6ecad9df631cdabdebd8edaa7d0c58295717be4d0ad4de5e55de352d33c27 WHIRLPOOL 0b9e4c00e6e2ee1f5ae9c764e93ae175abdfbcd0825a376351d6f34ee3cf6bb5486619d4d41dbc42f9ede1e903926e4a16c1eaedef50bc73ddcab8edd0b70672
 DIST mailutils-2.99.98.tar.xz 2505252 SHA256 62e2c28aed77e451e05ed15e68b5abc3932bcc3d2d6caf9b4a6864258c6a7b1a SHA512 fc20d97b3eed0f0ff7f1d7885e59f8de6ffd5b4646cd06c3636bda4a6bc9f7a0d5acdc7bb3bb573cdc80d63dfdc0be6464033ef2f6d88514bd2190f6611a1083 WHIRLPOOL c0f6f4f9dc2d60074c06a6c8f604fa4d92df4dafd6e205df8c360e97663e96c9b64a02aab9af7eab0659abc39e8aed70bbb0761b7d5a21b5873beabbcd409030
-EBUILD mailutils-2.99.98.ebuild 3300 SHA256 5ced39223406fb00095f86c410a7e4d529280d7137b0780e840519535c15c32a SHA512 3b37bc621e073e52f5c0fc5065eec606cae0bc7b8d3f91e239e7e47e05d3f6db6b6d9d9a41ce26567c230bc6a130bf865572d30115b0f09820d81145370cce85 WHIRLPOOL 2754b412f77242fde728f97e8e8ddf7e100e9a4314baab5c054818e16872c3b47f2755bc740869a1896b72a6a0e4ad9d81c4f1ed38b527cf7812ebbcfe25603e
-MISC ChangeLog 9689 SHA256 580ce01cff55066259b0bb2dd1dbd801b7b0951655824041a6e420491c3c5eab SHA512 82baa70b4aac21c0384c7d993cbb3573dbcf2aeab0daf34c0538a71681db470d58f6514eaa07df50504ddedddffea07c33b1bd1706db366e5bba669e1fbfee4c WHIRLPOOL cf5bd9300a0a6d8de25cd81d0a0a23d7c732d61d5cfddeaa9f3fee8a5096024833904d10a41a1ec068ff3e3b9a1c29342fbdeed5f79d6020bfc81f5a87e50ead
+EBUILD mailutils-2.99.98.ebuild 3357 SHA256 3c1d0752058d5c21e732fa5a2b9ac56ca4b85763512d8380278a49cef4b1c173 SHA512 f1b92be80ba6e86f12b297b44b6228809d5d3d4f912c23707360917c7bee7dcfff64b3a82bd0b435c95a7204256f025bdf92125bebf034bce73c74913728ff82 WHIRLPOOL 15f06767e9b72f6b106b53c6550e11acf53c5e0d23c7680daaaa8028c2268a87a4d7924ad9057502a83ee5ed011b317dc50c4768caad91fd91bec92f517827a4
+MISC ChangeLog 9879 SHA256 558d6cdff5bb025f36af6d764b2e21a92edef270dfbfb5f186add70926282b25 SHA512 dce52c640bec32defc30b86a955dd00ca37d1c5c2f1e126ac12940822bed52114aa18cb4518d1869b153fb1b575a56962700dbda578b4b023b818b7e4415cf7d WHIRLPOOL 662012dd2cb21703ff17d9d8493e33062bca982b474183adcf6d1e334daa7fb4e2303a311b687048593b62b52bcdd94d41d4c9a4c828c7621bf83f56373a033d
 MISC metadata.xml 444 SHA256 d43fe8d68603ba44e6e9092debc5f0e5d39049b2e9e3c37ecb802077cd4343ae SHA512 d67ebfe0bee72f6426ab4b0abc2a17e8021974321a283432d3d1161912c47e202d4c7cc152261243779985a2f0715d107e45dea68d56c5256ddbe3f823bef390 WHIRLPOOL 28487fdb3a815f2d75678f81adf69916a1f38f037d7934d4854682af44fbc2ae5e3347f74cbacabbc23e5115ab1aeb789d7ae0779f034a45862a6ff19d0530c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSbmZfAAoJEHfx8XVYajsfE4wP/0lFk37SNiRw75s0yQRDFgxd
-LsmyCuonChx3w/+gMM2QUB7s7vc7ui5buR9wUBEm/M1Y60dI52WLpG1/884wYG9K
-j/xlvabJohLKwk63hEfT6b4KVwGJrx9EMOSwbHG8rhMwke2d3AfXvkDL5b5nRV/B
-vx7eotnZtNt/zTwgrz6xBKA9ds8gPqMgaTATzslm6m7Mp6Kp01xHkhf/QPzUecQZ
-fmKB9yFW6L1nOaf+4Z4NYmCVyyMsjKurRasIwjt1URglTAB/SPcyeIYLsjieryyf
-ffOZrTvj2oO3Wpr6AN+Ja4CQDQF0t1kPMhUWUE8Bx8hUQheQeMdSFCF0tjcwWz/n
-2hqrXKD5xrmmjLMYWlOOo8BLg9He7UOlqTmFz3FYHdKxFZlShrfu4kO4L5qYGvn8
-JAKT+x3Ea/M9NkEFnyasiFqWV5vyNe2+DAgXYdgqT7NSdsxzpllayjE7ZCdnHao0
-UZ1OkBeFqdWjHn4FFrxDuvFEqfR+UR2wAWvSDOa7Hta9oyS6jiiFkcHALWerAQeI
-Es+F3BgX4pDCL8vm59srSYT5jq0pezZRXh+5eSUfUOGt9A6ICWi5TdMEHtUIzbif
-z7KbyRrE0kUsZrfHGS4xH3ryAvIVKi/C3D3yMLl9fmD+0674ZOowz7wAU2+seLc9
-jsloEA9GTSU+lEEOrfyz
-=iTnd
+iQIcBAEBCAAGBQJTHQhoAAoJEPGu1DbS6WIAB7EQAIeuJVj3z4bPKZB0s0e4ark5
+NzpjlMT/Zv4V3tk9/4+azJan4yLHUvrJRXKlLIEh2mDjFhqOlZW0YiQX3/ZwDaLh
+LTPWLe13IiXy3rUs/8Q9VBFPonhiGEqDTQhns8pGi5+xVntZ8EumR2Z0xHdHTvNB
+6990TrvlR0+XTuRCbHv5adJurnYHBy+m4Hn1BsleGHqvc6OuolRMVoimD9k4LpWD
+JF1fR22D7SuFbhdSA5SF66OUug/ubnymVkBiJMufqM11P0PmBMBvwY4S77rv8oTL
+KzW0BejxEbj4Kr6zYlkOEWJnNZhQaKk/cupI40hKN04wRFqeJNaS2tu/q0ZhfLfn
+lYB30JsNe/EXPofJQ9ojl1PCvUc4bmWgTUGhrKmOnvX/kBR1x2SRAN5G2L0o+FjN
+P3C72eBoai0N49R9/ObE6DbG5exmNY0cEl+WwnNo9jkV4Fmdty2f9E3AU9JWctQy
+xDcfXYhnlkRFLLxBb8R9ZXpxaE8twyp/wtUq126nFNdFABHhLk845QwAVBBS+UrJ
+DsqVIcsrecX8i3fEj56vpDoJMYlDgagDRcZdLqp0v7jo276U1MHeXrGaxLe3Lph0
+wJCRI316Pj7HmqUKSjB+NK19ypmvg3eKt9FoGXvEFPr2fcbGj2zzsysh92YlJbaC
+MmgC8LuIBgYzwbVZEjmW
+=8ArZ
 -----END PGP SIGNATURE-----
diff --git a/net-mail/mailutils/files/mailutils-2.99.98-readline-6.3.patch b/net-mail/mailutils/files/mailutils-2.99.98-readline-6.3.patch
new file mode 100644
index 000000000000..de9a487aaaf3
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-2.99.98-readline-6.3.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/503954
+
+fix build w/readline-6.3
+
+patch by Martin von Gagern
+
+--- mailutils-2.99.98/mu/shell.c
++++ mailutils-2.99.98/mu/shell.c
+@@ -336,7 +336,7 @@ mutool_initialize_readline (const char *
+ {
+   /* Allow conditional parsing of the ~/.inputrc file. */
+   rl_readline_name = (char *) name;
+-  rl_attempted_completion_function = (CPPFunction *) shell_completion;
++  rl_attempted_completion_function = shell_completion;
+   rl_getc_function = _shell_getc;
+   read_history (get_history_file_name ());
+ }
+--- mailutils-2.99.98/mail/mailline.c
++++ mailutils-2.99.98/mail/mailline.c
+@@ -93,7 +93,7 @@ ml_readline_init ()
+ 
+ #ifdef WITH_READLINE
+   rl_readline_name = "mail";
+-  rl_attempted_completion_function = (CPPFunction*)ml_command_completion;
++  rl_attempted_completion_function = ml_command_completion;
+   rl_getc_function = ml_getc;
+ #endif
+ #ifdef HAVE_SIGACTION
+--- mailutils-2.99.98/examples/nntpclient.c
++++ mailutils-2.99.98/examples/nntpclient.c
+@@ -163,7 +163,7 @@ initialize_readline ()
+   rl_readline_name = (char *) "nntp";
+ 
+   /* Tell the completer that we want a crack first. */
+-  rl_attempted_completion_function = (CPPFunction *) nntp_completion;
++  rl_attempted_completion_function = nntp_completion;
+ }
+ 
+ /* Attempt to complete on the contents of TEXT.  START and END bound the
diff --git a/net-mail/mailutils/mailutils-2.99.98.ebuild b/net-mail/mailutils/mailutils-2.99.98.ebuild
index f0c089fc754c..b664ed1f7247 100644
--- a/net-mail/mailutils/mailutils-2.99.98.ebuild
+++ b/net-mail/mailutils/mailutils-2.99.98.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-2.99.98.ebuild,v 1.3 2013/09/22 06:50:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-2.99.98.ebuild,v 1.4 2014/03/10 00:33:37 vapier Exp $
 
 EAPI=5
 PYTHON_DEPEND="python? 2"
@@ -55,6 +55,7 @@ src_prepare() {
 	# Disable bytecompilation of Python modules.
 	echo "#!/bin/sh" > build-aux/py-compile
 	epatch "${FILESDIR}/${P}-array_bounds.patch"
+	epatch "${FILESDIR}/${P}-readline-6.3.patch" #503954
 }
 
 src_configure() {