Fixup term settings for gnome-terminal #122566 by Ed Catmur.

Package-Manager: portage-2.1.1_pre1-r2

5 files changed, 225 insertions, 16 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 6cd278fb84d3..f60f0599072b 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.116 2006/06/25 14:24:00 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.117 2006/06/27 06:14:02 vapier Exp $
+
+*ncurses-5.5-r3 (27 Jun 2006)
+
+  27 Jun 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/ncurses-5.5-terminfo-gnome.patch, +ncurses-5.5-r3.ebuild:
+  Fixup term settings for gnome-terminal #122566 by Ed Catmur.
 
   25 Jun 2006; Guy Martin <gmsoft@gentoo.org> ncurses-5.5-r2.ebuild:
   Stable on hppa.
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 19aaa876e8f3..280a1ba6635e 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -17,11 +17,14 @@ AUX ncurses-5.5-gfbsd.patch 3060 RMD160 cf0eb3118ec5c0cd009d8569bb48fb92268b7877
 MD5 ad3890f5461218f96e1f999a48879711 files/ncurses-5.5-gfbsd.patch 3060
 RMD160 cf0eb3118ec5c0cd009d8569bb48fb92268b7877 files/ncurses-5.5-gfbsd.patch 3060
 SHA256 eb640dac78faf5970896d695d36953c2e36a89d92264cbea1b7a0c926ff635b1 files/ncurses-5.5-gfbsd.patch 3060
+AUX ncurses-5.5-terminfo-gnome.patch 597 RMD160 08f295ee2441dfae36b692f29fdb39dcd7e1390a SHA1 6fd87ec2214dc45d96b8558c2e9f3d1ee1faf847 SHA256 cc5110c84c1cdfdc13ea11c8cecf0f48a35c4096a25e10ba814889e5f3df2696
+MD5 d4e86212987c8a600a510b09d1c27090 files/ncurses-5.5-terminfo-gnome.patch 597
+RMD160 08f295ee2441dfae36b692f29fdb39dcd7e1390a files/ncurses-5.5-terminfo-gnome.patch 597
+SHA256 cc5110c84c1cdfdc13ea11c8cecf0f48a35c4096a25e10ba814889e5f3df2696 files/ncurses-5.5-terminfo-gnome.patch 597
 AUX xterm-debian.ti 342 RMD160 7f0506819afd9687891eaf03548c659c0ee1abd7 SHA1 dba1f761fe5ec11ac4c9549512bb5be35cc4da77 SHA256 1b10cdbff41f757c9f23f42c58dd6966e3c253b36fc6ceae1034233535743de0
 MD5 2167b54d7c96964183554e767e5f5376 files/xterm-debian.ti 342
 RMD160 7f0506819afd9687891eaf03548c659c0ee1abd7 files/xterm-debian.ti 342
 SHA256 1b10cdbff41f757c9f23f42c58dd6966e3c253b36fc6ceae1034233535743de0 files/xterm-debian.ti 342
-DIST ncurses-5.4-20050319-patch.sh.bz2 328630 RMD160 a4b5c820d65352367f15f37c5beee5bac1a09179 SHA1 1aa84a707d3824f1f048297963798ff5c2b66c58 SHA256 f5b3ac7710715549be9ea75e576350b478e375fd097107560f231c2fad8a997c
 DIST ncurses-5.4.tar.gz 2154022 RMD160 36369f4e2c76c396de51809deb8a671d8ca3d19e SHA1 c0dfaf2c4d383915f898a97c8caeace8a0a2c8b7 SHA256 5abce063cf431790f4e6a801a96c7eea0b33a41ecd0970f6312f52575c083b36
 DIST ncurses-5.5.tar.gz 2314030 RMD160 aac34d2530519fbb0fde7af87a365205339ba230 SHA1 46414a72e91a62f63a8c9af00f0d65497f5ecc5a SHA256 27a63f3a2ac9d13c1ed9a0a33ee4497c19a6b5810b8f9738e7654a0e12225b93
 EBUILD ncurses-5.4-r5.ebuild 6166 RMD160 f6a4712ae6d8d1ead3acc8db05e10dc5eb562c3a SHA1 f6f191c785d8dbb08b8cd72af638c9fc86a1c9e4 SHA256 1b95a17a60084781e1cf459520bded8c6ddf78568f18becbd03d373bb1c7a288
@@ -32,10 +35,6 @@ EBUILD ncurses-5.4-r6.ebuild 5465 RMD160 94046d6c0c855ebacfd0815a9dc68a576d8bac7
 MD5 3a23bee1fd81e1d279ec4632e9cc383e ncurses-5.4-r6.ebuild 5465
 RMD160 94046d6c0c855ebacfd0815a9dc68a576d8bac72 ncurses-5.4-r6.ebuild 5465
 SHA256 64c5e129d6d1c8f42cb4b973e300f212916c2b7335d342844acb04cbb3083dbd ncurses-5.4-r6.ebuild 5465
-EBUILD ncurses-5.4.20050319.ebuild 5741 RMD160 3796a2dd6e2b47298d1197d96779312a049d3048 SHA1 17403d34b2c40ff4725efea725668239900c5684 SHA256 028d5c9fc05aabd999529676ff19f32ce1a96165b40919f3afdbe5489510fe87
-MD5 45af8f6f6c26f746944e5e170f4ce537 ncurses-5.4.20050319.ebuild 5741
-RMD160 3796a2dd6e2b47298d1197d96779312a049d3048 ncurses-5.4.20050319.ebuild 5741
-SHA256 028d5c9fc05aabd999529676ff19f32ce1a96165b40919f3afdbe5489510fe87 ncurses-5.4.20050319.ebuild 5741
 EBUILD ncurses-5.5-r1.ebuild 5351 RMD160 4554c8bae8bc28c5735210bcaabf5b4cd51097d5 SHA1 ab702e3d353d6b7ff165499f70a8fbab8ad61bb7 SHA256 0ae216813de6c1597e35907221682fa730136a3c207cbae2d384bc1a53716ea8
 MD5 09ffb43a04a942aa18f6e40b991da362 ncurses-5.5-r1.ebuild 5351
 RMD160 4554c8bae8bc28c5735210bcaabf5b4cd51097d5 ncurses-5.5-r1.ebuild 5351
@@ -44,14 +43,18 @@ EBUILD ncurses-5.5-r2.ebuild 5404 RMD160 398cc7529c562978d6cf919ff3f273df18ac716
 MD5 83598454fee6c0758ed001144fff56b9 ncurses-5.5-r2.ebuild 5404
 RMD160 398cc7529c562978d6cf919ff3f273df18ac7164 ncurses-5.5-r2.ebuild 5404
 SHA256 e0c368af3161694da47b1879d20703852c17e7d72bc7fb27fb720925ab755ac7 ncurses-5.5-r2.ebuild 5404
+EBUILD ncurses-5.5-r3.ebuild 5463 RMD160 6e11a7075ffadbd89ef476864aa7bf416748db64 SHA1 47cf60223f7cade6005304ad5ea2284791ae1301 SHA256 8d35607de531b16eede86707d0506f99a19df9538833c4760fed57174f00dd1f
+MD5 08fef0b44ed850e6c5e893ed519169ec ncurses-5.5-r3.ebuild 5463
+RMD160 6e11a7075ffadbd89ef476864aa7bf416748db64 ncurses-5.5-r3.ebuild 5463
+SHA256 8d35607de531b16eede86707d0506f99a19df9538833c4760fed57174f00dd1f ncurses-5.5-r3.ebuild 5463
 EBUILD ncurses-5.5.ebuild 5253 RMD160 3a75fe57295da50e2aa666c3382f4c67dbdbf6d0 SHA1 a687ed912a1c29c68ea48f70dbfb3dca5c2df739 SHA256 1b4bf44e80fd126e6141ef3b968323914e5313cdcb2a6cb9b1105f71d9d0a5d1
 MD5 05ffcf86aeb3d3f5c9a5bfd5a72fb2d2 ncurses-5.5.ebuild 5253
 RMD160 3a75fe57295da50e2aa666c3382f4c67dbdbf6d0 ncurses-5.5.ebuild 5253
 SHA256 1b4bf44e80fd126e6141ef3b968323914e5313cdcb2a6cb9b1105f71d9d0a5d1 ncurses-5.5.ebuild 5253
-MISC ChangeLog 17599 RMD160 25b49e60e13d52fe2d2b0a92548a69f3badef640 SHA1 8553eecba6989f816837fa1b7c380dfd2297f03d SHA256 9ad1e88430551de4dc42268e33640e2589c0a87ab43a4b76b90c00adc707712f
-MD5 49c9d94a7d15b09a7c083181f5d8c173 ChangeLog 17599
-RMD160 25b49e60e13d52fe2d2b0a92548a69f3badef640 ChangeLog 17599
-SHA256 9ad1e88430551de4dc42268e33640e2589c0a87ab43a4b76b90c00adc707712f ChangeLog 17599
+MISC ChangeLog 17811 RMD160 6e2483b5ecbff1646a214adc4931846fbfe92229 SHA1 45243d447067969a537a67aca33357b660229072 SHA256 6ca667890b4b31c75381725bb0f53527e18858c6e5dc3092052dcddb9781e7d5
+MD5 986c218f920e22dc7f30552231c4d0e9 ChangeLog 17811
+RMD160 6e2483b5ecbff1646a214adc4931846fbfe92229 ChangeLog 17811
+SHA256 6ca667890b4b31c75381725bb0f53527e18858c6e5dc3092052dcddb9781e7d5 ChangeLog 17811
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -62,9 +65,6 @@ SHA256 de50b8338b918f8782530f0ef1481d4a31e0f126103561ff18a39467b709e56f files/di
 MD5 f392f8bd1bddd04e1e8d26e3f270e7d0 files/digest-ncurses-5.4-r6 238
 RMD160 2799f66e435f80b5914c6c5c75872cf4990555eb files/digest-ncurses-5.4-r6 238
 SHA256 de50b8338b918f8782530f0ef1481d4a31e0f126103561ff18a39467b709e56f files/digest-ncurses-5.4-r6 238
-MD5 16c8be235d7f1610ad8f0ad1ec234145 files/digest-ncurses-5.4.20050319 518
-RMD160 c41b8e4c0d8ab73b9c518d6f54973c7555ecad0b files/digest-ncurses-5.4.20050319 518
-SHA256 399a54f8f79984d23560b0b53784b3c858eaa9d0e91373c736fe45ad8f5f16b3 files/digest-ncurses-5.4.20050319 518
 MD5 6a01577df5b8434affdc1217be2ba5b1 files/digest-ncurses-5.5 238
 RMD160 755dd213b7e9f190613456f3bc9f419dcbc84271 files/digest-ncurses-5.5 238
 SHA256 f86ecfaaa7faef60ffbc739f005574acbd940ee20502129d8d6c6aa433e1ecee files/digest-ncurses-5.5 238
@@ -74,10 +74,13 @@ SHA256 f86ecfaaa7faef60ffbc739f005574acbd940ee20502129d8d6c6aa433e1ecee files/di
 MD5 6a01577df5b8434affdc1217be2ba5b1 files/digest-ncurses-5.5-r2 238
 RMD160 755dd213b7e9f190613456f3bc9f419dcbc84271 files/digest-ncurses-5.5-r2 238
 SHA256 f86ecfaaa7faef60ffbc739f005574acbd940ee20502129d8d6c6aa433e1ecee files/digest-ncurses-5.5-r2 238
+MD5 6a01577df5b8434affdc1217be2ba5b1 files/digest-ncurses-5.5-r3 238
+RMD160 755dd213b7e9f190613456f3bc9f419dcbc84271 files/digest-ncurses-5.5-r3 238
+SHA256 f86ecfaaa7faef60ffbc739f005574acbd940ee20502129d8d6c6aa433e1ecee files/digest-ncurses-5.5-r3 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEnsANamhnQswr0vIRAgLFAJ42EJBwJ+YEY//cyl+S4KXz7xQyQACeJuU1
-QdPDmSS5H3kFle1Hq+50VI8=
-=MAhs
+iD8DBQFEoM38amhnQswr0vIRAieVAJ4p8/df90sODPBuYdMXymOQrKR+1QCfXYPA
+CJEK3replaptEAY+WDWnWS4=
+=T/l4
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.5-r3 b/sys-libs/ncurses/files/digest-ncurses-5.5-r3
new file mode 100644
index 000000000000..abb9c346ffce
--- /dev/null
+++ b/sys-libs/ncurses/files/digest-ncurses-5.5-r3
@@ -0,0 +1,3 @@
+MD5 e73c1ac10b4bfc46db43b2ddfd6244ef ncurses-5.5.tar.gz 2314030
+RMD160 aac34d2530519fbb0fde7af87a365205339ba230 ncurses-5.5.tar.gz 2314030
+SHA256 27a63f3a2ac9d13c1ed9a0a33ee4497c19a6b5810b8f9738e7654a0e12225b93 ncurses-5.5.tar.gz 2314030
diff --git a/sys-libs/ncurses/files/ncurses-5.5-terminfo-gnome.patch b/sys-libs/ncurses/files/ncurses-5.5-terminfo-gnome.patch
new file mode 100644
index 000000000000..43c4e4b30f81
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-5.5-terminfo-gnome.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/122566
+
+--- ncurses-5.5/misc/terminfo.src
++++ ncurses-5.5/misc/terminfo.src
+@@ -3327,7 +3327,10 @@ gnome-rh90|GNOME Terminal, 
+ 	vpa=\E[%i%p1%dd, use=xterm+pcfkeys, use=gnome-rh80, 
+ 
+ gnome|GNOME Terminal, 
+-	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?25h, 
++	rs2=\E7\E[r\E8\E[m\E[?7h\E[!p\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?25h, 
++	rs1=\Ec,
++	kDN=\EO2B,kDN5=\EO5B,kDN6=\EO6B, kUP=\EO2A,kUP5=\EO5A,kUP6=\EO6A,
++	kLFT5=\EO5D,kLFT6=\EO6D, kRIT5=\EO5C,kRIT6=\EO6C,
+ 	use=gnome-rh90, 
+ 
+ # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce
diff --git a/sys-libs/ncurses/ncurses-5.5-r3.ebuild b/sys-libs/ncurses/ncurses-5.5-r3.ebuild
new file mode 100644
index 000000000000..9c92b00b0c8c
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-5.5-r3.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.5-r3.ebuild,v 1.1 2006/06/27 06:14:02 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 ~x86 ~x86-fbsd"
+IUSE="gpm build bootstrap debug doc minimal unicode nocxx"
+
+DEPEND="gpm? ( sys-libs/gpm )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	[[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
+
+	epatch "${FILESDIR}"/${P}-gfbsd.patch
+	epatch "${FILESDIR}"/${P}-terminfo-gnome.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}
+
+	local mylibprefix=""
+	[[ ${CHOST} == *-darwin* ]] && mylibprefix="/usr"
+
+	# 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 !
+	econf \
+		--libdir=${mylibprefix}/$(get_libdir) \
+		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
+		--disable-termcap \
+		--with-shared \
+		--with-rcs-ids \
+		--without-ada \
+		--enable-symlinks \
+		--enable-const \
+		--with-chtype='long' \
+		--with-mmask-t='long' \
+		$(use_with debug) \
+		$(use_with gpm) \
+		"$@" \
+		|| 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 first so that the non-unicode
+	# files overwrite the unicode versions
+	if use unicode ; then
+		cd "${WORKDIR}"/widec
+		make DESTDIR="${D}" install || die "make widec install failed"
+	fi
+	cd "${WORKDIR}"/narrowc
+	make DESTDIR="${D}" install || die "make narrowc install failed"
+
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		# 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
+	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
+
+	if use build ; then
+		cd "${D}"
+		rm -rf usr/share/man
+		cd usr/share/terminfo
+		cp -pPR l/linux n/nxterm v/vt100 "${T}"
+		rm -rf *
+		mkdir l x v
+		cp -pPR "${T}"/linux l
+		cp -pPR "${T}"/nxterm x/xterm
+		cp -pPR "${T}"/vt100 v
+	else
+		# Install xterm-debian terminfo entry to satisfy bug #18486
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${D}/usr/$(get_libdir):${D}/$(get_libdir) \
+		TERMINFO=${D}/usr/share/terminfo \
+			"${D}"/usr/bin/tic "${FILESDIR}"/xterm-debian.ti
+
+		if use minimal ; then
+			cp "${D}"/usr/share/terminfo/x/xterm-debian "${D}"/etc/terminfo/x/
+			rm -r "${D}"/usr/share/terminfo
+		fi
+
+		cd "${S}"
+		dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+		use doc && dohtml -r doc/html/
+	fi
+}
+
+pkg_preinst() {
+	if [[ ! -f ${ROOT}/etc/env.d/50ncurses ]] ; then
+		mkdir -p "${ROOT}"/etc/env.d
+		echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > \
+			"${ROOT}"/etc/env.d/50ncurses
+	fi
+}
+
+pkg_postinst() {
+	# Old ncurses may still be around from old build tbz2's.
+	rm -f "${ROOT}"/lib/libncurses.so.5.[23] "${ROOT}"/usr/lib/lib{form,menu,panel}.so.5.[23]
+	if [[ $(get_libdir) != "lib" ]] ; then
+		rm -f "${ROOT}"/$(get_libdir)/libncurses.so.5.[23] \
+			"${ROOT}"/usr/$(get_libdir)/lib{form,menu,panel}.so.5.[23]
+	fi
+}