diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-06-20 13:22:44 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-06-20 13:22:44 +0000 |
commit | a357de11fc790b441a6b38534f5e9f0b95c606b8 (patch) | |
tree | cfb317bc34ebaffe12d4762564b59f80d5c69132 /sys-libs | |
parent | Version bump. (diff) | |
download | gentoo-2-a357de11fc790b441a6b38534f5e9f0b95c606b8.tar.gz gentoo-2-a357de11fc790b441a6b38534f5e9f0b95c606b8.tar.bz2 gentoo-2-a357de11fc790b441a6b38534f5e9f0b95c606b8.zip |
Refactor compile step, include terminfo update from upstream #270527 by Ulrich Müller, and always add _GNU_SOURCE to BUILD_CPPFLAGS #214642 by Ryan Tandy.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/ncurses/ChangeLog | 10 | ||||
-rw-r--r-- | sys-libs/ncurses/files/ncurses-5.7-emacs.patch | 44 | ||||
-rw-r--r-- | sys-libs/ncurses/ncurses-5.6-r2.ebuild | 6 | ||||
-rw-r--r-- | sys-libs/ncurses/ncurses-5.7-r1.ebuild | 149 |
4 files changed, 205 insertions, 4 deletions
diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog index c2037e739da7..88e9e4722a69 100644 --- a/sys-libs/ncurses/ChangeLog +++ b/sys-libs/ncurses/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-libs/ncurses # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.161 2009/04/29 22:17:49 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.162 2009/06/20 13:22:43 vapier Exp $ + +*ncurses-5.7-r1 (20 Jun 2009) + + 20 Jun 2009; Mike Frysinger <vapier@gentoo.org> ncurses-5.6-r2.ebuild, + +ncurses-5.7-r1.ebuild, +files/ncurses-5.7-emacs.patch: + Refactor compile step, include terminfo update from upstream #270527 by + Ulrich Müller, and always add _GNU_SOURCE to BUILD_CPPFLAGS #214642 by + Ryan Tandy. 30 Apr 2009; Samuli Suominen <ssuominen@gentoo.org> ncurses-5.6-r2.ebuild, ncurses-5.7.ebuild: diff --git a/sys-libs/ncurses/files/ncurses-5.7-emacs.patch b/sys-libs/ncurses/files/ncurses-5.7-emacs.patch new file mode 100644 index 000000000000..615a73b2918f --- /dev/null +++ b/sys-libs/ncurses/files/ncurses-5.7-emacs.patch @@ -0,0 +1,44 @@ +http://bugs.gentoo.org/270527 +Add entry for eterm-color to terminfo file +Part of upstream patch, available at: +ftp://invisible-island.net/ncurses/5.7/ncurses-5.7-20081129.patch + +--- ncurses-5.7-20081122+/misc/terminfo.src 2008-11-15 21:54:35.000000000 +0000 ++++ ncurses-5.7-20081129/misc/terminfo.src 2008-11-29 15:27:35.000000000 +0000 +@@ -4357,6 +4357,26 @@ + sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m, + smul=\E[4m, + ++# The codes supported by the term.el terminal emulation in GNU Emacs 22.2 ++eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96, ++ am, mir, msgr, xenl, ++ colors#8, cols#80, lines#24, pairs#64, ++ bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=^M, ++ csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, ++ cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C, ++ cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, ++ dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, ++ el=\E[K, el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@, ++ il=\E[%p1%dL, il1=\E[L, ind=^J, invis=\E[8m, kbs=\177, ++ kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, ++ kdch1=\E[3~, kend=\E[4~, khome=\E[1~, kich1=\E[2~, ++ knp=\E[6~, kpp=\E[5~, op=\E[39;49m, rc=\E8, rev=\E[7m, ++ ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec, ++ sc=\E7, setab=\E[%p1%'('%+%dm, setaf=\E[%p1%{30}%+%dm, ++ sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m, ++ sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m, ++ u6=\E[%i%d;%dR, u7=\E[6n, ++ + # Entries for use by the `screen' program by Juergen Weigert, + # Michael Schroeder, Oliver Laumann. The screen and + # screen-w entries came with version 3.7.1. The screen2 and screen3 entries +@@ -21795,6 +21815,9 @@ + # * change several \E[2g (clear tab at current column) to \E[3g + # (clear all tabs) to match definition for tbc capability -TD + # ++# 2008-11-29 ++# * add eterm-color -TD ++# + # The following sets edit modes for GNU EMACS. + # Local Variables: + # fill-prefix:"\t" diff --git a/sys-libs/ncurses/ncurses-5.6-r2.ebuild b/sys-libs/ncurses/ncurses-5.6-r2.ebuild index e223a33c9f9c..c4a936a124f1 100644 --- a/sys-libs/ncurses/ncurses-5.6-r2.ebuild +++ b/sys-libs/ncurses/ncurses-5.6-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.6-r2.ebuild,v 1.12 2009/04/29 22:17:49 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.6-r2.ebuild,v 1.13 2009/06/20 13:22:43 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -38,7 +38,6 @@ src_compile() { local myconf="" use nocxx && myconf="${myconf} --without-cxx --without-cxx-binding" - use ada || myconf="${myconf} --without-ada" # First we build the regular ncurses ... mkdir "${WORKDIR}"/narrowc @@ -80,7 +79,8 @@ do_compile() { --enable-const \ --enable-colorfgbg \ --enable-echo \ - $(use_enable !ada warnings) \ + --without-ada \ + --enable-warnings \ $(use_with debug assertions) \ $(use_with !debug leaks) \ $(use_with debug expanded) \ diff --git a/sys-libs/ncurses/ncurses-5.7-r1.ebuild b/sys-libs/ncurses/ncurses-5.7-r1.ebuild new file mode 100644 index 000000000000..ec146f5c4f89 --- /dev/null +++ b/sys-libs/ncurses/ncurses-5.7-r1.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r1.ebuild,v 1.1 2009/06/20 13:22:43 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" + +LICENSE="MIT" +SLOT="5" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="ada cxx debug doc gpm minimal profile trace unicode" + +DEPEND="gpm? ( sys-libs/gpm )" +# berkdb? ( sys-libs/db )" + +S=${WORKDIR}/${MY_P} + +src_unpack() { + unpack ${A} + cd "${S}" + [[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh + epatch "${FILESDIR}"/${PN}-5.6-gfbsd.patch + epatch "${FILESDIR}"/${PN}-5.7-emacs.patch #270527 +} + +src_compile() { + unset TERMINFO #115036 + tc-export BUILD_CC + export BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642 + + do_compile narrowc + use unicode && do_compile widec --enable-widec --includedir=/usr/include/ncursesw +} +do_compile() { + ECONF_SOURCE=${S} + + mkdir "${WORKDIR}"/$1 + cd "${WORKDIR}"/$1 + shift + + # The chtype/mmask-t settings below are to retain ABI compat + # with ncurses-5.4 so dont change em ! + local conf_abi=" + --with-chtype=long \ + --with-mmask-t=long \ + --disable-ext-colors \ + --disable-ext-mouse \ + --without-pthread \ + --without-reentrant \ + " + # We need the basic terminfo files in /etc, bug #37026. We will + # add '--with-terminfo-dirs' and then populate /etc/terminfo in + # src_install() ... +# $(use_with berkdb hashed-db) + econf \ + --libdir="/$(get_libdir)" \ + --with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \ + --with-shared \ + --without-hashed-db \ + $(use_with ada) \ + $(use_with cxx) \ + $(use_with cxx cxx-binding) \ + $(use_with debug) \ + $(use_with profile) \ + $(use_with gpm) \ + --disable-termcap \ + --enable-symlinks \ + --with-rcs-ids \ + --with-manpage-format=normal \ + --enable-const \ + --enable-colorfgbg \ + --enable-echo \ + $(use_enable !ada warnings) \ + $(use_with debug assertions) \ + $(use_with !debug leaks) \ + $(use_with debug expanded) \ + $(use_with !debug macros) \ + $(use_with trace) \ + ${conf_abi} \ + "$@" \ + || 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 second so that the binaries in /usr/bin + # support both wide and narrow + cd "${WORKDIR}"/narrowc + emake DESTDIR="${D}" install || die "make narrowc install failed" + if use unicode ; then + cd "${WORKDIR}"/widec + emake DESTDIR="${D}" install || die "make widec install failed" + fi + + # Move static and extraneous ncurses libraries out of /lib + dodir /usr/$(get_libdir) + cd "${D}"/$(get_libdir) + mv lib{form,menu,panel}.so* *.a "${D}"/usr/$(get_libdir)/ + gen_usr_ldscript lib{,n}curses.so + if use unicode ; then + mv lib{form,menu,panel}w.so* "${D}"/usr/$(get_libdir)/ + gen_usr_ldscript libncursesw.so + fi + +# if ! use berkdb ; then + # 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 +# fi + + echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses + doenvd "${T}"/50ncurses + + use minimal && rm -r "${D}"/usr/share/terminfo* + # Because ncurses5-config --terminfo returns the directory we keep it + keepdir /usr/share/terminfo #245374 + + cd "${S}" + dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc + use doc && dohtml -r doc/html/ +} |