Revbump to add USE=static-libs support, fixes bug 324999

Package-Manager: portage-2.2_rc67/cvs/Linux i686

3 files changed, 189 insertions, 6 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index edad486840e3..b71274240b91 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.175 2010/03/06 23:12:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.176 2010/07/06 18:48:19 abcd Exp $
+
+*ncurses-5.7-r4 (06 Jul 2010)
+
+  06 Jul 2010; Jonathan Callen <abcd@gentoo.org> +ncurses-5.7-r4.ebuild:
+  Revbump to add USE=static-libs support, fixes bug 324999
 
   06 Mar 2010; Mike Frysinger <vapier@gentoo.org> ncurses-5.7-r3.ebuild:
   Fix handling of leaks option #305889 by Nikolas Garofil.
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 607b378c0654..01486f6830af 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -15,12 +15,23 @@ EBUILD ncurses-5.6-r2.ebuild 4746 RMD160 2d0c4b141d8bc51c7bbe0745817e2d5b4b51147
 EBUILD ncurses-5.7-r1.ebuild 4511 RMD160 337ebf710ea03791b4a13aa52615cd03ccf9c7b4 SHA1 4c4e091d14dd481011d7911c1e5ec6bb41d33848 SHA256 8e771b299a6b87e6fb8597fcf3756b5890aeb92d002f18fe9eafd04b0f9ed40b
 EBUILD ncurses-5.7-r2.ebuild 5156 RMD160 c17433a3f1c086c6b423ea4b8327b4f23036da20 SHA1 77e9f6919a433afb36d8cd6b72a3ed383bdeb091 SHA256 8e6c75149cc8cba1f672eb71b14cc9b1794ab213e65218c4508372b047c97951
 EBUILD ncurses-5.7-r3.ebuild 5367 RMD160 a21be510f13353c36ac20b04258c1e996a618102 SHA1 b67f404968a91da5b7e6b4ea01346ad13ebcf0da SHA256 73d761ad50ddf9bd1c904f59c0bdb85c5e6450aa662a3af75dc99f664326ba3c
-MISC ChangeLog 25492 RMD160 41873a28da41f56abcd8b53608b03d3c223d04b3 SHA1 421f456c3aae4e58902347713237bdc77b57bb34 SHA256 0345863d9ced3969a5a9021d95c60e9ca25d09dec940ba692b9dfd8cd69d16f2
+EBUILD ncurses-5.7-r4.ebuild 5191 RMD160 baa75fbbcdff3d374ce3e2ce54edee82407a540a SHA1 36eb46ebe77645e720c39bad2f338c74936f87e5 SHA256 52b3e5cd0e075c2c835e546b494f67b19df99448f53485d7c906fdf56824cae4
+MISC ChangeLog 25654 RMD160 30a3197f647c728784d19fb1221b2eca0c9dc1f4 SHA1 8235b0070813724192ed34d37e0d783f992c5b87 SHA256 54f1e0f41b6e36cad518c6f7aff3d6c81c78fe56773023772f57d8b4dbfd7717
 MISC metadata.xml 320 RMD160 cd60b146f09101932293157c33ac98f273c92783 SHA1 47c720e1ec7ce4a1c4de36edeac9cfd10004bbae SHA256 906f778ea6ad65cad63404d3bd4126d32dcaef8fa0dd81d0108fd20630594779
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkuS4XEACgkQTwhj9JtAlp7BzwEAyM/0mDOKduPxp7T01SGxn9zB
-w7gD1V2+SZ0CeYeh4+4A/A3impwRZ6rpD6eB0YBaWhaZasaut3lXqv/bQVs4ZExc
-=zQ02
+iQIcBAEBCAAGBQJMM3p+AAoJELHSF2kinlg4/lcP/1sZdUuLPjq7sKSBsuKRI0iU
+87h9EucW/be2SWEvNTGmwwHsxzA+y7yHrSTTd6U5hdE+l3xmB+o5zQC28ZH/h1Sv
+IbUkJXF1TSC8XMdD8FGzwFvoVSN3FPtCTd1WD2RDXRguCKXril6cjcyTbZObKePW
+uagtEWB/2eON7KQPY1bfecotW82ywHlvsIn5SDuQCo+ThT+4pShQ5N+0jY8DydDw
+1aFLvlYL61qSnfgSvpiKjEsLqiBjRJi62j8g7qPzns0/DKpxliGHOZPKePHwZtwP
+gzuGgm4XSE/kwsmDDWHwJTXEGpv5ac5EywBP8HlGTE1ZSnp6wGbUmXFKQzUpMOiI
+gc4KHBX6TotDRtxpx44tBcCtfEumrshr4+3Id3vUVYplS0H2Fnc6Z5a9wdeG9SSa
+ZcxYSdgCOZaP/tUcCXeC/OGr6mUE2si4eTSo5ajlFfJXHI8JcvzyXOI02lQOxgNu
+pGIbS0xPSMPUyFPminXPPDjqzntCcIo0w7JEJuj1L/AUwU7XG/QPtR6kVdf2jqxt
+JDMtvuF8flzLkYeaJSgv9L+xK8CqXwFYYwOFrshlXA/ujU4Q3H8ghpTIBNZ3IYG1
+5t22G5F3+NNITEo3jNAHumZ/SVCYyV3rj6cfEiHjtbhTGtFHUSpNUZCmMrhCJdzB
+DuwTiJ0lj3OpaDgN51QI
+=AKD8
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/ncurses-5.7-r4.ebuild b/sys-libs/ncurses/ncurses-5.7-r4.ebuild
new file mode 100644
index 000000000000..d2a66d3b482d
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-5.7-r4.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r4.ebuild,v 1.1 2010/07/06 18:48:19 abcd Exp $
+
+EAPI="1"
+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 ~sparc-fbsd ~x86-fbsd"
+IUSE="ada +cxx debug doc gpm minimal profile static-libs trace unicode"
+
+DEPEND="gpm? ( sys-libs/gpm )"
+#	berkdb? ( sys-libs/db )"
+RDEPEND="!<x11-terms/rxvt-unicode-9.06-r3"
+
+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
+	epatch "${FILESDIR}"/${PN}-5.7-emacs.patch #270527
+	epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch
+	epatch "${FILESDIR}"/${PN}-5.7-tic-cross-detection.patch #288881
+	epatch "${FILESDIR}"/${PN}-5.7-rxvt-unicode.patch #192083
+	epatch "${FILESDIR}"/${P}-hashdb-open.patch #245370
+	sed -i '/with_no_leaks=yes/s:=.*:=$enableval:' configure #305889
+}
+
+src_compile() {
+	unset TERMINFO #115036
+	tc-export BUILD_CC
+	export BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
+
+	# when cross-compiling, we need to build up our own tic
+	# because people often don't keep matching host/target
+	# ncurses versions #249363
+	if tc-is-cross-compiler && ! ROOT=/ has_version ~sys-libs/${P} ; then
+		make_flags="-C progs tic"
+		CHOST=${CBUILD} \
+		CFLAGS=${BUILD_CFLAGS} \
+		CXXFLAGS=${BUILD_CXXFLAGS} \
+		CPPFLAGS=${BUILD_CPPFLAGS} \
+		LDFLAGS="${BUILD_LDFLAGS} -static" \
+		do_compile cross --without-shared --with-normal
+	fi
+
+	make_flags=""
+	do_compile narrowc
+	use unicode && do_compile widec --enable-widec --includedir=/usr/include/ncursesw
+}
+do_compile() {
+	ECONF_SOURCE=${S}
+
+	mkdir "${WORKDIR}"/$1
+	cd "${WORKDIR}"/$1
+	shift
+
+	# 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 \
+		--without-pthread \
+		--without-reentrant \
+	"
+	# We need the basic terminfo files in /etc, bug #37026.  We will
+	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
+	# src_install() ...
+#		$(use_with berkdb hashed-db)
+	econf \
+		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
+		--with-shared \
+		$(use_with static-libs normal) \
+		--without-hashed-db \
+		$(use_with ada) \
+		$(use_with cxx) \
+		$(use_with cxx cxx-binding) \
+		$(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 \
+		$(use_enable !ada warnings) \
+		$(use_with debug assertions) \
+		$(use_enable !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 ${make_flags} || die "make ${make_flags} failed"
+}
+
+src_install() {
+	# use the cross-compiled tic (if need be) #249363
+	export PATH=${WORKDIR}/cross/progs:${PATH}
+
+	# 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 libncurses{,w} into /lib
+	gen_usr_ldscript -a ncurses
+	use unicode && gen_usr_ldscript -a ncursesw
+
+#	if ! use berkdb ; then
+		# 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 rxvt-unicode 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
+#	fi
+
+	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
+	doenvd "${T}"/50ncurses
+
+	use minimal && rm -r "${D}"/usr/share/terminfo*
+	# Because ncurses5-config --terminfo returns the directory we keep it
+	keepdir /usr/share/terminfo #245374
+
+	cd "${S}"
+	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+	use doc && dohtml -r doc/html/
+}