4 files changed, 80 insertions, 13 deletions
diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index 4aea769101bf..7e3451f82fb9 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/xterm
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.51 2004/10/23 19:59:43 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.52 2004/11/08 16:41:10 spyderous Exp $
+
+*xterm-196-r1 (08 Nov 2004)
+
+  08 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>; +xterm-196-r1.ebuild:
+  Make sure /usr/bin/xterm is 0755. It grabs permissions from the live system
+  at install time, and they could be old ones from when it was suid (for
+  unix98 pty) or sgid (for without utempter) (#69510).
 
   23 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> xterm-196.ebuild:
   Stable on alpha.
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 4c109e87fca6..f33bceadb032 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 70250a7ff1bb60fed961ad39c7ffbf3c ChangeLog 7307
 MD5 a8f4e2b68b04b535b32e12816278f1da metadata.xml 231
 MD5 1a8191a25cb537d0d9787a8e2cdcd765 xterm-179.ebuild 765
 MD5 6bf46051147f1c3ee33b53922434b474 xterm-184.ebuild 1306
 MD5 36479e2c7528b7ed5f056328e81b76df xterm-191.ebuild 1403
 MD5 254e9b7ebbb4d0e4c31e5153d08ca50f xterm-194.ebuild 1381
 MD5 e398ff67be1a8bf3a9062955f687d42b xterm-196.ebuild 1461
+MD5 274e53300b4f42f6e89c23803ae42160 xterm-196-r1.ebuild 1741
+MD5 728ea15d6d0931ab62c993ced673b8b5 ChangeLog 7623
 MD5 a2579a687debb13d3011931fad6249eb files/digest-xterm-179 58
 MD5 5c9025c4b70e8eb7494cfda9c86cec6c files/digest-xterm-184 58
-MD5 22861d1a4affc7229c468095a0103257 files/xterm-184-remove-termcap-breakage.patch 377
 MD5 716a3f43c00e18d6b9ee95c8cb67162b files/digest-xterm-191 58
 MD5 926622ad04f587a8e5058cd4972e01ed files/digest-xterm-194 58
 MD5 222267de7af1500b6d28efe51a296e1b files/digest-xterm-196 58
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBhERbHTu7gpaalycRAr39AKCGBC773S7FS+yWPjvIauxfp4RdzACg6hG2
-/aFzvliqedG8zm4By6pkRT0=
-=NdPA
------END PGP SIGNATURE-----
+MD5 22861d1a4affc7229c468095a0103257 files/xterm-184-remove-termcap-breakage.patch 377
+MD5 222267de7af1500b6d28efe51a296e1b files/digest-xterm-196-r1 58
diff --git a/x11-terms/xterm/files/digest-xterm-196-r1 b/x11-terms/xterm/files/digest-xterm-196-r1
new file mode 100644
index 000000000000..748336f67c7e
--- /dev/null
+++ b/x11-terms/xterm/files/digest-xterm-196-r1
@@ -0,0 +1 @@
+MD5 a07b5792cf8c9a5fc885a640590e4dfc xterm-196.tgz 678177
diff --git a/x11-terms/xterm/xterm-196-r1.ebuild b/x11-terms/xterm/xterm-196-r1.ebuild
new file mode 100644
index 000000000000..e19ee5271e2e
--- /dev/null
+++ b/x11-terms/xterm/xterm-196-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-196-r1.ebuild,v 1.1 2004/11/08 16:41:10 spyderous 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="|| ( x11-base/xorg-x11 >=x11-base/xfree-4.3.0-r7 )
+	sys-apps/utempter
+	Xaw3d? ( x11-libs/Xaw3d )"
+# Doesn't work because of broken portage (#8810)
+# virtual/x11"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-184-remove-termcap-breakage.patch
+}
+
+src_compile() {
+
+	filter-flags "-fstack-protector"
+
+	econf \
+		`use_enable truetype freetype` \
+		`use_enable unicode luit` \
+		`use_with Xaw3d` \
+		--libdir=/etc \
+		--with-utempter \
+		--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 \
+		--disable-imake \
+		--disable-toolbar \
+		${myconf} || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install-full || 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
+}