don't install any more terminfo files, as these clash with the files provided by ncurses. closes bug #72502 by Maurice van der Pot <griffon26@gentoo.org>

(Portage version: 2.0.51.19)

4 files changed, 82 insertions, 11 deletions

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index cde1f0ea5eb9..c4fd72237c70 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/xterm
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.75 2005/04/15 12:07:05 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.76 2005/04/15 14:18:53 seemant Exp $
+
+*xterm-200-r1 (15 Apr 2005)
+
+  15 Apr 2005; Seemant Kulleen <seemant@gentoo.org> +xterm-200-r1.ebuild:
+  don't install any more terminfo files, as these clash with the files
+  provided by ncurses. closes bug #72502 by Maurice van der Pot
+  <griffon26@gentoo.org>
 
   15 Apr 2005; Jochen Maes <sejo@gentoo.org> xterm-200.ebuild:
   added ppc keyword
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index fc55bd419f3d..67ddc77c8823 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 f5756b22150c8ca43da088191950b482 ChangeLog 10707
 MD5 a8f4e2b68b04b535b32e12816278f1da metadata.xml 231
 MD5 1765e27e1dc3a249bf40d42d1e1a01b8 xterm-197.ebuild 1624
 MD5 ec505f279a237dd970d710aa1a0bcee9 xterm-199.ebuild 1611
 MD5 e5318b84de1283c1dd96583b47c577b6 xterm-200.ebuild 1671
+MD5 638b042059e8372590f1a3c90b301d9f xterm-200-r1.ebuild 1903
 MD5 262f724e0a5b9a083a6fb77ba48e5e12 files/digest-xterm-197 58
 MD5 6fae395e470f08203ce93f62fa6e896c files/digest-xterm-199 58
 MD5 22861d1a4affc7229c468095a0103257 files/xterm-184-remove-termcap-breakage.patch 377
 MD5 7b7d35cfdf6b4601d1079f1aca757ab5 files/digest-xterm-200 58
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCX66PMXMsRNMHhmARAiaNAJ4jHxuUz/zl6UhrGbDuuWWuMnW0egCguUaL
-wVEhgEK9ERKL9DVRN+Z+tmo=
-=248b
------END PGP SIGNATURE-----
+MD5 7b7d35cfdf6b4601d1079f1aca757ab5 files/digest-xterm-200-r1 58
diff --git a/x11-terms/xterm/files/digest-xterm-200-r1 b/x11-terms/xterm/files/digest-xterm-200-r1
new file mode 100644
index 000000000000..5fae437bf624
--- /dev/null
+++ b/x11-terms/xterm/files/digest-xterm-200-r1
@@ -0,0 +1 @@
+MD5 c55b615195aebda12ea2422ea4bd718a xterm-200.tgz 697480
diff --git a/x11-terms/xterm/xterm-200-r1.ebuild b/x11-terms/xterm/xterm-200-r1.ebuild
new file mode 100644
index 000000000000..1c49d23f47a5
--- /dev/null
+++ b/x11-terms/xterm/xterm-200-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-200-r1.ebuild,v 1.1 2005/04/15 14:18:53 seemant Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Terminal Emulator for X Windows"
+HOMEPAGE="http://dickey.his.com/xterm/"
+SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
+
+LICENSE="X11"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+IUSE="truetype Xaw3d unicode toolbar"
+
+DEPEND="virtual/x11
+	sys-apps/utempter
+	Xaw3d? ( x11-libs/Xaw3d )"
+
+src_compile() {
+
+	filter-flags "-fstack-protector"
+
+	econf \
+		--libdir=/etc \
+		--with-x \
+		--with-utempter \
+		--disable-setuid \
+		--disable-full-tgetent \
+		--disable-imake \
+		--enable-ansi-color \
+		--enable-88-color \
+		--enable-256-color \
+		--enable-broken-osc \
+		--enable-broken-st \
+		--enable-load-vt-fonts \
+		--enable-i18n \
+		--enable-wide-chars \
+		--enable-doublechars \
+		--enable-warnings \
+		--enable-tcap-query \
+		--enable-logging \
+		--enable-dabbrev \
+		`use_enable truetype freetype` \
+		`use_enable unicode luit` `use_enable unicode mini-luit` \
+		`use_with Xaw3d` \
+		`use_enable toolbar` || die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install    || die
+	dodoc README* INSTALL*
+
+	# Fix permissions -- it grabs them from live system, and they can
+	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
+	# respectively (#69510).
+	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
+	fperms 0755 /usr/bin/xterm
+
+	# restore the navy blue
+	sed -i "s:blue2$:blue:" ${D}/etc/X11/app-defaults/XTerm-color
+}
+
+pkg_preinst() {
+	# Prevent the terminfo files from being removed.  These collide with ncurses
+	# provided terminfo files.  So, now no more package collisions, yay!
+	touch ${ROOT}/usr/share/terminfo/v/vs100
+	touch ${ROOT}/usr/share/terminfo/x/x*
+}