Add support for --enable-const #111961 by Horst Schirmeier.

Package-Manager: portage-2.0.53_rc7

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index b2b5a86622ba780211130ad82d49efcd5899c54d..a784c271dceb3d4995ec8a6ac9243d38a6fe6156 100644 (file)
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.102 2005/10/20 04:59:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.103 2005/11/10 02:46:58 vapier Exp $
+
+*ncurses-5.5-r1 (10 Nov 2005)
+
+  10 Nov 2005; Mike Frysinger <vapier@gentoo.org> +ncurses-5.5-r1.ebuild:
+  Add support for --enable-const #111961 by Horst Schirmeier.
 
 *ncurses-5.5 (20 Oct 2005)
 

diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index b9f39941e672cd0d0a6a1114306fd933b4d9cdce..5d4170c46f5a5978b17bd45dfb75fa0b9d762501 100644 (file)
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,11 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 78573214cb32527c31807d23215faebf ChangeLog 15702
+MD5 189ef9e1acde41c585061ec6d469d399 ChangeLog 15870
 MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r5 64
 MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r6 64
 MD5 97d66c7857e4be9c07d6ae8d7798a16c files/digest-ncurses-5.4.20050319 142
 MD5 cfb597b362a2079e24880e47e24357df files/digest-ncurses-5.5 64
+MD5 cfb597b362a2079e24880e47e24357df files/digest-ncurses-5.5-r1 64
 MD5 118971faee11066510aa77e6c6a2c51b files/ncurses-5.4-c++-templates.patch 351
 MD5 1ecbf68a55269d2cebeb997f6973fc1d files/ncurses-5.4-share-sed.patch 686
 MD5 61ecd5aac5ddbd35cc4d4a00282eed01 files/ncurses-5.4-xterm.patch 495
@@ -14,11 +15,12 @@ MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 a885c047e0ef76d733b76f158c480f2a ncurses-5.4-r5.ebuild 6147
 MD5 d303a209fc62dfcb17c00343f1fc6dcb ncurses-5.4-r6.ebuild 5385
 MD5 45af8f6f6c26f746944e5e170f4ce537 ncurses-5.4.20050319.ebuild 5741
+MD5 edf823f9288a022eb5b682decb638b3c ncurses-5.5-r1.ebuild 5251
 MD5 05ffcf86aeb3d3f5c9a5bfd5a72fb2d2 ncurses-5.5.ebuild 5253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDVyS9gIKl8Uu19MoRAivWAJ4s5jRa6tcGhsSrtaJl2ifaBUQvlACdEQ6U
-PeqGonsvsmeXi49GTZdMPKU=
-=VwmW
+iD8DBQFDcrTSgIKl8Uu19MoRAm1NAKCAkkRQS0mNpQKnNauDKL8e6YIYCgCfTLws
+CSh6YaUWM6qHUkLD1hqSaN0=
+=mV0p
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/ncurses/files/digest-ncurses-5.5-r1 b/sys-libs/ncurses/files/digest-ncurses-5.5-r1
new file mode 100644 (file)
index 0000000..2e5cf2c
--- /dev/null
+++ b/sys-libs/ncurses/files/digest-ncurses-5.5-r1
@@ -0,0 +1 @@
+MD5 e73c1ac10b4bfc46db43b2ddfd6244ef ncurses-5.5.tar.gz 2314030

diff --git a/sys-libs/ncurses/ncurses-5.5-r1.ebuild b/sys-libs/ncurses/ncurses-5.5-r1.ebuild
new file mode 100644 (file)
index 0000000..714eade
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-5.5-r1.ebuild
@@ -0,0 +1,172 @@
+# 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.5-r1.ebuild,v 1.1 2005/11/10 02:46:58 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 ~x86"
+IUSE="gpm build bootstrap debug doc minimal unicode nocxx"
+
+DEPEND="gpm? ( sys-libs/gpm )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       [[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
+}
+
+src_compile() {
+       tc-export BUILD_CC
+
+       # 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}
+
+       local mylibprefix=""
+       [[ ${USERLAND} == "Darwin" ]] && mylibprefix="/usr"
+
+       # We need the basic terminfo files in /etc, bug #37026.  We will
+       # add '--with-terminfo-dirs' and then populate /etc/terminfo in
+       # src_install() ...
+       # The chtype/mmask-t settings below are to retain ABI compat
+       # with ncurses-5.4 so dont change em !
+       econf \
+               --libdir=${mylibprefix}/$(get_libdir) \
+               --with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
+               --disable-termcap \
+               --with-shared \
+               --with-rcs-ids \
+               --without-ada \
+               --enable-symlinks \
+               --enable-const \
+               --with-chtype='long' \
+               --with-mmask-t='long' \
+               $(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"
+
+       if [[ ${USERLAND} != "Darwin" ]] ; then
+               # 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
+               use unicode && gen_usr_ldscript lib{,n}cursesw.so
+       fi
+
+       # 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 -pPR l/linux n/nxterm v/vt100 "${T}"
+               rm -rf *
+               mkdir l x v
+               cp -pPR "${T}"/linux l
+               cp -pPR "${T}"/nxterm x/xterm
+               cp -pPR "${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
+}