version bump -- and this one actually works for me now, I'll unmask after a few people test

(Portage version: 2.0.51.22-r2)

9 files changed, 14 insertions, 185 deletions

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index d7ed05aa6dd3..429d9eae3562 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,13 @@
 # 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.94 2005/07/03 03:08:18 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.95 2005/08/05 12:03:24 seemant Exp $
+
+*xterm-204 (05 Aug 2005)
+
+  05 Aug 2005; Seemant Kulleen <seemant@gentoo.org> -xterm-200-r1.ebuild,
+  -xterm-202-r1.ebuild, -xterm-202-r2.ebuild, +xterm-204.ebuild:
+  version bump -- and this one actually works for me now, I'll unmask after a
+  few people test
 
   03 Jul 2005; Hardave Riar <hardave@gentoo.org> xterm-200-r3.ebuild:
   Stable on mips, bug #91453
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 2dad9b78e106..2ace5301b1dc 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 99f9752783bc8c4cc41c72ea1e465fec metadata.xml 294
-MD5 fbef9698628550a847dc76cd497738a9 xterm-202-r1.ebuild 2353
-MD5 735c1b014e14a4d459574885e621c443 xterm-200-r3.ebuild 2243
 MD5 8f9c099f3a13c95bf5eb36e814cf7e3a xterm-200-r1.ebuild 1903
-MD5 3a14369574d72edf7edd635c62a13190 xterm-202-r2.ebuild 2355
 MD5 041cffd1ebd525e7c6ed980613abc089 ChangeLog 14113
+MD5 735c1b014e14a4d459574885e621c443 xterm-200-r3.ebuild 2243
+MD5 303a3e06bae4108587d0dc8b3e73bc63 xterm-204.ebuild 2300
 MD5 7b7d35cfdf6b4601d1079f1aca757ab5 files/digest-xterm-200-r1 58
-MD5 5b73666ce15842c6f2bd6cc83e9dd9f2 files/digest-xterm-202-r1 58
-MD5 7b7d35cfdf6b4601d1079f1aca757ab5 files/digest-xterm-200-r3 58
 MD5 201c212a3232d830f73261ea29e14f66 files/xterm-no-toolbar-by-default.patch 380
-MD5 5b73666ce15842c6f2bd6cc83e9dd9f2 files/digest-xterm-202-r2 58
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzHT8gIKl8Uu19MoRAlPXAJ0VuYUhvk66sQ8VIcEnWlEnuGTZDwCfRP67
-ouBhUt5/Ggc+g5z1cJJWlgs=
-=pmhf
------END PGP SIGNATURE-----
+MD5 7b7d35cfdf6b4601d1079f1aca757ab5 files/digest-xterm-200-r3 58
+MD5 8c7c791e44946002c03410f9a6e9fc69 files/digest-xterm-204 58
diff --git a/x11-terms/xterm/files/digest-xterm-200-r1 b/x11-terms/xterm/files/digest-xterm-200-r1
deleted file mode 100644
index 5fae437bf624..000000000000
--- a/x11-terms/xterm/files/digest-xterm-200-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c55b615195aebda12ea2422ea4bd718a xterm-200.tgz 697480
diff --git a/x11-terms/xterm/files/digest-xterm-202-r1 b/x11-terms/xterm/files/digest-xterm-202-r1
deleted file mode 100644
index 89e44ec17165..000000000000
--- a/x11-terms/xterm/files/digest-xterm-202-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a43b794f357adffd6ca0d05453dd2c80 xterm-202.tgz 707480
diff --git a/x11-terms/xterm/files/digest-xterm-202-r2 b/x11-terms/xterm/files/digest-xterm-202-r2
deleted file mode 100644
index 89e44ec17165..000000000000
--- a/x11-terms/xterm/files/digest-xterm-202-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a43b794f357adffd6ca0d05453dd2c80 xterm-202.tgz 707480
diff --git a/x11-terms/xterm/files/digest-xterm-204 b/x11-terms/xterm/files/digest-xterm-204
new file mode 100644
index 000000000000..6980f0ee9e0c
--- /dev/null
+++ b/x11-terms/xterm/files/digest-xterm-204
@@ -0,0 +1 @@
+MD5 5b0093671525e2db22203e606dba8834 xterm-204.tgz 715433
diff --git a/x11-terms/xterm/xterm-200-r1.ebuild b/x11-terms/xterm/xterm-200-r1.ebuild
deleted file mode 100644
index 8ad958e96f06..000000000000
--- a/x11-terms/xterm/xterm-200-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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-r1.ebuild,v 1.8 2005/06/10 14:44:52 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"
-
-DEPEND="virtual/x11
-	virtual/utempter
-	Xaw3d? ( x11-libs/Xaw3d )"
-
-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 \
-		`use_enable truetype freetype` \
-		`use_enable unicode luit` `use_enable unicode mini-luit` \
-		`use_with Xaw3d` \
-		`use_enable toolbar` || 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*
-}
diff --git a/x11-terms/xterm/xterm-202-r1.ebuild b/x11-terms/xterm/xterm-202-r1.ebuild
deleted file mode 100644
index 12e92218eadf..000000000000
--- a/x11-terms/xterm/xterm-202-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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-r1.ebuild,v 1.2 2005/06/10 15:09:01 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"
-
-DEPEND="virtual/x11
-	virtual/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 \
-		`use_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
-
-	# 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() {
-	# 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
-	ewarn "Please make SURE to run etc-update, as that is where the latest"
-	ewarn "security fix is made"
-	echo
-	epause 5
-	ebeep
-}
diff --git a/x11-terms/xterm/xterm-202-r2.ebuild b/x11-terms/xterm/xterm-204.ebuild
index a9546f8d12fc..583617586abd 100644
--- a/x11-terms/xterm/xterm-202-r2.ebuild
+++ b/x11-terms/xterm/xterm-204.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-r2.ebuild,v 1.1 2005/06/13 11:16:07 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-204.ebuild,v 1.1 2005/08/05 12:03:24 seemant Exp $
 
 inherit eutils flag-o-matic
 
@@ -19,7 +19,6 @@ DEPEND="virtual/x11
 
 src_unpack() {
 	unpack ${A}; cd ${S}
-#	epatch ${FILESDIR}/${PN}-no-toolbar-by-default.patch
 }
 
 src_compile() {