Removing xterm-220 and xterm-221 for segfault as shown in bug #152085 by Ciaran McCreesh

(Portage version: 2.1.2_pre3-r5)
 (Unsigned Manifest commit)

5 files changed, 4 insertions, 234 deletions

diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 64dab517bbce..11dbc3a2bd92 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -3,29 +3,19 @@ MD5 307a0970129ebdd2044f781e24dd434e files/xterm-app-defaults-ref.patch 572
 RMD160 c8f9acef7113e9e1ffa2987d51f9d03f50658116 files/xterm-app-defaults-ref.patch 572
 SHA256 41616cb3a3dd687b9c5e1e60ff0e5ebfc6a116f3e0de89c86705235ecfc6203f files/xterm-app-defaults-ref.patch 572
 DIST xterm-218.tgz 796457 RMD160 8b2cbce07da5d7a46f3aa988fd65d4df688e7e9c SHA1 6b7c6d0efc4230eba154d710cc0293c646dbfb3d SHA256 e84d808b5c34418873f987ecf958f4a8158574adcbf96390ccc72ce2667cd6af
-DIST xterm-220.tgz 801249 RMD160 66dee865a041993fa6acc131419420394f1aa50d SHA1 f4e0a43ab9993003827c014c92d4040eb2030401 SHA256 6ff97cefff8a210ddc9b72a93c4d8355dff29e21967f6ade66019744b934bb4b
-DIST xterm-221.tgz 802680 RMD160 7936f3ae02359e097bc373c285a48074159bdf47 SHA1 4e72ec63cbcb36d842f19dadbeeb4f1651d447de SHA256 ebfa569f985852caefb386447e2aefe73f9b49464e44fda8b8d9df6b47c5b2f0
 DIST xterm-222.tgz 802986 RMD160 4dd220fd9f47b340b6a72d953032fa7b608d1d1c SHA1 bedb7a87f7e0a92471ff7140f0727233aaeb8811 SHA256 b103660810b0db547ee0081536245cb0746400acb8c6d7f6f591ec5756f8d9e0
 EBUILD xterm-218.ebuild 2741 RMD160 1421c6326ed2c51392e4611d099eb8360207c269 SHA1 e319e87d2bbaed4305d39f20ea7eedd2e0c4af82 SHA256 59be510de697c5ac0ee6be228dafe3ab4c8173aab7e9202d36072d7ef224ef0a
 MD5 f893eddaa335c348238ff26ab9a89f3f xterm-218.ebuild 2741
 RMD160 1421c6326ed2c51392e4611d099eb8360207c269 xterm-218.ebuild 2741
 SHA256 59be510de697c5ac0ee6be228dafe3ab4c8173aab7e9202d36072d7ef224ef0a xterm-218.ebuild 2741
-EBUILD xterm-220.ebuild 2779 RMD160 ad0b23e814ad20974e481c7282033fc49dd278a9 SHA1 03ce5d810a769b52e4e3a8453188c9c163c2b9f7 SHA256 ce9c4e3dc0758f7d571b7147c335160f2d16454bc7a28dbe746a80910f5263d8
-MD5 78e2044c0f27986654c0536b9429d282 xterm-220.ebuild 2779
-RMD160 ad0b23e814ad20974e481c7282033fc49dd278a9 xterm-220.ebuild 2779
-SHA256 ce9c4e3dc0758f7d571b7147c335160f2d16454bc7a28dbe746a80910f5263d8 xterm-220.ebuild 2779
-EBUILD xterm-221.ebuild 2784 RMD160 b4a16eb75f9e4b5e0ba0722becde620a9ae81628 SHA1 2ea836335ea7062e1786d0d1ead2b391d7f84910 SHA256 a9ef9e3feebb495d5a0a66d643b55cafae7286da7ce97bf115cbcdbf08671134
-MD5 f4a74b018b4bdc58b584823e5a42296f xterm-221.ebuild 2784
-RMD160 b4a16eb75f9e4b5e0ba0722becde620a9ae81628 xterm-221.ebuild 2784
-SHA256 a9ef9e3feebb495d5a0a66d643b55cafae7286da7ce97bf115cbcdbf08671134 xterm-221.ebuild 2784
 EBUILD xterm-222.ebuild 2788 RMD160 dd5ce8f422b124e0cab5bbc28688f1345ec082fa SHA1 7186628db1ba6f58a7531c82919c6a5ccf9985ea SHA256 af56b83a761e8f421641d89f4047d90caf7786227635be7299f4bacaa661c8e8
 MD5 df32510209955357ade26adaace54697 xterm-222.ebuild 2788
 RMD160 dd5ce8f422b124e0cab5bbc28688f1345ec082fa xterm-222.ebuild 2788
 SHA256 af56b83a761e8f421641d89f4047d90caf7786227635be7299f4bacaa661c8e8 xterm-222.ebuild 2788
-MISC ChangeLog 25649 RMD160 a69675840dbd9e55fa376b70f3feb61bb5e940bb SHA1 e0c9a3aecd5804b0dd33badb49ee155d8b894c54 SHA256 2e6b7f4b82291bbe236b6d6202c98999aa27e78f006d81d4d25377a859285b69
-MD5 db0ef14a782f3bbdfba7dc31d216eced ChangeLog 25649
-RMD160 a69675840dbd9e55fa376b70f3feb61bb5e940bb ChangeLog 25649
-SHA256 2e6b7f4b82291bbe236b6d6202c98999aa27e78f006d81d4d25377a859285b69 ChangeLog 25649
+MISC ChangeLog 25834 RMD160 a9c85f2e7528a77baca0e893a40dc6efd21b0fd2 SHA1 e0fe276686147a77806e49e45f129a60a70ab045 SHA256 01aee7c5be214e27a8f3204070d9e8313af153d0d92a293fd19edcebe99b9753
+MD5 b8e6dd125ef7b1714905cf8d3f1634f8 ChangeLog 25834
+RMD160 a9c85f2e7528a77baca0e893a40dc6efd21b0fd2 ChangeLog 25834
+SHA256 01aee7c5be214e27a8f3204070d9e8313af153d0d92a293fd19edcebe99b9753 ChangeLog 25834
 MISC metadata.xml 509 RMD160 8260071117978c13f534adbaa2c080d5834420d7 SHA1 9edccd3fe2d180a92790068b5cdde8f47c7c4a3a SHA256 c4cf8fd894af68e5c7249d22885de0dd20b681dc636686d43c3bce7074fdf692
 MD5 0f56141a57f7925bd8470488fa51c330 metadata.xml 509
 RMD160 8260071117978c13f534adbaa2c080d5834420d7 metadata.xml 509
@@ -33,12 +23,6 @@ SHA256 c4cf8fd894af68e5c7249d22885de0dd20b681dc636686d43c3bce7074fdf692 metadata
 MD5 7759c0cdf996b013c0b72914396cca27 files/digest-xterm-218 220
 RMD160 21f06ceccc2e1482667cba9cb9c1e112ce6b93de files/digest-xterm-218 220
 SHA256 4e6bd1cddd65f427697decf9e1c279edc32a7cdd9c94702b0a91dd4d040716f5 files/digest-xterm-218 220
-MD5 4760242f57b6b91c51c07c212dc132a9 files/digest-xterm-220 220
-RMD160 31454749c94ce8289408fcfca1cb0b201c0902b7 files/digest-xterm-220 220
-SHA256 8725a5d15b31633e2d8b8c17ca6b005855d5178e5e8f8e5707565a75e8115b47 files/digest-xterm-220 220
-MD5 be9edbacc4706e63d6123ee228316fd8 files/digest-xterm-221 220
-RMD160 f30117bffe8bb677c931661e88ba3a034b9a28fe files/digest-xterm-221 220
-SHA256 791b1b47ce125ff7e251e31232100b700508d1f9a64755642d1fd34805337933 files/digest-xterm-221 220
 MD5 b03b4d9346118c4b583900958373b7ac files/digest-xterm-222 220
 RMD160 91e75d175299052ab31458462bb362803924b708 files/digest-xterm-222 220
 SHA256 3c727680d9239506117208fd3a1927c3271a7cf3242ac93c170791995492f9bd files/digest-xterm-222 220
diff --git a/x11-terms/xterm/files/digest-xterm-220 b/x11-terms/xterm/files/digest-xterm-220
deleted file mode 100644
index ac1abaee8fe0..000000000000
--- a/x11-terms/xterm/files/digest-xterm-220
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e8272cb45c1d962033b77ac0b5053787 xterm-220.tgz 801249
-RMD160 66dee865a041993fa6acc131419420394f1aa50d xterm-220.tgz 801249
-SHA256 6ff97cefff8a210ddc9b72a93c4d8355dff29e21967f6ade66019744b934bb4b xterm-220.tgz 801249
diff --git a/x11-terms/xterm/files/digest-xterm-221 b/x11-terms/xterm/files/digest-xterm-221
deleted file mode 100644
index 44dfffe6fc68..000000000000
--- a/x11-terms/xterm/files/digest-xterm-221
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dbda54660a275225a418825742b9961f xterm-221.tgz 802680
-RMD160 7936f3ae02359e097bc373c285a48074159bdf47 xterm-221.tgz 802680
-SHA256 ebfa569f985852caefb386447e2aefe73f9b49464e44fda8b8d9df6b47c5b2f0 xterm-221.tgz 802680
diff --git a/x11-terms/xterm/xterm-220.ebuild b/x11-terms/xterm/xterm-220.ebuild
deleted file mode 100644
index f2f1a80d57b1..000000000000
--- a/x11-terms/xterm/xterm-220.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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-220.ebuild,v 1.12 2006/10/19 13:30:24 agriffis 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"
-	replace-flags "-Os" "-O2" # work around gcc-4.1.1-r[01] bugs
-
-	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
-}
diff --git a/x11-terms/xterm/xterm-221.ebuild b/x11-terms/xterm/xterm-221.ebuild
deleted file mode 100644
index d5caa05b52ea..000000000000
--- a/x11-terms/xterm/xterm-221.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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-221.ebuild,v 1.1 2006/10/02 09:45:00 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"
-	replace-flags "-Os" "-O2" # work around gcc-4.1.1-r[01] bugs
-
-	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
-}