Gentoo Archives: gentoo-commits

From: "Alex Alexander (wired)" <wired@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-libs/ncurses: ncurses-5.7-r3.ebuild ChangeLog
Date: Wed, 28 Oct 2009 12:18:15
Message-Id: E1N37Tg-00052a-Uw@stork.gentoo.org
1 wired 09/10/28 12:18:12
2
3 Modified: ChangeLog
4 Added: ncurses-5.7-r3.ebuild
5 Log:
6 added rxvt-unicode terminfo generation wrt bug #192083
7 (Portage version: 2.2_rc46/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.167 sys-libs/ncurses/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/ncurses/ChangeLog?rev=1.167&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/ncurses/ChangeLog?rev=1.167&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/ncurses/ChangeLog?r1=1.166&r2=1.167
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v
19 retrieving revision 1.166
20 retrieving revision 1.167
21 diff -u -r1.166 -r1.167
22 --- ChangeLog 22 Oct 2009 12:30:58 -0000 1.166
23 +++ ChangeLog 28 Oct 2009 12:18:12 -0000 1.167
24 @@ -1,6 +1,12 @@
25 # ChangeLog for sys-libs/ncurses
26 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.166 2009/10/22 12:30:58 vapier Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.167 2009/10/28 12:18:12 wired Exp $
29 +
30 +*ncurses-5.7-r3 (28 Oct 2009)
31 +
32 + 28 Oct 2009; Alex Alexander <wired@g.o> +ncurses-5.7-r3.ebuild,
33 + +files/ncurses-5.7-rxvt-unicode.patch:
34 + added rxvt-unicode terminfo generation wrt bug #192083
35
36 22 Oct 2009; Mike Frysinger <vapier@g.o> ncurses-5.7-r2.ebuild,
37 +files/ncurses-5.7-tic-cross-detection.patch:
38
39
40
41 1.1 sys-libs/ncurses/ncurses-5.7-r3.ebuild
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r3.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r3.ebuild?rev=1.1&content-type=text/plain
45
46 Index: ncurses-5.7-r3.ebuild
47 ===================================================================
48 # Copyright 1999-2009 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r3.ebuild,v 1.1 2009/10/28 12:18:12 wired Exp $
51
52 EAPI="1"
53 inherit eutils flag-o-matic toolchain-funcs
54
55 MY_PV=${PV:0:3}
56 PV_SNAP=${PV:4}
57 MY_P=${PN}-${MY_PV}
58 DESCRIPTION="console display library"
59 HOMEPAGE="http://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
60 SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz"
61
62 LICENSE="MIT"
63 SLOT="5"
64 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
65 IUSE="ada +cxx debug doc gpm minimal profile trace unicode"
66
67 DEPEND="gpm? ( sys-libs/gpm )"
68 # berkdb? ( sys-libs/db )"
69 RDEPEND="!<x11-terms/rxvt-unicode-9.06-r3"
70
71 S=${WORKDIR}/${MY_P}
72
73 src_unpack() {
74 unpack ${A}
75 cd "${S}"
76 [[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
77 epatch "${FILESDIR}"/${PN}-5.6-gfbsd.patch
78 epatch "${FILESDIR}"/${PN}-5.7-emacs.patch #270527
79 epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch
80 epatch "${FILESDIR}"/${PN}-5.7-tic-cross-detection.patch #288881
81 epatch "${FILESDIR}"/${PN}-5.7-rxvt-unicode.patch #192083
82 epatch "${FILESDIR}"/${P}-hashdb-open.patch #245370
83 }
84
85 src_compile() {
86 unset TERMINFO #115036
87 tc-export BUILD_CC
88 export BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
89
90 # when cross-compiling, we need to build up our own tic
91 # because people often don't keep matching host/target
92 # ncurses versions #249363
93 if tc-is-cross-compiler ; then
94 make_flags="-C progs tic"
95 CHOST=${CBUILD} \
96 CFLAGS=${BUILD_CFLAGS} \
97 CXXFLAGS=${BUILD_CXXFLAGS} \
98 CPPFLAGS=${BUILD_CPPFLAGS} \
99 LDFLAGS="${BUILD_LDFLAGS} -static" \
100 do_compile cross --without-shared
101 fi
102
103 make_flags=""
104 do_compile narrowc
105 use unicode && do_compile widec --enable-widec --includedir=/usr/include/ncursesw
106 }
107 do_compile() {
108 ECONF_SOURCE=${S}
109
110 mkdir "${WORKDIR}"/$1
111 cd "${WORKDIR}"/$1
112 shift
113
114 # The chtype/mmask-t settings below are to retain ABI compat
115 # with ncurses-5.4 so dont change em !
116 local conf_abi="
117 --with-chtype=long \
118 --with-mmask-t=long \
119 --disable-ext-colors \
120 --disable-ext-mouse \
121 --without-pthread \
122 --without-reentrant \
123 "
124 # We need the basic terminfo files in /etc, bug #37026. We will
125 # add '--with-terminfo-dirs' and then populate /etc/terminfo in
126 # src_install() ...
127 # $(use_with berkdb hashed-db)
128 econf \
129 --libdir="/$(get_libdir)" \
130 --with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
131 --with-shared \
132 --without-hashed-db \
133 $(use_with ada) \
134 $(use_with cxx) \
135 $(use_with cxx cxx-binding) \
136 $(use_with debug) \
137 $(use_with profile) \
138 $(use_with gpm) \
139 --disable-termcap \
140 --enable-symlinks \
141 --with-rcs-ids \
142 --with-manpage-format=normal \
143 --enable-const \
144 --enable-colorfgbg \
145 --enable-echo \
146 $(use_enable !ada warnings) \
147 $(use_with debug assertions) \
148 $(use_with !debug leaks) \
149 $(use_with debug expanded) \
150 $(use_with !debug macros) \
151 $(use_with trace) \
152 ${conf_abi} \
153 "$@" \
154 || die "configure failed"
155
156 # A little hack to fix parallel builds ... they break when
157 # generating sources so if we generate the sources first (in
158 # non-parallel), we can then build the rest of the package
159 # in parallel. This is not really a perf hit since the source
160 # generation is quite small. -vapier
161 emake -j1 sources || die "make sources failed"
162 emake ${make_flags} || die "make ${make_flags} failed"
163 }
164
165 src_install() {
166 # use the cross-compiled tic (if need be) #249363
167 export PATH=${WORKDIR}/cross/progs:${PATH}
168
169 # install unicode version second so that the binaries in /usr/bin
170 # support both wide and narrow
171 cd "${WORKDIR}"/narrowc
172 emake DESTDIR="${D}" install || die "make narrowc install failed"
173 if use unicode ; then
174 cd "${WORKDIR}"/widec
175 emake DESTDIR="${D}" install || die "make widec install failed"
176 fi
177
178 # Move static and extraneous ncurses libraries out of /lib
179 dodir /usr/$(get_libdir)
180 cd "${D}"/$(get_libdir)
181 mv lib{form,menu,panel}.so* *.a "${D}"/usr/$(get_libdir)/
182 gen_usr_ldscript lib{,n}curses.so
183 if use unicode ; then
184 mv lib{form,menu,panel}w.so* "${D}"/usr/$(get_libdir)/
185 gen_usr_ldscript libncursesw.so
186 fi
187
188 # if ! use berkdb ; then
189 # We need the basic terminfo files in /etc, bug #37026
190 einfo "Installing basic terminfo files in /etc..."
191 for x in ansi console dumb linux rxvt rxvt-unicode screen sun vt{52,100,102,200,220} \
192 xterm xterm-color xterm-xfree86
193 do
194 local termfile=$(find "${D}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
195 local basedir=$(basename $(dirname "${termfile}"))
196
197 if [[ -n ${termfile} ]] ; then
198 dodir /etc/terminfo/${basedir}
199 mv ${termfile} "${D}"/etc/terminfo/${basedir}/
200 dosym ../../../../etc/terminfo/${basedir}/${x} \
201 /usr/share/terminfo/${basedir}/${x}
202 fi
203 done
204
205 # Build fails to create this ...
206 dosym ../share/terminfo /usr/$(get_libdir)/terminfo
207 # fi
208
209 echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
210 doenvd "${T}"/50ncurses
211
212 use minimal && rm -r "${D}"/usr/share/terminfo*
213 # Because ncurses5-config --terminfo returns the directory we keep it
214 keepdir /usr/share/terminfo #245374
215
216 cd "${S}"
217 dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
218 use doc && dohtml -r doc/html/
219 }