summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Ludd <solar@gentoo.org>2005-12-24 17:31:32 +0000
committerNed Ludd <solar@gentoo.org>2005-12-24 17:31:32 +0000
commit45184bf55e87b1d289f7f88c72b289a8e287d356 (patch)
treeef2b3c02017ee3696326f80808cad8dcfa96ec6c /sys-libs
parentChanged install location (diff)
downloadhistorical-45184bf55e87b1d289f7f88c72b289a8e287d356.tar.gz
historical-45184bf55e87b1d289f7f88c72b289a8e287d356.tar.bz2
historical-45184bf55e87b1d289f7f88c72b289a8e287d356.zip
- uclibc does not contain a stropts.h so we exclude it from rlfe
Package-Manager: portage-2.0.53
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/readline/ChangeLog6
-rw-r--r--sys-libs/readline/Manifest15
-rw-r--r--sys-libs/readline/files/readline-5.1-rlfe-uclibc.patch11
-rw-r--r--sys-libs/readline/readline-5.1-r2.ebuild4
4 files changed, 28 insertions, 8 deletions
diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index 58cae563a182..fbee80a3a3d8 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-libs/readline
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.56 2005/12/24 04:54:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.57 2005/12/24 17:31:32 solar Exp $
+
+ 24 Dec 2005; <solar@gentoo.org> +files/readline-5.1-rlfe-uclibc.patch,
+ readline-5.1-r2.ebuild:
+ - uclibc does not contain a stropts.h so we exclude it from rlfe
24 Dec 2005; Mike Frysinger <vapier@gentoo.org>
+files/readline-5.1-rlfe-build.patch, readline-5.1-r2.ebuild:
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index a6a270c619c0..7a072a63bb86 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,7 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 2b170a389cc04945e4ff8bc65bf7f971 ChangeLog 8447
+MD5 102c5e9ee59bc12cf16abdd9c664b507 ChangeLog 8613
MD5 d687545889dacb43e121f4932d99a534 files/bash-3.0-etc-inputrc.patch 1443
MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r5 348
MD5 cca21eb56279efff8356d028b1b39dd8 files/digest-readline-4.3-r6 348
@@ -16,15 +16,18 @@ MD5 a0bad5c8ba91f5c50ea6c2c97a76f2d1 files/readline-5.0-self-insert.patch 2463
MD5 fe45d673627dab53fb3fcffcb4f55e4e files/readline-5.0-solaris.patch 756
MD5 e4ac33c0a2293b72378e00e8729c71af files/readline-5.1-cleanups.patch 3817
MD5 73869a19bab0f37a7ee46e377d2bac15 files/readline-5.1-rlfe-build.patch 252
+MD5 acf485e32b4ff28ae6aec238c3a4581c files/readline-5.1-rlfe-uclibc.patch 308
MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
MD5 82ac0eae5f66926062b260f7d09de7c0 readline-4.3-r5.ebuild 2764
MD5 e16aefe27f29117c7a4e7be342e920b4 readline-4.3-r6.ebuild 3090
MD5 d33ebebef248a79c288c6b1dce06b0ee readline-5.0-r2.ebuild 2778
-MD5 70f8be4c722093f8290f8116d6d4eb9c readline-5.1-r2.ebuild 2928
+MD5 45c613ee86f337789f1bdb577f60de00 readline-5.1-r2.ebuild 2973
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
-iD8DBQFDrNR92+ySkm8kpY0RAvqNAKDDZLmwhd5IauQNvfAHcrV502F/zQCfVInw
-Nfbi+k5F+qT82mBzmrtRKpg=
-=SCBv
+iQCVAwUBQ62GAJ4WFLgrx1GWAQKHsAP+Kl8gVF2ttU7yuM618ke5wreCt/vhKRhX
+wpuipl3GhIslkcOjJsBnb0tPFwQVJZ4x3DlQNfVF6I81LzqHWmst+Yaclj/djp7+
+MQrmRd50HzuoThEHzB2tnVrKEyuyGhweahWWgdXCzPy/GaPHRpgwT+JDqg4xF6Md
+f75gHmKCmJo=
+=eFol
-----END PGP SIGNATURE-----
diff --git a/sys-libs/readline/files/readline-5.1-rlfe-uclibc.patch b/sys-libs/readline/files/readline-5.1-rlfe-uclibc.patch
new file mode 100644
index 000000000000..fbb9e039128b
--- /dev/null
+++ b/sys-libs/readline/files/readline-5.1-rlfe-uclibc.patch
@@ -0,0 +1,11 @@
+--- examples/rlfe/pty.c.orig 2005-12-24 16:49:08 +0000
++++ examples/rlfe/pty.c 2005-12-24 16:49:14 +0000
+@@ -34,7 +34,7 @@
+ #endif
+
+ /* for solaris 2.1, Unixware (SVR4.2) and possibly others */
+-#ifdef HAVE_SVR4_PTYS
++#if defined(HAVE_SVR4_PTYS) && !defined(__UCLIBC__)
+ # include <sys/stropts.h>
+ #endif
+
diff --git a/sys-libs/readline/readline-5.1-r2.ebuild b/sys-libs/readline/readline-5.1-r2.ebuild
index 9ab560ba914d..89713e40f533 100644
--- a/sys-libs/readline/readline-5.1-r2.ebuild
+++ b/sys-libs/readline/readline-5.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.1-r2.ebuild,v 1.4 2005/12/24 04:54:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-5.1-r2.ebuild,v 1.5 2005/12/24 17:31:32 solar Exp $
inherit eutils multilib toolchain-funcs
@@ -42,6 +42,8 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
epatch "${FILESDIR}"/${P}-cleanups.patch
epatch "${FILESDIR}"/${P}-rlfe-build.patch #116483
+ epatch "${FILESDIR}"/${P}-rlfe-uclibc.patch
+
ln -s ../.. examples/rlfe/readline
# force ncurses linking #71420