summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Wendel <lanius@gentoo.org>2004-08-19 14:48:26 +0000
committerHeinrich Wendel <lanius@gentoo.org>2004-08-19 14:48:26 +0000
commitac528afa5e9a98f8a0ae2e19e687121043615852 (patch)
treee9bb6c35d47a64d50b7f7b58f411d3b80bee98ff /sys-libs/ncurses
parentVersion bump. (Manifest recommit) (diff)
downloadgentoo-2-ac528afa5e9a98f8a0ae2e19e687121043615852.tar.gz
gentoo-2-ac528afa5e9a98f8a0ae2e19e687121043615852.tar.bz2
gentoo-2-ac528afa5e9a98f8a0ae2e19e687121043615852.zip
add utf-8 support, bug #20006, #27700
Diffstat (limited to 'sys-libs/ncurses')
-rw-r--r--sys-libs/ncurses/ChangeLog7
-rw-r--r--sys-libs/ncurses/Manifest26
-rw-r--r--sys-libs/ncurses/files/digest-ncurses-5.4-r41
-rw-r--r--sys-libs/ncurses/ncurses-5.4-r4.ebuild193
4 files changed, 214 insertions, 13 deletions
diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index fc5a43332e4a..801495fcf377 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-libs/ncurses
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.74 2004/08/17 20:19:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.75 2004/08/19 14:48:26 lanius Exp $
+
+*ncurses-5.4-r4 (19 Aug 2004)
+
+ 19 Aug 2004; Heinrich Wendel <lanius@gentoo.org> ncurses-5.4-r4.ebuild:
+ add utf-8 support, bug #20006, #27700
17 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> ncurses-5.4-r3.ebuild:
IUSE doc
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index fd70f5031028..cd4bdb8c49b6 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,18 +1,20 @@
-MD5 d0c437ebcddcbc9354b0e46170759730 ChangeLog 12055
-MD5 b64893113afb0ce133c2d3445394666f ncurses-5.4-r2.ebuild 5672
-MD5 e0cbea07444890f3bd2fa7462ee9b8c9 ncurses-8.1.ebuild 401
+MD5 5f45832dca8a592ee9b30aa27a26ab3e ncurses-5.4-r1.ebuild 5023
MD5 67809502940dfc2279c85ba964cf9208 ncurses-5.4-r3.ebuild 5628
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 e0cbea07444890f3bd2fa7462ee9b8c9 ncurses-8.1.ebuild 401
+MD5 b64893113afb0ce133c2d3445394666f ncurses-5.4-r2.ebuild 5672
MD5 31b0e575ef0e06746b60c74b3e9cdbe8 ncurses-5.3-r5.ebuild 3788
-MD5 5f45832dca8a592ee9b30aa27a26ab3e ncurses-5.4-r1.ebuild 5023
-MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r2 64
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ncurses-8.1 0
-MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r3 64
+MD5 7b43e97e8817fc943c88983c8a859b48 ChangeLog 12201
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 9b514f901c5f96e3c453900e2456f4fa ncurses-5.4-r4.ebuild 6015
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 d41d8cd98f00b204e9800998ecf8427e files/digest-ncurses-8.1 0
+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
+MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r2 64
+MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r3 64
+MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r4 64
+MD5 143b9126206485a5faeb817fd94b1054 files/ncurses-5.3-coreutils.patch 1581
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.4-r4 b/sys-libs/ncurses/files/digest-ncurses-5.4-r4
new file mode 100644
index 000000000000..fdf84beb38f9
--- /dev/null
+++ b/sys-libs/ncurses/files/digest-ncurses-5.4-r4
@@ -0,0 +1 @@
+MD5 069c8880072060373290a4fefff43520 ncurses-5.4.tar.gz 2154022
diff --git a/sys-libs/ncurses/ncurses-5.4-r4.ebuild b/sys-libs/ncurses/ncurses-5.4-r4.ebuild
new file mode 100644
index 000000000000..f80762d0c8f9
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-5.4-r4.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.4-r4.ebuild,v 1.1 2004/08/19 14:48:26 lanius Exp $
+
+inherit eutils flag-o-matic 64-bit gnuconfig
+
+DESCRIPTION="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 doc uclibc unicode"
+
+DEPEND="virtual/libc"
+# 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
+ gnuconfig_update
+}
+
+pkg_setup() {
+ # this adds support for installing to lib64/lib32. since only portage
+ # 2.0.51 will have this functionality supported in dolib and friends,
+ # and since it isnt expected that many profiles will define it, we need
+ # to make this variable default to lib.
+ [ -z "${CONF_LIBDIR}" ] && export CONF_LIBDIR="lib"
+}
+
+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
+
+ # 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"
+
+ # enable utf-8 support
+ use unicode && myconf="${myconf} --enable-widec"
+
+ # 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=/${CONF_LIBDIR} \
+ --with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
+ --disable-termcap \
+ --with-shared \
+ --with-rcs-ids \
+ --without-ada \
+ --enable-symlinks \
+ ${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}/${CONF_LIBDIR}
+ dodir /usr/${CONF_LIBDIR}
+ mv libform* libmenu* libpanel* *.a ${D}/usr/${CONF_LIBDIR}
+
+ if use unicode ; then
+ gen_usr_ldscript libncursesw.so
+ for i in ${D}/usr/lib/*w.*; do
+ local libncurses=${i/${D}/}
+ dosym ${libncurses} ${libncurses/w./.}
+ done
+ for i in ${D}/lib/libncursesw.so*; do
+ local libncurses=${i/${D}}
+ dosym ${libncurses} ${libncurses/w./.}
+ done
+ else
+ # bug #4411
+ gen_usr_ldscript libncurses.so || die "gen_usr_ldscript failed"
+ fi
+
+ # 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/${CONF_LIBDIR}/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 ; 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/${CONF_LIBDIR}:${D}/${CONF_LIBDIR} \
+ 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 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 /lib/libncurses.so.5.[23] /usr/lib/lib{form,menu,panel}.so.5.[23]
+ if [ "${CONF_LIBDIR}" != "lib" ] ;then
+ rm -f /${CONF_LIBDIR}/libncurses.so.5.[23] \
+ /usr/${CONF_LIBDIR}/lib{form,menu,panel}.so.5.[23]
+ fi
+}