Fix broken dependencies

6 files changed, 22 insertions, 490 deletions

diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index f41f243..373dad5 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,28 +1,21 @@
-AUX xterm-197-alt-keysym-index.patch.bz2 354 RMD160 0d9c6dde482efcf8666c7d5ffa1c4675ead3efb9 SHA1 cb5b4c7241f2d95cbbf234e7760bdd4a945bc70d SHA256 d7025b8225b711393949a98282c1d9e9b5832277e80bd59cab617e0d82c1e729
-AUX xterm-199-alt-meta-mod.patch.bz2 692 RMD160 839adad8d91a55956c703dcd495992106e150cc6 SHA1 406be01d971485e45f67ddb3946d45e558605839 SHA256 423466b0961d948d80a2ccb0b067cb15bf2a1f53b41c7eb87bd34cdf400aaabe
-AUX xterm-199-biarch-utmp.patch.bz2 326 RMD160 e9baad8e8afb204d9d5e6f522285ffc5672bb316 SHA1 032002942055c2a97c359c0435dd9b810171d750 SHA256 56d200a8d507967943552dca649bbef0f6bc0e15e359fa6888b6587ab12797cd
-AUX xterm-LANG.patch 1698 RMD160 8f442cbb3d39cd18645f656970d717c5bab84a2d SHA1 4ff6b11ac3ac8b590c7da294bd0c12dabd9013eb SHA256 b2e646c2f4c86cd8132a5a54a362363453f1f02a4f976751c41d7418b3d772c5
-AUX xterm-ds-config-278.patch 3509 RMD160 2d4231f34862f5fca6eff2dcf606f56e96316d43 SHA1 d965ebd9485829ed3ab97032d1350afda3ee10a6 SHA256 1f00ca7c2cd58c331ac64b283d5eb6bc7abb63560b4c3f8c8a416efd47bffb84
-AUX xterm-ds-config.patch 3026 RMD160 dd37dcf72980ee8fb3e162c0d744302274a0a8c0 SHA1 97bf54d7e4fd94f96b821d892076c20928744f38 SHA256 2317a3b521c4f2e586b46144f1ac2a10c151993d5fc04a15cca18d1173e71084
-AUX xterm-ds-copy-225.patch 1478 RMD160 e1fe530ec7c00b5b43a9e1910f872687542f1288 SHA1 a7362380ec7c8806c42f1230f41ca4266f70b18a SHA256 9ee6afbddf26fae1625d54bf9adf8ed30df33b675d95a3128a90f9fe8b74f6be
-AUX xterm-ds-copy-243.patch 1467 RMD160 af5e9328eaf247252f45f0616e643e3e0cb2da2c SHA1 20be1497e48196c1dc5a9c8d151732081396c12d SHA256 e57940b1675c146c6bd149371e92d4e98869b1d457d4a21ed324429e443e31ce
-AUX xterm-ds-copy.patch 1292 RMD160 09bbd5df49a84d095baf90e21c39a8429fe64539 SHA1 ed3e49519ea60cb6c685d9597456c08191987462 SHA256 c61394b4736e69f516173179344200e6ff7130f42573a2e48f4697f3cfc33048
-AUX xterm-ds-input-225.patch 405 RMD160 cd3db8a71e09c8e1ad47adacef90bbb7791ddb8f SHA1 0bd8a63499fcf34b2bb9f28e5fe81b7a3748c85d SHA256 79de426f66e89a7ea419b4e5efc535fa36e6d6598e0e31fa6da362c9249f75c4
-AUX xterm-ds-input.patch 284 RMD160 90c6215006241d8d7690752b92886ef4febe7016 SHA1 4ce7afb3865916fb3e7e0ad468edba2524c42f18 SHA256 954814e335cdd60adc3b2e6a6ab2881802272c1554ee1f1da546f713ca39b5a4
-AUX xterm-ds-metaesc.patch 300 RMD160 47ab6dcb4ef4a19ee1998fe5cd701feea79cc7b1 SHA1 00334f1c910c4c623ee59069e9489e5526bbb832 SHA256 8e590fc34b79fed733b4464e501d60e85bed4811e9649dacade51c2cffc72ab9
-AUX xterm-ds-paste-225.patch 420 RMD160 d0409d2200a5653a12a5eaa3fa97ac0eb4accf64 SHA1 42901b4ca49982e57ff2e83660d8a2ec49a6f685 SHA256 7534f3ae11ddcbb6ca1a373de4cd46d71e8f61252ec6b269f7525cceb3207264
-AUX xterm-ds-paste-278.patch 452 RMD160 a2c7075c4191dca93cfaee9afa759363ca5c0bcd SHA1 343f69f3d5220458ee01a59dadc89806e536bbbf SHA256 b5be53bcf3d1fd1f832c11c9aeb3231d69907efb15762edea703b7d26b193c7a
-AUX xterm-ds-paste.patch 438 RMD160 054d27dba5472a11637a12743ac84ad1e9e4714c SHA1 7fdfcb8a45f43092d7f0b5055f1eef29e68841a9 SHA256 9eb6f56e5035a075f8a2cc7961a931b9a75a3c3976ceade1e1431ac03f686586
-AUX xterm-ds-sm-243.patch 3796 RMD160 029fefce2bdf3ca76c140529087b9cfb6953cad2 SHA1 5e138c2e3053603841c01a4a473bd3ff6c51f2e2 SHA256 e11828ee573fa58ade9c26ce066f1afcc0ef8c6e7c34acb131c4b42c3c2a7f73
-AUX xterm-ds-sm.patch 3587 RMD160 2182a966d3c4d9bea2830b4a52c789c42bbd8fbc SHA1 3c07c5caa298eebac368577692fd8cbedc45210d SHA256 59371083ce9a362fb555a96c65c04e3af664aaeb31feaf1cf965102cdeb81668
-AUX xterm-ds-utf8mode.patch 476 RMD160 7e072e1881fbba1283131b24594b5e41e7e02248 SHA1 8012064ed4bf82b6e194ed6039f7a44de1f6e420 SHA256 84bb2867dfd9d7e9dfcedfa0a4c541bc0db272f2838dc75aa107608414ef633f
-AUX xterm215-ds-copy.patch 1460 RMD160 00e40d82fe220414e9359bd240630046a3a6c64c SHA1 4b251d14547b689be51f0d665acb7ecf290630ca SHA256 fb050a025159d8c09ecee036817fe92d23d927a19ed33588168d5bbd0906d3c5
-DIST xterm-215.tgz 784236 RMD160 458c14aa97503bdac5da3881491de14e2d87f52a SHA1 d2cb4919d3a2bada27c5ff6e32727b9aecb2266a SHA256 4564c646a4a4f56e49e8c8cda1d4aa027e228db2d4bb2a4ad0f055f34373734f
-DIST xterm-225.tgz 821717 RMD160 ceba9372d85ef1a74f3a2ebeb37199bc80949006 SHA1 55598c979da15fe219ddd07bfdd15eb08460026b SHA256 d21ca1b0c9f47da42944b1d1c06f50c7f8ac541cd6047edacfc5837e331af47e
-DIST xterm-243.tgz 874033 RMD160 0099382feb4c6b97fb37fa77edebfb6903a38835 SHA1 2d21f9ac13df846053b43d9fcf6ae70eaa63715a SHA256 2621e7362713b588d1ec035f969194f160896b77f6455a26fd81dcc6e29b9877
-DIST xterm-278.tgz 996716 RMD160 f8b7370530979453489891aae49f9788ab54e322 SHA1 753ad19e1a0979e875eb2dc2db60f1fb270486ee SHA256 1372f9afe07bc35bfd47482db146c649223dadd0b472da31f8c337ab37f90585
-EBUILD xterm-215-r3.ebuild 3242 RMD160 1a7e869845ea71d3b4669b05e1f216283ec8ecf6 SHA1 94ee2651413aef84211c48fddddbf93748d8c49e SHA256 08c1d0e0c8ccdfb5c88a1c14ee1f06821f0d2a9e886c5b28503c331da24867ab
-EBUILD xterm-225-r1.ebuild 3172 RMD160 10cf5341611568c6e1b7a9e6e4e2df288f6cbe36 SHA1 542f17d5aa3c12089805eb9c8ea652ecdfd2cb22 SHA256 e5accd0166ca0e646f33511dc92cfbb4192c15675a8582b938149d8a737053b8
-EBUILD xterm-243-r1.ebuild 3261 RMD160 7c6e0c7fbd7e6cf1327e0c08d269abfa4e635220 SHA1 f7d2a43c00a0964b948d80bde27caacecb5a5e4b SHA256 a42a0eb235b5f293bb2111ebb835735c3935c590b492581bf6f29eba5922500d
-EBUILD xterm-278-r1.ebuild 3122 RMD160 e883b11422d123afa9cc66c06abf44fbebd4a5f1 SHA1 4bb6ed2d203f8785902b690c61f51048bf7066dd SHA256 539d28289e226ed9268f5adc053f99be6d1bbaef8319933506909ee50c686567
-EBUILD xterm-278-r2.ebuild 3180 RMD160 558828972b1e6bacdab99d243b0374d79b12f96a SHA1 ad851815dd4274fcf26c4b796d98ab5cefeef191 SHA256 b0f26d1b14fcd5ff38180f603195ccf9b29a43df0019acab94d7c26587bc53c7
+AUX xterm-197-alt-keysym-index.patch.bz2 354 BLAKE2B b6fa961cd4a74fe4392b9b7785e13ae3399343dc75c1c7d0d31284d86d9561a3b5aa29da1ef831f18de42b889f909dd8b88d5ae93dbc5b63abb4a34393513059 SHA512 d7e96af630a6a3c0475d1d08297a0cf6f57327bfbf5b2c241d468db127a227850620ac12fd6ad132fbc941cb7b43090bfa2382350459019b0fa4952ff35b3630
+AUX xterm-199-alt-meta-mod.patch.bz2 692 BLAKE2B b890952fb47a18d56a217f5b1ac702eaa7bf749e26fba3aaa701bd2a4d352d829fbe91b75608471932274fd5e1135696078bbe8a921665bcbe10a696980d072a SHA512 acdfb84dc0c1ed58580ac2bc12f61b162f3d1726d29846a210c21973a2334f8015d548ec030085105c2ce679725ad5489b310383e8f0c425d5d36cdfa559af9f
+AUX xterm-199-biarch-utmp.patch.bz2 326 BLAKE2B f69f857d925e1caf061bf6747d9d1e097bd14b24bea3500f268ded3fd5fbb003fe613b369376d8704c5be423a575263e200f10b724d06213411ca98b8827cac2 SHA512 530c795af30b75499488cb81a87d90003f4ce72e74a51bf6b122a5396801c7ee4eb38d277741ec2eee3aac4555677a72094420d98c91228573c413c0ff1a32db
+AUX xterm-LANG.patch 1698 BLAKE2B b2ef384630bed32a2e9f8a17cc6c2753dbfedf49e615989478568f7673474650c3c603c51b869f7ede2bf3148a940055cd0f187fd239c082edbb597f40c5e506 SHA512 e17d1e63aeadba4667bae6b4fdd0c828a089034ad6d48419067af8d653042079ad389681b7f8f05e2e89f4354d2535416d534f7117d8f02c02c84010689c3494
+AUX xterm-ds-config-278.patch 3509 BLAKE2B 62bdd3adee281876bf5c7315c401e67624d8a9a827289a2b9a8bf437fb49fbcebfc079314b9eabf3380aceb66d3db945838edaa89891dd9f8c7f2c1cafc1a8bc SHA512 887f675b924781e357c9d2f3a9f35b5cd64ba1e2ee04118ffa6cb3a44c27165c8713dd2fb26cfacb4b0d35167a283f14f5a7658a969caffda978995a6ea7fca0
+AUX xterm-ds-config.patch 3026 BLAKE2B 3242a43fed83af8ec19301d285d2444e55eb8c08e71e44b74c2e4cea010569729ca68617f56c805d9d880fd2d748b623d38bbb462db06c2bbd4c68c8bf63f99b SHA512 0b336f68fcdeed6f1b951805bcce91df311a9b831339410bbcee8467b3e45ac6481c5de32ca812446490909fbcc74b3fc295bc31824abdd9673f26f7edadb0fd
+AUX xterm-ds-copy-225.patch 1478 BLAKE2B e1309fb247da9831cf9b91d9bd64918a4b566a03acef8bd2b340a94e6c68c9f5dea0a6b724da306c3e7fbd7c5741a0ab700f89202ff094b90c065bc9f88c5685 SHA512 b82a983740d6cdd3b05d6838943086c90e6d84e607324851295820a9894bbcb04fdade337f30198730d8478493d7d4567a9faa32ca9d649956a3c9883046de0c
+AUX xterm-ds-copy-243.patch 1467 BLAKE2B 399b1be82f4fcc606d0d02b40db2e96411af98aba82b615ff9b259bf1d99ab7b2bacbf7e48fab30b00dc2027efafcfabb41840e0282ae5e80f420df64c8a8bfc SHA512 298d636ff2bcdcdded1dc7cd6bffde8b6e9952ea1b2e24159ea1492f8e567f818a7ceeb8e68f5152c0901f9c9a51017c6cf84632181fe04c9fa6922e427b063f
+AUX xterm-ds-copy.patch 1292 BLAKE2B 7f45853e654baa35f113ca6e3e127cebea57295824e1dad7da017fda75ddd6ae6e486a04ec5f443392cdd8c505b1ecd177e85a5332323d196f9bd7da52275e27 SHA512 659858c20a2af236418953e8c966f3d501ebbc8753755f0220c9821a16f2c1f6231f220a2277f6d5de11e8b23f3d2eb6c9e2b838a891e9e18c56ebf162b18b6a
+AUX xterm-ds-input-225.patch 405 BLAKE2B 68f02786b50ecc641cb713e091e82770c875e7fd4933cdb773cdbe5c0babf665c0cd99e6ee654be372ab2a49a0313e584d4eb1f68f045846c32d4b71e1f47ecd SHA512 266f62f19faca7db953ce04dc0d175fa82fbaea45836be58a8010a29fc29948742d8ee2022d3bfecca294a31f46e56320be53f397aa2c9eff23aee8d565ac9fc
+AUX xterm-ds-input.patch 284 BLAKE2B f21b06769b4032fdc59fda5f86034d660a1bc2bd481d271fdca2e43c593db8fc9c3f801fb40813e25fa0b5fe496bb03f9a6359f8f019752085dbfefee9c984e9 SHA512 c5123c78cb847bb883bfcf9ba71f702ec7df693c85cbaefd098ad63a1d38b8902b05633b982b8839b87a4266a7ca2f2fc92e5c7e34c905ff3f71bc9cfbcae681
+AUX xterm-ds-metaesc.patch 300 BLAKE2B 09916a9a62938693ed3a1acfc23d5d318c47dd9be281cc2b74b4fc7e0552ae7c7d2697eb801bb8440d8716cf2e56caa1618bc12fc11d7e054be53cc15ebf0f2f SHA512 bab4d3d88cbcfe0fd06803b548a80b41a9056e46125073b94bd17225052f08c68787938810f1b3f1c9173fa6a76964b3c2d9b7fba1a5a988ae11dd747eb5c2cf
+AUX xterm-ds-paste-225.patch 420 BLAKE2B 8af1d1afc0b8eb7e803c1fc7ab327cedd6cca71c4a6005ccc728fcc0cabfdd047a3d15de4f1aa7ac79bec689e2e347041d9f262cab0bf51e1205b7ad69e83910 SHA512 fdc325877c549337092bea87c51f951ab3079ef472f7e461e03059f4747907343355f42602842fb1dd66c4dca105a51ebf481bacf00c291119270d3454fe3cf0
+AUX xterm-ds-paste-278.patch 452 BLAKE2B 686d230335d2666ff0166747fa669a9ed4d54b21c49f8ec7fb6a80be95981bc3060d54b24edf374b5cf74de3193a529dc88d40277f612098a6deff5910763261 SHA512 16468835ba4e9e5d13d135eca3692a84a47e159c43f9c2adb9c31bf0004f97c8a74f6eabf46447e841ca31834d12ab2b34831a444de4c2f552c344f44397ef1d
+AUX xterm-ds-paste.patch 438 BLAKE2B e9aaa69d1719fdb9fb13ba564617f4140dbf4930a74ab9d861bd2031ed7949de009a218b3598aab8b0859abf6b4e5d68e9735e19f12acc39c6a557eef44eef15 SHA512 f96bcc3d5a00261e4b9248ed71ce6d67678c2083a2efb39032d0521f977084b469d7ea32c9379ecd20104170b5137542d61c997cc77a0aafa2560dc5ba42cd53
+AUX xterm-ds-sm-243.patch 3796 BLAKE2B 62666047cf3a61f29c119814e3ecb9d7fea5c60c4f5546e0b7c5fd75ce93cef7701580585b8a5d6026cd24f74d5c81ac934921c03e82b0cdf938ee5cb2358ca9 SHA512 0bf024b52b9096c105166c6c3e4f3f7022212c06a27429f40400d198fdffba93414777e3d2cb1bbb103c00e64de546908be629e280c83b22112e74cb395096e7
+AUX xterm-ds-sm.patch 3587 BLAKE2B cb6d5649617723e691650e31722bc74468dd25202f02e55ca9ad9d3406925f61bad06fad07e51898d6e6b0ab1e1913766b04b55a68f56ef1b4a0755994b69bd4 SHA512 d8ff6803e5f4ac46867a56ef174c852ac5416b72ddaf5b84ea45adca38919a02202d3ace1ba6b7528a0d0c993d53e84c4d529503fe1dca6d3fd057cced43762c
+AUX xterm-ds-utf8mode.patch 476 BLAKE2B 5b17c0ac6da348bb1666bce8a83a3f1bc43a2fbc21ae596f8627b1cc4716b1c73d52113a993bc56fdcb4ff92546f00d9590a57d8c773c5ed530807f9cc746a7a SHA512 38f3de8f682bbf9adece113538eec5cfd4285a477c9c6d7c282dc71808ea39f641bf50ca97884ecb0d3c67e4ba1a86fc89a3f974f58cbceaf8a6f0277b7be5c0
+AUX xterm215-ds-copy.patch 1460 BLAKE2B 7b5e27479f4710c298ad347809c95cc561b2088d6addac7058e27a86123af0e3a05ac21884cea2f6fbac989e37f144d589b636e425aca205dee8d164aae358f7 SHA512 7030d834ae057cc2834cb919798ff5e45d6bebaaa2122c8b5620138cd67cf3d7c6baebaa6aba79904611bc9d373f76258a92d0b2939f24806ea9e6070ec12420
+DIST xterm-278.tgz 996716 BLAKE2B b51f0ef61fb80f2d00e5af925cd70411ad4160877dd64ece848f6fd105a0befea2932e3765f42454921191b66fb108bfebff8081bc8d935a2cc7b0c5ea6bc56b SHA512 4ddbf2003b54c2d2a082465d3ef160840dd1d27f253ba57c9c033477f6d005653093c506cd216072cf032e2ccb136de647b031a6999d8c5ccd5cfb641c50c994
+EBUILD xterm-278-r2.ebuild 3164 BLAKE2B 2542fd065957f5c143b1c8a6ffa78f0856441decf6fd7f0570ee29e7062cae0623be85d3e377e750216504d9bc6d8bad168aa80173d4169645d19b5ae514fa3c SHA512 50b0c94cd0fc184853a4f0d3920fbe50234c8268710e7191abe0e04ad4f2c39f782ddd62812ffac90ecea151dc59e27410ec0cb5046cdb39bd33fee52464314d
diff --git a/x11-terms/xterm/xterm-215-r3.ebuild b/x11-terms/xterm/xterm-215-r3.ebuild
deleted file mode 100644
index 9f5aef2..0000000
--- a/x11-terms/xterm/xterm-215-r3.ebuild
+++ /dev/null
@@ -1,125 +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-215-r1.ebuild,v 1.1 2006/07/11 10:53:47 exg Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="http://dickey.his.com/xterm/"
-SRC_URI="http://dside.dyndns.org/files/darklin/${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
-}
-
-#SDS
-src_unpack() {
-    unpack ${A}
-    cd ${S}
-
-#MDK
-#    epatch ${FILESDIR}/xterm-199-biarch-utmp.patch.bz2
-    epatch ${FILESDIR}/xterm-197-alt-keysym-index.patch.bz2
-    epatch ${FILESDIR}/xterm-199-alt-meta-mod.patch.bz2
-
-#DarkLin
-    epatch ${FILESDIR}/xterm-ds-config.patch
-    epatch ${FILESDIR}/xterm-ds-sm.patch
-    epatch ${FILESDIR}/xterm-ds-paste.patch
-    epatch ${FILESDIR}/xterm-ds-input.patch
-    epatch ${FILESDIR}/xterm215-ds-copy.patch 
-    epatch ${FILESDIR}/xterm-ds-utf8mode.patch
-}
-#EDS
-
-
-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
-}
diff --git a/x11-terms/xterm/xterm-225-r1.ebuild b/x11-terms/xterm/xterm-225-r1.ebuild
deleted file mode 100644
index 849fb16..0000000
--- a/x11-terms/xterm/xterm-225-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-225.ebuild,v 1.1 2007/03/24 19:58:16 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 )
-	Xaw3d? ( x11-libs/Xaw3d )
-	sys-libs/libutempter"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-pkg_setup() {
-	DEFAULTS_DIR="/usr/share/X11/app-defaults"
-}
-
-#SDS
-src_unpack() {
-    unpack ${A}
-    cd ${S}
-
-#MDK
-#    epatch ${FILESDIR}/xterm-199-biarch-utmp.patch.bz2
-    epatch ${FILESDIR}/xterm-197-alt-keysym-index.patch.bz2
-#    epatch ${FILESDIR}/xterm-199-alt-meta-mod.patch.bz2
-
-#DarkLin
-    epatch ${FILESDIR}/xterm-ds-config.patch
-    epatch ${FILESDIR}/xterm-ds-sm.patch
-    epatch ${FILESDIR}/xterm-ds-paste-225.patch
-    epatch ${FILESDIR}/xterm-ds-input-225.patch
-    epatch ${FILESDIR}/xterm-ds-copy-225.patch 
-    epatch ${FILESDIR}/xterm-ds-utf8mode.patch
-}
-#EDS
-
-
-src_compile() {
-	filter-flags "-fstack-protector"
-	replace-flags "-Os" "-O2" # work around gcc-4.1.1-r[01] bugs
-
-	econf --libdir=/etc \
-		--with-x \
-		--with-utempter \
-		--disable-setuid \
-		--disable-full-tgetent \
-		--disable-imake \
-		--disable-narrowproto \
-		--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)
-
-	emake || die "emake failed."
-}
-
-# Parallel make causes File exists error and dies. Forcing -j1 for now.
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed."
-	dodoc README{,.i18n} ctlseqs.txt
-	dohtml 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-243-r1.ebuild b/x11-terms/xterm/xterm-243-r1.ebuild
deleted file mode 100644
index 2e869cf..0000000
--- a/x11-terms/xterm/xterm-243-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-243.ebuild,v 1.1 2009/05/05 12:41:03 ssuominen Exp $
-
-EAPI=2
-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"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libxkbfile
-	x11-libs/libXft
-	x11-libs/libXaw
-	x11-apps/xmessage
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/Xaw3d )
-	sys-libs/libutempter"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-pkg_setup() {
-	DEFAULTS_DIR="/usr/share/X11/app-defaults"
-}
-
-#SDS
-src_unpack() {
-    unpack ${A}
-    cd ${S}
-
-#MDK
-#    epatch ${FILESDIR}/xterm-199-biarch-utmp.patch.bz2
-#    epatch ${FILESDIR}/xterm-197-alt-keysym-index.patch.bz2
-#    epatch ${FILESDIR}/xterm-199-alt-meta-mod.patch.bz2
-
-#DarkLin
-    epatch ${FILESDIR}/xterm-ds-metaesc.patch || die
-    epatch ${FILESDIR}/xterm-ds-config.patch || die
-    epatch ${FILESDIR}/xterm-ds-sm-243.patch || die
-    epatch ${FILESDIR}/xterm-ds-paste-225.patch || die
-    epatch ${FILESDIR}/xterm-ds-input-225.patch || die
-    epatch ${FILESDIR}/xterm-ds-copy-243.patch || die
-# Embedded in SM patch
-##    epatch ${FILESDIR}/xterm-ds-utf8mode.patch
-}
-#EDS
-
-src_configure() {
-	filter-flags "-fstack-protector"
-	replace-flags "-Os" "-O2" # work around gcc-4.1.1-r[01] bugs
-
-	econf --libdir=/etc \
-		--with-x \
-		--with-utempter \
-		--disable-setuid \
-		--disable-full-tgetent \
-		--disable-imake \
-		--disable-narrowproto \
-		--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} \
-		--x-libraries="${ROOT}usr/lib" \
-		$(use_enable toolbar) \
-		$(use_enable truetype freetype) \
-		$(use_enable unicode luit) $(use_enable unicode mini-luit) \
-		$(use_with Xaw3d)
-}
-
-# Parallel make causes File exists error and dies. Forcing -j1 for now.
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	dodoc README{,.i18n} ctlseqs.txt
-	dohtml 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() {
-	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"
-}
diff --git a/x11-terms/xterm/xterm-278-r1.ebuild b/x11-terms/xterm/xterm-278-r1.ebuild
deleted file mode 100644
index 63a1bd9..0000000
--- a/x11-terms/xterm/xterm-278-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-278.ebuild,v 1.1 2012/01/19 19:01:38 ssuominen Exp $
-
-EAPI=4
-inherit eutils multilib
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="http://dickey.his.com/xterm/"
-SRC_URI="ftp://invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="toolbar truetype unicode Xaw3d"
-
-COMMON_DEPEND="kernel_linux? ( sys-libs/libutempter )
-	kernel_FreeBSD? ( sys-libs/libutempter )
-	>=sys-libs/ncurses-5.7-r7
-	x11-apps/xmessage
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/libXaw3d )"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/font-misc-misc"
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
-	x11-proto/kbproto
-	x11-proto/xproto"
-
-pkg_setup() {
-	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
-
-#SDS
-src_unpack() {
-    unpack ${A}
-    cd ${S}
-
-#MDK
-#    epatch ${FILESDIR}/xterm-199-biarch-utmp.patch.bz2
-#    epatch ${FILESDIR}/xterm-197-alt-keysym-index.patch.bz2
-#    epatch ${FILESDIR}/xterm-199-alt-meta-mod.patch.bz2
-
-#DarkLin
-    epatch ${FILESDIR}/xterm-ds-config-278.patch || die
-    epatch ${FILESDIR}/xterm-ds-paste-278.patch || die
-    epatch ${FILESDIR}/xterm-ds-input-225.patch || die
-    epatch ${FILESDIR}/xterm-ds-copy-243.patch || die
-# Embedded in SM patch
-##    epatch ${FILESDIR}/xterm-ds-utf8mode.patch
-# Since 278 is provided internaly 
-##    epatch ${FILESDIR}/xterm-ds-sm-243.patch || die
-# Incorporated into the config patch
-##    epatch ${FILESDIR}/xterm-ds-metaesc.patch || die
-}
-#EDS
-
-src_configure() {
-	# looking for reason why crosscompile failed? try restoring this:
-	# --x-libraries="${ROOT}usr/$(get_libdir)"
-	# -ssuominen, 2011
-
-	econf \
-		--libdir="${EPREFIX}"/etc \
-		--disable-full-tgetent \
-		--with-app-defaults=${DEFAULTS_DIR} \
-		--disable-setuid \
-		--disable-setgid \
-		--with-utempter \
-		--with-x \
-		$(use_with Xaw3d) \
-		--disable-imake \
-		--enable-256-color \
-		--enable-broken-osc \
-		--enable-broken-st \
-		--enable-exec-xterm \
-		$(use_enable truetype freetype) \
-		--enable-i18n \
-		--enable-load-vt-fonts \
-		--enable-logging \
-		$(use_enable toolbar) \
-		$(use_enable unicode mini-luit) \
-		$(use_enable unicode luit) \
-		--enable-wide-chars \
-		--enable-dabbrev \
-		--enable-warnings
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README{,.i18n} ctlseqs.txt
-	dohtml xterm.log.html
-	domenu *.desktop
-
-	# 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 -e "s:blue2$:blue:" "${ED}"${DEFAULTS_DIR}/XTerm-color
-}
diff --git a/x11-terms/xterm/xterm-278-r2.ebuild b/x11-terms/xterm/xterm-278-r2.ebuild
index fdb5eb8..6409683 100644
--- a/x11-terms/xterm/xterm-278-r2.ebuild
+++ b/x11-terms/xterm/xterm-278-r2.ebuild
@@ -31,8 +31,7 @@ RDEPEND="${COMMON_DEPEND}
 	media-fonts/font-misc-misc"
 DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig
-	x11-proto/kbproto
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 pkg_setup() {
 	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults