Add optional support for bracketed paste mode, bug #93051.

Package-Manager: portage-2.1.1_pre2-r2

4 files changed, 123 insertions, 5 deletions

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index c6bac4cf7208..bfdd0776f76d 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/xterm
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.153 2006/07/09 04:06:08 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.154 2006/07/11 10:53:47 exg Exp $
+
+*xterm-215-r1 (11 Jul 2006)
+
+  11 Jul 2006; Emanuele Giaquinta <exg@gentoo.org> +xterm-215-r1.ebuild:
+  Add optional support for bracketed paste mode, bug #93051.
 
   09 Jul 2006; Joshua Kinard <kumba@gentoo.org> xterm-215.ebuild:
   Marked stable on mips.
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index b9b11d1176b0..8d899b09eeda 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -30,14 +30,18 @@ EBUILD xterm-213.ebuild 2619 RMD160 d4a7de736a1511746edf72d96cd919bf97cd3983 SHA
 MD5 4bdb247b49d76e86ee3a9688a09f633b xterm-213.ebuild 2619
 RMD160 d4a7de736a1511746edf72d96cd919bf97cd3983 xterm-213.ebuild 2619
 SHA256 dfb16db614d07356bf924efc71713fe2bc18ccb52b57281ec058cae6b8767939 xterm-213.ebuild 2619
+EBUILD xterm-215-r1.ebuild 2725 RMD160 e0ab243634f1b15e3c9be8c4053d8e2cb2c26bda SHA1 60df07cbbbfdcdd9863f293dd748673cfb3c00b4 SHA256 875d15ffecaf064dee488e3bd7f832cf7b6cda6be0912c632429ce35ddec3e26
+MD5 26928370cd01bc8be19b44144d37b07a xterm-215-r1.ebuild 2725
+RMD160 e0ab243634f1b15e3c9be8c4053d8e2cb2c26bda xterm-215-r1.ebuild 2725
+SHA256 875d15ffecaf064dee488e3bd7f832cf7b6cda6be0912c632429ce35ddec3e26 xterm-215-r1.ebuild 2725
 EBUILD xterm-215.ebuild 2408 RMD160 8ccb3dcc949320bd880b8eedb1a03cb0c1f8d618 SHA1 a79ba5b069e6017b6cb7fd15d43d88d7d70df6db SHA256 1f6428488250bbbfbb9c660109401878f9ddd24fe83f43c2e33c1d8de0556f88
 MD5 7c8c34cde3263f0027218cbfc9c31a0f xterm-215.ebuild 2408
 RMD160 8ccb3dcc949320bd880b8eedb1a03cb0c1f8d618 xterm-215.ebuild 2408
 SHA256 1f6428488250bbbfbb9c660109401878f9ddd24fe83f43c2e33c1d8de0556f88 xterm-215.ebuild 2408
-MISC ChangeLog 22139 RMD160 817b9dc0c16c40b895dd8ecd7ce11969b87d23b4 SHA1 f2059582e909cf977de15651696b223ba5fdd9e9 SHA256 775b7ac4cc201f0c6f7ffa52203b008b211f625767f622776e708a70b9e18105
-MD5 c5634a8dc6af9878ee8749fb6a1aedcb ChangeLog 22139
-RMD160 817b9dc0c16c40b895dd8ecd7ce11969b87d23b4 ChangeLog 22139
-SHA256 775b7ac4cc201f0c6f7ffa52203b008b211f625767f622776e708a70b9e18105 ChangeLog 22139
+MISC ChangeLog 22301 RMD160 d393d94cb0a007673ffd10f0377abafb56bc1132 SHA1 34a8f786769e09975c668620511a9596bb6f6f55 SHA256 5759bf4d34b05637c1e9bc4be67b3729d0c1f577e35ea27ae8b6fa17b6c0fbe8
+MD5 6f04d848bba722c9ca436ab18239ff10 ChangeLog 22301
+RMD160 d393d94cb0a007673ffd10f0377abafb56bc1132 ChangeLog 22301
+SHA256 5759bf4d34b05637c1e9bc4be67b3729d0c1f577e35ea27ae8b6fa17b6c0fbe8 ChangeLog 22301
 MISC metadata.xml 509 RMD160 8260071117978c13f534adbaa2c080d5834420d7 SHA1 9edccd3fe2d180a92790068b5cdde8f47c7c4a3a SHA256 c4cf8fd894af68e5c7249d22885de0dd20b681dc636686d43c3bce7074fdf692
 MD5 0f56141a57f7925bd8470488fa51c330 metadata.xml 509
 RMD160 8260071117978c13f534adbaa2c080d5834420d7 metadata.xml 509
@@ -63,3 +67,6 @@ SHA256 c7d7f85ce52eee14c5651ef2565e887e116be152bc5d64e2c00f6d123c56b717 files/di
 MD5 4cedea1a5eac1efdb432db19adabbe14 files/digest-xterm-215 220
 RMD160 4aa5a97ff7d914a01d1a05e37d0791e73046c9e5 files/digest-xterm-215 220
 SHA256 7517f175c943e594165cc49555b344e09e52039901f6522cecc530e93edf3fc7 files/digest-xterm-215 220
+MD5 4cedea1a5eac1efdb432db19adabbe14 files/digest-xterm-215-r1 220
+RMD160 4aa5a97ff7d914a01d1a05e37d0791e73046c9e5 files/digest-xterm-215-r1 220
+SHA256 7517f175c943e594165cc49555b344e09e52039901f6522cecc530e93edf3fc7 files/digest-xterm-215-r1 220
diff --git a/x11-terms/xterm/files/digest-xterm-215-r1 b/x11-terms/xterm/files/digest-xterm-215-r1
new file mode 100644
index 000000000000..d75b4f093f55
--- /dev/null
+++ b/x11-terms/xterm/files/digest-xterm-215-r1
@@ -0,0 +1,3 @@
+MD5 8c2a45d4ca754b2cb019242e26f657eb xterm-215.tgz 784236
+RMD160 458c14aa97503bdac5da3881491de14e2d87f52a xterm-215.tgz 784236
+SHA256 4564c646a4a4f56e49e8c8cda1d4aa027e228db2d4bb2a4ad0f055f34373734f xterm-215.tgz 784236
diff --git a/x11-terms/xterm/xterm-215-r1.ebuild b/x11-terms/xterm/xterm-215-r1.ebuild
new file mode 100644
index 000000000000..841c5632ef7a
--- /dev/null
+++ b/x11-terms/xterm/xterm-215-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-215-r1.ebuild,v 1.1 2006/07/11 10:53:47 exg Exp $
+
+inherit 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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="truetype Xaw3d unicode toolbar paste64"
+
+RDEPEND="|| ( (	x11-libs/libX11
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXmu
+		x11-libs/libxkbfile
+		x11-libs/libXft
+		x11-libs/libXaw
+		unicode? ( x11-apps/luit ) )
+	virtual/x11 )
+	Xaw3d? ( x11-libs/Xaw3d )
+	sys-libs/libutempter"
+
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xproto virtual/x11 )"
+
+pkg_setup() {
+	if has_version "x11-libs/libX11"; then
+		DEFAULTS_DIR="/usr/share/X11/app-defaults"
+	else
+		DEFAULTS_DIR="/etc/X11/app-defaults"
+	fi
+}
+
+src_compile() {
+	filter-flags "-fstack-protector"
+
+	local myconf=""
+
+	if has_version "x11-libs/libX11"; then
+		myconf="--disable-narrowproto"
+	fi
+
+	econf \
+		--libdir=/etc \
+		--with-x \
+		--with-utempter \
+		--disable-setuid \
+		--disable-full-tgetent \
+		--disable-imake \
+		--enable-ansi-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 \
+		--with-app-defaults=${DEFAULTS_DIR} \
+		$(use_enable toolbar) \
+		$(use_enable truetype freetype) \
+		$(use_enable unicode luit) $(use_enable unicode mini-luit) \
+		$(use_with Xaw3d) \
+		$(use_enable paste64) \
+		${myconf} \
+		|| die
+
+	emake || die "failed to compile xterm"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc README{,.i18n} ctlseqs.txt xterm.log.html
+
+	# 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}${DEFAULTS_DIR}/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_postinst() {
+	if use paste64 ; then
+		elog "bracketed paste mode requires the allowWindowOps resource to be true"
+		elog "which is false by default for security reasons (see bug #91453)."
+		elog "To be able to use it add 'allowWindowOps: true' to your resources"
+	fi
+}