Version bump. Cleanup.

Package-Manager: portage-2.1_rc3-r2

12 files changed, 21 insertions, 619 deletions

diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index 82495f1e22ef..bd4d7ae52e47 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,70 +1,36 @@
-AUX xterm-LANG.patch 1698 RMD160 8f442cbb3d39cd18645f656970d717c5bab84a2d SHA1 4ff6b11ac3ac8b590c7da294bd0c12dabd9013eb SHA256 b2e646c2f4c86cd8132a5a54a362363453f1f02a4f976751c41d7418b3d772c5 size 1698
-MD5 a5048a1a15d86d400d3e2dbaaa0ac1c8 files/xterm-LANG.patch 1698
-RMD160 8f442cbb3d39cd18645f656970d717c5bab84a2d files/xterm-LANG.patch 1698
-SHA256 b2e646c2f4c86cd8132a5a54a362363453f1f02a4f976751c41d7418b3d772c5 files/xterm-LANG.patch 1698
-AUX xterm-app-defaults-ref.patch 572 RMD160 c8f9acef7113e9e1ffa2987d51f9d03f50658116 SHA1 d80445dccc4a52bc22d118787929db937417ce50 SHA256 41616cb3a3dd687b9c5e1e60ff0e5ebfc6a116f3e0de89c86705235ecfc6203f size 572
+AUX xterm-app-defaults-ref.patch 572 RMD160 c8f9acef7113e9e1ffa2987d51f9d03f50658116 SHA1 d80445dccc4a52bc22d118787929db937417ce50 SHA256 41616cb3a3dd687b9c5e1e60ff0e5ebfc6a116f3e0de89c86705235ecfc6203f
 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-204.tgz 715433 size 715433
-DIST xterm-207.tgz 745083 RMD160 225aafce1de43212e0cd86da953e99a1a9121a05 SHA256 652f579171e6e8f73c13ab6b060d2447ae35ebfbd39a6002b7c05a1dfc0f7eb8 size 745083
-DIST xterm-210.tgz 761944 RMD160 65cfb18484d859365bac571b8d8b7da0762e91e7 SHA256 49cde913a5283ef837b442e74766b7926eceef42743fc82bc68cc1e5ee7eb30e size 761944
-DIST xterm-211.tgz 762374 RMD160 fb8a8e9f1cdf654063706b3aa9e9f9c49d0b100e SHA256 15dbf56f02b6d117e8e5d20955731fc13e598875d36b17de61b826b77955f092 size 762374
-DIST xterm-212.tgz 764465 RMD160 2808cdf3f550ef9df7e83a4844f3f4f64f0508a1 SHA256 bfd201600c0f0f3c3d9dcfe32fde1db333307a87a4453084bf55a7aa97b3b6ae size 764465
-EBUILD xterm-204.ebuild 2530 RMD160 eaf282efc07e5ac5580222ff84a5dda28a39f948 SHA1 02acd253a18c1dbea21202cd4bbaa14dcffdf032 SHA256 934ee1a2ff7c80added70a81bc4cd498cb49635b5720553253d684e513bccdbe size 2530
-MD5 444f8b10a7261b2ce95b3e13a05cf505 xterm-204.ebuild 2530
-RMD160 eaf282efc07e5ac5580222ff84a5dda28a39f948 xterm-204.ebuild 2530
-SHA256 934ee1a2ff7c80added70a81bc4cd498cb49635b5720553253d684e513bccdbe xterm-204.ebuild 2530
-EBUILD xterm-207.ebuild 2812 RMD160 c3ea1dd7973b724cf9f894d183569ca4bf47818c SHA1 a0043c499f9aeef82dd28979b7d059313292fb5b SHA256 5b7cefe19febb996f7ee38dc7a6cb5a36ec722bd8458b4c5809e2f9277534421 size 2812
+DIST xterm-207.tgz 745083 RMD160 225aafce1de43212e0cd86da953e99a1a9121a05 SHA256 652f579171e6e8f73c13ab6b060d2447ae35ebfbd39a6002b7c05a1dfc0f7eb8
+DIST xterm-212.tgz 764465 RMD160 2808cdf3f550ef9df7e83a4844f3f4f64f0508a1 SHA256 bfd201600c0f0f3c3d9dcfe32fde1db333307a87a4453084bf55a7aa97b3b6ae
+DIST xterm-213.tgz 765077 RMD160 a6419401b30bcdc56f710af8e0bfeba62c101736 SHA1 7b76c63bcc0ccd70a5aa68045da6d51388b93515 SHA256 745ea1f97a8e1cb836802d9433f5f466076953eab915b06448383d40ed2df68e
+EBUILD xterm-207.ebuild 2812 RMD160 c3ea1dd7973b724cf9f894d183569ca4bf47818c SHA1 a0043c499f9aeef82dd28979b7d059313292fb5b SHA256 5b7cefe19febb996f7ee38dc7a6cb5a36ec722bd8458b4c5809e2f9277534421
 MD5 e06943b90ca57b7290ee7ba54a627eaf xterm-207.ebuild 2812
 RMD160 c3ea1dd7973b724cf9f894d183569ca4bf47818c xterm-207.ebuild 2812
 SHA256 5b7cefe19febb996f7ee38dc7a6cb5a36ec722bd8458b4c5809e2f9277534421 xterm-207.ebuild 2812
-EBUILD xterm-210.ebuild 2582 RMD160 e60ff7c2ad5fc420d6eddddc9557329f4339a07b SHA1 c5adf792db08432eb4378e19dd88c80d186f2fc7 SHA256 974092a056dd7e03dfd80a263e0e08b16a309a027a50cffaf23811decf85fc25 size 2582
-MD5 80646453e917c4a64a9ce068b81823bf xterm-210.ebuild 2582
-RMD160 e60ff7c2ad5fc420d6eddddc9557329f4339a07b xterm-210.ebuild 2582
-SHA256 974092a056dd7e03dfd80a263e0e08b16a309a027a50cffaf23811decf85fc25 xterm-210.ebuild 2582
-EBUILD xterm-211.ebuild 2684 RMD160 b5381e5382de46f3087ce63faf0a49efa9c6c0de SHA1 1e74836d7804eaa7c57fb4f177b031e787d425c4 SHA256 aa31ca937e7306809f21b3dad46afbb8fd3859fb51d71e8ac1d08a7b0bb6c236 size 2684
-MD5 0c00df38a951d8843067d8479e4b2381 xterm-211.ebuild 2684
-RMD160 b5381e5382de46f3087ce63faf0a49efa9c6c0de xterm-211.ebuild 2684
-SHA256 aa31ca937e7306809f21b3dad46afbb8fd3859fb51d71e8ac1d08a7b0bb6c236 xterm-211.ebuild 2684
-EBUILD xterm-212-r1.ebuild 2523 RMD160 fce9e36d0b3081e0b41f0cc685a87a172e5352c1 SHA1 40c9e5cf2beb3764d7b76639e1883d9206cf1aaf SHA256 dbc976bfdc867ba5eb79581e0fcd6c954288924f509197a427e538fffbaa2b5a size 2523
-MD5 d08344a6d7ebb2f3e00a58d58fb5eef4 xterm-212-r1.ebuild 2523
-RMD160 fce9e36d0b3081e0b41f0cc685a87a172e5352c1 xterm-212-r1.ebuild 2523
-SHA256 dbc976bfdc867ba5eb79581e0fcd6c954288924f509197a427e538fffbaa2b5a xterm-212-r1.ebuild 2523
-EBUILD xterm-212-r2.ebuild 2609 RMD160 2c50947d66cb1f977622d8a737f39a7a90c35aa2 SHA1 d87df87df2cb15e430bb8a567a47337c01ab2ff2 SHA256 ee96e9201f2c38076bb32ecb0ff65c10889db49c911b6168e8cc08528de960d3 size 2609
-MD5 b9ad299458c7f264c07d19d2cd493114 xterm-212-r2.ebuild 2609
-RMD160 2c50947d66cb1f977622d8a737f39a7a90c35aa2 xterm-212-r2.ebuild 2609
-SHA256 ee96e9201f2c38076bb32ecb0ff65c10889db49c911b6168e8cc08528de960d3 xterm-212-r2.ebuild 2609
-EBUILD xterm-212.ebuild 2648 RMD160 17c53b19e2a77d6d4bc9fee0b7fda94fac47778e SHA1 754d648ffc360374641cb2cb5bb68e8b2e379c62 SHA256 1332bc0b8756d5aa96484546ecbf0f3157b4305e67f6221f11e52a1b6c7feca2 size 2648
-MD5 79143e92b612b26d841e210fff1aa6be xterm-212.ebuild 2648
-RMD160 17c53b19e2a77d6d4bc9fee0b7fda94fac47778e xterm-212.ebuild 2648
-SHA256 1332bc0b8756d5aa96484546ecbf0f3157b4305e67f6221f11e52a1b6c7feca2 xterm-212.ebuild 2648
-MISC ChangeLog 19657 RMD160 fd3dee2bdb31a75c406f8b14313883c458671912 SHA1 5892b2b53be142d0cade1ecf7cb321ff160361a6 SHA256 a5d230d023f52dc4f629c5f898a86a59533194a14f2119a6b470c7dc1a46599b size 19657
-MD5 9541a9e96850b95012e5df08a83c63cf ChangeLog 19657
-RMD160 fd3dee2bdb31a75c406f8b14313883c458671912 ChangeLog 19657
-SHA256 a5d230d023f52dc4f629c5f898a86a59533194a14f2119a6b470c7dc1a46599b ChangeLog 19657
-MISC metadata.xml 509 RMD160 8260071117978c13f534adbaa2c080d5834420d7 SHA1 9edccd3fe2d180a92790068b5cdde8f47c7c4a3a SHA256 c4cf8fd894af68e5c7249d22885de0dd20b681dc636686d43c3bce7074fdf692 size 509
+EBUILD xterm-212-r2.ebuild 2622 RMD160 eab4abfca7fc4c7b5f25311257717dcec93b3d04 SHA1 2a667910f2f9049df91000691afbe8809259b41f SHA256 a78cbf99403ce0e175df5f8a06eaf9605f0a0a6b7bf75bf1a3e321c6be76ef26
+MD5 7138b02e09919e8d0637ecc83a186635 xterm-212-r2.ebuild 2622
+RMD160 eab4abfca7fc4c7b5f25311257717dcec93b3d04 xterm-212-r2.ebuild 2622
+SHA256 a78cbf99403ce0e175df5f8a06eaf9605f0a0a6b7bf75bf1a3e321c6be76ef26 xterm-212-r2.ebuild 2622
+EBUILD xterm-213.ebuild 2619 RMD160 d4a7de736a1511746edf72d96cd919bf97cd3983 SHA1 d62afa4d8ce8710b7db2a89a9087645d16cc3c57 SHA256 dfb16db614d07356bf924efc71713fe2bc18ccb52b57281ec058cae6b8767939
+MD5 4bdb247b49d76e86ee3a9688a09f633b xterm-213.ebuild 2619
+RMD160 d4a7de736a1511746edf72d96cd919bf97cd3983 xterm-213.ebuild 2619
+SHA256 dfb16db614d07356bf924efc71713fe2bc18ccb52b57281ec058cae6b8767939 xterm-213.ebuild 2619
+MISC ChangeLog 19929 RMD160 9807cd67d35374ba0f90960695b9f9aa7aa68145 SHA1 2441cd265fb993725b1f0b5cfa5436c08d53f67a SHA256 10d29ac466e51c05dd9557026bd1fb7044558f447e86d91f283ed46ba8d0f835
+MD5 12a4a8fbec8a8da4cc93bbacf29a5630 ChangeLog 19929
+RMD160 9807cd67d35374ba0f90960695b9f9aa7aa68145 ChangeLog 19929
+SHA256 10d29ac466e51c05dd9557026bd1fb7044558f447e86d91f283ed46ba8d0f835 ChangeLog 19929
+MISC metadata.xml 509 RMD160 8260071117978c13f534adbaa2c080d5834420d7 SHA1 9edccd3fe2d180a92790068b5cdde8f47c7c4a3a SHA256 c4cf8fd894af68e5c7249d22885de0dd20b681dc636686d43c3bce7074fdf692
 MD5 0f56141a57f7925bd8470488fa51c330 metadata.xml 509
 RMD160 8260071117978c13f534adbaa2c080d5834420d7 metadata.xml 509
 SHA256 c4cf8fd894af68e5c7249d22885de0dd20b681dc636686d43c3bce7074fdf692 metadata.xml 509
-MD5 8c7c791e44946002c03410f9a6e9fc69 files/digest-xterm-204 58
-RMD160 e9ecd1ef9454b58a3f4e42afb31f3e4dd8610bd9 files/digest-xterm-204 58
-SHA256 8df2cf980b114cea6fe97747bb45e68d9eafee4a4d0b34a60cc06ed4da14cb5c files/digest-xterm-204 58
 MD5 f798ace9153b7e69cafb78a3e29bd7d7 files/digest-xterm-207 220
 RMD160 fb6ec0e6c86c9eb3e3313a873f7287532e2c12ea files/digest-xterm-207 220
 SHA256 ffa8ac6ddc7bbf1ee689af54009677c601aa424c852163430af5ea8c63e117a9 files/digest-xterm-207 220
-MD5 99d2840c41bffd60ea6a01a0f8561e1f files/digest-xterm-210 220
-RMD160 db63a1408eaebcfdc33eb773ed4ef64300411fb7 files/digest-xterm-210 220
-SHA256 f9cf0ecfba109650d0168470d09302ef3b30ab3dadf3d41093c4871bd72930a8 files/digest-xterm-210 220
-MD5 555fc3d8a5da96662b58fdd2379ecc39 files/digest-xterm-211 220
-RMD160 f66cf329d0e530117f0d6bb2959324e434dd13b2 files/digest-xterm-211 220
-SHA256 9902af9789ecae331985035d87f4645989e3c149dee9eae397ddd5f5855dce03 files/digest-xterm-211 220
-MD5 515d0610099473c1e3d2d46d4b9f46f3 files/digest-xterm-212 220
-RMD160 64ac702cd771d4a38712041dd15c16366d90602d files/digest-xterm-212 220
-SHA256 9a597d9971e64390dba0f5fb1cc744df257cfce836447560a831d2b02e6dde13 files/digest-xterm-212 220
-MD5 515d0610099473c1e3d2d46d4b9f46f3 files/digest-xterm-212-r1 220
-RMD160 64ac702cd771d4a38712041dd15c16366d90602d files/digest-xterm-212-r1 220
-SHA256 9a597d9971e64390dba0f5fb1cc744df257cfce836447560a831d2b02e6dde13 files/digest-xterm-212-r1 220
 MD5 515d0610099473c1e3d2d46d4b9f46f3 files/digest-xterm-212-r2 220
 RMD160 64ac702cd771d4a38712041dd15c16366d90602d files/digest-xterm-212-r2 220
 SHA256 9a597d9971e64390dba0f5fb1cc744df257cfce836447560a831d2b02e6dde13 files/digest-xterm-212-r2 220
+MD5 f1e06625f293203b84c63eecfd95d601 files/digest-xterm-213 220
+RMD160 87ac0aa1fa757179db24e68f5487c2e5c9b9073a files/digest-xterm-213 220
+SHA256 c7d7f85ce52eee14c5651ef2565e887e116be152bc5d64e2c00f6d123c56b717 files/digest-xterm-213 220
diff --git a/x11-terms/xterm/files/digest-xterm-204 b/x11-terms/xterm/files/digest-xterm-204
deleted file mode 100644
index 6980f0ee9e0c..000000000000
--- a/x11-terms/xterm/files/digest-xterm-204
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5b0093671525e2db22203e606dba8834 xterm-204.tgz 715433
diff --git a/x11-terms/xterm/files/digest-xterm-210 b/x11-terms/xterm/files/digest-xterm-210
deleted file mode 100644
index 963395d0af43..000000000000
--- a/x11-terms/xterm/files/digest-xterm-210
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1528b95619b21740c01addd5c9fdb4f0 xterm-210.tgz 761944
-RMD160 65cfb18484d859365bac571b8d8b7da0762e91e7 xterm-210.tgz 761944
-SHA256 49cde913a5283ef837b442e74766b7926eceef42743fc82bc68cc1e5ee7eb30e xterm-210.tgz 761944
diff --git a/x11-terms/xterm/files/digest-xterm-211 b/x11-terms/xterm/files/digest-xterm-211
deleted file mode 100644
index 60514e1742a6..000000000000
--- a/x11-terms/xterm/files/digest-xterm-211
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 babb9a02ba7ebb7770f48e3257b2884e xterm-211.tgz 762374
-RMD160 fb8a8e9f1cdf654063706b3aa9e9f9c49d0b100e xterm-211.tgz 762374
-SHA256 15dbf56f02b6d117e8e5d20955731fc13e598875d36b17de61b826b77955f092 xterm-211.tgz 762374
diff --git a/x11-terms/xterm/files/digest-xterm-212 b/x11-terms/xterm/files/digest-xterm-212
deleted file mode 100644
index 6d07057d24f9..000000000000
--- a/x11-terms/xterm/files/digest-xterm-212
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d39ec47dbf846e0e7dddb354280c4074 xterm-212.tgz 764465
-RMD160 2808cdf3f550ef9df7e83a4844f3f4f64f0508a1 xterm-212.tgz 764465
-SHA256 bfd201600c0f0f3c3d9dcfe32fde1db333307a87a4453084bf55a7aa97b3b6ae xterm-212.tgz 764465
diff --git a/x11-terms/xterm/files/digest-xterm-212-r1 b/x11-terms/xterm/files/digest-xterm-212-r1
deleted file mode 100644
index 6d07057d24f9..000000000000
--- a/x11-terms/xterm/files/digest-xterm-212-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d39ec47dbf846e0e7dddb354280c4074 xterm-212.tgz 764465
-RMD160 2808cdf3f550ef9df7e83a4844f3f4f64f0508a1 xterm-212.tgz 764465
-SHA256 bfd201600c0f0f3c3d9dcfe32fde1db333307a87a4453084bf55a7aa97b3b6ae xterm-212.tgz 764465
diff --git a/x11-terms/xterm/files/xterm-LANG.patch b/x11-terms/xterm/files/xterm-LANG.patch
deleted file mode 100644
index d344d5b1eced..000000000000
--- a/x11-terms/xterm/files/xterm-LANG.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
-option parsing, it may break.
-
-http://bugs.gentoo.org/105369
-
---- xterm/configure
-+++ xterm/configure
-@@ -46,6 +46,16 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+# Only set these to C if already set.  These must not be set unconditionally
-+# because not all systems understand e.g. LANG=C (notably SCO).
-+# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-+# Non-C LC_CTYPE values break the ctype check.
-+if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-+if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-+if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-+if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -502,16 +512,6 @@
-   esac
- done
- 
--# NLS nuisances.
--# Only set these to C if already set.  These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.
diff --git a/x11-terms/xterm/xterm-204.ebuild b/x11-terms/xterm/xterm-204.ebuild
deleted file mode 100644
index 786e09ec81ec..000000000000
--- a/x11-terms/xterm/xterm-204.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-204.ebuild,v 1.14 2006/01/07 08:01:18 vapier 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 sh sparc x86"
-IUSE="truetype Xaw3d unicode toolbar"
-
-RDEPEND="|| ( (	x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXmu
-		x11-libs/libxkbfile
-		x11-libs/libXft
-		x11-libs/libXaw )
-	virtual/x11 )
-	virtual/utempter
-	Xaw3d? ( x11-libs/Xaw3d )"
-
-DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )"
-
-src_unpack() {
-	unpack ${A}; cd ${S}
-
-	epatch ${FILESDIR}/xterm-LANG.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-210.ebuild b/x11-terms/xterm/xterm-210.ebuild
deleted file mode 100644
index a0273224fc7c..000000000000
--- a/x11-terms/xterm/xterm-210.ebuild
+++ /dev/null
@@ -1,100 +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-210.ebuild,v 1.2 2006/03/22 18:29:00 spyderous 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 ~s390 ~sh ~sparc ~x86"
-IUSE="truetype Xaw3d unicode toolbar doc"
-
-RDEPEND="|| ( (	x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXmu
-		x11-libs/libxkbfile
-		x11-libs/libXft
-		x11-libs/libXaw )
-	virtual/x11 )
-	Xaw3d? ( x11-libs/Xaw3d )
-	doc? ( sys-apps/groff )
-	virtual/utempter"
-
-DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )"
-
-pkg_setup() {
-	if has_version ">=x11-base/xorg-x11-7.0.0_rc1"; then
-		einfo "Found $(best_version x11-base/xorg-x11)."
-		NEWAPPDEFAULTS=1
-		DEFAULTS_DIR="/usr/$(get_libdir)/X11/app-defaults"
-	else
-		einfo "Not found xorg-x11 version 7."
-		NEWAPPDEFAULTS=0
-		DEFAULTS_DIR="/etc/X11/app-defaults"
-	fi
-}
-
-
-src_compile() {
-
-	filter-flags "-fstack-protector"
-
-	econf \
-		--libdir=/etc \
-		--with-x \
-		--with-utempter \
-		--disable-setuid \
-		--disable-full-tgetent \
-		--disable-imake \
-		--disable-narrowproto \
-		--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 \
-		--with-app-defaults=${DEFAULTS_DIR} \
-		`use_enable toolbar` \
-		`use_enable truetype freetype` \
-		`use_enable unicode luit` `use_enable unicode mini-luit` \
-		`use_with Xaw3d` \
-		|| die
-
-	emake || die "failed to compile xterm"
-
-	if use doc ; then
-		make ctlseqs.txt || die "failed to make documentation file"
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install    || die
-	dodoc README* INSTALL* ctlseqs.txt
-
-	# 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}/${DEFAULTS_DIR}/XTerm
-	echo "*allowWindowOps: 	false" >> ${D}/${DEFAULTS_DIR}/UXTerm
-
-}
diff --git a/x11-terms/xterm/xterm-211.ebuild b/x11-terms/xterm/xterm-211.ebuild
deleted file mode 100644
index 5dff28ef31a0..000000000000
--- a/x11-terms/xterm/xterm-211.ebuild
+++ /dev/null
@@ -1,106 +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-211.ebuild,v 1.6 2006/03/31 20:09:44 flameeyes 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 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="truetype Xaw3d unicode toolbar doc"
-
-RDEPEND="|| ( (	x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXmu
-		x11-libs/libxkbfile
-		x11-libs/libXft
-		x11-libs/libXaw )
-	virtual/x11 )
-	Xaw3d? ( x11-libs/Xaw3d )
-	doc? ( sys-apps/groff )
-	virtual/utempter"
-
-DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )"
-
-pkg_setup() {
-	if has_version ">=x11-base/xorg-x11-7.0.0_rc1"; then
-		einfo "Found $(best_version x11-base/xorg-x11)."
-		NEWAPPDEFAULTS=1
-		DEFAULTS_DIR="/usr/$(get_libdir)/X11/app-defaults"
-	else
-		einfo "Not found xorg-x11 version 7."
-		NEWAPPDEFAULTS=0
-		DEFAULTS_DIR="/etc/X11/app-defaults"
-	fi
-}
-
-
-src_compile() {
-
-	filter-flags "-fstack-protector"
-
-	local myconf=""
-
-	if has_version ">=x11-base/xorg-x11-7.0.0_rc1"; then
-		myconf="--disable-narrowproto"
-	fi
-
-	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 \
-		--with-app-defaults=${DEFAULTS_DIR} \
-		`use_enable toolbar` \
-		`use_enable truetype freetype` \
-		`use_enable unicode luit` `use_enable unicode mini-luit` \
-		`use_with Xaw3d` \
-		${myconf} \
-		|| die
-
-	emake || die "failed to compile xterm"
-
-	if use doc ; then
-		make ctlseqs.txt || die "failed to make documentation file"
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install    || die
-	dodoc README* INSTALL* ctlseqs.txt
-
-	# 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
-
-}
diff --git a/x11-terms/xterm/xterm-212-r1.ebuild b/x11-terms/xterm/xterm-212-r1.ebuild
deleted file mode 100644
index d71d1c8386f0..000000000000
--- a/x11-terms/xterm/xterm-212-r1.ebuild
+++ /dev/null
@@ -1,99 +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-212-r1.ebuild,v 1.1 2006/05/03 14:22:36 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 doc"
-
-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 )
-	virtual/utempter"
-
-DEPEND="${RDEPEND}
-	doc? ( sys-apps/groff )
-	|| ( x11-proto/xproto virtual/x11 )"
-
-pkg_setup() {
-	if has_version "x11-libs/libX11"; then
-		DEFAULTS_DIR="/usr/$(get_libdir)/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) \
-		${myconf} \
-		|| die
-
-	emake || die "failed to compile xterm"
-
-	if use doc ; then
-		make ctlseqs.txt || die "failed to make documentation file"
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc README* INSTALL* ctlseqs.txt
-
-	# 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
-}
diff --git a/x11-terms/xterm/xterm-212.ebuild b/x11-terms/xterm/xterm-212.ebuild
deleted file mode 100644
index 066d118b3c08..000000000000
--- a/x11-terms/xterm/xterm-212.ebuild
+++ /dev/null
@@ -1,102 +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-212.ebuild,v 1.1 2006/04/12 21:53: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 doc"
-
-RDEPEND="|| ( (	x11-libs/libX11
-		x11-libs/libXrender
-		x11-libs/libXt
-		x11-libs/libXmu
-		x11-libs/libxkbfile
-		x11-libs/libXft
-		x11-libs/libXaw )
-	virtual/x11 )
-	Xaw3d? ( x11-libs/Xaw3d )
-	doc? ( sys-apps/groff )
-	virtual/utempter"
-
-DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )"
-
-pkg_setup() {
-	if has_version ">=x11-base/xorg-x11-7.0.0_rc1"; then
-		einfo "Found $(best_version x11-base/xorg-x11)."
-		NEWAPPDEFAULTS=1
-		DEFAULTS_DIR="/usr/$(get_libdir)/X11/app-defaults"
-	else
-		einfo "Not found xorg-x11 version 7."
-		NEWAPPDEFAULTS=0
-		DEFAULTS_DIR="/etc/X11/app-defaults"
-	fi
-}
-
-src_compile() {
-	filter-flags "-fstack-protector"
-
-	local myconf=""
-
-	if has_version ">=x11-base/xorg-x11-7.0.0_rc1"; 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) \
-		${myconf} \
-		|| die
-
-	emake || die "failed to compile xterm"
-
-	if use doc ; then
-		make ctlseqs.txt || die "failed to make documentation file"
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc README* INSTALL* ctlseqs.txt
-
-	# 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
-}