updated rxvt-unicode terminfo. fixes bug #383871. acked by robbat2

Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64

4 files changed, 389 insertions, 18 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 3defc4bf1320..2d0051db91b1 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/ncurses
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.197 2011/12/28 19:26:42 halcy0n Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.198 2012/02/29 09:05:27 wired Exp $
+
+*ncurses-5.9-r2 (29 Feb 2012)
+
+  29 Feb 2012; Alex Alexander <wired@gentoo.org> +ncurses-5.9-r2.ebuild,
+  +files/ncurses-5.9-rxvt-unicode-9.15.patch:
+  updated rxvt-unicode terminfo. fixes bug #383871. acked by robbat2
 
   28 Dec 2011; Mark Loeser <halcy0n@gentoo.org> ncurses-5.9.ebuild:
   Stable for ppc/ppc64; bug #377631
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index f151d76ed372..7315bf6de2cd 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 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
@@ -11,27 +11,29 @@ AUX ncurses-5.7-rxvt-unicode.patch 3339 RMD160 ad5fac04693b1cb08e942ba4ee9e3d166
 AUX ncurses-5.7-tic-cross-detection.patch 1656 RMD160 cd30a10d49ce0a88fd031b38739032addd49d340 SHA1 584ac536cb09b84801336af4938f67c96ccab57a SHA256 afadd1db1530054cb745193723435a3dffceb9de541abc92caace89c2ea429a5
 AUX ncurses-5.8-gfbsd.patch 695 RMD160 41081a2ae135dd9a149c949f31cfbcb06bf12610 SHA1 f1a90d9911349f464b0ed93aaf104b73b215110f SHA256 68c405dcd1b2bbad1d4880d906ba9e02ad62691c63edfb363ad767ee01079e82
 AUX ncurses-5.8-rxvt-unicode.patch 3724 RMD160 d6b46469ce0078ec08e1fa405f0a1d9399970c56 SHA1 1adeb974f84197499e59d86991d6ce4f17194155 SHA256 385b6b2afe7b95e3ad172ece63ea60ee2b8db5b5c83f55209fbd319be5edf380
+AUX ncurses-5.9-rxvt-unicode-9.15.patch 3804 RMD160 016d385921afbcb08d1e75f2edbab4849ef53fb4 SHA1 5d83d9f7813885194ee1fd2727e7aca89fa85724 SHA256 ae684be42600ac3bbbf6e7be61e085524f65d86c20da8c453b10c27516e30b27
 DIST ncurses-5.7.tar.gz 2445052 RMD160 a19ca026d32255f5a4d22eb006d65182041e0234 SHA1 8233ee56ed84ae05421e4e6d6db6c1fe72ee6797 SHA256 0a9bdea5c7de8ded5c9327ed642915f2cc380753f12d4ad120ef7da3ea3498f4
 DIST ncurses-5.9.tar.gz 2826473 RMD160 dd7dffe38fcc908230ce3e036b71ced2d270ac9e SHA1 3e042e5f2c7223bffdaac9646a533b8c758b65b5 SHA256 9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b
 EBUILD ncurses-5.7-r7.ebuild 5126 RMD160 9292a311c2eee95af143369891be944d8f1c7995 SHA1 53bd7470945a2fdf3d760c4d8b6aad27bba5b4a4 SHA256 768d9c817523e94b07aa031e95466bee13bcbedf0bb96115a8a2eab67fc84c6e
 EBUILD ncurses-5.9-r1.ebuild 5245 RMD160 52a9207cf00490931ac7fa8cef0a1d3ceb183fb8 SHA1 49d71a1a7517c8566480e130955e6d020d78e581 SHA256 8e234b5c9604475f64f07824c0356797edf5ffe6761f37a389dfb7c781671090
+EBUILD ncurses-5.9-r2.ebuild 5257 RMD160 77bc91c68dbfdbaab90ad46f301b7e3b809a91c7 SHA1 b93cb9a0344ec627a986101f9a541bc22f34357e SHA256 c77e1bd2868b580a4fc1b306156a319c1dc25d494178c0ab5580b245899874f5
 EBUILD ncurses-5.9.ebuild 4878 RMD160 a64accdf045f6198e8ca4530acc33e7e691a4236 SHA1 27152c98305d0c573f25073d512717763a765cb9 SHA256 4e123a8bf06f4d7bc92c03bd75fe8f28ecab2d636dc20ab53a66277811b6839d
-MISC ChangeLog 28330 RMD160 f7ebadda06381d54fb5e4325e67e75f572eee448 SHA1 deb0e060e1a47da407f5051850d1ac796c59e745 SHA256 cb5a5a6180b11a2fac0fb375a5d8626d5622496311ca279a4e3640cb4f34a84c
+MISC ChangeLog 28548 RMD160 dca14b1ef665a2e530b445ee9086c53ccdae99f1 SHA1 efa096ca5b1331dba2638441edaa56398b9895a1 SHA256 d0624af830a66ab8fde1e77b2fdbd20408bcf48616b8de2dcaf18cad7016ff4b
 MISC metadata.xml 320 RMD160 cd60b146f09101932293157c33ac98f273c92783 SHA1 47c720e1ec7ce4a1c4de36edeac9cfd10004bbae SHA256 906f778ea6ad65cad63404d3bd4126d32dcaef8fa0dd81d0108fd20630594779
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJO+214AAoJEPTTRK0uRVaNigkQALq6XCFFmpSnW/9M5eMgOgxy
-p+PEeeb7+M/V/q/M2LUY6rQCa9Rg+ta8cSG9gga/30XT8crHmPH22LqKiss1NhsS
-k5gOxbGwVuKTy0F/nxDM5g6VzB4wxBUxqxNoc+6fg0kfipTjOykQeFy0wh3e/kCh
-nG+6KN69+DWZ9JuZfh3pum/3xou7LZg2Rnu02mmB7ejqBfx/M1JvZIUOW6X3sFPx
-BldFG+LsJ6QfVx0QnX7xTgYdhiR+ywu/LUroxoCGZi6ZLge7mMrtIK849cwZqfOJ
-Ze0PvlPNFmfElS9IZzmDbv0KrUyiTul3HoG9aJK5+OEVxHWAZ3dDXiBuD6fy1Cxa
-AYjH0wUqW61Uo6SNxAH63bi8yK+S8oBZSdRcY+wsx4SX6n0ZCzG3Qn3JsxgzZwMW
-o1NAOL1E35p8Q4aFd2KpR/gnSgguVLJmXneyOjU5NQmce+GZvWmJpEijp+1AkZTs
-2S0csX5AK9xEJs6ypCZ25wDC1ZKrJn6Oeun9h5mvvsr0V+IUEtRtBEa1l8Pzz/fO
-CWMvJV4LimybEd9VP6bXs7xTrOp5OUMESe0srG2OlwaJ8Dn5FKWaPtUqxboovjFY
-hf/b6VA8hzqiUvPXdNRntmYPdXgp8yh2eM8YzfoCMdzLEBpZvjqxrASz9bqLO4DV
-kGwN5LiFy15Czt9uRFGq
-=H3on
+iQIcBAEBCgAGBQJPTeukAAoJEDZF8K7rm0r6mIEP/jOI64NqhUFMdOqKQRnkqRfw
+gUmu0ZW3elDWCjOvmtTBMSwyLKwGorhcbKxUiKFRbuR6oVhfpbZlV2rnIq20CHiL
+LiXkjlm6hJFRQ97NEqm20PHCGMokfmnaFmv1yo9PjtvsFVXPL6ey5x8jTUY+mTnn
+YdbboW3aHdNZVG+LO7sk9qoiqRJpkYAehhqXfIa9ve1SUwReCjsglFV6Dyd6A/pC
+a89c/gm+NPlvdyz+IXv9aFaEuA0/Oo5ZOwYeTxpuKNISECsclm5xbf/JCVe8Svpl
+21ndPOfkWHiDTrH2Z2Lmf++dDs97AEorQhtgO5DgJdZIaJIErK8Sf2chpUS1KVi6
+X4ZrJtAQbMXnzpzH8G5HRUSeE74ugcw0iwT2kvMwJeqdzGTF8MpELOwEPUMn2ABY
++MantDg+IytarYv5EyW1q55Szs92qzJcQLDTQrHViIk7+24VDF0VMZ0jVjrwMnPr
+hZaxp3RSVOpYtGzBwnYL4ln6x0ZG3Lk/IUK/D7O+3vaoQqFnjLUGFh+Ldrk7whJ8
+mAiuCTeyDibprqGQ0Ac9iIdihev7CPBMRqvo9lbb1Q09n2vczZzkCwocbdSWqaQK
+sfwVp+Cn/Okm4YVxCDay0jivex4SiluEUsIF61aOu1/zufpNV4LB5tsnahM90rVS
+8B+D4OeS/5sWp5xz0f+L
+=E7zD
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch b/sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch
new file mode 100644
index 000000000000..b6d1924cbe7e
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-5.9-rxvt-unicode-9.15.patch
@@ -0,0 +1,191 @@
+Add rxvt-unicode terminfo, required by rxvt-unicode to function properly.
+
+Providing this in ncurses makes it widely available, much better than having to
+install rxvt-unicode everywhere.
+
+http://bugs.gentoo.org/show_bug.cgi?id=192083
+
+This patch uses the updated rxvt-unicode-9.15 terminfo
+which includes 256 color support and fixes Gentoo bug 383871
+
+http://bugs.gentoo.org/show_bug.cgi?id=383871
+
+--- misc/terminfo.src
++++ misc/terminfo.src
+@@ -4208,6 +4208,176 @@
+ 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 <schmorp@schmorp.de>, 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=\E[2$,
++	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\E(B,
++	enacs=,
++	smacs=\E(0,
++	rmacs=\E(B,
++	smso=\E[7m,
++	smul=\E[4m,
++	tbc=\E[3g,
++	vpa=\E[%i%p1%dd,
++	colors#88,
++	pairs#7744,
++	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,
++
++rxvt-unicode-256color|rxvt-unicode terminal with 256 colors (X Window System),
++	colors#256,
++	pairs#32767,
++	use=rxvt-unicode,
++
+ # mrxvt 0.5.4
+ #
+ # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which
diff --git a/sys-libs/ncurses/ncurses-5.9-r2.ebuild b/sys-libs/ncurses/ncurses-5.9-r2.ebuild
new file mode 100644
index 000000000000..2e34500a2dec
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-5.9-r2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.9-r2.ebuild,v 1.1 2012/02/29 09:05:27 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 ~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.8-gfbsd.patch
+	epatch "${FILESDIR}"/${PN}-5.7-nongnu.patch
+	epatch "${FILESDIR}"/${PN}-5.9-rxvt-unicode-9.15.patch #192083 #383871
+	sed -i \
+		-e '/^PKG_CONFIG_LIBDIR/s:=.*:=$(libdir)/pkgconfig:' \
+		misc/Makefile.in || die
+}
+
+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 \
+		--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 \
+		--enable-pc-files \
+		$(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} \
+		"$@"
+
+	# 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.
+	emake -j1 sources || die
+	# For some reason, sources depends on pc-files which depends on
+	# compiled libraries which depends on sources which ...
+	# Manually delete the pc-files file so the install step will
+	# create the .pc files we want.
+	rm -f misc/pc-files
+	emake ${make_flags} || die
+}
+
+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
+	if use unicode ; then
+		cd "${WORKDIR}"/widec
+		emake DESTDIR="${D}" install || die
+	fi
+
+	# Move libncurses{,w} into /lib
+	gen_usr_ldscript -a ncurses
+	use unicode && gen_usr_ldscript -a ncursesw
+	ln -sf libncurses.so "${D}"/usr/$(get_libdir)/libcurses.so || die
+	use static-libs || rm "${D}"/usr/$(get_libdir)/*.a
+
+#	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/
+}