1 |
vapier 11/03/01 07:51:17 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: ncurses-5.7-r7.ebuild |
5 |
Log: |
6 |
Fix new static-libs logic #351316 by Rafał Mużyło. |
7 |
|
8 |
Revision Changes Path |
9 |
1.179 sys-libs/ncurses/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/ncurses/ChangeLog?rev=1.179&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/ncurses/ChangeLog?rev=1.179&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/ncurses/ChangeLog?r1=1.178&r2=1.179 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v |
18 |
retrieving revision 1.178 |
19 |
retrieving revision 1.179 |
20 |
diff -u -r1.178 -r1.179 |
21 |
--- ChangeLog 15 Nov 2010 11:55:07 -0000 1.178 |
22 |
+++ ChangeLog 1 Mar 2011 07:51:17 -0000 1.179 |
23 |
@@ -1,6 +1,11 @@ |
24 |
# ChangeLog for sys-libs/ncurses |
25 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.178 2010/11/15 11:55:07 wired Exp $ |
27 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.179 2011/03/01 07:51:17 vapier Exp $ |
29 |
+ |
30 |
+*ncurses-5.7-r7 (01 Mar 2011) |
31 |
+ |
32 |
+ 01 Mar 2011; Mike Frysinger <vapier@g.o> +ncurses-5.7-r7.ebuild: |
33 |
+ Fix new static-libs logic #351316 by Rafał Mużyło. |
34 |
|
35 |
*ncurses-5.7-r6 (15 Nov 2010) |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.1 sys-libs/ncurses/ncurses-5.7-r7.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r7.ebuild?rev=1.1&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r7.ebuild?rev=1.1&content-type=text/plain |
44 |
|
45 |
Index: ncurses-5.7-r7.ebuild |
46 |
=================================================================== |
47 |
# Copyright 1999-2011 Gentoo Foundation |
48 |
# Distributed under the terms of the GNU General Public License v2 |
49 |
# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r7.ebuild,v 1.1 2011/03/01 07:51:17 vapier Exp $ |
50 |
|
51 |
EAPI="1" |
52 |
inherit eutils flag-o-matic toolchain-funcs |
53 |
|
54 |
MY_PV=${PV:0:3} |
55 |
PV_SNAP=${PV:4} |
56 |
MY_P=${PN}-${MY_PV} |
57 |
DESCRIPTION="console display library" |
58 |
HOMEPAGE="http://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/" |
59 |
SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz" |
60 |
|
61 |
LICENSE="MIT" |
62 |
SLOT="5" |
63 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" |
64 |
IUSE="ada +cxx debug doc gpm minimal profile static-libs trace unicode" |
65 |
|
66 |
DEPEND="gpm? ( sys-libs/gpm )" |
67 |
# berkdb? ( sys-libs/db )" |
68 |
RDEPEND="!<x11-terms/rxvt-unicode-9.06-r3" |
69 |
|
70 |
S=${WORKDIR}/${MY_P} |
71 |
|
72 |
src_unpack() { |
73 |
unpack ${A} |
74 |
cd "${S}" |
75 |
[[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh |
76 |
epatch "${FILESDIR}"/${PN}-5.6-gfbsd.patch |
77 |
epatch "${FILESDIR}"/${PN}-5.7-emacs.patch #270527 |
78 |
epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch |
79 |
epatch "${FILESDIR}"/${PN}-5.7-tic-cross-detection.patch #288881 |
80 |
epatch "${FILESDIR}"/${PN}-5.7-rxvt-unicode-9.09.patch #192083 |
81 |
epatch "${FILESDIR}"/${P}-hashdb-open.patch #245370 |
82 |
sed -i '/with_no_leaks=yes/s:=.*:=$enableval:' configure #305889 |
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 && ! ROOT=/ has_version ~sys-libs/${P} ; 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 --with-normal |
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 |
--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \ |
130 |
--with-shared \ |
131 |
--without-hashed-db \ |
132 |
$(use_with ada) \ |
133 |
$(use_with cxx) \ |
134 |
$(use_with cxx cxx-binding) \ |
135 |
$(use_with debug) \ |
136 |
$(use_with profile) \ |
137 |
$(use_with gpm) \ |
138 |
--disable-termcap \ |
139 |
--enable-symlinks \ |
140 |
--with-rcs-ids \ |
141 |
--with-manpage-format=normal \ |
142 |
--enable-const \ |
143 |
--enable-colorfgbg \ |
144 |
--enable-echo \ |
145 |
$(use_enable !ada warnings) \ |
146 |
$(use_with debug assertions) \ |
147 |
$(use_enable debug leaks) \ |
148 |
$(use_with debug expanded) \ |
149 |
$(use_with !debug macros) \ |
150 |
$(use_with trace) \ |
151 |
${conf_abi} \ |
152 |
"$@" |
153 |
|
154 |
# A little hack to fix parallel builds ... they break when |
155 |
# generating sources so if we generate the sources first (in |
156 |
# non-parallel), we can then build the rest of the package |
157 |
# in parallel. This is not really a perf hit since the source |
158 |
# generation is quite small. |
159 |
emake -j1 sources || die |
160 |
emake ${make_flags} || die |
161 |
} |
162 |
|
163 |
src_install() { |
164 |
# use the cross-compiled tic (if need be) #249363 |
165 |
export PATH=${WORKDIR}/cross/progs:${PATH} |
166 |
|
167 |
# install unicode version second so that the binaries in /usr/bin |
168 |
# support both wide and narrow |
169 |
cd "${WORKDIR}"/narrowc |
170 |
emake DESTDIR="${D}" install || die |
171 |
if use unicode ; then |
172 |
cd "${WORKDIR}"/widec |
173 |
emake DESTDIR="${D}" install || die |
174 |
fi |
175 |
|
176 |
# Move libncurses{,w} into /lib |
177 |
gen_usr_ldscript -a ncurses |
178 |
use unicode && gen_usr_ldscript -a ncursesw |
179 |
ln -sf libncurses.so "${D}"/usr/$(get_libdir)/libcurses.so || die |
180 |
use static-libs || rm "${D}"/usr/$(get_libdir)/*.a |
181 |
|
182 |
# if ! use berkdb ; then |
183 |
# We need the basic terminfo files in /etc, bug #37026 |
184 |
einfo "Installing basic terminfo files in /etc..." |
185 |
for x in ansi console dumb linux rxvt rxvt-unicode screen sun vt{52,100,102,200,220} \ |
186 |
xterm xterm-color xterm-xfree86 |
187 |
do |
188 |
local termfile=$(find "${D}"/usr/share/terminfo/ -name "${x}" 2>/dev/null) |
189 |
local basedir=$(basename $(dirname "${termfile}")) |
190 |
|
191 |
if [[ -n ${termfile} ]] ; then |
192 |
dodir /etc/terminfo/${basedir} |
193 |
mv ${termfile} "${D}"/etc/terminfo/${basedir}/ |
194 |
dosym ../../../../etc/terminfo/${basedir}/${x} \ |
195 |
/usr/share/terminfo/${basedir}/${x} |
196 |
fi |
197 |
done |
198 |
|
199 |
# Build fails to create this ... |
200 |
dosym ../share/terminfo /usr/$(get_libdir)/terminfo |
201 |
# fi |
202 |
|
203 |
echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses |
204 |
doenvd "${T}"/50ncurses |
205 |
|
206 |
use minimal && rm -r "${D}"/usr/share/terminfo* |
207 |
# Because ncurses5-config --terminfo returns the directory we keep it |
208 |
keepdir /usr/share/terminfo #245374 |
209 |
|
210 |
cd "${S}" |
211 |
dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc |
212 |
use doc && dohtml -r doc/html/ |
213 |
} |