version bump (I missed 206 entirely) to 207, which fixes bug #104818, bug #113596, and bug #112793. Huge thanks to Thomas

Package-Manager: portage-2.0.53

4 files changed, 128 insertions, 2 deletions

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index bc101a471841..f71258e3fd17 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,12 @@
 # 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.111 2005/10/19 14:54:27 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.112 2005/12/07 15:14:00 seemant Exp $
+
+*xterm-207 (07 Dec 2005)
+
+  07 Dec 2005; Seemant Kulleen <seemant@gentoo.org> +xterm-207.ebuild:
+  version bump (I missed 206 entirely) to 207, which fixes bug #104818, bug
+  #113596, and bug #112793. Huge thanks to Thomas
 
   19 Oct 2005; Seemant Kulleen <seemant@gentoo.org> xterm-205.ebuild:
   remove postinst message about security, since that issue is old and dead.
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index c8d1d5827d58..2c4448673156 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,7 +1,9 @@
-MD5 b62fd6b8b3cce18ef47f2b68bb6ff967 ChangeLog 16530
+MD5 e037fff81a0535e21ad0d5a720211002 ChangeLog 16754
 MD5 8c7c791e44946002c03410f9a6e9fc69 files/digest-xterm-204 58
 MD5 93bc9a4e8639a697e639b46636a802ba files/digest-xterm-205 58
+MD5 f5ee205af95a801f901ea6ce2764bf3d files/digest-xterm-207 58
 MD5 a5048a1a15d86d400d3e2dbaaa0ac1c8 files/xterm-LANG.patch 1698
 MD5 99f9752783bc8c4cc41c72ea1e465fec metadata.xml 294
 MD5 c42b2497dfa255b8bde0c64ad6c8b7a1 xterm-204.ebuild 2527
 MD5 1e0d3b0e7a7017a9faecf4a8c3072ebb xterm-205.ebuild 2542
+MD5 82229cd3c61e1bb2bafabe0a64f00a0d xterm-207.ebuild 2951
diff --git a/x11-terms/xterm/files/digest-xterm-207 b/x11-terms/xterm/files/digest-xterm-207
new file mode 100644
index 000000000000..6340f831fba8
--- /dev/null
+++ b/x11-terms/xterm/files/digest-xterm-207
@@ -0,0 +1 @@
+MD5 3de8a3756c284a46a08c6d0308909486 xterm-207.tgz 745083
diff --git a/x11-terms/xterm/xterm-207.ebuild b/x11-terms/xterm/xterm-207.ebuild
new file mode 100644
index 000000000000..a2f5d79b3a89
--- /dev/null
+++ b/x11-terms/xterm/xterm-207.ebuild
@@ -0,0 +1,117 @@
+# 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-207.ebuild,v 1.1 2005/12/07 15:14:00 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 doc"
+
+RDEPEND="||( (
+		x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXmu
+		x11-libs/libxkbfile
+		x11-libs/libXft
+		x11-libs/libXaw )
+	virtual/x11 )
+	Xaw3d? ( x11-libs/Xaw3d )
+	doc? ( sys-apps/groff )
+	virtual/utempter"
+
+DEPEND="${RDEPEND}
+	||( x11-proto/xproto virtual/x11 )"
+
+pkg_setup() {
+	if has_version ">=x11-base/xorg-x11-7.0.0_rc1"; then
+		einfo "Found $(best_version x11-base/xorg-x11)."
+		NEWAPPDEFAULTS=1
+		DEFAULTS_DIR="/usr/$(get_libdir)/X11/app-defaults"
+	else
+		einfo "Not found xorg-x11 version 7."
+		NEWAPPDEFAULTS=0
+		DEFAULTS_DIR="/etc/X11/app-defaults"
+	fi
+}
+
+
+src_compile() {
+
+	filter-flags "-fstack-protector"
+
+	local myconf
+
+	if [ ${NEWAPPDEFAULTS} = 1 ] ; then
+		myconf="--enable-narrowproto"
+	else
+		myconf="--disable-narrowproto"
+	fi
+	
+	myconf="${myconf} --with-app-defaults=${DEFAULTS_DIR}"
+		
+
+	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 toolbar` \
+		`use_enable truetype freetype` \
+		`use_enable unicode luit` `use_enable unicode mini-luit` \
+		`use_with Xaw3d` \
+		${myconf} || die
+
+	emake || die "failed to compile xterm"
+
+	if use doc ; then
+		make ctlseqs.txt || die "failed to make documentation file"
+	fi
+}
+
+src_install() {
+	make DESTDIR=${D} install    || die
+	dodoc README* INSTALL* ctlseqs.txt
+
+	# 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
+
+	# Fix for bug #91453 at Thomas Dickey's suggestion:
+	echo "*allowWindowOps: 	false" >> ${D}/${DEFAULTS_DIR}/XTerm
+	echo "*allowWindowOps: 	false" >> ${D}/${DEFAULTS_DIR}/UXTerm
+
+}
+
+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*
+}