append, not overwrite. Sorry for this. Thanks to: Dan Foster <dsf@globalcrossing.net> in bug #95858

Package-Manager: portage-2.0.51.22-r1

6 files changed, 32 insertions, 21 deletions

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index 75a6735ba9b3..83775f54762d 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,14 @@
 # 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.92 2005/06/12 10:44:01 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.93 2005/06/13 11:16:07 seemant Exp $
+
+*xterm-202-r2 (13 Jun 2005)
+*xterm-200-r3 (13 Jun 2005)
+
+  13 Jun 2005; Seemant Kulleen <seemant@gentoo.org> -xterm-200-r2.ebuild,
+  +xterm-200-r3.ebuild, -xterm-202.ebuild, +xterm-202-r2.ebuild:
+  append, not overwrite. Sorry for this. Thanks to: Dan Foster
+  <dsf@globalcrossing.net> in bug #95858
 
   12 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> xterm-200-r2.ebuild:
   Stable on hppa.
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index d57a38d78301..a7ef183c3e9c 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,11 +1,11 @@
-MD5 8f9c099f3a13c95bf5eb36e814cf7e3a xterm-200-r1.ebuild 1903
 MD5 99f9752783bc8c4cc41c72ea1e465fec metadata.xml 294
+MD5 8f9c099f3a13c95bf5eb36e814cf7e3a xterm-200-r1.ebuild 1903
+MD5 d23713edbb7fe3b9807f6c33b10815c7 ChangeLog 14013
+MD5 c9f1bbe4840e9a78a1012be58e6f2ce0 xterm-200-r3.ebuild 2246
+MD5 3a14369574d72edf7edd635c62a13190 xterm-202-r2.ebuild 2355
 MD5 fbef9698628550a847dc76cd497738a9 xterm-202-r1.ebuild 2353
-MD5 fccd0229e8a80244a341c2ccc8dcc423 ChangeLog 13711
-MD5 0dc185546142fa5513a3a4e345cbb1da xterm-202.ebuild 2298
-MD5 5ae198fe18a5e4f90b7d1810c5fae190 xterm-200-r2.ebuild 2243
-MD5 5b73666ce15842c6f2bd6cc83e9dd9f2 files/digest-xterm-202 58
-MD5 7b7d35cfdf6b4601d1079f1aca757ab5 files/digest-xterm-200-r2 58
-MD5 5b73666ce15842c6f2bd6cc83e9dd9f2 files/digest-xterm-202-r1 58
-MD5 201c212a3232d830f73261ea29e14f66 files/xterm-no-toolbar-by-default.patch 380
 MD5 7b7d35cfdf6b4601d1079f1aca757ab5 files/digest-xterm-200-r1 58
+MD5 201c212a3232d830f73261ea29e14f66 files/xterm-no-toolbar-by-default.patch 380
+MD5 5b73666ce15842c6f2bd6cc83e9dd9f2 files/digest-xterm-202-r1 58
+MD5 7b7d35cfdf6b4601d1079f1aca757ab5 files/digest-xterm-200-r3 58
+MD5 5b73666ce15842c6f2bd6cc83e9dd9f2 files/digest-xterm-202-r2 58
diff --git a/x11-terms/xterm/files/digest-xterm-200-r2 b/x11-terms/xterm/files/digest-xterm-200-r3
index 5fae437bf624..5fae437bf624 100644
--- a/x11-terms/xterm/files/digest-xterm-200-r2
+++ b/x11-terms/xterm/files/digest-xterm-200-r3
diff --git a/x11-terms/xterm/files/digest-xterm-202 b/x11-terms/xterm/files/digest-xterm-202-r2
index 89e44ec17165..89e44ec17165 100644
--- a/x11-terms/xterm/files/digest-xterm-202
+++ b/x11-terms/xterm/files/digest-xterm-202-r2
diff --git a/x11-terms/xterm/xterm-200-r2.ebuild b/x11-terms/xterm/xterm-200-r3.ebuild
index 5d8b7ca8ad00..0504200ddd4c 100644
--- a/x11-terms/xterm/xterm-200-r2.ebuild
+++ b/x11-terms/xterm/xterm-200-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.6 2005/06/12 10:44:01 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-200-r3.ebuild,v 1.1 2005/06/13 11:16:07 seemant Exp $
 
 inherit eutils flag-o-matic
 
@@ -63,8 +63,8 @@ src_install() {
 	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}/etc/X11/app-defaults/XTerm
-	echo "*allowWindowOps: 	false" > ${D}/etc/X11/app-defaults/UXTerm
+	echo "*allowWindowOps: 	false" >> ${D}/etc/X11/app-defaults/XTerm
+	echo "*allowWindowOps: 	false" >> ${D}/etc/X11/app-defaults/UXTerm
 }
 
 pkg_preinst() {
diff --git a/x11-terms/xterm/xterm-202.ebuild b/x11-terms/xterm/xterm-202-r2.ebuild
index cf655469655c..a9546f8d12fc 100644
--- a/x11-terms/xterm/xterm-202.ebuild
+++ b/x11-terms/xterm/xterm-202-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-202.ebuild,v 1.2 2005/05/13 21:10:34 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-202-r2.ebuild,v 1.1 2005/06/13 11:16:07 seemant Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,7 +11,7 @@ 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"
+IUSE="truetype Xaw3d unicode toolbar"
 
 DEPEND="virtual/x11
 	virtual/utempter
@@ -19,7 +19,7 @@ DEPEND="virtual/x11
 
 src_unpack() {
 	unpack ${A}; cd ${S}
-	epatch ${FILESDIR}/${PN}-no-toolbar-by-default.patch
+#	epatch ${FILESDIR}/${PN}-no-toolbar-by-default.patch
 }
 
 src_compile() {
@@ -46,7 +46,7 @@ src_compile() {
 		--enable-tcap-query \
 		--enable-logging \
 		--enable-dabbrev \
-		--enable-toolbar \
+		`use_enable toolbar` \
 		`use_enable truetype freetype` \
 		`use_enable unicode luit` `use_enable unicode mini-luit` \
 		`use_with Xaw3d` \
@@ -67,6 +67,11 @@ src_install() {
 
 	# 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}/etc/X11/app-defaults/XTerm
+	echo "*allowWindowOps: 	false" >> ${D}/etc/X11/app-defaults/UXTerm
+
 }
 
 pkg_preinst() {
@@ -79,11 +84,9 @@ pkg_preinst() {
 
 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}"
+	ewarn "Please make SURE to run etc-update, as that is where the latest"
+	ewarn "security fix is made"
 	echo
-	epause
+	epause 5
 	ebeep
 }