Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-libs/readline: readline-6.2_p1.ebuild ChangeLog
Date: Tue, 01 Mar 2011 00:48:31
Message-Id: 20110301004821.B75E920054@flycatcher.gentoo.org
1 vapier 11/03/01 00:48:21
2
3 Modified: ChangeLog
4 Added: readline-6.2_p1.ebuild
5 Log:
6 Version bump.
7
8 (Portage version: 2.2.0_alpha25/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.168 sys-libs/readline/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/ChangeLog?rev=1.168&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/ChangeLog?rev=1.168&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/ChangeLog?r1=1.167&r2=1.168
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v
20 retrieving revision 1.167
21 retrieving revision 1.168
22 diff -u -r1.167 -r1.168
23 --- ChangeLog 1 Mar 2011 00:34:48 -0000 1.167
24 +++ ChangeLog 1 Mar 2011 00:48:21 -0000 1.168
25 @@ -1,6 +1,11 @@
26 # ChangeLog for sys-libs/readline
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.167 2011/03/01 00:34:48 ranger Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.168 2011/03/01 00:48:21 vapier Exp $
30 +
31 +*readline-6.2_p1 (01 Mar 2011)
32 +
33 + 01 Mar 2011; Mike Frysinger <vapier@g.o> +readline-6.2_p1.ebuild:
34 + Version bump.
35
36 01 Mar 2011; Brent Baude <ranger@g.o> readline-6.1_p2.ebuild:
37 stable ppc64, bug 354939
38
39
40
41 1.1 sys-libs/readline/readline-6.2_p1.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/readline-6.2_p1.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/readline-6.2_p1.ebuild?rev=1.1&content-type=text/plain
45
46 Index: readline-6.2_p1.ebuild
47 ===================================================================
48 # Copyright 1999-2011 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.2_p1.ebuild,v 1.1 2011/03/01 00:48:21 vapier Exp $
51
52 inherit autotools eutils multilib toolchain-funcs flag-o-matic
53
54 # Official patches
55 # See ftp://ftp.cwru.edu/pub/bash/readline-6.0-patches/
56 PLEVEL=${PV##*_p}
57 MY_PV=${PV/_p*}
58 MY_PV=${MY_PV/_/-}
59 MY_P=${PN}-${MY_PV}
60 [[ ${PV} != *_p* ]] && PLEVEL=0
61 patches() {
62 [[ ${PLEVEL} -eq 0 ]] && return 1
63 local opt=$1
64 eval set -- {1..${PLEVEL}}
65 set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
66 if [[ ${opt} == -s ]] ; then
67 echo "${@/#/${DISTDIR}/}"
68 else
69 local u
70 for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
71 printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
72 done
73 fi
74 }
75
76 DESCRIPTION="Another cute console display library"
77 HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
78 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
79
80 LICENSE="GPL-3"
81 SLOT="0"
82 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
83 IUSE=""
84
85 # We must be certain that we have a bash that is linked
86 # to its internal readline, else we may get problems.
87 RDEPEND=">=sys-libs/ncurses-5.2-r2"
88 DEPEND="${RDEPEND}
89 >=app-shells/bash-2.05b-r2"
90
91 S=${WORKDIR}/${MY_P}
92
93 src_unpack() {
94 unpack ${MY_P}.tar.gz
95
96 cd "${S}"
97 [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
98 epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
99 epatch "${FILESDIR}"/${PN}-5.2-no-ignore-shlib-errors.patch #216952
100
101 # force ncurses linking #71420
102 sed -i -e 's:^SHLIB_LIBS=:SHLIB_LIBS=-lncurses:' support/shobj-conf || die "sed"
103
104 # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
105 # objformat for years, so we don't want to rely on that.
106 sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
107
108 ln -s ../.. examples/rlfe/readline # for local readline headers
109 }
110
111 src_compile() {
112 # fix implicit decls with widechar funcs
113 append-cppflags -D_GNU_SOURCE
114 # http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
115 append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
116
117 econf --with-curses || die
118 emake || die
119
120 if ! tc-is-cross-compiler ; then
121 # code is full of AC_TRY_RUN()
122 cd examples/rlfe
123 append-ldflags -L.
124 local l
125 for l in readline history ; do
126 ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
127 ln -sf ../../lib${l}.a lib${l}.a
128 done
129 econf || die
130 emake || die
131 fi
132 }
133
134 src_install() {
135 emake DESTDIR="${D}" install || die
136 gen_usr_ldscript -a readline history #4411
137
138 if ! tc-is-cross-compiler; then
139 dobin examples/rlfe/rlfe || die
140 fi
141
142 dodoc CHANGELOG CHANGES README USAGE NEWS
143 docinto ps
144 dodoc doc/*.ps
145 dohtml -r doc
146 }
147
148 pkg_preinst() {
149 preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865
150 }
151
152 pkg_postinst() {
153 preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5}
154 }