Update configure options used; tie more to USE=debug and USE=profile.

Package-Manager: portage-2.1.3_rc6

4 files changed, 192 insertions, 5 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 6aa33f216668..40ef0a2cf75d 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,11 @@
 # 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.141 2007/06/30 18:29:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.142 2007/07/09 01:30:46 vapier Exp $
+
+*ncurses-5.6-r2 (09 Jul 2007)
+
+  09 Jul 2007; Mike Frysinger <vapier@gentoo.org> +ncurses-5.6-r2.ebuild:
+  Update configure options used; tie more to USE=debug and USE=profile.
 
   30 Jun 2007; Raúl Porcel <armin76@gentoo.org> ncurses-5.6-r1.ebuild:
   ia64/x86 stable
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index aeba2178693e..7acf56b42234 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ncurses-5.4-c++-templates.patch 351 RMD160 d9a0e9387367be813e7067b4ddeddf907a2217b8 SHA1 80471645bee521e6f154c7ff5a9acdc2e87879ef SHA256 853fc14f7ab2f5eb156b2e7d658d79243877102a18cd2845e3ebd4eb24193d7c
 MD5 118971faee11066510aa77e6c6a2c51b files/ncurses-5.4-c++-templates.patch 351
 RMD160 d9a0e9387367be813e7067b4ddeddf907a2217b8 files/ncurses-5.4-c++-templates.patch 351
@@ -38,14 +41,18 @@ EBUILD ncurses-5.6-r1.ebuild 4521 RMD160 da497d58f0021305717d495e9cd257c36b1423c
 MD5 152086cf08d8b56acce4bc432690fcaf ncurses-5.6-r1.ebuild 4521
 RMD160 da497d58f0021305717d495e9cd257c36b1423c3 ncurses-5.6-r1.ebuild 4521
 SHA256 3569726de6b0a44bd778b9773c78050bd6ab9e0cb837f850609872e01c281194 ncurses-5.6-r1.ebuild 4521
+EBUILD ncurses-5.6-r2.ebuild 4820 RMD160 fb653e1db49f70657e519ae06dd259c69ff68f7a SHA1 292125463edc3a7abe63e314c3cd9c05066cc003 SHA256 a98151cc758601a7ca92a9c60e53d5003d5faa76f217e6e615daec3b1cf5671e
+MD5 378cfda3df8d0066be688b0a0b191284 ncurses-5.6-r2.ebuild 4820
+RMD160 fb653e1db49f70657e519ae06dd259c69ff68f7a ncurses-5.6-r2.ebuild 4820
+SHA256 a98151cc758601a7ca92a9c60e53d5003d5faa76f217e6e615daec3b1cf5671e ncurses-5.6-r2.ebuild 4820
 EBUILD ncurses-5.6.ebuild 4440 RMD160 a52592fa52df37fc10b88afcd233ada177acf0f0 SHA1 c074a68dc742f17a1d5d2100fba7aa756793c1f4 SHA256 64e2c6fd56c06fea4eec93e49fbfdeaf3342a1d79c32c5f868ced17a373f87ae
 MD5 04c5c49ff9ecef9f65d4f94f76fd7049 ncurses-5.6.ebuild 4440
 RMD160 a52592fa52df37fc10b88afcd233ada177acf0f0 ncurses-5.6.ebuild 4440
 SHA256 64e2c6fd56c06fea4eec93e49fbfdeaf3342a1d79c32c5f868ced17a373f87ae ncurses-5.6.ebuild 4440
-MISC ChangeLog 20676 RMD160 b80890367683285ab7cff09db61cc868187b7cef SHA1 a1fe3fed567e046bf1a887d2ef0ff6559e0e9321 SHA256 18e002dcde09b8f165796fcbcb9dfad125be59de6a1f6cf653fe36f17ba0c302
-MD5 920addd2cbcfec63ff2fb49dce317321 ChangeLog 20676
-RMD160 b80890367683285ab7cff09db61cc868187b7cef ChangeLog 20676
-SHA256 18e002dcde09b8f165796fcbcb9dfad125be59de6a1f6cf653fe36f17ba0c302 ChangeLog 20676
+MISC ChangeLog 20853 RMD160 bb05fef00789d571cd1b48eea471f9285eba1b63 SHA1 b355fcf68d213bd03b983dfd612f599a68fa79ba SHA256 6b0b6209fb3f45cd40a52ac8c220fcdc0c02d5589c6d7288dfc1b2589bf34c73
+MD5 96151d78d382e9f06873a944bd08565b ChangeLog 20853
+RMD160 bb05fef00789d571cd1b48eea471f9285eba1b63 ChangeLog 20853
+SHA256 6b0b6209fb3f45cd40a52ac8c220fcdc0c02d5589c6d7288dfc1b2589bf34c73 ChangeLog 20853
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -62,3 +69,13 @@ SHA256 aeae266804b5463f9acb8a7ece8f88dfcb520a6b7705011e727b1c0cbe83632d files/di
 MD5 4113e58a2761a788de58821d1058f534 files/digest-ncurses-5.6-r1 500
 RMD160 467579d539f83f3e670698737d5c1a5a2b78a05b files/digest-ncurses-5.6-r1 500
 SHA256 0ebdcdfd302a82613b796db3a2cfce0c7a6319992f7fc9ec80c1301444766042 files/digest-ncurses-5.6-r1 500
+MD5 4113e58a2761a788de58821d1058f534 files/digest-ncurses-5.6-r2 500
+RMD160 467579d539f83f3e670698737d5c1a5a2b78a05b files/digest-ncurses-5.6-r2 500
+SHA256 0ebdcdfd302a82613b796db3a2cfce0c7a6319992f7fc9ec80c1301444766042 files/digest-ncurses-5.6-r2 500
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGkZBmp/wUKkr7RBoRAmfVAKDkc271hSZSnSDRpiBUxLWfDv4mAACfbjwK
+EtDmjydxq4IPV8ZU//TBgs4=
+=UQMJ
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.6-r2 b/sys-libs/ncurses/files/digest-ncurses-5.6-r2
new file mode 100644
index 000000000000..93a3482eb6c2
--- /dev/null
+++ b/sys-libs/ncurses/files/digest-ncurses-5.6-r2
@@ -0,0 +1,6 @@
+MD5 27607b10fef869740cbcc408d86695b1 ncurses-5.6-coverity.patch.gz 6196
+RMD160 b11682ae9e043be8d6c50f040d8531f80fc26ce8 ncurses-5.6-coverity.patch.gz 6196
+SHA256 3deeef017c739116c17574e7fd235b1b05053f5c50c7bfeeee2e3f8e4332380e ncurses-5.6-coverity.patch.gz 6196
+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/ncurses-5.6-r2.ebuild b/sys-libs/ncurses/ncurses-5.6-r2.ebuild
new file mode 100644
index 000000000000..a3781251e322
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-5.6-r2.ebuild
@@ -0,0 +1,159 @@
+# 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-r2.ebuild,v 1.1 2007/07/09 01:30:46 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
+	ftp://invisible-island.net/ncurses/${PV}/${P}-coverity.patch.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 profile trace unicode"
+
+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
+	epatch "${WORKDIR}"/${P}-coverity.patch
+	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}
+
+	# 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 !
+	local conf_abi="
+		--with-chtype=long \
+		--with-mmask-t=long \
+		--disable-ext-colors \
+		--disable-ext-mouse \
+	"
+	econf \
+		--libdir="/$(get_libdir)" \
+		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
+		--with-shared \
+		$(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 \
+		--enable-warnings \
+		$(use_with debug assertions) \
+		$(use_with !debug leaks) \
+		$(use_with debug expanded) \
+		$(use_with !debug macros) \
+		$(use_with trace) \
+		${conf_abi} \
+		"$@" \
+		|| 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 second so that the binaries in /usr/bin
+	# support both wide and narrow
+	cd "${WORKDIR}"/narrowc
+	emake DESTDIR="${D}" install || die "make narrowc install failed"
+	if use unicode ; then
+		cd "${WORKDIR}"/widec
+		emake DESTDIR="${D}" install || die "make widec install failed"
+	fi
+
+	# 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
+
+	# 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
+
+	use minimal && rm -r "${D}"/usr/share/terminfo
+	cd "${S}"
+	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+	use doc && dohtml -r doc/html/
+}
+
+pkg_preinst() {
+	use unicode || preserve_old_lib /$(get_libdir)/libncursesw.so.5
+}
+
+pkg_postinst() {
+	use unicode || preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
+}