diff options
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/ncurses/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch | 24 | ||||
| -rw-r--r-- | sys-libs/ncurses/files/ncurses-5.8-rxvt-unicode.patch | 189 | ||||
| -rw-r--r-- | sys-libs/ncurses/ncurses-5.8.ebuild | 163 |
4 files changed, 383 insertions, 1 deletions
diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog index 4cef777f69a4..e5f5eeb3a4de 100644 --- a/sys-libs/ncurses/ChangeLog +++ b/sys-libs/ncurses/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/ncurses # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.179 2011/03/01 07:51:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.180 2011/03/01 07:52:56 vapier Exp $ + +*ncurses-5.8 (01 Mar 2011) + + 01 Mar 2011; Mike Frysinger <vapier@gentoo.org> +ncurses-5.8.ebuild, + +files/ncurses-5.8-gfbsd.patch, +files/ncurses-5.8-rxvt-unicode.patch: + Version bump. *ncurses-5.7-r7 (01 Mar 2011) diff --git a/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch b/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch new file mode 100644 index 000000000000..0200a14462af --- /dev/null +++ b/sys-libs/ncurses/files/ncurses-5.8-gfbsd.patch @@ -0,0 +1,24 @@ +we'll hijack the freebsd* case that comes later + +--- ncurses-5.6/aclocal.m4 ++++ ncurses-5.6/aclocal.m4 +@@ -3806,7 +3806,7 @@ + fi + cf_cv_rm_so_locs=yes + ;; +- linux*|gnu*|k*bsd*-gnu) #(vi ++ linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) #(vi + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" +--- ncurses-5.6/configure ++++ ncurses-5.6/configure +@@ -3806,7 +3806,7 @@ + fi + cf_cv_rm_so_locs=yes + ;; +- linux*|gnu*|k*bsd*-gnu) #(vi ++ linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) #(vi + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" diff --git a/sys-libs/ncurses/files/ncurses-5.8-rxvt-unicode.patch b/sys-libs/ncurses/files/ncurses-5.8-rxvt-unicode.patch new file mode 100644 index 000000000000..33a3b0d84887 --- /dev/null +++ b/sys-libs/ncurses/files/ncurses-5.8-rxvt-unicode.patch @@ -0,0 +1,189 @@ +Add rxvt-unicode terminfo, required by rxvt-unicode to function properly. + +Providing this in ncurses makes it widely available, much better than having to +install rxvt-unicode everywhere. + +http://bugs.gentoo.org/show_bug.cgi?id=192083 + +This patch uses the updated rxvt-unicode-9.09 terminfo +which adds support for 256 colors. + +--- misc/terminfo.src ++++ misc/terminfo.src +@@ -3965,6 +3965,176 @@ + rxvt-16color|xterm with 16 colors like aixterm, + ncv#32, use=ibm+16color, use=rxvt, + ++# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997 ++# Updated: Özgür Kesim <kesim@math.fu-berlin.de> 02 Nov 1997 ++# Updated: Marc Lehmann <pcg@goof.com>, 17 Feb 2005 ++# Updated: Marc Lehmann <schmorp@schmorp.de>, 04 Nov 2008: change init/reset sequences ++rxvt-unicode|rxvt-unicode terminal (X Window System), ++ am, ++ bce, ++ eo, ++ km, ++ msgr, ++ xenl, ++ hs, ++ cols#80, ++ it#8, ++ lines#24, ++ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG, ++ bel=^G, ++ blink=\E[5m, ++ bold=\E[1m, ++ civis=\E[?25l, ++ clear=\E[H\E[2J, ++ cnorm=\E[?25h, ++ 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, ++ cvvis=\E[?25h, ++ dch=\E[%p1%dP, ++ dch1=\E[P, ++ dl=\E[%p1%dM, ++ dl1=\E[M, ++ ed=\E[J, ++ el=\E[K, ++ el1=\E[1K, ++ flash=\E[?5h$<20/>\E[?5l, ++ home=\E[H, ++ hpa=\E[%i%p1%dG, ++ ht=^I, ++ hts=\EH, ++ ich=\E[%p1%d@, ++ ich1=\E[@, ++ il=\E[%p1%dL, ++ il1=\E[L, ++ ind=^J, ++ is1=\E[\041p, ++ is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, ++ kDC=\E[3$, ++ kIC=\E2$, ++ kEND=\E[8$, ++ kHOM=\E[7$, ++ kLFT=\E[d, ++ kNXT=\E[6$, ++ kPRV=\E[5$, ++ kRIT=\E[c, ++ kbs=\177, ++ ka1=\EOw, ++ ka3=\EOy, ++ kb2=\EOu, ++ kc1=\EOq, ++ kc3=\EOs, ++ kcbt=\E[Z, ++ kcub1=\E[D, ++ kcud1=\E[B, ++ kcuf1=\E[C, ++ kcuu1=\E[A, ++ kdch1=\E[3~, ++ kel=\E[8\^, ++ kend=\E[8~, ++ kent=\EOM, ++ kf1=\E[11~, ++ kf10=\E[21~, ++ kf11=\E[23~, ++ kf12=\E[24~, ++ kf13=\E[25~, ++ kf14=\E[26~, ++ kf15=\E[28~, ++ kf16=\E[29~, ++ kf17=\E[31~, ++ kf18=\E[32~, ++ kf19=\E[33~, ++ kf2=\E[12~, ++ kf20=\E[34~, ++ kf3=\E[13~, ++ kf4=\E[14~, ++ kf5=\E[15~, ++ kf6=\E[17~, ++ kf7=\E[18~, ++ kf8=\E[19~, ++ kf9=\E[20~, ++ kfnd=\E[1~, ++ khome=\E[7~, ++ kich1=\E[2~, ++ kmous=\E[M, ++ knp=\E[6~, ++ kpp=\E[5~, ++ kslt=\E[4~, ++ rc=\E8, ++ rev=\E[7m, ++ ri=\EM, ++ rmso=\E[27m, ++ rmul=\E[24m, ++ rs1=\Ec, ++ rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l, ++ sgr0=\E[m\E(B, ++ enacs=, ++ smacs=\E(0, ++ rmacs=\E(B, ++ smso=\E[7m, ++ smul=\E[4m, ++ tbc=\E[3g, ++ vpa=\E[%i%p1%dd, ++ colors#88, ++ pairs#7744, ++ btns#5, ++ lm#0, ++ ccc, ++ npc, ++ mc5i, ++ ncv#0, ++ mir, ++ xon, ++ bw, ++ ech=\E[%p1%dX, ++ mc0=\E[i, ++ mc4=\E[4i, ++ mc5=\E[5i, ++ sitm=\E[3m, ++ ritm=\E[23m, ++ smam=\E[?7h, ++ rmam=\E[?7l, ++ smir=\E[4h, ++ rmir=\E[4l, ++ smcup=\E[?1049h, ++ rmcup=\E[r\E[?1049l, ++ smkx=\E=, ++ rmkx=\E>, ++ indn=\E[%p1%dS, ++ rin=\E[%p1%dT, ++ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;, ++ op=\E[39;49m, ++ setaf=\E[38;5;%p1%dm, ++ setab=\E[48;5;%p1%dm, ++ setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, ++ setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;, ++ initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\, ++ sc=\E7, ++ s0ds=\E(B, ++ s1ds=\E(0, ++ s2ds=\E*B, ++ s3ds=\E+B, ++ u6=\E[%i%d;%dR, ++ u7=\E[6n, ++ u8=\E[?1;2c, ++ u9=\E[c, ++ tsl=\E]2;, ++ fsl=\007, ++ dsl=\E]2;\007, ++ ++rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System), ++ colors#256, ++ pairs#32767, ++ use=rxvt-unicode, ++ + # mrxvt 0.5.4 + # + # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which diff --git a/sys-libs/ncurses/ncurses-5.8.ebuild b/sys-libs/ncurses/ncurses-5.8.ebuild new file mode 100644 index 000000000000..edb924c13553 --- /dev/null +++ b/sys-libs/ncurses/ncurses-5.8.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.8.ebuild,v 1.1 2011/03/01 07:52:56 vapier Exp $ + +EAPI="1" +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 ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="ada +cxx debug doc gpm minimal profile static-libs trace unicode" + +DEPEND="gpm? ( sys-libs/gpm )" +# berkdb? ( sys-libs/db )" +RDEPEND="!<x11-terms/rxvt-unicode-9.06-r3" + +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.8-gfbsd.patch + epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch + epatch "${FILESDIR}"/${PN}-5.8-rxvt-unicode.patch #192083 +} + +src_compile() { + unset TERMINFO #115036 + tc-export BUILD_CC + export BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642 + + # when cross-compiling, we need to build up our own tic + # because people often don't keep matching host/target + # ncurses versions #249363 + if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then + make_flags="-C progs tic" + CHOST=${CBUILD} \ + CFLAGS=${BUILD_CFLAGS} \ + CXXFLAGS=${BUILD_CXXFLAGS} \ + CPPFLAGS=${BUILD_CPPFLAGS} \ + LDFLAGS="${BUILD_LDFLAGS} -static" \ + do_compile cross --without-shared --with-normal + fi + + make_flags="" + 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 \ + --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_enable debug leaks) \ + $(use_with debug expanded) \ + $(use_with !debug macros) \ + $(use_with trace) \ + ${conf_abi} \ + "$@" + + # 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. + emake -j1 sources || die + emake ${make_flags} || die +} + +src_install() { + # use the cross-compiled tic (if need be) #249363 + export PATH=${WORKDIR}/cross/progs:${PATH} + + # install unicode version second so that the binaries in /usr/bin + # support both wide and narrow + cd "${WORKDIR}"/narrowc + emake DESTDIR="${D}" install || die + if use unicode ; then + cd "${WORKDIR}"/widec + emake DESTDIR="${D}" install || die + fi + + # Move libncurses{,w} into /lib + gen_usr_ldscript -a ncurses + use unicode && gen_usr_ldscript -a ncursesw + ln -sf libncurses.so "${D}"/usr/$(get_libdir)/libcurses.so || die + use static-libs || rm "${D}"/usr/$(get_libdir)/*.a + +# 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 rxvt-unicode 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/ +} |