remove crufty ebuild. Filter the -Os gcc flag in favour of -O2, for now. When gcc-4.1.1-r2 goes stable (see bug #135718, SpanKY's comments), then the filter will be removed. This closes bug #147401

(Portage version: 2.1.1)
 (Unsigned Manifest commit)

3 files changed, 16 insertions, 130 deletions

diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 82ad2c97985b..d82a64b44cc9 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -3,29 +3,24 @@ 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-215.tgz 784236 RMD160 458c14aa97503bdac5da3881491de14e2d87f52a SHA1 d2cb4919d3a2bada27c5ff6e32727b9aecb2266a SHA256 4564c646a4a4f56e49e8c8cda1d4aa027e228db2d4bb2a4ad0f055f34373734f
-DIST xterm-217.tgz 799748 RMD160 2ecea708db38995a13273fb0723a78eaa49fc2b4 SHA1 54662d7531d65ac2cca3dc0cccabe055b74baa9c SHA256 ad11b705b308fc19760a52ef0d99ea3f5ace611b9076bb53ed07a560253310bc
 DIST xterm-218.tgz 796457 RMD160 8b2cbce07da5d7a46f3aa988fd65d4df688e7e9c SHA1 6b7c6d0efc4230eba154d710cc0293c646dbfb3d SHA256 e84d808b5c34418873f987ecf958f4a8158574adcbf96390ccc72ce2667cd6af
 DIST xterm-220.tgz 801249 RMD160 66dee865a041993fa6acc131419420394f1aa50d SHA1 f4e0a43ab9993003827c014c92d4040eb2030401 SHA256 6ff97cefff8a210ddc9b72a93c4d8355dff29e21967f6ade66019744b934bb4b
-EBUILD xterm-215.ebuild 2406 RMD160 1d2888e02d25dcd9cb1f7bd8ec1cbca82b1706e8 SHA1 be7f75c34b214565160471cd8b443bfcfbc359b2 SHA256 b52c3016d89e2f55e7b020c1e38eac95e3ca3b8f96baa25515afb7280c2526d0
-MD5 499ee52ee79c36399d481602126f90ee xterm-215.ebuild 2406
-RMD160 1d2888e02d25dcd9cb1f7bd8ec1cbca82b1706e8 xterm-215.ebuild 2406
-SHA256 b52c3016d89e2f55e7b020c1e38eac95e3ca3b8f96baa25515afb7280c2526d0 xterm-215.ebuild 2406
-EBUILD xterm-217.ebuild 2726 RMD160 d900771a4f07fa21732865f36c22d57c63406568 SHA1 8e304ef3be4ca098c88799e854c07fa6373ac176 SHA256 21f855de465263e3fccf3c02077f71d3efa9d1d8de66940b9db9faf78ee8e3e2
-MD5 6dfc5fd2432ae58f06c8fa88433c743a xterm-217.ebuild 2726
-RMD160 d900771a4f07fa21732865f36c22d57c63406568 xterm-217.ebuild 2726
-SHA256 21f855de465263e3fccf3c02077f71d3efa9d1d8de66940b9db9faf78ee8e3e2 xterm-217.ebuild 2726
-EBUILD xterm-218.ebuild 2726 RMD160 015e596e0827c93aaa11d71b204d7c036ca89f6c SHA1 2424b1c793b38092560636afc21042eb347ec211 SHA256 a33509d5a0df48d999c7fd184286500ddb638c2bdb6b8ba5f96b93908475cf01
-MD5 9967b852508602cb56a089343bf37809 xterm-218.ebuild 2726
-RMD160 015e596e0827c93aaa11d71b204d7c036ca89f6c xterm-218.ebuild 2726
-SHA256 a33509d5a0df48d999c7fd184286500ddb638c2bdb6b8ba5f96b93908475cf01 xterm-218.ebuild 2726
-EBUILD xterm-220.ebuild 2726 RMD160 c094b45ccadccb21b1dfe9caf931f78699e37dfd SHA1 d9ba63b377c073f3521623dafce8e43941fe7b4b SHA256 4047108e504dfa3dde51771e9d570cfd81857944ea677b6fabdc1cc5ff176647
-MD5 36f13836adf442bfc0ea9507167dc507 xterm-220.ebuild 2726
-RMD160 c094b45ccadccb21b1dfe9caf931f78699e37dfd xterm-220.ebuild 2726
-SHA256 4047108e504dfa3dde51771e9d570cfd81857944ea677b6fabdc1cc5ff176647 xterm-220.ebuild 2726
-MISC ChangeLog 23302 RMD160 2be025e0837f78cf5670bc75a1b782f4e7adddae SHA1 a5011b1509059e4164cefbccfde2b2d22cf85f13 SHA256 f6e71f32de9f10c355d2612aaed8cd22a683ccf7c8a71e9018f9d04269084433
-MD5 eb7ea8550073af92aa1f94216c4fd217 ChangeLog 23302
-RMD160 2be025e0837f78cf5670bc75a1b782f4e7adddae ChangeLog 23302
-SHA256 f6e71f32de9f10c355d2612aaed8cd22a683ccf7c8a71e9018f9d04269084433 ChangeLog 23302
+EBUILD xterm-215.ebuild 2434 RMD160 3706617e81387daac36f1d590b2814572466d89b SHA1 2d6c1d12359f2c8fc600ca4165e24cdedaea6e3d SHA256 e52624417961a135211580656b7615a741fdf7bced0e588617ed07f171fd348f
+MD5 56f69bbd7165cbe203e9f7110a6201f2 xterm-215.ebuild 2434
+RMD160 3706617e81387daac36f1d590b2814572466d89b xterm-215.ebuild 2434
+SHA256 e52624417961a135211580656b7615a741fdf7bced0e588617ed07f171fd348f xterm-215.ebuild 2434
+EBUILD xterm-218.ebuild 2753 RMD160 55f87224c3496557839f33ee2711f2d9f8efd747 SHA1 69f10ed82772068ed52855bbc1713524a007d9c7 SHA256 017464dbe1dfda5e5bfe8f89093377beba28303623388c3cb2f63b8c5c296cc4
+MD5 1188245261a390dba0f022d72583d329 xterm-218.ebuild 2753
+RMD160 55f87224c3496557839f33ee2711f2d9f8efd747 xterm-218.ebuild 2753
+SHA256 017464dbe1dfda5e5bfe8f89093377beba28303623388c3cb2f63b8c5c296cc4 xterm-218.ebuild 2753
+EBUILD xterm-220.ebuild 2753 RMD160 ba80082ee5b26b48fea5d7d7d761cc0624df1822 SHA1 04ba41d3da2540f11407415a7d8ec62a6ce0fc45 SHA256 5510c9cae8e239ef31d985fd245408ea0f5c659c211bbb4eb004d54be16ce382
+MD5 6b8fdb4984a3f4bee27ce851ae122330 xterm-220.ebuild 2753
+RMD160 ba80082ee5b26b48fea5d7d7d761cc0624df1822 xterm-220.ebuild 2753
+SHA256 5510c9cae8e239ef31d985fd245408ea0f5c659c211bbb4eb004d54be16ce382 xterm-220.ebuild 2753
+MISC ChangeLog 23638 RMD160 d82aacb35b2acdb57ed0814f6a80ff44e1200d62 SHA1 90575db6556f528b74739c3f670b19bb0fb6d77b SHA256 c984a8f7d7d84e02cd5cc34fc9b63224a9b2255148ef0015e2e8cf2664d00c35
+MD5 01e2fa7b3647fd6956f9f7cf97a14f58 ChangeLog 23638
+RMD160 d82aacb35b2acdb57ed0814f6a80ff44e1200d62 ChangeLog 23638
+SHA256 c984a8f7d7d84e02cd5cc34fc9b63224a9b2255148ef0015e2e8cf2664d00c35 ChangeLog 23638
 MISC metadata.xml 509 RMD160 8260071117978c13f534adbaa2c080d5834420d7 SHA1 9edccd3fe2d180a92790068b5cdde8f47c7c4a3a SHA256 c4cf8fd894af68e5c7249d22885de0dd20b681dc636686d43c3bce7074fdf692
 MD5 0f56141a57f7925bd8470488fa51c330 metadata.xml 509
 RMD160 8260071117978c13f534adbaa2c080d5834420d7 metadata.xml 509
@@ -33,9 +28,6 @@ SHA256 c4cf8fd894af68e5c7249d22885de0dd20b681dc636686d43c3bce7074fdf692 metadata
 MD5 4cedea1a5eac1efdb432db19adabbe14 files/digest-xterm-215 220
 RMD160 4aa5a97ff7d914a01d1a05e37d0791e73046c9e5 files/digest-xterm-215 220
 SHA256 7517f175c943e594165cc49555b344e09e52039901f6522cecc530e93edf3fc7 files/digest-xterm-215 220
-MD5 01933cb25c4358cb43f31c60d4122ed7 files/digest-xterm-217 220
-RMD160 27153febae5bae543c7286eb5ecf2592d5d48db2 files/digest-xterm-217 220
-SHA256 0d09396b8b42a65d8fb749e7e7a5da017a1d22b2f319cf7bb9209b5e8479a979 files/digest-xterm-217 220
 MD5 7759c0cdf996b013c0b72914396cca27 files/digest-xterm-218 220
 RMD160 21f06ceccc2e1482667cba9cb9c1e112ce6b93de files/digest-xterm-218 220
 SHA256 4e6bd1cddd65f427697decf9e1c279edc32a7cdd9c94702b0a91dd4d040716f5 files/digest-xterm-218 220
diff --git a/x11-terms/xterm/files/digest-xterm-217 b/x11-terms/xterm/files/digest-xterm-217
deleted file mode 100644
index 9704c7588efe..000000000000
--- a/x11-terms/xterm/files/digest-xterm-217
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a16ae2aeb026d8776cffb7a36b778656 xterm-217.tgz 799748
-RMD160 2ecea708db38995a13273fb0723a78eaa49fc2b4 xterm-217.tgz 799748
-SHA256 ad11b705b308fc19760a52ef0d99ea3f5ace611b9076bb53ed07a560253310bc xterm-217.tgz 799748
diff --git a/x11-terms/xterm/xterm-217.ebuild b/x11-terms/xterm/xterm-217.ebuild
deleted file mode 100644
index 2c43523d8cc4..000000000000
--- a/x11-terms/xterm/xterm-217.ebuild
+++ /dev/null
@@ -1,103 +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-217.ebuild,v 1.1 2006/08/22 11:23:48 seemant 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
-}