Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-libs/readline: ChangeLog readline-6.3.ebuild
Date: Thu, 27 Feb 2014 10:08:21
Message-Id: 20140227100814.080902004C@flycatcher.gentoo.org
1 polynomial-c 14/02/27 10:08:13
2
3 Modified: ChangeLog
4 Added: readline-6.3.ebuild
5 Log:
6 Version bump
7
8 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
9
10 Revision Changes Path
11 1.193 sys-libs/readline/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/ChangeLog?rev=1.193&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/ChangeLog?rev=1.193&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/ChangeLog?r1=1.192&r2=1.193
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v
20 retrieving revision 1.192
21 retrieving revision 1.193
22 diff -u -r1.192 -r1.193
23 --- ChangeLog 20 Jan 2014 06:34:37 -0000 1.192
24 +++ ChangeLog 27 Feb 2014 10:08:13 -0000 1.193
25 @@ -1,6 +1,11 @@
26 # ChangeLog for sys-libs/readline
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.192 2014/01/20 06:34:37 vapier Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.193 2014/02/27 10:08:13 polynomial-c Exp $
30 +
31 +*readline-6.3 (27 Feb 2014)
32 +
33 + 27 Feb 2014; Lars Wendler <polynomial-c@g.o> +readline-6.3.ebuild:
34 + Version bump.
35
36 20 Jan 2014; Mike Frysinger <vapier@g.o> readline-6.2_p5-r1.ebuild:
37 Depend on virtual/pkgconfig for ncurses needs #498586 by palme3000.
38
39
40
41 1.1 sys-libs/readline/readline-6.3.ebuild
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/readline-6.3.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/readline/readline-6.3.ebuild?rev=1.1&content-type=text/plain
45
46 Index: readline-6.3.ebuild
47 ===================================================================
48 # Copyright 1999-2014 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.3.ebuild,v 1.1 2014/02/27 10:08:13 polynomial-c Exp $
51
52 EAPI=4
53
54 inherit eutils multilib toolchain-funcs flag-o-matic multilib-minimal
55
56 # Official patches
57 # See ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/
58 PLEVEL=${PV##*_p}
59 MY_PV=${PV/_p*}
60 MY_PV=${MY_PV/_/-}
61 MY_P=${PN}-${MY_PV}
62 [[ ${PV} != *_p* ]] && PLEVEL=0
63 patches() {
64 [[ ${PLEVEL} -eq 0 ]] && return 1
65 local opt=$1
66 eval set -- {1..${PLEVEL}}
67 set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
68 if [[ ${opt} == -s ]] ; then
69 echo "${@/#/${DISTDIR}/}"
70 else
71 local u
72 for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
73 printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
74 done
75 fi
76 }
77
78 DESCRIPTION="Another cute console display library"
79 HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
80 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
81
82 LICENSE="GPL-3"
83 SLOT="0"
84 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
85 IUSE="static-libs"
86
87 RDEPEND=">=sys-libs/ncurses-5.2-r2[${MULTILIB_USEDEP}]
88 abi_x86_32? (
89 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
90 !<=app-emulation/emul-linux-x86-baselibs-20131008-r7
91 )"
92 DEPEND="${RDEPEND}
93 virtual/pkgconfig"
94
95 S=${WORKDIR}/${MY_P}
96
97 src_unpack() {
98 unpack ${MY_P}.tar.gz
99 }
100
101 src_prepare() {
102 [[ ${PLEVEL} -gt 0 ]] && epatch $(patches -s)
103 epatch "${FILESDIR}"/${PN}-5.0-no_rpath.patch
104 epatch "${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
105
106 # Force ncurses linking. #71420
107 # Use pkg-config to get the right values. #457558
108 local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses --libs)
109 sed -i \
110 -e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
111 support/shobj-conf || die
112 sed -i \
113 -e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
114 examples/rlfe/configure || die
115
116 # fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
117 # objformat for years, so we don't want to rely on that.
118 sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
119
120 ln -s ../.. examples/rlfe/readline # for local readline headers
121 }
122
123 src_configure() {
124 # fix implicit decls with widechar funcs
125 append-cppflags -D_GNU_SOURCE
126 # http://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
127 append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
128
129 # Make sure configure picks a better ar than `ar`. #484866
130 export ac_cv_prog_AR=$(tc-getAR)
131
132 # Force the test since we used sed above to force it.
133 export bash_cv_termcap_lib=ncurses
134
135 # This is for rlfe, but we need to make sure LDFLAGS doesn't change
136 # so we can re-use the config cache file between the two.
137 append-ldflags -L.
138
139 multilib-minimal_src_configure
140 }
141
142 multilib_src_configure() {
143 ECONF_SOURCE=${S} \
144 econf \
145 --cache-file="${BUILD_DIR}"/config.cache \
146 --with-curses \
147 $(use_enable static-libs static)
148
149 if multilib_build_binaries && ! tc-is-cross-compiler ; then
150 # code is full of AC_TRY_RUN()
151 mkdir -p examples/rlfe || die
152 cd examples/rlfe || die
153 ECONF_SOURCE=${S}/examples/rlfe \
154 econf --cache-file="${BUILD_DIR}"/config.cache
155 fi
156 }
157
158 multilib_src_compile() {
159 emake
160
161 if multilib_build_binaries && ! tc-is-cross-compiler ; then
162 # code is full of AC_TRY_RUN()
163 cd examples/rlfe || die
164 local l
165 for l in readline history ; do
166 ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname)
167 ln -sf ../../lib${l}.a lib${l}.a
168 done
169 emake
170 fi
171 }
172
173 multilib_src_install() {
174 default
175
176 if multilib_build_binaries ; then
177 gen_usr_ldscript -a readline history #4411
178
179 if ! tc-is-cross-compiler; then
180 dobin examples/rlfe/rlfe
181 fi
182 fi
183 }
184
185 multilib_src_install_all() {
186 einstalldocs
187 dodoc USAGE
188 dohtml -r doc/.
189 docinto ps
190 dodoc doc/*.ps
191 }
192
193 pkg_preinst() {
194 preserve_old_lib /$(get_libdir)/lib{history,readline}.so.{4,5} #29865
195 }
196
197 pkg_postinst() {
198 preserve_old_lib_notify /$(get_libdir)/lib{history,readline}.so.{4,5}
199 }