From edf9c5a6e3b756f27aaef63954b108336d38a8d7 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 17 Jan 2007 20:25:59 +0000 Subject: [PATCH] Version bump #162561 by Michael Cramer. Package-Manager: portage-2.1.2 --- sys-libs/ncurses/ChangeLog | 8 +- sys-libs/ncurses/Manifest | 33 ++-- sys-libs/ncurses/files/digest-ncurses-5.6 | 3 + .../ncurses/files/ncurses-5.6-gfbsd.patch | 24 +++ sys-libs/ncurses/ncurses-5.6.ebuild | 181 ++++++++++++++++++ 5 files changed, 234 insertions(+), 15 deletions(-) create mode 100644 sys-libs/ncurses/files/digest-ncurses-5.6 create mode 100644 sys-libs/ncurses/files/ncurses-5.6-gfbsd.patch create mode 100644 sys-libs/ncurses/ncurses-5.6.ebuild diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog index 4162f15400b7..5093cace2cad 100644 --- a/sys-libs/ncurses/ChangeLog +++ b/sys-libs/ncurses/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-libs/ncurses # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.129 2007/01/16 22:36:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.130 2007/01/17 20:25:59 vapier Exp $ + +*ncurses-5.6 (17 Jan 2007) + + 17 Jan 2007; Mike Frysinger + +files/ncurses-5.6-gfbsd.patch, +ncurses-5.6.ebuild: + Version bump #162561 by Michael Cramer. 16 Jan 2007; Mike Frysinger ncurses-5.5-r3.ebuild: Dont compress manpages #162396 by Michael Cramer. diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest index 0cdb633d8f52..7224ac6a4502 100644 --- a/sys-libs/ncurses/Manifest +++ b/sys-libs/ncurses/Manifest @@ -21,24 +21,29 @@ AUX ncurses-5.5-terminfo-gnome.patch 597 RMD160 08f295ee2441dfae36b692f29fdb39dc MD5 d4e86212987c8a600a510b09d1c27090 files/ncurses-5.5-terminfo-gnome.patch 597 RMD160 08f295ee2441dfae36b692f29fdb39dcd7e1390a files/ncurses-5.5-terminfo-gnome.patch 597 SHA256 cc5110c84c1cdfdc13ea11c8cecf0f48a35c4096a25e10ba814889e5f3df2696 files/ncurses-5.5-terminfo-gnome.patch 597 +AUX ncurses-5.6-gfbsd.patch 817 RMD160 2d5a96174730a93320e391cb057880df4996854e SHA1 b6798815c44059a00a2bcd4f9f28bbf74dfc0e2d SHA256 d9e94c5068a22d32f52c5db6aadc3793af11bb0c08b006e375921726931e0065 +MD5 7bd729ea90b7498696c5a7f5ac57d480 files/ncurses-5.6-gfbsd.patch 817 +RMD160 2d5a96174730a93320e391cb057880df4996854e files/ncurses-5.6-gfbsd.patch 817 +SHA256 d9e94c5068a22d32f52c5db6aadc3793af11bb0c08b006e375921726931e0065 files/ncurses-5.6-gfbsd.patch 817 DIST ncurses-5.4.tar.gz 2154022 RMD160 36369f4e2c76c396de51809deb8a671d8ca3d19e SHA1 c0dfaf2c4d383915f898a97c8caeace8a0a2c8b7 SHA256 5abce063cf431790f4e6a801a96c7eea0b33a41ecd0970f6312f52575c083b36 DIST ncurses-5.5.tar.gz 2314030 RMD160 aac34d2530519fbb0fde7af87a365205339ba230 SHA1 46414a72e91a62f63a8c9af00f0d65497f5ecc5a SHA256 27a63f3a2ac9d13c1ed9a0a33ee4497c19a6b5810b8f9738e7654a0e12225b93 +DIST ncurses-5.6.tar.gz 2402592 RMD160 1a878819c43e6426500fd74ccedf0a032ef399d8 SHA1 4d54d8ad0b90fffa2780a0a45edb6fcb027ef18d SHA256 f9cac2b31683a37d65bc37119599752198a0691e462d0d1a252cf9815f5724d5 EBUILD ncurses-5.4-r6.ebuild 5465 RMD160 94046d6c0c855ebacfd0815a9dc68a576d8bac72 SHA1 c2190dd1fcf260c3312394111482bbef728a7fe4 SHA256 64c5e129d6d1c8f42cb4b973e300f212916c2b7335d342844acb04cbb3083dbd MD5 3a23bee1fd81e1d279ec4632e9cc383e ncurses-5.4-r6.ebuild 5465 RMD160 94046d6c0c855ebacfd0815a9dc68a576d8bac72 ncurses-5.4-r6.ebuild 5465 SHA256 64c5e129d6d1c8f42cb4b973e300f212916c2b7335d342844acb04cbb3083dbd ncurses-5.4-r6.ebuild 5465 -EBUILD ncurses-5.5-r2.ebuild 5402 RMD160 d99b702ef4932c727be6c008ff9d3161ca6b4071 SHA1 ea71c9c932725ffe89963bac6ae57af6ab41d671 SHA256 3cb9c682545c2f534b7d05978845028dc37b949ec303ba84c3928b1d009f89d2 -MD5 ddc3408ed01dd382c8bd2943c6eb7df7 ncurses-5.5-r2.ebuild 5402 -RMD160 d99b702ef4932c727be6c008ff9d3161ca6b4071 ncurses-5.5-r2.ebuild 5402 -SHA256 3cb9c682545c2f534b7d05978845028dc37b949ec303ba84c3928b1d009f89d2 ncurses-5.5-r2.ebuild 5402 EBUILD ncurses-5.5-r3.ebuild 5524 RMD160 06488893ddbc85178781d33ed224a942a5518cb3 SHA1 919c494fbd4873dd861888464b6d014809605d15 SHA256 906c28e44f0826941107ea00913b0257ca2e8cca7bff97d601d60ad756f7e927 MD5 1261a5cc58730bf871eee272225ed1e0 ncurses-5.5-r3.ebuild 5524 RMD160 06488893ddbc85178781d33ed224a942a5518cb3 ncurses-5.5-r3.ebuild 5524 SHA256 906c28e44f0826941107ea00913b0257ca2e8cca7bff97d601d60ad756f7e927 ncurses-5.5-r3.ebuild 5524 -MISC ChangeLog 19187 RMD160 e63588c718dd6f68265ba1d21e34e3ba5373cf17 SHA1 89037419b492a780ffa6a42e2b8f423ced946aa1 SHA256 ce9bd15157b505cc3465895826a2136bf5a60dfd76daacb65f0e009a4209f2fc -MD5 0f64693f9b6ca1c24bb297345e0faa04 ChangeLog 19187 -RMD160 e63588c718dd6f68265ba1d21e34e3ba5373cf17 ChangeLog 19187 -SHA256 ce9bd15157b505cc3465895826a2136bf5a60dfd76daacb65f0e009a4209f2fc ChangeLog 19187 +EBUILD ncurses-5.6.ebuild 5489 RMD160 c7f9ae1eed5c8abd093cc553a2faeb8342487b19 SHA1 fc2a8af50c7ebf9ec409d8b21498e120dded1910 SHA256 0ec9a24d8775e0a8812d4d03211a25c7825d32e9154e4b3e4b9661fa43e7e3ae +MD5 263bdb6296f78a892159dba7a9d2eecc ncurses-5.6.ebuild 5489 +RMD160 c7f9ae1eed5c8abd093cc553a2faeb8342487b19 ncurses-5.6.ebuild 5489 +SHA256 0ec9a24d8775e0a8812d4d03211a25c7825d32e9154e4b3e4b9661fa43e7e3ae ncurses-5.6.ebuild 5489 +MISC ChangeLog 19363 RMD160 bf3a505f22f898a979efbc318ddec52b268ca1ce SHA1 be9ec36d6b5001329bae16e3aa153ed894117be0 SHA256 3d2b8a0ab64d320353a0b8b6fc0040ba3f8deec9438fe9be3209d4f97db6ecd5 +MD5 3246699fec9098c9b1a67291849aa324 ChangeLog 19363 +RMD160 bf3a505f22f898a979efbc318ddec52b268ca1ce ChangeLog 19363 +SHA256 3d2b8a0ab64d320353a0b8b6fc0040ba3f8deec9438fe9be3209d4f97db6ecd5 ChangeLog 19363 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -46,16 +51,16 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata MD5 f392f8bd1bddd04e1e8d26e3f270e7d0 files/digest-ncurses-5.4-r6 238 RMD160 2799f66e435f80b5914c6c5c75872cf4990555eb files/digest-ncurses-5.4-r6 238 SHA256 de50b8338b918f8782530f0ef1481d4a31e0f126103561ff18a39467b709e56f files/digest-ncurses-5.4-r6 238 -MD5 6a01577df5b8434affdc1217be2ba5b1 files/digest-ncurses-5.5-r2 238 -RMD160 755dd213b7e9f190613456f3bc9f419dcbc84271 files/digest-ncurses-5.5-r2 238 -SHA256 f86ecfaaa7faef60ffbc739f005574acbd940ee20502129d8d6c6aa433e1ecee files/digest-ncurses-5.5-r2 238 MD5 6a01577df5b8434affdc1217be2ba5b1 files/digest-ncurses-5.5-r3 238 RMD160 755dd213b7e9f190613456f3bc9f419dcbc84271 files/digest-ncurses-5.5-r3 238 SHA256 f86ecfaaa7faef60ffbc739f005574acbd940ee20502129d8d6c6aa433e1ecee files/digest-ncurses-5.5-r3 238 +MD5 815d6657066cf2f88061b6542dc5bfe0 files/digest-ncurses-5.6 238 +RMD160 dbf4e20e60f6247945ffbefcf00a455920d0c1b1 files/digest-ncurses-5.6 238 +SHA256 aeae266804b5463f9acb8a7ece8f88dfcb520a6b7705011e727b1c0cbe83632d files/digest-ncurses-5.6 238 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFrVN68bi6rjpTunYRAqpeAJ0ZVT5lRxDgoETIJT+/qBT9JdeayQCg4ktk -k/4i8Pv0LFBLzUFsx11c0Vc= -=dVtD +iD8DBQFFroZf8bi6rjpTunYRAi0BAJ9bRQhsDcmIXr7ifEn+GyZIJbulbwCgljNB +V98RJJmDZnuuA70d+skfUro= +=yCHx -----END PGP SIGNATURE----- diff --git a/sys-libs/ncurses/files/digest-ncurses-5.6 b/sys-libs/ncurses/files/digest-ncurses-5.6 new file mode 100644 index 000000000000..01afe97ca86c --- /dev/null +++ b/sys-libs/ncurses/files/digest-ncurses-5.6 @@ -0,0 +1,3 @@ +MD5 b6593abe1089d6aab1551c105c9300e3 ncurses-5.6.tar.gz 2402592 +RMD160 1a878819c43e6426500fd74ccedf0a032ef399d8 ncurses-5.6.tar.gz 2402592 +SHA256 f9cac2b31683a37d65bc37119599752198a0691e462d0d1a252cf9815f5724d5 ncurses-5.6.tar.gz 2402592 diff --git a/sys-libs/ncurses/files/ncurses-5.6-gfbsd.patch b/sys-libs/ncurses/files/ncurses-5.6-gfbsd.patch new file mode 100644 index 000000000000..4dc51d35a49d --- /dev/null +++ b/sys-libs/ncurses/files/ncurses-5.6-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 @@ + MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $[@]` -o $[@]' + cf_cv_rm_so_locs=yes + ;; +- linux*|gnu*|k*bsd*-gnu) ++ linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) + 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 @@ + MK_SHARED_LIB='${CC} -shared -rdata_shared -soname `basename $@` -o $@' + cf_cv_rm_so_locs=yes + ;; +- linux*|gnu*|k*bsd*-gnu) ++ linux*|gnu*|k*bsd*-gnu|freebsd*|dragonfly*) + if test "$DFT_LWR_MODEL" = "shared" ; then + LOCAL_LDFLAGS="-Wl,-rpath,\$(LOCAL_LIBDIR)" + LOCAL_LDFLAGS2="$LOCAL_LDFLAGS" diff --git a/sys-libs/ncurses/ncurses-5.6.ebuild b/sys-libs/ncurses/ncurses-5.6.ebuild new file mode 100644 index 000000000000..6f322e7e1c4e --- /dev/null +++ b/sys-libs/ncurses/ncurses-5.6.ebuild @@ -0,0 +1,181 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.6.ebuild,v 1.1 2007/01/17 20:25:59 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="bootstrap build debug doc gpm minimal nocxx trace unicode" + +DEPEND="gpm? ( sys-libs/gpm )" +RDEPEND="${DEPEND}" + +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 +} + +src_compile() { + tc-export BUILD_CC + + # Protect the user from themselves #115036 + unset TERMINFO + + # 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="" + [[ ${CHOST} == *-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' \ + --with-manpage-format=normal \ + $(use_with debug) \ + $(use_with gpm) \ + $(use_with trace) \ + "$@" \ + || 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 + make DESTDIR="${D}" install || die "make widec install failed" + fi + cd "${WORKDIR}"/narrowc + make DESTDIR="${D}" install || die "make narrowc install failed" + + if [[ ${CHOST} != *-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 + if use unicode ; then + mv lib{form,menu,panel}w.so* "${D}"/usr/$(get_libdir)/ + gen_usr_ldscript lib{,n}cursesw.so + fi + 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 +} -- 2.26.2