Fixed build with readline support on bsd (bug #507468)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

4 files changed, 88 insertions, 17 deletions

diff --git a/sys-apps/gawk/ChangeLog b/sys-apps/gawk/ChangeLog
index 3528a01a4a93..64874ace7b00 100644
--- a/sys-apps/gawk/ChangeLog
+++ b/sys-apps/gawk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/gawk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.182 2015/05/23 19:38:43 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/ChangeLog,v 1.183 2015/06/30 20:31:53 polynomial-c Exp $
+
+  30 Jun 2015; Lars Wendler <polynomial-c@gentoo.org> gawk-4.1.3.ebuild,
+  +files/gawk-4.1.3-bsd_configure_readline.patch:
+  Fixed build with readline support on bsd (bug #507468).
 
 *gawk-4.1.3 (23 May 2015)
 
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 2d8337b0c269..d426fb1eb079 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX filefuncs/Makefile 1226 SHA256 a3b91ceefd4d659d9ffdc0c8502c7de10e7d4f9daee4e297cb2d8da11257c77e SHA512 7238b64971d6345d99d24b75363f9d842befa140c3373709c0ddfceb566666fbf75dfa10aea032028b1a7ffe94180d389fb922b23f79ccf8f319a76d23b2c96d WHIRLPOOL 3557762a538e26484a3203fac09b6094e4eef306dfa6fa414a5722bf738accadd0f893787d102cefd5b1132db7d12511ec0378c958ef51370ee618f25aaf3698
 AUX filefuncs/filefuncs.c 10992 SHA256 c647aa27170ef8e001d47bdf86c47809afd7f6d5a89be2f9769ce05b55ed8309 SHA512 07caa4dfe83716de8218f9035b893778461a8c709a538a0a3f45dc6a08f99387a9bf15967b849cdad8ccfe1fb94fc4c3de790457f6460998275afe20f8c16a94 WHIRLPOOL 6b2078a9538691871c6441a5d828d17246a97640ad8c3d080e9b24f324488500e2da4058bdb387ee857d849ec9f4a0be36f77fc335357c4a48f24ca9bb5271bf
 AUX gawk-4.1.0-ports.patch 5332 SHA256 ff39dda30e5efc14f9cd7c85f105049c36c78ff89b98fc992c86d9cf6384fca2 SHA512 37a25cc8515862b3a6056751e5fa0828a9630eee118f1da6dfda3881ac5b54e3997d389034f3d4b5b2b142449dd7631eece480d5316e59e85c3fc29b52bcd6dd WHIRLPOOL f99a6f7952431558c956b5d32d6d2e0048b3f164e211e96b0dfd07aef7de3c2fd474f86448bb7dd1e25ca0b3e5a849ad3ac72c17278ccaa16f49dfb839f8e4ec
+AUX gawk-4.1.3-bsd_configure_readline.patch 1898 SHA256 7678c4a00140a2ea0caf7be315ea57b6a9d7a73d6841be63f59cdfd1fc82f7bc SHA512 44d01e6a64ad29fe99344ed7d5b890cdc559a5e7c35f40ec43eddd39d19b39cf6bd3f5fdb43b69970fa707e30f709a6fe3aa11711870dbaa25904e5ecddabd6a WHIRLPOOL ed280c1bb7c86129853549a1b39316a31e6c5f6997d9df21a22f4f589eefcd7a59ce48797654bd9fafbe3c058489a23bba2463bb891b27ae52cd2d40b96727b6
 DIST gawk-3.1.8.tar.bz2 1984129 SHA256 5dbc7b2c4c328711337c2aacd09a122c7313122262e3ff034590f014067412b4 SHA512 a8046c1a5a6ffc8bd90cc6062d97ba6301b7a707f4a34a06355a83aaaea2ccdf4c4476563fc6f444b529a2d8d3a2de2126b53434ba50aad8bd898fb3299904dd WHIRLPOOL e24079d7c2aee57e48db2ef76df4c217ea0fa435304a563c6df8d0442f8a5e5e4cff2141809f68430939d66a3a6eda981edefa94b2b8c85e5f0a3ee7ba8a7649
 DIST gawk-4.0.2.tar.xz 1626808 SHA256 21e1f28c51b5160f0a4bf1a735c6109b46a3bd6a43de808eabc21c17bb026d13 SHA512 069f68b6792521d94d4003764006ad8fbe9a17c60a88212629204d9a5eb3f662903fff6d91dd3c1834597b76c18f9d3231c93a033f456c59c0571ac13eb77b27 WHIRLPOOL 8b2916d964c5fa67a46c0a5fc39d424b03e6b39a3335ad796a224feb760528631199c1ec6ee2b6719bdc014ab190ddf38092211685020c92851d617e6ca08690
 DIST gawk-4.1.2.tar.xz 2279136 SHA256 ea8b53c5834ee27012fecba7273f97fca7104884975cf81ddae6f85c5581f481 SHA512 89aed50a4bd335bd6a3045b1b738c76788f3d8d5745153683c990f021e424c31d8a3b2599f8e57f18f64022d5d1b57f4766ccf1a7d2a1b9fb4b20dabdf099117 WHIRLPOOL 254900ce8ce9992551e89ed5ccf6ba9b0bdb8324643d0c84573404c59d3d756aa64de2d054194d424958f9aa4c52bd9b12ba6185ada0d39b38cd046e1192c336
@@ -11,23 +12,23 @@ DIST gawk-4.1.3.tar.xz 2311268 SHA256 e3cf55e91e31ea2845f8338bedd91e40671fc30e4d
 EBUILD gawk-3.1.8.ebuild 1899 SHA256 e744223da8960e3a7d6cb6a7ad33e286be8d0b611bf88df4a55bd8e6b8cdbe45 SHA512 64f8018d3548784044188170589d20049c7dfd91090f3be709f1d405f638fb5585e2a846e69b6993ae05cd1e880ab51513617044ea11c933800e9a31828a8778 WHIRLPOOL a4382af5d5538f8638f28d76e746799a905d3ab6899562fa437c60ded1657cb2a84a79ed65c48e78ad26262dd8849786affa4e844f76437d2678bcae9ad73210
 EBUILD gawk-4.0.2.ebuild 2264 SHA256 7136d6883bd88a6afc0fdc08b80249500469d1701247653117225a1567361779 SHA512 ad0c0e04b1470b7b93d45d420e0d6c8ffd89836400814eea0cea670bb3901ecda80f96f055e91620e2b2d875caffecc27a3b2e499cf03a5e4963e9b643f0b999 WHIRLPOOL d4491d84b12c30aa0b2983346598aac85c01b0928c09e43042f1b2b63457e40cf73976e80ecf463484bd00126f16c791336629b5b0344721505a94d5efb533a1
 EBUILD gawk-4.1.2.ebuild 2307 SHA256 20f9b8f4d0f1832407cca08cd96d718fe6bba8eedc9e9292fc60b3254c720635 SHA512 66c149a6572186cc751fdf95523780cf7d48095d733cf1fba9f69800b9bccd2b08aa45a8647e2850e1039bbd8bd10a6a9e39c11bd3315978685811c03f68217d WHIRLPOOL 48012177a9626711eca7c5352c10137d43b248fd0461c97fa235be199d30d7a72ddc45eb9f63362425cf7184d5c92b9f055e4b5745726aaf2a1eb98633c7bcc5
-EBUILD gawk-4.1.3.ebuild 2307 SHA256 faac2b37d8af4606b03c4dd28240bec39b140ab19d1bd2bbb9e83e099d83eb93 SHA512 77a20653f64ca7fc2481d8d2d5d8dc87f99466e8eb48e21dd0a697386ecd74502eb1d21f4fbed38b282c855fa74b01aaee7ec0ddab9b040cf270c71403ccd8fc WHIRLPOOL 8ac168e2b9db4ef94701d946e53ba80c35e5fc0c7d25364602ef54e40a318fd930f1cf4d91af9c70833788fc6058b2163dc01ad464addba8b6cd1d86bc152976
-MISC ChangeLog 24760 SHA256 462653cf3c676d807d7d85af0de13f3a84c4e6b10084cb87ff9e4a8fe80e1b44 SHA512 1b47f1eb7e9f3d62e1a07ca30fa049acf01c778e8c93bba16560f192973fc7ec03e3f1c4a8223d9b46eae66012d2b04388dbe55451d1b5d4da883e883442c3c9 WHIRLPOOL 593cead16804b58854aea6972a2abcdb2947c23ccd0a9fa0722ac1b98d6f301a88f2419e0d2e211befb1facb9a79b8c58b8aec8d23689710761c9620f08f6d1f
+EBUILD gawk-4.1.3.ebuild 2392 SHA256 491b3df2e2084262eaea1d76f21e267aa7f0fd459e2b110ce970bde9d1d801aa SHA512 4147de24cb1d1e99d6c6811f346c8941f3ca166e9b805faec717c042f1064de89186d0fd1d3b862d97ef98b0e540177cb758cf0ab1fe3f9508ff433f61f18b4c WHIRLPOOL 4697cb6d76640f70f2873be148390375aa398546f5a8d5828581533e3cb070fb22330122f1d5aa0e78fc287729456e58c748b38a1ae3b2b3c14a59b82506502d
+MISC ChangeLog 24942 SHA256 c48e02f1f32afc2a6d973204d6bcf27d8e149f44cef430596fc239b6621fe6da SHA512 4490b183af23c18ea644f8ea27d3b63696ad5113c7e8f0d6b7ffb6b22931adb7bec162070ace1043b6c4d139afcf2eaadc36179384bb6ea8aa524bf68c93ab4f WHIRLPOOL 9762d4eb03c3d6848e5a912b20b752bd5b8c89dcbcc3bac2b6241e13ddfae81805c2f20e7839922b1931a20454c3a0cb4750e43ff2e6de930894d2ef055a5a29
 MISC metadata.xml 258 SHA256 741574d9acaca0b5556f6cfa01e8754daa3519c18c5903e17a6fb8874bcfa451 SHA512 e63162871aee375c0b000a9052cb944072b43b400c532a0eff50599e40f010ada30675e68c60d0497226f5b593220235b9b6357e1f1f8859ea71852e532822b8 WHIRLPOOL 75d54aeff7b6adb2760941a8c12fbba6f1a67f9167d938e267bb61046770c9508bbcc9b732c564983c27eb6450780edbe2cd4ac19b2aa317d97e0a6e4da49d9a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVYNdEAAoJEPiazRVxLXTFmgsQAL0ghj7i+6ARbM5DfHHzzkI6
-Nhmk3RAMXa21rMKIpEqtxKyFQPb9j+W5EJ2kW5rDq7xgBYFB2ZoderEcfotS0227
-blM8ffkfCUVHSl3VkwBQqdaQl5wd003CkwUwN1rBN7c47EYI0LFB8xm3bfQ0nOLx
-5hixsksZgTUaNFqHEb3WpsZ0XcO19CPg5ud5H3TFyDjUfqtpIB+24JfGbxFtfMSm
-NF+S1kyMpx3U/P4UgremUJNY+L7pd+gGfMP5HsLCA6JZYTSJvpdMCqcDoDf7y6jI
-aANHK8hlNB3qFOLUBs6EaXNh5dLIDLAnCowu+N6rst0fM2Unl7QfMWlnTXiFMGED
-h7PoM7D1JW/3xpnW/ZMjOeUd2gdVFbvJCHn16KwDUqwUfHcTfi/B2uwhyDYFf+Qq
-y+7hbIgh5/xc3Z8uTebvmC2f9xcnCnDdpoKT9y2CuQJWdNEiz9ET1HD+o5kqFnfp
-7WSLNGbHBvWt52X11BI6eonUsrGwn5BBPIBnFaWotlLqysIjyc0jviRV32VMkSzv
-0X+D5OQpzFZYkA0MCb67JyvzzJAn02E9PRHS2kDQeXDda8gCHoBJonCE1dHh/cel
-hreMv/ulGO3fOqJpbOTRqZVGwXm/5O5nsMn+9BO4lJpgAUtX+qhbsXuZZZW/MLUc
-Z9vVjBLcbARamqc1Ja2U
-=tXk2
+iQIcBAEBCAAGBQJVkvy6AAoJEPiazRVxLXTFC2kP/0e/5eR2FfuI1f4M4U7EQQiZ
+55MnL1GSA0lA8hOFM9hS3KCdIap3Bgfl9wtCk7nlI1nJciQLU8T57jc0xTfr7+UM
+FK9KFW/3An2VGfJCK+cEIsZVkaes2pCqkc3xO2F2DjDd6JwAiwGXlVdPNljfB67w
+kj4pfNnn4lDFXuCmi0TfgirpHNvL7Ugw1vtNhmJVQEIKSMwiz07Ij0u1x3J7zfda
+P/JeP7AEwYorgCh6OhZi5iROvjnXeJGyndLQuUg++5/pPhtNhvGewrh6HKLMwkJd
+DRxoagIflcJrI5tT/XHIAv1HMxlSUNBKYKsrqIEssrW/vFUk8J8YEiSFfS6XPjW3
+PzDEYCmvvPP8tC/D2sczpZGOISAZL8ocEdHplw24tfw6Eu/gJaSvAhduAOPR3eTU
+tZPRafvgAVJOJTtHwipYSawSoLHRHXZvR3pS0/TNDngqjUMmxawGULzqhhSclJFY
+cYwHmAl7yYWhsAw6wTQiv/Tgmk/PHEGtVhgvkuAG4tQiPTjpfy9l6dE+7on4PWGf
+mIlA8gxCqarsfMp9gHXE0QGIARofuLTCJ0rmOzNhJr/u33TTbYDQRbCHmPYCpsWK
+PCFCi0u1TeTW/DgZ/oo++om5nZWhL9HREwIPPCNur7EtcxZlXob1lc9eLXwmCksu
+w7VYeCxC/stqZXiVNeUd
+=n2W6
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gawk/files/gawk-4.1.3-bsd_configure_readline.patch b/sys-apps/gawk/files/gawk-4.1.3-bsd_configure_readline.patch
new file mode 100644
index 000000000000..13b4ca80bc37
--- /dev/null
+++ b/sys-apps/gawk/files/gawk-4.1.3-bsd_configure_readline.patch
@@ -0,0 +1,63 @@
+http://git.savannah.gnu.org/cgit/gawk.git/commit/?id=ac0ef52fe407b89c7968b927c7b2b513cc13963a
+
+--- gawk-4.1.3/configure	2015-05-19 09:38:35.000000000 -0400
++++ gawk-4.1.3/configure	2015-05-19 09:38:35.000000000 -0400
+@@ -10832,7 +10832,46 @@
+ 
+         if test $_found_readline = yes ; then
+ 	   case $host_os in
+-	   *bsd* )	_combo="$_combo -ltermcap"
++	   *bsd* )	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
++$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
++if ${ac_cv_lib_termcap_tgetent+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ltermcap  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char tgetent ();
++int
++main ()
++{
++return tgetent ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_termcap_tgetent=yes
++else
++  ac_cv_lib_termcap_tgetent=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
++$as_echo "$ac_cv_lib_termcap_tgetent" >&6; }
++if test "x$ac_cv_lib_termcap_tgetent" = xyes; then :
++  _combo="$_combo -ltermcap"
++fi
++
+ 	  	 ;;
+ 	   esac
+ 
+--- gawk-4.1.3/m4/readline.m4	2015-04-05 06:19:19.000000000 -0400
++++ gawk-4.1.3/m4/readline.m4	2015-04-05 06:19:19.000000000 -0400
+@@ -92,7 +92,7 @@
+ 
+         if test $_found_readline = yes ; then
+ 	   case $host_os in
+-	   *bsd* )	_combo="$_combo -ltermcap"
++	   *bsd* )	AC_CHECK_LIB(termcap, tgetent, _combo="$_combo -ltermcap")
+ 	  	 ;;
+ 	   esac
+            AC_DEFINE(HAVE_LIBREADLINE,1,
\ No newline at end of file
diff --git a/sys-apps/gawk/gawk-4.1.3.ebuild b/sys-apps/gawk/gawk-4.1.3.ebuild
index b560f6762bc5..bcdb50181b97 100644
--- a/sys-apps/gawk/gawk-4.1.3.ebuild
+++ b/sys-apps/gawk/gawk-4.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-4.1.3.ebuild,v 1.1 2015/05/23 19:38:43 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gawk/gawk-4.1.3.ebuild,v 1.2 2015/06/30 20:31:53 polynomial-c Exp $
 
 EAPI="4"
 
@@ -31,6 +31,9 @@ src_prepare() {
 	sed -i \
 		-e '/check-recursive all-recursive: check-for-shared-lib-support/d' \
 		extension/Makefile.in || die
+
+	EPATCH_OPTS="-Z" \
+	epatch "${FILESDIR}/${P}-bsd_configure_readline.patch" #507468
 }
 
 src_configure() {