Version bump thanks to Donnie in irc. I don't like the way this one does the prompts -- makes it hard to read and stuff. If anyone has fixes for it, contact me via email or irc please. Also, toolbars are now enabled by default -- not USE based anymore. run xterm -tb to enable them if you want. The default resource files causes toolbars to be disabled as per expected behaviour

Package-Manager: portage-2.0.51.20-r4

5 files changed, 116 insertions, 2 deletions

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index b76da782e995..917b4d22f29d 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,17 @@
 # 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.77 2005/04/20 22:02:56 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.78 2005/04/26 21:31:33 seemant Exp $
+
+*xterm-201 (26 Apr 2005)
+
+  26 Apr 2005; Seemant Kulleen <seemant@gentoo.org>
+  +files/xterm-no-toolbar-by-default.patch, +xterm-201.ebuild:
+  Version bump thanks to Donnie in irc. I don't like the way this one does the
+  prompts -- makes it hard to read and stuff. If anyone has fixes for it,
+  contact me via email or irc please. Also, toolbars are now enabled by
+  default -- not USE based anymore. run xterm -tb to enable them if you want.
+  The default resource files causes toolbars to be disabled as per expected
+  behaviour
 
   20 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> xterm-200-r1.ebuild:
   Stable on alpha + ia64, requested by seemant.
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index d99e6f3a7030..ada18fefa099 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,9 +1,12 @@
-MD5 db3e0be48f8b4105d3e2cf8593a6683c ChangeLog 11096
+MD5 70649e75bcd905c8d01d4a2ee07d616e ChangeLog 11630
 MD5 a8f4e2b68b04b535b32e12816278f1da metadata.xml 231
 MD5 1765e27e1dc3a249bf40d42d1e1a01b8 xterm-197.ebuild 1624
 MD5 ec505f279a237dd970d710aa1a0bcee9 xterm-199.ebuild 1611
 MD5 cc6c77e2aabfa98173ad773e6686e68a xterm-200-r1.ebuild 1906
+MD5 e6afdf97402facb3626f4ff7e44d9165 xterm-201.ebuild 2292
 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-r1 58
+MD5 882f30d5e789becbfab9dec94025c812 files/digest-xterm-201 58
+MD5 201c212a3232d830f73261ea29e14f66 files/xterm-no-toolbar-by-default.patch 380
diff --git a/x11-terms/xterm/files/digest-xterm-201 b/x11-terms/xterm/files/digest-xterm-201
new file mode 100644
index 000000000000..8b9b740be2a5
--- /dev/null
+++ b/x11-terms/xterm/files/digest-xterm-201
@@ -0,0 +1 @@
+MD5 c38bcb40a793743cb442ccaeddfe0466 xterm-201.tgz 705663
diff --git a/x11-terms/xterm/files/xterm-no-toolbar-by-default.patch b/x11-terms/xterm/files/xterm-no-toolbar-by-default.patch
new file mode 100644
index 000000000000..cf231a8e736b
--- /dev/null
+++ b/x11-terms/xterm/files/xterm-no-toolbar-by-default.patch
@@ -0,0 +1,10 @@
+--- xterm-201/XTerm.ad.orig	2005-04-26 17:01:44.000000000 -0400
++++ xterm-201/XTerm.ad	2005-04-26 17:01:59.000000000 -0400
+@@ -7,6 +7,7 @@
+ ! $XFree86: xc/programs/xterm/XTerm.ad,v 3.30 2005/04/22 00:21:53 dickey Exp $
+ 
+ *saveLines: 1024
++*toolBar: False
+ 
+ *SimpleMenu*BackingStore: NotUseful
+ *SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-*
diff --git a/x11-terms/xterm/xterm-201.ebuild b/x11-terms/xterm/xterm-201.ebuild
new file mode 100644
index 000000000000..66974b013caa
--- /dev/null
+++ b/x11-terms/xterm/xterm-201.ebuild
@@ -0,0 +1,89 @@
+# 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-201.ebuild,v 1.1 2005/04/26 21:31:33 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"
+
+DEPEND="virtual/x11
+	sys-apps/utempter
+	Xaw3d? ( x11-libs/Xaw3d )"
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+	epatch ${FILESDIR}/${PN}-no-toolbar-by-default.patch
+}
+
+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 \
+		--enable-toolbar \
+		`use_enable truetype freetype` \
+		`use_enable unicode luit` `use_enable unicode mini-luit` \
+		`use_with Xaw3d` \
+		|| 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*
+}
+
+
+pkg_postinst() {
+	echo
+	einfo "Xterm is now built with toolbar support enabled.  The 'toolbar'"
+	einfo "USE flag is gone away from this release onwards.  In order to run"
+	einfo "xterm with the toolbar, please see the manpage or the ChangeLog"
+	einfo "in /usr/share/doc/${PF}"
+	echo
+	epause
+	ebeep
+}