summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-libs/readline/ChangeLog6
-rw-r--r--sys-libs/readline/Manifest15
-rw-r--r--sys-libs/readline/files/readline-6.1-rlfe-freebsd.patch16
-rw-r--r--sys-libs/readline/readline-6.1_p2.ebuild3
4 files changed, 36 insertions, 4 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index e7eff5823810..d63a8e853ccd 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/readline
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.153 2010/03/23 20:42:06 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.154 2010/03/24 04:14:27 the_paya Exp $
+
+ 24 Mar 2010; Javier Villavicencio <the_paya@gentoo.org>
+ readline-6.1_p2.ebuild, +files/readline-6.1-rlfe-freebsd.patch:
+ Fix for bug 301508, rlfe build on FreeBSD.
23 Mar 2010; Brent Baude <ranger@gentoo.org> readline-6.1.ebuild:
stable ppc, bug 310819
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 0ef397e60055..a2e7aeb6003d 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX readline-5.0-no_rpath.patch 363 RMD160 6a4ea25da4f683a77892a24f904de873579270fd SHA1 6e5e24e7965cd71abc8b09897de74b766a85461e SHA256 59df6107772d1a93550bacc267a2c00f9dfd6d5380b8497d8fd756a7191b9e4b
AUX readline-5.2-no-ignore-shlib-errors.patch 688 RMD160 ffb4bddfe278dd4f3c56c2bfe1f62daedbe4dc59 SHA1 e899ea5a3270b9c64aebc91fe49d45b053107a2b SHA256 2c585c4e2d69d6b91157f378a3dd11cb49beefab808eef3350cf1b8357b2efc6
AUX readline-6.0-rlfe-build.patch 743 RMD160 49ddd8e98588ea3efbd2c8fd613e27fa52d70b95 SHA1 29e6ca942db168919973d79a0f11e0c9b88268ac SHA256 3a084fe0c976355031b2b7a467b60489e4d26d5d4c443b69f102e55fa8ca4f2b
+AUX readline-6.1-rlfe-freebsd.patch 387 RMD160 079f61a66e3ff6e1d12f33fba49b41ad5840c5b4 SHA1 ffe93dcb95c3dc32fe8e5ad22cbf4d3a1fa2ef80 SHA256 c601fd268665a3217ecd720b266960f3182e6adcd61dbcbba8a0f8ada2a5b4d3
DIST readline-4.3.tar.gz 961662 RMD160 07aebeb250284d0ef68acf44d1c1ff8578e2ae2f SHA1 4e226fd5f6f919707f11b9e28d47b5487448895d SHA256 eeaf6f050b9f515b0636e5b4f2c153f9ef78e9061ee5dd74f612fab54c77bf88
DIST readline-5.2.tar.gz 2037705 RMD160 983cbb25192e0a376b80cb2428fe8ee254a041c7 SHA1 18f3412c73068509d5f491b7b4535aeaf9522834 SHA256 12e88d96aee2cd1192500356f0535540db499282ca7f76339fb4228c31249f45
DIST readline-6.0.tar.gz 2270818 RMD160 9f886f437dfa3387cb3a4ce3439cefecffc2c789 SHA1 1e511b091514ef631c539552316787c75ace5262 SHA256 1199d905c025735b34cf67d03078585e18f84707052413279fe68ce48c1cc1de
@@ -34,6 +38,13 @@ EBUILD readline-4.3_p5.ebuild 1591 RMD160 d689f7d568d7e3b1115fbf89daf7c8840d801f
EBUILD readline-5.2_p14.ebuild 1905 RMD160 292c4388861f43c7cbbb7f5eda9bb3afc5ef90e1 SHA1 c5ceb9f28c7f9a480881275919200671d4233ab5 SHA256 170279df1909b218b3c9ff6b9cc3e315b1a72b8f1a6b5615010e903d67c65259
EBUILD readline-6.0_p4.ebuild 2931 RMD160 c893cb5a03b9073002868967a3e4a8884f2f0865 SHA1 3e9b72d63131c8faec2c360b4408cc13692d4b08 SHA256 76f31753e9c5dc2892600982a98dd2757a9aae725cf306d926051a7f68d096e9
EBUILD readline-6.1.ebuild 2761 RMD160 77f5b9eab1e5ef5a34e6b684b70f19bc7e049979 SHA1 411322a8b4e9735b7369c1c69d3c5bd1e4821c48 SHA256 9d9a1f399c5101b9643ac5c1979a8607be6664e34df4618d7d300dbe5bddd1c1
-EBUILD readline-6.1_p2.ebuild 2766 RMD160 2384abecc0019378a19b98abfa85f6c875118e8c SHA1 445e5f545ce8ad70cfd608caeb8c68ad05239b31 SHA256 10a1ecdf589f3d7dad2c2657df035cb1728e429eecf86cd538ea460ea515d1a3
-MISC ChangeLog 19465 RMD160 517c83c1222e84c6e5a4293a4cba3ca335c46e75 SHA1 2a532783d6f64b1e7b225fb6baaec776f2066e28 SHA256 53f0c05438b1bd533679e5b0539ddc11ca83d9ee25a75f47ddd21fb0dae74861
+EBUILD readline-6.1_p2.ebuild 2828 RMD160 8076605fe4ac9ecc9a68accb5377b5652cd73895 SHA1 0913705c3787ace8c57d1abb023e8afb81c3024c SHA256 2262f19f1df464b69948333f228cee1c0f792569709a65d3d3a255bef3c6de02
+MISC ChangeLog 19637 RMD160 5291af311b042c3abe2049cb4baf4721a9259e52 SHA1 2b7394e00b377e23045e6feb47d07e74638c91cc SHA256 3593a8d4631804f698bef899abd82adb5a65b92634922d5f702b42d855a9c522
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (FreeBSD)
+
+iEYEARECAAYFAkupkawACgkQgvV6MZSadQpn7wCghsz3ol/712NfJn0gvRLYI60G
+nXIAnik7s5wFK+Qxm/EU1LkiSWlIMAiD
+=mDdF
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/readline-6.1-rlfe-freebsd.patch b/sys-libs/readline/files/readline-6.1-rlfe-freebsd.patch
new file mode 100644
index 000000000000..e9a051eacb82
--- /dev/null
+++ b/sys-libs/readline/files/readline-6.1-rlfe-freebsd.patch
@@ -0,0 +1,16 @@
+FreeBSD-8 dropped sgtty.h in favor of termios.h,
+without this rlfe build on FreeBSD-8 fails with a
+missing sgtty.h.
+See also bug #301508.
+
+--- readline-6.1/examples/rlfe/os.h.orig
++++ readline-6.1/examples/rlfe/os.h
+@@ -186,7 +186,7 @@
+ * terminal handling
+ */
+
+-#ifdef POSIX
++#if defined(POSIX) || defined(__FreeBSD__)
+ # include <termios.h>
+ # ifdef hpux
+ # include <bsdtty.h>
diff --git a/sys-libs/readline/readline-6.1_p2.ebuild b/sys-libs/readline/readline-6.1_p2.ebuild
index 6a6c14de19b3..810ca4df2602 100644
--- a/sys-libs/readline/readline-6.1_p2.ebuild
+++ b/sys-libs/readline/readline-6.1_p2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.1_p2.ebuild,v 1.1 2010/03/23 02:23:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.1_p2.ebuild,v 1.2 2010/03/24 04:14:27 the_paya Exp $
inherit autotools eutils multilib toolchain-funcs flag-o-matic
@@ -50,6 +50,7 @@ src_unpack() {
[[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
epatch "${FILESDIR}"/${PN}-5.2-no-ignore-shlib-errors.patch #216952
+ epatch "${FILESDIR}"/${PN}-6.1-rlfe-freebsd.patch # 301508
# force ncurses linking #71420
sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"