Refactor compile step, include terminfo update from upstream #270527 by Ulrich Müller, and always add _GNU_SOURCE to BUILD_CPPFLAGS #214642 by Ryan Tandy.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 219 insertions, 6 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index c2037e739da7..88e9e4722a69 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.161 2009/04/29 22:17:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.162 2009/06/20 13:22:43 vapier Exp $
+
+*ncurses-5.7-r1 (20 Jun 2009)
+
+  20 Jun 2009; Mike Frysinger <vapier@gentoo.org> ncurses-5.6-r2.ebuild,
+  +ncurses-5.7-r1.ebuild, +files/ncurses-5.7-emacs.patch:
+  Refactor compile step, include terminfo update from upstream #270527 by
+  Ulrich Müller, and always add _GNU_SOURCE to BUILD_CPPFLAGS #214642 by
+  Ryan Tandy.
 
   30 Apr 2009; Samuli Suominen <ssuominen@gentoo.org> ncurses-5.6-r2.ebuild,
   ncurses-5.7.ebuild:
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 051f77bcaf98..2d1ea46a2a69 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,9 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ncurses-5.6-build.patch 265 RMD160 9958f375f7b305f1b8d52b27d9da746be9175263 SHA1 16990ca2cef127711074d70f9d40d256458969e9 SHA256 51cc2319ad1f854500d76ec978897f6af92d31cebb7f454c1fd649568ad4a251
 AUX ncurses-5.6-gfbsd.patch 817 RMD160 2d5a96174730a93320e391cb057880df4996854e SHA1 b6798815c44059a00a2bcd4f9f28bbf74dfc0e2d SHA256 d9e94c5068a22d32f52c5db6aadc3793af11bb0c08b006e375921726931e0065
+AUX ncurses-5.7-emacs.patch 1934 RMD160 07b7cdb8f0975441e9823959533285f35f31e35c SHA1 c6e4259c455e83e0c166cf89d8c7d23ee77effde SHA256 daf300b7ba0bef6fc685b63f657dc4d864b53da77454129783d767522f1374b0
 DIST ncurses-5.6-coverity.patch.gz 6196 RMD160 b11682ae9e043be8d6c50f040d8531f80fc26ce8 SHA1 fee27bdd55c1c316248643e168865b55235d79c7 SHA256 3deeef017c739116c17574e7fd235b1b05053f5c50c7bfeeee2e3f8e4332380e
 DIST ncurses-5.6.tar.gz 2402592 RMD160 1a878819c43e6426500fd74ccedf0a032ef399d8 SHA1 4d54d8ad0b90fffa2780a0a45edb6fcb027ef18d SHA256 f9cac2b31683a37d65bc37119599752198a0691e462d0d1a252cf9815f5724d5
 DIST ncurses-5.7.tar.gz 2445052 RMD160 a19ca026d32255f5a4d22eb006d65182041e0234 SHA1 8233ee56ed84ae05421e4e6d6db6c1fe72ee6797 SHA256 0a9bdea5c7de8ded5c9327ed642915f2cc380753f12d4ad120ef7da3ea3498f4
-EBUILD ncurses-5.6-r2.ebuild 4750 RMD160 8b606e5de692c00da35729d0707ec79ec238cd21 SHA1 45ca259986232d11ffe4eabc2ca03c0328747c32 SHA256 e1c4332a99bbee3dd6920d0e8a176859ec0859f66b30379903e3143a578c09fb
+EBUILD ncurses-5.6-r2.ebuild 4710 RMD160 7bcd26b1f2e9a1059886cebe7809ebb883fe9e5e SHA1 a75cbd62ee211af14a4923ed3d7c0f7cbd4cd084 SHA256 658f1ebe6a1ac20a1629b700a3ce1b7fdd9fc95c352f8dbbc4ad79c9a546d978
+EBUILD ncurses-5.7-r1.ebuild 4453 RMD160 e4b2b6e56e696a11e1cc9d310bfd1e4de8f7033d SHA1 bd3cf92c415997246a9ad1f6a2bf8e95568967ee SHA256 8cf87943eeec59854710633987f9173521167e144d1f6bea7775af895631d43f
 EBUILD ncurses-5.7.ebuild 4601 RMD160 93f10936b489f6b50df86b000f3c5f26e65af3ca SHA1 2ede148465bd691a8947ee288265879195911bcb SHA256 7ed5908b070231eefebf519cbcbe353f089e26f52e38823cd2d5743c1b059a98
-MISC ChangeLog 23293 RMD160 7d91c3bad8e75f76c196851c956cae9b014769fd SHA1 7771e5711dfc104e824e881308b232f7d43c8ad6 SHA256 14bd48043bbdf9fa16284351daedc556da36dbab6fbb97c805e79f0151a3d467
+MISC ChangeLog 23615 RMD160 016a48b004faf8a5fdc003da277b09c28e2d99ff SHA1 06a47a343f9edbfb31bd5ec35601fb0a028b819f SHA256 cad69ca3077b18bbcbadd879abbbadc6c4a93c0f5425e88545d816a84ca8975d
 MISC metadata.xml 320 RMD160 cd60b146f09101932293157c33ac98f273c92783 SHA1 47c720e1ec7ce4a1c4de36edeac9cfd10004bbae SHA256 906f778ea6ad65cad63404d3bd4126d32dcaef8fa0dd81d0108fd20630594779
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAko84qkACgkQlPl3HsVfCDroIwCdFiQDeSOfDJeD0Hba0NQIOv/J
+zoIAn0v1wMYHpT4n0U/O+ghFxuOewEH0
+=YbX0
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/files/ncurses-5.7-emacs.patch b/sys-libs/ncurses/files/ncurses-5.7-emacs.patch
new file mode 100644
index 000000000000..615a73b2918f
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-5.7-emacs.patch
@@ -0,0 +1,44 @@
+http://bugs.gentoo.org/270527
+Add entry for eterm-color to terminfo file
+Part of upstream patch, available at:
+ftp://invisible-island.net/ncurses/5.7/ncurses-5.7-20081129.patch
+
+--- ncurses-5.7-20081122+/misc/terminfo.src	2008-11-15 21:54:35.000000000 +0000
++++ ncurses-5.7-20081129/misc/terminfo.src	2008-11-29 15:27:35.000000000 +0000
+@@ -4357,6 +4357,26 @@
+ 	sgr0=\E[m, smcup=\E7\E[?47h, smir=\E[4h, smso=\E[7m,
+ 	smul=\E[4m,
+ 
++# The codes supported by the term.el terminal emulation in GNU Emacs 22.2
++eterm-color|Emacs term.el terminal emulator term-protocol-version 0.96,
++	am, mir, msgr, xenl,
++	colors#8, cols#80, lines#24, pairs#64,
++	bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=^M,
++	csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
++	cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
++	cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
++	dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J,
++	el=\E[K, el1=\E[1K, home=\E[H, ht=^I, ich=\E[%p1%d@,
++	il=\E[%p1%dL, il1=\E[L, ind=^J, invis=\E[8m, kbs=\177,
++	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
++	kdch1=\E[3~, kend=\E[4~, khome=\E[1~, kich1=\E[2~,
++	knp=\E[6~, kpp=\E[5~, op=\E[39;49m, rc=\E8, rev=\E[7m,
++	ri=\EM, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
++	sc=\E7, setab=\E[%p1%'('%+%dm, setaf=\E[%p1%{30}%+%dm,
++	sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m,
++	sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
++	u6=\E[%i%d;%dR, u7=\E[6n,
++
+ # Entries for use by the `screen' program by Juergen Weigert,
+ # Michael Schroeder, Oliver Laumann.  The screen and
+ # screen-w entries came with version 3.7.1.  The screen2 and screen3 entries
+@@ -21795,6 +21815,9 @@
+ #	* change several \E[2g (clear tab at current column) to \E[3g
+ #	  (clear all tabs) to match definition for tbc capability -TD
+ #
++# 2008-11-29
++#	* add eterm-color -TD
++#
+ # The following sets edit modes for GNU EMACS.
+ # Local Variables:
+ # fill-prefix:"\t"
diff --git a/sys-libs/ncurses/ncurses-5.6-r2.ebuild b/sys-libs/ncurses/ncurses-5.6-r2.ebuild
index e223a33c9f9c..c4a936a124f1 100644
--- a/sys-libs/ncurses/ncurses-5.6-r2.ebuild
+++ b/sys-libs/ncurses/ncurses-5.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.12 2009/04/29 22:17:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.6-r2.ebuild,v 1.13 2009/06/20 13:22:43 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -38,7 +38,6 @@ src_compile() {
 
 	local myconf=""
 	use nocxx && myconf="${myconf} --without-cxx --without-cxx-binding"
-	use ada || myconf="${myconf} --without-ada"
 
 	# First we build the regular ncurses ...
 	mkdir "${WORKDIR}"/narrowc
@@ -80,7 +79,8 @@ do_compile() {
 		--enable-const \
 		--enable-colorfgbg \
 		--enable-echo \
-		$(use_enable !ada warnings) \
+		--without-ada \
+		--enable-warnings \
 		$(use_with debug assertions) \
 		$(use_with !debug leaks) \
 		$(use_with debug expanded) \
diff --git a/sys-libs/ncurses/ncurses-5.7-r1.ebuild b/sys-libs/ncurses/ncurses-5.7-r1.ebuild
new file mode 100644
index 000000000000..ec146f5c4f89
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-5.7-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.7-r1.ebuild,v 1.1 2009/06/20 13:22:43 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="ada cxx debug doc gpm minimal profile trace unicode"
+
+DEPEND="gpm? ( sys-libs/gpm )"
+#	berkdb? ( sys-libs/db )"
+
+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
+}
+
+src_compile() {
+	unset TERMINFO #115036
+	tc-export BUILD_CC
+	export BUILD_CPPFLAGS+=" -D_GNU_SOURCE" #214642
+
+	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 \
+		--libdir="/$(get_libdir)" \
+		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
+		--with-shared \
+		--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_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 libncursesw.so
+	fi
+
+#	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 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/
+}