Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 106820 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-6 / +21 lines)
Line  Link Here
0
-- ncurses-5.6.ebuild
0
++ ncurses-5.6.ebuild
Lines 51-57 Link Here
51
	if use unicode ; then
51
	if use unicode ; then
52
		mkdir "${WORKDIR}"/widec
52
		mkdir "${WORKDIR}"/widec
53
		cd "${WORKDIR}"/widec
53
		cd "${WORKDIR}"/widec
54
		do_compile ${myconf} --enable-widec --includedir=/usr/include/ncursesw
54
		do_compile ${myconf} --enable-widec
55
	fi
55
	fi
56
}
56
}
57
do_compile() {
57
do_compile() {
Lines 93-106 Link Here
93
}
93
}
94
94
95
src_install() {
95
src_install() {
96
	# install unicode version first so that the non-unicode
96
	cd "${WORKDIR}"/narrowc
97
	# files overwrite the unicode versions
97
	make DESTDIR="${D}" install || die "make narrowc install failed"
98
99
	# install wide version last so that the wide
100
	# files overwrite the narrow versions
98
	if use unicode ; then
101
	if use unicode ; then
99
		cd "${WORKDIR}"/widec
102
		cd "${WORKDIR}"/widec
100
		make DESTDIR="${D}" install || die "make widec install failed"
103
		make DESTDIR="${D}" install || die "make widec install failed"
104
105
		# use wide versions for new programs, but don't break binary
106
		# compatibility for old programs
107
		cd "${D}"lib || die "cd ${D}lib failed"
108
		for lib in *w.a ; do
109
			ln -nsfv ${lib} ${lib%w.a}.a
110
		done
111
		for lib in *w.so ; do
112
			ln -nsfv ${lib} ${lib%w.so}.so
113
		done
101
	fi
114
	fi
102
	cd "${WORKDIR}"/narrowc
103
	make DESTDIR="${D}" install || die "make narrowc install failed"
104
115
105
	if [[ ${CHOST} != *-darwin* ]] ; then
116
	if [[ ${CHOST} != *-darwin* ]] ; then
106
		# Move static and extraneous ncurses libraries out of /lib
117
		# Move static and extraneous ncurses libraries out of /lib
Lines 164-169 Link Here
164
}
175
}
165
176
166
pkg_preinst() {
177
pkg_preinst() {
178
	use unicode || preserve_old_lib /$(get_libdir)/libncursesw.so.5
179
167
	if [[ ! -f ${ROOT}/etc/env.d/50ncurses ]] ; then
180
	if [[ ! -f ${ROOT}/etc/env.d/50ncurses ]] ; then
168
		mkdir -p "${ROOT}"/etc/env.d
181
		mkdir -p "${ROOT}"/etc/env.d
169
		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > \
182
		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > \
Lines 172-177 Link Here
172
}
185
}
173
186
174
pkg_postinst() {
187
pkg_postinst() {
188
	use unicode || preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
189
175
	# Old ncurses may still be around from old build tbz2's.
190
	# Old ncurses may still be around from old build tbz2's.
176
	rm -f "${ROOT}"/lib/libncurses.so.5.[23] "${ROOT}"/usr/lib/lib{form,menu,panel}.so.5.[23]
191
	rm -f "${ROOT}"/lib/libncurses.so.5.[23] "${ROOT}"/usr/lib/lib{form,menu,panel}.so.5.[23]
177
	if [[ $(get_libdir) != "lib" ]] ; then
192
	if [[ $(get_libdir) != "lib" ]] ; then

Return to bug 106820