diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-04-28 23:08:05 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-04-28 23:08:05 +0000 |
commit | 72c6465e7b5f230c4ad4903a99d3f115621df763 (patch) | |
tree | be648c14db4d44620a6e209a673bb0075655c46f /sys-libs | |
parent | alpha stable (diff) | |
download | gentoo-2-72c6465e7b5f230c4ad4903a99d3f115621df763.tar.gz gentoo-2-72c6465e7b5f230c4ad4903a99d3f115621df763.tar.bz2 gentoo-2-72c6465e7b5f230c4ad4903a99d3f115621df763.zip |
Add patch from upstream.
(Portage version: 2.0.51.20-r5)
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/ncurses/ChangeLog | 10 | ||||
-rw-r--r-- | sys-libs/ncurses/files/digest-ncurses-5.4.20050319 | 2 | ||||
-rw-r--r-- | sys-libs/ncurses/ncurses-5.4.20050319.ebuild | 175 |
3 files changed, 185 insertions, 2 deletions
diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog index 174bc0d72876..f6cbda1d74da 100644 --- a/sys-libs/ncurses/ChangeLog +++ b/sys-libs/ncurses/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/ncurses -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.92 2005/04/28 01:21:18 gustavoz Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.93 2005/04/28 23:08:05 vapier Exp $ + +*ncurses-5.4.20050319 (28 Apr 2005) + + 28 Apr 2005; Mike Frysinger <vapier@gentoo.org> + +ncurses-5.4.20050319.ebuild: + Add patch from upstream. 28 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> ncurses-5.4-r6.ebuild: Stable on sparc diff --git a/sys-libs/ncurses/files/digest-ncurses-5.4.20050319 b/sys-libs/ncurses/files/digest-ncurses-5.4.20050319 new file mode 100644 index 000000000000..53ef5581c789 --- /dev/null +++ b/sys-libs/ncurses/files/digest-ncurses-5.4.20050319 @@ -0,0 +1,2 @@ +MD5 069c8880072060373290a4fefff43520 ncurses-5.4.tar.gz 2154022 +MD5 39d36aeb65f3762ff0bb1a82a0d39c77 ncurses-5.4-20050319-patch.sh.bz2 328630 diff --git a/sys-libs/ncurses/ncurses-5.4.20050319.ebuild b/sys-libs/ncurses/ncurses-5.4.20050319.ebuild new file mode 100644 index 000000000000..20c0d04fdaa3 --- /dev/null +++ b/sys-libs/ncurses/ncurses-5.4.20050319.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4.20050319.ebuild,v 1.1 2005/04/28 23:08:05 vapier Exp $ + +inherit eutils flag-o-matic toolchain-funcs + +MY_PV=${PV:0:3} +PV_SNAP=${PV:4} +MY_P=${PN}-${MY_PV} +DESCRIPTION="console display library" +HOMEPAGE="http://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/" +SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz + ftp://invisible-island.net/ncurses/${MY_PV}/${MY_P}-${PV_SNAP}-patch.sh.bz2" + +LICENSE="MIT" +SLOT="5" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="gpm build bootstrap debug doc minimal unicode nocxx" +DEPEND="gpm? ( sys-libs/gpm )" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + # check for unicode use flag, see bug #78313 + if ! use unicode && [[ -f ${ROOT}/usr/lib/libncursesw.so ]] && [[ ${COMPILE_NCURSES} != "true" ]] ; then + ewarn "Remerging ncurses without unicode in USE flags may break your system." + ewarn "For more information see http://bugs.gentoo.org/78313" + ewarn "If you still want continue, export COMPILE_NCURSES to 'true'." + die "refusing to rebuild ncurses w/out unicode" + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh + epatch "${FILESDIR}"/${MY_P}-share-sed.patch #42336 +} + +src_compile() { + tc-export BUILD_CC + filter-flags -fno-exceptions + + # From version 5.3, ncurses also build c++ bindings, and as + # we do not have a c++ compiler during bootstrap, disable + # building it. We will rebuild ncurses after gcc's second + # build in bootstrap.sh. + local myconf="" + ( use build || use bootstrap || use nocxx ) \ + && myconf="${myconf} --without-cxx --without-cxx-binding --without-ada" + + # First we build the regular ncurses ... + mkdir "${WORKDIR}"/narrowc + cd "${WORKDIR}"/narrowc + do_compile ${myconf} + + # Then we build the UTF-8 version + if use unicode ; then + mkdir "${WORKDIR}"/widec + cd "${WORKDIR}"/widec + do_compile ${myconf} --enable-widec --includedir=/usr/include/ncursesw + fi +} +do_compile() { + ECONF_SOURCE=${S} + + # We need the basic terminfo files in /etc, bug #37026. We will + # add '--with-terminfo-dirs' and then populate /etc/terminfo in + # src_install() ... + econf \ + --libdir=/$(get_libdir) \ + --with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \ + --disable-termcap \ + --with-shared \ + --with-rcs-ids \ + --without-ada \ + --enable-symlinks \ + --program-prefix="" \ + $(use_with debug) \ + $(use_with gpm) \ + "$@" \ + || die "configure failed" + + # A little hack to fix parallel builds ... they break when + # generating sources so if we generate the sources first (in + # non-parallel), we can then build the rest of the package + # in parallel. This is not really a perf hit since the source + # generation is quite small. -vapier + emake -j1 sources || die "make sources failed" + emake || die "make failed" +} + +src_install() { + # install unicode version first so that the non-unicode + # files overwrite the unicode versions + if use unicode ; then + cd "${WORKDIR}"/widec + sed -i '2iexit 0' man/edit_man.sh + make DESTDIR="${D}" install || die "make widec install failed" + fi + cd "${WORKDIR}"/narrowc + make DESTDIR="${D}" install || die "make narrowc install failed" + + # Move static and extraneous ncurses libraries out of /lib + dodir /usr/$(get_libdir) + cd "${D}"/$(get_libdir) + mv libform* libmenu* libpanel* *.a "${D}"/usr/$(get_libdir)/ + gen_usr_ldscript lib{,n}curses.so + use unicode && gen_usr_ldscript lib{,n}cursesw.so + + # We need the basic terminfo files in /etc, bug #37026 + einfo "Installing basic terminfo files in /etc..." + for x in ansi console dumb linux rxvt screen sun vt{52,100,102,200,220} \ + xterm xterm-color xterm-xfree86 + do + local termfile=$(find "${D}"/usr/share/terminfo/ -name "${x}" 2>/dev/null) + local basedir=$(basename $(dirname "${termfile}")) + + if [[ -n ${termfile} ]] ; then + dodir /etc/terminfo/${basedir} + mv ${termfile} "${D}"/etc/terminfo/${basedir}/ + dosym ../../../../etc/terminfo/${basedir}/${x} \ + /usr/share/terminfo/${basedir}/${x} + fi + done + + # Build fails to create this ... + dosym ../share/terminfo /usr/$(get_libdir)/terminfo + + echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses + doenvd "${T}"/50ncurses + + if use build ; then + cd "${D}" + rm -rf usr/share/man + cd usr/share/terminfo + cp -a l/linux n/nxterm v/vt100 "${T}" + rm -rf * + mkdir l x v + cp -a "${T}"/linux l + cp -a "${T}"/nxterm x/xterm + cp -a "${T}"/vt100 v + else + # Install xterm-debian terminfo entry to satisfy bug #18486 + LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir):${D}/$(get_libdir) \ + TERMINFO=${D}/usr/share/terminfo \ + "${D}"/usr/bin/tic "${FILESDIR}"/xterm-debian.ti + + if use minimal ; then + cp "${D}"/usr/share/terminfo/x/xterm-debian "${D}"/etc/terminfo/x/ + rm -r "${D}"/usr/share/terminfo + fi + + cd "${S}" + dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc + use doc && dohtml -r doc/html/ + fi +} + +pkg_preinst() { + if [[ ! -f ${ROOT}/etc/env.d/50ncurses ]] ; then + mkdir -p "${ROOT}"/etc/env.d + echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > \ + "${ROOT}"/etc/env.d/50ncurses + fi +} + +pkg_postinst() { + # Old ncurses may still be around from old build tbz2's. + rm -f "${ROOT}"/lib/libncurses.so.5.[23] "${ROOT}"/usr/lib/lib{form,menu,panel}.so.5.[23] + if [[ $(get_libdir) != "lib" ]] ; then + rm -f "${ROOT}"/$(get_libdir)/libncurses.so.5.[23] \ + "${ROOT}"/usr/$(get_libdir)/lib{form,menu,panel}.so.5.[23] + fi +} |