From cfc3af94409d6934145fcc94f2007a0093475155 Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Wed, 14 Oct 2015 15:44:58 -0700 Subject: [PATCH] bump(app-editors/vim-core): sync with upstream --- .../app-editors/vim-core/ChangeLog | 17 +- .../app-editors/vim-core/Manifest | 37 +-- .../app-editors/vim-core/files/vimrc-r4 | 2 +- .../app-editors/vim-core/metadata.xml | 5 +- .../vim-core/vim-core-7.4.273.ebuild | 6 +- .../vim-core/vim-core-7.4.670.ebuild | 230 ------------------ .../vim-core/vim-core-7.4.712.ebuild | 230 ------------------ ...7.4.591.ebuild => vim-core-7.4.769.ebuild} | 25 +- ...7.4.622.ebuild => vim-core-7.4.827.ebuild} | 21 +- .../app-editors/vim-core/vim-core-9999.ebuild | 21 +- .../md5-cache/app-editors/vim-core-7.4.273 | 4 +- .../md5-cache/app-editors/vim-core-7.4.670 | 13 - .../md5-cache/app-editors/vim-core-7.4.712 | 13 - .../{vim-core-7.4.591 => vim-core-7.4.769} | 6 +- .../{vim-core-7.4.622 => vim-core-7.4.827} | 4 +- .../md5-cache/app-editors/vim-core-9999 | 6 +- 16 files changed, 68 insertions(+), 572 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.670.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.712.ebuild rename sdk_container/src/third_party/portage-stable/app-editors/vim-core/{vim-core-7.4.591.ebuild => vim-core-7.4.769.ebuild} (86%) rename sdk_container/src/third_party/portage-stable/app-editors/vim-core/{vim-core-7.4.622.ebuild => vim-core-7.4.827.ebuild} (91%) delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.670 delete mode 100644 sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.712 rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/{vim-core-7.4.591 => vim-core-7.4.769} (53%) rename sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/{vim-core-7.4.622 => vim-core-7.4.827} (80%) diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/ChangeLog b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/ChangeLog index beace3c767..be8f3b7a87 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/ChangeLog +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for app-editors/vim-core # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.464 2015/05/03 06:55:01 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.467 2015/07/08 01:50:53 radhermit Exp $ + +*vim-core-7.4.769 (08 Jul 2015) + + 08 Jul 2015; Tim Harder +vim-core-7.4.769.ebuild: + Version bump. + + 18 Jun 2015; Tim Harder vim-core-7.4.738.ebuild, + vim-core-9999.ebuild: + Use correct temporary build directory for live builds. + +*vim-core-7.4.738 (18 Jun 2015) + + 18 Jun 2015; Tim Harder +vim-core-7.4.738.ebuild, + vim-core-9999.ebuild: + Version bump, use github repo and tarball. *vim-core-7.4.712 (03 May 2015) diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest index 7a8899aa3b..9b6939cdc4 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/Manifest @@ -1,32 +1,15 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX vimrc-r4 6919 SHA256 9c59acc4c486a2aca5c6e5e297f13521a8ec57ebd540ec9ab846112fbb3e5c39 SHA512 f4ea9d2865e400d9b205ee8924b1152fa38434d1b73c67bcfceda18f737db8c8763701e12a3608465ef5409e74bfe6b5581a500577c826a16f3112bea49d63a9 WHIRLPOOL 7c7263db7b219cb845e15968c268c25614610696d6e5b6c508662b30640392aeb9f823ef4f74873ad2785dd354eb32ea612794ddab896f63bd4a24c53b38f182 +AUX vimrc-r4 6814 SHA256 1dd8550b737322fe6333611342a68ea5aad6ac0b3c6b1eed0b06b7ef8f2dbb7e SHA512 7b53ff22d5bdff077b307f2269eb61ae95feab137199184262893b478a7989d2a6db38dfe3502d1a09b10e2ecf6ce9b84a583cb9efb1186bd800762248ee42d3 WHIRLPOOL e02b8b6c95a42f91acc4caea304b6f8b223f21ea0d7d4275674d4c744374ebe4ffe1d1a7253347c213efccc057056f2f062121bcac4d3a1db7f775addb4b422a AUX xxd-completion 461 SHA256 580064ca4db3ac149fd89c743bd9946241220c211721f978f7a3ef97b3c171df SHA512 fc92426ea657e86ff765aa5a60736cdc70db938156dd8946db0a30c54d3f557bd8af421f1713bd750e779ccacd73f8f290a12a5e71ed48259fe1e6dece2de19c WHIRLPOOL 65324afb44612f1dd8f8850b7caa8524cff055d83aaad74c5b5030787463d0a95dbe0ce1b91c1a7b7f3e6954db3c0608ac2a2e1e75572af94e83758237b18447 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2 -DIST vim-7.4.591.patch.xz 805892 SHA256 6556595e75666b35cce58dcd585605e3d8910477761cee0fb34317d8969e0344 SHA512 fd98fa6e84fb1b6dc3c80f1e68694ee3711678e66234953962c6bad1aaf045c053c3824d25dd3df9842951e9c5e3ca630b65fafedc30fa6c31313822e3518968 WHIRLPOOL 47f5a75d2faec35460ee0af565437da275b2cd18259645456a76ba79d289d7b8f7392cde95d6cb5da5e2b4657043c11f5f363e99d1cb8457f83dfa884f5ab238 -DIST vim-7.4.622.patch.xz 816104 SHA256 f9d6624b7c8e5cbae749eff3f3bef30f7b10554fa04edf7fe3c85828b2b2e7a8 SHA512 544258cca6e46291743f95acba3dbc7844fddf0f579706cb7903f338b359b852cb4818238e7402e2b5413fa1a2ca9084246ffe39a7c23d29d14883594caa65c3 WHIRLPOOL 2b92e418892bc99c45e6b56592635804394e282c8f0959addf1a93434dccdfb06fa75f39f171624f484cc6a6420bfd6ea6a9d30b1b0a9694cb8a14cbf42e456e -DIST vim-7.4.670.patch.xz 845000 SHA256 5ffbb05466c68aea08fda6067a6a46e068beece3e26d33098964e5e472439ec0 SHA512 04e2c54fe4b6afba6f8b123ef24d63e898667c808083b91ea5affa6607ad1661b081fa0bd6536a5a2260dbd2b818e7942ef3896719ed82fcc071355239cba536 WHIRLPOOL 6b632e757101d4a54989bd85c0b6186326573794504dc0dd0ebf25e14fca5827b4a884677c380381359968687e40d4aa4ea27b42d5419538a0e843c4356227e6 -DIST vim-7.4.712.patch.xz 890304 SHA256 fa385439a55703715704b7163dc7ac4a53908d908bd456af432dd5618144c630 SHA512 639847f6c5e92c5838b259f83ffb8b473e8ad7142589e72e2dcd0d51a9e9d272c29ec4fd4239ee21bcf5599f3cc6cc790aee02fe2b860f7d79ce1d3a811a6dd0 WHIRLPOOL f9fe642fe68f324e2e68d1fcdda80d15e2eac6e7a246561728fa467c90e271cd83aab6b24adfec65977ab12cf0fd9ec5c1848bbfdc2342e63114f321234e95d9 +DIST vim-7.4.769.tar.gz 12189506 SHA256 d9b9c3af27161545a1e086e1ee9485432c0b1a792a1a59755f04ef94136c5042 SHA512 ce3917cc68dba8b69696eb43436f90347c68a687f1e8c4b2f15f4a232ff7ce1a581a61737042ec49548d78c5f010e55e4c40b051b1a2574bbc27146a9249f15c WHIRLPOOL 230304892e501ef9851bf9f0c9fc9c888bfe1ad2cd703bcd62c449866e28308027c37c7ed466966951ec9c5feb5d9ec82e843528861212cb40a5bf4cec6e8947 +DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988 WHIRLPOOL 23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed +DIST vim-7.4.827.tar.gz 12203128 SHA256 8920db8115c78d260abbb2757ebf0e1e64d6e2f989626435fffad1ef37a9760f SHA512 e055b71afdde347a45d78ff10a672be8b92d00dc0215febe39db8a0b44474a92b40f728cbbdbb2ceefbe6fa08683eed549880e07e6e97dd44c994b7f669a8e6a WHIRLPOOL e86e3b203c29ffd9b0b6536b7a997377bd0914cdb4f2b8775a4ae1fae2ab44f54b6c007e0d1bb08d8272aa8da596577729a9f004e7cf1f4914bf55c402b468e5 DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4 DIST vim-core-7.3-gentoo-patches-r4.tar.bz2 3015 SHA256 a4f61e4d0cd1848812f603e7f6b8a5304d13ac199f4e3061264cd3bec75a17c5 SHA512 0ba7a20dfdc2c24a92a4af5a6fe49a94d5d5c5e9111c42c4812d0cd52c26cc567acd2d7e74f66730afd3c4bc9f1667b0ad9c1f82f93d2844d8309b143f293676 WHIRLPOOL cec628c0f19971077677e667cc8903ea0a56041799a43907d47acc218fd9e0a6ea2a2a30999c74512fb36d233c6ac6d436f033684290155ff6ae70be5277bdbf DIST vim-patches-7.4.273.patch.bz2 506378 SHA256 065447179d22602315e2965d135cf9f1db4394ff5655520719f6338ff29e89ca SHA512 029a5cef758e4b201eabbc82458f3e1c3674582715a8c78a7270f3ecd57980b1cef66a0152526fd3505685c27c07f6e6742da48da9ad9546e3cfc2a5e7c11164 WHIRLPOOL 305322e991e9640b80147dd5ceac9dd6dae93a07610f807bbf01c0fdf37cba67ea41a1b2720c8a43da0161c57e0a522086f135efc712fb0106497a21288a872a -EBUILD vim-core-7.4.273.ebuild 7307 SHA256 b9ca490150e34c11c88c9c1689da45e88828ad45bab847d5052d79e44f909dba SHA512 71c9dd301b8035815ffedc0920c97edbd89c27f8380ed2192fa794e469dc50db385391305c1b7f162a472afb16895466ebdaec8422d6a35b6bd437b5c4519725 WHIRLPOOL 886dbc182aeec81d5a5457f11198b3965aef5e9f86961fbffba0d36db62c37465250ce9223b1e80cc9d962de4dd4de21563bf40ca6deadf07604410331f58a18 -EBUILD vim-core-7.4.591.ebuild 7280 SHA256 472bd4528d24e49a80030de2ed573d0d00773549f21aa424205e5880bb83f9f9 SHA512 5c94f9de098b5368b5c5a9c970ad71bc3968bbebfb5caafc7fa1d2e75a88d0ec3a06ec40ae479687dbbe30dfe001502875e4bea9cec1ebaf70d10f9f592780db WHIRLPOOL e9a1957a7335f9c376867395285a0bd5486ce5409b080e06ca30562769a9a49274ffce61cfb17373b74cbe1f43cb11fe4baf95a0d6dd42db6c34b78b473cdf2f -EBUILD vim-core-7.4.622.ebuild 7285 SHA256 9bb92aefe746df6bf35159f919beff75643f80416e79bf54283c35d737adf8b6 SHA512 467eefa8956789ec9b6efaf0958a0f4d16dfb3f1a6327009a7c021a3bf72648dae1a563d59addc097731d3f140a42a31e4cfe9822e36b221bbbf24df8da7abf8 WHIRLPOOL 4fe446cd52643a3efbc1847b6e64ea33aa58877e1d6b2b52f9a59807ff68d3c63f732dd9122d22f88c5dc41af0437359b8b1f1d2d63e0383fd983c82d4e5a28d -EBUILD vim-core-7.4.670.ebuild 7285 SHA256 3517c9615c476b15078f8602747241675a60a2284a56bdae3813ab2ee3cf8e25 SHA512 93bd5938d48c550705c048948c6de2f0eb0d17d737610bb0ae94bcb794a529a3d2fe50f5a8fa7442e193d7942082995cb70a4046752bd87c3ae85455ad74bb83 WHIRLPOOL faaa25c9c272ee036faa30d9158a537152a4673f930a8f5b9ce8106c315c09fa756292526c01a459f293dce5ff73c1d9296f12d43ee223b0029849599d7405dd -EBUILD vim-core-7.4.712.ebuild 7285 SHA256 b4c67239511ecffcdfcadf43b463db0d48a85c864998da4d8a856be32af40922 SHA512 efca85cd6ca6b88468652f2a65bc93e8378990428f5ff121482004dabf00e3c836ea567c13e1ab06bb8e7b252727b06109efb38d68359d308737362b0fa37aa7 WHIRLPOOL 83557ab477282cdb26096f7de67b871e4a3627dc9eeca2b649ac4cc0629304858b31ab50facf14deaa1f92d5c8bd0feeba46b7ca5ab084029d52c633d4d0cb8d -EBUILD vim-core-9999.ebuild 7281 SHA256 1c2447ac314f57288405a460470ef0f85b720991d8c70d1a17d00f5533f8597c SHA512 c045c66c69024d2ac0b6c6f3e48d4dad58496ad54ac30e27e6fb416bb6e397826b539cfd6abf118e7bd14a758b49eee6baa66f00af9e1f56f2b0b52cafacac55 WHIRLPOOL 8e192352ea56a0900526748f86231ddb7d6da42a3233bfb3df81559f7d8cd818118f159857d45f47d13f4af07f63f5306fb6bf57291daa10e5bb0cdd8eb5abc6 -MISC ChangeLog 63126 SHA256 233830915e6106ea2989134519603c90c4b678841f0fee22640ebb5d02b63f45 SHA512 9307b70aa882f47c111bab17b7747a3de142595e79618514aef5d63bb6261db2359630fc1e67928c388175b369fe646b8defc4d394101e8b6f3735046ecdf02a WHIRLPOOL 3fc9447ed61b7156187edcf481c2d38d4f9108b4c07419dec342d4456067dd0abda8da0037f7dd197707db4652386fb701199ed028be94da99c4c4ef819c779d -MISC metadata.xml 156 SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 SHA512 7dc1d902106e794e1a12bde5dcacb8b7143584cba9c61e72ac5728dd952663144c1b0efc949fbbc9fcec03b396b5e060e8263eaad7d70cd82d6d5b350c62f0c1 WHIRLPOOL 4381a5d144e783e5979d394720b32f7d95818a8571f748e72c5ece965c4e0375b1aec0c34f6f506a9f9fc255f1b69a220fdb74d1dbb8aabc92ec48afa44ab883 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQEcBAEBCAAGBQJVRcZEAAoJEEqz6FtPBkyjMnsH/RKdlHpLHrjA93/Nv8BXtrF8 -02SHQ6iY5HKX4LARLNwJ/4oboAPaRTjjdOnK7Z5vIjj0dIdSsUhoRRaVMV6MOROU -hc60CadrGr6c37C/jmkO9tHQkkuQaHEeG4LbinogTr3ebOi3AllZb13JLbXNNkVQ -uOH2445FHftg++YFI676tTRNwabITkSmMGKhovv3TK3hgS9ZR7dHf+dtvkiUqB/s -RAlvLz3Rk5+gwzPs0cjG6AJ4bzfOLvqjIYakpZmvvSekOR9EkRqLtjlx1EHlU5jo -9280RIMq5apSNog1QrGDYzOsc4+laVnngonuapi0kGKrw3hmwWUlemg2sRrg1Xc= -=byGu ------END PGP SIGNATURE----- +EBUILD vim-core-7.4.273.ebuild 7199 SHA256 14a9284b60a798e35ea7fdae9d2e02367ce18c160b1d6d71ab390c7cf7ad0cac SHA512 6161f03a4d645514b64357ccddad5b5b5ac98c578b24281b69c9cfcf49327876b3caa7b27e389e6bb7ea92f67be5b4cb375b919a3035cb7d23d285006fb121e1 WHIRLPOOL 17c8574c47ad3d100e3b846c135d1865bf16e21fed8dff03486a88f3765ff1872e6d4b61618a245e36b83ce2fa2c0bdefc9dd4d7851362356d1ae0f78e6e2caf +EBUILD vim-core-7.4.769.ebuild 6949 SHA256 34f390bd1d2726c0270d1cda662852fb436f0be1132c8806b1ed0253c1dfe87d SHA512 f2b96d9c8e24bd076a89be47489240c7fb809f8e056278303619129cc4ef5fdd6cc0ffc5457cf4f5252823932abf63e996caf04d2e4c9d921b4748c5b4be9a29 WHIRLPOOL b28d9056f852ce68f6b4339936940a8414f4960a12830a6bf0adab2dfd69a85de3318b53f8df917868e89f8f62d24da3995b2d26f12f95dfffa02b1a5a422b80 +EBUILD vim-core-7.4.827.ebuild 6931 SHA256 5bd7bb12860e5040c26e24f85ac67f6b69ecdb36cafb83d5157c661ed70db6f9 SHA512 73155a1c7109021bcadee594f46dce3788e890f5832fa83d652f7e285780db0edcff3110f16b06091d539cc483f235303c76d622838cabcc7312f4bfe4f83d93 WHIRLPOOL 130d077bdeda51e5f8a15b3385ec133c56418d4cf8ddf6ae93ce90578e5a498ddddf703120c3895c17d01e8a811e6046a74ff412be1176eae4c82a918bd27209 +EBUILD vim-core-9999.ebuild 6931 SHA256 5bd7bb12860e5040c26e24f85ac67f6b69ecdb36cafb83d5157c661ed70db6f9 SHA512 73155a1c7109021bcadee594f46dce3788e890f5832fa83d652f7e285780db0edcff3110f16b06091d539cc483f235303c76d622838cabcc7312f4bfe4f83d93 WHIRLPOOL 130d077bdeda51e5f8a15b3385ec133c56418d4cf8ddf6ae93ce90578e5a498ddddf703120c3895c17d01e8a811e6046a74ff412be1176eae4c82a918bd27209 +MISC ChangeLog 63585 SHA256 fcbf2e79dabadcfea37e13f90bd1a0da5060f06fa4676551bb5ae5c15b140d3b SHA512 f5431dc90fecae587bfe51915711f2cd117505a034dfa821d412e29898d2046feb7afa98762878b9554d602c4a24dce8807b75613ba7b01fb5747ebc5911fe54 WHIRLPOOL 2410b2440a6eecee31ac1f8b2ccfc0ebc5ffbaf043e95fb4734fd1e22fd4b29093296d1a6b63a8e6e66c5d845a3b300f7655c31e2397eddb2a582033796b680c +MISC metadata.xml 229 SHA256 d6387ed9613350e6f34fb9a184006b08fbc5d1d5bc8c913d018aebdb73915844 SHA512 74f1f56398c938de361205715732f4b6c80934d83053bfc9641c3d13688fbd2691d83d04e231cad2b7bac5882c95d8c022e04bc02689bbb31e9655da6a68ed2c WHIRLPOOL 1da3001e6cff7cd9025e231e431195e53db003e103379b6f7c7a591f5b08f97e228e5c7330b8390853c4cf0aeec6600ad7cd1870694d44797d03e77758ae061c diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vimrc-r4 b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vimrc-r4 index f54e5a39f9..07fffcceab 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vimrc-r4 +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/files/vimrc-r4 @@ -2,7 +2,7 @@ scriptencoding utf-8 " ^^ Please leave the above line at the start of the file. " Default configuration file for Vim -" $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/files/vimrc-r4,v 1.3 2010/04/15 19:30:32 darkside Exp $ +" $Id$ " Written by Aron Griffis " Modified by Ryan Phillips diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/metadata.xml b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/metadata.xml index 5fcb67350f..4728811b89 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/metadata.xml @@ -1,5 +1,8 @@ -vim + vim + + vim/vim + diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.273.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.273.ebuild index 25e093ee55..248ea57923 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.273.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.273.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/vim-core/vim-core-7.4.273.ebuild,v 1.10 2014/10/12 09:02:05 ago Exp $ +# $Id$ EAPI=5 VIM_VERSION="7.4" @@ -14,8 +14,8 @@ 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/${PN}-7.3-gentoo-patches-r4.tar.bz2 - http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}" + https://dev.gentoo.org/~radhermit/vim/${PN}-7.3-gentoo-patches-r4.tar.bz2 + https://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCHES}" 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 diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.670.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.670.ebuild deleted file mode 100644 index a1fc6eefe3..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.670.ebuild +++ /dev/null @@ -1,230 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.670.ebuild,v 1.1 2015/03/21 06:28:50 radhermit Exp $ - -EAPI=5 -VIM_VERSION="7.4" -inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix - -if [[ ${PV} == 9999* ]] ; then - inherit mercurial - EHG_REPO_URI="https://vim.googlecode.com/hg/" - EHG_PROJECT="vim" -else - VIM_ORG_PATCH="vim-${PV}.patch.xz" - SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 - http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH} - http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2" - 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 ~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 and gvim shared files" -HOMEPAGE="http://www.vim.org/" - -SLOT="0" -LICENSE="vim" -IUSE="nls acl minimal" - -DEPEND="sys-devel/autoconf" -PDEPEND="!minimal? ( app-vim/gentoo-syntax )" - -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 -} - -src_prepare() { - if [[ ${PV} != 9999* ]] ; then - if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then - # Apply any patches available from vim.org for this version - epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz} - 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/\> "$c" ; done - - # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]] ; then - sed -i -e \ - '/-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 - - # 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} \ - --enable-gui=no \ - --without-x \ - --disable-darwin \ - --disable-perlinterp \ - --disable-pythoninterp \ - --disable-rubyinterp \ - --disable-gpm \ - --disable-selinux \ - $(use_enable nls) \ - $(use_enable acl) \ - ${myconf} -} - -src_compile() { - # The following allows emake to be used - emake -j1 -C src auto/osdef.h objects - - emake tools -} - -src_test() { :; } - -src_install() { - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} - - dodir /usr/{bin,share/{man/man1,vim}} - cd src || die "cd src failed" - emake \ - installruntime \ - installmanlinks \ - installmacros \ - installtutor \ - installtutorbin \ - installtools \ - install-languages \ - install-icons \ - DESTDIR="${D}" \ - BINDIR="${EPREFIX}"/usr/bin \ - MANDIR="${EPREFIX}"/usr/share/man \ - DATADIR="${EPREFIX}"/usr/share - - keepdir ${vimfiles}/keymap - - # default vimrc is installed by vim-core since it applies to - # both vim and gvim - insinto /etc/vim/ - newins "${FILESDIR}"/vimrc-r4 vimrc - eprefixify "${ED}"/etc/vim/vimrc - - if use minimal ; then - # To save space, install only a subset of the files. - # Helps minimalize the livecd, bug 65144. - eshopts_push -s extglob - - rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} - rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor} - rm "${ED}"/usr/bin/vimtutor - - local keep_colors="default" - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) - - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" - # tinkering with the next line might make bad things happen ... - keep_syntax="${keep_syntax}|syntax|nosyntax|synload" - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) - - eshopts_pop - fi - - # These files might have slight security issues, so we won't - # install them. See bug #77841. We don't mind if these don't - # exist. - rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null - - newbashcomp "${FILESDIR}"/xxd-completion xxd - - # 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 -} - -pkg_postrm() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags -} diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.712.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.712.ebuild deleted file mode 100644 index fb8c575c37..0000000000 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.712.ebuild +++ /dev/null @@ -1,230 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.712.ebuild,v 1.1 2015/05/03 06:55:01 radhermit Exp $ - -EAPI=5 -VIM_VERSION="7.4" -inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix - -if [[ ${PV} == 9999* ]] ; then - inherit mercurial - EHG_REPO_URI="https://vim.googlecode.com/hg/" - EHG_PROJECT="vim" -else - VIM_ORG_PATCH="vim-${PV}.patch.xz" - SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 - http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH} - http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2" - 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 ~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 and gvim shared files" -HOMEPAGE="http://www.vim.org/" - -SLOT="0" -LICENSE="vim" -IUSE="nls acl minimal" - -DEPEND="sys-devel/autoconf" -PDEPEND="!minimal? ( app-vim/gentoo-syntax )" - -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 -} - -src_prepare() { - if [[ ${PV} != 9999* ]] ; then - if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then - # Apply any patches available from vim.org for this version - epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz} - 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/\> "$c" ; done - - # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]] ; then - sed -i -e \ - '/-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 - - # 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} \ - --enable-gui=no \ - --without-x \ - --disable-darwin \ - --disable-perlinterp \ - --disable-pythoninterp \ - --disable-rubyinterp \ - --disable-gpm \ - --disable-selinux \ - $(use_enable nls) \ - $(use_enable acl) \ - ${myconf} -} - -src_compile() { - # The following allows emake to be used - emake -j1 -C src auto/osdef.h objects - - emake tools -} - -src_test() { :; } - -src_install() { - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} - - dodir /usr/{bin,share/{man/man1,vim}} - cd src || die "cd src failed" - emake \ - installruntime \ - installmanlinks \ - installmacros \ - installtutor \ - installtutorbin \ - installtools \ - install-languages \ - install-icons \ - DESTDIR="${D}" \ - BINDIR="${EPREFIX}"/usr/bin \ - MANDIR="${EPREFIX}"/usr/share/man \ - DATADIR="${EPREFIX}"/usr/share - - keepdir ${vimfiles}/keymap - - # default vimrc is installed by vim-core since it applies to - # both vim and gvim - insinto /etc/vim/ - newins "${FILESDIR}"/vimrc-r4 vimrc - eprefixify "${ED}"/etc/vim/vimrc - - if use minimal ; then - # To save space, install only a subset of the files. - # Helps minimalize the livecd, bug 65144. - eshopts_push -s extglob - - rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} - rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor} - rm "${ED}"/usr/bin/vimtutor - - local keep_colors="default" - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) - - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" - # tinkering with the next line might make bad things happen ... - keep_syntax="${keep_syntax}|syntax|nosyntax|synload" - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) - - eshopts_pop - fi - - # These files might have slight security issues, so we won't - # install them. See bug #77841. We don't mind if these don't - # exist. - rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null - - newbashcomp "${FILESDIR}"/xxd-completion xxd - - # 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 -} - -pkg_postrm() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags -} diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.591.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.769.ebuild similarity index 86% rename from sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.591.ebuild rename to sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.769.ebuild index a9395ae97c..6e00fc5245 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.591.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.769.ebuild @@ -1,21 +1,21 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.591.ebuild,v 1.2 2015/02/28 22:26:04 tgall Exp $ +# $Id$ EAPI=5 VIM_VERSION="7.4" inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix +MY_PV=${PV//./-} + if [[ ${PV} == 9999* ]] ; then - inherit mercurial - EHG_REPO_URI="https://vim.googlecode.com/hg/" - EHG_PROJECT="vim" + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${MY_PV} else - VIM_ORG_PATCH="vim-${PV}.patch.xz" - SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 - http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH} - http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2" - 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 ~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" + SRC_URI="https://github.com/vim/vim/archive/v${MY_PV}.tar.gz -> vim-${PV}.tar.gz + https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2" + 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 ~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 and gvim shared files" @@ -28,7 +28,7 @@ IUSE="nls acl minimal" DEPEND="sys-devel/autoconf" PDEPEND="!minimal? ( app-vim/gentoo-syntax )" -S=${WORKDIR}/vim${VIM_VERSION/.} +S=${WORKDIR}/vim-${MY_PV} pkg_setup() { # people with broken alphabets run into trouble. bug 82186. @@ -42,11 +42,6 @@ pkg_setup() { src_prepare() { if [[ ${PV} != 9999* ]] ; then - if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then - # Apply any patches available from vim.org for this version - epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz} - fi - if [[ -d "${WORKDIR}"/patches/ ]]; then # Gentoo patches to fix runtime issues, cross-compile errors, etc EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.622.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.827.ebuild similarity index 91% rename from sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.622.ebuild rename to sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.827.ebuild index 1adf82914a..145f7d0599 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.622.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-7.4.827.ebuild @@ -1,20 +1,18 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.4.622.ebuild,v 1.1 2015/02/07 02:15:32 radhermit Exp $ +# $Id$ EAPI=5 VIM_VERSION="7.4" inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix if [[ ${PV} == 9999* ]] ; then - inherit mercurial - EHG_REPO_URI="https://vim.googlecode.com/hg/" - EHG_PROJECT="vim" + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} else - VIM_ORG_PATCH="vim-${PV}.patch.xz" - SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 - http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH} - http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2" + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz + https://dev.gentoo.org/~radhermit/vim/vim-7.4.827-gentoo-patches.tar.bz2" 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 ~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 @@ -28,7 +26,7 @@ IUSE="nls acl minimal" DEPEND="sys-devel/autoconf" PDEPEND="!minimal? ( app-vim/gentoo-syntax )" -S=${WORKDIR}/vim${VIM_VERSION/.} +S=${WORKDIR}/vim-${PV} pkg_setup() { # people with broken alphabets run into trouble. bug 82186. @@ -42,11 +40,6 @@ pkg_setup() { src_prepare() { if [[ ${PV} != 9999* ]] ; then - if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then - # Apply any patches available from vim.org for this version - epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz} - fi - if [[ -d "${WORKDIR}"/patches/ ]]; then # Gentoo patches to fix runtime issues, cross-compile errors, etc EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ diff --git a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9999.ebuild index a787142c0b..145f7d0599 100644 --- a/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-editors/vim-core/vim-core-9999.ebuild @@ -1,20 +1,18 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-9999.ebuild,v 1.14 2015/01/26 23:25:08 radhermit Exp $ +# $Id$ EAPI=5 VIM_VERSION="7.4" inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix if [[ ${PV} == 9999* ]] ; then - inherit mercurial - EHG_REPO_URI="https://vim.googlecode.com/hg/" - EHG_PROJECT="vim" + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} else - VIM_ORG_PATCH="vim-${PV}.patch.xz" - SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2 - http://dev.gentoo.org/~radhermit/vim/${VIM_ORG_PATCH} - http://dev.gentoo.org/~radhermit/vim/vim-${PV}-gentoo-patches.tar.bz2" + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz + https://dev.gentoo.org/~radhermit/vim/vim-7.4.827-gentoo-patches.tar.bz2" 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 ~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 @@ -28,7 +26,7 @@ IUSE="nls acl minimal" DEPEND="sys-devel/autoconf" PDEPEND="!minimal? ( app-vim/gentoo-syntax )" -S=${WORKDIR}/vim${VIM_VERSION/.} +S=${WORKDIR}/vim-${PV} pkg_setup() { # people with broken alphabets run into trouble. bug 82186. @@ -42,11 +40,6 @@ pkg_setup() { src_prepare() { if [[ ${PV} != 9999* ]] ; then - if [[ -f "${WORKDIR}"/${VIM_ORG_PATCH%.xz} ]] ; then - # Apply any patches available from vim.org for this version - epatch "${WORKDIR}"/${VIM_ORG_PATCH%.xz} - fi - if [[ -d "${WORKDIR}"/patches/ ]]; then # Gentoo patches to fix runtime issues, cross-compile errors, etc EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \ diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.273 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.273 index ec160016c6..55de9c67fb 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.273 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.273 @@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~pp LICENSE=vim PDEPEND=!minimal? ( app-vim/gentoo-syntax ) SLOT=0 -SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-core-7.3-gentoo-patches-r4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-patches-7.4.273.patch.bz2 +SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vim-core-7.3-gentoo-patches-r4.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vim-patches-7.4.273.patch.bz2 _eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f vim-doc 1c18baeec98cec3287524cbf2fee2bd2 -_md5_=5db477a682a703904767ee7b29fed837 +_md5_=0458361a4c83e260aaba73e66ae1d190 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.670 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.670 deleted file mode 100644 index d1afc96a8c..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.670 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test -DEPEND=sys-devel/autoconf -DESCRIPTION=vim and gvim shared files -EAPI=5 -HOMEPAGE=http://www.vim.org/ -IUSE=nls acl minimal -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 ~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 -LICENSE=vim -PDEPEND=!minimal? ( app-vim/gentoo-syntax ) -SLOT=0 -SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-7.4.670.patch.xz http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2 -_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f vim-doc 1c18baeec98cec3287524cbf2fee2bd2 -_md5_=6e997bbe3263446c3f9f6954ad1f124e diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.712 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.712 deleted file mode 100644 index 24d80cf86c..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.712 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install postinst postrm prepare setup test -DEPEND=sys-devel/autoconf -DESCRIPTION=vim and gvim shared files -EAPI=5 -HOMEPAGE=http://www.vim.org/ -IUSE=nls acl minimal -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 ~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 -LICENSE=vim -PDEPEND=!minimal? ( app-vim/gentoo-syntax ) -SLOT=0 -SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-7.4.712.patch.xz http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2 -_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f vim-doc 1c18baeec98cec3287524cbf2fee2bd2 -_md5_=864b9cbb408d04a563d5c006dc23ac11 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.591 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.769 similarity index 53% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.591 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.769 index 5bcb269825..78729735bc 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.591 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.769 @@ -4,10 +4,10 @@ DESCRIPTION=vim and gvim shared files EAPI=5 HOMEPAGE=http://www.vim.org/ IUSE=nls acl minimal -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 ~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 +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 ~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 LICENSE=vim PDEPEND=!minimal? ( app-vim/gentoo-syntax ) SLOT=0 -SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-7.4.591.patch.xz http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2 +SRC_URI=https://github.com/vim/vim/archive/v7-4-769.tar.gz -> vim-7.4.769.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2 _eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f vim-doc 1c18baeec98cec3287524cbf2fee2bd2 -_md5_=d51719b52b64c9eb6b1966c1a496ae25 +_md5_=d82e915a09f53b1f0f23d72bfcf23c7a diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.622 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.827 similarity index 80% rename from sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.622 rename to sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.827 index 55992666d9..dc8f30ac6b 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.622 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-7.4.827 @@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh LICENSE=vim PDEPEND=!minimal? ( app-vim/gentoo-syntax ) SLOT=0 -SRC_URI=ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 http://dev.gentoo.org/~radhermit/vim/vim-7.4.622.patch.xz http://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2 +SRC_URI=https://github.com/vim/vim/archive/v7.4.827.tar.gz -> vim-7.4.827.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-7.4.827-gentoo-patches.tar.bz2 _eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 multilib 62927b3db3a589b0806255f3a002d5d3 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f vim-doc 1c18baeec98cec3287524cbf2fee2bd2 -_md5_=85ae4a07afa8f8e8960eda3cab8e753f +_md5_=154ba5988cc7448a023ea86321216a2c diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-9999 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-9999 index bb20f1572b..4e3e46fde1 100644 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-9999 +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-editors/vim-core-9999 @@ -1,5 +1,5 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack -DEPEND=sys-devel/autoconf dev-vcs/mercurial +DEPEND=sys-devel/autoconf >=dev-vcs/git-1.8.2.1 DESCRIPTION=vim and gvim shared files EAPI=5 HOMEPAGE=http://www.vim.org/ @@ -7,5 +7,5 @@ IUSE=nls acl minimal LICENSE=vim PDEPEND=!minimal? ( app-vim/gentoo-syntax ) SLOT=0 -_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 mercurial 2fbda5894dda6392b71334ee9a92de0b multilib 62927b3db3a589b0806255f3a002d5d3 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f vim-doc 1c18baeec98cec3287524cbf2fee2bd2 -_md5_=dfe95df91fa05a234aa13919fa239d9e +_eclasses_=bash-completion-r1 c8399c7c7ecbcf7ed6e5bd3abb3d4af3 eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 git-r3 ab80045e5d080584334f33013f4df21d multilib 62927b3db3a589b0806255f3a002d5d3 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f vim-doc 1c18baeec98cec3287524cbf2fee2bd2 +_md5_=154ba5988cc7448a023ea86321216a2c