From 5d1d6d849781c684c3ad6088fbeae49ff5838bb5 Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Mon, 13 Oct 2014 21:13:31 +0000 Subject: Sync live/release changes. Package-Manager: portage-2.2.12/cvs/Linux x86_64 Manifest-Sign-Key: 0x4AB3E85B4F064CA3 --- app-editors/vim/ChangeLog | 6 +++++- app-editors/vim/Manifest | 20 ++++++++++---------- app-editors/vim/vim-7.4.475.ebuild | 4 +++- app-editors/vim/vim-9999.ebuild | 4 ++-- 4 files changed, 20 insertions(+), 14 deletions(-) (limited to 'app-editors/vim') diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog index 3db0b2c9475c..83b23fdf0a31 100644 --- a/app-editors/vim/ChangeLog +++ b/app-editors/vim/ChangeLog @@ -1,6 +1,10 @@ # 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.473 2014/10/13 21:09:46 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.474 2014/10/13 21:13:29 radhermit Exp $ + + 13 Oct 2014; Tim Harder vim-7.4.475.ebuild, + vim-9999.ebuild: + Sync live/release changes. *vim-7.4.475 (13 Oct 2014) diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index e25b29c7a190..959c041ffb3c 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -29,19 +29,19 @@ EBUILD vim-7.4.273.ebuild 11583 SHA256 8e18baa085586ae62719adf825fba0caf6c511472 EBUILD vim-7.4.326.ebuild 11597 SHA256 3bed65e619f768d0f80ef7f358c179f65f29c76226b8cdb191c40fe0e297c27a SHA512 f222d789a4b6d4beb4d554ebecf57c902fa8178fff40b8a92d6e11927c93805a93b78f57062db69d9dead7fe123f1ee47a960d469e324892d78b290c77fed9b8 WHIRLPOOL 660987d1825bb5530b3bda0cfa48972fb274276cea9e80b8c6f21f53730e0c6ee2d28d0d779052036aaf244280437fb7e1b08f3c210cb5647358a787a830a6f7 EBUILD vim-7.4.417.ebuild 11597 SHA256 90aa26e18489324e4d4ceda7e876033c5550c0f4fc15d98775814801af9faa3c SHA512 77b331806b6f393634f4191247b3d22e3d86b4b5376a478b58013e608b49017e3534ce31cb73272e345ecbc0d0d1dca644c9c5bb46a17899afe7864eada79ad4 WHIRLPOOL 5f5eed689bc411da17287e7e366cedc766304d7913251522b4a43a0f6feb7d6ef003b932103fcf88cad0824710c1d7504046161cf66daac8f1e8a859fab20212 EBUILD vim-7.4.430.ebuild 11942 SHA256 6ead57a07c4fb27de434d74f4874d12c6960c3a7bdb2ff6e2cc46d282776f541 SHA512 422cee85b8fa5fa79d782aa513334d11f51cf557fa3dc11a1082a66b3bc77fc1439161613ac2b0305030ba7f78b95cf1c8d03e00d61e3d9c11f1cc58bb291168 WHIRLPOOL 03fb88d2df1f848d0833982332bca1dbe2efa9c5f640b3d7fb98ed0ddac13c08782447beccc2eda46db2f78c56ab8cafed0a839bcaa754ec2bb6578dcfb57b14 -EBUILD vim-7.4.475.ebuild 11847 SHA256 fbffdcaf93a52777005e2fde759bda933e7325ad96129481a95bfd5f2a9b72d5 SHA512 6aa1d16dde375afb08ebdb15e718503c05e533cef649d92705cf343fe19e3911711a3a5b9746da3d3b010865c0309a0dd5e8cd5239276c41b1b32ceca4f38d10 WHIRLPOOL 68ba536ebc5b1e7a447d55f529873aa776841f772c57a2ab10c827868ae84d9987d26242b971331ff0a5e7e8e9d93c520d3d1642f070023ce6f7fdcbda16f813 +EBUILD vim-7.4.475.ebuild 11941 SHA256 0470b4bb5664ec08b48e3c1e742dc4a75d2f1c8b84bb9dcae1348ebf9e7dad5e SHA512 c7989f1998a11e26c1d2785dec36d13abeba83f353a08b1ee28f5a7d89b306ca5a5eb126c26205a3b6cceb440eb93f78fdf64daa4e3eafc339c38d8dc7518590 WHIRLPOOL 2bf372a28c69b0f708ce8992edfdbd67075f0ec6c608819750f53b7f9e7f07b8adc06bccea184a949ff5d88dd4799e6c03dcc958212df99b0578e72caabf83b9 EBUILD vim-7.4.52.ebuild 11778 SHA256 6c966f4d425286610619b546ea787222b4fdcdb619eefc017cc041c7eac16db9 SHA512 a4f7af2a712f6ac7f254b62597a25ce3b4e269d575531eae85df9d34fdb5315ccba8c1b5946d4eff210d3acc82781040f7309a176b79f25eb6886bf94bf0fe77 WHIRLPOOL c1e4bfa5d5ae42f9df88a237903190d7658eaaaaf37b05c5b4addbc56c3064556ba630e923a1b3037f5f7800b35287ce6b2cc2bd800099e079094b820e749545 -EBUILD vim-9999.ebuild 11940 SHA256 a41913c4f593f870b85a5707fbfa4eb5bb4892d1289d9cc823a15fb14b2b88b9 SHA512 04ae72432c1a5e014b17db6b71312ba6df388bebbf1de4f8ffbae900b48a108cdfb1d719d471aa157a08a4495b710a9725ee16f3ff86283a576ed0b40aaca9e6 WHIRLPOOL f7ba510e92312248703156099dd4107ce9e6c36bd99f2cfa42e9475a6271ba23b9350b07ae716946ae23252151f4558f1cf58c89eef7c82217823f3cbb78954f -MISC ChangeLog 63754 SHA256 24f0c81d4be33db9e9e6d3b1824ad53b2a20044fd7605d706e9488950051f9e7 SHA512 b352252a9c37eb9d66dcff77da3689f47f0245b37faa9d2e92c4d5cf54ac51a9926943e17c04105248f44e551c279aa29398785dc999eb7eae76cd2a27712ae3 WHIRLPOOL f81129d9fdd0640c610684b847ccf4ae3202d3d3e2cd63d66091d590dc2a3b613255ac3aa0fb33ad3f9e943eefdcc2bc7c44c19c522f0557d3016696e281ceb0 +EBUILD vim-9999.ebuild 11939 SHA256 0c2d109a6d03c90700cafaf8393cb15c36cb6e62041da8a0669b6ed3ef2c5b9a SHA512 823685d0b04b5ec585258b5678793f92388601bb7d9c181c38107c7771ec4db62cd852442a14c3a70ac9c7cc76d5237e212bc0f695b3ee066dc4cc5d85c62e38 WHIRLPOOL ec1dcdf1928a626a33bf3982884751520bec18511f15db918fce9dcd5f20af202d18dc2e5fc56f6973fdc0be9a216624fb6907380bb962eecf35abde412d518d +MISC ChangeLog 63872 SHA256 5f59f9eac5435a223054bccb73e158e935284cae703303e88cc62f7d4549c2aa SHA512 7e834e0cccd823223ff1aa616ac47b9ef4584b8235fdf5b7d4d4a096db59b4abf75f19ace4fc166dc32948148a663dfb0c2a7b1d5e39bfeddde6ef0aabf0071a WHIRLPOOL 30d15ff277d7b8da8dce2493f179ae166da3253347b1f569d05f488b6e39a30fefb579711855b9b8ce4c0f4ca2ec6da4f5344de3573c46454198d04060b5f981 MISC metadata.xml 611 SHA256 ca72f78f706a782fd43a809be03a88ae31684a281697c8668e08210084af78c0 SHA512 2566bee4ccd952830492057b31e0dd02743554748a798ef3a7df3bb44014162e5137d62fd915e28b5b4efe2c70d135baa3e0397cf60ad624ea587c3e2207bd6d WHIRLPOOL cb89aba309663ba96731451d92377a60b00347b7e8f76caac0b373459911e4b9980a015db1588750f433b5d490a0bb7f3000689ca8ea3dab5d1823d1873adec1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJUPD+yAAoJEEqz6FtPBkyjHaEH/247Aeo/PCpl1GNGNCn3hnnT -odILBp6J10Tg8jfeA1vtiopOhwEyGKd059590HP7bh/p9MjauBaDeQ9ytv9DKt/v -3Vb8HkR9QLbkH9sQ09x/OmMkdXZ6YTIL0vNGK924lF8UDF+GA8RDA+mIm5r1fbJk -nCoqCTe4vOL+Vkq1qm+ravIh8mWOsGHmK2tvVLq6BdLpFKFohD4iMeVU4vT7F/cs -pwc/4RPINaAKDIXXHYRrFV+t3Rb8Zzp0j98snrFT3ZWs+o7fGDUKQLwF2qCTpG43 -lpm6vbfQNXniGEz83uHQ0BAzHXdeKZsO537PmIhX2rVs2bwaB6lOOUcdmiFuOH0= -=EwNd +iQEcBAEBCAAGBQJUPECQAAoJEEqz6FtPBkyjMncH/1MNjmpTCW89+t92hTLdVlA9 +5tXG+AyGbSNSFZdB8WjyEgo1pUDjuO1I45vsy2i0/mDPaXxPa5F9D0UJYMvNyjJg +xxFXYiUV39B17JNeylAGrXe+/XD5Um/25UD3zdNkEQX9doOga1qvxsHJB4/8xqcC +d7CDg0qjmyBd9QHJAUEmD41hK6gfAdCp6OOfF1/VLnfdxw0V6JYluzpk4tOC9YgG +TDchrpGQsBpsO041ioQCmsdpWr7h0EPkc15VOtPDIzWQjTtIybkHwNFtGAvN6yal +GHi8V5BUicB6HQL2y1vqLEuXDup8QuSasjlelqlVjBazgQo8zAjDAFlqfEKTKUE= +=qGmj -----END PGP SIGNATURE----- diff --git a/app-editors/vim/vim-7.4.475.ebuild b/app-editors/vim/vim-7.4.475.ebuild index 265b5b7f841e..52b75dbaa59d 100644 --- a/app-editors/vim/vim-7.4.475.ebuild +++ b/app-editors/vim/vim-7.4.475.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/vim-7.4.475.ebuild,v 1.1 2014/10/13 21:09:46 radhermit Exp $ +# $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" @@ -333,6 +333,8 @@ src_install() { 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 diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild index 0abf8f242f73..8e1293fc1c43 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -1,10 +1,10 @@ # 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-9999.ebuild,v 1.15 2014/10/11 18:34:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-9999.ebuild,v 1.16 2014/10/13 21:13:29 radhermit Exp $ EAPI=5 VIM_VERSION="7.4" -PYTHON_COMPAT=( python{2_7,3_2,3_3,3_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 -- cgit v1.2.3-65-gdbad