added rxvt-unicode terminfo generation wrt bug #192083

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

4 files changed, 356 insertions, 12 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 76829d3c67e8..48f7e316a4fc 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,12 @@
 # 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.166 2009/10/22 12:30:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.167 2009/10/28 12:18:12 wired Exp $
+
+*ncurses-5.7-r3 (28 Oct 2009)
+
+  28 Oct 2009; Alex Alexander <wired@gentoo.org> +ncurses-5.7-r3.ebuild,
+  +files/ncurses-5.7-rxvt-unicode.patch:
+  added rxvt-unicode terminfo generation wrt bug #192083
 
   22 Oct 2009; Mike Frysinger <vapier@gentoo.org> ncurses-5.7-r2.ebuild,
   +files/ncurses-5.7-tic-cross-detection.patch:
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 04d3effaa765..30a9d1838c35 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,11 +1,9 @@
------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
 AUX ncurses-5.7-hashdb-open.patch 1893 RMD160 4dbe84dc24cd727f17ff591b73b96bc4322bcf1f SHA1 585f0a2512f2ada00ee364b3336e521234c46083 SHA256 f9ab706816b270e06629ace613fcffb8ad78532075dc7ae52e27c77071b2aa66
 AUX ncurses-5.7-nongnu.patch 490 RMD160 fc755ed90de37c6492c346c4630d0fd92f720c45 SHA1 1e843d97e0f2640f6eeb2a874ad019e61aa06328 SHA256 d6fbf11c63aa872bf9553f832c8071a161b2c7bc106f0f76c4471b01025c9422
+AUX ncurses-5.7-rxvt-unicode.patch 3339 RMD160 ad5fac04693b1cb08e942ba4ee9e3d166431b875 SHA1 816812a6de3f3318415998c7b25b52076f181c51 SHA256 6c1ea8169e9f11de2c598fc0c15cb3814445e5a6d5a2d82bd31fc90634ab4b54
 AUX ncurses-5.7-tic-cross-detection.patch 1656 RMD160 cd30a10d49ce0a88fd031b38739032addd49d340 SHA1 584ac536cb09b84801336af4938f67c96ccab57a SHA256 afadd1db1530054cb745193723435a3dffceb9de541abc92caace89c2ea429a5
 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
@@ -13,12 +11,6 @@ DIST ncurses-5.7.tar.gz 2445052 RMD160 a19ca026d32255f5a4d22eb006d65182041e0234
 EBUILD ncurses-5.6-r2.ebuild 4746 RMD160 2d0c4b141d8bc51c7bbe0745817e2d5b4b51147b SHA1 ed1e10beb9f436b298b9f59e6b0b7fdfd3ae144c SHA256 57d0c3a8058ddbb1bbed9d3d65be56b7947aa1e3459fe847de3cce456fa7a61e
 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
-MISC ChangeLog 24375 RMD160 04bbed29b9fde6f218eabe44f89697b10b26637a SHA1 17efcf3a854c35a37a85accb2f03150cca0b5475 SHA256 3b67d21dc5a164abc166c2536269e90c586c702926d65bdb8933525e957da142
+EBUILD ncurses-5.7-r3.ebuild 5270 RMD160 d46472291fbfbc231aa24166710eb3a4c6ad5014 SHA1 52cb44b138c69b00e5daba69efd0d32bb08f8b2a SHA256 a9e09accca17f2edcd20e8f73a0fe9ef3f478453f38b0a819cf128c1f1d3e27c
+MISC ChangeLog 24577 RMD160 39a361e649d7c08421b3e008bc274d40bae53c6c SHA1 212bbefd60674421f8131d40499c39710b9180c8 SHA256 70a173c40b3dd425e04d3a67bb62a942fbcc397facdfbf6ac374ffda8f8ac8de
 MISC metadata.xml 320 RMD160 cd60b146f09101932293157c33ac98f273c92783 SHA1 47c720e1ec7ce4a1c4de36edeac9cfd10004bbae SHA256 906f778ea6ad65cad63404d3bd4126d32dcaef8fa0dd81d0108fd20630594779
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkrgUKYACgkQlPl3HsVfCDpGqQCeIVHSrqk0y9Po50buILzCmgPk
-St0An0UURwuWdYvu+e0AwxmgZInVMObS
-=uWTn
------END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/files/ncurses-5.7-rxvt-unicode.patch b/sys-libs/ncurses/files/ncurses-5.7-rxvt-unicode.patch
new file mode 100644
index 000000000000..ee9b135ef9a1
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-5.7-rxvt-unicode.patch
@@ -0,0 +1,174 @@
+--- misc/terminfo.src.old	2009-10-27 21:02:05.413714694 +0200
++++ misc/terminfo.src	2009-10-27 21:02:07.637734809 +0200
+@@ -3965,6 +3965,171 @@
+ rxvt-16color|xterm with 16 colors like aixterm,
+ 	ncv#32, use=ibm+16color, use=rxvt,
+ 
++# From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
++# Updated: Özgür Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
++# Updated: Marc Lehmann <pcg@goof.com>, 17 Feb 2005
++# Updated: Marc Lehmann <schmorp@schmorp.de>, 04 Nov 2008: change init/reset sequences
++rxvt-unicode|rxvt-unicode terminal (X Window System),
++	am,
++	bce,
++	eo,
++	km,
++	msgr,
++	xenl,
++	hs,
++	cols#80,
++	it#8,
++	lines#24,
++	acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~-A.B+C\,D0EhFiG,
++	bel=^G,
++	blink=\E[5m,
++	bold=\E[1m,
++	civis=\E[?25l,
++	clear=\E[H\E[2J,
++	cnorm=\E[?25h,
++	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,
++	cvvis=\E[?25h,
++	dch=\E[%p1%dP,
++	dch1=\E[P,
++	dl=\E[%p1%dM,
++	dl1=\E[M,
++	ed=\E[J,
++	el=\E[K,
++	el1=\E[1K,
++	flash=\E[?5h$<20/>\E[?5l,
++	home=\E[H,
++	hpa=\E[%i%p1%dG,
++	ht=^I,
++	hts=\EH,
++	ich=\E[%p1%d@,
++	ich1=\E[@,
++	il=\E[%p1%dL,
++	il1=\E[L,
++	ind=^J,
++	is1=\E[\041p,
++	is2=\E[r\E[m\E[2J\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
++	kDC=\E[3$,
++	kIC=\E2$,
++	kEND=\E[8$,
++	kHOM=\E[7$,
++	kLFT=\E[d,
++	kNXT=\E[6$,
++	kPRV=\E[5$,
++	kRIT=\E[c,
++	kbs=\177,
++	ka1=\EOw,
++	ka3=\EOy,
++	kb2=\EOu,
++	kc1=\EOq,
++	kc3=\EOs,
++	kcbt=\E[Z,
++	kcub1=\E[D,
++	kcud1=\E[B,
++	kcuf1=\E[C,
++	kcuu1=\E[A,
++	kdch1=\E[3~,
++	kel=\E[8\^,
++	kend=\E[8~,
++	kent=\EOM,
++	kf1=\E[11~,
++	kf10=\E[21~,
++	kf11=\E[23~,
++	kf12=\E[24~,
++	kf13=\E[25~,
++	kf14=\E[26~,
++	kf15=\E[28~,
++	kf16=\E[29~,
++	kf17=\E[31~,
++	kf18=\E[32~,
++	kf19=\E[33~,
++	kf2=\E[12~,
++	kf20=\E[34~,
++	kf3=\E[13~,
++	kf4=\E[14~,
++	kf5=\E[15~,
++	kf6=\E[17~,
++	kf7=\E[18~,
++	kf8=\E[19~,
++	kf9=\E[20~,
++	kfnd=\E[1~,
++	khome=\E[7~,
++	kich1=\E[2~,
++	kmous=\E[M,
++	knp=\E[6~,
++	kpp=\E[5~,
++	kslt=\E[4~,
++	rc=\E8,
++	rev=\E[7m,
++	ri=\EM,
++	rmso=\E[27m,
++	rmul=\E[24m,
++	rs1=\Ec,
++	rs2=\E[r\E[m\E[?7;25h\E[?1;3;4;5;6;9;66;1000;1001;1049l\E[4l,
++	sgr0=\E[m\017,
++	enacs=,
++	smacs=\E(0,
++	rmacs=\E(B,
++	smso=\E[7m,
++	smul=\E[4m,
++	tbc=\E[3g,
++	vpa=\E[%i%p1%dd,
++	colors#88,
++	pairs#256,
++	btns#5,
++	lm#0,
++	ccc,
++	npc,
++	mc5i,
++	ncv#0,
++	mir,
++	xon,
++	bw,
++	ech=\E[%p1%dX,
++	mc0=\E[i,
++	mc4=\E[4i,
++	mc5=\E[5i,
++	sitm=\E[3m,
++	ritm=\E[23m,
++	smam=\E[?7h,
++	rmam=\E[?7l,
++	smir=\E[4h,
++	rmir=\E[4l,
++	smcup=\E[?1049h,
++	rmcup=\E[r\E[?1049l,
++	smkx=\E=,
++	rmkx=\E>,
++	indn=\E[%p1%dS,
++	rin=\E[%p1%dT,
++	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
++	op=\E[39;49m,
++	setaf=\E[38;5;%p1%dm,
++	setab=\E[48;5;%p1%dm,
++	setf=%?%p1%{7}%>%t\E[38;5;%p1%dm%e\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
++	setb=%?%p1%{7}%>%t\E[48;5;%p1%dm%e\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m%;,
++	initc=\E]4;%p1%d;rgb\:%p2%{65535}%*%{1000}%/%4.4X/%p3%{65535}%*%{1000}%/%4.4X/%p4%{65535}%*%{1000}%/%4.4X\E\\,
++	sc=\E7,
++	s0ds=\E(B,
++	s1ds=\E(0,
++	s2ds=\E*B,
++	s3ds=\E+B,
++	u6=\E[%i%d;%dR,
++	u7=\E[6n,
++	u8=\E[?1;2c,
++	u9=\E[c,
++	tsl=\E]2;,
++	fsl=\007,
++	dsl=\E]2;\007,
++
+ # mrxvt 0.5.3
+ #
+ # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which
diff --git a/sys-libs/ncurses/ncurses-5.7-r3.ebuild b/sys-libs/ncurses/ncurses-5.7-r3.ebuild
new file mode 100644
index 000000000000..0457e1aa4daf
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-5.7-r3.ebuild
@@ -0,0 +1,172 @@
+# 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-r3.ebuild,v 1.1 2009/10/28 12:18:12 wired 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 ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="ada +cxx debug doc gpm minimal profile 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
+}
+
+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 ; 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
+	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 \
+		--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 ${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 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 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/
+}