10 files changed, 15 insertions, 926 deletions
diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index 0199cc6fe280..095f8edc6066 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/vim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.478 2014/12/08 05:41:11 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.479 2014/12/08 05:59:47 radhermit Exp $
+
+  08 Dec 2014; Tim Harder <radhermit@gentoo.org> -vim-7.3.762.ebuild,
+  -vim-7.3.1214.ebuild, -vim-7.4.430.ebuild, -vim-7.4.475.ebuild,
+  -files/vim-7.1.285-darwin-x11link.patch, -files/vim-7.3.1214-python3.patch,
+  -files/vim-7.3-interix-link.patch, -files/vim-7.4.193-fix-tests.patch:
+  Remove old.
 
 *vim-7.4.542 (08 Dec 2014)
 
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 667c8198fbaa..497b82355b5b 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,42 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX vim-7.1.285-darwin-x11link.patch 388 SHA256 0b935efbedabeab8439d42baa1d07b2f3d5e2964dea9e504ff2a4d4b9f3e6bcd SHA512 5fc5786abfc1258d29f3d37e89696dce8f4f770a889bebc4b287ee777cfb3e933025dfad015c9cd5984fcc355d06db4d95d45af768d2dfc5c76287a3ff5e04cf WHIRLPOOL b0e140078233ae10a944db92fc1268e9f73239ca045a89e5f4ed933859a97a075c20cfa3702b69eff807dfd0a10007c9051ccc272534438ebd7a504d359e1b29
-AUX vim-7.3-interix-link.patch 530 SHA256 6d72a9b4f1ebe3876c31d9424aead4ec5946fd8051966c34ec51043751007c76 SHA512 6b7809628b389465f628d240889a4b42a3057991e34a02089da302fc65e9677f30a12b1ca6866b6fe5c770c0e62baafbe174ade69c7f004d0372be1e2a17bbb5 WHIRLPOOL 9e2f5405685ee92c4fca0ffd4e23e6b37473e1e9b921fdd87e91c29073b11f896f2fb1ddb3a21b66f1a2ba299dff4069af4632807a4abfdedf712bc28ded7ce5
-AUX vim-7.3.1214-python3.patch 780 SHA256 9c128516c92f178c844a6cf8447f6feb4246903bda2f0fdb368e19f6d87cba4b SHA512 79460f95c4a181f78144e2749bdc388e60a6ff7bf3efec346a0e3cf741c128d093aac8533e8fa76120ce9016de4e27d5c9b0d1ed1d93fa77614191c1fcc59125 WHIRLPOOL 42f17388e5c373725146e0bcf75f7df61d03c089c8cefc53f39a3407c974c86a3e4676ef0a6546ebbc1f5be7f1be220b9d442a8e37964f1c7e80b6dffddcf42a
-AUX vim-7.4.193-fix-tests.patch 3303 SHA256 23824f70378c62aa17a26060d48c4df5015e0a9e38c4ecb767a4275731908d70 SHA512 da751f8971ee86e3b9f7332c0705fbb94386c1b2aa4e4aad5e4bfe071de754098e8e22e3fa1f82b1e6f9f533ee865d09a6054c6b914b29cd0172e0c07ec9a093 WHIRLPOOL 8e88282303f9248573dc1cb7d1166194eeea4e25dadc3909f1c926b9b69675760498e5b034f72b3cb9b89f6b95244989a2d5c8d6dc6e5139d95141f9d21ac2d6
 AUX vim-completion 1004 SHA256 8191a5a47e03de62d67ad6936259c8eb005e50b52d94994bcf4164e54ffefdae SHA512 dccf663a93efdf2ec3be69f49e418a0ef66277e2fae6c12287adde772592e19f5130388a04242121846f1dae39f78b30780c99dc6fe1b847f4f08354bda3cc41 WHIRLPOOL 0f5d9ed640ecd3520c79e9abb4473bbca66f145106d2c997791eacf6f0f93131f102d55b2f056f87484c5d5ca781af958fd48f1a24e2c2c1a4ac1be378700f84
-DIST vim-7.3.tar.bz2 9080692 SHA256 5c5d5d6e07f1bbc49b6fe3906ff8a7e39b049928b68195b38e3e3d347100221d SHA512 5560351fb005aae0be435a59de0218a8b4f494c8211a026838e8735a98d5010c395b9da6ec8c1ea31c75a94da7c6071f3eb0b7e5426f5beb75cc0d56ddb8d5b2 WHIRLPOOL 4ae549b9c6dcac34a676fa27dc1fb51e925d874fba932817eed8aeff56ad94d2dc4314219a94876b70776263575e1577bd80fb60a019bbd784c96ed74a5df822
 DIST vim-7.4-gentoo-patches.tar.bz2 3314 SHA256 704e2ef7fc3a9f3e721b4c9cbc619a47e5bec8b9ddbb9d3cdc3123b10d53e373 SHA512 ed22f899b93e06515512c92d8a840f84c56f5f7a02541687c07cfdce5dbab89cdd68301bef15d7b18f1149292edd592a0a1ac5b0bccfe478c56ccfd2a760f890 WHIRLPOOL a240183a7e90227916aed3a198a9408f2c35056bdf6d93a879f88f620845bd287e8d3887dfeec91e187681d9ef669ea96cc790efacf7714ae8e1213113f4ca34
 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4
-DIST vim-patches-7.3.1214.patch.bz2 1678514 SHA256 ad8e7742b14337f77bc8d35a77b18455bc601d895dfa18faa8c62ef5ffcaf10b SHA512 1b336d6d55b1c123503590b8ccc8c6cfa516e29fdb9e273dcb79700ef0a4a0c1bf2c7a386d38de7ece1a69634016cd1e6f78f8cc5cb96a30f4c59483f5214c69 WHIRLPOOL 85f07bfc1a4fa28312185bb8a54225e0d69c09cdfc4d0aa492abc74639b77e2d908f08b561d1446292fbbe09ef0a8aeca67fb0a2720a70f93e9e05605c6d4b2a
-DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c05b8dc699000b8b4932437829ed34936dab SHA512 b7288438f98b56e082a957c5178818f549dd8e2aca31301f432d3c6d94c0702e482e4c14b17c122f6a83a11bb21dcc165725b3996a503f6cb45400492ae783bd WHIRLPOOL cc1140556487fde2c2ee9a9351f4a062a080d270cfa8e728295beb233288efc7acdb750181dc25a2a1b74d4b547e1219e3f043c89b6a27348f7aa916d64f9fd3
 DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a
-DIST vim-patches-7.4.430.patch.bz2 680438 SHA256 173ebaaf7e39e9cc9face31e6f8269ec7e5880998a8b846a80f88bc65fa40be3 SHA512 dd58e693286bf73d49a3f0625d597fc88c6a72eb386eae9f8e656854ac42f92a3e0bc0b43efd23e55d65040ec4f767ab48366753736b1b843b85c2a738829a54 WHIRLPOOL 7ce6e2de659103edf2dc5ff09c66fbe3d24d5f1fcaf34e49daef65a1d5f498c9326c5384615cb011848d60fb5ec538a531b28f63d2c2f9a51db979bf3141086e
-DIST vim-patches-7.4.475.patch.bz2 704060 SHA256 35e1f82629e888865d03ddf8647554a607d94fc5ba33502822fa171d4914aba3 SHA512 80e26c872793604b6ff76bbb9b63d10ed9633b448008158d2f2538e9a18c62f7070b5f014b221643d2e97d0d6f7812ffc8a038f7acb2e1558ac5a083d6db8ee0 WHIRLPOOL 983c51f3d1220ab0512491f04e72cbf90a2891d44c578dcde043737a700c329cc3a090f3d2bf581ad4a23b6765bb72517f76520da1299ea8a65c6ac5957578da
 DIST vim-patches-7.4.488.patch.bz2 755739 SHA256 831bd6338a5169d90b82c313ea73256a70325ad8b721e2b7052d9d5ec5ff2fde SHA512 53a1041e2baa6477b179fd7879ca76867a8fff9cc21a7e843519fb96c3f880f6053760a7465d68c84ee4d7f6cb42cc2017152789a4b57db7953d20bbfa7dd4aa WHIRLPOOL 0bfc8d839e1d886ac8339edf01bb84e46f8c1d3754791d565d3b4050ebf678b548792c8d94b1c8f09824ebbee52fb1df9c65670b63fa860032278b318b89db66
 DIST vim-patches-7.4.527.patch.bz2 791537 SHA256 18cc9809e5322ea121c0326246d268bd7e8a56457fa00c12756538f0efa4d80b SHA512 55cfe5be9a4f356c8053450b55c79a8ecb38a64a77a97613e020de6ff9149508f7298a9ac3adb2b830e7cc1d68e183986ceb894401a8cce011e020371286f8cc WHIRLPOOL a7d443387705bd89ff7ea17b915842f8d055640546715836555361de0d7d6bfc82b9211cedfa51ebf2b4b8fbb294dcb6940007e1884a53e5ad7dc4f352ede4df
 DIST vim-patches-7.4.542.patch.bz2 819067 SHA256 b4bce59981be70daf11e28c92b958e4dcfce1b2d57d57ea6aabc5c0c8d50bdfb SHA512 f47a27cad1ebd7e7ba4664cf1698ea1781eb148f49f492b0579c354b224dd3a725ffa39fc4430da0de4890851bc22b9e9a2ff7a70217d46653446b796ef763b8 WHIRLPOOL 61bd9ffa831fd87e68fbd3d4450dea5b655590b9a9a15e0918085d15f09060e01014dd8467e26362e873ac5b94d671eb827720a706a11ee5ed78645d1b917d41
-EBUILD vim-7.3.1214.ebuild 1125 SHA256 682ed73f4a04ba569fe9dcde80a8d4296e0cdc9a3a2e14dcfe06e8d77603f6e2 SHA512 24b9e32030ff1fbf246575d05fcbd0a34edf91a5af5a2b5c46c54e53e76f015b6b796ea81714dc2215ae61adfec95d80b0410ed918647017e1df69235f5978a8 WHIRLPOOL 2c2966e9756b8432c2a9a58db84fecdc7ccee9d5c17ec85573b3b326535c151f089f872b60ec2c5514252e613a459cb0df1ffb4dd0fb46282c67492ed5c3d925
-EBUILD vim-7.3.762.ebuild 1010 SHA256 63e9605c3a4726f130bc310c4d1d26006acf1db17b2351eb21fc15c916dabd38 SHA512 7a1809e3d4bb863c652f5baf76a258d86929a0b14eba5758722900b7b3c8687e0ad42a2674fe60207f50e0ae6a2d66baac056e371daad9804a36bdf489e2d7dc WHIRLPOOL 68a62475f39cb36a9c6935d352ff778617157b1f1d0259235fc01dc2bbd0ac8a45ec619726530fa447d0aa111b3a820684d61da88f501311d8d3555f3a68915a
 EBUILD vim-7.4.273.ebuild 11583 SHA256 8e18baa085586ae62719adf825fba0caf6c511472926f6b41dbe6d6f46f082ad SHA512 7c9714048c4263c770ea199931e1181e7bde37866c4c3fe269215577411add77cab18c900b10144c65ded164991664e6af93740463336316d7eff8e4262824fa WHIRLPOOL 6fbf8bdd200d73a1e50ff6c5c7abc6b248bf3a764080d0be2ee8544d45ca1dcda313dbabddcfb9c9f175190fab04dac1a1c6942a8e5c1fa749fab58f8d35d4e8
-EBUILD vim-7.4.430.ebuild 11942 SHA256 6ead57a07c4fb27de434d74f4874d12c6960c3a7bdb2ff6e2cc46d282776f541 SHA512 422cee85b8fa5fa79d782aa513334d11f51cf557fa3dc11a1082a66b3bc77fc1439161613ac2b0305030ba7f78b95cf1c8d03e00d61e3d9c11f1cc58bb291168 WHIRLPOOL 03fb88d2df1f848d0833982332bca1dbe2efa9c5f640b3d7fb98ed0ddac13c08782447beccc2eda46db2f78c56ab8cafed0a839bcaa754ec2bb6578dcfb57b14
-EBUILD vim-7.4.475.ebuild 11941 SHA256 0470b4bb5664ec08b48e3c1e742dc4a75d2f1c8b84bb9dcae1348ebf9e7dad5e SHA512 c7989f1998a11e26c1d2785dec36d13abeba83f353a08b1ee28f5a7d89b306ca5a5eb126c26205a3b6cceb440eb93f78fdf64daa4e3eafc339c38d8dc7518590 WHIRLPOOL 2bf372a28c69b0f708ce8992edfdbd67075f0ec6c608819750f53b7f9e7f07b8adc06bccea184a949ff5d88dd4799e6c03dcc958212df99b0578e72caabf83b9
 EBUILD vim-7.4.488.ebuild 11942 SHA256 7a01b7bdd6bcd4fd6597277f8c4129fd80127627602ea55c77632c1f23e5899c SHA512 c85da514554cfcb282740eaf4a53d0e3bec9e5dd4f61d713b603f8d584ffb56f958888ece24a7ea36e2327245cd29b1fc9c36658d3304ff072dbb57914af6f5f WHIRLPOOL 2042b303a07acbb061f7e910d44d4b4e6a7a3308f77a3597f28f0e9829dcd76fcfcbe3db4f6301eac4a62f16b07542f2b7bf5d84137f0f07d842d264ed3097bb
 EBUILD vim-7.4.527.ebuild 11942 SHA256 ec0efe24daefd46bc176c0e6a29f86b2fd1342e0b07a2c8161d0ead7c9edaf82 SHA512 0c3c2adae0fcd3011d3cd598d047cc73b9426579f06076d08977eedba8e0060caacc78929ea569decea855ebba0eb7f14d96b8934d31da7afa7c046edb789d79 WHIRLPOOL a15c2937e0bbdf724958540d47699eff032ac34e9b20aabf3d4fd7a4409cc0b2061c6444f03e14f1ad0506f33eb1d328fce6e125bb656692116ac6706af6e1b5
 EBUILD vim-7.4.542.ebuild 11933 SHA256 981fbac054ae56ae3d9a5602f5f8d3e6ec5eb37abf6aa58f50b103a1490f27a2 SHA512 82c6c8956f8d35a70173263e7236e10b80c23a5f13c9c723b69f3b4d3e74be1edc7f72f11cc2868ee940a30d5d84dc4690ab3a51a9c4352cd5bdbbfdd22e55f7 WHIRLPOOL 57092567e90f4e5a0f36be0668efceee3b1fe39ac378a2d51261e3567132753838cb49e88bbfda1d7d4f68e7c3d779b5ab18b6b3d5a6d3c440968cdbaca801fd
 EBUILD vim-9999.ebuild 11940 SHA256 178f4fc4a8d57c1d120f3e571d8bf534c3f64949c2807d1db51fad770a4084cf SHA512 525bdab2862840d96213a9fd18257d81f1285132103446ac35b995d355c34ff5dcc366bfce196fca2a3d56ebe03974516e1f6ffb283897fb643a2af194233525 WHIRLPOOL 79692ac000136a4dfbb4174413526cf3de1b1b3eeb2d9d49b483fc1adfb5c2090881c750a1a1a2af4d556c83db06f8bbc7611837eae15bd3760b49e8ee77aa3c
-MISC ChangeLog 64474 SHA256 27b60d9b0aaece49e097cb541cb7c1e10e3b29bf1204a34c8bbdf446e58f54ed SHA512 2526b96aa66c1cfe529afc88488ccc02e6f7fd3088b1973a8de1d25e76575f5b864fb88b2255d300457c8dae8815aed3937ff9177d2bcaff6878b6ba8358fa0f WHIRLPOOL 37fbdb7708f37bc1917b4039eb1ce732003b00a026d541daaeed6f47e6c089bf34b357156e8d99ecf65ff1d13b89781cd9a9e8e1620446894a93a7687cf17645
+MISC ChangeLog 64776 SHA256 ad02f7357e196367f4fd75036c6a7b9474b639987b88537e4ab5ff0a8f6aed3c SHA512 b7c21446decd42f1836d73da5415650407c36476805138f88f346b497364a13aed52859b09dc53799249af8cd557af5dd29b375f9487b8b2880f042a499169bc WHIRLPOOL 40ab9e25213cd1c0bd3a4bae45b2e2e44bbc0547266e950b070d33d7dece339f0a7eb73458143e86cd0a19dc7f03f0aa9af07ba28f11308c488c8fe40164e367
 MISC metadata.xml 611 SHA256 ca72f78f706a782fd43a809be03a88ae31684a281697c8668e08210084af78c0 SHA512 2566bee4ccd952830492057b31e0dd02743554748a798ef3a7df3bb44014162e5137d62fd915e28b5b4efe2c70d135baa3e0397cf60ad624ea587c3e2207bd6d WHIRLPOOL cb89aba309663ba96731451d92377a60b00347b7e8f76caac0b373459911e4b9980a015db1588750f433b5d490a0bb7f3000689ca8ea3dab5d1823d1873adec1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUhToAAAoJEEqz6FtPBkyjUacIAIplz64hwY3HfZuVGcbZ8Odo
-NhAZdE+DJvyJwrWdRKiJogjdTbPFkx0YKLIqtY+9MXYevmHalsR8yDJDy61vlRgH
-nOQQ1wCIsvam8mmvLhFE/k5YC72xXpCwjClAgJos4bPYY+ms0Xq+Dx6Ni2QYffnH
-LymvruufAUTAyTyziXiMIYAkPH1Ck1D5VMRX224GHUh3LJmFDa8iAfm6qdvS7m3f
-BgwE2Z9XTON5hIjHG8y1x8/78z1Gm/mKCdUfBKXMvVSAFGyE457hPp5jVmarVU4v
-jd7U/DV0GXrohgjjeqXlUSm+RPacNNWUbOonhnnq0oftGQvqSX4gL5BBQfTXd+E=
-=7R0u
+iQEcBAEBCAAGBQJUhT5dAAoJEEqz6FtPBkyj0sYH/R1iDAWZwwSTeHyLbJPD9rKB
+dtyQR8CKeiSBcQtKgeA2uzX+ZcIWheGdwUH17V9JqHd/94FC8lj3ef/yuevDDmmW
+FAKC2gPRtifzaZJsUm1EEjlW0hmFTZ/sLRKlOUn4gL+ti5XCOqv+o1OZyngGsN6l
+DrQNBTTcoKgfDwNIP0ZIF+g+rsUvyIQAZBjHsLlZAeHzpI7dGs+AlJ8Q/2QoMjjT
+XWZGkJq5c2cUObxx3hb6UsJirt8y6kDzKq0dtPsLpS93f6tOdzAMv8Q+sqTaegwL
+9fw7EMJim9mZuTlYDNU9xGj1L/iVoqVAfu8/7dcl9bflp8ulX5hi6QC42NaqRSY=
+=lEGX
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim/files/vim-7.1.285-darwin-x11link.patch b/app-editors/vim/files/vim-7.1.285-darwin-x11link.patch
deleted file mode 100644
index 1cf00d6a8faa..000000000000
--- a/app-editors/vim/files/vim-7.1.285-darwin-x11link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/configure.in
-+++ src/configure.in
-@@ -2701,7 +2701,7 @@
-     AC_MSG_CHECKING(whether X_LOCALE needed)
-     AC_TRY_COMPILE([#include <X11/Xlocale.h>],,
- 	AC_TRY_LINK_FUNC([_Xsetlocale], [AC_MSG_RESULT(yes)
--		AC_DEFINE(X_LOCALE)], AC_MSG_RESULT(no)),
-+		AC_DEFINE(X_LOCALE) ldflags_save="$ldflags_save -lX11"], AC_MSG_RESULT(no)),
- 	AC_MSG_RESULT(no))
-   fi
-   CFLAGS=$cflags_save
diff --git a/app-editors/vim/files/vim-7.3-interix-link.patch b/app-editors/vim/files/vim-7.3-interix-link.patch
deleted file mode 100644
index 26036652a6f2..000000000000
--- a/app-editors/vim/files/vim-7.3-interix-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru vim73.orig/src/link.sh vim73/src/link.sh
---- vim73.orig/src/link.sh	2010-10-21 16:29:07 +0200
-+++ vim73/src/link.sh	2010-10-21 16:23:15 +0200
-@@ -41,7 +41,7 @@
-   if sh link.cmd; then
-     touch auto/link.sed
-     cp link.cmd linkit.sh
--    for libname in SM ICE nsl dnet dnet_stub inet socket dir elf iconv Xt Xmu Xp Xpm X11 Xdmcp x w perl dl pthread thread readline m crypt attr; do
-+    for libname in dummy; do
-       cont=yes
-       while test -n "$cont"; do
-         if grep "l$libname " linkit.sh >/dev/null; then
diff --git a/app-editors/vim/files/vim-7.3.1214-python3.patch b/app-editors/vim/files/vim-7.3.1214-python3.patch
deleted file mode 100644
index 80dc073f5267..000000000000
--- a/app-editors/vim/files/vim-7.3.1214-python3.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -r 6e9667d3f166 src/configure.in
---- a/src/configure.in	Sun Jun 16 22:49:14 2013 +0200
-+++ b/src/configure.in	Sun Jun 16 17:47:30 2013 -0700
-@@ -1107,9 +1107,9 @@
-       AC_CACHE_CHECK(Python's configuration directory,vi_cv_path_python3_conf,
-       [
-        vi_cv_path_python3_conf=
--       config_dir="config"
-+       config_dir="config-${vi_cv_var_python3_version}"
-        if test "${vi_cv_var_python3_abiflags}" != ""; then
--         config_dir="${config_dir}-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
-+         config_dir="${config_dir}${vi_cv_var_python3_abiflags}"
-        fi
-        d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"`
-        if test -d "$d" && test -f "$d/config.c"; then
diff --git a/app-editors/vim/files/vim-7.4.193-fix-tests.patch b/app-editors/vim/files/vim-7.4.193-fix-tests.patch
deleted file mode 100644
index 9159aa569f7c..000000000000
--- a/app-editors/vim/files/vim-7.4.193-fix-tests.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/src/testdir/test86.ok
-+++ b/src/testdir/test86.ok
-@@ -882,11 +882,11 @@
- l[:] = FailingIter():NotImplementedError:('iter',)
- l[:] = FailingIterNext():NotImplementedError:('next',)
- <<< Finished
--nel[1:10:2]  = "abcK":ValueError:('attempt to assign sequence of size greater then 2 to extended slice',)
-+nel[1:10:2]  = "abcK":ValueError:('attempt to assign sequence of size greater than 2 to extended slice',)
- ('a', 'b', 'c', 'O')
- nel[1:10:2]  = "a":ValueError:('attempt to assign sequence of size 1 to extended slice of size 2',)
- ('a', 'b', 'c', 'O')
--nel[1:1:-1]  = "a":ValueError:('attempt to assign sequence of size greater then 0 to extended slice',)
-+nel[1:1:-1]  = "a":ValueError:('attempt to assign sequence of size greater than 0 to extended slice',)
- ('a', 'b', 'c', 'O')
- nel[:] = FailingIterNextN(2):NotImplementedError:('next N',)
- ('a', 'b', 'c', 'O')
-@@ -1233,8 +1233,8 @@
- >>> Testing NumberToLong using vim.buffers[%s]
- vim.buffers[[]]:TypeError:('expected int(), long() or something supporting coercing to long(), but got list',)
- vim.buffers[None]:TypeError:('expected int(), long() or something supporting coercing to long(), but got NoneType',)
--vim.buffers[-1]:ValueError:('number must be greater then zero',)
--vim.buffers[0]:ValueError:('number must be greater then zero',)
-+vim.buffers[-1]:ValueError:('number must be greater than zero',)
-+vim.buffers[0]:ValueError:('number must be greater than zero',)
- <<< Finished
- > Current
- >> CurrentGetattr
---- a/src/testdir/test87.ok
-+++ b/src/testdir/test87.ok
-@@ -882,11 +882,11 @@
- l[:] = FailingIter():(<class 'NotImplementedError'>, NotImplementedError('iter',))
- l[:] = FailingIterNext():(<class 'NotImplementedError'>, NotImplementedError('next',))
- <<< Finished
--nel[1:10:2]  = "abcK":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater then 2 to extended slice',))
-+nel[1:10:2]  = "abcK":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater than 2 to extended slice',))
- (b'a', b'b', b'c', b'O')
- nel[1:10:2]  = "a":(<class 'ValueError'>, ValueError('attempt to assign sequence of size 1 to extended slice of size 2',))
- (b'a', b'b', b'c', b'O')
--nel[1:1:-1]  = "a":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater then 0 to extended slice',))
-+nel[1:1:-1]  = "a":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater than 0 to extended slice',))
- (b'a', b'b', b'c', b'O')
- nel[:] = FailingIterNextN(2):(<class 'NotImplementedError'>, NotImplementedError('next N',))
- (b'a', b'b', b'c', b'O')
-@@ -1233,8 +1233,8 @@
- >>> Testing NumberToLong using vim.buffers[%s]
- vim.buffers[[]]:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got list',))
- vim.buffers[None]:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got NoneType',))
--vim.buffers[-1]:(<class 'ValueError'>, ValueError('number must be greater then zero',))
--vim.buffers[0]:(<class 'ValueError'>, ValueError('number must be greater then zero',))
-+vim.buffers[-1]:(<class 'ValueError'>, ValueError('number must be greater than zero',))
-+vim.buffers[0]:(<class 'ValueError'>, ValueError('number must be greater than zero',))
- <<< Finished
- > Current
- >> CurrentGetattr
diff --git a/app-editors/vim/vim-7.3.1214.ebuild b/app-editors/vim/vim-7.3.1214.ebuild
deleted file mode 100644
index c6aacd38c40d..000000000000
--- a/app-editors/vim/vim-7.3.1214.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.3.1214.ebuild,v 1.3 2014/06/06 06:05:47 vapier Exp $
-
-EAPI=5
-VIM_VERSION="7.3"
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-inherit vim
-
-VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
-
-SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
-	http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}"
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-S=${WORKDIR}/vim${VIM_VERSION/.}
-
-src_prepare() {
-	vim_src_prepare
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		epatch "${FILESDIR}"/${PN}-7.3-interix-link.patch
-	fi
-	epatch "${FILESDIR}"/${PN}-7.1.285-darwin-x11link.patch
-
-	# fix python3 support
-	epatch "${FILESDIR}"/${P}-python3.patch
-}
diff --git a/app-editors/vim/vim-7.3.762.ebuild b/app-editors/vim/vim-7.3.762.ebuild
deleted file mode 100644
index d5af3c2cce36..000000000000
--- a/app-editors/vim/vim-7.3.762.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.3.762.ebuild,v 1.13 2014/06/06 06:05:47 vapier Exp $
-
-EAPI=3
-VIM_VERSION="7.3"
-inherit vim
-
-VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
-
-SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
-	http://dev.gentoo.org/~lack/vim/${VIM_ORG_PATCHES}"
-
-S="${WORKDIR}/vim${VIM_VERSION/.}"
-DESCRIPTION="Vim, an improved vi-style text editor"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-src_prepare() {
-	vim_src_prepare
-
-	if [[ ${CHOST} == *-interix* ]]; then
-		epatch "${FILESDIR}"/${PN}-7.3-interix-link.patch
-	fi
-	epatch "${FILESDIR}"/${PN}-7.1.285-darwin-x11link.patch
-}
diff --git a/app-editors/vim/vim-7.4.430.ebuild b/app-editors/vim/vim-7.4.430.ebuild
deleted file mode 100644
index a9470795d4f8..000000000000
--- a/app-editors/vim/vim-7.4.430.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.430.ebuild,v 1.3 2014/10/11 18:34:46 mgorny Exp $
-
-EAPI=5
-VIM_VERSION="7.4"
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
-PYTHON_REQ_USE=threads
-inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="https://vim.googlecode.com/hg/"
-	EHG_PROJECT="vim"
-else
-	VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
-		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}
-		http://dev.gentoo.org/~radhermit/vim/vim-${VIM_VERSION}-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="http://www.vim.org/"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	luajit? ( lua )
-"
-
-RDEPEND="
-	>=app-admin/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2
-	nls? ( virtual/libintl )
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? (
-		luajit? ( dev-lang/luajit )
-		!luajit? ( dev-lang/lua[deprecated] )
-	)
-	!minimal? (
-		~app-editors/vim-core-${PV}
-		dev-util/ctags
-	)
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
-	selinux? ( sys-libs/libselinux )
-	tcl? ( dev-lang/tcl )
-	X? ( x11-libs/libXt )
-"
-DEPEND="${RDEPEND}
-	>=app-admin/eselect-vi-1.1
-	sys-devel/autoconf
-	>=sys-libs/ncurses-5.2-r2
-	nls? ( sys-devel/gettext )
-"
-
-S=${WORKDIR}/vim${VIM_VERSION/.}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then
-			# Apply any patches available from vim.org for this version
-			epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2}
-		fi
-
-		if [[ -d "${WORKDIR}"/patches/ ]]; then
-			# Gentoo patches to fix runtime issues, cross-compile errors, etc
-			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches/
-		fi
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
-		|| die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.in || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
-
-	# conditionally make the manpager.sh script
-	if use vim-pager ; then
-		cat <<-END > "${S}"/runtime/macros/manpager.sh
-			#!/bin/sh
-			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-					vim \\
-						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man' \\
-						-c 'let g:showmarks_enable=0' \\
-						-c 'runtime! macros/less.vim' -
-			END
-	fi
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]] ; then
-		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile
-	fi
-
-	if version_is_at_least 7.3.122 ; then
-		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
-	fi
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	if version_is_at_least 7.3 ; then
-		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
-			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.in is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
-	rm -f src/auto/configure
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
-		[[ -e ${file} ]] && addwrite $file
-	done
-
-	if use minimal ; then
-		myconf="--with-features=tiny \
-			--disable-nls \
-			--disable-multibyte \
-			--disable-acl \
-			--enable-gui=no \
-			--without-x \
-			--disable-darwin \
-			--disable-luainterp \
-			--disable-perlinterp \
-			--disable-pythoninterp \
-			--disable-mzschemeinterp \
-			--disable-rubyinterp \
-			--disable-selinux \
-			--disable-tclinterp \
-			--disable-gpm"
-	else
-		use debug && append-flags "-DDEBUG"
-
-		myconf="--with-features=huge --enable-multibyte"
-		myconf+=" $(use_enable acl)"
-		myconf+=" $(use_enable cscope)"
-		myconf+=" $(use_enable gpm)"
-		myconf+=" $(use_enable lua luainterp)"
-		myconf+=" $(use_with luajit)"
-		myconf+=" $(use_enable nls)"
-		myconf+=" $(use_enable perl perlinterp)"
-		myconf+=" $(use_enable racket mzschemeinterp)"
-		myconf+=" $(use_enable ruby rubyinterp)"
-		myconf+=" $(use_enable selinux)"
-		myconf+=" $(use_enable tcl tclinterp)"
-
-		if use python ; then
-			if [[ ${EPYTHON} == python3* ]] ; then
-				myconf+=" --enable-python3interp"
-				export vi_cv_path_python3="${PYTHON}"
-			else
-				myconf+=" --enable-pythoninterp"
-				export vi_cv_path_python="${PYTHON}"
-			fi
-		else
-			myconf+=" --disable-pythoninterp --disable-python3interp"
-		fi
-
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope ; then
-			sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
-				die "couldn't disable cscope"
-		fi
-
-		# don't test USE=X here ... see bug #19115
-		# but need to provide a way to link against X ... see bug #20093
-		myconf+=" --enable-gui=no --disable-darwin $(use_with X x)"
-	fi
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		${myconf}
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	echo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	echo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	echo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# We've got to call make test from within testdir, since the Makefiles
-	# don't pass through our VIMPROG argument
-	cd "${S}"/src/testdir
-
-	# Test 49 won't work inside a portage environment
-	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
-	sed -i 's~test49.out~~g' Makefile
-
-	# We don't want to rebuild vim before running the tests
-	sed -i 's,: \$(VIMPROG),: ,' Makefile
-
-	# Don't try to do the additional GUI test
-	emake -j1 VIMPROG=../vim nongui
-}
-
-# Make convenience symlinks, hopefully without stepping on toes.  Some
-# of these links are "owned" by the vim ebuild when it is installed,
-# but they might be good for gvim as well (see bug 45828)
-update_vim_symlinks() {
-	has "${EAPI:-0}" 0 1 2 && use !prefix && EROOT="${ROOT}"
-	local f syms
-	syms="vimdiff rvim rview"
-	einfo "Calling eselect vi update..."
-	# Call this with --if-unset to respect user's choice (bug 187449)
-	eselect vi update --if-unset
-
-	# Make or remove convenience symlink, vim -> gvim
-	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
-		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
-	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
-		rm "${EROOT}"/usr/bin/vim
-	fi
-
-	# Make or remove convenience symlinks to vim
-	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
-		for f in ${syms}; do
-			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
-		done
-	else
-		for f in ${syms}; do
-			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
-				rm -f "${EROOT}"/usr/bin/${f}
-			fi
-		done
-	fi
-
-	# This will still break if you merge then remove the vi package,
-	# but there's only so much you can do, eh?  Unfortunately we don't
-	# have triggers like are done in rpm-land.
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-	#       managed by eselect-vi
-	dobin src/vim
-	dosym vim /usr/bin/vimdiff
-	dosym vim /usr/bin/rvim
-	dosym vim /usr/bin/rview
-	if use vim-pager ; then
-		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-		insinto ${vimfiles}/macros
-		doins runtime/macros/manpager.sh
-		fperms a+x ${vimfiles}/macros/manpager.sh
-	fi
-
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-	# keep in sync with 'complete ... -F' list
-	bashcomp_alias vim ex vi view rvim rview vimdiff
-
-	# We shouldn't be installing the ex or view man page symlinks, as they
-	# are managed by eselect-vi
-	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		if use X ; then
-			echo
-			elog "The 'X' USE flag enables vim <-> X communication, like"
-			elog "updating the xterm titlebar. It does not install a GUI."
-		fi
-		echo
-		elog "To install a GUI version of vim, use the app-editors/gvim"
-		elog "package."
-		echo
-		elog "Vim 7 includes an integrated spell checker. You need to install"
-		elog "word list files before you can use it. There are ebuilds for"
-		elog "some of these named app-vim/vim-spell-*. If your language of"
-		elog "choice is not included, please consult vim-spell.eclass for"
-		elog "instructions on how to make a package."
-		echo
-		ewarn "Note that the English word lists are no longer installed by"
-		ewarn "default."
-	fi
-
-	# Make convenience symlinks
-	update_vim_symlinks
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Make convenience symlinks
-	update_vim_symlinks
-}
diff --git a/app-editors/vim/vim-7.4.475.ebuild b/app-editors/vim/vim-7.4.475.ebuild
deleted file mode 100644
index 52b75dbaa59d..000000000000
--- a/app-editors/vim/vim-7.4.475.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.4.475.ebuild,v 1.2 2014/10/13 21:13:29 radhermit Exp $
-
-EAPI=5
-VIM_VERSION="7.4"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE=threads
-inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-single-r1
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="https://vim.googlecode.com/hg/"
-	EHG_PROJECT="vim"
-else
-	VIM_ORG_PATCHES="vim-patches-${PV}.patch.bz2"
-	SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
-		http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}
-		http://dev.gentoo.org/~radhermit/vim/vim-${VIM_VERSION}-gentoo-patches.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="Vim, an improved vi-style text editor"
-HOMEPAGE="http://www.vim.org/"
-
-SLOT="0"
-LICENSE="vim"
-IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl vim-pager"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	luajit? ( lua )
-"
-
-RDEPEND="
-	>=app-admin/eselect-vi-1.1
-	>=sys-libs/ncurses-5.2-r2
-	nls? ( virtual/libintl )
-	acl? ( kernel_linux? ( sys-apps/acl ) )
-	cscope? ( dev-util/cscope )
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	lua? (
-		luajit? ( dev-lang/luajit )
-		!luajit? ( dev-lang/lua[deprecated] )
-	)
-	!minimal? (
-		~app-editors/vim-core-${PV}
-		dev-util/ctags
-	)
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	racket? ( dev-scheme/racket )
-	ruby? ( || ( dev-lang/ruby:2.1 dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
-	selinux? ( sys-libs/libselinux )
-	tcl? ( dev-lang/tcl )
-	X? ( x11-libs/libXt )
-"
-DEPEND="${RDEPEND}
-	>=app-admin/eselect-vi-1.1
-	sys-devel/autoconf
-	>=sys-libs/ncurses-5.2-r2
-	nls? ( sys-devel/gettext )
-"
-
-S=${WORKDIR}/vim${VIM_VERSION/.}
-
-pkg_setup() {
-	# people with broken alphabets run into trouble. bug 82186.
-	unset LANG LC_ALL
-	export LC_COLLATE="C"
-
-	# Gnome sandbox silliness. bug #114475.
-	mkdir -p "${T}"/home
-	export HOME="${T}"/home
-
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999* ]] ; then
-		if [[ -f "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2} ]] ; then
-			# Apply any patches available from vim.org for this version
-			epatch "${WORKDIR}"/${VIM_ORG_PATCHES%.bz2}
-		fi
-
-		if [[ -d "${WORKDIR}"/patches/ ]]; then
-			# Gentoo patches to fix runtime issues, cross-compile errors, etc
-			EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
-				epatch "${WORKDIR}"/patches/
-		fi
-	fi
-
-	# Fixup a script to use awk instead of nawk
-	sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
-		|| die "mve.awk sed failed"
-
-	# Read vimrc and gvimrc from /etc/vim
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-	echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
-
-	# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
-	# Hopefully this pattern won't break for a while at least.
-	# This fixes bug 29398 (27 Sep 2003 agriffis)
-	sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
-		"${S}"/runtime/doc/syntax.txt \
-		"${S}"/runtime/doc/tagsrch.txt \
-		"${S}"/runtime/doc/usr_29.txt \
-		"${S}"/runtime/menu.vim \
-		"${S}"/src/configure.in || die 'sed failed'
-
-	# Don't be fooled by /usr/include/libc.h.  When found, vim thinks
-	# this is NeXT, but it's actually just a file in dev-libs/9libs
-	# This fixes bug 43885 (20 Mar 2004 agriffis)
-	sed -i 's/ libc\.h / /' "${S}"/src/configure.in || die 'sed failed'
-
-	# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
-	# correctly. To avoid some really entertaining error messages about stuff
-	# which isn't even in the source file being invalid, we'll do some trickery
-	# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
-	find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
-
-	# conditionally make the manpager.sh script
-	if use vim-pager ; then
-		cat <<-END > "${S}"/runtime/macros/manpager.sh
-			#!/bin/sh
-			sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
-					vim \\
-						-c 'let no_plugin_maps = 1' \\
-						-c 'set nolist nomod ft=man' \\
-						-c 'let g:showmarks_enable=0' \\
-						-c 'runtime! macros/less.vim' -
-			END
-	fi
-
-	# Try to avoid sandbox problems. Bug #114475.
-	if [[ -d "${S}"/src/po ]] ; then
-		sed -i '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
-			"${S}"/src/po/Makefile
-	fi
-
-	if version_is_at_least 7.3.122 ; then
-		cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk
-	fi
-
-	# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
-	if version_is_at_least 7.3 ; then
-		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
-			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf
-
-	# Fix bug 37354: Disallow -funroll-all-loops on amd64
-	# Bug 57859 suggests that we want to do this for all archs
-	filter-flags -funroll-all-loops
-
-	# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
-	# everyone since previous flag filtering bugs have turned out to affect
-	# multiple archs...
-	replace-flags -O3 -O2
-
-	# Fix bug 18245: Prevent "make" from the following chain:
-	# (1) Notice configure.in is newer than auto/configure
-	# (2) Rebuild auto/configure
-	# (3) Notice auto/configure is newer than auto/config.mk
-	# (4) Run ./configure (with wrong args) to remake auto/config.mk
-	sed -i 's/ auto.config.mk:/:/' src/Makefile || die "Makefile sed failed"
-	rm -f src/auto/configure
-	emake -j1 -C src autoconf
-
-	# This should fix a sandbox violation (see bug 24447). The hvc
-	# things are for ppc64, see bug 86433.
-	for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do
-		[[ -e ${file} ]] && addwrite $file
-	done
-
-	if use minimal ; then
-		myconf="--with-features=tiny \
-			--disable-nls \
-			--disable-multibyte \
-			--disable-acl \
-			--enable-gui=no \
-			--without-x \
-			--disable-darwin \
-			--disable-luainterp \
-			--disable-perlinterp \
-			--disable-pythoninterp \
-			--disable-mzschemeinterp \
-			--disable-rubyinterp \
-			--disable-selinux \
-			--disable-tclinterp \
-			--disable-gpm"
-	else
-		use debug && append-flags "-DDEBUG"
-
-		myconf="--with-features=huge --enable-multibyte"
-		myconf+=" $(use_enable acl)"
-		myconf+=" $(use_enable cscope)"
-		myconf+=" $(use_enable gpm)"
-		myconf+=" $(use_enable lua luainterp)"
-		myconf+=" $(use_with luajit)"
-		myconf+=" $(use_enable nls)"
-		myconf+=" $(use_enable perl perlinterp)"
-		myconf+=" $(use_enable racket mzschemeinterp)"
-		myconf+=" $(use_enable ruby rubyinterp)"
-		myconf+=" $(use_enable selinux)"
-		myconf+=" $(use_enable tcl tclinterp)"
-
-		if use python ; then
-			if [[ ${EPYTHON} == python3* ]] ; then
-				myconf+=" --enable-python3interp"
-				export vi_cv_path_python3="${PYTHON}"
-			else
-				myconf+=" --enable-pythoninterp"
-				export vi_cv_path_python="${PYTHON}"
-			fi
-		else
-			myconf+=" --disable-pythoninterp --disable-python3interp"
-		fi
-
-		# --with-features=huge forces on cscope even if we --disable it. We need
-		# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
-		if ! use cscope ; then
-			sed -i '/# define FEAT_CSCOPE/d' src/feature.h || \
-				die "couldn't disable cscope"
-		fi
-
-		# don't test USE=X here ... see bug #19115
-		# but need to provide a way to link against X ... see bug #20093
-		myconf+=" --enable-gui=no --disable-darwin $(use_with X x)"
-	fi
-
-	# Let Portage do the stripping. Some people like that.
-	export ac_cv_prog_STRIP="$(type -P true ) faking strip"
-
-	# Keep Gentoo Prefix env contained within the EPREFIX
-	use prefix && myconf+=" --without-local-dir"
-
-	econf \
-		--with-modified-by=Gentoo-${PVR} \
-		${myconf}
-}
-
-src_compile() {
-	# The following allows emake to be used
-	emake -j1 -C src auto/osdef.h objects
-
-	emake
-}
-
-src_test() {
-	echo
-	einfo "Starting vim tests. Several error messages will be shown"
-	einfo "while the tests run. This is normal behaviour and does not"
-	einfo "indicate a fault."
-	echo
-	ewarn "If the tests fail, your terminal may be left in a strange"
-	ewarn "state. Usually, running 'reset' will fix this."
-	echo
-
-	# Don't let vim talk to X
-	unset DISPLAY
-
-	# We've got to call make test from within testdir, since the Makefiles
-	# don't pass through our VIMPROG argument
-	cd "${S}"/src/testdir
-
-	# Test 49 won't work inside a portage environment
-	einfo "Test 49 isn't sandbox-friendly, so it will be skipped."
-	sed -i 's~test49.out~~g' Makefile
-
-	# We don't want to rebuild vim before running the tests
-	sed -i 's,: \$(VIMPROG),: ,' Makefile
-
-	# Don't try to do the additional GUI test
-	emake -j1 VIMPROG=../vim nongui
-}
-
-# Make convenience symlinks, hopefully without stepping on toes.  Some
-# of these links are "owned" by the vim ebuild when it is installed,
-# but they might be good for gvim as well (see bug 45828)
-update_vim_symlinks() {
-	has "${EAPI:-0}" 0 1 2 && use !prefix && EROOT="${ROOT}"
-	local f syms
-	syms="vimdiff rvim rview"
-	einfo "Calling eselect vi update..."
-	# Call this with --if-unset to respect user's choice (bug 187449)
-	eselect vi update --if-unset
-
-	# Make or remove convenience symlink, vim -> gvim
-	if [[ -f "${EROOT}"/usr/bin/gvim ]]; then
-		ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null
-	elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then
-		rm "${EROOT}"/usr/bin/vim
-	fi
-
-	# Make or remove convenience symlinks to vim
-	if [[ -f "${EROOT}"/usr/bin/vim ]]; then
-		for f in ${syms}; do
-			ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null
-		done
-	else
-		for f in ${syms}; do
-			if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then
-				rm -f "${EROOT}"/usr/bin/${f}
-			fi
-		done
-	fi
-
-	# This will still break if you merge then remove the vi package,
-	# but there's only so much you can do, eh?  Unfortunately we don't
-	# have triggers like are done in rpm-land.
-}
-
-src_install() {
-	local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
-
-	# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
-	#       managed by eselect-vi
-	dobin src/vim
-	dosym vim /usr/bin/vimdiff
-	dosym vim /usr/bin/rvim
-	dosym vim /usr/bin/rview
-	if use vim-pager ; then
-		dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
-		dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
-		insinto ${vimfiles}/macros
-		doins runtime/macros/manpager.sh
-		fperms a+x ${vimfiles}/macros/manpager.sh
-	fi
-
-	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
-	# keep in sync with 'complete ... -F' list
-	bashcomp_alias vim ex vi view rvim rview vimdiff
-
-	# We shouldn't be installing the ex or view man page symlinks, as they
-	# are managed by eselect-vi
-	rm -f "${ED}"/usr/share/man/man1/{ex,view}.1
-}
-
-pkg_postinst() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		if use X ; then
-			echo
-			elog "The 'X' USE flag enables vim <-> X communication, like"
-			elog "updating the xterm titlebar. It does not install a GUI."
-		fi
-		echo
-		elog "To install a GUI version of vim, use the app-editors/gvim"
-		elog "package."
-		echo
-		elog "Vim 7 includes an integrated spell checker. You need to install"
-		elog "word list files before you can use it. There are ebuilds for"
-		elog "some of these named app-vim/vim-spell-*. If your language of"
-		elog "choice is not included, please consult vim-spell.eclass for"
-		elog "instructions on how to make a package."
-		echo
-		ewarn "Note that the English word lists are no longer installed by"
-		ewarn "default."
-	fi
-
-	# Make convenience symlinks
-	update_vim_symlinks
-}
-
-pkg_postrm() {
-	# Update documentation tags (from vim-doc.eclass)
-	update_vim_helptags
-
-	# Make convenience symlinks
-	update_vim_symlinks
-}