diff options
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/ncurses/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-libs/ncurses/Manifest | 26 | ||||
| -rw-r--r-- | sys-libs/ncurses/files/digest-ncurses-5.4-r2 | 1 | ||||
| -rw-r--r-- | sys-libs/ncurses/ncurses-5.4-r2.ebuild | 169 |
4 files changed, 186 insertions, 18 deletions
diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog index a5d0680bfd48..0e948aff1d88 100644 --- a/sys-libs/ncurses/ChangeLog +++ b/sys-libs/ncurses/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/ncurses # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.65 2004/06/07 17:28:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.66 2004/06/20 02:38:53 solar Exp $ + +*ncurses-5.4-r2 (19 Jun 2004) + + 19 Jun 2004; <solar@gentoo.org> ncurses-5.4-r2.ebuild: + Add missing IUSE='build bootstrap' flags and new uclibc IUSE flag. Remove + extraneous ncurses libraries when bootstraping and or when uclibc is set. 07 Jun 2004; Mike Frysinger <vapier@gentoo.org> ncurses-5.4-r1.ebuild: Move back into ~ppc since latest xfree/xorg-x11/gcc combination should fix the diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest index 54503e52e1f0..9fec9f2a572b 100644 --- a/sys-libs/ncurses/Manifest +++ b/sys-libs/ncurses/Manifest @@ -1,22 +1,14 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 b7c71eeb40d4cb074f10c94b658d43e7 ChangeLog 10778 +MD5 9cd6d80dc07939585707baed13ea10c9 ncurses-5.4-r1.ebuild 4495 +MD5 ce9147abe082b9b85a9805c910711c25 ncurses-5.4-r2.ebuild 5142 +MD5 a89cdbc81558f8517491eb3cec0c64a0 ncurses-5.3-r5.ebuild 3828 +MD5 3f882e7dfb028860374dcdf5ebdd440d ChangeLog 11017 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 db75ec065134459591abd33360d27283 ncurses-5.3-r5.ebuild 3829 -MD5 cfae6bf1d7eae80afe4891e73daa2eff ncurses-5.4-r1.ebuild 4496 MD5 f96d1b4b0bf94f1d38ce950df0efb37e files/ncurses-5.3-xterm.patch 1002 -MD5 2167b54d7c96964183554e767e5f5376 files/xterm-debian.ti 342 -MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r5 64 -MD5 143b9126206485a5faeb817fd94b1054 files/ncurses-5.3-coreutils.patch 1581 +MD5 61ecd5aac5ddbd35cc4d4a00282eed01 files/ncurses-5.4-xterm.patch 495 MD5 c5b265c81eb2dea26b66cd656c61e99c files/ncurses-5.3-share-sed.patch 686 +MD5 2167b54d7c96964183554e767e5f5376 files/xterm-debian.ti 342 MD5 1ecbf68a55269d2cebeb997f6973fc1d files/ncurses-5.4-share-sed.patch 686 -MD5 61ecd5aac5ddbd35cc4d4a00282eed01 files/ncurses-5.4-xterm.patch 495 +MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r5 64 MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r1 64 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.9.8 (GNU/Linux) - -iD8DBQFAxKXvHTu7gpaalycRAvgfAJwMGD2PZy3AGTaR9FO8unyd8lnI/wCePSgK -dZpljxjwl6HTkkKlMudV5n8= -=6Grk ------END PGP SIGNATURE----- +MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r2 64 +MD5 143b9126206485a5faeb817fd94b1054 files/ncurses-5.3-coreutils.patch 1581 diff --git a/sys-libs/ncurses/files/digest-ncurses-5.4-r2 b/sys-libs/ncurses/files/digest-ncurses-5.4-r2 new file mode 100644 index 000000000000..fdf84beb38f9 --- /dev/null +++ b/sys-libs/ncurses/files/digest-ncurses-5.4-r2 @@ -0,0 +1 @@ +MD5 069c8880072060373290a4fefff43520 ncurses-5.4.tar.gz 2154022 diff --git a/sys-libs/ncurses/ncurses-5.4-r2.ebuild b/sys-libs/ncurses/ncurses-5.4-r2.ebuild new file mode 100644 index 000000000000..69e76f7d95e6 --- /dev/null +++ b/sys-libs/ncurses/ncurses-5.4-r2.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r2.ebuild,v 1.1 2004/06/20 02:38:53 solar Exp $ + +inherit eutils flag-o-matic 64-bit gnuconfig + +DESCRIPTION="Linux console display library" +HOMEPAGE="http://www.gnu.org/software/ncurses/ncurses.html" +SRC_URI="mirror://gnu/ncurses/${P}.tar.gz" + +LICENSE="MIT" +SLOT="5" +KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390" +IUSE="build bootstrap debug uclibc" + +DEPEND="virtual/glibc" +# This doesn't fix the problem. bootstrap builds ncurses again with +# normal USE flags while bootstrap is unset, which apparently causes +# things to break -- avenj 2 Apr 04 +# !bootstrap? ( gpm? ( sys-libs/gpm ) )" + +src_unpack() { + unpack ${A} + + cd ${S} + epatch ${FILESDIR}/${P}-xterm.patch + # Bug #42336. + epatch ${FILESDIR}/${P}-share-sed.patch +} + +src_compile() { + local myconf= + + filter-flags -fno-exceptions + + use debug || myconf="${myconf} --without-debug" + + # Shared objects are compiled properly with -fPIC, but + # standard libs also require this. + 64-bit && append-flags -fPIC + filter-ldflags -pie + + # Detect mips systems + use mips && gnuconfig_update + + # 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. + # <azarah@gentoo.org> (23 Oct 2002) + ( use build || use bootstrap || use uclibc ) \ + && myconf="${myconf} --without-cxx --without-cxx-binding --without-ada" + + # see note about DEPEND above -- avenj@gentoo.org 2 Apr 04 +# use gpm && myconf="${myconf} --with-gpm" + + # 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=/lib \ + --with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \ + --disable-termcap \ + --with-shared \ + --with-rcs-ids \ + --without-ada \ + ${myconf} \ + || 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() { + local x= + + make DESTDIR=${D} install || die "make install failed" + + # Move static and extraneous ncurses libraries out of /lib + cd ${D}/lib + dodir /usr/lib + mv libform* libmenu* libpanel* ${D}/usr/lib + mv *.a ${D}/usr/lib + # bug #4411 + gen_usr_ldscript libncurses.so || die "gen_usr_ldscript failed" + + # We need the basic terminfo files in /etc, bug #37026 + einfo "Installing basic terminfo files in /etc..." + # added some for uclibc + #for x in dumb linux rxvt screen sun vt{52,100,102,220} xterm + 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/lib/terminfo + + dodir /etc/env.d + echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > ${D}/etc/env.d/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 + # bash compilation requires static libncurses libraries, so + # this breaks the "build a new build image" system. We now + # need to remove libncurses.a from the build image manually. + # cd ${D}/usr/lib; rm *.a + # remove extraneous ncurses libraries + cd ${D}/usr/lib; rm -f lib{form,menu,panel}* + cd ${D}/usr/include; rm -f {eti,form,menu,panel}.h + else + if ( use bootstrap || use uclibc ) ; then + cd ${D}/usr/lib; rm -f lib{form,menu,panel,ncurses++}* + cd ${D}/usr/include; rm -f {eti,form,menu,panel}.h cursesapp.h curses?.h cursslk.h etip.h + fi + # Install xterm-debian terminfo entry to satisfy bug #18486 + LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/lib:${D}/lib \ + TERMINFO=${D}/usr/share/terminfo \ + ${D}/usr/bin/tic ${FILESDIR}/xterm-debian.ti + + if use uclibc ; then + cp ${D}/usr/share/terminfo/x/xterm-debian ${D}/etc/terminfo/x/ + rm -rf ${D}/usr/share/terminfo/* + fi + + cd ${S} + dodoc ANNOUNCE MANIFEST NEWS README* TO-DO + dodoc doc/*.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 /lib/libncurses.so.5.[23] + rm -f /usr/lib/lib{form,menu,panel}.so.5.[23] +} |