Version bump, add support for user patching (bug #503328).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

5 files changed, 477 insertions, 11 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index e22d962518be..f7b4df1ef07b 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/gvim
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.423 2014/02/06 07:10:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.424 2014/03/10 19:28:51 radhermit Exp $
+
+*gvim-7.4.193 (10 Mar 2014)
+
+  10 Mar 2014; Tim Harder <radhermit@gentoo.org> +gvim-7.4.193.ebuild,
+  gvim-9999.ebuild, +files/gvim-7.4.193-fix-tests.patch:
+  Version bump, add support for user patching (bug #503328).
 
 *gvim-7.4.169 (06 Feb 2014)
 
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 323141507b35..6e111ab0b6a7 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -5,6 +5,7 @@ AUX gvim-7.1-interix-link.patch 716 SHA256 53459943e62247469f6fbaa30abd36d7629e0
 AUX gvim-7.1.285-darwin-x11link.patch 388 SHA256 0b935efbedabeab8439d42baa1d07b2f3d5e2964dea9e504ff2a4d4b9f3e6bcd SHA512 5fc5786abfc1258d29f3d37e89696dce8f4f770a889bebc4b287ee777cfb3e933025dfad015c9cd5984fcc355d06db4d95d45af768d2dfc5c76287a3ff5e04cf WHIRLPOOL b0e140078233ae10a944db92fc1268e9f73239ca045a89e5f4ed933859a97a075c20cfa3702b69eff807dfd0a10007c9051ccc272534438ebd7a504d359e1b29
 AUX gvim-7.1.319-interix-cflags.patch 919 SHA256 4823169ed87498ed4856e8c18e5ca4dd7d5cc9f8d899b2091b3c757579290a21 SHA512 97f8009473f13fa13e9a413f5ae627f9e750f74a2d34c3ecff43144c4ed4836d2b021021e3eca6799f8ac7fd3fd6473a768e1ee72ece3b37b184f9904d5a3ee8 WHIRLPOOL e9811962e23e521fddfb66ee629cbfa0a86678dba8fcc5ba9cdeb0540b141101c28dc85925711f8929fcfe8ce461b611d557a8076e26804b5d3979a7afc30647
 AUX gvim-7.3.1214-python3.patch 780 SHA256 9c128516c92f178c844a6cf8447f6feb4246903bda2f0fdb368e19f6d87cba4b SHA512 79460f95c4a181f78144e2749bdc388e60a6ff7bf3efec346a0e3cf741c128d093aac8533e8fa76120ce9016de4e27d5c9b0d1ed1d93fa77614191c1fcc59125 WHIRLPOOL 42f17388e5c373725146e0bcf75f7df61d03c089c8cefc53f39a3407c974c86a3e4676ef0a6546ebbc1f5be7f1be220b9d442a8e37964f1c7e80b6dffddcf42a
+AUX gvim-7.4.193-fix-tests.patch 3303 SHA256 23824f70378c62aa17a26060d48c4df5015e0a9e38c4ecb767a4275731908d70 SHA512 da751f8971ee86e3b9f7332c0705fbb94386c1b2aa4e4aad5e4bfe071de754098e8e22e3fa1f82b1e6f9f533ee865d09a6054c6b914b29cd0172e0c07ec9a093 WHIRLPOOL 8e88282303f9248573dc1cb7d1166194eeea4e25dadc3909f1c926b9b69675760498e5b034f72b3cb9b89f6b95244989a2d5c8d6dc6e5139d95141f9d21ac2d6
 AUX gvim-completion 1200 SHA256 e3976b6e6732002059129cfbe158ba43b2edc1ccd6e3753d1751211297c95ce8 SHA512 8bccfc1b8d1ece1091b61a449fd0ce35a97dd212dd1bbbe17e6765f5e5f0bd596226e3ec519fa5c277ddd12d0bb9111fd7a386bd69d40fc2f25c6f3fa563e33f WHIRLPOOL a58857e2726362df460f19356f5240dcd41259d59812231992c4ec85e14a755edf30a80ec3341b25e146364946e99fbf3624579c0ab3b94a3d01cc2bb47f0d84
 AUX gvim.desktop-r2 171 SHA256 840e4bcac0b448566e26e53b8292f31a9e187360b6aaf75f37929e43c46f22ce SHA512 1e4ceb7776100d00cb4ea70039cc4e7342decffd392c0c8633254c6c0ffa6c0816acbe56b8b03b9302119c473d2e4618b4df0e6e1e2031282e21a66063a1ec3b WHIRLPOOL fd085e75deaecd336f23c784929d6b95b8889cd5aba3c8c0777adc6aaf5a484881bd11d5d7a291972a75b527e82240a9d48ac7668550ddfbe25c903665e54e6a
 AUX gvim.xpm 1371 SHA256 adf603379740f509b0c543f9ac78a3eda7c804958c1a9086c50e7daecd059cc7 SHA512 550df3d5ae428735918cf0f364a1792d105312336c1d5f09c7187e20cd8470dcf86b37748388d20b4bbf3897f9868c6a9f981b8907ab488c354be02c26fdec98 WHIRLPOOL 39978c576662616e809618f1f9a17405f69d13ad70a94f783e28a64745a8c31696a32389d4fe9f50145056938c15e61a1a26143f362627c172d269bc8b559e8e
@@ -15,23 +16,25 @@ DIST vim-patches-7.3.1214.patch.bz2 1678514 SHA256 ad8e7742b14337f77bc8d35a77b18
 DIST vim-patches-7.3.762.patch.bz2 1102824 SHA256 91dd83f66b1f362be987cff40c00c05b8dc699000b8b4932437829ed34936dab SHA512 b7288438f98b56e082a957c5178818f549dd8e2aca31301f432d3c6d94c0702e482e4c14b17c122f6a83a11bb21dcc165725b3996a503f6cb45400492ae783bd WHIRLPOOL cc1140556487fde2c2ee9a9351f4a062a080d270cfa8e728295beb233288efc7acdb750181dc25a2a1b74d4b547e1219e3f043c89b6a27348f7aa916d64f9fd3
 DIST vim-patches-7.4.155.patch.bz2 183677 SHA256 df57d372ace540809dde22ad649ee7f13c4a165770cef28bb76d8dc7aa630671 SHA512 0667810a1ae908f5739ab37b32688fff3d65c4f69e83d3f9d0364112e8e7f70c77eeae3d672725df25ad837a75e373619321c1f183e7ded67afad544fbdd7801 WHIRLPOOL 829ab6152daed43323af6537669d4c3d6367138d0858c746ba02a6fc15497ef7161c62ccbe9bac7526296f5adf52a4ba1fe86c3539dd559ddc5cb4f6e0f90cfe
 DIST vim-patches-7.4.169.patch.bz2 220499 SHA256 faf5e06098d45b25cea6ddb9e4ef080ce4717f2c2148678ded4f715bcb9fd652 SHA512 1102d7f89ad0cdd81f4bfa03875d400be3b642565527c61e72583b85723ef5f25ed7d7bc0dd6b620d013f65f500add84b96db734f45c21369e22405f6f6a6f8d WHIRLPOOL 1e45b776f85c941b3b741018338ece2b299576e5261103bc381e9b1f1162652bd79f119e060710dbabf99e3bff0668de9485df38b57897f716bd52a2f1f3cb2f
+DIST vim-patches-7.4.193.patch.bz2 252912 SHA256 9fbfa1758610a84315bb74c3e6d8224779fd5ef1fccb3acabc488d855966839a SHA512 d86d1bcc2dea13971772ff716dfd455c66d7e8df280c2a7293ec2d7baa10a0e184b4083044665db7b4a0a7c64bbcc0c3f20e43fd937dd712fb4cfd6ce9a0a5ab WHIRLPOOL 46203445b9d8b445f2be63262a60d7e48ddf922c5830326af84199760e8770b0b987974f4abb52d97099ddfabb6c0f93cb6647bfe5e0f94eed056bbb10aee3db
 DIST vim-patches-7.4.52.patch.bz2 14 SHA256 d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 SHA512 6de201dfed1d45412509c65deb34690dc2d09c6aafccfe491fd2f440f92842b9c755b61dc7bcdd4cc0c9f18cf46c2b3a1241e99c4c2a33fff5555e7b2f0b6348 WHIRLPOOL 39fd27630df1bd07de69b6bae68be5028bbefbc8ffdac645d5e0527eb1ed9575d0aaf97b39d0d6c9b69401846fbf8aeb3383b14bafb4a7564a20e92182dbd4b0
 EBUILD gvim-7.3.1214.ebuild 1067 SHA256 d005488811ca107f47fcc78d63d4bc7fcfd17232eaa8f43a553fbe4e14c81b5d SHA512 a0e321432369a986810cd7ac1201247e42c1693331de7e4de234f204b7b943ef8e9cc689bde0122082a984583ce9c36ec5ecf1136df3a8fb451493fde8cef484 WHIRLPOOL 2a3a10f491937a96980f6207c1309ab3df46336d589b812ab2e1748698f19194e7fe44eca07b21f0f88b0297e742372f7eba1337d40add870929b2ee860ab783
 EBUILD gvim-7.3.762.ebuild 958 SHA256 19a7ce0d8ad24047c022c866046ec63aab92efa911e87dea3d83f7e4b33e7dd9 SHA512 3966bd3a5cb514f99cc3ee5718b09a3fcb8eaf2e71c118a255a3ffc496b64d116a5321719a3773d38743b9552408bc2655373753a9e1b8e5f571d848226253e3 WHIRLPOOL 8095463dd1ed4bbace9ef0fbb9a2ce74fc49f1c1f431fc9ce83e8eed4d23c97f1eb54e90575baaa77b928eacf659322076256e511b045896b94e1ec5479fe5ce
 EBUILD gvim-7.4.155.ebuild 12176 SHA256 100e8776c9a4901090b11fe52eb9dd93826ccc37f1ee7c86fbfb0f1c3c62f3ff SHA512 5dfa0df6a04f94906044190d0ed2c50daf82f8173a3429e927b726099ea4ee378e20097bf59f18f3a9e36fe3ef59d9cb7b84b0dc79800052cccf18148a1ddcb5 WHIRLPOOL 5d4a093537d250cd487df5c6d57f2dd5a3be4dddf83ca707b7d3786cd6a25e93af8d41610fca1e3c9799987efe4971302fbae9d67bd5fbf30fc90ebb08b59a2f
 EBUILD gvim-7.4.169.ebuild 12230 SHA256 ba711bbc117c9ab20fa949f5ff59bcc7b5180b7159e1fbe8ae7b95c4c7f3f4cb SHA512 6d2a9a43fb0edfb540fcc46672223ed274b9e71539aacac1178b9a8fb44bce0fb1c7fa6acedf3239cc9d59d0b4975b8b7d7e912518866366b960be290f0e48b5 WHIRLPOOL 467f352896767da1df0257c6b60f2f5aa13676d3b2d3adbf34a60e81558efe8a2fb86c926e784fc4e45aa5fb094b35f7c5d2ba171b32e5d4b56274dec5d4c20b
+EBUILD gvim-7.4.193.ebuild 12288 SHA256 60351734e3e69a53d634c8deb7d110f3ddd9a4777fcf53f81bea3125a9dd529a SHA512 7db2465afd30900b3c65809f87ba37fc09d994418cf1ba3831a369b390528789151cc915f0096b30af868d9aa0c31268d342b23d21b00f5b87a2000a18d07b2a WHIRLPOOL 891632d4c4f09eaffa2e08fd3e7af2f7b34d2126f786ae52cb30dddc0e752f9e9ea04a20ad28839399a93bf699e7b872bfc60067ad3ba3797f505720c5530b90
 EBUILD gvim-7.4.52.ebuild 12559 SHA256 14bc67c1fac648ae0990ad6b91f73a35db92c6cd8135e7d6bd8796e193bdf537 SHA512 7f1625a0220cd80f9a2516e082c64f8b32ac984ed1ae0c3a3a72d93b8d4d37cefedfd60b40a115f3d9cf4ad13e6bb13ad8b92b50da26b77074d434ee583fe112 WHIRLPOOL f278ae87c4fa0e49835ce91b070f9fd5acb5be939c8cc65f6f5e798b21eacf14c779bd6af18809fc7f9561f95a92ac7e7998ad3a60856de90a9340ed5090a6c8
-EBUILD gvim-9999.ebuild 12228 SHA256 3083eefe04d5f5a865517d2607c62a144a21030a804512a1dc270c281c86b92d SHA512 0413d343cb4e0ea4071fef36522c7bae30d23dffe664b597e58fda6d18bd6fb32a8198b9179f319ff19ee09af52eded1439a7de682f100b43724a99485d1205e WHIRLPOOL 31409a57ffe3fbbb2c2ff2ca487d6fbb6c48ee7afa2ed13a35948ab45f055889d48467b746f67c187d11e127006acb4635936c8fcab2de9db2c7d56faaa80eb5
-MISC ChangeLog 58069 SHA256 be307a1fc7b29a33ad55f4d4cf670e665ac83060bf603fd27b5dbfe39d925257 SHA512 a001d06c36677aa67a7333894f983ad910c93d352de73b2a3a8ea97cfb37ef44431e90df3274c3ffe5c3edab6b2d2a70b9aa666de446b80888e58ad85325abf5 WHIRLPOOL e7951cd0f8543eb938cb54c585dbb2ca2aa4949eb516e13ffc7027e1ced9012ac51f829b4b5a84bc7cc3daedf994fd1ad583976da98c71d02d44e25aedf81f31
+EBUILD gvim-9999.ebuild 12242 SHA256 0a0d944bff97acdfca3d77a80ce7acfb7d060b3d48052cc074e23159cbc03a23 SHA512 d3181247ac2769d1f66e7c5c6e182dc7608824212b1c66819d2b7878ca34fbe8835e637c483d7686d8909f12b9c46f31c4c3374116910c42e33d189d0793109e WHIRLPOOL 4a5ffd51789bbc60ee0ad0ddad2021e04de2f58e055864afb9dc73f64d22091c9c5b7a8c98d2b94ae3145f1f8b3545563e7f35ab3681f6d054e27c06e6824525
+MISC ChangeLog 58288 SHA256 5144c53cfb6c9c26dc170da90a510b73bc3df9a29da74b1870bcdcff78f24162 SHA512 5ca6154832e71edc293e08880af338d9d49b41cba6a2cef514f69bff150fbf4dd33456bbc736f1e85d8704ef784e9572092e7b128d9746a88f30aa8afa257c36 WHIRLPOOL b22235d03b29f4ff9189d70e00fb916d90396ca5a8f78600900f6429c4b09ec672dc36793390e334d7f22e96bf677eaeb86af4027b1d4684e78d715d62d154a5
 MISC metadata.xml 448 SHA256 524e425c32bae85ecbdb39210b1a936ef2849092916d7b3dcb52a5dbc921ec6e SHA512 a07525b45a00b8de6e019e35305479275013b75c557abc5447f78c196a1bf7806480ecbf3b1fe2faf148b0e147870303d2e04cf6bb027bd501b2f04106e67b71 WHIRLPOOL 0fddc25f0abb4814caae4faef2ff5aef0c090c74caa4a773f727a904b5308efe19e72f1fda61c431c67f07a384a5cfd9e92fbf24ddf1cc92ad35e1622d907def
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJS8zV1AAoJEEqz6FtPBkyjcDkIAKDIL7yTQERJ3j6Mnm0lcYaV
-Dgw4cQIjtJY4aTJVZQrpnwPlUxfBTbITYKmwGwyR2u8isD1wn86igR61Sqmuy5FT
-CnNByMpl6hzYMeUqWtMG6PK+1eaD1hhL5dF7oDbi575UWidzvFOnUPdfGo++yC63
-Nc5sBC5PFUkXUPM2qbxrfSRvgueY47O7ME8h8EBHiKEAJrnOU3/RgQRf6uUc6rxa
-/NkCJWoeWlGNm0cPVg7mOZzIIAOrSZzHiM8PJKO7sa3jfd+Rj+2Da6e6owbAgKQm
-gyNbjmbtSyrm1i7iq0VSNViEYZbpx0uFtiQs1J9wO18vgMnzabUsaGZm6eBGlQQ=
-=BUsC
+iQEcBAEBCAAGBQJTHhKAAAoJEEqz6FtPBkyjbnwH/RGlvaV3Q73S02jbDyoDi0Xt
+ik5GfNVD2G9dvbH3WM77CTSp3QQtMjQDBRwLpJpQk2rOkzZoqwZ3YIq6vYA0B78l
+5FuxXCjtdPGtlMZNhJLFCuQuGfVESDGAlDykT6qjVQJJnlMy2M1cQW26lZTZm5bJ
+AV6WqX3BHMOOdzdOPou6BGiaMCvtWoaO9fjogMndEqzRPIMVoLu4ztrXApbKfQ/8
+bznfPMGRQw/9yzGT+FrToewdf9z8ZMSsLlxXLhTt8eBsSqCFh1DonTrglkCfMxxL
+2vBxYW3/UucvSm9jE5QyzNgzUXsdo3LAWLRkleoVup8NfoQN+1Dqwjij/xzUxVM=
+=o9IZ
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gvim/files/gvim-7.4.193-fix-tests.patch b/app-editors/gvim/files/gvim-7.4.193-fix-tests.patch
new file mode 100644
index 000000000000..9159aa569f7c
--- /dev/null
+++ b/app-editors/gvim/files/gvim-7.4.193-fix-tests.patch
@@ -0,0 +1,54 @@
+--- 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/gvim/gvim-7.4.193.ebuild b/app-editors/gvim/gvim-7.4.193.ebuild
new file mode 100644
index 000000000000..dba282959d7d
--- /dev/null
+++ b/app-editors/gvim/gvim-7.4.193.ebuild
@@ -0,0 +1,401 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.4.193.ebuild,v 1.1 2014/03/10 19:28:51 radhermit Exp $
+
+EAPI=5
+VIM_VERSION="7.4"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_REQ_USE=threads
+inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix 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}"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+fi
+
+DESCRIPTION="GUI version of the Vim text editor"
+HOMEPAGE="http://www.vim.org/"
+
+SLOT="0"
+LICENSE="vim"
+IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	luajit? ( lua )
+"
+
+RDEPEND="
+	~app-editors/vim-core-${PV}
+	>=app-admin/eselect-vi-1.1
+	>=sys-libs/ncurses-5.2-r2
+	x11-libs/libXext
+	x11-libs/libXt
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	!aqua? (
+		gtk? (
+			>=x11-libs/gtk+-2.6:2
+			x11-libs/libXft
+			gnome? ( >=gnome-base/libgnomeui-2.6 )
+		)
+		!gtk? (
+			motif? ( >=x11-libs/motif-2.3:0 )
+			!motif? (
+				neXt? ( x11-libs/neXtaw )
+				!neXt? ( x11-libs/libXaw )
+			)
+		)
+	)
+	cscope? ( dev-util/cscope )
+	lua? (
+		luajit? ( dev-lang/luajit )
+		!luajit? ( dev-lang/lua[deprecated] )
+	)
+	nls? ( virtual/libintl )
+	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 dev-lang/ruby:1.8 ) )
+	selinux? ( sys-libs/libselinux )
+	session? ( x11-libs/libSM )
+	tcl? ( dev-lang/tcl )
+"
+DEPEND="${RDEPEND}
+	>=app-admin/eselect-vi-1.1
+	dev-util/ctags
+	sys-devel/autoconf
+	virtual/pkgconfig
+	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
+	fi
+
+	epatch "${FILESDIR}"/${P}-fix-tests.patch
+
+	# 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
+
+	# 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
+
+	use debug && append-flags "-DDEBUG"
+
+	myconf="--with-features=huge --disable-gpm --enable-multibyte"
+	myconf+=" $(use_enable acl)"
+	myconf+=" $(use_enable cscope)"
+	myconf+=" $(use_enable lua luainterp)"
+	myconf+=" $(use_with luajit)"
+	myconf+=" $(use_enable netbeans)"
+	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 session xsmp)"
+	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
+
+	# gvim's GUI preference order is as follows:
+	# aqua                          CARBON (not tested)
+	# -aqua gtk gnome               GNOME2
+	# -aqua gtk -gnome              GTK2
+	# -aqua -gtk  motif             MOTIF
+	# -aqua -gtk -motif neXt        NEXTAW
+	# -aqua -gtk -motif -neXt       ATHENA
+	echo ; echo
+	if use aqua ; then
+		einfo "Building gvim with the Carbon GUI"
+		myconf+=" --enable-darwin --enable-gui=carbon"
+	elif use gtk ; then
+		myconf+=" --enable-gtk2-check"
+		if use gnome ; then
+			einfo "Building gvim with the Gnome 2 GUI"
+			myconf+=" --enable-gui=gnome2"
+		else
+			einfo "Building gvim with the gtk+-2 GUI"
+			myconf+=" --enable-gui=gtk2"
+		fi
+	elif use motif ; then
+		einfo "Building gvim with the MOTIF GUI"
+		myconf+=" --enable-gui=motif"
+	elif use neXt ; then
+		einfo "Building gvim with the neXtaw GUI"
+		myconf+=" --enable-gui=nextaw"
+	else
+		einfo "Building gvim with the Athena GUI"
+		myconf+=" --enable-gui=athena"
+	fi
+	echo ; echo
+
+	# 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"
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# avoid finding of this function, to avoid having to patch either
+		# configure or the source, which would be much more hackish.
+		# after all vim does it right, only interix is badly broken (again)
+		export ac_cv_func_sigaction=no
+	fi
+
+	econf \
+		--with-modified-by=Gentoo-${PVR} \
+		--with-vim-name=gvim --with-x \
+		${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
+
+	# Make gvim not try to connect to X. See :help gui-x11-start
+	# in vim for how this evil trickery works.
+	ln -s "${S}"/src/gvim "${S}"/src/testvim
+
+	# Don't try to do the additional GUI test
+	emake -j1 VIMPROG=../testvim 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/.}
+
+	dobin src/gvim
+	dosym gvim /usr/bin/gvimdiff
+	dosym gvim /usr/bin/evim
+	dosym gvim /usr/bin/eview
+	dosym gvim /usr/bin/gview
+	dosym gvim /usr/bin/rgvim
+	dosym gvim /usr/bin/rgview
+
+	dodir /usr/share/man/man1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
+	echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
+	echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
+
+	insinto /etc/vim
+	newins "${FILESDIR}"/gvimrc-r1 gvimrc
+	eprefixify "${ED}"/etc/vim/gvimrc
+
+	newmenu "${FILESDIR}"/gvim.desktop-r2 gvim.desktop
+	doicon "${FILESDIR}"/gvim.xpm
+
+	# bash completion script, bug #79018.
+	newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
+
+	# 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
+
+	# Update fdo mime stuff, bug #78394
+	fdo-mime_mime_database_update
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		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."
+		echo
+	fi
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
+
+pkg_postrm() {
+	# Update documentation tags (from vim-doc.eclass)
+	update_vim_helptags
+
+	# Update fdo mime stuff, bug #78394
+	fdo-mime_mime_database_update
+
+	# Make convenience symlinks
+	update_vim_symlinks
+}
diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
index 8ff7859abff0..a4baa267f165 100644
--- a/app-editors/gvim/gvim-9999.ebuild
+++ b/app-editors/gvim/gvim-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.14 2014/02/06 07:10:44 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-9999.ebuild,v 1.15 2014/03/10 19:28:51 radhermit Exp $
 
 EAPI=5
 VIM_VERSION="7.4"
@@ -140,6 +140,8 @@ src_prepare() {
 		sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:"	\
 			"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
 	fi
+
+	epatch_user
 }
 
 src_configure() {