summaryrefslogtreecommitdiff
path: root/app-vim
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 21:03:06 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 21:03:06 +0100
commit8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-vim
parent30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
gentoo resync : 14.07.2018
Diffstat (limited to 'app-vim')
-rw-r--r--app-vim/Manifest.gzbin43731 -> 32609 bytes
-rw-r--r--app-vim/ackvim-1.0.9-r112
-rw-r--r--app-vim/ackvim/Manifest3
-rw-r--r--app-vim/ackvim/ackvim-1.0.9-r1.ebuild25
-rw-r--r--app-vim/ackvim/metadata.xml15
-rw-r--r--app-vim/airline-0.912
-rw-r--r--app-vim/airline-999910
-rw-r--r--app-vim/airline-themes-999910
-rw-r--r--app-vim/airline-themes/Manifest2
-rw-r--r--app-vim/airline-themes/airline-themes-9999.ebuild16
-rw-r--r--app-vim/airline-themes/metadata.xml14
-rw-r--r--app-vim/airline/Manifest4
-rw-r--r--app-vim/airline/airline-0.9.ebuild29
-rw-r--r--app-vim/airline/airline-9999.ebuild29
-rw-r--r--app-vim/airline/metadata.xml11
-rw-r--r--app-vim/align-4312
-rw-r--r--app-vim/align/Manifest3
-rw-r--r--app-vim/align/align-43.ebuild15
-rw-r--r--app-vim/align/metadata.xml8
-rw-r--r--app-vim/alternate-2.18-r112
-rw-r--r--app-vim/alternate-2.18-r212
-rw-r--r--app-vim/alternate/Manifest7
-rw-r--r--app-vim/alternate/alternate-2.18-r1.ebuild27
-rw-r--r--app-vim/alternate/alternate-2.18-r2.ebuild35
-rw-r--r--app-vim/alternate/files/alternate-2.18-hh-cc-alternation.patch18
-rw-r--r--app-vim/alternate/metadata.xml11
-rw-r--r--app-vim/ansiesc-1212
-rw-r--r--app-vim/ansiesc/Manifest3
-rw-r--r--app-vim/ansiesc/ansiesc-12.ebuild15
-rw-r--r--app-vim/ansiesc/metadata.xml8
-rw-r--r--app-vim/ant_menu-0.5.7.1-r112
-rw-r--r--app-vim/ant_menu/Manifest3
-rw-r--r--app-vim/ant_menu/ant_menu-0.5.7.1-r1.ebuild15
-rw-r--r--app-vim/ant_menu/metadata.xml8
-rw-r--r--app-vim/autoalign-1412
-rw-r--r--app-vim/autoalign/Manifest3
-rw-r--r--app-vim/autoalign/autoalign-14.ebuild31
-rw-r--r--app-vim/autoalign/metadata.xml8
-rw-r--r--app-vim/automatictexplugin-12.5-r114
-rw-r--r--app-vim/automatictexplugin/Manifest3
-rw-r--r--app-vim/automatictexplugin/automatictexplugin-12.5-r1.ebuild34
-rw-r--r--app-vim/automatictexplugin/metadata.xml11
-rw-r--r--app-vim/bash-support-4.2.112
-rw-r--r--app-vim/bash-support/Manifest3
-rw-r--r--app-vim/bash-support/bash-support-4.2.1.ebuild20
-rw-r--r--app-vim/bash-support/metadata.xml8
-rw-r--r--app-vim/bnf-syntax-1.2-r212
-rw-r--r--app-vim/bnf-syntax/Manifest3
-rw-r--r--app-vim/bnf-syntax/bnf-syntax-1.2-r2.ebuild21
-rw-r--r--app-vim/bnf-syntax/metadata.xml8
-rw-r--r--app-vim/brainfuck-syntax-1.0.212
-rw-r--r--app-vim/brainfuck-syntax-1.0.312
-rw-r--r--app-vim/brainfuck-syntax/Manifest5
-rw-r--r--app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild15
-rw-r--r--app-vim/brainfuck-syntax/brainfuck-syntax-1.0.3.ebuild12
-rw-r--r--app-vim/brainfuck-syntax/metadata.xml8
-rw-r--r--app-vim/breakpts-4.0-r112
-rw-r--r--app-vim/breakpts/Manifest3
-rw-r--r--app-vim/breakpts/breakpts-4.0-r1.ebuild23
-rw-r--r--app-vim/breakpts/metadata.xml8
-rw-r--r--app-vim/bufexplorer-7.4.1812
-rw-r--r--app-vim/bufexplorer-7.4.1912
-rw-r--r--app-vim/bufexplorer-999910
-rw-r--r--app-vim/bufexplorer/Manifest6
-rw-r--r--app-vim/bufexplorer/bufexplorer-7.4.18.ebuild19
-rw-r--r--app-vim/bufexplorer/bufexplorer-7.4.19.ebuild19
-rw-r--r--app-vim/bufexplorer/bufexplorer-9999.ebuild25
-rw-r--r--app-vim/bufexplorer/metadata.xml11
-rw-r--r--app-vim/c-support-6.012
-rw-r--r--app-vim/c-support-6.112
-rw-r--r--app-vim/c-support-6.1.112
-rw-r--r--app-vim/c-support/Manifest7
-rw-r--r--app-vim/c-support/c-support-6.0.ebuild21
-rw-r--r--app-vim/c-support/c-support-6.1.1.ebuild20
-rw-r--r--app-vim/c-support/c-support-6.1.ebuild20
-rw-r--r--app-vim/c-support/metadata.xml8
-rw-r--r--app-vim/calendar-2.912
-rw-r--r--app-vim/calendar/Manifest3
-rw-r--r--app-vim/calendar/calendar-2.9.ebuild13
-rw-r--r--app-vim/calendar/metadata.xml8
-rw-r--r--app-vim/cctree-1.61-r112
-rw-r--r--app-vim/cctree/Manifest3
-rw-r--r--app-vim/cctree/cctree-1.61-r1.ebuild28
-rw-r--r--app-vim/cctree/metadata.xml11
-rw-r--r--app-vim/cecutil-1712
-rw-r--r--app-vim/cecutil/Manifest3
-rw-r--r--app-vim/cecutil/cecutil-17.ebuild13
-rw-r--r--app-vim/cecutil/metadata.xml8
-rw-r--r--app-vim/cfengine-syntax-2014101912
-rw-r--r--app-vim/cfengine-syntax/Manifest3
-rw-r--r--app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild14
-rw-r--r--app-vim/cfengine-syntax/metadata.xml16
-rw-r--r--app-vim/checkattach-0.1712
-rw-r--r--app-vim/checkattach/Manifest3
-rw-r--r--app-vim/checkattach/checkattach-0.17.ebuild13
-rw-r--r--app-vim/checkattach/metadata.xml11
-rw-r--r--app-vim/closetag-0.9.1-r112
-rw-r--r--app-vim/closetag/Manifest3
-rw-r--r--app-vim/closetag/closetag-0.9.1-r1.ebuild16
-rw-r--r--app-vim/closetag/metadata.xml8
-rw-r--r--app-vim/cmdalias-3.0-r112
-rw-r--r--app-vim/cmdalias/Manifest3
-rw-r--r--app-vim/cmdalias/cmdalias-3.0-r1.ebuild16
-rw-r--r--app-vim/cmdalias/metadata.xml8
-rw-r--r--app-vim/colorschemes-20140623-r112
-rw-r--r--app-vim/colorschemes/Manifest3
-rw-r--r--app-vim/colorschemes/colorschemes-20140623-r1.ebuild29
-rw-r--r--app-vim/colorschemes/metadata.xml8
-rw-r--r--app-vim/colorsel-2010040612
-rw-r--r--app-vim/colorsel/Manifest3
-rw-r--r--app-vim/colorsel/colorsel-20100406.ebuild19
-rw-r--r--app-vim/colorsel/metadata.xml8
-rw-r--r--app-vim/colorv-3.0.2-r114
-rw-r--r--app-vim/colorv/Manifest3
-rw-r--r--app-vim/colorv/colorv-3.0.2-r1.ebuild34
-rw-r--r--app-vim/colorv/metadata.xml11
-rw-r--r--app-vim/command-t-5.0.114
-rw-r--r--app-vim/command-t-5.0.214
-rw-r--r--app-vim/command-t/Manifest5
-rw-r--r--app-vim/command-t/command-t-5.0.1.ebuild48
-rw-r--r--app-vim/command-t/command-t-5.0.2.ebuild48
-rw-r--r--app-vim/command-t/metadata.xml11
-rw-r--r--app-vim/conque-2.312
-rw-r--r--app-vim/conque-2.3-r114
-rw-r--r--app-vim/conque/Manifest4
-rw-r--r--app-vim/conque/conque-2.3-r1.ebuild25
-rw-r--r--app-vim/conque/conque-2.3.ebuild22
-rw-r--r--app-vim/conque/metadata.xml11
-rw-r--r--app-vim/cream-0.4313
-rw-r--r--app-vim/cream/Manifest10
-rw-r--r--app-vim/cream/cream-0.43.ebuild158
-rw-r--r--app-vim/cream/files/cream-0.30-ebuilds.patch12
-rw-r--r--app-vim/cream/files/enhancedcommentify-2.1-extra-ft-support.patch13
-rw-r--r--app-vim/cream/files/enhancedcommentify-2.1-gentooisms.patch23
-rw-r--r--app-vim/cream/metadata.xml11
-rw-r--r--app-vim/csound-syntax-2016080412
-rw-r--r--app-vim/csound-syntax/Manifest4
-rw-r--r--app-vim/csound-syntax/csound-syntax-20160804.ebuild20
-rw-r--r--app-vim/csound-syntax/files/csound-syntax-20160804-doc.patch9
-rw-r--r--app-vim/csound-syntax/metadata.xml11
-rw-r--r--app-vim/csscomplete-1.012
-rw-r--r--app-vim/csscomplete/Manifest3
-rw-r--r--app-vim/csscomplete/csscomplete-1.0.ebuild25
-rw-r--r--app-vim/csscomplete/metadata.xml14
-rw-r--r--app-vim/csv-0.31-r112
-rw-r--r--app-vim/csv/Manifest3
-rw-r--r--app-vim/csv/csv-0.31-r1.ebuild13
-rw-r--r--app-vim/csv/metadata.xml8
-rw-r--r--app-vim/ctrlp-1.8012
-rw-r--r--app-vim/ctrlp-1.80_p2018041812
-rw-r--r--app-vim/ctrlp/Manifest5
-rw-r--r--app-vim/ctrlp/ctrlp-1.80.ebuild16
-rw-r--r--app-vim/ctrlp/ctrlp-1.80_p20180418.ebuild17
-rw-r--r--app-vim/ctrlp/metadata.xml11
-rw-r--r--app-vim/ctx-1.17-r112
-rw-r--r--app-vim/ctx/Manifest3
-rw-r--r--app-vim/ctx/ctx-1.17-r1.ebuild19
-rw-r--r--app-vim/ctx/metadata.xml8
-rw-r--r--app-vim/curcmdmode-1.0-r112
-rw-r--r--app-vim/curcmdmode/Manifest3
-rw-r--r--app-vim/curcmdmode/curcmdmode-1.0-r1.ebuild18
-rw-r--r--app-vim/curcmdmode/metadata.xml8
-rw-r--r--app-vim/cvsmenu-1.147-r112
-rw-r--r--app-vim/cvsmenu/Manifest3
-rw-r--r--app-vim/cvsmenu/cvsmenu-1.147-r1.ebuild18
-rw-r--r--app-vim/cvsmenu/metadata.xml8
-rw-r--r--app-vim/dbext-26.0012
-rw-r--r--app-vim/dbext/Manifest3
-rw-r--r--app-vim/dbext/dbext-26.00.ebuild13
-rw-r--r--app-vim/dbext/metadata.xml8
-rw-r--r--app-vim/detectindent-1.0_p2015090812
-rw-r--r--app-vim/detectindent/Manifest3
-rw-r--r--app-vim/detectindent/detectindent-1.0_p20150908.ebuild21
-rw-r--r--app-vim/detectindent/metadata.xml15
-rw-r--r--app-vim/dhcpd-syntax-20030825-r112
-rw-r--r--app-vim/dhcpd-syntax/Manifest4
-rw-r--r--app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild15
-rw-r--r--app-vim/dhcpd-syntax/files/dhcpd-syntax-20030825-multiple-addresses.patch12
-rw-r--r--app-vim/dhcpd-syntax/metadata.xml13
-rw-r--r--app-vim/diffchar-7.0112
-rw-r--r--app-vim/diffchar-7.212
-rw-r--r--app-vim/diffchar/Manifest5
-rw-r--r--app-vim/diffchar/diffchar-7.01.ebuild13
-rw-r--r--app-vim/diffchar/diffchar-7.2.ebuild13
-rw-r--r--app-vim/diffchar/metadata.xml11
-rw-r--r--app-vim/dirdiff-1.1.512
-rw-r--r--app-vim/dirdiff/Manifest3
-rw-r--r--app-vim/dirdiff/dirdiff-1.1.5.ebuild15
-rw-r--r--app-vim/dirdiff/metadata.xml8
-rw-r--r--app-vim/easy-align-2.10.012
-rw-r--r--app-vim/easy-align/Manifest3
-rw-r--r--app-vim/easy-align/easy-align-2.10.0.ebuild23
-rw-r--r--app-vim/easy-align/metadata.xml11
-rw-r--r--app-vim/easytags-3.1114
-rw-r--r--app-vim/easytags/Manifest4
-rw-r--r--app-vim/easytags/easytags-3.11.ebuild42
-rw-r--r--app-vim/easytags/files/easytags-3.11-fix-ctags-detection.patch54
-rw-r--r--app-vim/easytags/metadata.xml11
-rw-r--r--app-vim/ebnf-syntax-1.1-r212
-rw-r--r--app-vim/ebnf-syntax/Manifest3
-rw-r--r--app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild22
-rw-r--r--app-vim/ebnf-syntax/metadata.xml8
-rw-r--r--app-vim/editorconfig-vim-0.3.3-r214
-rw-r--r--app-vim/editorconfig-vim/Manifest6
-rw-r--r--app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild40
-rw-r--r--app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-fixes.patch92
-rw-r--r--app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-max-line-length-off.patch20
-rw-r--r--app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-python3.patch213
-rw-r--r--app-vim/editorconfig-vim/metadata.xml14
-rw-r--r--app-vim/emmet-0.8512
-rw-r--r--app-vim/emmet/Manifest3
-rw-r--r--app-vim/emmet/emmet-0.85.ebuild13
-rw-r--r--app-vim/emmet/metadata.xml8
-rw-r--r--app-vim/enhancedcommentify-2.3-r112
-rw-r--r--app-vim/enhancedcommentify/Manifest5
-rw-r--r--app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild27
-rw-r--r--app-vim/enhancedcommentify/files/enhancedcommentify-2.1-extra-ft-support.patch13
-rw-r--r--app-vim/enhancedcommentify/files/enhancedcommentify-2.1-gentooisms.patch23
-rw-r--r--app-vim/enhancedcommentify/metadata.xml8
-rw-r--r--app-vim/errsign-0.1-r112
-rw-r--r--app-vim/errsign/Manifest3
-rw-r--r--app-vim/errsign/errsign-0.1-r1.ebuild18
-rw-r--r--app-vim/errsign/metadata.xml8
-rw-r--r--app-vim/eruby-syntax-2.0-r212
-rw-r--r--app-vim/eruby-syntax/Manifest3
-rw-r--r--app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild18
-rw-r--r--app-vim/eruby-syntax/metadata.xml8
-rw-r--r--app-vim/eselect-syntax-2007050612
-rw-r--r--app-vim/eselect-syntax/Manifest3
-rw-r--r--app-vim/eselect-syntax/eselect-syntax-20070506.ebuild21
-rw-r--r--app-vim/eselect-syntax/metadata.xml8
-rw-r--r--app-vim/exheres-syntax-2009031012
-rw-r--r--app-vim/exheres-syntax-9999999910
-rw-r--r--app-vim/exheres-syntax/Manifest4
-rw-r--r--app-vim/exheres-syntax/exheres-syntax-20090310.ebuild18
-rw-r--r--app-vim/exheres-syntax/exheres-syntax-99999999.ebuild22
-rw-r--r--app-vim/exheres-syntax/metadata.xml8
-rw-r--r--app-vim/extra-syntax-4-r211
-rw-r--r--app-vim/extra-syntax/Manifest2
-rw-r--r--app-vim/extra-syntax/extra-syntax-4-r2.ebuild37
-rw-r--r--app-vim/extra-syntax/metadata.xml8
-rw-r--r--app-vim/ferret-1.412
-rw-r--r--app-vim/ferret-1.4-r112
-rw-r--r--app-vim/ferret-1.512
-rw-r--r--app-vim/ferret-2.012
-rw-r--r--app-vim/ferret-3.012
-rw-r--r--app-vim/ferret/Manifest10
-rw-r--r--app-vim/ferret/ferret-1.4-r1.ebuild23
-rw-r--r--app-vim/ferret/ferret-1.4.ebuild21
-rw-r--r--app-vim/ferret/ferret-1.5.ebuild23
-rw-r--r--app-vim/ferret/ferret-2.0.ebuild22
-rw-r--r--app-vim/ferret/ferret-3.0.ebuild22
-rw-r--r--app-vim/ferret/metadata.xml15
-rw-r--r--app-vim/fluxbox-syntax-1.512
-rw-r--r--app-vim/fluxbox-syntax/Manifest3
-rw-r--r--app-vim/fluxbox-syntax/fluxbox-syntax-1.5.ebuild31
-rw-r--r--app-vim/fluxbox-syntax/metadata.xml8
-rw-r--r--app-vim/foldutil-3.0-r112
-rw-r--r--app-vim/foldutil/Manifest3
-rw-r--r--app-vim/foldutil/foldutil-3.0-r1.ebuild20
-rw-r--r--app-vim/foldutil/metadata.xml8
-rw-r--r--app-vim/frawor-0.2.313
-rw-r--r--app-vim/frawor/Manifest3
-rw-r--r--app-vim/frawor/frawor-0.2.3.ebuild16
-rw-r--r--app-vim/frawor/metadata.xml11
-rw-r--r--app-vim/fugitive-2.212
-rw-r--r--app-vim/fugitive-2.312
-rw-r--r--app-vim/fugitive-999910
-rw-r--r--app-vim/fugitive/Manifest6
-rw-r--r--app-vim/fugitive/fugitive-2.2.ebuild22
-rw-r--r--app-vim/fugitive/fugitive-2.3.ebuild22
-rw-r--r--app-vim/fugitive/fugitive-9999.ebuild22
-rw-r--r--app-vim/fugitive/metadata.xml11
-rw-r--r--app-vim/fuzzyfinder-4.2.212
-rw-r--r--app-vim/fuzzyfinder/Manifest3
-rw-r--r--app-vim/fuzzyfinder/fuzzyfinder-4.2.2.ebuild19
-rw-r--r--app-vim/fuzzyfinder/metadata.xml8
-rw-r--r--app-vim/genindent-1.1-r112
-rw-r--r--app-vim/genindent/Manifest3
-rw-r--r--app-vim/genindent/genindent-1.1-r1.ebuild16
-rw-r--r--app-vim/genindent/metadata.xml8
-rw-r--r--app-vim/gentoo-syntax-2016053013
-rw-r--r--app-vim/gentoo-syntax-2017022513
-rw-r--r--app-vim/gentoo-syntax-9999999911
-rw-r--r--app-vim/gentoo-syntax/Manifest6
-rw-r--r--app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild53
-rw-r--r--app-vim/gentoo-syntax/gentoo-syntax-20170225.ebuild53
-rw-r--r--app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild53
-rw-r--r--app-vim/gentoo-syntax/metadata.xml14
-rw-r--r--app-vim/genutils-2.512
-rw-r--r--app-vim/genutils-2.5-r112
-rw-r--r--app-vim/genutils/Manifest4
-rw-r--r--app-vim/genutils/genutils-2.5-r1.ebuild20
-rw-r--r--app-vim/genutils/genutils-2.5.ebuild20
-rw-r--r--app-vim/genutils/metadata.xml8
-rw-r--r--app-vim/gist-7.312
-rw-r--r--app-vim/gist/Manifest3
-rw-r--r--app-vim/gist/gist-7.3.ebuild30
-rw-r--r--app-vim/gist/metadata.xml11
-rw-r--r--app-vim/git-patch-tags-0.212
-rw-r--r--app-vim/git-patch-tags/Manifest3
-rw-r--r--app-vim/git-patch-tags/git-patch-tags-0.2.ebuild13
-rw-r--r--app-vim/git-patch-tags/metadata.xml8
-rw-r--r--app-vim/gitgutter-2017110112
-rw-r--r--app-vim/gitgutter-2018031612
-rw-r--r--app-vim/gitgutter-9999999910
-rw-r--r--app-vim/gitgutter/Manifest6
-rw-r--r--app-vim/gitgutter/gitgutter-20171101.ebuild28
-rw-r--r--app-vim/gitgutter/gitgutter-20180316.ebuild30
-rw-r--r--app-vim/gitgutter/gitgutter-99999999.ebuild30
-rw-r--r--app-vim/gitgutter/metadata.xml11
-rw-r--r--app-vim/gitlog-5.1.012
-rw-r--r--app-vim/gitlog-6.0.012
-rw-r--r--app-vim/gitlog-999910
-rw-r--r--app-vim/gitlog/Manifest6
-rw-r--r--app-vim/gitlog/gitlog-5.1.0.ebuild15
-rw-r--r--app-vim/gitlog/gitlog-6.0.0.ebuild21
-rw-r--r--app-vim/gitlog/gitlog-9999.ebuild21
-rw-r--r--app-vim/gitlog/metadata.xml11
-rw-r--r--app-vim/gitolite-syntax-2011122512
-rw-r--r--app-vim/gitolite-syntax-2013030612
-rw-r--r--app-vim/gitolite-syntax/Manifest5
-rw-r--r--app-vim/gitolite-syntax/gitolite-syntax-20111225.ebuild15
-rw-r--r--app-vim/gitolite-syntax/gitolite-syntax-20130306.ebuild22
-rw-r--r--app-vim/gitolite-syntax/metadata.xml15
-rw-r--r--app-vim/gitv-1.3.112
-rw-r--r--app-vim/gitv-999910
-rw-r--r--app-vim/gitv/Manifest4
-rw-r--r--app-vim/gitv/gitv-1.3.1.ebuild30
-rw-r--r--app-vim/gitv/gitv-9999.ebuild28
-rw-r--r--app-vim/gitv/metadata.xml11
-rw-r--r--app-vim/gnupg-2.612
-rw-r--r--app-vim/gnupg/Manifest3
-rw-r--r--app-vim/gnupg/gnupg-2.6.ebuild28
-rw-r--r--app-vim/gnupg/metadata.xml8
-rw-r--r--app-vim/greputils-2.8-r112
-rw-r--r--app-vim/greputils/Manifest3
-rw-r--r--app-vim/greputils/greputils-2.8-r1.ebuild21
-rw-r--r--app-vim/greputils/metadata.xml8
-rw-r--r--app-vim/gtk-syntax-2013071612
-rw-r--r--app-vim/gtk-syntax/Manifest3
-rw-r--r--app-vim/gtk-syntax/gtk-syntax-20130716.ebuild11
-rw-r--r--app-vim/gtk-syntax/metadata.xml8
-rw-r--r--app-vim/gundo-2.6.214
-rw-r--r--app-vim/gundo/Manifest3
-rw-r--r--app-vim/gundo/gundo-2.6.2.ebuild30
-rw-r--r--app-vim/gundo/metadata.xml11
-rw-r--r--app-vim/haskellmode-20101118-r112
-rw-r--r--app-vim/haskellmode/Manifest3
-rw-r--r--app-vim/haskellmode/haskellmode-20101118-r1.ebuild50
-rw-r--r--app-vim/haskellmode/metadata.xml8
-rw-r--r--app-vim/help-extra-syntax-20050106-r112
-rw-r--r--app-vim/help-extra-syntax/Manifest3
-rw-r--r--app-vim/help-extra-syntax/help-extra-syntax-20050106-r1.ebuild23
-rw-r--r--app-vim/help-extra-syntax/metadata.xml8
-rw-r--r--app-vim/increment-1.1-r112
-rw-r--r--app-vim/increment/Manifest3
-rw-r--r--app-vim/increment/increment-1.1-r1.ebuild15
-rw-r--r--app-vim/increment/metadata.xml8
-rw-r--r--app-vim/indentpython-0.312
-rw-r--r--app-vim/indentpython/Manifest3
-rw-r--r--app-vim/indentpython/indentpython-0.3.ebuild14
-rw-r--r--app-vim/indentpython/metadata.xml14
-rw-r--r--app-vim/info-1.7-r212
-rw-r--r--app-vim/info/Manifest3
-rw-r--r--app-vim/info/info-1.7-r2.ebuild23
-rw-r--r--app-vim/info/metadata.xml8
-rw-r--r--app-vim/jedi-0.8_p2017101514
-rw-r--r--app-vim/jedi/Manifest3
-rw-r--r--app-vim/jedi/jedi-0.8_p20171015.ebuild33
-rw-r--r--app-vim/jedi/metadata.xml23
-rw-r--r--app-vim/json-2015051112
-rw-r--r--app-vim/json/Manifest3
-rw-r--r--app-vim/json/json-20150511.ebuild15
-rw-r--r--app-vim/json/metadata.xml11
-rw-r--r--app-vim/l9-1.112
-rw-r--r--app-vim/l9/Manifest3
-rw-r--r--app-vim/l9/l9-1.1.ebuild18
-rw-r--r--app-vim/l9/metadata.xml8
-rw-r--r--app-vim/languagetool-1.2912
-rw-r--r--app-vim/languagetool-1.3012
-rw-r--r--app-vim/languagetool/Manifest6
-rw-r--r--app-vim/languagetool/files/languagetool-1.29-script.patch38
-rw-r--r--app-vim/languagetool/languagetool-1.29.ebuild17
-rw-r--r--app-vim/languagetool/languagetool-1.30.ebuild17
-rw-r--r--app-vim/languagetool/metadata.xml8
-rw-r--r--app-vim/lightline-999910
-rw-r--r--app-vim/lightline/Manifest2
-rw-r--r--app-vim/lightline/lightline-9999.ebuild21
-rw-r--r--app-vim/lightline/metadata.xml14
-rw-r--r--app-vim/locateopen-1.3-r112
-rw-r--r--app-vim/locateopen/Manifest3
-rw-r--r--app-vim/locateopen/locateopen-1.3-r1.ebuild28
-rw-r--r--app-vim/locateopen/metadata.xml8
-rw-r--r--app-vim/lustyexplorer-4.112
-rw-r--r--app-vim/lustyexplorer-4.312
-rw-r--r--app-vim/lustyexplorer/Manifest5
-rw-r--r--app-vim/lustyexplorer/lustyexplorer-4.1.ebuild26
-rw-r--r--app-vim/lustyexplorer/lustyexplorer-4.3.ebuild26
-rw-r--r--app-vim/lustyexplorer/metadata.xml8
-rw-r--r--app-vim/matrix-1.10-r112
-rw-r--r--app-vim/matrix/Manifest3
-rw-r--r--app-vim/matrix/matrix-1.10-r1.ebuild17
-rw-r--r--app-vim/matrix/metadata.xml12
-rw-r--r--app-vim/merginal-2.0.212
-rw-r--r--app-vim/merginal-2.1.012
-rw-r--r--app-vim/merginal-999910
-rw-r--r--app-vim/merginal/Manifest6
-rw-r--r--app-vim/merginal/merginal-2.0.2.ebuild26
-rw-r--r--app-vim/merginal/merginal-2.1.0.ebuild31
-rw-r--r--app-vim/merginal/merginal-9999.ebuild31
-rw-r--r--app-vim/merginal/metadata.xml11
-rw-r--r--app-vim/metadata.xml37
-rw-r--r--app-vim/minibufexpl-6.5.212
-rw-r--r--app-vim/minibufexpl/Manifest3
-rw-r--r--app-vim/minibufexpl/metadata.xml11
-rw-r--r--app-vim/minibufexpl/minibufexpl-6.5.2.ebuild24
-rw-r--r--app-vim/molokai-0.1_p2015111512
-rw-r--r--app-vim/molokai/Manifest3
-rw-r--r--app-vim/molokai/metadata.xml11
-rw-r--r--app-vim/molokai/molokai-0.1_p20151115.ebuild16
-rw-r--r--app-vim/multiplesearch-1.312
-rw-r--r--app-vim/multiplesearch/Manifest3
-rw-r--r--app-vim/multiplesearch/metadata.xml8
-rw-r--r--app-vim/multiplesearch/multiplesearch-1.3.ebuild18
-rw-r--r--app-vim/multvals-3.10-r112
-rw-r--r--app-vim/multvals/Manifest3
-rw-r--r--app-vim/multvals/metadata.xml8
-rw-r--r--app-vim/multvals/multvals-3.10-r1.ebuild16
-rw-r--r--app-vim/nagios-syntax-1.812
-rw-r--r--app-vim/nagios-syntax/Manifest3
-rw-r--r--app-vim/nagios-syntax/metadata.xml13
-rw-r--r--app-vim/nagios-syntax/nagios-syntax-1.8.ebuild17
-rw-r--r--app-vim/neocomplcache-7.112
-rw-r--r--app-vim/neocomplcache-7.1-r112
-rw-r--r--app-vim/neocomplcache/Manifest4
-rw-r--r--app-vim/neocomplcache/metadata.xml11
-rw-r--r--app-vim/neocomplcache/neocomplcache-7.1-r1.ebuild19
-rw-r--r--app-vim/neocomplcache/neocomplcache-7.1.ebuild14
-rw-r--r--app-vim/nerdcommenter-2.5.012
-rw-r--r--app-vim/nerdcommenter-2.5.112
-rw-r--r--app-vim/nerdcommenter-999910
-rw-r--r--app-vim/nerdcommenter/Manifest6
-rw-r--r--app-vim/nerdcommenter/metadata.xml11
-rw-r--r--app-vim/nerdcommenter/nerdcommenter-2.5.0.ebuild25
-rw-r--r--app-vim/nerdcommenter/nerdcommenter-2.5.1.ebuild25
-rw-r--r--app-vim/nerdcommenter/nerdcommenter-9999.ebuild25
-rw-r--r--app-vim/nerdtree-5.0.012
-rw-r--r--app-vim/nerdtree-999910
-rw-r--r--app-vim/nerdtree-tabs-1.4.712
-rw-r--r--app-vim/nerdtree-tabs/Manifest3
-rw-r--r--app-vim/nerdtree-tabs/metadata.xml14
-rw-r--r--app-vim/nerdtree-tabs/nerdtree-tabs-1.4.7.ebuild23
-rw-r--r--app-vim/nerdtree/Manifest4
-rw-r--r--app-vim/nerdtree/metadata.xml11
-rw-r--r--app-vim/nerdtree/nerdtree-5.0.0.ebuild18
-rw-r--r--app-vim/nerdtree/nerdtree-9999.ebuild25
-rw-r--r--app-vim/nginx-syntax-0.3.312
-rw-r--r--app-vim/nginx-syntax/Manifest3
-rw-r--r--app-vim/nginx-syntax/metadata.xml8
-rw-r--r--app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild11
-rw-r--r--app-vim/notes-0.33.414
-rw-r--r--app-vim/notes/Manifest3
-rw-r--r--app-vim/notes/metadata.xml11
-rw-r--r--app-vim/notes/notes-0.33.4.ebuild30
-rw-r--r--app-vim/ntp-syntax-20031001-r112
-rw-r--r--app-vim/ntp-syntax/Manifest3
-rw-r--r--app-vim/ntp-syntax/metadata.xml8
-rw-r--r--app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild14
-rw-r--r--app-vim/omnicppcomplete-0.4112
-rw-r--r--app-vim/omnicppcomplete/Manifest3
-rw-r--r--app-vim/omnicppcomplete/metadata.xml8
-rw-r--r--app-vim/omnicppcomplete/omnicppcomplete-0.41.ebuild22
-rw-r--r--app-vim/pathogen-2.412
-rw-r--r--app-vim/pathogen/Manifest3
-rw-r--r--app-vim/pathogen/metadata.xml11
-rw-r--r--app-vim/pathogen/pathogen-2.4.ebuild14
-rw-r--r--app-vim/pdv-1.0.1-r112
-rw-r--r--app-vim/pdv/Manifest3
-rw-r--r--app-vim/pdv/metadata.xml8
-rw-r--r--app-vim/pdv/pdv-1.0.1-r1.ebuild20
-rw-r--r--app-vim/perl-support-5.3.212
-rw-r--r--app-vim/perl-support-5.412
-rw-r--r--app-vim/perl-support/Manifest5
-rw-r--r--app-vim/perl-support/metadata.xml11
-rw-r--r--app-vim/perl-support/perl-support-5.3.2.ebuild28
-rw-r--r--app-vim/perl-support/perl-support-5.4.ebuild46
-rw-r--r--app-vim/perlomni-2.512
-rw-r--r--app-vim/perlomni/Manifest3
-rw-r--r--app-vim/perlomni/metadata.xml14
-rw-r--r--app-vim/perlomni/perlomni-2.5.ebuild35
-rw-r--r--app-vim/pfsyntax-1.312
-rw-r--r--app-vim/pfsyntax/Manifest3
-rw-r--r--app-vim/pfsyntax/metadata.xml8
-rw-r--r--app-vim/pfsyntax/pfsyntax-1.3.ebuild16
-rw-r--r--app-vim/pgn-syntax-1.012
-rw-r--r--app-vim/pgn-syntax/Manifest3
-rw-r--r--app-vim/pgn-syntax/metadata.xml8
-rw-r--r--app-vim/pgn-syntax/pgn-syntax-1.0.ebuild16
-rw-r--r--app-vim/phpdocs-0.26-r112
-rw-r--r--app-vim/phpdocs/Manifest3
-rw-r--r--app-vim/phpdocs/metadata.xml8
-rw-r--r--app-vim/phpdocs/phpdocs-0.26-r1.ebuild18
-rw-r--r--app-vim/project-1.4.112
-rw-r--r--app-vim/project/Manifest3
-rw-r--r--app-vim/project/metadata.xml8
-rw-r--r--app-vim/project/project-1.4.1.ebuild17
-rw-r--r--app-vim/puppet-syntax-3.0.112
-rw-r--r--app-vim/puppet-syntax/Manifest3
-rw-r--r--app-vim/puppet-syntax/metadata.xml12
-rw-r--r--app-vim/puppet-syntax/puppet-syntax-3.0.1.ebuild19
-rw-r--r--app-vim/pushpop-4.0-r112
-rw-r--r--app-vim/pushpop/Manifest3
-rw-r--r--app-vim/pushpop/metadata.xml8
-rw-r--r--app-vim/pushpop/pushpop-4.0-r1.ebuild20
-rw-r--r--app-vim/pyclewn-2.0.114
-rw-r--r--app-vim/pyclewn-2.1-r114
-rw-r--r--app-vim/pyclewn/Manifest5
-rw-r--r--app-vim/pyclewn/metadata.xml16
-rw-r--r--app-vim/pyclewn/pyclewn-2.0.1.ebuild46
-rw-r--r--app-vim/pyclewn/pyclewn-2.1-r1.ebuild51
-rw-r--r--app-vim/pydiction-1.2.312
-rw-r--r--app-vim/pydiction-1.2.3-r114
-rw-r--r--app-vim/pydiction-1.2.3-r214
-rw-r--r--app-vim/pydiction/Manifest5
-rw-r--r--app-vim/pydiction/metadata.xml12
-rw-r--r--app-vim/pydiction/pydiction-1.2.3-r1.ebuild30
-rw-r--r--app-vim/pydiction/pydiction-1.2.3-r2.ebuild38
-rw-r--r--app-vim/pydiction/pydiction-1.2.3.ebuild25
-rw-r--r--app-vim/pydoc-2.0-r114
-rw-r--r--app-vim/pydoc/Manifest3
-rw-r--r--app-vim/pydoc/metadata.xml14
-rw-r--r--app-vim/pydoc/pydoc-2.0-r1.ebuild24
-rw-r--r--app-vim/pytest-1.1.412
-rw-r--r--app-vim/pytest/Manifest3
-rw-r--r--app-vim/pytest/metadata.xml11
-rw-r--r--app-vim/pytest/pytest-1.1.4.ebuild19
-rw-r--r--app-vim/python-mode-0.6.18-r312
-rw-r--r--app-vim/python-mode-0.6.18-r414
-rw-r--r--app-vim/python-mode-0.9.013
-rw-r--r--app-vim/python-mode-0.9.0-r115
-rw-r--r--app-vim/python-mode/Manifest8
-rw-r--r--app-vim/python-mode/files/python-mode-0.6.18-dont-add-cwd-to-syspath.patch15
-rw-r--r--app-vim/python-mode/metadata.xml17
-rw-r--r--app-vim/python-mode/python-mode-0.6.18-r3.ebuild55
-rw-r--r--app-vim/python-mode/python-mode-0.6.18-r4.ebuild62
-rw-r--r--app-vim/python-mode/python-mode-0.9.0-r1.ebuild48
-rw-r--r--app-vim/python-mode/python-mode-0.9.0.ebuild43
-rw-r--r--app-vim/rails-5.112
-rw-r--r--app-vim/rails-5.212
-rw-r--r--app-vim/rails/Manifest5
-rw-r--r--app-vim/rails/metadata.xml11
-rw-r--r--app-vim/rails/rails-5.1.ebuild23
-rw-r--r--app-vim/rails/rails-5.2.ebuild23
-rw-r--r--app-vim/rainbow_parentheses-1.012
-rw-r--r--app-vim/rainbow_parentheses/Manifest3
-rw-r--r--app-vim/rainbow_parentheses/metadata.xml15
-rw-r--r--app-vim/rainbow_parentheses/rainbow_parentheses-1.0.ebuild17
-rw-r--r--app-vim/recover-0.1812
-rw-r--r--app-vim/recover/Manifest3
-rw-r--r--app-vim/recover/metadata.xml11
-rw-r--r--app-vim/recover/recover-0.18.ebuild12
-rw-r--r--app-vim/reload-0.6.1712
-rw-r--r--app-vim/reload/Manifest3
-rw-r--r--app-vim/reload/metadata.xml11
-rw-r--r--app-vim/reload/reload-0.6.17.ebuild22
-rw-r--r--app-vim/repeat-1.112
-rw-r--r--app-vim/repeat/Manifest3
-rw-r--r--app-vim/repeat/metadata.xml11
-rw-r--r--app-vim/repeat/repeat-1.1.ebuild21
-rw-r--r--app-vim/ri-browser-1.212
-rw-r--r--app-vim/ri-browser/Manifest3
-rw-r--r--app-vim/ri-browser/metadata.xml8
-rw-r--r--app-vim/ri-browser/ri-browser-1.2.ebuild18
-rw-r--r--app-vim/rust-vim-1_pre2018012512
-rw-r--r--app-vim/rust-vim/Manifest3
-rw-r--r--app-vim/rust-vim/metadata.xml15
-rw-r--r--app-vim/rust-vim/rust-vim-1_pre20180125.ebuild17
-rw-r--r--app-vim/salt-vim-2015111912
-rw-r--r--app-vim/salt-vim/Manifest3
-rw-r--r--app-vim/salt-vim/metadata.xml15
-rw-r--r--app-vim/salt-vim/salt-vim-20151119.ebuild20
-rw-r--r--app-vim/scala-syntax-1.0-r112
-rw-r--r--app-vim/scala-syntax/Manifest3
-rw-r--r--app-vim/scala-syntax/metadata.xml7
-rw-r--r--app-vim/scala-syntax/scala-syntax-1.0-r1.ebuild15
-rw-r--r--app-vim/screen-1.512
-rw-r--r--app-vim/screen/Manifest3
-rw-r--r--app-vim/screen/metadata.xml11
-rw-r--r--app-vim/screen/screen-1.5.ebuild21
-rw-r--r--app-vim/searchcomplete-1.1-r112
-rw-r--r--app-vim/searchcomplete/Manifest3
-rw-r--r--app-vim/searchcomplete/metadata.xml8
-rw-r--r--app-vim/searchcomplete/searchcomplete-1.1-r1.ebuild14
-rw-r--r--app-vim/securemodelines-2014092612
-rw-r--r--app-vim/securemodelines/Manifest3
-rw-r--r--app-vim/securemodelines/metadata.xml17
-rw-r--r--app-vim/securemodelines/securemodelines-20140926.ebuild13
-rw-r--r--app-vim/selinux-syntax-2004122512
-rw-r--r--app-vim/selinux-syntax/Manifest3
-rw-r--r--app-vim/selinux-syntax/metadata.xml12
-rw-r--r--app-vim/selinux-syntax/selinux-syntax-20041225.ebuild16
-rw-r--r--app-vim/session-2.13.112
-rw-r--r--app-vim/session/Manifest3
-rw-r--r--app-vim/session/metadata.xml11
-rw-r--r--app-vim/session/session-2.13.1.ebuild25
-rw-r--r--app-vim/showmarks-2.2-r112
-rw-r--r--app-vim/showmarks/Manifest3
-rw-r--r--app-vim/showmarks/metadata.xml8
-rw-r--r--app-vim/showmarks/showmarks-2.2-r1.ebuild30
-rw-r--r--app-vim/sleuth-1.012
-rw-r--r--app-vim/sleuth-1.112
-rw-r--r--app-vim/sleuth/Manifest5
-rw-r--r--app-vim/sleuth/metadata.xml11
-rw-r--r--app-vim/sleuth/sleuth-1.0.ebuild14
-rw-r--r--app-vim/sleuth/sleuth-1.1.ebuild13
-rw-r--r--app-vim/slimv-0.9.12-r114
-rw-r--r--app-vim/slimv-0.9.13_p2017091014
-rw-r--r--app-vim/slimv/Manifest5
-rw-r--r--app-vim/slimv/metadata.xml28
-rw-r--r--app-vim/slimv/slimv-0.9.12-r1.ebuild33
-rw-r--r--app-vim/slimv/slimv-0.9.13_p20170910.ebuild41
-rw-r--r--app-vim/snipmate-0.87-r112
-rw-r--r--app-vim/snipmate/Manifest3
-rw-r--r--app-vim/snipmate/metadata.xml11
-rw-r--r--app-vim/snipmate/snipmate-0.87-r1.ebuild29
-rw-r--r--app-vim/splice-1.0.114
-rw-r--r--app-vim/splice-1.1.014
-rw-r--r--app-vim/splice/Manifest5
-rw-r--r--app-vim/splice/metadata.xml12
-rw-r--r--app-vim/splice/splice-1.0.1.ebuild32
-rw-r--r--app-vim/splice/splice-1.1.0.ebuild35
-rw-r--r--app-vim/sudoedit-0.2112
-rw-r--r--app-vim/sudoedit/Manifest3
-rw-r--r--app-vim/sudoedit/metadata.xml11
-rw-r--r--app-vim/sudoedit/sudoedit-0.21.ebuild19
-rw-r--r--app-vim/supertab-2.112
-rw-r--r--app-vim/supertab/Manifest3
-rw-r--r--app-vim/supertab/metadata.xml11
-rw-r--r--app-vim/supertab/supertab-2.1.ebuild18
-rw-r--r--app-vim/surround-2.1-r112
-rw-r--r--app-vim/surround/Manifest3
-rw-r--r--app-vim/surround/metadata.xml8
-rw-r--r--app-vim/surround/surround-2.1-r1.ebuild13
-rw-r--r--app-vim/syntastic-3.8.012
-rw-r--r--app-vim/syntastic-999910
-rw-r--r--app-vim/syntastic/Manifest4
-rw-r--r--app-vim/syntastic/metadata.xml11
-rw-r--r--app-vim/syntastic/syntastic-3.8.0.ebuild33
-rw-r--r--app-vim/syntastic/syntastic-9999.ebuild33
-rw-r--r--app-vim/tagbar-2.6.112
-rw-r--r--app-vim/tagbar-2.712
-rw-r--r--app-vim/tagbar/Manifest5
-rw-r--r--app-vim/tagbar/metadata.xml11
-rw-r--r--app-vim/tagbar/tagbar-2.6.1.ebuild17
-rw-r--r--app-vim/tagbar/tagbar-2.7.ebuild22
-rw-r--r--app-vim/taglist-4.612
-rw-r--r--app-vim/taglist/Manifest4
-rw-r--r--app-vim/taglist/files/taglist-3.4-ebuilds.patch12
-rw-r--r--app-vim/taglist/metadata.xml11
-rw-r--r--app-vim/taglist/taglist-4.6.ebuild19
-rw-r--r--app-vim/tasklist-1.0.112
-rw-r--r--app-vim/tasklist/Manifest3
-rw-r--r--app-vim/tasklist/metadata.xml15
-rw-r--r--app-vim/tasklist/tasklist-1.0.1.ebuild19
-rw-r--r--app-vim/tcomment-3.08.112
-rw-r--r--app-vim/tcomment-999910
-rw-r--r--app-vim/tcomment/Manifest4
-rw-r--r--app-vim/tcomment/metadata.xml11
-rw-r--r--app-vim/tcomment/tcomment-3.08.1.ebuild28
-rw-r--r--app-vim/tcomment/tcomment-9999.ebuild28
-rw-r--r--app-vim/thlnk-1.2.1-r112
-rw-r--r--app-vim/thlnk/Manifest3
-rw-r--r--app-vim/thlnk/metadata.xml8
-rw-r--r--app-vim/thlnk/thlnk-1.2.1-r1.ebuild14
-rw-r--r--app-vim/tlib-1.2012
-rw-r--r--app-vim/tlib/Manifest3
-rw-r--r--app-vim/tlib/metadata.xml11
-rw-r--r--app-vim/tlib/tlib-1.20.ebuild23
-rw-r--r--app-vim/tmpl-0.1-r112
-rw-r--r--app-vim/tmpl/Manifest3
-rw-r--r--app-vim/tmpl/metadata.xml8
-rw-r--r--app-vim/tmpl/tmpl-0.1-r1.ebuild14
-rw-r--r--app-vim/toggle-0.5-r112
-rw-r--r--app-vim/toggle/Manifest3
-rw-r--r--app-vim/toggle/metadata.xml8
-rw-r--r--app-vim/toggle/toggle-0.5-r1.ebuild16
-rw-r--r--app-vim/tt2-syntax-1.13-r112
-rw-r--r--app-vim/tt2-syntax/Manifest3
-rw-r--r--app-vim/tt2-syntax/metadata.xml8
-rw-r--r--app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild15
-rw-r--r--app-vim/txtfmt-2.4-r112
-rw-r--r--app-vim/txtfmt-3.112
-rw-r--r--app-vim/txtfmt/Manifest5
-rw-r--r--app-vim/txtfmt/metadata.xml8
-rw-r--r--app-vim/txtfmt/txtfmt-2.4-r1.ebuild21
-rw-r--r--app-vim/txtfmt/txtfmt-3.1.ebuild21
-rw-r--r--app-vim/udev-syntax-20051016-r212
-rw-r--r--app-vim/udev-syntax/Manifest4
-rw-r--r--app-vim/udev-syntax/files/udev-syntax-20051016-ftdetect.patch6
-rw-r--r--app-vim/udev-syntax/metadata.xml11
-rw-r--r--app-vim/udev-syntax/udev-syntax-20051016-r2.ebuild18
-rw-r--r--app-vim/undotree-5.012
-rw-r--r--app-vim/undotree-999910
-rw-r--r--app-vim/undotree/Manifest4
-rw-r--r--app-vim/undotree/metadata.xml11
-rw-r--r--app-vim/undotree/undotree-5.0.ebuild12
-rw-r--r--app-vim/undotree/undotree-9999.ebuild11
-rw-r--r--app-vim/unite-4.0-r112
-rw-r--r--app-vim/unite/Manifest3
-rw-r--r--app-vim/unite/metadata.xml17
-rw-r--r--app-vim/unite/unite-4.0-r1.ebuild15
-rw-r--r--app-vim/uptime-1.3-r112
-rw-r--r--app-vim/uptime/Manifest3
-rw-r--r--app-vim/uptime/metadata.xml8
-rw-r--r--app-vim/uptime/uptime-1.3-r1.ebuild14
-rw-r--r--app-vim/vcscommand-1.99.4712
-rw-r--r--app-vim/vcscommand/Manifest3
-rw-r--r--app-vim/vcscommand/metadata.xml13
-rw-r--r--app-vim/vcscommand/vcscommand-1.99.47.ebuild15
-rw-r--r--app-vim/vim-addon-mw-utils-2012110512
-rw-r--r--app-vim/vim-addon-mw-utils/Manifest3
-rw-r--r--app-vim/vim-addon-mw-utils/metadata.xml11
-rw-r--r--app-vim/vim-addon-mw-utils/vim-addon-mw-utils-20121105.ebuild11
-rw-r--r--app-vim/vim-autoclose-2.012
-rw-r--r--app-vim/vim-autoclose/Manifest3
-rw-r--r--app-vim/vim-autoclose/metadata.xml15
-rw-r--r--app-vim/vim-autoclose/vim-autoclose-2.0.ebuild17
-rw-r--r--app-vim/vim-commentary-1.3_p2018053012
-rw-r--r--app-vim/vim-commentary/Manifest3
-rw-r--r--app-vim/vim-commentary/metadata.xml11
-rw-r--r--app-vim/vim-commentary/vim-commentary-1.3_p20180530.ebuild16
-rw-r--r--app-vim/vim-flake8-1.612
-rw-r--r--app-vim/vim-flake8/Manifest3
-rw-r--r--app-vim/vim-flake8/metadata.xml14
-rw-r--r--app-vim/vim-flake8/vim-flake8-1.6.ebuild14
-rw-r--r--app-vim/vim-go-1.1313
-rw-r--r--app-vim/vim-go/Manifest3
-rw-r--r--app-vim/vim-go/metadata.xml11
-rw-r--r--app-vim/vim-go/vim-go-1.13.ebuild22
-rw-r--r--app-vim/vim-hoogle-1.312
-rw-r--r--app-vim/vim-hoogle/Manifest3
-rw-r--r--app-vim/vim-hoogle/metadata.xml11
-rw-r--r--app-vim/vim-hoogle/vim-hoogle-1.3.ebuild16
-rw-r--r--app-vim/vim-latex-1.10.014
-rw-r--r--app-vim/vim-latex/Manifest3
-rw-r--r--app-vim/vim-latex/metadata.xml11
-rw-r--r--app-vim/vim-latex/vim-latex-1.10.0.ebuild64
-rw-r--r--app-vim/vim-misc-1.17.612
-rw-r--r--app-vim/vim-misc/Manifest3
-rw-r--r--app-vim/vim-misc/metadata.xml11
-rw-r--r--app-vim/vim-misc/vim-misc-1.17.6.ebuild18
-rw-r--r--app-vim/vim-multiple-cursors-2.2-r112
-rw-r--r--app-vim/vim-multiple-cursors/Manifest3
-rw-r--r--app-vim/vim-multiple-cursors/metadata.xml15
-rw-r--r--app-vim/vim-multiple-cursors/vim-multiple-cursors-2.2-r1.ebuild24
-rw-r--r--app-vim/vim-r-1.012
-rw-r--r--app-vim/vim-r-1.2.612
-rw-r--r--app-vim/vim-r/Manifest5
-rw-r--r--app-vim/vim-r/metadata.xml8
-rw-r--r--app-vim/vim-r/vim-r-1.0.ebuild22
-rw-r--r--app-vim/vim-r/vim-r-1.2.6.ebuild22
-rw-r--r--app-vim/vim-rest-console-2.3.012
-rw-r--r--app-vim/vim-rest-console-2.4.012
-rw-r--r--app-vim/vim-rest-console-2.5.012
-rw-r--r--app-vim/vim-rest-console-2.6.012
-rw-r--r--app-vim/vim-rest-console/Manifest9
-rw-r--r--app-vim/vim-rest-console/metadata.xml11
-rw-r--r--app-vim/vim-rest-console/vim-rest-console-2.3.0.ebuild20
-rw-r--r--app-vim/vim-rest-console/vim-rest-console-2.4.0.ebuild20
-rw-r--r--app-vim/vim-rest-console/vim-rest-console-2.5.0.ebuild20
-rw-r--r--app-vim/vim-rest-console/vim-rest-console-2.6.0.ebuild21
-rw-r--r--app-vim/vim-spell-cs-20061021-r110
-rw-r--r--app-vim/vim-spell-cs/Manifest3
-rw-r--r--app-vim/vim-spell-cs/metadata.xml20
-rw-r--r--app-vim/vim-spell-cs/vim-spell-cs-20061021-r1.ebuild12
-rw-r--r--app-vim/vim-spell-da-20060116-r110
-rw-r--r--app-vim/vim-spell-da/Manifest3
-rw-r--r--app-vim/vim-spell-da/metadata.xml12
-rw-r--r--app-vim/vim-spell-da/vim-spell-da-20060116-r1.ebuild12
-rw-r--r--app-vim/vim-spell-de-20080213-r110
-rw-r--r--app-vim/vim-spell-de/Manifest3
-rw-r--r--app-vim/vim-spell-de/metadata.xml12
-rw-r--r--app-vim/vim-spell-de/vim-spell-de-20080213-r1.ebuild12
-rw-r--r--app-vim/vim-spell-el-20080402-r110
-rw-r--r--app-vim/vim-spell-el/Manifest3
-rw-r--r--app-vim/vim-spell-el/metadata.xml12
-rw-r--r--app-vim/vim-spell-el/vim-spell-el-20080402-r1.ebuild12
-rw-r--r--app-vim/vim-spell-en-20060123-r110
-rw-r--r--app-vim/vim-spell-en/Manifest3
-rw-r--r--app-vim/vim-spell-en/metadata.xml12
-rw-r--r--app-vim/vim-spell-en/vim-spell-en-20060123-r1.ebuild12
-rw-r--r--app-vim/vim-spell-es-20060208-r110
-rw-r--r--app-vim/vim-spell-es/Manifest3
-rw-r--r--app-vim/vim-spell-es/metadata.xml12
-rw-r--r--app-vim/vim-spell-es/vim-spell-es-20060208-r1.ebuild12
-rw-r--r--app-vim/vim-spell-fr-20060121-r110
-rw-r--r--app-vim/vim-spell-fr/Manifest3
-rw-r--r--app-vim/vim-spell-fr/metadata.xml12
-rw-r--r--app-vim/vim-spell-fr/vim-spell-fr-20060121-r1.ebuild12
-rw-r--r--app-vim/vim-spell-he-20100312-r110
-rw-r--r--app-vim/vim-spell-he/Manifest3
-rw-r--r--app-vim/vim-spell-he/metadata.xml12
-rw-r--r--app-vim/vim-spell-he/vim-spell-he-20100312-r1.ebuild12
-rw-r--r--app-vim/vim-spell-hu-20100312-r110
-rw-r--r--app-vim/vim-spell-hu/Manifest3
-rw-r--r--app-vim/vim-spell-hu/metadata.xml12
-rw-r--r--app-vim/vim-spell-hu/vim-spell-hu-20100312-r1.ebuild12
-rw-r--r--app-vim/vim-spell-it-20100312-r110
-rw-r--r--app-vim/vim-spell-it/Manifest3
-rw-r--r--app-vim/vim-spell-it/metadata.xml12
-rw-r--r--app-vim/vim-spell-it/vim-spell-it-20100312-r1.ebuild12
-rw-r--r--app-vim/vim-spell-nl-20051007-r110
-rw-r--r--app-vim/vim-spell-nl/Manifest3
-rw-r--r--app-vim/vim-spell-nl/metadata.xml12
-rw-r--r--app-vim/vim-spell-nl/vim-spell-nl-20051007-r1.ebuild12
-rw-r--r--app-vim/vim-spell-pl-20060218-r110
-rw-r--r--app-vim/vim-spell-pl/Manifest3
-rw-r--r--app-vim/vim-spell-pl/metadata.xml12
-rw-r--r--app-vim/vim-spell-pl/vim-spell-pl-20060218-r1.ebuild12
-rw-r--r--app-vim/vim-spell-pt-20100312-r110
-rw-r--r--app-vim/vim-spell-pt/Manifest3
-rw-r--r--app-vim/vim-spell-pt/metadata.xml12
-rw-r--r--app-vim/vim-spell-pt/vim-spell-pt-20100312-r1.ebuild12
-rw-r--r--app-vim/vim-spell-ru-20070506-r110
-rw-r--r--app-vim/vim-spell-ru/Manifest3
-rw-r--r--app-vim/vim-spell-ru/metadata.xml16
-rw-r--r--app-vim/vim-spell-ru/vim-spell-ru-20070506-r1.ebuild12
-rw-r--r--app-vim/vim-tmux-3.0.012
-rw-r--r--app-vim/vim-tmux/Manifest3
-rw-r--r--app-vim/vim-tmux/metadata.xml18
-rw-r--r--app-vim/vim-tmux/vim-tmux-3.0.0.ebuild17
-rw-r--r--app-vim/vim2hs-0.1_p2017110612
-rw-r--r--app-vim/vim2hs/Manifest3
-rw-r--r--app-vim/vim2hs/metadata.xml11
-rw-r--r--app-vim/vim2hs/vim2hs-0.1_p20171106.ebuild29
-rw-r--r--app-vim/vimagit-1.7.112
-rw-r--r--app-vim/vimagit-1.7.212
-rw-r--r--app-vim/vimagit-999910
-rw-r--r--app-vim/vimagit/Manifest6
-rw-r--r--app-vim/vimagit/metadata.xml11
-rw-r--r--app-vim/vimagit/vimagit-1.7.1.ebuild20
-rw-r--r--app-vim/vimagit/vimagit-1.7.2.ebuild25
-rw-r--r--app-vim/vimagit/vimagit-9999.ebuild25
-rw-r--r--app-vim/vimbuddy-0.9.2-r112
-rw-r--r--app-vim/vimbuddy/Manifest3
-rw-r--r--app-vim/vimbuddy/metadata.xml11
-rw-r--r--app-vim/vimbuddy/vimbuddy-0.9.2-r1.ebuild17
-rw-r--r--app-vim/vimcalc-1.3-r214
-rw-r--r--app-vim/vimcalc/Manifest3
-rw-r--r--app-vim/vimcalc/metadata.xml8
-rw-r--r--app-vim/vimcalc/vimcalc-1.3-r2.ebuild43
-rw-r--r--app-vim/vimcdoc-1.9.012
-rw-r--r--app-vim/vimcdoc-2.1.012
-rw-r--r--app-vim/vimcdoc/Manifest5
-rw-r--r--app-vim/vimcdoc/metadata.xml8
-rw-r--r--app-vim/vimcdoc/vimcdoc-1.9.0.ebuild12
-rw-r--r--app-vim/vimcdoc/vimcdoc-2.1.0.ebuild12
-rw-r--r--app-vim/vimclojure-2.3.6-r312
-rw-r--r--app-vim/vimclojure/Manifest3
-rw-r--r--app-vim/vimclojure/metadata.xml14
-rw-r--r--app-vim/vimclojure/vimclojure-2.3.6-r3.ebuild52
-rw-r--r--app-vim/vimcommander-0.8112
-rw-r--r--app-vim/vimcommander/Manifest3
-rw-r--r--app-vim/vimcommander/metadata.xml8
-rw-r--r--app-vim/vimcommander/vimcommander-0.81.ebuild12
-rw-r--r--app-vim/vimoutliner-0.3.612
-rw-r--r--app-vim/vimoutliner-0.3.6-r114
-rw-r--r--app-vim/vimoutliner-0.4.0_p2018030114
-rw-r--r--app-vim/vimoutliner/Manifest7
-rw-r--r--app-vim/vimoutliner/files/vimoutliner-0.3.6-fix-shebangs.patch21
-rw-r--r--app-vim/vimoutliner/metadata.xml11
-rw-r--r--app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild48
-rw-r--r--app-vim/vimoutliner/vimoutliner-0.3.6.ebuild23
-rw-r--r--app-vim/vimoutliner/vimoutliner-0.4.0_p20180301.ebuild42
-rw-r--r--app-vim/vimpress-2.1.512
-rw-r--r--app-vim/vimpress-3.2.014
-rw-r--r--app-vim/vimpress/Manifest5
-rw-r--r--app-vim/vimpress/metadata.xml11
-rw-r--r--app-vim/vimpress/vimpress-2.1.5.ebuild29
-rw-r--r--app-vim/vimpress/vimpress-3.2.0.ebuild20
-rw-r--r--app-vim/vimpython-1.13-r112
-rw-r--r--app-vim/vimpython-1.13-r214
-rw-r--r--app-vim/vimpython/Manifest4
-rw-r--r--app-vim/vimpython/metadata.xml8
-rw-r--r--app-vim/vimpython/vimpython-1.13-r1.ebuild14
-rw-r--r--app-vim/vimpython/vimpython-1.13-r2.ebuild18
-rw-r--r--app-vim/vimtex-2016032412
-rw-r--r--app-vim/vimtex-2018032412
-rw-r--r--app-vim/vimtex-9999999910
-rw-r--r--app-vim/vimtex/Manifest6
-rw-r--r--app-vim/vimtex/metadata.xml11
-rw-r--r--app-vim/vimtex/vimtex-20160324.ebuild20
-rw-r--r--app-vim/vimtex/vimtex-20180324.ebuild36
-rw-r--r--app-vim/vimtex/vimtex-99999999.ebuild36
-rw-r--r--app-vim/voom-5.112
-rw-r--r--app-vim/voom-5.1-r114
-rw-r--r--app-vim/voom/Manifest4
-rw-r--r--app-vim/voom/metadata.xml8
-rw-r--r--app-vim/voom/voom-5.1-r1.ebuild22
-rw-r--r--app-vim/voom/voom-5.1.ebuild15
-rw-r--r--app-vim/webapi-0.212
-rw-r--r--app-vim/webapi-0.312
-rw-r--r--app-vim/webapi/Manifest5
-rw-r--r--app-vim/webapi/metadata.xml8
-rw-r--r--app-vim/webapi/webapi-0.2.ebuild14
-rw-r--r--app-vim/webapi/webapi-0.3.ebuild21
-rw-r--r--app-vim/wikipedia-syntax-20101113-r112
-rw-r--r--app-vim/wikipedia-syntax/Manifest3
-rw-r--r--app-vim/wikipedia-syntax/metadata.xml13
-rw-r--r--app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r1.ebuild18
-rw-r--r--app-vim/xquery-syntax-0.1-r212
-rw-r--r--app-vim/xquery-syntax/Manifest3
-rw-r--r--app-vim/xquery-syntax/metadata.xml8
-rw-r--r--app-vim/xquery-syntax/xquery-syntax-0.1-r2.ebuild23
-rw-r--r--app-vim/xsl-syntax-0.3.11-r212
-rw-r--r--app-vim/xsl-syntax/Manifest3
-rw-r--r--app-vim/xsl-syntax/metadata.xml8
-rw-r--r--app-vim/xsl-syntax/xsl-syntax-0.3.11-r2.ebuild19
-rw-r--r--app-vim/yankring-19.012
-rw-r--r--app-vim/yankring/Manifest3
-rw-r--r--app-vim/yankring/metadata.xml8
-rw-r--r--app-vim/yankring/yankring-19.0.ebuild11
-rw-r--r--app-vim/youcompleteme-2013091014
-rw-r--r--app-vim/youcompleteme-9999999912
-rw-r--r--app-vim/youcompleteme/Manifest4
-rw-r--r--app-vim/youcompleteme/metadata.xml11
-rw-r--r--app-vim/youcompleteme/youcompleteme-20130910.ebuild85
-rw-r--r--app-vim/youcompleteme/youcompleteme-99999999.ebuild111
-rw-r--r--app-vim/zenburn-2.2512
-rw-r--r--app-vim/zenburn/Manifest3
-rw-r--r--app-vim/zenburn/metadata.xml14
-rw-r--r--app-vim/zenburn/zenburn-2.25.ebuild18
-rw-r--r--app-vim/zoomwin-2412
-rw-r--r--app-vim/zoomwin/Manifest3
-rw-r--r--app-vim/zoomwin/metadata.xml8
-rw-r--r--app-vim/zoomwin/zoomwin-24.ebuild14
937 files changed, 9652 insertions, 3157 deletions
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 049d4b6d8edb..181c52d77a8d 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
Binary files differ
diff --git a/app-vim/ackvim-1.0.9-r1 b/app-vim/ackvim-1.0.9-r1
deleted file mode 100644
index a0659f7d0563..000000000000
--- a/app-vim/ackvim-1.0.9-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: run ack from vim
-EAPI=6
-HOMEPAGE=https://github.com/mileszs/ack.vim
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=sys-apps/ack || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/mileszs/ack.vim/archive/1.0.9.tar.gz -> ack.vim-1.0.9.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=2eee2a0b4c475257c75ff912bb592719
diff --git a/app-vim/ackvim/Manifest b/app-vim/ackvim/Manifest
new file mode 100644
index 000000000000..159cc9941929
--- /dev/null
+++ b/app-vim/ackvim/Manifest
@@ -0,0 +1,3 @@
+DIST ack.vim-1.0.9.tar.gz 9361 BLAKE2B c1bbcd00d7ec5207fb7de0ff1a49df5ada31f02f1b4dfabc84ae3567f62d058224fb6e7d3eae338f4ba9ae09276a1ca3dc2a7025a154b93d008e243fc36ba921 SHA512 42c931433ca2554cee0ccdc576891ba82efaebb0e5301ab279b3db8160816892b6f6232da7389058177ef9640a07e9582409c852ee5b55f3c9ee0b6f547ae8d0
+EBUILD ackvim-1.0.9-r1.ebuild 525 BLAKE2B a9efb2a16765815197b500d9cd92213345abb076018de164966a915fe2dc9601cae738b25f10be0c17eaaa8cfe816f82897e40403522e358170280fc775828c7 SHA512 c1584b58eb21af819309bbaa079d8762cd8a69034e12dffd243eca49bdc20d160ac92a3e5ba4c5c0d09e53cfb4a57ed421453dd1aad4b1a25c00b963e8138ced
+MISC metadata.xml 441 BLAKE2B c75a457783a1afc0c008bc4161787dbec890f51ef35ab9fa38467ff7b0c4ca336a376eb053991fecfbae08f666344744916e7d2fe1ad36d5b5784014d8242b37 SHA512 2d1dcc58aad00a20900a58a57a4a560adef15405ae2c9a04e52cb82504e8999bcf2461cd39d8bec8211c1815cbe82ea8dce35970e83ff2357f8e0974c38a9d6d
diff --git a/app-vim/ackvim/ackvim-1.0.9-r1.ebuild b/app-vim/ackvim/ackvim-1.0.9-r1.ebuild
new file mode 100644
index 000000000000..1b57e2677c19
--- /dev/null
+++ b/app-vim/ackvim/ackvim-1.0.9-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN="ack.vim"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="vim plugin: run ack from vim"
+HOMEPAGE="https://github.com/mileszs/ack.vim"
+SRC_URI="https://github.com/mileszs/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+RDEPEND="sys-apps/ack"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+ # See bug 584768.
+ mv ftplugin/qf.vim ftplugin/ackqf.vim || die
+}
diff --git a/app-vim/ackvim/metadata.xml b/app-vim/ackvim/metadata.xml
new file mode 100644
index 000000000000..d5118b2c9442
--- /dev/null
+++ b/app-vim/ackvim/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mileszs/ack.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/airline-0.9 b/app-vim/airline-0.9
deleted file mode 100644
index cc2290aa07ca..000000000000
--- a/app-vim/airline-0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: lean & mean statusline for vim that's light as air
-EAPI=6
-HOMEPAGE=https://github.com/vim-airline/vim-airline/ https://www.vim.org/scripts/script.php?script_id=4661
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/vim-airline/vim-airline/archive/v0.9.tar.gz -> airline-0.9.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=8241ffaed57074c728f03431a45bdf65
diff --git a/app-vim/airline-9999 b/app-vim/airline-9999
deleted file mode 100644
index 1b6374221609..000000000000
--- a/app-vim/airline-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: lean & mean statusline for vim that's light as air
-EAPI=6
-HOMEPAGE=https://github.com/vim-airline/vim-airline/ https://www.vim.org/scripts/script.php?script_id=4661
-LICENSE=MIT
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 8f6de46b0aa318aea0e8cac62ece098b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=bc87517b125862cf7ef2085718775611
diff --git a/app-vim/airline-themes-9999 b/app-vim/airline-themes-9999
deleted file mode 100644
index 08d40e8f9b0b..000000000000
--- a/app-vim/airline-themes-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=app-vim/airline || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: a collection of themes for vim-airline
-EAPI=6
-HOMEPAGE=https://github.com/vim-airline/vim-airline-themes
-LICENSE=MIT
-RDEPEND=app-vim/airline || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 8f6de46b0aa318aea0e8cac62ece098b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=7c611ae385f5ea9198aa07ba5e035fdf
diff --git a/app-vim/airline-themes/Manifest b/app-vim/airline-themes/Manifest
new file mode 100644
index 000000000000..98ab04ca7e93
--- /dev/null
+++ b/app-vim/airline-themes/Manifest
@@ -0,0 +1,2 @@
+EBUILD airline-themes-9999.ebuild 408 BLAKE2B 465ac11ae90275b3cbdf3171b957257075a86ba73699f12fd5ef765ee31094bf39396dd2b246ea1dc321051f9701b95d09065363b4d735f45a83bab37c6e3da5 SHA512 4f96d7819deafa452e8efdb4531208a19fad406e96cbfd2765ff216ed0f191cccddeedc4cfa2b4346ed1896fa2424aa4064a833444f0b1a3e4957dc393a391de
+MISC metadata.xml 439 BLAKE2B 45dd2e92f4cbcd83e0acbe5d4bae4aebe12c541184edcdc1187e0a8f8aa3887bbb089d9253147c451e05be8b3b6d9f8fe84a9f4b6cacfa24e11a2288396ef86c SHA512 d652a18b151c701e17191e1dbe3dc57f6b8cd02ec2107ceef4dd9ae7164724b62389872025f473cc85c328b8552b9e16eadc2103080488e296e2d81253ce08f4
diff --git a/app-vim/airline-themes/airline-themes-9999.ebuild b/app-vim/airline-themes/airline-themes-9999.ebuild
new file mode 100644
index 000000000000..a8942956de4f
--- /dev/null
+++ b/app-vim/airline-themes/airline-themes-9999.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin git-r3
+
+EGIT_REPO_URI="https://github.com/vim-airline/vim-airline-themes.git"
+
+DESCRIPTION="vim plugin: a collection of themes for vim-airline"
+HOMEPAGE="https://github.com/vim-airline/vim-airline-themes"
+LICENSE="MIT"
+IUSE=""
+
+DEPEND="app-vim/airline"
+RDEPEND="${DEPEND}"
diff --git a/app-vim/airline-themes/metadata.xml b/app-vim/airline-themes/metadata.xml
new file mode 100644
index 000000000000..6eadc4d2435b
--- /dev/null
+++ b/app-vim/airline-themes/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">vim-airline/vim-airline-themes</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/airline/Manifest b/app-vim/airline/Manifest
new file mode 100644
index 000000000000..f6ea693ad700
--- /dev/null
+++ b/app-vim/airline/Manifest
@@ -0,0 +1,4 @@
+DIST airline-0.9.tar.gz 72660 BLAKE2B d6c9762d8140b2a88a001b9ea3ae62c3c9147ccf3db90146d7fded8dcbc6062bf97c0725baa79db9d7bfe0eeaa5dc00ddfabde8ed1b9aec7f5aa24c41b11d1f2 SHA512 f3fd03c7ab6603eee6e892a1b88888d72fc43cf0a8582ad7e65152cddebb0d14be3a805529fa5467fc82e040cce2616f1693bf294c892c0849d9fb51cbbd04ec
+EBUILD airline-0.9.ebuild 759 BLAKE2B 436c701d3158c3905c2b00c9af14cb27637f15b54d8f4f5fb042136331581547241e74ab2c8fc8f9f782124ea4e7bc0a87186da0f7d544e5ae183cbdc3ece437 SHA512 4ea077bbe732cde3af20eab05373aca10696525de22e741140082c520d16c82d17c64c702dd62c8435a13de95436143c601f46220713b48a2cc5bfeb12afea8c
+EBUILD airline-9999.ebuild 761 BLAKE2B 8765adadb622edda9254aa516563a3230f1088a811a610ce6d9571092cfb3b29c5f2b082ea3adba859b6685a29a0b8c93c52618ba1d8a0ddd21534ae587c8afe SHA512 f3cc5f2451af1779c231ce82d955ac6a44fad7d5819e305353d1f1f8f2094207b3e2c6b0a7f6cf7403eac9456761151b414acb74967848e9bb02e9920ce621da
+MISC metadata.xml 341 BLAKE2B 773326b7103bbac0a5d028d4269187e8acd4a7c0603cb1ccdb129c2d3cffed385e87f47fadd5fd8d68dcf5271521ccddc43412b7f8b7ab41dd7618c65f56c849 SHA512 90eec982571c778fff57d1e8a604fd994d249149846544223c2cb0c244c16632fb320fce1eda35641bc0a914cc2a9031bd2e73a1444412119690a2d3729c541a
diff --git a/app-vim/airline/airline-0.9.ebuild b/app-vim/airline/airline-0.9.ebuild
new file mode 100644
index 000000000000..66e1c77f5dea
--- /dev/null
+++ b/app-vim/airline/airline-0.9.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} != 9999* ]] ; then
+ MY_PN=vim-${PN}
+ MY_P=${MY_PN}-${PV}
+ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 x86"
+ S=${WORKDIR}/${MY_P}
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/vim-airline/vim-airline.git"
+fi
+
+DESCRIPTION="vim plugin: lean & mean statusline for vim that's light as air"
+HOMEPAGE="https://github.com/vim-airline/vim-airline/ https://www.vim.org/scripts/script.php?script_id=4661"
+LICENSE="MIT"
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+ default
+
+ # remove unwanted files
+ rm -r t Gemfile Rakefile LICENSE README* || die
+}
diff --git a/app-vim/airline/airline-9999.ebuild b/app-vim/airline/airline-9999.ebuild
new file mode 100644
index 000000000000..2b0d045e241b
--- /dev/null
+++ b/app-vim/airline/airline-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} != 9999* ]] ; then
+ MY_PN=vim-${PN}
+ MY_P=${MY_PN}-${PV}
+ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S=${WORKDIR}/${MY_P}
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/vim-airline/vim-airline.git"
+fi
+
+DESCRIPTION="vim plugin: lean & mean statusline for vim that's light as air"
+HOMEPAGE="https://github.com/vim-airline/vim-airline/ https://www.vim.org/scripts/script.php?script_id=4661"
+LICENSE="MIT"
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+ default
+
+ # remove unwanted files
+ rm -r t Gemfile Rakefile LICENSE README* || die
+}
diff --git a/app-vim/airline/metadata.xml b/app-vim/airline/metadata.xml
new file mode 100644
index 000000000000..9135445654a8
--- /dev/null
+++ b/app-vim/airline/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">bling/vim-airline</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/align-43 b/app-vim/align-43
deleted file mode 100644
index b3146b75cec6..000000000000
--- a/app-vim/align-43
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: commands and maps to help produce aligned text
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=294
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=vim
-RDEPEND=app-vim/cecutil || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/align-43.tar.bz2 https://dev.gentoo.org/~radhermit/vim/align-43.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=fad11c041de7f69a34fcdc559db0833d
diff --git a/app-vim/align/Manifest b/app-vim/align/Manifest
new file mode 100644
index 000000000000..2991875f06e5
--- /dev/null
+++ b/app-vim/align/Manifest
@@ -0,0 +1,3 @@
+DIST align-43.tar.bz2 34490 BLAKE2B 61fa5d7233275ca372541379bf498004553daca788d1cf4f23da7ddae001530507cab551d8c49a747fa252c88acc0a8f0d24f8d58e515fb9db31bf1c76c1b26a SHA512 b796ce56a60982a1b974a55e6b3ec74cd13ad8b572b00f49d814f22385d76441cb244c913216af3ef0d2ad128d5871eb60e5fc70343e55ce88453356941b0ecd
+EBUILD align-43.ebuild 392 BLAKE2B b0656b35697da22acd25e641199e7be1f9232cabf9fa5a1d0e2b1b52f3a4fe5acf73c4dbbd481d4b45fdc19f79e01c580fa47c258ff7881eeaccd59f52c6f222 SHA512 beea50bf7e363e89e185ab82a858d111b32b300cd7039a2c7e019e58db7fa549d12ffdc2230af72c8ae0643ccd8768c062349398039284d59af6dde784ba59ab
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/align/align-43.ebuild b/app-vim/align/align-43.ebuild
new file mode 100644
index 000000000000..877894bd4964
--- /dev/null
+++ b/app-vim/align/align-43.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: commands and maps to help produce aligned text"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=294"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+
+RDEPEND="app-vim/cecutil"
+
+VIM_PLUGIN_HELPFILES="align"
diff --git a/app-vim/align/metadata.xml b/app-vim/align/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/align/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/alternate-2.18-r1 b/app-vim/alternate-2.18-r1
deleted file mode 100644
index 0c20e6f099b9..000000000000
--- a/app-vim/alternate-2.18-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: quickly switch between .c and .h files
-EAPI=6
-HOMEPAGE=https://github.com/vim-scripts/a.vim https://www.vim.org/scripts/script.php?script_id=31
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=alternate
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/alternate-2.18.tar.bz2 https://dev.gentoo.org/~radhermit/vim/alternate-2.18.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=320a965fd09558862d24995dcad1a951
diff --git a/app-vim/alternate-2.18-r2 b/app-vim/alternate-2.18-r2
deleted file mode 100644
index cf0109d25cd1..000000000000
--- a/app-vim/alternate-2.18-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: quickly switch between .c and .h files
-EAPI=6
-HOMEPAGE=https://github.com/vim-scripts/a.vim https://www.vim.org/scripts/script.php?script_id=31
-KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=alternate
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/vim-scripts/a.vim/archive/2.18.tar.gz -> alternate-2.18.tar.gz https://www.vim.org/scripts/download_script.php?src_id=6347 -> alternate.txt
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=8b9d45122e5cf3d48b19d4029a4052b0
diff --git a/app-vim/alternate/Manifest b/app-vim/alternate/Manifest
new file mode 100644
index 000000000000..e560ce24b814
--- /dev/null
+++ b/app-vim/alternate/Manifest
@@ -0,0 +1,7 @@
+AUX alternate-2.18-hh-cc-alternation.patch 918 BLAKE2B 0362420f64fdd1607529842d965e4f6bcafa49467e7d6befd9621844f47ff2c1f58e22bd1e1efd5579b6373bd24a0c7974e468cf9edf471a58e964718a25c506 SHA512 b1f524d47785e7482791b56f891e624da2a06739483d0584d080f691eaf89c9a350e708fd1369c41b6f99a263d7395b25572366e0b90b0349230079fbdcea4b9
+DIST alternate-2.18.tar.bz2 7907 BLAKE2B 574369557d3a56b163e7288bc60636649a2c44192c56d1d30464cbc2eb89e672aece59a205d39124e062037b3bc4983f628ae0bed53b7982915c8f9546ec4117 SHA512 397d39a5c5fd186f32f3e0a1651f9b9f739899ffcfdd344e85117c4bb676d8fb8c668410754fefe8934ff1a57537387d49d115dfa17bdca896e423935840ae3f
+DIST alternate-2.18.tar.gz 8652 BLAKE2B f6e50d3e1499fb913f7cfa4ff95df180855c7857a700428be1339916aed4513bf77a8da62b75407a6c129f4da3e3bcd00f5caed53d7a939a2eac96a287a11ffe SHA512 d797b99cbe536285d87c5bb14adfcaa3e18611351c8529d9a0755606e766ecc006f19af5cd9b9535f236220dc525bbc27e1280cbb1e3c71f7444cdefd506cefa
+DIST alternate.txt 8897 BLAKE2B b2c2ad9e39c98c82592034ddb0db79803f39bdf3c8d55307aecc488855a75c7be508b41a6a6cf9d3f3d0f4e938feb65fdd756040d8e51e0244c9dc6b9fbacd86 SHA512 92b24aef5fe1fb459b4cb85ca780ae20126bc79138ac15dec652c15a89b688d40bedc00bdae8fce912c8805b24b8805e45ddbd9e6b1ec10c20e61eed11d37651
+EBUILD alternate-2.18-r1.ebuild 727 BLAKE2B e09fcbd230d6ff7ca1f940556a16483f7fcf9eca457abbfe519fb2c27acbd794b633a96bd2e7ab6f35685832625dd00234374041b1132f122a85854ef48970ef SHA512 1b0932395f1783e4adcad151dc5f12c71938706f15210f26137f6932a30ec17da4f842ddb816e00fb9831bda8c746c3bdc0aa82e091881b7185c1a9c5e6341ac
+EBUILD alternate-2.18-r2.ebuild 1013 BLAKE2B 57659ca6fb819c9bd22975a31f3e51a84062e31d8b9c44944f80cc95d36149c4d476ab6e7ec2da8bd443af6020dc2d83907d7a2c27c487e29f94d35d4fd9c3a5 SHA512 bbf5ef860e9480e8fbc7dd62ffe6999e9c7d1d5a1f1dde913b9f56318415d5884497f77d55b5c1a168174eab00d145b373bd0a1276960cf4597e7f6db26c5c25
+MISC metadata.xml 331 BLAKE2B 2dc5ef5397f37066b5fc7d3a3c5c04185632f538fa6efb5006d0d8aa12d51696464850b2b3a0aea4e7bff8c3e9caf9cbe9e90a312e903d0b5313e29eb5588d3c SHA512 ef4ca068ea9f5409c814ca371c0f68456799bed2bae3019cf2ea3af5c2d13750a059f1d885e2c901cc6549cb7915dcb48abb9d5ce7d67210d89b73d79a2e319d
diff --git a/app-vim/alternate/alternate-2.18-r1.ebuild b/app-vim/alternate/alternate-2.18-r1.ebuild
new file mode 100644
index 000000000000..dd9a4b2a2719
--- /dev/null
+++ b/app-vim/alternate/alternate-2.18-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin eutils
+
+DESCRIPTION="vim plugin: quickly switch between .c and .h files"
+HOMEPAGE="https://github.com/vim-scripts/a.vim
+https://www.vim.org/scripts/script.php?script_id=31"
+
+LICENSE="alternate"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides a new :A command which will switch between a .c
+file and the associated .h file. There is also :AS to split windows and
+:AV to split windows vertiically."
+
+PATCHES=(
+ "${FILESDIR}"/${P}-hh-cc-alternation.patch
+)
+
+src_prepare() {
+ default
+}
diff --git a/app-vim/alternate/alternate-2.18-r2.ebuild b/app-vim/alternate/alternate-2.18-r2.ebuild
new file mode 100644
index 000000000000..5b01204abb9e
--- /dev/null
+++ b/app-vim/alternate/alternate-2.18-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: quickly switch between .c and .h files"
+HOMEPAGE="https://github.com/vim-scripts/a.vim https://www.vim.org/scripts/script.php?script_id=31"
+
+SRC_URI="
+ https://github.com/vim-scripts/a.vim/archive/${PV}.tar.gz -> ${P}.tar.gz
+ https://www.vim.org/scripts/download_script.php?src_id=6347 -> ${PN}.txt"
+
+LICENSE="alternate"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides a new :A command which will switch between a .c
+file and the associated .h file. There is also :AS to split windows and
+:AV to split windows vertiically."
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-hh-cc-alternation.patch
+)
+
+S="${WORKDIR}/a.vim-${PV}"
+
+src_prepare() {
+ default
+ mkdir -p "${S}/doc" || die
+ cp "${DISTDIR}/${PN}.txt" "${S}/doc" || die
+}
diff --git a/app-vim/alternate/files/alternate-2.18-hh-cc-alternation.patch b/app-vim/alternate/files/alternate-2.18-hh-cc-alternation.patch
new file mode 100644
index 000000000000..14b314aa0e0c
--- /dev/null
+++ b/app-vim/alternate/files/alternate-2.18-hh-cc-alternation.patch
@@ -0,0 +1,18 @@
+--- a/plugin/a.vim 2005-05-06 22:20:24.000000000 +0100
++++ b/plugin/a.vim 2005-06-20 15:45:45.000000000 +0100
+@@ -57,13 +57,14 @@
+ " Mappings for C and C++
+ call <SID>AddAlternateExtensionMapping('h',"c,cpp,cxx,cc,CC")
+ call <SID>AddAlternateExtensionMapping('H',"C,CPP,CXX,CC")
++call <SID>AddAlternateExtensionMapping('hh',"c,cpp,cxx,cc,CC")
+ call <SID>AddAlternateExtensionMapping('hpp',"cpp,c")
+ call <SID>AddAlternateExtensionMapping('HPP',"CPP,C")
+ call <SID>AddAlternateExtensionMapping('c',"h")
+ call <SID>AddAlternateExtensionMapping('C',"H")
+ call <SID>AddAlternateExtensionMapping('cpp',"h,hpp")
+ call <SID>AddAlternateExtensionMapping('CPP',"H,HPP")
+-call <SID>AddAlternateExtensionMapping('cc',"h")
++call <SID>AddAlternateExtensionMapping('cc',"h,hh")
+ call <SID>AddAlternateExtensionMapping('CC',"H,h")
+ call <SID>AddAlternateExtensionMapping('cxx',"h")
+ call <SID>AddAlternateExtensionMapping('CXX',"H")
diff --git a/app-vim/alternate/metadata.xml b/app-vim/alternate/metadata.xml
new file mode 100644
index 000000000000..e9468b3dde77
--- /dev/null
+++ b/app-vim/alternate/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">vim-scripts/a.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/ansiesc-12 b/app-vim/ansiesc-12
deleted file mode 100644
index 08f93a925d5e..000000000000
--- a/app-vim/ansiesc-12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: ansi escape sequences concealed, but highlighted as specified
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=302
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=app-vim/cecutil || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/ansiesc-12.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ansiesc-12.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=f692fefcd1d7ae177fdf7d437dd6710f
diff --git a/app-vim/ansiesc/Manifest b/app-vim/ansiesc/Manifest
new file mode 100644
index 000000000000..c594c8403c0b
--- /dev/null
+++ b/app-vim/ansiesc/Manifest
@@ -0,0 +1,3 @@
+DIST ansiesc-12.tar.bz2 8647 BLAKE2B 224b38073e5013705b90d4c98dd768dc090bcb2ff9336d18a680d1ecf477070963db8e64d94f91b49ffa3b2986ff52114ee472f02519255aab00bef5d1c14516 SHA512 e699974e3b2e532e3c6dca038a148dca8cc3d3a7efa65d63de63e259a34958f62bb7e43b1078d21fcab4603c856dba392e6e82ddb90e2335dc714e9ad60e336e
+EBUILD ansiesc-12.ebuild 396 BLAKE2B 933915c2d148dbf86d0e357f70c51532fa0b1178d552d42fea29b4d2bdcb68518bb943fd849b4daa9ccb0d78ea780e5e1c946ac253967d5a9d4a9da8e1907c93 SHA512 5004ccb5270e6ac02da25545c819c412f70bd105178ac7dd4cb9521e994f903f3aac2207cc56d0a356755aa233bb01612864c712586055cc3486132d03a0d8c3
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/ansiesc/ansiesc-12.ebuild b/app-vim/ansiesc/ansiesc-12.ebuild
new file mode 100644
index 000000000000..b45dfc4f9b25
--- /dev/null
+++ b/app-vim/ansiesc/ansiesc-12.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: ansi escape sequences concealed, but highlighted as specified"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=302"
+LICENSE="public-domain"
+KEYWORDS="amd64 x86"
+
+RDEPEND="app-vim/cecutil"
+
+VIM_PLUGIN_HELPFILES="AnsiEsc.txt"
diff --git a/app-vim/ansiesc/metadata.xml b/app-vim/ansiesc/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/ansiesc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/ant_menu-0.5.7.1-r1 b/app-vim/ant_menu-0.5.7.1-r1
deleted file mode 100644
index 7833eb870e48..000000000000
--- a/app-vim/ant_menu-0.5.7.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Java ant build system integration
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=155
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=LGPL-2
-RDEPEND=dev-java/ant || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/ant_menu-0.5.7.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ant_menu-0.5.7.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=6fc546a7ba8b0108e52a35a74ec9a0bf
diff --git a/app-vim/ant_menu/Manifest b/app-vim/ant_menu/Manifest
new file mode 100644
index 000000000000..df20f4fc1299
--- /dev/null
+++ b/app-vim/ant_menu/Manifest
@@ -0,0 +1,3 @@
+DIST ant_menu-0.5.7.1.tar.bz2 3786 BLAKE2B 43f1e7c90a9c72a1b9998ae126d931b398c6631055e2d15fe0bc981cafb97ee6be8e38fb9b9f9757557cbaab8155381c9cbb42e92c056e14b06e210925bee321 SHA512 e8cc2bbe416d54137839e6f122fbcf52398321c8faa5b3a83ba42661c889c29af44029a3ffb386667228950c49d01247703cc6dce8101ea622cb3586c9a07fb4
+EBUILD ant_menu-0.5.7.1-r1.ebuild 439 BLAKE2B b30d472d25e1b4c8bb7fac67cd61008eba831c604ad251419d500a72728556465f68699864f2f707d37e15082c8d72a19b00b6d25f5b9e0b9093598aefde4dd0 SHA512 dc05c13a41c6cfbfe60794d7b65b9f9f632355e9dcf400bfd2d56213d82b7f508727e02636bf5260c9dd2b0f53d08e002c207a69798a7ba1c6afd3d14d7e5f2a
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/ant_menu/ant_menu-0.5.7.1-r1.ebuild b/app-vim/ant_menu/ant_menu-0.5.7.1-r1.ebuild
new file mode 100644
index 000000000000..57337fc2c004
--- /dev/null
+++ b/app-vim/ant_menu/ant_menu-0.5.7.1-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Java ant build system integration"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=155"
+LICENSE="LGPL-2"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+RDEPEND="dev-java/ant"
+
+VIM_PLUGIN_HELPURI="https://www.vim.org/scripts/script.php?script_id=155"
diff --git a/app-vim/ant_menu/metadata.xml b/app-vim/ant_menu/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/ant_menu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/autoalign-14 b/app-vim/autoalign-14
deleted file mode 100644
index 4622040f7538..000000000000
--- a/app-vim/autoalign-14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=app-arch/xz-utils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: automatically align bib, c, c++, tex and vim code
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=884
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=vim
-RDEPEND=>=app-vim/align-30 >=app-vim/cecutil-4 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/autoalign-14.tar.xz https://dev.gentoo.org/~chutzpah/vim/autoalign-14.tar.xz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=a388c19a19352fdd4e18feb6f7ad3df6
diff --git a/app-vim/autoalign/Manifest b/app-vim/autoalign/Manifest
new file mode 100644
index 000000000000..f5e0ca779414
--- /dev/null
+++ b/app-vim/autoalign/Manifest
@@ -0,0 +1,3 @@
+DIST autoalign-14.tar.xz 13400 BLAKE2B eba5a5fe00d264c1b8aaacfb79e9ba6bdb0f6a6314a6a8364c89b7e4136a8edcdae73db2343f94a7b76103285a88e6fa13d60cbaa91a6ac35bea99410776819c SHA512 40107b8e12c4190c4f31c740d9b7615eb0836f4d159e6071526de768e6f7726849cb0cd93af8674aff7d6cfecc1b7f27d5b894628f426c51941bb914b92944f2
+EBUILD autoalign-14.ebuild 771 BLAKE2B b460dc053cc677c1196b3399b5a71a5e11724e6ae053c89f2c8a5a4a22e797d406a82fe7f76f4e2ccec22b9ae7f9affb34c55eb67f0f98ad22c814c85baf69f1 SHA512 96d0ac9dd64f23355a00248305d26ca94a184a3a93514c88df567571e32d0f2b757dc214dde32d31b757da979ede4584232e52ba0cfdf87d417096ed51d85ec1
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/autoalign/autoalign-14.ebuild b/app-vim/autoalign/autoalign-14.ebuild
new file mode 100644
index 000000000000..0d7d12e9d234
--- /dev/null
+++ b/app-vim/autoalign/autoalign-14.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: automatically align bib, c, c++, tex and vim code"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=884"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+if [[ ${PV} != 9999* ]] ; then
+ SRC_URI="mirror://gentoo/${P}.tar.xz
+ https://dev.gentoo.org/~chutzpah/vim/${P}.tar.xz"
+fi
+
+DEPEND="app-arch/xz-utils"
+RDEPEND="
+ >=app-vim/align-30
+ >=app-vim/cecutil-4"
+
+VIM_PLUGIN_HELPFILES="autoalign"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+ # Don't use the cecutil.vim included in the tarball, use the one
+ # provided by app-vim/cecutil instead.
+ rm plugin/cecutil.vim || die
+}
diff --git a/app-vim/autoalign/metadata.xml b/app-vim/autoalign/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/autoalign/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/automatictexplugin-12.5-r1 b/app-vim/automatictexplugin-12.5-r1
deleted file mode 100644
index 772291249ac2..000000000000
--- a/app-vim/automatictexplugin-12.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a comprehensive plugin for editing LaTeX files
-EAPI=5
-HOMEPAGE=http://atp-vim.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !app-vim/vim-latex app-vim/align app-text/wdiff dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-tex/latexmk dev-tex/detex virtual/tex-base python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/atp-vim/releases/AutomaticTexPlugin_12.5.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=c2590af0b7cb34b49ddf72fa41be9209
diff --git a/app-vim/automatictexplugin/Manifest b/app-vim/automatictexplugin/Manifest
new file mode 100644
index 000000000000..d9e8ade29fa8
--- /dev/null
+++ b/app-vim/automatictexplugin/Manifest
@@ -0,0 +1,3 @@
+DIST AutomaticTexPlugin_12.5.tar.gz 442431 BLAKE2B 8e6c199df24336f318d37248d96f1f1c953c9f0d0e6cd05f1891403b896aa3ea870dcd9ac72c530aa3779e65804f318bfec6ca769592091dc29cba25b2371316 SHA512 93e48b3d7eb9bdc0319bf03d0ddc59f49c2aab63170030b4234fa83aa3aeb739f1384c4a94e09e630b82d328d9cbfbbdfbf493e6decff915ad9cd4d5b2fc3a5b
+EBUILD automatictexplugin-12.5-r1.ebuild 825 BLAKE2B 5c0a06bd07f68d396b66552c5159e945e3137dc70adad006396bb3adb50aaf359a7a181f009a380830caba6a343b0951afde277f12e267a8d95c7c23e2f48156 SHA512 129af107a67db846ed10fb3b82b2e08e141d836b5d1ad673266457c5d3d05a658c6c48ccfb7efe722f229fe9baa376733efaad28bf72787b74a6ad36d3cfb442
+MISC metadata.xml 326 BLAKE2B 06ff44159678364bab7d0bbc453b9ce39504c5b70b23438919f8fe449a60aa8e1755624bd7474073dc9f2f1135a403d207765171fde940d3c5e56d7fb1019f0f SHA512 8ed4ff2cf60c6e0c39bb3c60c4f9ad4f1a5b6888192bb43fa9f0fb45efd89a549de839c60678bfbe6ed2353f594ea6b28b53f63ae2530650c0ea563325a0f5ff
diff --git a/app-vim/automatictexplugin/automatictexplugin-12.5-r1.ebuild b/app-vim/automatictexplugin/automatictexplugin-12.5-r1.ebuild
new file mode 100644
index 000000000000..d3a67dadea3a
--- /dev/null
+++ b/app-vim/automatictexplugin/automatictexplugin-12.5-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 vim-plugin
+
+MY_P="AutomaticTexPlugin_${PV}"
+DESCRIPTION="vim plugin: a comprehensive plugin for editing LaTeX files"
+HOMEPAGE="http://atp-vim.sourceforge.net/"
+SRC_URI="mirror://sourceforge/atp-vim/releases/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+KEYWORDS="amd64 x86"
+
+S=${WORKDIR}
+
+VIM_PLUGIN_HELPFILES="automatic-tex-plugin.txt"
+
+RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
+ !app-vim/vim-latex
+ app-vim/align
+ app-text/wdiff
+ dev-python/psutil[${PYTHON_USEDEP}]
+ dev-tex/latexmk
+ dev-tex/detex
+ virtual/tex-base
+ ${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_prepare() {
+ python_fix_shebang .
+}
diff --git a/app-vim/automatictexplugin/metadata.xml b/app-vim/automatictexplugin/metadata.xml
new file mode 100644
index 000000000000..037d63f53966
--- /dev/null
+++ b/app-vim/automatictexplugin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">atp-vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/bash-support-4.2.1 b/app-vim/bash-support-4.2.1
deleted file mode 100644
index 8261c830e383..000000000000
--- a/app-vim/bash-support-4.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: write and run bash scripts using menus and hotkeys
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=365
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/bash-support-4.2.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/bash-support-4.2.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=f560261234f8d1f57e1c9e1744090509
diff --git a/app-vim/bash-support/Manifest b/app-vim/bash-support/Manifest
new file mode 100644
index 000000000000..6310db35d2f4
--- /dev/null
+++ b/app-vim/bash-support/Manifest
@@ -0,0 +1,3 @@
+DIST bash-support-4.2.1.tar.bz2 115200 BLAKE2B 2fab4f1bb0897af389a206051e63d2fe7a8cd89367298b1be51146eed7c0d788b23cec7bc81ce3056d26b5efc920043e67be003e4e6bfe25b503d532c74d9c07 SHA512 12ab39f5cffb58e4adb2137265d6c4f1a61b5f2e360f6866c21ead0a67e02a5445bd12fec5b00b26e5d6102b3aaab99b8b13539a67575067c3ef9b26c4ef8fba
+EBUILD bash-support-4.2.1.ebuild 467 BLAKE2B 4c82f25ae607a82f5a420734c3ce4eca70a4f46920e18c12df7359749a58cc49b7bdd760d61d9f359e5676817cceb55f152f01c2551b4099ef5b77b5c85f3a9b SHA512 a78d7140c56889dc3710926085b653b4693aefc21ade0b453bcffea1ded123c40c4704ecfcd4f0bd71676f07ba14bff6a08972d54f028463e97d35a2be4761f9
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/bash-support/bash-support-4.2.1.ebuild b/app-vim/bash-support/bash-support-4.2.1.ebuild
new file mode 100644
index 000000000000..f48008913875
--- /dev/null
+++ b/app-vim/bash-support/bash-support-4.2.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: write and run bash scripts using menus and hotkeys"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=365"
+LICENSE="public-domain"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_install() {
+ dodoc ${PN}/doc/{ChangeLog,bash-hotkeys.pdf}
+ rm -rf ${PN}/doc || die
+
+ vim-plugin_src_install
+}
diff --git a/app-vim/bash-support/metadata.xml b/app-vim/bash-support/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/bash-support/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/bnf-syntax-1.2-r2 b/app-vim/bnf-syntax-1.2-r2
deleted file mode 100644
index fe2289a8f83b..000000000000
--- a/app-vim/bnf-syntax-1.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: BNF file syntax highlighting
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=250
-KEYWORDS=alpha amd64 ia64 ~mips ppc ppc64 sparc x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/bnf-syntax-1.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/bnf-syntax-1.2.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=82a47db19c387272cc26f2e3d4a6981f
diff --git a/app-vim/bnf-syntax/Manifest b/app-vim/bnf-syntax/Manifest
new file mode 100644
index 000000000000..423084150d3b
--- /dev/null
+++ b/app-vim/bnf-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST bnf-syntax-1.2.tar.bz2 887 BLAKE2B 11923f80153d760e92577e461fb912a13ea6ac1ab8c48b6371362d9f5e6ddacf520608626ecb2020f0bc043106241a818b53131be43c991720ae37df8ec40132 SHA512 e073866a8dd41bc0ab982e250bf2a803d78916dbdaafabe504a6854f67255fe4ed84a4db426f1cbde77c9b0a059070fda666338c53b6ddcc7e46f04d9f0265d6
+EBUILD bnf-syntax-1.2-r2.ebuild 556 BLAKE2B ee6139b5b201617be9bee86c7e8a2f2506ae604d62599ccc822e1614b214beb73d5bdae64bfb6828c9b83132d41975ab8bc0e561e3106f7d9282028ee1267372 SHA512 bbf353bcf9a5436bb2f744bf0bb02273691bc05e7506dd4061fd7b987acb9a03a958b053c14b1ad5c3404e79a443d03f7f0763d4009a65c99d891eb88d246ccd
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/bnf-syntax/bnf-syntax-1.2-r2.ebuild b/app-vim/bnf-syntax/bnf-syntax-1.2-r2.ebuild
new file mode 100644
index 000000000000..5df55562ff91
--- /dev/null
+++ b/app-vim/bnf-syntax/bnf-syntax-1.2-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: BNF file syntax highlighting"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=250"
+LICENSE="vim.org"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for BNF files."
+
+src_prepare() {
+ default
+ # fix hi link to use def, bug #101790.
+ sed -i -e 's,hi link,hi def link,g' syntax/bnf.vim || die "sed failed"
+}
diff --git a/app-vim/bnf-syntax/metadata.xml b/app-vim/bnf-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/bnf-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/brainfuck-syntax-1.0.2 b/app-vim/brainfuck-syntax-1.0.2
deleted file mode 100644
index ad7a8087f514..000000000000
--- a/app-vim/brainfuck-syntax-1.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: BrainFuck source file syntax highlighting
-EAPI=0
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=716
-KEYWORDS=amd64 ~mips ppc ppc64 x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/brainfuck-syntax-1.0.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/brainfuck-syntax-1.0.2.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=ef85060c2863b28248800f761b25a269
diff --git a/app-vim/brainfuck-syntax-1.0.3 b/app-vim/brainfuck-syntax-1.0.3
deleted file mode 100644
index 6939ea1a9eaf..000000000000
--- a/app-vim/brainfuck-syntax-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: BrainFuck source file syntax highlighting
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=716
-KEYWORDS=~amd64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=BSD-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/brainfuck-syntax-1.0.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/brainfuck-syntax-1.0.3.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=d938859aa292109752ef7df4bf4c4b89
diff --git a/app-vim/brainfuck-syntax/Manifest b/app-vim/brainfuck-syntax/Manifest
new file mode 100644
index 000000000000..bf942852a5bc
--- /dev/null
+++ b/app-vim/brainfuck-syntax/Manifest
@@ -0,0 +1,5 @@
+DIST brainfuck-syntax-1.0.2.tar.bz2 916 BLAKE2B 0436337aef6cb28b55806510046c3604840f6f7e1cf0a1f94222886658474e41f76879ca1e2b42b5db378fbf98e2f8bffe5da27fe3381af5e778576d377b1576 SHA512 d01e544e45d4ada1c7ed8ca02e72d888fdcd374be8ee45c01d7797fc1e32457be94e0429dc3fc88f12fee063bd70d06af8ab4238795154a82793b6abb42dd974
+DIST brainfuck-syntax-1.0.3.tar.bz2 926 BLAKE2B e5cb55e58d0d2a597cdcc00fd5a1fc482a715b4fda6d0fbd0790ceba261005478091c4c94dfeba0154e4917470ce386b3ebe03bd3e1f90a315b0d5bc2cfc4a97 SHA512 42dbcbe916b19bcb30cadf929cb71aadb7032ebe38c26b1d5fa2fc9d8513d3dda275df289cc5fdf094f9fccd5f4e720e6c24d006d431fd3668f73d2c44e8b82a
+EBUILD brainfuck-syntax-1.0.2.ebuild 425 BLAKE2B 4e8bfa243cbbac9b459ad956a57bb5b57b38b6ec10aee103dbc22c7102c4ddc291ab2b9f326712ff98de905e608be7137f4b9385f978dc878c720e982d01cb24 SHA512 2b3b8bda3732b23384cca35014de4c556c103c6276c6246f3535c0e945b6aeba64a83896922d459eaf6f53113a7084ac00148fa8f51c9992d071d2f27281bd33
+EBUILD brainfuck-syntax-1.0.3.ebuild 416 BLAKE2B df4397a6e2fc07e3d463537657eb74a0b7fbf0d58fb085fc261afc26571308d0a8f11f61a818fbccef5ef75500472f38fb32ea568513e211cbfcc6bde2dd536e SHA512 6592246bd4003317536964c006aa4a73dee9875a46aa2d6682f876584164066b34c9e074f71aa6dbf84269075a4fd36734518636b54003a1a784826ccc41380a
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild b/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild
new file mode 100644
index 000000000000..b3eca59a1f52
--- /dev/null
+++ b/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: BrainFuck source file syntax highlighting"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=716"
+LICENSE="vim.org"
+KEYWORDS="amd64 ~mips ppc ppc64 x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for BrainFuck source files."
diff --git a/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.3.ebuild b/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.3.ebuild
new file mode 100644
index 000000000000..3228130a7b40
--- /dev/null
+++ b/app-vim/brainfuck-syntax/brainfuck-syntax-1.0.3.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: BrainFuck source file syntax highlighting"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=716"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+
+VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for BrainFuck source files."
diff --git a/app-vim/brainfuck-syntax/metadata.xml b/app-vim/brainfuck-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/brainfuck-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/breakpts-4.0-r1 b/app-vim/breakpts-4.0-r1
deleted file mode 100644
index e2ca75035116..000000000000
--- a/app-vim/breakpts-4.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: sets vim breakpoints visually
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=618
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) >=app-vim/multvals-3.6.1 >=app-vim/genutils-1.13 >=app-vim/foldutil-1.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/breakpts-4.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/breakpts-4.0.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=ef0e47841da38c86361416bf853635f2
diff --git a/app-vim/breakpts/Manifest b/app-vim/breakpts/Manifest
new file mode 100644
index 000000000000..1e2df12aa0e4
--- /dev/null
+++ b/app-vim/breakpts/Manifest
@@ -0,0 +1,3 @@
+DIST breakpts-4.0.tar.bz2 17349 BLAKE2B c7ad9eed8fb13537c940e6868f5e4e5dd812a6b7f7c26c4617e3c24905b6e2a817dc91990b613b700e793dd763a6841f85dd7f9cc42fb9f5afc25c3609f909fc SHA512 a480bf32cd3e756ac25849b1d5fd20521bd8c965454bb94c33810c9d1d4464762a731d08dcae858c59853a6cf41ab3cb6cddeda440c8b041cc8ec192ab2bd2fd
+EBUILD breakpts-4.0-r1.ebuild 682 BLAKE2B bf0c5025e3e2707a805b6fbd22f97313235c6a7d55f0397015c36f7e0041305c374fc44104d5a26c1f56f9a7452b60fa26f72869d6fb65b1f433e9f90930780a SHA512 90aed4c69a96cf1cbbd27162d9e1b057792f3f1ccaf6335a99060bbf89fe2b1dfb0344c2999004802628329b567ff33728faf643df0cfc5eabd73ece79a1c250
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/breakpts/breakpts-4.0-r1.ebuild b/app-vim/breakpts/breakpts-4.0-r1.ebuild
new file mode 100644
index 000000000000..2358b0b21ccd
--- /dev/null
+++ b/app-vim/breakpts/breakpts-4.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: sets vim breakpoints visually"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=618"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+RDEPEND="
+ || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
+ >=app-vim/multvals-3.6.1
+ >=app-vim/genutils-1.13
+ >=app-vim/foldutil-1.6"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin allows breakpoints to be set and cleared visually. To start,
+use :BreakPts, move to the required function and press <CR>. Breakpoints
+can then be added using :BPToggle or <F9>."
diff --git a/app-vim/breakpts/metadata.xml b/app-vim/breakpts/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/breakpts/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/bufexplorer-7.4.18 b/app-vim/bufexplorer-7.4.18
deleted file mode 100644
index dab0ddb5ee72..000000000000
--- a/app-vim/bufexplorer-7.4.18
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: easily browse vim buffers
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/jlanzarotta/bufexplorer/archive/v7.4.18.tar.gz -> bufexplorer-7.4.18.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=a4e6b174db2b8b146321420f26d40ac2
diff --git a/app-vim/bufexplorer-7.4.19 b/app-vim/bufexplorer-7.4.19
deleted file mode 100644
index 9019b3b25119..000000000000
--- a/app-vim/bufexplorer-7.4.19
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: easily browse vim buffers
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/jlanzarotta/bufexplorer/archive/v7.4.19.tar.gz -> bufexplorer-7.4.19.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=18c706bd9c4a9bfc4403461772be47d1
diff --git a/app-vim/bufexplorer-9999 b/app-vim/bufexplorer-9999
deleted file mode 100644
index aa0d5f055a8d..000000000000
--- a/app-vim/bufexplorer-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: easily browse vim buffers
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer
-LICENSE=BSD
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 8f6de46b0aa318aea0e8cac62ece098b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=f7e2a48b5672799a596195f6cd648d89
diff --git a/app-vim/bufexplorer/Manifest b/app-vim/bufexplorer/Manifest
new file mode 100644
index 000000000000..f86f4d8ff46c
--- /dev/null
+++ b/app-vim/bufexplorer/Manifest
@@ -0,0 +1,6 @@
+DIST bufexplorer-7.4.18.tar.gz 25117 BLAKE2B 2768f7fdc31b4678147d492f3322cf12f97384f3fab4f5219f7237263e83060d24b476c25dabc6850aa6b6168f98b4350c3dfe0fd61a3975a6e607ac4e11e3e4 SHA512 420e3d352bb31a80311c3ab8ad62f7a6530fdcf78eb0bc45717e075f81a3d1a42fef18d756c129d2c25e8d5f7d8e1161affae905cfa7d8b0d1d3c9245c9f1bea
+DIST bufexplorer-7.4.19.tar.gz 25679 BLAKE2B 814adb79fc196174a9915643a3617e3c324f963792a2706f59f35699289524d0b93e7337ec3697d03e3a98b9f15018d40dbf9c0d4f35d6cebde8ea6de4cf1b23 SHA512 d38bcb52a50cfcf6d0b66ca6f1290a6be53d5cee98b3d2d7a93e01b5ef904af53c6cc8256e667bdeeb23a58344f5d69838bb7b5d71d225a83d1e173b99344888
+EBUILD bufexplorer-7.4.18.ebuild 504 BLAKE2B ee68329b9446ebf1c7571af162de167dae2ea85fcdbc1b9ac88cbb623bdf9cb728d1ef7fe296be1309542dd5ea01c68a72effaf920274f2a8b731ef26db4c168 SHA512 90dc950091b57c65896ff66b77e3b65671cbb21ae37f878445b3771153ce9509dcc5984fe0c3734ae693ca04518328b8517312188eb691a03ef4066df06752ff
+EBUILD bufexplorer-7.4.19.ebuild 506 BLAKE2B 8bd50099f3da4d4841089e63f9634f480190c4e5ef0a73ddb3d7f181ebb3ae32a72970fc51df72d7c3e31e46c288f69ac470095e246855f36838f82235670038 SHA512 b396c84c4fda3fbd12d1a91a96012c1cae337c8db7bd2eef56e70b79ac3d45645e20139f049c8749cec6d146eac0487c6469b6d97d67a30674a15c24e67ca5cc
+EBUILD bufexplorer-9999.ebuild 629 BLAKE2B 1bb452f22f906ffa14e6dec853dd5dfe14a478cde4c4e7a47984d42ac12e14b338423bdce9869c5643d4a4f30efab691018f6c8c11fff5714dfbd60e110965dc SHA512 7fe257c7df973c65d80920d2af28c710e21a8f3337628b517faa546de954b27b1303be55334b0c89cbbcb814b8cc40c4a6a75d667b501df8018de803764d919b
+MISC metadata.xml 337 BLAKE2B 1f7ff65f6508fb9463322cbf6d76f55455dd281dbc5b1227fea6f066e0c197216cbc775373fef3a8d8bece89f39b84ff5546ab5b3ee0ffe6244ddb482e51d2ef SHA512 31c66f4059fd32f6521fa33b6d655d6d006a71b6d14fc008e4dbe2cc1b93bd3fe5a8055105afcef07f38845377ebee7ecb41d0f92cf7da73e020dcf72216590e
diff --git a/app-vim/bufexplorer/bufexplorer-7.4.18.ebuild b/app-vim/bufexplorer/bufexplorer-7.4.18.ebuild
new file mode 100644
index 000000000000..c286927dffc5
--- /dev/null
+++ b/app-vim/bufexplorer/bufexplorer-7.4.18.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: easily browse vim buffers"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
+SRC_URI="https://github.com/jlanzarotta/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+ default
+ rm LICENSE README.md || die
+}
diff --git a/app-vim/bufexplorer/bufexplorer-7.4.19.ebuild b/app-vim/bufexplorer/bufexplorer-7.4.19.ebuild
new file mode 100644
index 000000000000..9447a5bc849d
--- /dev/null
+++ b/app-vim/bufexplorer/bufexplorer-7.4.19.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: easily browse vim buffers"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
+SRC_URI="https://github.com/jlanzarotta/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+ default
+ rm LICENSE README.md || die
+}
diff --git a/app-vim/bufexplorer/bufexplorer-9999.ebuild b/app-vim/bufexplorer/bufexplorer-9999.ebuild
new file mode 100644
index 000000000000..e285e23f86cd
--- /dev/null
+++ b/app-vim/bufexplorer/bufexplorer-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/jlanzarotta/bufexplorer.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/jlanzarotta/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: easily browse vim buffers"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer"
+LICENSE="BSD"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+ default
+ rm LICENSE README.md || die
+}
diff --git a/app-vim/bufexplorer/metadata.xml b/app-vim/bufexplorer/metadata.xml
new file mode 100644
index 000000000000..5c41162e1690
--- /dev/null
+++ b/app-vim/bufexplorer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">jlanzarotta/bufexplorer</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/c-support-6.0 b/app-vim/c-support-6.0
deleted file mode 100644
index 008f327b76a7..000000000000
--- a/app-vim/c-support-6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=213
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/c-support-6.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/c-support-6.0.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=2ffc4054c1c16e498b5bdddbc71db621
diff --git a/app-vim/c-support-6.1 b/app-vim/c-support-6.1
deleted file mode 100644
index afed61364ddc..000000000000
--- a/app-vim/c-support-6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=213
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/c-support-6.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/c-support-6.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=b72bc9b7958aead73bfe2c5fb2008b9d
diff --git a/app-vim/c-support-6.1.1 b/app-vim/c-support-6.1.1
deleted file mode 100644
index df1d1de9a06e..000000000000
--- a/app-vim/c-support-6.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=213
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/c-support-6.1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/c-support-6.1.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=e7f6952818b37e2d9b7cca2a2b547eeb
diff --git a/app-vim/c-support/Manifest b/app-vim/c-support/Manifest
new file mode 100644
index 000000000000..e3ca8fdb0d13
--- /dev/null
+++ b/app-vim/c-support/Manifest
@@ -0,0 +1,7 @@
+DIST c-support-6.0.tar.bz2 130832 BLAKE2B 0cec691b367904647b2d8ea0e284027b3b7ce0d3f8db0c8e8d5c9ceac996d0cdcd2899cc4432425fd2ab0ee205069ab95a239686de81c13c77dbf7c16db06811 SHA512 280e8e91b8961ad856524f1869ecd580870ccbb6064c02aefdd5cec7f55a7bf12a17c76a4de91c8d2a7fed25bd96e793909f7cc258b9664f295e1324e0b392da
+DIST c-support-6.1.1.tar.bz2 167371 BLAKE2B 2c1d333d377eb57c52845f215c98d41e15029bd34fbef9cd8844cc2f237d129ed471d64dc71a55495189500de90b6e7fc3bb41cec18d62c51ba3b4ceb0331cc3 SHA512 dda33732505341bc260b9c3f73f95c70c3ee6f0eb50b9d1fd534fc8e83fb21d0caa3feea0ae50cf59da4abbef455c31fe1c02c80bb9168423cfa332941ff0886
+DIST c-support-6.1.tar.bz2 164255 BLAKE2B d57ab7d74eb0cc13767401aa2bad1f7883842d24e47ec0a03fb5354d5a6950029021ec1084acd7e5e86c42e9682eb4b1cc19c8c1f4c4f9d0a147571d88d51f8c SHA512 6fdc4f757ba0febfebe0c8898b6b0d582e03d6f7d08523e8663368011c41d6444df2620f96c6276d959b4a05b7c83a0e377bc5a8e75aaed5cf478f8bc83ce9ec
+EBUILD c-support-6.0.ebuild 482 BLAKE2B 3f9a451bd1c1c1e5daf2ab26c8b1d3a38d9f599d24443b730ee7a84e660dc7bd9c93375a365d0903e46ccae35d66fbc29e1e5c5b2a1d6bff975a098a20ef4919 SHA512 7950de1386b3d4dcc32aa11425f99a564e5009f9f91e2f9f3d460d50b15a4c67b8f7f5ee4268e827b62f8e31a1c31f110dac989a960279d1f9796742d3d49e9c
+EBUILD c-support-6.1.1.ebuild 472 BLAKE2B 0ae8b108eb6607233c00bb62a3a00850bad8971a0a3ff0380b08f0acbc9b54889cd3d5bd0ec8c9b142b127546ee857d6dae007b3cdfa63a906ab3e85d30b694f SHA512 34bc159b372bc8d15324b0d7a67f2eb7912410fdc19559d5075d91d6bbee5de7b8e4fd6544584fb620cd99bdfab15d02af0de9ebef29f4b2904308fc42f2fcec
+EBUILD c-support-6.1.ebuild 474 BLAKE2B e51b80a2794749007cdda1a8de58f5779b317461bd1929f8f70b577260ad4eb45e651ab5c894d47f61955f98928ebb89c584bd75e3e070d5d43fa8a33ca29066 SHA512 1c59e8308129105f946554daea9ba016667535a35bb1a115d10dbe2b8c3bd58225a2bd466622ccc95ffc489178c3f8c3969680976a9e9cd99c4ac04edea8ee42
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/c-support/c-support-6.0.ebuild b/app-vim/c-support/c-support-6.0.ebuild
new file mode 100644
index 000000000000..9432efcde238
--- /dev/null
+++ b/app-vim/c-support/c-support-6.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=213"
+LICENSE="public-domain"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_install() {
+ dodoc ${PN}/doc/{ChangeLog,c-hotkeys.pdf}
+ rm -r ${PN}/doc || die
+
+ vim-plugin_src_install
+}
diff --git a/app-vim/c-support/c-support-6.1.1.ebuild b/app-vim/c-support/c-support-6.1.1.ebuild
new file mode 100644
index 000000000000..f9cfe8c262e4
--- /dev/null
+++ b/app-vim/c-support/c-support-6.1.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=213"
+LICENSE="public-domain"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_install() {
+ dodoc ${PN}/doc/{ChangeLog,c-hotkeys.pdf}
+ rm -r ${PN}/doc || die
+
+ vim-plugin_src_install
+}
diff --git a/app-vim/c-support/c-support-6.1.ebuild b/app-vim/c-support/c-support-6.1.ebuild
new file mode 100644
index 000000000000..b845e2e7abfc
--- /dev/null
+++ b/app-vim/c-support/c-support-6.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=213"
+LICENSE="public-domain"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_install() {
+ dodoc ${PN}/doc/{ChangeLog,c-hotkeys.pdf}
+ rm -r ${PN}/doc || die
+
+ vim-plugin_src_install
+}
diff --git a/app-vim/c-support/metadata.xml b/app-vim/c-support/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/c-support/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/calendar-2.9 b/app-vim/calendar-2.9
deleted file mode 100644
index 5e0919943555..000000000000
--- a/app-vim/calendar-2.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: calendar window
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=52
-KEYWORDS=amd64 ~mips ppc x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/calendar-2.9.tar.bz2 https://dev.gentoo.org/~radhermit/vim/calendar-2.9.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=117a15f90011165fe8f56c376584c338
diff --git a/app-vim/calendar/Manifest b/app-vim/calendar/Manifest
new file mode 100644
index 000000000000..07b2fa30ae38
--- /dev/null
+++ b/app-vim/calendar/Manifest
@@ -0,0 +1,3 @@
+DIST calendar-2.9.tar.bz2 11070 BLAKE2B 9c137d6975f3978776e8739dfa0697a6fd9f1828c0903ec529008d6c272e2226418e7f175149f048feecd405235501a88967fd6fa4dc6413eabec4021d675bca SHA512 8d1c29cb1e7b8189447d60bb5e8940b7ed52837c9039bd8ff8e3ce19c5fd7a9a8060291bb8a0c0bd2a2bb677fce388bb7f807f25358f3903c28b07c715ae1a07
+EBUILD calendar-2.9.ebuild 320 BLAKE2B 56d5aa88b5a00b580e2415197df7734c503ea10b84cd0998d116dd88f872dfa867968f897d87161c6731d8a6c9df84994c403493441f96cc4475be0c06ff3cf4 SHA512 728f07ee715dae3c00771ef7ef78c4e7f03d5ae940bb77d34b32c8b6b3c1dbdf5d1322f1e93ed8d171f99d4c19e10ecb357950f7927fe0e87364f39014057ca9
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/calendar/calendar-2.9.ebuild b/app-vim/calendar/calendar-2.9.ebuild
new file mode 100644
index 000000000000..d8ec95a7f8c4
--- /dev/null
+++ b/app-vim/calendar/calendar-2.9.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: calendar window"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=52"
+LICENSE="vim"
+KEYWORDS="amd64 ~mips ppc x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/calendar/metadata.xml b/app-vim/calendar/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/calendar/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/cctree-1.61-r1 b/app-vim/cctree-1.61-r1
deleted file mode 100644
index ebf8f0ded055..000000000000
--- a/app-vim/cctree-1.61-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Cscope based source-code browser and code flow analysis tool
-EAPI=6
-HOMEPAGE=https://sites.google.com/site/vimcctree/
-KEYWORDS=amd64 x86
-LICENSE=bufexplorer.vim
-RDEPEND=dev-util/cscope || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/cctree-1.61.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cctree-1.61.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=608d78a654f35de7b8b36ad920ae90d1
diff --git a/app-vim/cctree/Manifest b/app-vim/cctree/Manifest
new file mode 100644
index 000000000000..39b028bc67fe
--- /dev/null
+++ b/app-vim/cctree/Manifest
@@ -0,0 +1,3 @@
+DIST cctree-1.61.tar.bz2 23243 BLAKE2B ba39d476ed68109a614cf5f626a44010aaa7e6154edf0c05f87973c46d95957a46fa22e29d73b0d3d602bae78039fd0bf6ef356d94f6570e0cea205bb6335572 SHA512 9d29c573ef3cdcde1ec91ca34684c84c8beb3b89669654b1f9dafab928a11d8f1df77294af06c7612ba8aa7d65dfba69352f3f74dd11c98d22a300907d8a6b0e
+EBUILD cctree-1.61-r1.ebuild 804 BLAKE2B 5aaf44b8cbfcc0dee1470e55b2a946f796456707474c5ce433db2c6c4579ca31f04ff18b22e99cbb07d27115b9aa4224cbb606ab23694544b71f95f91789c252 SHA512 0eb287aa4d494e57248350888c311ebdb92dc4e86c3bb79b45da4e25fc9313dd115717a7f9e8522f254293ef64ef9446dd19689eff66a679798ebcf687b0aebc
+MISC metadata.xml 332 BLAKE2B fa5f17b84fcf8c7beb06eb3ae508493f8f0240beb91be975323a2974991fdd9e82f639df0c2624d1d7741b11d5894f74256bb81994f636700a57ed6a7a57a3e0 SHA512 c1338d54664a59c207fe04fa762db7c824c289912564cb1ef206fde45883e6741426e9967efc2e1fd64594d3c89989b227c702caf45283aef658a03eaf443979
diff --git a/app-vim/cctree/cctree-1.61-r1.ebuild b/app-vim/cctree/cctree-1.61-r1.ebuild
new file mode 100644
index 000000000000..1cc0cf069e51
--- /dev/null
+++ b/app-vim/cctree/cctree-1.61-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Cscope based source-code browser and code flow analysis tool"
+HOMEPAGE="https://sites.google.com/site/vimcctree/"
+LICENSE="bufexplorer.vim"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-util/cscope"
+
+src_prepare() {
+ # There's good documentation included with the script, but it's not
+ # in a helpfile. Since there's rather too much information to include
+ # in a VIM_PLUGIN_HELPTEXT, we'll sed ourselves a help doc.
+ mkdir doc || die
+ sed -e '/" Name Of File/,/".\+Community/!d' -e 's/^" \?//' \
+ -e 's/\(Name Of File: \)\([^.]\+\)\.vim/\1*\L\2.txt*/' \
+ ftplugin/${PN}.vim > doc/${PN}.txt || die
+
+ default
+}
diff --git a/app-vim/cctree/metadata.xml b/app-vim/cctree/metadata.xml
new file mode 100644
index 000000000000..8c235406518e
--- /dev/null
+++ b/app-vim/cctree/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">vim-scripts/CCTree</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/cecutil-17 b/app-vim/cecutil-17
deleted file mode 100644
index dc3f771526ca..000000000000
--- a/app-vim/cecutil-17
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: library used by many of Charles Campbell's plugins
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1066
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/cecutil-17.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cecutil-17.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=a8c0249bffd4a98dfa1b5f809bc199ae
diff --git a/app-vim/cecutil/Manifest b/app-vim/cecutil/Manifest
new file mode 100644
index 000000000000..95352fa6eedb
--- /dev/null
+++ b/app-vim/cecutil/Manifest
@@ -0,0 +1,3 @@
+DIST cecutil-17.tar.bz2 6985 BLAKE2B ae67aec09177198ca2934ec488a76105f9fabb867cb9b435a7696a45074d65876ac04df2bc3f33dcca82220e63d2627e86ca5af08a7d31c6a0ebb29ad85ca1f5 SHA512 2ad7963e5928d3d6b46fc4a8eafe1927445c73e54b8af2869253a8223aa3dba7776a118085b4e7b517845c3872bdac96978981004e863da5a7ff8716acea1393
+EBUILD cecutil-17.ebuild 374 BLAKE2B 0a8945961bf1d3c19d52e5155c1b300f4b8103135a316227b4c8d9d3bf8c60e8e2ef160f63d50281e4cf17a1b0d6d065cd0364cdc15322be9bbbe4bed783d0df SHA512 846f67a261785fd4be2669a2fe1c056c7c6c5378980f22384388dddd096bf3b4738185ca7caa4a08d4a3f2e2c09770fb2364bb61f97fa5f81a92457841b1bc17
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/cecutil/cecutil-17.ebuild b/app-vim/cecutil/cecutil-17.ebuild
new file mode 100644
index 000000000000..5ad2ee32c8a9
--- /dev/null
+++ b/app-vim/cecutil/cecutil-17.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library used by many of Charles Campbell's plugins"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1066"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/cecutil/metadata.xml b/app-vim/cecutil/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/cecutil/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/cfengine-syntax-20141019 b/app-vim/cfengine-syntax-20141019
deleted file mode 100644
index b66c7020a0c8..000000000000
--- a/app-vim/cfengine-syntax-20141019
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Cfengine 3 configuration files syntax
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2904 https://github.com/neilhwatson/vim_cf3
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=GPL-3+
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/cfengine-syntax-20141019.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cfengine-syntax-20141019.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=5a8a424a4efee6b3e7e539c82d1348e6
diff --git a/app-vim/cfengine-syntax/Manifest b/app-vim/cfengine-syntax/Manifest
new file mode 100644
index 000000000000..c94fa88c75af
--- /dev/null
+++ b/app-vim/cfengine-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST cfengine-syntax-20141019.tar.bz2 7611 BLAKE2B e43f3c374292404ebe28dd63bc4ee7f95d51ef6e88948d9155f3c1f6c58c948a58e844325ab7b12b300d277e573a61ea9855041c5389bea4341586ed5e1ce2b6 SHA512 c8987073b9cc9b1494b0d3cb8737a5b99f62c1b99f5b1e84ce1903e37a924ec9b3e2487cb3b72c75dfba40528809289efdaf3641bf6c059a668c6bf073bcb83e
+EBUILD cfengine-syntax-20141019.ebuild 533 BLAKE2B 394f966a09701bb5d0857ea4a9d06492e9dfbcf699095e8b0149aedbcf14ca5021162e45f41f6697844ffd931c04dfd796e865ab1caf9d5f6d7a282cdffa7fb1 SHA512 5dcca2328ac6b458f5bb372598db4aa4a895335d65e4e4d3661c463c4d5991ef07aa32d5c53bac3cded2260e969c64cfbba311df283efb4b0b46733aae912800
+MISC metadata.xml 538 BLAKE2B 3eb09b3af0b2cb8732cc07640aeef9218ce4bffa529437cd2e5fa18a32c36411e29a4a923dcfa9691c67d274e039f54dad872e45979a14cb29c53af746a45bcb SHA512 64ce2e382ba91771caf3d654164d111191f65cbe281d8525ce4ae683ee3148c47f8514e1f01dcc9ec052e0db6ab75c5b2453dbbde5f0e00bd1b4b6da5b0433cc
diff --git a/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild b/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
new file mode 100644
index 000000000000..6459dc9faff8
--- /dev/null
+++ b/app-vim/cfengine-syntax/cfengine-syntax-20141019.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Cfengine 3 configuration files syntax"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2904 https://github.com/neilhwatson/vim_cf3"
+LICENSE="GPL-3+"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 s390 sparc x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for Cfengine configuration
+files. Detection is by filename (/var/cfengine/inputs/)."
diff --git a/app-vim/cfengine-syntax/metadata.xml b/app-vim/cfengine-syntax/metadata.xml
new file mode 100644
index 000000000000..ee538625adbd
--- /dev/null
+++ b/app-vim/cfengine-syntax/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ This package provides Vim syntax highlighting for Cfengine configuration
+ files, and automatic filetype detection for these files based upon
+ filename.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">neilhwatson/vim_cf3</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/checkattach-0.17 b/app-vim/checkattach-0.17
deleted file mode 100644
index ae093d6ff6af..000000000000
--- a/app-vim/checkattach-0.17
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: check for attachments when writing mails with mutt
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2796 https://github.com/chrisbra/CheckAttach
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/checkattach-0.17.tar.bz2 https://dev.gentoo.org/~radhermit/vim/checkattach-0.17.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=6b848ef0261577654b17e48096f7842b
diff --git a/app-vim/checkattach/Manifest b/app-vim/checkattach/Manifest
new file mode 100644
index 000000000000..47a0571cbd6c
--- /dev/null
+++ b/app-vim/checkattach/Manifest
@@ -0,0 +1,3 @@
+DIST checkattach-0.17.tar.bz2 6491 BLAKE2B 5069bf24d09e9d7d6cc10c28681ea57902d9b01baf52727b7491a3c1f5f11907a9934906e3396cdc9db2efa8196007c21573fbcae840191cb18cec9224f9a650 SHA512 98ac172a5fd84bacda8cd682dfb320aceb799098bd1f5a5abcf5834c2a883e7269b0fafbe1e77d2215982ed0548d592c32e80fc4aa67ae3e87c6a69ffc75cdbd
+EBUILD checkattach-0.17.ebuild 393 BLAKE2B 55af7eacad4f26556ec8aa08b21d5897faafdf382e557d9d9d1e4992b557a3ab98c812454efb167fb733f54a0e726f8b5fd24674a336eea96aa71cd9b4af6811 SHA512 4501ca6f3cfc2de127fa3e857b3e5bdde770003da8e4bb659597f3533da3ecd0f8552039befbee45f04a2f6bedf4eb88ada8ccc5fa6b168ac1ccf997dcc73612
+MISC metadata.xml 344 BLAKE2B 693bc7aafe1a27687df50fc216e02a9cd5c2809e2d0544b56cc704a9c34b523ddd3b61a3961fc28c30feee24cb22ef2d9499fec23a9692442d3e9960a4880da3 SHA512 53935b44d8dc0efeb033c8326cd8b4776d863cde5267f3ff03aa2006a825a1f1c94e95b94cff4a0ac9ee25b35219d02fcfc0999f8e4a7f0ce1bbf98c2ba289c7
diff --git a/app-vim/checkattach/checkattach-0.17.ebuild b/app-vim/checkattach/checkattach-0.17.ebuild
new file mode 100644
index 000000000000..8e37492bd15f
--- /dev/null
+++ b/app-vim/checkattach/checkattach-0.17.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: check for attachments when writing mails with mutt"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2796 https://github.com/chrisbra/CheckAttach"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="CheckAttach.txt"
diff --git a/app-vim/checkattach/metadata.xml b/app-vim/checkattach/metadata.xml
new file mode 100644
index 000000000000..b5f3123eb17b
--- /dev/null
+++ b/app-vim/checkattach/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">chrisbra/CheckAttach</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/closetag-0.9.1-r1 b/app-vim/closetag-0.9.1-r1
deleted file mode 100644
index e2ef10253575..000000000000
--- a/app-vim/closetag-0.9.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: close HTML/XML tags quickly
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=13
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/closetag-0.9.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/closetag-0.9.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=1d7deaebfbe34184995263b18a4483ac
diff --git a/app-vim/closetag/Manifest b/app-vim/closetag/Manifest
new file mode 100644
index 000000000000..ce8821a812dd
--- /dev/null
+++ b/app-vim/closetag/Manifest
@@ -0,0 +1,3 @@
+DIST closetag-0.9.1.tar.bz2 4717 BLAKE2B e5324bf5b6017d7a1116c3d9dafb24aeb3151dc772250282be6897d9032412e47e09e7841c70a0703baa0aeae549a6fc15ec1547c1babbea08adbfbe3568425b SHA512 67e10871c98716bf65c1c1f3e07cb65ebd158fb058ee4e51e189703a5848e5f35066fa492c9614703936add21fbb34a387e9cf4a82043d794f3abb62d6c3ff38
+EBUILD closetag-0.9.1-r1.ebuild 418 BLAKE2B f4372d4760f56afe4e6fe127f519e0a35fc62285eb25279da62e5aec327b21d590fd52a8b1ede1fdaba11645cfa6617eb5a77d364a9110388208ccb8d9a8a960 SHA512 85279925059bb11e8b1574568f6619b0dc1c5df5d6686bb6dd6d5bd6949cd917aa43a03176af3efcf90232f429879b0edc8bcfee3b6a032f1e81324999880337
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/closetag/closetag-0.9.1-r1.ebuild b/app-vim/closetag/closetag-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..ab2e93def305
--- /dev/null
+++ b/app-vim/closetag/closetag-0.9.1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: close HTML/XML tags quickly"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=13"
+
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides a <ctrl-_> mapping for closing HTML / XML tags."
diff --git a/app-vim/closetag/metadata.xml b/app-vim/closetag/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/closetag/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/cmdalias-3.0-r1 b/app-vim/cmdalias-3.0-r1
deleted file mode 100644
index ebe72644b33f..000000000000
--- a/app-vim/cmdalias-3.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: library for alias creation
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=746
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/cmdalias-3.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cmdalias-3.0.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=4578c49fc1611daeb63fa31f60e5fef9
diff --git a/app-vim/cmdalias/Manifest b/app-vim/cmdalias/Manifest
new file mode 100644
index 000000000000..c3b46859788a
--- /dev/null
+++ b/app-vim/cmdalias/Manifest
@@ -0,0 +1,3 @@
+DIST cmdalias-3.0.tar.bz2 2601 BLAKE2B 89b36b2bd638dbdc454739e1f9a3cd61715faa5c392bf3a85c937a0ec179f4e35485ac3137fdb84c2d66ba235e44af84d1ce42ca7e8f212438e88eb91f691570 SHA512 a29b8b588c662ca48e8208422e4592e4d2a2908f23ed123b0b2aa639e6c05725dcc6ee0179418dbfdc39108953de064f5da5eec4261f7e9db5efea0d91fe58aa
+EBUILD cmdalias-3.0-r1.ebuild 442 BLAKE2B a7e932c1c2babf9b35c8380b16c0e5c9fdfa1ede74b771525573ab9ea9aa5ab7ddcdf1a37ba50e1d2b675a9747eafec02b27a93d470254145ddb88d15b2d4b7a SHA512 64ba4c261fb9ed34fafa8b049bfd83113fcc206a836dda5e80b80e1205a6ce3af5edd9a67f6aeccf0fedff7a362d464ab5c5ca4c6d645580437ba803b9f743d0
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/cmdalias/cmdalias-3.0-r1.ebuild b/app-vim/cmdalias/cmdalias-3.0-r1.ebuild
new file mode 100644
index 000000000000..0d37167dd15c
--- /dev/null
+++ b/app-vim/cmdalias/cmdalias-3.0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library for alias creation"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=746"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides library functions and is not intended to be used
+directly by the user."
diff --git a/app-vim/cmdalias/metadata.xml b/app-vim/cmdalias/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/cmdalias/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/colorschemes-20140623-r1 b/app-vim/colorschemes-20140623-r1
deleted file mode 100644
index 5734afbcbb05..000000000000
--- a/app-vim/colorschemes-20140623-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a collection of color schemes from vim.org
-EAPI=5
-HOMEPAGE=https://www.vim.org/
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=vim GPL-2 GPL-2+ GPL-3 GPL-3+ MIT BSD WTFPL-2 public-domain vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/colorschemes-20140623.tar.bz2 https://dev.gentoo.org/~radhermit/vim/colorschemes-20140623.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=1900a218b9a581e1ed2cc0fd19cdb249
diff --git a/app-vim/colorschemes/Manifest b/app-vim/colorschemes/Manifest
new file mode 100644
index 000000000000..193630d60699
--- /dev/null
+++ b/app-vim/colorschemes/Manifest
@@ -0,0 +1,3 @@
+DIST colorschemes-20140623.tar.bz2 683654 BLAKE2B 465c6dda4b45b847ac674d0116987723f68454a97b57471569d3d7333e64960a6ffac8a3bb4d157f2f9f87d0be9ea871871ec33de2e9e09fd67eed1ad8fa96b3 SHA512 523a1fcc5f179ede94887c844397bf507ba6432f7e8812794be3a2451f467370e0c2119000e138ca021f05eee4b3f43e34444916f3fed3eeb7749db459b502e3
+EBUILD colorschemes-20140623-r1.ebuild 854 BLAKE2B fce8820ca92c71ee2db582707f6186b1d69bb2b781580545096111c11749d183c7dcbba41e28448ade64f72ab82db2c572bd7ceb4896995898f6cfd0206a6939 SHA512 42d4e16e21c3c9b47a737831058e85a8ece8aeb6cc63bfc488ab11c1fe14dec6bb07930192a391b52db612b7ec7fed14d9de59c96cd6d271e50ffaae77dd3147
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/colorschemes/colorschemes-20140623-r1.ebuild b/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
new file mode 100644
index 000000000000..29f54897ed03
--- /dev/null
+++ b/app-vim/colorschemes/colorschemes-20140623-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin eutils
+
+DESCRIPTION="vim plugin: a collection of color schemes from vim.org"
+HOMEPAGE="https://www.vim.org/"
+
+LICENSE="vim GPL-2 GPL-2+ GPL-3 GPL-3+ MIT BSD WTFPL-2 public-domain vim.org"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides a collection of color schemes for vim. To switch
+color schemes, use :colorscheme schemename (tab completion is available
+for scheme names). To automatically set a scheme at startup, please see
+:help vimrc."
+
+src_prepare() {
+ EPATCH_SOURCE="${S}/patches" \
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch
+ rm -rf patches/
+
+ # fix line endings
+ edos2unix colors/*
+}
diff --git a/app-vim/colorschemes/metadata.xml b/app-vim/colorschemes/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/colorschemes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/colorsel-20100406 b/app-vim/colorsel-20100406
deleted file mode 100644
index 4d8b3b7fd2fb..000000000000
--- a/app-vim/colorsel-20100406
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: RGB / HSV color selector
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=927
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=public-domain
-RDEPEND=>=app-editors/gvim-7.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=12789 -> colorsel-20100406.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=520b2b0b20f701d6d07d44c5ab0b4c8c
diff --git a/app-vim/colorsel/Manifest b/app-vim/colorsel/Manifest
new file mode 100644
index 000000000000..3347c06ff1c7
--- /dev/null
+++ b/app-vim/colorsel/Manifest
@@ -0,0 +1,3 @@
+DIST colorsel-20100406.zip 11216 BLAKE2B 7fed182d4d79c1ab971f734a196a3d99b5b45abf92fa5c101ef05c8b74b8f4ddeb0bb144c46c23c3926f2f40a22f1ea0f107f468744232e5e6640622e9098984 SHA512 628c2824ce0c5524f45eac209010873324111c33697fd4e36a71d7dbe7aa83f388caec46cdf18224faaaf5480fb671e2e0fa241f0ab4379b276354217d5587cb
+EBUILD colorsel-20100406.ebuild 512 BLAKE2B ce678c3fae7ad07f85cc27018bcb46ed598b98d87ebe733ae145b913fcc17a9c5d4d8db89b26d2d9f57532481b29942fef66686ea5a3def4b0cea4bfd3475213 SHA512 be123e53431f2b3c8b67fe501ee99ca3babb8cfc781dc39c6597df9c8bebd276b5ae2e96edbff56f316639722a01911123a89c8e697c9e80edbaf420b8c2fb56
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/colorsel/colorsel-20100406.ebuild b/app-vim/colorsel/colorsel-20100406.ebuild
new file mode 100644
index 000000000000..7c63a3c90123
--- /dev/null
+++ b/app-vim/colorsel/colorsel-20100406.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: RGB / HSV color selector"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=927"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=12789 -> ${P}.zip"
+LICENSE="public-domain"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=app-editors/gvim-7.0"
+
+S=${WORKDIR}
diff --git a/app-vim/colorsel/metadata.xml b/app-vim/colorsel/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/colorsel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/colorv-3.0.2-r1 b/app-vim/colorv-3.0.2-r1
deleted file mode 100644
index d63b26637231..000000000000
--- a/app-vim/colorv-3.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a color tool for vim
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3597 https://github.com/Rykka/colorv.vim/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ( app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://gentoo/colorv-3.0.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/colorv-3.0.2.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=c39de0773fbcf008d3afc7385f3b2811
diff --git a/app-vim/colorv/Manifest b/app-vim/colorv/Manifest
new file mode 100644
index 000000000000..b90b9d88cd3f
--- /dev/null
+++ b/app-vim/colorv/Manifest
@@ -0,0 +1,3 @@
+DIST colorv-3.0.2.tar.bz2 47059 BLAKE2B 2a84b264085d61f02d3ec881bd1f097d11f23286f53f52e46db468f3bb49df94dcbb9a3514bbbe143167fc597f871064dc998665a25796c43d000c051a62debb SHA512 cb4a893d65bbada5cec27c0810bf3e78db3c64e64f4179529d5da30402ab65b141f53dd7f2a9e8bbccf3d5f7dc5843afc7cab0d908e66a86fc41a5c38c9a848e
+EBUILD colorv-3.0.2-r1.ebuild 950 BLAKE2B cdfcdc7dc3194f2df142652c5c0aff747aae19c03b2706584b80fa4cf070e42b10ba2fe6ac6aeb6fd1d1e798360d8b26761c803c40100a7dc797904a8680ff67 SHA512 703c0521578c74c3b4a533faadb28419ba8e442d2cfcf97c85b5026d483ca09a82587ae3f925dfbfa2fc21c5c43dc82062fbc84b967e71d52e1a25c0e9c36fe0
+MISC metadata.xml 332 BLAKE2B aadba68bd1f0ea3b25ff5b0e807175ec9438e0b10479b539ad60199e9ea3c4442ab45dba549b6507b98b5416d4a65cf981d750cb8698b219e56bb792da616543 SHA512 f7665a682723f68af0fb47584b8442216937a348a9bee52959209cdb44de6d79453ef4029c0ae536371e5a2292624d1cad8c2058d569c703d4f2fa17c0eef0d9
diff --git a/app-vim/colorv/colorv-3.0.2-r1.ebuild b/app-vim/colorv/colorv-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..7f371d403d8d
--- /dev/null
+++ b/app-vim/colorv/colorv-3.0.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# TODO: supposedly supports python3... but that conflicts with pygtk
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: a color tool for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3597 https://github.com/Rykka/colorv.vim/"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ || (
+ app-editors/vim[python,${PYTHON_USEDEP}]
+ ( app-editors/gvim[python,${PYTHON_USEDEP}] dev-python/pygtk:2[${PYTHON_USEDEP}] )
+ )"
+
+src_prepare() {
+ eapply_user
+
+ # fix shebangs in Python files (note: one of them is python3...)
+ sed -i -e "1s:python[23]:${EPYTHON}:" autoload/colorv/*.py || die
+ # use python colorpicker instead of C-based picker
+ rm autoload/colorv/{colorpicker.c,Makefile} || die
+}
diff --git a/app-vim/colorv/metadata.xml b/app-vim/colorv/metadata.xml
new file mode 100644
index 000000000000..c96bbcaaff6f
--- /dev/null
+++ b/app-vim/colorv/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">vim-scripts/ColorV</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/command-t-5.0.1 b/app-vim/command-t-5.0.1
deleted file mode 100644
index ba716dd85500..000000000000
--- a/app-vim/command-t-5.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-DESCRIPTION=vim plugin: fast file navigation for vim
-EAPI=6
-HOMEPAGE=https://vim.sourceforge.io/scripts/script.php?script_id=3025 https://github.com/wincent/command-t
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/wincent/command-t/archive/5.0.1.tar.gz -> command-t-5.0.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=35f4d1122c92cb843334fdc41c9010cd
diff --git a/app-vim/command-t-5.0.2 b/app-vim/command-t-5.0.2
deleted file mode 100644
index 7020ecdac9b8..000000000000
--- a/app-vim/command-t-5.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-DESCRIPTION=vim plugin: fast file navigation for vim
-EAPI=6
-HOMEPAGE=https://vim.sourceforge.io/scripts/script.php?script_id=3025 https://github.com/wincent/command-t
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/wincent/command-t/archive/5.0.2.tar.gz -> command-t-5.0.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=e92884084ab3adccea4067954ef96a63
diff --git a/app-vim/command-t/Manifest b/app-vim/command-t/Manifest
new file mode 100644
index 000000000000..11bd4e9505ed
--- /dev/null
+++ b/app-vim/command-t/Manifest
@@ -0,0 +1,5 @@
+DIST command-t-5.0.1.tar.gz 81781 BLAKE2B 5d606892d9653c259525b6778cd72309da898fae787964fd4d1c9a6ebfd91e467e1f88f5756d7966c4866f721912164f0bf852efdd19209ce779a56725e2adbf SHA512 54262f4628bbef8a11878a8593510af566dabf35dd70005dc90e4abb4c4e9aebde5dc7d08d808c944980017f8f35d7e9723b0032ccde5ab6d2d2fae38e1c632d
+DIST command-t-5.0.2.tar.gz 83601 BLAKE2B 0391f010252fcd8b48909ad4a8dd504e6cbb74f1a2f776d719a8179f0d44299bfddf8161a2961c9089cbb3a4c4c944daa4adb26927f27c4c3beebceb0b938f53 SHA512 f8c8356231c3fb0f3a91cb61f534acac4dd401721a940c6ea045ada287d29395923eb46b1cb4f55b8254000f10eea9970841531abb2b110992180a1edbd66b81
+EBUILD command-t-5.0.1.ebuild 1274 BLAKE2B c2330d4912899a05e05f2acf5584d74342059ef6a573eb5d7fe4c9f0a64ed2225a4f0bf2d103527db7aa8f9f56cdf8339841f4e35712eb0f4f567c1744c7c5fb SHA512 4ffdedc751a9cbf8bc1a700b3220a570ff99c539e269f870f5b4a2034728243d7d261cf3c3024f0ee8d548a57c16f0745d9977be9de429896423692ea931da59
+EBUILD command-t-5.0.2.ebuild 1274 BLAKE2B 26853635b32078ee63daee365599f815186565b4295ef8db749c0dd2986e6272b1554e5ee6db78b1c65432e100f0463980966e732d47ad7fcc18034f8db9b378 SHA512 a35ba097aac85835bf0d42780ac7ae87fbfbaf960e5ca1d9f60aebcf3cc42ba247e8b4d2a0a9bbf220cb1010095387c1891156a81e1ed9d1ee6777659f978380
+MISC metadata.xml 331 BLAKE2B ce98227d75f9770a856398ac8ee677a237a2ebff220647964e59ffa6c02ae0162eef5a97b078014cf9c07fae2287d3bfcdba4af162f9d3760a96bc71f5cde6ae SHA512 e6b82ef13f3942afbb08a2d192073d5498640a719e64512c8203c15081e6873e0acb39421adcc711efc6a0f3adbea2953309da0d48acc86a92c51b6a3924f331
diff --git a/app-vim/command-t/command-t-5.0.1.ebuild b/app-vim/command-t/command-t-5.0.1.ebuild
new file mode 100644
index 000000000000..700b5dbef1e5
--- /dev/null
+++ b/app-vim/command-t/command-t-5.0.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit vim-plugin ruby-ng
+
+DESCRIPTION="vim plugin: fast file navigation for vim"
+HOMEPAGE="https://vim.sourceforge.io/scripts/script.php?script_id=3025 https://github.com/wincent/command-t"
+SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="|| ( app-editors/vim[ruby] app-editors/gvim[ruby] )"
+
+all_ruby_prepare() {
+ find "${S}" -name .gitignore -delete || die
+}
+
+each_ruby_configure() {
+ cd ruby/${PN}/ext/${PN} || die
+ ${RUBY} extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+ cd ruby/${PN}/ext/${PN} || die
+ emake V=1
+ rm *.o *.c *.h *.log extconf.rb depend Makefile || die
+}
+
+each_ruby_install() {
+ local sitelibdir=$(ruby_rbconfig_value "sitelibdir")
+ insinto "${sitelibdir}"
+ doins -r ruby/${PN}/{ext,lib}/*
+}
+
+all_ruby_install() {
+ rm Gemfile* Rakefile LICENSE README.md || die
+ rm -r appstream bin fixtures data ruby/${PN}/{ext,lib,*.gemspec} spec vendor || die
+
+ vim-plugin_src_install
+
+ # make sure scripts are executable
+ chmod +x "${ED}"/usr/share/vim/vimfiles/ruby/${PN}/bin/* || die
+}
diff --git a/app-vim/command-t/command-t-5.0.2.ebuild b/app-vim/command-t/command-t-5.0.2.ebuild
new file mode 100644
index 000000000000..82f1973dda57
--- /dev/null
+++ b/app-vim/command-t/command-t-5.0.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+inherit vim-plugin ruby-ng
+
+DESCRIPTION="vim plugin: fast file navigation for vim"
+HOMEPAGE="https://vim.sourceforge.io/scripts/script.php?script_id=3025 https://github.com/wincent/command-t"
+SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="|| ( app-editors/vim[ruby] app-editors/gvim[ruby] )"
+
+all_ruby_prepare() {
+ find "${S}" -name .gitignore -delete || die
+}
+
+each_ruby_configure() {
+ cd ruby/${PN}/ext/${PN} || die
+ ${RUBY} extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+ cd ruby/${PN}/ext/${PN} || die
+ emake V=1
+ rm *.o *.c *.h *.log extconf.rb depend Makefile || die
+}
+
+each_ruby_install() {
+ local sitelibdir=$(ruby_rbconfig_value "sitelibdir")
+ insinto "${sitelibdir}"
+ doins -r ruby/${PN}/{ext,lib}/*
+}
+
+all_ruby_install() {
+ rm Gemfile* Rakefile LICENSE README.md || die
+ rm -r appstream bin fixtures data ruby/${PN}/{ext,lib,*.gemspec} spec vendor || die
+
+ vim-plugin_src_install
+
+ # make sure scripts are executable
+ chmod +x "${ED}"/usr/share/vim/vimfiles/ruby/${PN}/bin/* || die
+}
diff --git a/app-vim/command-t/metadata.xml b/app-vim/command-t/metadata.xml
new file mode 100644
index 000000000000..26f6f323f397
--- /dev/null
+++ b/app-vim/command-t/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">wincent/command-t</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/conque-2.3 b/app-vim/conque-2.3
deleted file mode 100644
index 5d4558831486..000000000000
--- a/app-vim/conque-2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
-DESCRIPTION=vim plugin: Run interactive commands inside a Vim buffer
-EAPI=4
-HOMEPAGE=https://code.google.com/p/conque/
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=|| ( app-editors/vim[python] app-editors/gvim[python] ) >=dev-lang/python-2.3 || ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
-SLOT=0
-SRC_URI=https://conque.googlecode.com/files/conque_2.3.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=cffaa7a931dc28a96f5d93667506e257
diff --git a/app-vim/conque-2.3-r1 b/app-vim/conque-2.3-r1
deleted file mode 100644
index 5f4d92deea86..000000000000
--- a/app-vim/conque-2.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=|| ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
-DESCRIPTION=vim plugin: Run interactive commands inside a Vim buffer
-EAPI=5
-HOMEPAGE=https://code.google.com/p/conque/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://conque.googlecode.com/files/conque_2.3.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=117dffe784cfe67b732b8e61b4ca9ad1
diff --git a/app-vim/conque/Manifest b/app-vim/conque/Manifest
new file mode 100644
index 000000000000..8d79a689d211
--- /dev/null
+++ b/app-vim/conque/Manifest
@@ -0,0 +1,4 @@
+DIST conque_2.3.tar.gz 52195 BLAKE2B 31546d8e0797525cd05a4663f3598a11cbb5dd7dcc6fabf181d277e2cab88593e1458f5e646688e9e46a8d01952eb1383f358454200d59634c40920b93b7db9e SHA512 b69c0564ccaf897ee2f18d0769877986e67006cf33dbefe2bbc85261726372f09669d19aa118de58ccfb847cc8b7e670e25c030128eec665e1cecf0a96cb4b89
+EBUILD conque-2.3-r1.ebuild 679 BLAKE2B 2fe441d1398c14d2be1db505bf128f08a458d1a51e735abd5dcb5f01af41d7ae0c6524a7a98a59d54db59f712814e95a8806ef2eedd3ccedae7f24ea03341f5d SHA512 25dd890235046296654394595c91e7db6dcf91820aa44c040162942d0d621d89c796bcab6e77f1d65d4b348fac14077993b12275831b2d704c474d7e656d9f1f
+EBUILD conque-2.3.ebuild 554 BLAKE2B 64ef39e65fcd02562ef840487f3a5805971ed9c138db084cd0249d7be7ed0e33e8baae8f9b0ce4d5203bd9c6f1208786de3e63880dabb8394fa6b80f6c051c8e SHA512 c1934cab70cb7d9be06247e853ac5b32f7f131177b862639e90cfa35a2267ba7fa1773b5607bef7affc361a5f381d35e800da1dc65f4a9a6097bc40587740efc
+MISC metadata.xml 325 BLAKE2B d9e43a221c8ce8ec5a6cdfbed4c1d76cbebc9922587a1414a9bd09a14dbe1462ce2bad738ca2fa74e21686e20dc1c05a6dac2faf91abe29beb4ccc046e2014c1 SHA512 6bbcbd15af2e070d8b377cb9ce8d267b4321c895375a874d77cc85f6d9ec5aee8787415f3799b93801aa748d10a15e64968dab7ace10d9f19d48c252d2b2e4a3
diff --git a/app-vim/conque/conque-2.3-r1.ebuild b/app-vim/conque/conque-2.3-r1.ebuild
new file mode 100644
index 000000000000..93ff4281f401
--- /dev/null
+++ b/app-vim/conque/conque-2.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+VIM_PLUGIN_VIM_VERSION="7.1"
+
+inherit python-single-r1 vim-plugin
+
+MY_P="${PN}_${PV}"
+DESCRIPTION="vim plugin: Run interactive commands inside a Vim buffer"
+HOMEPAGE="https://code.google.com/p/conque/"
+SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
+ ${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+VIM_PLUGIN_HELPFILES="ConqueTerm"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/app-vim/conque/conque-2.3.ebuild b/app-vim/conque/conque-2.3.ebuild
new file mode 100644
index 000000000000..c16c2d156302
--- /dev/null
+++ b/app-vim/conque/conque-2.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+VIM_PLUGIN_VIM_VERSION="7.1"
+
+inherit vim-plugin
+
+MY_P="${PN}_${PV}"
+DESCRIPTION="vim plugin: Run interactive commands inside a Vim buffer"
+HOMEPAGE="https://code.google.com/p/conque/"
+SRC_URI="https://${PN}.googlecode.com/files/${MY_P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )
+ >=dev-lang/python-2.3"
+
+VIM_PLUGIN_HELPFILES="ConqueTerm"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/app-vim/conque/metadata.xml b/app-vim/conque/metadata.xml
new file mode 100644
index 000000000000..6fa1407c232d
--- /dev/null
+++ b/app-vim/conque/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="google-code">conque</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/cream-0.43 b/app-vim/cream-0.43
deleted file mode 100644
index 8decc68bbcd1..000000000000
--- a/app-vim/cream-0.43
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=>=app-editors/gvim-7.0 app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=An easy-to-use configuration of the GVim text editor
-EAPI=4
-HOMEPAGE=http://cream.sourceforge.net
-IUSE=l10n_de l10n_en l10n_fr l10n_es
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=>=app-editors/gvim-7.0 dev-util/ctags || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://sourceforge/cream/cream-0.43.tar.gz l10n_de? ( http://cream.sourceforge.net/cream-spell-dict-ger_2.0.1.zip ) l10n_en? ( http://cream.sourceforge.net/cream-spell-dict-eng_2.0.2.zip ) l10n_es? ( http://cream.sourceforge.net/cream-spell-dict-spa_3.0.zip ) l10n_fr? ( http://cream.sourceforge.net/cream-spell-dict-fre_2.1.zip )
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=2cc7b7569d676cf5cc239b732ad52117
diff --git a/app-vim/cream/Manifest b/app-vim/cream/Manifest
new file mode 100644
index 000000000000..22a9cc28d414
--- /dev/null
+++ b/app-vim/cream/Manifest
@@ -0,0 +1,10 @@
+AUX cream-0.30-ebuilds.patch 435 BLAKE2B d6668878dbfc867442b9c39cc58b75c0ad079aff6ffb6d031ad42e36cd90a5cc4ac6e3799664d8e957b84aa6ea79ad39d03106fb8a674d4487d9e2b21ad3ec23 SHA512 96cfee5d25267dc19c47ee953cf29e2fd43e3b0ba5b7d25f72f25901e52733fb3b2b707c233b1b091d02740fcce2462b37efb28ffc3b28dff42f574b41204167
+AUX enhancedcommentify-2.1-extra-ft-support.patch 666 BLAKE2B 007791dd72aae136e0d221b35fa8a7537fd3d1b3928a41cc1345c77572a81873574d04397dc372562ee257af19bcc3af2e3de7c330c689a4b36f06893077f040 SHA512 a3450231dc95c9e82eaf103c2da0d6cd7b7e21708f1680ecd4fb08157e1bcdb0582c1c16972a3e55d0ecfa6227ad9484f4cd4ef71e01f8154d75e0103966f21b
+AUX enhancedcommentify-2.1-gentooisms.patch 809 BLAKE2B 8007d10b08528f34825fe11acb8de386f10d6cdfdf980c5942c7047866b17227c6f9165542cc24c2a676cfff70802eafa4a32945bb42f0b2461b570e5cff0858 SHA512 1aa085e1a4bc90ec40f3f4118f8800f36b3e0e4d69625ed72cc660514074a4f3abfb0f564f45c3c187fdd9e8dbf0dd1b2974aeac14f830360e20862e32280749
+DIST cream-0.43.tar.gz 785889 BLAKE2B 39231309c5382e26587a602d8185e40012f7b850ed6dcd1372eaed65e05e6a97ed7222bdc29666255f345e99ff696901da02acf7814ff784b6545d06f970866a SHA512 6e6c139bcb5f1ed8cb9718f2c1453a69453c87f2588b6074264f94877dd5b7f78842f5a7c45df693effc2249020e5fa61a88ab5d4e3e13806e2674f1f57dccb7
+DIST cream-spell-dict-eng_2.0.2.zip 1778434 BLAKE2B c4f73ba51cf1371faec1d3aaae44d55a38ef11d351bd66cd51514067feea78b27f381cb7184be8cd26d74e863634ea9e2f4841ef29b98693e92874cee9ab680c SHA512 72ea2c4d72fc39aa80d9f47762f42ec3fcc4251cc27a9dc62a8b8f8f4b66340df7c15afd603a0e4a12805770606c09e462be548f5203feba76badefa27321b1d
+DIST cream-spell-dict-fre_2.1.zip 872841 BLAKE2B 0711e0780c8a9b77f8bea9deda47bef3417ebea91f672a5146a0644c2f2fd70f4ccbc032802a62bd60b908d1c289a2acc46bf80115a3c37a5ef113f509319773 SHA512 d34773e3ec2bd905a669175680f91146ead8dc0a7d3de8fa668c56e550eed23ac6c8678b2e7b3c642b756d6eba97b815494395c07b3f28cb54e3a01cf8f5b1a0
+DIST cream-spell-dict-ger_2.0.1.zip 894848 BLAKE2B 0018d95b887ee48b7f36b9a7a90413a3a45c4daf6f939ec428670f54e690206e447813c0fff3048106d816960b6be0ce7153362dd0305fc2276fab1b58269efd SHA512 1fb1a797bfbcd0516d8124daf1256b27a356ef3eb58887c2a55fc8537f211faa60dcba713935b2fa5595ebf6bba07a1463819060018f725e5cd0952b978a342a
+DIST cream-spell-dict-spa_3.0.zip 1710280 BLAKE2B 44039b8ee664fe9c9664bb60af60e6b9687dd51989a2452ee3bc7afca4fa6d7f124221aca7d8578c27b462b3d660417a7c518ba4bbff64fa76125cecb29f0fd9 SHA512 27de9d920afe191ae4e7d5267b5ad6fb14a6e4185d474c09d17af1eb45f926dab2d4696080cee25d1591bf0b588234a20778e9b1485927dfffa8595b19e247d2
+EBUILD cream-0.43.ebuild 4279 BLAKE2B 73076eb05caf45817e3ca9b7791f6fb0c6a7793513c77a98a971d85de84173b387cc28944c91693d7518a67bf02a2a5167f3e72987c9e0fd08d221d7691bc4b0 SHA512 e126f9ef16ca5b6b9afb4ce985631e3d88eeae2ffa35c98b6c7af1ce1ab5ec61827e99ae615f236fa38fa2480c3776a452c1c104689bf718370cd1b7be5252df
+MISC metadata.xml 324 BLAKE2B 6c7902862acd6c6ad8e94e0bbd0d63f771039cd456cc401a72812c2dbe94d91bd13610fe77cb6484fecf33afc9beccd8aaa3e8d11cd4dfd0884c3bd90a228c10 SHA512 0c3e2ef2f849117218de711a2952e6571f92a5bd768c61004284bfc72f8945c77174fb3f83bb70c69ef030dbcab467eb1a531e09a0baf7d85167c3deade5cf65
diff --git a/app-vim/cream/cream-0.43.ebuild b/app-vim/cream/cream-0.43.ebuild
new file mode 100644
index 000000000000..2d8b551361c0
--- /dev/null
+++ b/app-vim/cream/cream-0.43.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vim-plugin eutils fdo-mime
+
+DESCRIPTION="An easy-to-use configuration of the GVim text editor"
+HOMEPAGE="http://cream.sourceforge.net"
+
+DICT_EN="eng_2.0.2"
+DICT_FR="fre_2.1"
+DICT_ES="spa_3.0"
+DICT_DE="ger_2.0.1"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+ l10n_de? ( ${HOMEPAGE}/cream-spell-dict-${DICT_DE}.zip )
+ l10n_en? ( ${HOMEPAGE}/cream-spell-dict-${DICT_EN}.zip )
+ l10n_es? ( ${HOMEPAGE}/cream-spell-dict-${DICT_ES}.zip )
+ l10n_fr? ( ${HOMEPAGE}/cream-spell-dict-${DICT_FR}.zip )"
+
+IUSE="l10n_de l10n_en l10n_fr l10n_es"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+
+DEPEND="
+ >=app-editors/gvim-7.0
+ app-arch/unzip"
+RDEPEND="
+ >=app-editors/gvim-7.0
+ dev-util/ctags"
+
+VIM_PLUGIN_HELPTEXT=\
+"Cream is completely independent from the rest of your Vim/GVim setup.
+To launch GVim in Cream mode, use this wrapper script:
+\ % cream [filename...]
+
+Cream's documentation has been installed in ${ROOT}usr/share/doc/${PF}
+In particular, you may want to read:
+
+\ - the Cream features list:
+file://${ROOT}usr/share/doc/${PF}/html/features.html
+
+\ - the Cream shortcuts list:
+file://${ROOT}usr/share/doc/${PF}/html/keyboardshortcuts.html
+
+\ - the Cream FAQ:
+file://${ROOT}usr/share/doc/${PF}/html/faq.html"
+
+# Utility function to rename a Vim help file and its links/anchors:
+# prefix_help_file prefix file [pattern ...]
+prefix_help_file() {
+ local prefix="${1}" ; shift
+ local helpfile="${1}" ; shift
+ while [[ -n "${1}" ]] ; do
+ sed -i "s:\([*|]\)\(${1}[*|]\):\1${prefix}-\2:g" "${helpfile}" \
+ || die "Failed to sed \"${1}\" on \"${helpfile}\""
+ shift
+ done
+ mv "${helpfile}" "${helpfile%/*}/${prefix}-${helpfile##*/}" \
+ || die "Failed to rename \"${helpfile}\""
+}
+
+pkg_setup() {
+ elog "Cream comes with several dictionaries for spell checking. In"
+ elog "all cases, at least a small English dictionary will be installed."
+ elog
+ elog "To specify which optional dictionaries are installed, set the"
+ elog "L10N variable in /etc/portage/make.conf. For example, to install full"
+ elog "English and French dictionaries, use:"
+ elog " L10N=\"en fr\""
+ elog
+ elog "Available dictionaries are:"
+ for dict in "English en" "French fr" "German de" "Spanish es" ; do
+ elog " ${dict% *} \t(${dict#* }) $(usex l10n_${dict#* } \
+ "(Will be installed)" "(Will not be installed)")"
+ done
+ elog
+}
+
+src_unpack() {
+ mkdir -p "${S}"/spelldicts
+
+ # install spell dictionaries into ${S}/spelldicts
+ local my_a
+ for my_a in ${A} ; do
+ if [ -z ${my_a/*spell-dict*/} ] ; then
+ cd "${S}"/spelldicts
+ unpack ${my_a}
+ else
+ cd "${WORKDIR}"
+ unpack ${my_a}
+ fi
+ done
+}
+
+src_prepare() {
+ # change installation path + fix the wrapper command (disable plugins)
+ cat > cream <<-EOF
+ #!/bin/sh
+ gvim --servername CREAM --noplugin -U NONE -u "\\\$VIM/cream/creamrc" "\$@"
+ EOF
+
+ sed -i "/let \$CREAM/s:VIMRUNTIME:VIM:" creamrc || die
+
+ # make taglist ebuild aware, bug #66052
+ epatch "${FILESDIR}"/${PN}-0.30-ebuilds.patch
+
+ # more filetypes for EnhancedCommentify, including the Gentoo ones
+ epatch "${FILESDIR}"/enhancedcommentify-2.1-gentooisms.patch
+ epatch "${FILESDIR}"/enhancedcommentify-2.1-extra-ft-support.patch
+
+ # rename vim help files to avoid conflicts with other vim packages
+ prefix_help_file cream help/EnhancedCommentify.txt \
+ 'EnhancedCommentify' 'EnhComm-[a-zA-Z]\+'
+
+}
+
+src_install() {
+ # install launcher and menu entry
+ dobin cream
+ domenu cream.desktop
+ doicon cream.svg cream.png
+
+ # install shared vim files
+ insinto /usr/share/vim/cream
+ doins *.vim creamrc
+ local dir
+ for dir in addons bitmaps filetypes lang ; do
+ insinto /usr/share/vim/cream/${dir}
+ doins ${dir}/*
+ done
+
+ if [[ -n ${L10N} ]] ; then
+ insinto /usr/share/vim/cream/spelldicts
+ doins spelldicts/*
+ fi
+
+ insinto /usr/share/vim/vimfiles/doc
+ doins help/*.txt
+
+ # install docs
+ dodoc docs/{CHANGELOG,DEVELOPER,KEYBOARD,PressRelease,README,RELEASE}.txt
+ dohtml docs-html/*
+ # html doc may be opened from Cream GUI
+ dosym ../../doc/${PF}/html /usr/share/vim/cream/docs-html
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ vim-plugin_pkg_postinst
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ vim-plugin_pkg_postrm
+}
diff --git a/app-vim/cream/files/cream-0.30-ebuilds.patch b/app-vim/cream/files/cream-0.30-ebuilds.patch
new file mode 100644
index 000000000000..30e310387005
--- /dev/null
+++ b/app-vim/cream/files/cream-0.30-ebuilds.patch
@@ -0,0 +1,12 @@
+--- cream-0.30/taglist.vim.orig 2004-10-02 00:12:58.400215576 +0100
++++ cream-0.30/taglist.vim 2004-10-02 00:26:28.535056360 +0100
+@@ -205,6 +205,9 @@
+ let s:tlist_def_cobol_settings = 'cobol;d:data;f:file;g:group;p:paragraph;' .
+ \ 'P:program;s:section'
+
++" ebuilds
++let s:tlist_def_ebuild_settings = 'sh;f:function'
++
+ " eiffel language
+ let s:tlist_def_eiffel_settings = 'eiffel;c:class;f:feature'
+
diff --git a/app-vim/cream/files/enhancedcommentify-2.1-extra-ft-support.patch b/app-vim/cream/files/enhancedcommentify-2.1-extra-ft-support.patch
new file mode 100644
index 000000000000..597518a6d547
--- /dev/null
+++ b/app-vim/cream/files/enhancedcommentify-2.1-extra-ft-support.patch
@@ -0,0 +1,13 @@
+--- plugin/EnhancedCommentify.vim.orig 2005-03-01 02:28:23.409962824 -0500
++++ plugin/EnhancedCommentify.vim 2005-03-01 02:29:45.695453528 -0500
+@@ -740,7 +740,9 @@
+ \ 'psf\|ptcap\|r\|radiance\|ratpoison\|readline\remind\|'.
+ \ 'ruby\|screen\|sed\|sm\|snnsnet\|snnspat\|snnsres\|spec\|'.
+ \ 'squid\|terminfo\|tidy\|tli\|tsscl\|vgrindefs\|vrml\|'.
+- \ 'wget\|wml\|xf86conf\|xmath\)$'
++ \ 'wget\|wml\|xf86conf\|xmath\|fstab\|apache\|resolv\|sudoers\|'.
++ \ 'ntp\|mailcap\|ssh_config\|sshdconfig\|mplayerconf\|desktop\|'.
++ \ 'gkrellmrc\|pf\|ipfilter\|grub\|fluxbox\)$'
+ let b:ECcommentOpen = '#'
+ let b:ECcommentClose = ''
+ elseif fileType =~ 'gentoo'
diff --git a/app-vim/cream/files/enhancedcommentify-2.1-gentooisms.patch b/app-vim/cream/files/enhancedcommentify-2.1-gentooisms.patch
new file mode 100644
index 000000000000..9e45142ff8ae
--- /dev/null
+++ b/app-vim/cream/files/enhancedcommentify-2.1-gentooisms.patch
@@ -0,0 +1,23 @@
+--- plugin/EnhancedCommentify.vim.orig 2005-01-27 00:20:00.049461056 -0500
++++ plugin/EnhancedCommentify.vim 2005-01-27 00:17:57.617073608 -0500
+@@ -628,6 +628,10 @@
+ " letter.
+ if match(synFiletype, '\l\+\u') == 0
+ let ft = substitute(synFiletype, '^\(\l\+\)\u.*$', '\1', "")
++ " work-around for gentoo-syntax stuff ; won't work with the above
++ " case, since all the identifiers start with a capital 'G'
++ elseif synFiletype =~ "GentooPackage*"
++ let ft = "gentoo"
+ endif
+
+ if ft == ""
+@@ -739,6 +743,9 @@
+ \ 'wget\|wml\|xf86conf\|xmath\)$'
+ let b:ECcommentOpen = '#'
+ let b:ECcommentClose = ''
++ elseif fileType =~ 'gentoo'
++ let b:ECcommentOpen = '#'
++ let b:ECcommentClose = ''
+ elseif fileType == 'webmacro'
+ let b:ECcommentOpen = '##'
+ let b:ECcommentClose = ''
diff --git a/app-vim/cream/metadata.xml b/app-vim/cream/metadata.xml
new file mode 100644
index 000000000000..a882b886daea
--- /dev/null
+++ b/app-vim/cream/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">cream</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/csound-syntax-20160804 b/app-vim/csound-syntax-20160804
deleted file mode 100644
index 46945c729bd3..000000000000
--- a/app-vim/csound-syntax-20160804
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: set of tools for editing Csound files with vim
-EAPI=6
-HOMEPAGE=https://github.com/luisjure/csound
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/csound-syntax-20160804.tar.bz2 https://dev.gentoo.org/~radhermit/vim/csound-syntax-20160804.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=d7a8f14159e306c57d33456843c0ee3e
diff --git a/app-vim/csound-syntax/Manifest b/app-vim/csound-syntax/Manifest
new file mode 100644
index 000000000000..e05010585f80
--- /dev/null
+++ b/app-vim/csound-syntax/Manifest
@@ -0,0 +1,4 @@
+AUX csound-syntax-20160804-doc.patch 388 BLAKE2B ec94940f41e3e9b891f4d70488bfc17b00e8f95a8efa989bb040261ccee8fca60b21e1a6f80c5b9189473ea73a46b3fb1f30d6f384607a97db89cf2d7c51aeb5 SHA512 a05e5bdb3165bdb3c86fd963e9767eaaca7c7047dffd73d239fa58248ad24f78667ebea6106777123ea1e366ba4c72387b5765ead760acbfc881d581691920bc
+DIST csound-syntax-20160804.tar.bz2 326658 BLAKE2B 04ba7e1eb3afee6b32de4603e91f78fdc7fd3b70b137bd05ecac5ace2b34222a1cc8c095cd7776abe46b7bb18bd67d1711bca75f20e2f656162d414f2c6e2b2f SHA512 83ba89768be3d9e5dd701cc8323fbbff75ce399210891fc1e5676e278c39cfdb4b5e4a354c93c1f439a667d0ea65f459aea0b6f79740a061381e22d2557c0eb8
+EBUILD csound-syntax-20160804.ebuild 422 BLAKE2B d7e5f6383d08e2d7866dc9327d4fd972e94c3cc3599a15abc469ff848ead5dbb1d7bb31569c93337385e328b1c09639c0a3c663a47e840484cc23506aa1c90dd SHA512 a1b2c9f4fff3e4399feaa556fd0c0dd973f4211c92b409f4de0cbfa6bf14b99180b4d7a114dcd1dddfcbadbc0ba809c1bcd5fbe7be907112caf6a4d723bef077
+MISC metadata.xml 329 BLAKE2B e0693430b5111554bfcbd4929204c4e88534933d4f5d8d445345845487adfcebc4181e5b55b6c04211c696a794b53c4dcac068e150949b419cd022c4de612a44 SHA512 5caad244c40e0c4a7db09f340c0119758dc579db6bfc5a82e1e0023e7cc63964dc85b4f35546155f15c1f858991d8ed428910bb5b7c41d5538b34bbeffa8354a
diff --git a/app-vim/csound-syntax/csound-syntax-20160804.ebuild b/app-vim/csound-syntax/csound-syntax-20160804.ebuild
new file mode 100644
index 000000000000..1562317fb7f5
--- /dev/null
+++ b/app-vim/csound-syntax/csound-syntax-20160804.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: set of tools for editing Csound files with vim"
+HOMEPAGE="https://github.com/luisjure/csound"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+PATCHES=( "${FILESDIR}/${P}-doc.patch" )
+
+src_prepare() {
+ rm -v LICENSE README.md || die
+ default
+}
diff --git a/app-vim/csound-syntax/files/csound-syntax-20160804-doc.patch b/app-vim/csound-syntax/files/csound-syntax-20160804-doc.patch
new file mode 100644
index 000000000000..c2cc7eccbad1
--- /dev/null
+++ b/app-vim/csound-syntax/files/csound-syntax-20160804-doc.patch
@@ -0,0 +1,9 @@
+--- csound-syntax-20160804/doc/csound.txt
++++ csound-syntax-20160804/doc/csound.txt
+@@ -1,4 +1,6 @@
++*csound.txt* Csound Syntax Reference
+
++ *csound-syntax*
+ ===========================================================================
+ != *!=*
+
diff --git a/app-vim/csound-syntax/metadata.xml b/app-vim/csound-syntax/metadata.xml
new file mode 100644
index 000000000000..a734c4404129
--- /dev/null
+++ b/app-vim/csound-syntax/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">luisjure/csound</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/csscomplete-1.0 b/app-vim/csscomplete-1.0
deleted file mode 100644
index 331ff6bfc84d..000000000000
--- a/app-vim/csscomplete-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: CSS 3 omni complete function
-EAPI=6
-HOMEPAGE=https://github.com/othree/csscomplete.vim
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/othree/csscomplete.vim/archive/1.0.zip -> csscomplete-1.0.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=754f50aecd97a0209959aae3ace84c65
diff --git a/app-vim/csscomplete/Manifest b/app-vim/csscomplete/Manifest
new file mode 100644
index 000000000000..001d1319eed1
--- /dev/null
+++ b/app-vim/csscomplete/Manifest
@@ -0,0 +1,3 @@
+DIST csscomplete-1.0.zip 18057 BLAKE2B e6b7f91b86f18d6359885ef92486dcbb8ed32eaf90ca3c7b49d56dd2f762b334cef30c3dc92e1bebf7cd4d902876f49838146a5ac0c79342a5004701b857ccee SHA512 63b8b9a31d09ba6ce8195b524df5785cf5da73db7b487b68bba291fcfb62af0ea8e595f1aed73d657b8343775bacca056185dae9fc22d0dbcad1596653f94a81
+EBUILD csscomplete-1.0.ebuild 501 BLAKE2B 4137d393c686ab5668b92836a98b4cf29afcd92e4a506fcf0e344edd360b88891aa7efa8e89155186e2f4769748fd2af207a8fe9b4d728eac894ac8cee770637 SHA512 48470b066d5756db5bf30fefdb681e4aa6506a12356704595c1dc501b4701618e3c79f5120bb0e095b722069dcf1fa3742b479400e970d5772a183a8df0f9c8c
+MISC metadata.xml 431 BLAKE2B cc935d06e76af5fe96e6f270140525e207c316cf11350476e446432b51bba36748586016edf8b314f1a895c21234bdd27873b9d351150edb570237a3aff45010 SHA512 18a9dd07313408b87c59fd36d268004d5d8c4370a377e524e1c62aadbe1d7bd6f677524912b71e5eed7ae421ce4eba60c9581382b97666cc5ed70dc88ca9b69a
diff --git a/app-vim/csscomplete/csscomplete-1.0.ebuild b/app-vim/csscomplete/csscomplete-1.0.ebuild
new file mode 100644
index 000000000000..13028dac1e33
--- /dev/null
+++ b/app-vim/csscomplete/csscomplete-1.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: CSS 3 omni complete function"
+HOMEPAGE="https://github.com/othree/csscomplete.vim"
+SRC_URI="https://github.com/othree/${PN}.vim/archive/${PV}.zip -> ${P}.zip"
+LICENSE="vim.org"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${PN}.vim-${PV}"
+
+src_prepare() {
+ default
+ rm -v config.mk || die
+}
+
+src_compile() {
+ :;
+}
diff --git a/app-vim/csscomplete/metadata.xml b/app-vim/csscomplete/metadata.xml
new file mode 100644
index 000000000000..373d7ca9fa23
--- /dev/null
+++ b/app-vim/csscomplete/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">othree/csscomplete.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/csv-0.31-r1 b/app-vim/csv-0.31-r1
deleted file mode 100644
index 69ee89c438b3..000000000000
--- a/app-vim/csv-0.31-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: display and alter csv files
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2830
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/csv-0.31.tar.bz2 https://dev.gentoo.org/~radhermit/vim/csv-0.31.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=8ac9f8c51bf6b9f7a5ffd2fe60e18ef6
diff --git a/app-vim/csv/Manifest b/app-vim/csv/Manifest
new file mode 100644
index 000000000000..94ba001977e7
--- /dev/null
+++ b/app-vim/csv/Manifest
@@ -0,0 +1,3 @@
+DIST csv-0.31.tar.bz2 38537 BLAKE2B cc148b084b6b139646b4bbb0a907830b02343e3ed6f55cab0c7f0864124705df31c71e2eee976b5bad340400e033e9da303f9c1e972185dca2164701ecf38ae8 SHA512 1d0716765e3268e20ef7b2ed822e7322febbe2c9e9b775e79a2628c4641f157084b6b24d999b051657881acaee5ae8dd36a558ef31e5985bf7bf14ac894d5677
+EBUILD csv-0.31-r1.ebuild 325 BLAKE2B c552086da2673808ec74f62635d10d20346c37d9836884edb91cbd01887a7707a502cd6e11525b031b1364d2b4beb6463c99d21472813d77f0c656a1e1a14003 SHA512 9ef6f9f5e85cf6a9104913824a2bbcebff63ee51ce4f58089e44a4d792c46e70deb721b3b0b0edc78a1f5fc5584576824fe859e5a8546058bedcf1f9d39f7cfd
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/csv/csv-0.31-r1.ebuild b/app-vim/csv/csv-0.31-r1.ebuild
new file mode 100644
index 000000000000..df81af3d6bba
--- /dev/null
+++ b/app-vim/csv/csv-0.31-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: display and alter csv files"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2830"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="ft-csv.txt"
diff --git a/app-vim/csv/metadata.xml b/app-vim/csv/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/csv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/ctrlp-1.80 b/app-vim/ctrlp-1.80
deleted file mode 100644
index 45c3798c2856..000000000000
--- a/app-vim/ctrlp-1.80
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: fuzzy file, buffer, mru, tag, ... finder with regex support
-EAPI=6
-HOMEPAGE=https://github.com/ctrlpvim/ctrlp.vim
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/ctrlpvim/ctrlp.vim/archive/1.80.tar.gz -> ctrlp-1.80.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=e70f43201887478d3c72e78c0f9df95a
diff --git a/app-vim/ctrlp-1.80_p20180418 b/app-vim/ctrlp-1.80_p20180418
deleted file mode 100644
index ded72bc052df..000000000000
--- a/app-vim/ctrlp-1.80_p20180418
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: fuzzy file, buffer, mru, tag, ... finder with regex support
-EAPI=6
-HOMEPAGE=https://github.com/ctrlpvim/ctrlp.vim
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/ctrlpvim/ctrlp.vim/archive/4b9e7cac612902a25498cca49f13475fe1a821a4.tar.gz -> ctrlp-1.80_p20180418.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=da750d82482107496eebb862e9161064
diff --git a/app-vim/ctrlp/Manifest b/app-vim/ctrlp/Manifest
new file mode 100644
index 000000000000..510f5254b0c5
--- /dev/null
+++ b/app-vim/ctrlp/Manifest
@@ -0,0 +1,5 @@
+DIST ctrlp-1.80.tar.gz 75269 BLAKE2B 38b70168d5b220dca220b2f1bfddcae1234fabf01348083fd9db4e1ca0396b56eb3f88f1cda84c22884c3946b731de06a710ca89f51a916f4758345afa748b19 SHA512 40175e64bb9c4ccdc202bc31b8956b96ede5761a3a4f17706c4d915f8083991cb7729e33c79d021bf6faff00f381fe9272145f852981e487b279f0471b86cadd
+DIST ctrlp-1.80_p20180418.tar.gz 76376 BLAKE2B 2ae3e85eac29bb07bfafcc60b879b506b57b7874ee9798d4fc0e420e06283ceca4cfe4d282fb9552c1971db48de25dc8df03d3e20d85ae1bbfc72f1162cc1fba SHA512 08a566087e0be0496c3dd1d60e24d65421b7fc758c95d3959181293502dd1e3581066bebea58cc1ef85f2a7cba76b45eee2e5ff2c522e27523ea31bebe4a36d5
+EBUILD ctrlp-1.80.ebuild 456 BLAKE2B b7f36c26f668cbff5c3be99395e1555a51f28f083efeefd05aac83cc9bef07abcdc25e0f8f69ef2b44aecf1dcc8993906f80c2971ba02838fc782399eb018a5c SHA512 9f8a52fd5d00138b7619b7d8c0ff2d166f48375e02ca4ca872d7ed655a2bcaf80282bd71bd4c122d479ad33c395cb57bee6421497d4da34e857663c9dfc283ab
+EBUILD ctrlp-1.80_p20180418.ebuild 521 BLAKE2B 6131d17541c56e2a41eca6fc11eee8e4f2149756dcc04d73f0e094f47ffa08420d345f1685b131599e20b35f9d171bc103b3ec47ec956b04a702975758d73b43 SHA512 ea8499bf3114e73df549efcc324c2779a61dce182109541d3c401d51a077f47f0856cd39391fa733fce86388d6b72e7b950d5e957e60fa802fed7672be20b743
+MISC metadata.xml 338 BLAKE2B 41c758d6fb547d7d7baabc1dd88431b320430d5549861120d9667082474c6ce45dd17983f2be9dd8f7b7044d3e8ba707b8baffc05d59430b9435ae3e0bc4138a SHA512 5167190c5206fc93a419c088f08ff5fd89ff0f12198824576f652973baa99c16ed8b8856e7afb2ba8c7e1bf9c90d4c94b83ff38dfd1ee63c06d9a69d57b07d45
diff --git a/app-vim/ctrlp/ctrlp-1.80.ebuild b/app-vim/ctrlp/ctrlp-1.80.ebuild
new file mode 100644
index 000000000000..2c42572f0e5a
--- /dev/null
+++ b/app-vim/ctrlp/ctrlp-1.80.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: fuzzy file, buffer, mru, tag, ... finder with regex support"
+HOMEPAGE="https://github.com/ctrlpvim/ctrlp.vim"
+SRC_URI="https://github.com/${PN}vim/${PN}.vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+S="${WORKDIR}/${PN}.vim-${PV}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/ctrlp/ctrlp-1.80_p20180418.ebuild b/app-vim/ctrlp/ctrlp-1.80_p20180418.ebuild
new file mode 100644
index 000000000000..cf9b207e7672
--- /dev/null
+++ b/app-vim/ctrlp/ctrlp-1.80_p20180418.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin vcs-snapshot
+
+# Commit Date: 18 Apr 2018
+COMMIT="4b9e7cac612902a25498cca49f13475fe1a821a4"
+
+DESCRIPTION="vim plugin: fuzzy file, buffer, mru, tag, ... finder with regex support"
+HOMEPAGE="https://github.com/ctrlpvim/ctrlp.vim"
+SRC_URI="https://github.com/${PN}vim/${PN}.vim/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/ctrlp/metadata.xml b/app-vim/ctrlp/metadata.xml
new file mode 100644
index 000000000000..edfbc7a37966
--- /dev/null
+++ b/app-vim/ctrlp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">kien/ctrlp.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/ctx-1.17-r1 b/app-vim/ctx-1.17-r1
deleted file mode 100644
index cd1cb05056e4..000000000000
--- a/app-vim/ctx-1.17-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-editors/vim[perl] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: display current scope context in a C file
-EAPI=6
-HOMEPAGE=http://www.bluweb.com/us/chouser/proj/ctx/
-KEYWORDS=alpha amd64 ia64 ppc x86
-LICENSE=GPL-2
-RDEPEND=!app-vim/enhancedcommentify || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/ctx-1.17.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ctx-1.17.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=3d14ede93e637afa99431a731523d3f8
diff --git a/app-vim/ctx/Manifest b/app-vim/ctx/Manifest
new file mode 100644
index 000000000000..f27d46659c98
--- /dev/null
+++ b/app-vim/ctx/Manifest
@@ -0,0 +1,3 @@
+DIST ctx-1.17.tar.bz2 4391 BLAKE2B 2e6ba12c1f416e7de10bc2b6fbef79cc0b4fd3d3e80820034db3b327730b8927afbc26fee4d93b96cbaf510d8642a4ccf95b6b13cf8d83d6d05de3deecc0238e SHA512 35839f005cec56baf90ecbf46ce28530f9d3a18d8a538323d3f1d2134fa392a9595d95c3258c9ce2320381a69b1fb4a61b2ad2cd9d4c581e75bea378dfe7e13c
+EBUILD ctx-1.17-r1.ebuild 477 BLAKE2B dec530b3b2934fe23c02c445bed0ee801a9ad4dada34b63707b944391106cf2020a1703032072953d9beefbf1aad2440ce8562539363965c42eb903791d583d1 SHA512 2944924f6795b7a9f510f5685fffb2bf04152d21056210f429345fa84aa786536524a9222163af334cbad2161f0d00518763faed4d9388b89465936653fb13ec
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/ctx/ctx-1.17-r1.ebuild b/app-vim/ctx/ctx-1.17-r1.ebuild
new file mode 100644
index 000000000000..3d0faf39b45b
--- /dev/null
+++ b/app-vim/ctx/ctx-1.17-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: display current scope context in a C file"
+HOMEPAGE="http://www.bluweb.com/us/chouser/proj/ctx/"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ppc x86"
+
+VIM_PLUGIN_HELPURI="http://www.bluweb.com/us/chouser/proj/ctx/"
+
+# bug #74897
+RDEPEND="!app-vim/enhancedcommentify"
+
+# See bug 591068.
+DEPEND="app-editors/vim[perl]"
diff --git a/app-vim/ctx/metadata.xml b/app-vim/ctx/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/ctx/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/curcmdmode-1.0-r1 b/app-vim/curcmdmode-1.0-r1
deleted file mode 100644
index 46e0dc1446b3..000000000000
--- a/app-vim/curcmdmode-1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: library for extending vim's mode() function
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=745
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=app-vim/genutils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/curcmdmode-1.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/curcmdmode-1.0.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=ad72e66b14d51b454503aec2e560d770
diff --git a/app-vim/curcmdmode/Manifest b/app-vim/curcmdmode/Manifest
new file mode 100644
index 000000000000..1e1b1c020820
--- /dev/null
+++ b/app-vim/curcmdmode/Manifest
@@ -0,0 +1,3 @@
+DIST curcmdmode-1.0.tar.bz2 3566 BLAKE2B 138c7b9b84d69a40df731dc633dd7b7e2b2859af70d8418a5760a7b6016dd61f3401bd7bd1bb7854e500c744cabb8f0c65a89fe2ee37ffbe0a3117909c232491 SHA512 eae4e7cc92ae3838ffbdb507fd51174daf2fcd05d23f418555ac9ea3dde5562e49c67ee7b27dfcf6bf2088dd335ca97165835919dd804a86fca581b4d6bc0ea2
+EBUILD curcmdmode-1.0-r1.ebuild 487 BLAKE2B f7e27dd0363ee7a6467f0872215f942ed5223c77f8f3a0e0cf72e64a0b5e05d3544cbe5839ae891854828e17874c44605f659308babf90aee95dec998ff4b8e4 SHA512 fc04cb7a064c5838136757c7fe5a7a87617808960b2f3c2b07bb44b242427634a0161fbff3b14bf97ad6b5138a08071f0f631426f3c9f91d046b1cf24cd23e36
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/curcmdmode/curcmdmode-1.0-r1.ebuild b/app-vim/curcmdmode/curcmdmode-1.0-r1.ebuild
new file mode 100644
index 000000000000..48607fca05bf
--- /dev/null
+++ b/app-vim/curcmdmode/curcmdmode-1.0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library for extending vim's mode() function"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=745"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+RDEPEND="app-vim/genutils"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides library functions and is not intended to be used
+directly by the user."
diff --git a/app-vim/curcmdmode/metadata.xml b/app-vim/curcmdmode/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/curcmdmode/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/cvsmenu-1.147-r1 b/app-vim/cvsmenu-1.147-r1
deleted file mode 100644
index b494e0de7111..000000000000
--- a/app-vim/cvsmenu-1.147-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: CVS(NT) integration script
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1245
-KEYWORDS=amd64 ppc x86
-LICENSE=LGPL-2
-RDEPEND=dev-vcs/cvs || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/cvsmenu-1.147.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cvsmenu-1.147.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=740fdb8d6b5c2499f844e499f5fdd257
diff --git a/app-vim/cvsmenu/Manifest b/app-vim/cvsmenu/Manifest
new file mode 100644
index 000000000000..b90df55971ad
--- /dev/null
+++ b/app-vim/cvsmenu/Manifest
@@ -0,0 +1,3 @@
+DIST cvsmenu-1.147.tar.bz2 16440 BLAKE2B 509b5240232b8bc2770a49e9b7814ce5783114108d22f2ae80de04c19ff037fed7c76479b3c783407c753c5d7b7f58a51df455dc4e9f7d4472e607d8b1e3f5d1 SHA512 ca25c4b6d50d0d82ce179a76a8993b1a7a5ef72d032639ec9cf16fbdeafd87eddf7f89214fa8d370d330f5f7501e1265f1c5635153cc387e23191ab81ce56c8b
+EBUILD cvsmenu-1.147-r1.ebuild 480 BLAKE2B 88e2005a772fdbd4f2e77fe4a71661aaa8f3da768d78a298563e99949e9afc49d918efab4c79439908e01fa3552b75682f201f4843b7184b6f9d303edf23db2b SHA512 30cf8e0e0aafe85c21b8fd745ab9179b45e016f1df6167738493d7c56a912cdb723c982dd22e1ffa72c7445cea653d5ba70db019f69d55821877fe3892f6754e
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/cvsmenu/cvsmenu-1.147-r1.ebuild b/app-vim/cvsmenu/cvsmenu-1.147-r1.ebuild
new file mode 100644
index 000000000000..afa97bfe8197
--- /dev/null
+++ b/app-vim/cvsmenu/cvsmenu-1.147-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: CVS(NT) integration script"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1245"
+LICENSE="LGPL-2"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+# Note, this comes from CVS on sf.net
+# http://ezytools.cvs.sourceforge.net/*checkout*/ezytools/VimTools/cvsmenu.txt
+VIM_PLUGIN_HELPFILES="cvsmenu.txt"
+
+RDEPEND="dev-vcs/cvs"
diff --git a/app-vim/cvsmenu/metadata.xml b/app-vim/cvsmenu/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/cvsmenu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/dbext-26.00 b/app-vim/dbext-26.00
deleted file mode 100644
index 337937b6bf70..000000000000
--- a/app-vim/dbext-26.00
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: easy access to databases
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=356
-KEYWORDS=amd64 ~mips ppc x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/dbext-26.00.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dbext-26.00.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=5622978270657b426327143b95317a91
diff --git a/app-vim/dbext/Manifest b/app-vim/dbext/Manifest
new file mode 100644
index 000000000000..c20764d8e8ec
--- /dev/null
+++ b/app-vim/dbext/Manifest
@@ -0,0 +1,3 @@
+DIST dbext-26.00.tar.bz2 109724 BLAKE2B 01f1378514836ac43cbdf9ca6087377ce83118b95fba04d530854a268f22dc2dc78a5f163c75c35ed9bf76514b3889c5f420b704f105dbd88bffc17f3d3c1bd3 SHA512 02d0f75443d91d32f8a6423712fb7eebde7659b986fcca2ddfef6458a5fd5caea3c73ba21ecd7a0fd57793f0a6fbc71d81c2ee6db3b82a9d98fd84572b1df18b
+EBUILD dbext-26.00.ebuild 332 BLAKE2B 1ef70306c946cb18d2fd8a82ff1863647b640e2b5aff7d5f4c6544a4ef002db8187c3649bb6abf8c1a83bdd2040a5c480dc9f8382fbc11271d7c7897ceb64967 SHA512 b3fcc20e340b19227b1c1dc95a6780266468cb2da0a5d54beedf2f8e68c0aaf600f3d987460d1c95f1153a2edfeec1094eac0ff67a16315d0c27f50bbd735f0c
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/dbext/dbext-26.00.ebuild b/app-vim/dbext/dbext-26.00.ebuild
new file mode 100644
index 000000000000..90f05bddfff0
--- /dev/null
+++ b/app-vim/dbext/dbext-26.00.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: easy access to databases"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=356"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~mips ppc x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/dbext/metadata.xml b/app-vim/dbext/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/dbext/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/detectindent-1.0_p20150908 b/app-vim/detectindent-1.0_p20150908
deleted file mode 100644
index 1a5bbb9e75d4..000000000000
--- a/app-vim/detectindent-1.0_p20150908
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/xz-utils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: automatically detect file indent settings
-EAPI=5
-HOMEPAGE=https://github.com/ciaranm/detectindent
-KEYWORDS=amd64 hppa ~mips ppc sparc x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/detectindent-1.0_p20150908.tar.xz https://dev.gentoo.org/~chutzpah/vim/detectindent-1.0_p20150908.tar.xz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=d9ddbb6bc352ad9634db9267bf9a7ba8
diff --git a/app-vim/detectindent/Manifest b/app-vim/detectindent/Manifest
new file mode 100644
index 000000000000..d4e9d201ff02
--- /dev/null
+++ b/app-vim/detectindent/Manifest
@@ -0,0 +1,3 @@
+DIST detectindent-1.0_p20150908.tar.xz 2788 BLAKE2B fbf27c3d9cbe3c92f96c9ed094cd72a24db948a1eb8abadb5ee3c86c3c118c409ffc02bee5806134e9b217361b9af44a773c6f91c3996a7ab54c7fda6f1341ce SHA512 d828d04871e6eeeaa11c109e137fbe70a3b7fa265f569e45d77b8b185f380a200b009aa0a2f0825afdbf344b12d7b8922050c4788decadcb7640bbe3fe9ca8de
+EBUILD detectindent-1.0_p20150908.ebuild 513 BLAKE2B c1b9f7d9ca299aedf5e32c8126eb931750121e3e96eb4cdd37f476461c0ae0902cf2f49dfbd7022a08c6c08a7d47cd2f03d252dfff68f195c72411d6bd6fd77c SHA512 243929e04d24e04d23a37bf1e4aeb7257cd73b6cbdbd45c9a88817be9938d8fec3332b7a9a0abee5224e8c11281222b91f4f2b5e5466c7b7622b7a3c637acf73
+MISC metadata.xml 481 BLAKE2B 5220c1a9da2e3f78bb0aafdbb2e3694374ae1158a9051110742e68e43bf22417bf5f51bc09dc06b402e89e4296c67df260825c1deaeda17eafc1c3618799bdfd SHA512 b4dfde13c17bb38d66031284c72288648992cf1157bb253c7cae53ad179d097ee05fde55333b9ac660e748298ab84b767976c5c8bb03a0defb7e37a5087031b2
diff --git a/app-vim/detectindent/detectindent-1.0_p20150908.ebuild b/app-vim/detectindent/detectindent-1.0_p20150908.ebuild
new file mode 100644
index 000000000000..232c7a61e1a8
--- /dev/null
+++ b/app-vim/detectindent/detectindent-1.0_p20150908.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: automatically detect file indent settings"
+HOMEPAGE="https://github.com/ciaranm/detectindent"
+LICENSE="vim"
+KEYWORDS="amd64 hppa ~mips ppc sparc x86"
+IUSE=""
+
+if [[ ${PV} != 9999* ]] ; then
+ SRC_URI="mirror://gentoo/${P}.tar.xz
+ https://dev.gentoo.org/~chutzpah/vim/${P}.tar.xz"
+fi
+
+DEPEND="app-arch/xz-utils"
+
+VIM_PLUGIN_HELPFILES="detectindent.txt"
diff --git a/app-vim/detectindent/metadata.xml b/app-vim/detectindent/metadata.xml
new file mode 100644
index 000000000000..34279beb870e
--- /dev/null
+++ b/app-vim/detectindent/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Vim plugin which automatically detects indent settings for files which
+ do not have modelines.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">ciaranm/detectindent</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/dhcpd-syntax-20030825-r1 b/app-vim/dhcpd-syntax-20030825-r1
deleted file mode 100644
index 182fdc314a37..000000000000
--- a/app-vim/dhcpd-syntax-20030825-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: syntax highlighting for dhcpd.conf
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=744
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/dhcpd-syntax-20030825.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dhcpd-syntax-20030825.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=0c47956ad1d6f52815b991ee01f17e88
diff --git a/app-vim/dhcpd-syntax/Manifest b/app-vim/dhcpd-syntax/Manifest
new file mode 100644
index 000000000000..51134fa806b5
--- /dev/null
+++ b/app-vim/dhcpd-syntax/Manifest
@@ -0,0 +1,4 @@
+AUX dhcpd-syntax-20030825-multiple-addresses.patch 588 BLAKE2B 1f38da00084f2e3c42ec7c851e0d4798782e7727f4677a289b0db9096d93bcd8fb2a28695c05f390727bca1c1f27ed7f4918472496e94e673009ca8ba40d9600 SHA512 9b6a22f50bb4402fbe63c7971b11a1b1d7dfec5976758897aebf14a8f0025c52daaed9e3c8668a93f5b2c7c61afde600040f6c64aeac62f2e0e9a6b01735a74a
+DIST dhcpd-syntax-20030825.tar.bz2 2761 BLAKE2B 95478de740c28a93e03179e576e2edf02a682a6161bccae676b379dbb5b654d0239c3f8e523925f2e6d36f949847f9ba7cefae20104196d71f42837afcaae76d SHA512 97c1706e0ab2c89ee20618ae0c854347f8674a3008a5c4414aacb78e984e35b0eb6eeb5f641363ed6601ceeac0c794577d518658db9200c7391871ffae5341bc
+EBUILD dhcpd-syntax-20030825-r1.ebuild 518 BLAKE2B dd2b46cc48d7053bd2d47302179cac5b1a3b5edd178209494a4fae46d06b8ba447efbf2404f66ad7ace2cfa3ce7000d60d616b47c45a53784b96073521d19256 SHA512 22eab4a129f6a32c519b1b2c71f3325bbe374506043be7bb95ea8cbce27b83968d0ad386281c0a4afc61de30d77d42305c7d00f1aa74b5f8fbcb6db2d9a9fd15
+MISC metadata.xml 451 BLAKE2B d8b36c756c321d18b52d77db7cfcd40b3ee3c9e8cdc282c090f6172f8b58b2639026650c317cbd2f4b1d575353a4b3cd22d80fbcea298d875fa5b737d69976b7 SHA512 cc138ac01df08624272da2daac14b2efd86fa8880e79b76de9fed6798fb5b8f6421fe608e2851af9c1afb7e6586f8d3f27865729960ce82ea76ac29f499e9e9a
diff --git a/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
new file mode 100644
index 000000000000..543bd478be7a
--- /dev/null
+++ b/app-vim/dhcpd-syntax/dhcpd-syntax-20030825-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: syntax highlighting for dhcpd.conf"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=744"
+LICENSE="vim"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+
+VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for dhcpd.conf files."
+
+PATCHES=( "${FILESDIR}"/${P}-multiple-addresses.patch )
diff --git a/app-vim/dhcpd-syntax/files/dhcpd-syntax-20030825-multiple-addresses.patch b/app-vim/dhcpd-syntax/files/dhcpd-syntax-20030825-multiple-addresses.patch
new file mode 100644
index 000000000000..b783792d4cb1
--- /dev/null
+++ b/app-vim/dhcpd-syntax/files/dhcpd-syntax-20030825-multiple-addresses.patch
@@ -0,0 +1,12 @@
+--- a/syntax/dhcpd.vim 2005-03-24 16:41:59.755564944 +0000
++++ b/syntax/dhcpd.vim 2005-03-24 16:42:15.894111512 +0000
+@@ -33,7 +33,7 @@
+ " Base constructs {{{
+ syn match dhcpdString +"[^"]*"+
+ syn match dhcpdDecNumber "\<-\?\d\+\(;\|\s\|$\)"
+-syn match dhcpdIPv4 "\<\(\d\{1,3}\.\)\{3}\d\{1,3}\(;\|\s\|$\)"
++syn match dhcpdIPv4 "\<\(\d\{1,3}\.\)\{3}\d\{1,3}\(;\|\s\|,\|$\)"
+ syn match dhcpdMAC "\<\(\x\x\?:\)\{5}\x\x\?\(;\|\s\|$\)"
+ syn match dhcpdDate "\<[0-6]\s\d\{4}/\d\d/\d\d/\s\d\d:\d\d:\d\d\(;\|\s\|$\)"
+ """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" }}}
+
diff --git a/app-vim/dhcpd-syntax/metadata.xml b/app-vim/dhcpd-syntax/metadata.xml
new file mode 100644
index 000000000000..ab33f6f8c5af
--- /dev/null
+++ b/app-vim/dhcpd-syntax/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ This package provides Vim syntax highlighting for dhcpd configuration
+ files, and automatic filetype detection for these files based upon
+ filename.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/diffchar-7.01 b/app-vim/diffchar-7.01
deleted file mode 100644
index 88c67b912601..000000000000
--- a/app-vim/diffchar-7.01
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: highlight the exact differences, based on characters and words
-EAPI=6
-HOMEPAGE=https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932
-KEYWORDS=amd64 x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/diffchar-7.01.tar.bz2 https://dev.gentoo.org/~radhermit/vim/diffchar-7.01.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=0e5160fe6f5a249c1040778710012884
diff --git a/app-vim/diffchar-7.2 b/app-vim/diffchar-7.2
deleted file mode 100644
index fd09d5b3fdc1..000000000000
--- a/app-vim/diffchar-7.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: highlight the exact differences, based on characters and words
-EAPI=6
-HOMEPAGE=https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932
-KEYWORDS=~amd64 ~x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/diffchar-7.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/diffchar-7.2.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=2f4a2d51c2cce945715a00bb67a66c43
diff --git a/app-vim/diffchar/Manifest b/app-vim/diffchar/Manifest
new file mode 100644
index 000000000000..59d4d9b8f905
--- /dev/null
+++ b/app-vim/diffchar/Manifest
@@ -0,0 +1,5 @@
+DIST diffchar-7.01.tar.bz2 19950 BLAKE2B a014fa17e5b15179a4baa8e2cd4fcce36f1cc66cbd8c4ab3a13c0288a510b74f06105d2034666669e2bac2881f5bc5cd81aa1cabb3b80a91f3d67a3bf62bd916 SHA512 3f42f40ec27262f76058d9461ccde80c5badc61d0854c1ff239bea399c26e20eb5cf8960b76901223e937097e18dd7e015fc14a8f7a99907666c518d4baf5117
+DIST diffchar-7.2.tar.bz2 20092 BLAKE2B 20eef77d7019e55e466e1212e4560d91cde83f55808a4b77eb6fe2e5b7518715606d8d89c046e453dcb380517163974e173e00c18d662df2ee8ae43a6a347c06 SHA512 7c9a9239ae4eae1d325984ab40ae8d90e2dabf96dc929ed6f05c3496352aeb562452bd154fe3d1ec96353356c287604162f5b89d762b7afe26bc975449d92427
+EBUILD diffchar-7.01.ebuild 404 BLAKE2B 0e367725b5b0ba6ee4d0ab82cafc55f1e5ee429a7478d5240836475f6d1bce055b947ed51bf3cc1c7d13748f5cb4d47af4ad86e50ac847dad9553a79a06f5eb5 SHA512 bed5f93ea8048e5b21b71250b95ec5cd89473b615e65222a47366aaee6a83b582674f0314f1213ae4d204afaae60d0dfa0e77feaba95078d24ccbec025955010
+EBUILD diffchar-7.2.ebuild 406 BLAKE2B 29853c47dc16d39d7390349eb00be951c430405422dfdbcb22543a353294d20482cf7b4e3bbe30788bf8eb90a92166a0cfacbaf86695b79b6565e12ca2975d30 SHA512 52f1966646b49749170a482af5c34240f906749a3041b3bfaec482732dac24e1e4838aa5ac085c3dd52ad67fe3aeceee9563dbe55ac5241bf7cce474ed5bff47
+MISC metadata.xml 345 BLAKE2B 25adb1e474dae23ba85761950707568de3a87a9f9b0b38545e3a7cb127cd1099f0531f23c04f55a0b21f42a4d5a36b2ef454f2608c692c3afe9a90068dc4ffdb SHA512 bbe312936f14ed5cda6ac637f0780480b5e82580ca79320c5503b404e0a2eb9659fb7d0dda9e83097546fa104b7b9503bb1b25b166725b045487c78d80219d7e
diff --git a/app-vim/diffchar/diffchar-7.01.ebuild b/app-vim/diffchar/diffchar-7.01.ebuild
new file mode 100644
index 000000000000..6c45dd971e77
--- /dev/null
+++ b/app-vim/diffchar/diffchar-7.01.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: highlight the exact differences, based on characters and words"
+HOMEPAGE="https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932"
+LICENSE="vim.org"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/diffchar/diffchar-7.2.ebuild b/app-vim/diffchar/diffchar-7.2.ebuild
new file mode 100644
index 000000000000..7a51a1973915
--- /dev/null
+++ b/app-vim/diffchar/diffchar-7.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: highlight the exact differences, based on characters and words"
+HOMEPAGE="https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932"
+LICENSE="vim.org"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/diffchar/metadata.xml b/app-vim/diffchar/metadata.xml
new file mode 100644
index 000000000000..33e52c74c3ab
--- /dev/null
+++ b/app-vim/diffchar/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">rickhowe/diffchar.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/dirdiff-1.1.5 b/app-vim/dirdiff-1.1.5
deleted file mode 100644
index b5efd0b58eae..000000000000
--- a/app-vim/dirdiff-1.1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: diff and merge two directories recursively
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=102
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=sys-apps/diffutils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/dirdiff-1.1.5.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dirdiff-1.1.5.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=2ae5fe30f0b2073de5e3d3b6c4c6b0b9
diff --git a/app-vim/dirdiff/Manifest b/app-vim/dirdiff/Manifest
new file mode 100644
index 000000000000..eb83cc2cc79d
--- /dev/null
+++ b/app-vim/dirdiff/Manifest
@@ -0,0 +1,3 @@
+DIST dirdiff-1.1.5.tar.bz2 11131 BLAKE2B 17a7adaa67f90c2e23ada8a53b10c5b50db3039bb17b7a32797870072b1b06ff14cc8b1b41106d0eadbfc9ac4dfabf1bb4e925a39ca2ab2a8b4444e64d7acc66 SHA512 d1abc7981d38eb784cec265146fb3b45af32f9df17698d133f6f001608c48d53aa2529f4d3d7204509ee26fcd84e813842b5a8193b145abe9d0cc468f69b7f87
+EBUILD dirdiff-1.1.5.ebuild 368 BLAKE2B 71dbc4958a6a7b3b17745c8f15fab89b2bacf919313e6261c373d73de67b5faf78a07f60fddabf21a72b34e70a8279f8fcbf01b1a5fa951f88a2ea798e948220 SHA512 4595aa09c345dff988be2c50c2c6d435b518954b41989604eb30a3a4b1190274d0db050e4a4237e5db9d626977538796b22cdf7e35822a321a60f6928b2f60ae
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/dirdiff/dirdiff-1.1.5.ebuild b/app-vim/dirdiff/dirdiff-1.1.5.ebuild
new file mode 100644
index 000000000000..e0cd57fdb82b
--- /dev/null
+++ b/app-vim/dirdiff/dirdiff-1.1.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: diff and merge two directories recursively"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=102"
+LICENSE="BSD"
+KEYWORDS="amd64 x86"
+
+RDEPEND="sys-apps/diffutils"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/dirdiff/metadata.xml b/app-vim/dirdiff/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/dirdiff/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/easy-align-2.10.0 b/app-vim/easy-align-2.10.0
deleted file mode 100644
index 978440aee2c7..000000000000
--- a/app-vim/easy-align-2.10.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a simple alignment plugin
-EAPI=5
-HOMEPAGE=https://github.com/junegunn/vim-easy-align https://www.vim.org/scripts/script.php?script_id=4520
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/junegunn/vim-easy-align/archive/2.10.0.tar.gz -> easy-align-2.10.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=1cdab99dcb8986216c6cd01de0387cd4
diff --git a/app-vim/easy-align/Manifest b/app-vim/easy-align/Manifest
new file mode 100644
index 000000000000..f8fe5d8d2030
--- /dev/null
+++ b/app-vim/easy-align/Manifest
@@ -0,0 +1,3 @@
+DIST easy-align-2.10.0.tar.gz 20056 BLAKE2B 3319cfc84147a3cfb0c7109dbb9116c94b734da528623944e2546667ac45e5d912e404c8c94df963002e7789760ba8fa7023e98cf22c1201bedbe8f667b1d13d SHA512 4a6a46db96b78d830fc0191b77b2226e9c1a2de585b731d1997f69ee31c8c76038ceb14f18e13f30fee00b5ce9ca7aed4241db06cac303b8ae903a856e4baabd
+EBUILD easy-align-2.10.0.ebuild 551 BLAKE2B e802d9157674c57d00f502f4e17babf34bfd039f2df5890b64ff91ef87fa312d11c784b14d65d9f006d9f18fe8a31f20b3101f37c74c10fa66c3e023e8cc0909 SHA512 d7cc1c6432630f3db2342c64d04d660506c3d2b721865dcbae625ec945ffdb0a2b93bcac5cb4f5ae7503466018beccede4f492ddd56e2d1f0f59ac6c26a0eb03
+MISC metadata.xml 347 BLAKE2B 21be1fa0f775c2734cede9e1e5ffd6bd2a23681a16a6361689a927ae4871ed3df26592c87da7e8e8771242fdf496baa0647fee36d007c356e60bd190d2a9ba62 SHA512 4b687e38ddec009ffc0ab3effb0f1d4d46d8a576812b73f3526bf13f0facef23525b75765ac7c56e9c541d66b0cbdb1f3f46a0907d3688f91576cd0a6bb67c92
diff --git a/app-vim/easy-align/easy-align-2.10.0.ebuild b/app-vim/easy-align/easy-align-2.10.0.ebuild
new file mode 100644
index 000000000000..e13cbff4ce51
--- /dev/null
+++ b/app-vim/easy-align/easy-align-2.10.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN=vim-${PN}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="vim plugin: a simple alignment plugin"
+HOMEPAGE="https://github.com/junegunn/vim-easy-align https://www.vim.org/scripts/script.php?script_id=4520"
+SRC_URI="https://github.com/junegunn/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+ rm -rv test || die
+}
diff --git a/app-vim/easy-align/metadata.xml b/app-vim/easy-align/metadata.xml
new file mode 100644
index 000000000000..0c9042ba210c
--- /dev/null
+++ b/app-vim/easy-align/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">junegunn/vim-easy-align</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/easytags-3.11 b/app-vim/easytags-3.11
deleted file mode 100644
index 01b040ba0a1f..000000000000
--- a/app-vim/easytags-3.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: automated tag file generation and syntax highlighting
-EAPI=5
-HOMEPAGE=http://peterodding.com/code/vim/easytags/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-vim/vim-misc-1.17.6 dev-util/ctags || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/xolox/vim-easytags/archive/3.11.tar.gz -> easytags-3.11.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=4b99a8eec8528e51bb69047af73f6348
diff --git a/app-vim/easytags/Manifest b/app-vim/easytags/Manifest
new file mode 100644
index 000000000000..b31c1c84faf9
--- /dev/null
+++ b/app-vim/easytags/Manifest
@@ -0,0 +1,4 @@
+AUX easytags-3.11-fix-ctags-detection.patch 2964 BLAKE2B eafaddd9877d8732eeace0197ab29cedba38a89a1f7c4e1fb2192cb075bc7a4541e6a5e5448a8944a7f6a0b47fb1cd481035529d6b11d5508df35089f2e85865 SHA512 f3ef6cfce5cbbebc4d33fc5f6fe0b7df037c9ec80da6f4a2b29bccb15e00b385719e654238f6becea1372900ac5f9e5e6d6af481537dde12c03cda24ee49e674
+DIST easytags-3.11.tar.gz 40572 BLAKE2B a6b228743f493bd467aff6685b6799de7e4862d384e14c81a084d7a211cf165d62cf902415a3c98a69858eded64c606bd4565f6e0c43fab7c078ba81d0ec5217 SHA512 9c1985a02b2718315d825ed29c06cbf78050e693893a9a7530a774031cbe9e6a27ee1dc91878950a1fbcaf7ea685faeb799d1e5b218b9ce25718783409f66130
+EBUILD easytags-3.11.ebuild 1018 BLAKE2B d212a9b22864eb361299c7b0303409165dc12fb1d67067d6199f57c071d5cf8ff608d9273da3cb5317bda3d691c88ba2102bb90cebf1e8d5c5b4170ab830fdde SHA512 d4de90b1b1da0f94d5254b7917fa3c0df2b47da5c02b7f285a1e5cdfe8974e3029c45f41ea680c9e7990161914a525a2fad1774c8572586a0d1d3b0cfa0d622c
+MISC metadata.xml 342 BLAKE2B 5e7e191544a04bc4ae28e482deef1c44c8ee11f6afe01d9ed6b138364f771411e341b5827e92bdfeae1edffdc166979c72a53034886530b0cdb55e34d9c2ce6e SHA512 0f4fbbedc023ccccc74ef8e020c3a90a0ccb0184164a52dd733699c5d4bf729d09478ea87fda093197679f7b44b3c1b64d3c64845d91d3fb92f9e3a1eab8fc78
diff --git a/app-vim/easytags/easytags-3.11.ebuild b/app-vim/easytags/easytags-3.11.ebuild
new file mode 100644
index 000000000000..79b37e481e5a
--- /dev/null
+++ b/app-vim/easytags/easytags-3.11.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: automated tag file generation and syntax highlighting"
+HOMEPAGE="http://peterodding.com/code/vim/easytags/"
+SRC_URI="https://github.com/xolox/vim-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=app-vim/vim-misc-1.17.6
+ dev-util/ctags"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S="${WORKDIR}/vim-${P}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-ctags-detection.patch"
+)
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+ # remove unnecessary files
+ rm addon-info.json INSTALL.md README.md || die
+}
+
+src_install() {
+ vim-plugin_src_install
+
+ # fix scripts
+ fperms 755 /usr/share/vim/vimfiles/misc/easytags/{normalize-tags,why-so-slow}.py
+ python_fix_shebang "${ED}"/usr/share/vim/vimfiles/misc/easytags/{normalize-tags,why-so-slow}.py
+}
diff --git a/app-vim/easytags/files/easytags-3.11-fix-ctags-detection.patch b/app-vim/easytags/files/easytags-3.11-fix-ctags-detection.patch
new file mode 100644
index 000000000000..56b24dfe406f
--- /dev/null
+++ b/app-vim/easytags/files/easytags-3.11-fix-ctags-detection.patch
@@ -0,0 +1,54 @@
+From f5746bdfd9942b00c349e53f3f4917ae73bb6797 Mon Sep 17 00:00:00 2001
+From: Mathias Andersson <wraul@dbox.se>
+Date: Thu, 24 Dec 2015 14:24:34 +0100
+Subject: [PATCH] Fix detection of Universal Ctags.
+
+Recently Universal Ctags changed version from 'Development' to '0.0.0'
+which broke the detection.
+---
+ autoload/xolox/easytags.vim | 32 +++++++++++++++++++-------------
+ 1 file changed, 19 insertions(+), 13 deletions(-)
+
+diff --git a/autoload/xolox/easytags.vim b/autoload/xolox/easytags.vim
+index d0dec21..3c85e6a 100644
+--- a/autoload/xolox/easytags.vim
++++ b/autoload/xolox/easytags.vim
+@@ -78,19 +78,25 @@ function! xolox#easytags#check_ctags_compatible(name, min_version) " {{{2
+ call xolox#misc#msg#debug("easytags.vim %s: Command '%s' returned nonzero exit code %i!", g:xolox#easytags#version, a:name, result['exit_code'])
+ else
+ " Extract the version number from the output.
+- let pattern = '\(Exuberant\|Universal\) Ctags \zs\(\d\+\(\.\d\+\)*\|Development\)'
+- let g:easytags_ctags_version = matchstr(get(result['stdout'], 0, ''), pattern)
+- " Deal with development builds.
+- if g:easytags_ctags_version == 'Development'
+- call xolox#misc#msg#debug("easytags.vim %s: Assuming development build is compatible ..", g:xolox#easytags#version, a:name)
+- return 1
+- endif
+- " Make sure the version is compatible.
+- if xolox#misc#version#at_least(a:min_version, g:easytags_ctags_version)
+- call xolox#misc#msg#debug("easytags.vim %s: Version is compatible! :-)", g:xolox#easytags#version)
+- return 1
+- else
+- call xolox#misc#msg#debug("easytags.vim %s: Version is not compatible! :-(", g:xolox#easytags#version)
++ let pattern = '\(\w\+\) Ctags \(\d\+\(\.\d\+\)*\|Development\)'
++ let match = matchlist(get(result['stdout'], 0, ''), pattern)
++ let g:easytags_ctags_fork = match[1]
++ let g:easytags_ctags_version = match[2]
++ if g:easytags_ctags_fork != '' && g:easytags_ctags_version != ''
++ call xolox#misc#msg#debug("easytags.vim %s: Detected %s Ctags %s", g:xolox#easytags#version, g:easytags_ctags_fork, g:easytags_ctags_version)
++ if g:easytags_ctags_fork == 'Universal'
++ " All versions should be compatible.
++ call xolox#misc#msg#debug("easytags.vim %s: Assuming all versions is compatible ..", g:xolox#easytags#version)
++ return 1
++ elseif g:easytags_ctags_fork == 'Exuberant'
++ " Make sure the version is compatible.
++ if xolox#misc#version#at_least(a:min_version, g:easytags_ctags_version)
++ call xolox#misc#msg#debug("easytags.vim %s: Version is compatible! :-)", g:xolox#easytags#version)
++ return 1
++ else
++ call xolox#misc#msg#debug("easytags.vim %s: Version is not compatible! :-(", g:xolox#easytags#version)
++ endif
++ endif
+ endif
+ endif
+ call xolox#misc#msg#debug("easytags.vim %s: Standard output of command: %s", g:xolox#easytags#version, string(result['stdout']))
diff --git a/app-vim/easytags/metadata.xml b/app-vim/easytags/metadata.xml
new file mode 100644
index 000000000000..f13cee8dc033
--- /dev/null
+++ b/app-vim/easytags/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">xolox/vim-easytags</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/ebnf-syntax-1.1-r2 b/app-vim/ebnf-syntax-1.1-r2
deleted file mode 100644
index 6510db7b9af3..000000000000
--- a/app-vim/ebnf-syntax-1.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: EBNF (ISO/IEC 14997) file syntax highlighting
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=545
-KEYWORDS=alpha amd64 ia64 ~mips ppc ppc64 sparc x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/ebnf-syntax-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ebnf-syntax-1.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=9b33c1835d3d0d8cbc337f34a392546c
diff --git a/app-vim/ebnf-syntax/Manifest b/app-vim/ebnf-syntax/Manifest
new file mode 100644
index 000000000000..2e82913f67ac
--- /dev/null
+++ b/app-vim/ebnf-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST ebnf-syntax-1.1.tar.bz2 981 BLAKE2B 5ab1916fc909f8b6b4fc139fd34c5c982f2bfac3f4ccfa53f13945787db6b9c6b5531cb805d4a0feea5f3165259cd3a033951fd9074344e62657e067571e5300 SHA512 0fba3be91e998b26a3011bfe18765a3bc3ebde6aa33e96580dc0529d79a067020cfeee614dfa40126a1a968d3ca8e77711eca096095675cf6072061c9be7c083
+EBUILD ebnf-syntax-1.1-r2.ebuild 582 BLAKE2B 109f7998c113695e6404c6630c508a73e157ca7039778e0ab4864aa21af2f08926ff4eab1bf2557f56309d75614f73983ef073a97c385fda8383557b8d5cb66d SHA512 1642c6d5ae458bc4f7edafbf65dc994a01f28c065f6321a5fe3f36b7d9dadeb2e51f79e1a1032e89d3bb6cdad796322db6979b65159fe1ad3eef5a429748155d
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
new file mode 100644
index 000000000000..fd08be1bffec
--- /dev/null
+++ b/app-vim/ebnf-syntax/ebnf-syntax-1.1-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: EBNF (ISO/IEC 14997) file syntax highlighting"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=545"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for EBNF (ISO/IEC 14997) files."
+
+src_prepare() {
+ default
+
+ # don't use hi link, bug #101799.
+ sed -i -e 's,hi link,hi def link,' syntax/ebnf.vim || die "sed failed"
+}
diff --git a/app-vim/ebnf-syntax/metadata.xml b/app-vim/ebnf-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/ebnf-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/editorconfig-vim-0.3.3-r2 b/app-vim/editorconfig-vim-0.3.3-r2
deleted file mode 100644
index 89afca3813f6..000000000000
--- a/app-vim/editorconfig-vim-0.3.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/editorconfig-core-py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( app-editors/vim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Support EditorConfig files
-EAPI=6
-HOMEPAGE=https://editorconfig.org/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/editorconfig-core-py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( app-editors/vim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/editorconfig/editorconfig-vim/archive/v0.3.3.tar.gz -> editorconfig-vim-0.3.3.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=abbe851148f44662f8b2b4577826ae23
diff --git a/app-vim/editorconfig-vim/Manifest b/app-vim/editorconfig-vim/Manifest
new file mode 100644
index 000000000000..a0e12834ca5c
--- /dev/null
+++ b/app-vim/editorconfig-vim/Manifest
@@ -0,0 +1,6 @@
+AUX editorconfig-vim-0.3.3-fixes.patch 3434 BLAKE2B 0a8050698e5138282b838ecad598dcda7676ef3210985fb4d1330fd63651b34eb0df5bd20715acceb807f5f5db7a60a0161b03419b880090f0a727e1a9557daa SHA512 3133dc753c46dbb66d833cb58bf464d37cbd05f77fc9a4a29b9fb9b3eea39b990df2020c7604e881031aaa1cc6cf11b0d42b7ac186c56736721341750d15a81b
+AUX editorconfig-vim-0.3.3-max-line-length-off.patch 735 BLAKE2B 3be429d92fefa14a5c483dfdb9e4b10ba18fec0a4b925088995ccf03dcee1534a50aa394c8c37a03ec5e3115a7c0804fdaa2e07f8e39a71f545e485814296087 SHA512 7657b145d71890f0ec12b142c8edc21558171d7cc8f8392912c0fb2e774799d5e57bf06999d48dfce7bb6402bf05ba7a7bd2d613efb5341bebf223a50135ab1d
+AUX editorconfig-vim-0.3.3-python3.patch 5601 BLAKE2B 4a9bee66b7b3b2b016d13a557a71d49e28c098c0be26224f55945ea9950d1f4a1484dba2f3c560d8d0ddb93abd6936b72b2195fec81d0b951a238d2344a2f052 SHA512 10a08c795a667c92e0667f292472c5704c43915868fc8c1f164898feb4c4e7af71ede553f5aa874b19e2b4c48f89313bfb90494e0d5d2dc4b7cbaa049d5df2a3
+DIST editorconfig-vim-0.3.3.tar.gz 35395 BLAKE2B a7b65c1472024017dd408e5c4ac5048004d0bd55f44c7cfba49b5973cb445125ed89cc3d4363fb902a4c5fbb507f3ee5ed0ca48aece3fb6915e643bae0dbf70c SHA512 2dd968cf6bb162db8e6242ffb60cc61fb05a8042804b6b46b9f9cd35be968f83b473f04797e47c5cff11d7c052ff523bf8ba1d568992d44b72b97b54a81425a1
+EBUILD editorconfig-vim-0.3.3-r2.ebuild 967 BLAKE2B da2cebacac674bc411193b0366c6611de3e7a107d4881b37126d23da0b3e27c287b1be08a60a60f81a6e57484a69390dce8f2f40c412f23b0b8d0df8e07c1faf SHA512 2ab31f3785633643ba3ad5c96f194495aba9a793775226d5b38702c13d07e482e34225442b7d75f1f1d97cd081a97cc3c47c8be50bd0e97e4b3a570a27e417d6
+MISC metadata.xml 419 BLAKE2B b73a8d7814d585826406516eff8e391fbeec6b1da25bb5b583ad65709260819753bba45f88cafd3c7337854843ce7aa02a8f00f9ab49973c0bfa422e4ef801d6 SHA512 57167b4b86b6bb89094b28341476c03f8415c1dff97fd90f91c882991afe5e33fbd14edd38a18e07d06f3498f070ced5ca9e598b66e7e615c37146b598b6282d
diff --git a/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild b/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
new file mode 100644
index 000000000000..81a35dbb4e31
--- /dev/null
+++ b/app-vim/editorconfig-vim/editorconfig-vim-0.3.3-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=(python2_7 python3_4 python3_5 python3_6)
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: Support EditorConfig files "
+HOMEPAGE="https://editorconfig.org/"
+SRC_URI="https://github.com/${PN%-vim}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+ ${PYTHON_DEPS}
+ dev-python/editorconfig-core-py[${PYTHON_USEDEP}]
+ || (
+ app-editors/vim[python,${PYTHON_USEDEP}]
+ app-editors/gvim[python,${PYTHON_USEDEP}]
+ )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-python3.patch"
+ "${FILESDIR}/${P}-max-line-length-off.patch"
+ "${FILESDIR}/${P}-fixes.patch"
+)
+
+VIM_PLUGIN_HELPFILES="${PN%-vim}.txt"
+
+src_prepare() {
+ default
+
+ rm LICENSE mkzip.sh .editorconfig .gitignore .travis.yml || die
+ rm -r tests plugin/${PN%-vim}-core-py || die
+}
diff --git a/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-fixes.patch b/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-fixes.patch
new file mode 100644
index 000000000000..955560088735
--- /dev/null
+++ b/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-fixes.patch
@@ -0,0 +1,92 @@
+diff --git a/doc/editorconfig.txt b/doc/editorconfig.txt
+index bd6173b..3b32012 100644
+--- a/doc/editorconfig.txt
++++ b/doc/editorconfig.txt
+@@ -79,7 +79,8 @@ empty. There are 3 modes currently: "external_command", "python_builtin",
+ "python_external".
+
+ python_builtin: Use the vim built-in python to run the python version
+- EditorConfig Core.
++ EditorConfig Core. In this mode, Python 2.5 or higher
++ is required.
+ python_external: Use an external python interpreter to run the python
+ version EditorConfig Core.
+ external_command: Run external EditorConfig Core.
+diff --git a/plugin/editorconfig.vim b/plugin/editorconfig.vim
+index af4f630..9abd008 100644
+--- a/plugin/editorconfig.vim
++++ b/plugin/editorconfig.vim
+@@ -121,15 +121,15 @@ function! s:FindPythonFiles() " {{{1
+
+ let l:python_core_files_dir = fnamemodify(
+ \ findfile(g:EditorConfig_python_files_dir . '/main.py',
+- \ ','.&runtimepath), ':p:h')
++ \ fnameescape(','.&runtimepath)), ':p:h')
+
+ if empty(l:python_core_files_dir)
+ let l:python_core_files_dir = ''
+ else
+
+- " expand python core file path to full path, and remove the appending '/'
+- let l:python_core_files_dir = substitute(
+- \ fnamemodify(l:python_core_files_dir, ':p'), '/$', '', '')
++ " expand python core file path to full path, and remove the appending '/'
++ let l:python_core_files_dir = substitute(
++ \ fnamemodify(l:python_core_files_dir, ':p'), '/$', '', '')
+ endif
+
+ let &shellslash = l:old_shellslash
+@@ -247,7 +247,7 @@ function! s:InitializePythonBuiltin(editorconfig_core_py_dir) " {{{2
+ " The following line modifies l:ret. This is a bit confusing but
+ " unfortunately to be compatible with Vim 7.3, we cannot use pyeval. This
+ " should be changed in the future.
+- execute s:pyfile_cmd s:pyscript_path
++ execute s:pyfile_cmd fnameescape(s:pyscript_path)
+
+ return l:ret
+ endfunction
+@@ -327,14 +327,19 @@ endif
+
+ function! s:UseConfigFiles()
+
++ let l:buffer_name = expand('%:p')
+ " ignore buffers without a name
+- if empty(expand('%:p'))
++ if empty(l:buffer_name)
+ return
+ endif
+
++ if g:EditorConfig_verbose
++ echo 'Applying EditorConfig on file "' . l:buffer_name . '"'
++ endif
++
+ " Ignore specific patterns
+ for pattern in g:EditorConfig_exclude_patterns
+- if expand('%:p') =~ pattern
++ if l:buffer_name =~ pattern
+ return
+ endif
+ endfor
+@@ -386,8 +391,8 @@ endfunction
+ function! s:UseConfigFiles_Python_External() " {{{2
+ " Use external python interp to run the python EditorConfig Core
+
+- let l:cmd = s:editorconfig_python_interp . ' ' .
+- \ s:editorconfig_core_py_dir . '/main.py'
++ let l:cmd = shellescape(s:editorconfig_python_interp) . ' ' .
++ \ shellescape(s:editorconfig_core_py_dir . '/main.py')
+
+ call s:SpawnExternalParser(l:cmd)
+
+@@ -445,6 +450,11 @@ function! s:SpawnExternalParser(cmd) " {{{2
+ return
+ endif
+
++ if g:EditorConfig_verbose
++ echo 'Output from EditorConfig core executable:'
++ echo l:parsing_result
++ endif
++
+ for one_line in l:parsing_result
+ let l:eq_pos = stridx(one_line, '=')
+
diff --git a/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-max-line-length-off.patch b/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-max-line-length-off.patch
new file mode 100644
index 000000000000..be5d736a385c
--- /dev/null
+++ b/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-max-line-length-off.patch
@@ -0,0 +1,20 @@
+commit 6e7011712398e53671e5a44edefeb68914562a3a
+Author: Hong Xu <hong@topbug.net>
+Date: Wed Apr 6 00:34:26 2016 -0700
+
+ Support max_line_length=off to leave the decision to the editor settings.
+
+diff --git a/plugin/editorconfig.vim b/plugin/editorconfig.vim
+index 9abd008..0e9d647 100644
+--- a/plugin/editorconfig.vim
++++ b/plugin/editorconfig.vim
+@@ -563,7 +563,8 @@ function! s:ApplyConfig(config) " {{{1
+ endif
+
+ " highlight the columns following max_line_length
+- if has_key(a:config, 'max_line_length')
++ if has_key(a:config, 'max_line_length') &&
++ \ a:config['max_line_length'] != 'off'
+ let l:max_line_length = str2nr(a:config['max_line_length'])
+
+ if l:max_line_length >= 0
diff --git a/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-python3.patch b/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-python3.patch
new file mode 100644
index 000000000000..848582ab02e2
--- /dev/null
+++ b/app-vim/editorconfig-vim/files/editorconfig-vim-0.3.3-python3.patch
@@ -0,0 +1,213 @@
+commit c2b7a104b826b7ff9283d32cb95a039ddccde79b
+Author: Shunsuke Shimizu <grafi@grafi.jp>
+Date: Sun Jan 10 00:12:10 2016 -0800
+
+ Make the plugin to be compatible with Python 3.
+
+ Squashed commit of the following:
+
+ commit 0973c5179e504ffbd74a38d6557bb49fe3bf8b5d
+ Author: Hong Xu <hong@topbug.net>
+ Date: Sun Jan 10 00:11:11 2016 -0800
+
+ Some minor corrections
+
+ commit ca17e97e86bd6379bcf3782adfa200c1589cab69
+ Author: Shunsuke Shimizu <grafi@grafi.jp>
+ Date: Sun Jan 10 15:24:13 2016 +0900
+
+ vim 7.3 support by using `py[3]` command instead of `py[3]eval()` function
+
+ commit c51ae80ce0ca8fe24c014a7c2d54a85d604d3c88
+ Author: grafi <grafi@grafi.jp>
+ Date: Sun Jan 10 14:42:38 2016 +0900
+
+ use print_function on python2
+
+ commit 401a9486bba7528aa4d54b06b8ef3ace582829c9
+ Author: grafi <grafi@grafi.jp>
+ Date: Sun Jan 10 14:33:25 2016 +0900
+
+ assure that sys.path is cleaned
+
+ commit f3bf442429d9579a336a1bb8f98fee82710fbd1e
+ Author: grafi <grafi@grafi.jp>
+ Date: Sun Jan 10 14:22:45 2016 +0900
+
+ python3 style print
+
+ commit 8e059379328b23e4253f76cbd72d3ef484501d42
+ Author: Shunsuke Shimizu <grafi@grafi.jp>
+ Date: Sat Dec 26 07:54:49 2015 +0900
+
+ Support python3
+
+diff --git a/plugin/editorconfig.py b/plugin/editorconfig.py
+new file mode 100644
+index 0000000..21ea9c7
+--- /dev/null
++++ b/plugin/editorconfig.py
+@@ -0,0 +1,42 @@
++from __future__ import print_function
++
++try:
++ try:
++ import vim
++ import sys
++ except:
++ vim.command('let l:ret = 2')
++ raise
++
++ try:
++ sys.path.insert(0, vim.eval('a:editorconfig_core_py_dir'))
++
++ import editorconfig
++ import editorconfig.exceptions as editorconfig_except
++ except:
++ vim.command('let l:ret = 3')
++ raise
++ finally:
++ del sys.path[0]
++
++ # `ec_` prefix is used in order to keep clean Python namespace
++ ec_data = {}
++
++ def ec_UseConfigFiles():
++ ec_data['filename'] = vim.eval("expand('%:p')")
++ ec_data['conf_file'] = ".editorconfig"
++
++ try:
++ ec_data['options'] = editorconfig.get_properties(ec_data['filename'])
++ except editorconfig_except.EditorConfigError as e:
++ if int(vim.eval('g:EditorConfig_verbose')) != 0:
++ print(str(e), file=sys.stderr)
++ vim.command('let l:ret = 1')
++ return
++
++ for key, value in ec_data['options'].items():
++ vim.command("let l:config['" + key.replace("'", "''") + "'] = " +
++ "'" + value.replace("'", "''") + "'")
++
++except:
++ pass
+diff --git a/plugin/editorconfig.vim b/plugin/editorconfig.vim
+index a21b103..af4f630 100644
+--- a/plugin/editorconfig.vim
++++ b/plugin/editorconfig.vim
+@@ -36,6 +36,8 @@ let g:loaded_EditorConfig = 1
+ let s:saved_cpo = &cpo
+ set cpo&vim
+
++let s:pyscript_path = expand('<sfile>:p:r') . '.py'
++
+ " variables {{{1
+ if !exists('g:EditorConfig_exec_path')
+ let g:EditorConfig_exec_path = ''
+@@ -231,48 +233,23 @@ function! s:InitializePythonBuiltin(editorconfig_core_py_dir) " {{{2
+
+ let s:builtin_python_initialized = 1
+
+- let l:ret = 0
+-
+- if !has('python')
++ if has('python')
++ let s:pyfile_cmd = 'pyfile'
++ let s:py_cmd = 'py'
++ elseif has('python3')
++ let s:pyfile_cmd = 'py3file'
++ let s:py_cmd = 'py3'
++ else
+ return 1
+ endif
+
+- python << EEOOFF
+-
+-try:
+- import vim
+- import sys
+-except:
+- vim.command('let l:ret = 2')
+-
+-EEOOFF
+-
+- if l:ret != 0
+- return l:ret
+- endif
+-
+- python << EEOOFF
+-
+-try:
+- sys.path.insert(0, vim.eval('a:editorconfig_core_py_dir'))
+-
+- import editorconfig
+- import editorconfig.exceptions as editorconfig_except
+-
+-except:
+- vim.command('let l:ret = 3')
+-
+-del sys.path[0]
+-
+-ec_data = {} # used in order to keep clean Python namespace
+-
+-EEOOFF
+-
+- if l:ret != 0
+- return l:ret
+- endif
++ let l:ret = 0
++ " The following line modifies l:ret. This is a bit confusing but
++ " unfortunately to be compatible with Vim 7.3, we cannot use pyeval. This
++ " should be changed in the future.
++ execute s:pyfile_cmd s:pyscript_path
+
+- return 0
++ return l:ret
+ endfunction
+
+ " Do some initalization for the case that the user has specified core mode {{{1
+@@ -388,41 +365,22 @@ augroup END
+ function! s:UseConfigFiles_Python_Builtin() " {{{2
+ " Use built-in python to run the python EditorConfig core
+
+- let l:config = {}
+- let l:ret = 0
+-
+ " ignore buffers that do not have a file path associated
+ if empty(expand('%:p'))
+ return 0
+ endif
+
+- python << EEOOFF
+-
+-ec_data['filename'] = vim.eval("expand('%:p')")
+-ec_data['conf_file'] = ".editorconfig"
+-
+-try:
+- ec_data['options'] = editorconfig.get_properties(ec_data['filename'])
+-except editorconfig_except.EditorConfigError as e:
+- if int(vim.eval('g:EditorConfig_verbose')) != 0:
+- print >> sys.stderr, str(e)
+- vim.command('let l:ret = 1')
++ let l:config = {}
+
+-EEOOFF
++ let l:ret = 0
++ execute s:py_cmd 'ec_UseConfigFiles()'
+ if l:ret != 0
+ return l:ret
+ endif
+
+- python << EEOOFF
+-for key, value in ec_data['options'].items():
+- vim.command("let l:config['" + key.replace("'", "''") + "'] = " +
+- "'" + value.replace("'", "''") + "'")
+-
+-EEOOFF
+-
+ call s:ApplyConfig(l:config)
+
+- return 0
++ return l:ret
+ endfunction
+
+ function! s:UseConfigFiles_Python_External() " {{{2
diff --git a/app-vim/editorconfig-vim/metadata.xml b/app-vim/editorconfig-vim/metadata.xml
new file mode 100644
index 000000000000..ea346f7a9329
--- /dev/null
+++ b/app-vim/editorconfig-vim/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ </maintainer>
+ <maintainer type="person">
+ <email>chutzpah@gentoo.org</email>
+ <name>Patrick McLean</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">editorconfig/editorconfig-vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/emmet-0.85 b/app-vim/emmet-0.85
deleted file mode 100644
index 2cc1d0beef4b..000000000000
--- a/app-vim/emmet-0.85
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: HTML and CSS hi-speed coding
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2981 https://mattn.github.io/emmet-vim/ https://emmet.io/
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/emmet-0.85.tar.bz2 https://dev.gentoo.org/~radhermit/vim/emmet-0.85.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=cb9003fa1a4b08782eba9b76cb120302
diff --git a/app-vim/emmet/Manifest b/app-vim/emmet/Manifest
new file mode 100644
index 000000000000..60060e58936e
--- /dev/null
+++ b/app-vim/emmet/Manifest
@@ -0,0 +1,3 @@
+DIST emmet-0.85.tar.bz2 31274 BLAKE2B ffba1130c7c51144524a9da6f1477f1c836b7f16b19c669050139540beaf933382b62a4a7784cf4e90703b153f53e2da8416126f606c6fd572e73efe7b09e9b4 SHA512 567f79c43ac0d5560dea2130e6fb6d32f25d35b20c3bbf8fc40b7cdc8c20e2d9352b9e1c03e57de2077ac192915ab174a6bee442d5311f01cc79c3fe6e10af56
+EBUILD emmet-0.85.ebuild 378 BLAKE2B 9d232b4f3e89a913d5ce46679270baa39cdf03c83aaedab8648f95aaa1c3c24325d02f66709de1c11b5a244c9fee29dc70757b44276f585800ecf8469cb8e880 SHA512 6ea5cb5f681fe5eb8eb7824a41395670c5cdf3c2d4c715451efd513fa9bde18738378919f2a0ebbe586de46be3c43b4972391042a0be2d2a9c07d5aab625af9c
+MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-vim/emmet/emmet-0.85.ebuild b/app-vim/emmet/emmet-0.85.ebuild
new file mode 100644
index 000000000000..3fb6d0a756ce
--- /dev/null
+++ b/app-vim/emmet/emmet-0.85.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: HTML and CSS hi-speed coding"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2981 https://mattn.github.io/emmet-vim/ https://emmet.io/"
+LICENSE="BSD"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/emmet/metadata.xml b/app-vim/emmet/metadata.xml
new file mode 100644
index 000000000000..f1abc6411341
--- /dev/null
+++ b/app-vim/emmet/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-vim/enhancedcommentify-2.3-r1 b/app-vim/enhancedcommentify-2.3-r1
deleted file mode 100644
index 2a87373562da..000000000000
--- a/app-vim/enhancedcommentify-2.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=sys-apps/sed || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: enhanced comment creation
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=23
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=BSD
-RDEPEND=sys-apps/sed !app-vim/ctx || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/enhancedcommentify-2.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/enhancedcommentify-2.3.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=c2e069b45b4a0e47532b7dbf2b7da88f
diff --git a/app-vim/enhancedcommentify/Manifest b/app-vim/enhancedcommentify/Manifest
new file mode 100644
index 000000000000..7f0756956785
--- /dev/null
+++ b/app-vim/enhancedcommentify/Manifest
@@ -0,0 +1,5 @@
+AUX enhancedcommentify-2.1-extra-ft-support.patch 665 BLAKE2B f9afbc2602b1f7b215943a4bb504e31780e41edc602a80c5aac22780561c6be0cd471dc19e6adbc9be66e56d1db1c4c6ae972b8eaea62328c00146f41aacce11 SHA512 44adbcbf9fcb993db85e56853cc0eaed95fa9b194bec1a1be71523323ffb6640fdbedafd94b4f336de105c0b1b07c6b479a6f40a5a15bb6baa5a22644e33946b
+AUX enhancedcommentify-2.1-gentooisms.patch 808 BLAKE2B 6802720fdc4883629a2e180461982ea9f6d51886d882895a4aa962b4a407e096811473e97b9fd6b502d4d2aa0da076625fd758c6b108c930e8596059a7fb8084 SHA512 974ae98fedbc4c3ea75499d615066efaef5dd8e03ebe00bb20a5fdc6dd8d5cc7ebd0f34e86cb587175f0c3e26d04bed4d09561216dedcc7757d1e9266dff0046
+DIST enhancedcommentify-2.3.tar.bz2 17005 BLAKE2B cad7f66092a9c54535226616dc2da8c13b9fcc1ae8cb2a5077462e0138345033ccd756556b640ee6e4569a1ba2037b98138ad84f9d44d9466a3955f3ef0ea12e SHA512 673cb42fcc5a2d23ae404bbfa4664f388901249d3ed8315f77227f3fa42f3c267d69eda7554347b4e70de81c9bd58437c243a42d62218444063d5235fe22a171
+EBUILD enhancedcommentify-2.3-r1.ebuild 557 BLAKE2B e34ef57120978c754cd59675913d27194f62514bd28c00d23169f58001c5d3c81a801f13957b48fe0605d3a631c8054a9fa5fdd4d51cf64b6fea1edb2866679b SHA512 79b809cc7879538aec0f25840020e0cd9a22991c20ba55d3c55fb1430b8fce7747f6e9cf7e9472ca3e84f6dc790cd98aa58d87fa8aa7d68833df41a44667b35a
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild b/app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild
new file mode 100644
index 000000000000..3d04912e6153
--- /dev/null
+++ b/app-vim/enhancedcommentify/enhancedcommentify-2.3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: enhanced comment creation"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=23"
+
+LICENSE="BSD"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+
+VIM_PLUGIN_HELPFILES="EnhancedCommentify"
+
+DEPEND="sys-apps/sed"
+
+# See bug #74897.
+RDEPEND="
+ ${DEPEND}
+ !app-vim/ctx"
+
+PATCHES=(
+ # See bug #79185.
+ "${FILESDIR}"/${PN}-2.1-gentooisms.patch
+ "${FILESDIR}"/${PN}-2.1-extra-ft-support.patch
+)
diff --git a/app-vim/enhancedcommentify/files/enhancedcommentify-2.1-extra-ft-support.patch b/app-vim/enhancedcommentify/files/enhancedcommentify-2.1-extra-ft-support.patch
new file mode 100644
index 000000000000..7c350a5310e5
--- /dev/null
+++ b/app-vim/enhancedcommentify/files/enhancedcommentify-2.1-extra-ft-support.patch
@@ -0,0 +1,13 @@
+--- a/plugin/EnhancedCommentify.vim 2005-03-01 02:28:23.409962824 -0500
++++ b/plugin/EnhancedCommentify.vim 2005-03-01 02:29:45.695453528 -0500
+@@ -740,7 +740,9 @@
+ \ 'psf\|ptcap\|r\|radiance\|ratpoison\|readline\remind\|'.
+ \ 'ruby\|screen\|sed\|sm\|snnsnet\|snnspat\|snnsres\|spec\|'.
+ \ 'squid\|terminfo\|tidy\|tli\|tsscl\|vgrindefs\|vrml\|'.
+- \ 'wget\|wml\|xf86conf\|xmath\)$'
++ \ 'wget\|wml\|xf86conf\|xmath\|fstab\|apache\|resolv\|sudoers\|'.
++ \ 'ntp\|mailcap\|ssh_config\|sshdconfig\|mplayerconf\|desktop\|'.
++ \ 'gkrellmrc\|pf\|ipfilter\|grub\|fluxbox\)$'
+ let b:ECcommentOpen = '#'
+ let b:ECcommentClose = ''
+ elseif fileType =~ 'gentoo'
diff --git a/app-vim/enhancedcommentify/files/enhancedcommentify-2.1-gentooisms.patch b/app-vim/enhancedcommentify/files/enhancedcommentify-2.1-gentooisms.patch
new file mode 100644
index 000000000000..a22b30ebcf31
--- /dev/null
+++ b/app-vim/enhancedcommentify/files/enhancedcommentify-2.1-gentooisms.patch
@@ -0,0 +1,23 @@
+--- a/plugin/EnhancedCommentify.vim 2005-01-27 00:20:00.049461056 -0500
++++ b/plugin/EnhancedCommentify.vim 2005-01-27 00:17:57.617073608 -0500
+@@ -628,6 +628,10 @@
+ " letter.
+ if match(synFiletype, '\l\+\u') == 0
+ let ft = substitute(synFiletype, '^\(\l\+\)\u.*$', '\1', "")
++ " work-around for gentoo-syntax stuff ; won't work with the above
++ " case, since all the identifiers start with a capital 'G'
++ elseif synFiletype =~ "GentooPackage*"
++ let ft = "gentoo"
+ endif
+
+ if ft == ""
+@@ -739,6 +743,9 @@
+ \ 'wget\|wml\|xf86conf\|xmath\)$'
+ let b:ECcommentOpen = '#'
+ let b:ECcommentClose = ''
++ elseif fileType =~ 'gentoo'
++ let b:ECcommentOpen = '#'
++ let b:ECcommentClose = ''
+ elseif fileType == 'webmacro'
+ let b:ECcommentOpen = '##'
+ let b:ECcommentClose = ''
diff --git a/app-vim/enhancedcommentify/metadata.xml b/app-vim/enhancedcommentify/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/enhancedcommentify/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/errsign-0.1-r1 b/app-vim/errsign-0.1-r1
deleted file mode 100644
index 6dc28d255646..000000000000
--- a/app-vim/errsign-0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: display marks on lines with errors
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1027
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/errsign-0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/errsign-0.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=a8ada8ec9c09d794fdc7a046e0a54dfe
diff --git a/app-vim/errsign/Manifest b/app-vim/errsign/Manifest
new file mode 100644
index 000000000000..ab1ac1b8f93f
--- /dev/null
+++ b/app-vim/errsign/Manifest
@@ -0,0 +1,3 @@
+DIST errsign-0.1.tar.bz2 599 BLAKE2B 85b6589da0cad1827d16d33e1e38c7b533c3ab3caa985bb77bdb5cc8f96fbc1e29daa6d925ff30be69e8810bf7ea8148d0c4340144743f6cdc50d2c9110ce9fe SHA512 ccf1136043b5a54614ef90190c157c02fa5470bd79159b8ba6f7a7cd95bdd0c0dcc41eb993d8a26d2b308012cd400f4d3168f4e7dde7bbdbe8dcedcfe5d1c929
+EBUILD errsign-0.1-r1.ebuild 548 BLAKE2B 9adfa98efb0e4e6a6ba0299f9ade747ac2b040abc025435cd7afa6cf53e01599fe91430f3c0569db8ecec526815ad65397c08f60d879d94f58926b2154157c0f SHA512 5ba4594fc680687fe5bd350670ea7cd8c7f2d341548e33a167e05665aa419175651dc9fef7f7383a3e252e00d028441e9dfd760790578a46ce258013ce423e14
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/errsign/errsign-0.1-r1.ebuild b/app-vim/errsign/errsign-0.1-r1.ebuild
new file mode 100644
index 000000000000..46ade2f94c13
--- /dev/null
+++ b/app-vim/errsign/errsign-0.1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: display marks on lines with errors"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1027"
+
+LICENSE="vim.org"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+'To use this plugin, simply type \\\\es in normal mode and any lines which
+have been marked as errors (for example, via :make) will be indicated with
+a >> mark on the left of the window.'
diff --git a/app-vim/errsign/metadata.xml b/app-vim/errsign/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/errsign/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/eruby-syntax-2.0-r2 b/app-vim/eruby-syntax-2.0-r2
deleted file mode 100644
index ac192f40a15a..000000000000
--- a/app-vim/eruby-syntax-2.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: syntax highlighting for eruby
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=403
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/eruby-syntax-2.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/eruby-syntax-2.0.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=a68f036285c946789ab5b05368365605
diff --git a/app-vim/eruby-syntax/Manifest b/app-vim/eruby-syntax/Manifest
new file mode 100644
index 000000000000..18641f5d30f5
--- /dev/null
+++ b/app-vim/eruby-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST eruby-syntax-2.0.tar.bz2 958 BLAKE2B 467e1df5bf32ad83bb427bfde6755425a752051b1532397e75f627dc084cfb6bbeba99655366698f812bd398b171fec4110af0fba28de1900a0a22aaa08b01ec SHA512 1fdf1e6ad95109528b13b30d7504da2ea8678785b1a716c33bae0b94fafb8f23d50d81022b5bc373c1970f6d3df04f2e78d87fbb2067f0c270780963b472468c
+EBUILD eruby-syntax-2.0-r2.ebuild 518 BLAKE2B d9ff3803aeb6a1b192140b93549f5ea43dce871f6bc3fd585a7b3680419450f15f89e83ac0a91241980dd7c17353e5afb0fa774e84a66119891e8c24a007aa89 SHA512 da855d113283ce2466da482b8fd298b49d5424165bb580d02b005cb0695e25c66374c2e555418a25ae9fb537ac927b67dd0d63f3e855852d7a8e6514c73fca9f
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild b/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
new file mode 100644
index 000000000000..7062ef9a855c
--- /dev/null
+++ b/app-vim/eruby-syntax/eruby-syntax-2.0-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: syntax highlighting for eruby"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=403"
+LICENSE="vim.org"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+
+VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for eruby"
+
+src_prepare() {
+ default
+ sed -i -e 's#hi link#hi def link#' syntax/eruby.vim || die "sed failed"
+}
diff --git a/app-vim/eruby-syntax/metadata.xml b/app-vim/eruby-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/eruby-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/eselect-syntax-20070506 b/app-vim/eselect-syntax-20070506
deleted file mode 100644
index 267089036cf9..000000000000
--- a/app-vim/eselect-syntax-20070506
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=!<app-vim/gentoo-syntax-20070506 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Eselect syntax highlighting, filetype and indent settings
-EAPI=0
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=vim
-RDEPEND=!<app-vim/gentoo-syntax-20070506 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/eselect-syntax-20070506.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=e15cf16911dfd156d2077f30f9a3342a
diff --git a/app-vim/eselect-syntax/Manifest b/app-vim/eselect-syntax/Manifest
new file mode 100644
index 000000000000..8ef3442e4b93
--- /dev/null
+++ b/app-vim/eselect-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST eselect-syntax-20070506.tar.bz2 3006 BLAKE2B 2ad4175a678e03870ef59166e06ec41d4cc5fb6c8fd34b8b066b06eea17747416e19bdfdacfe68ea63341ac7284b47d2d3efe5d700c4602ae2429ffe81f1f825 SHA512 8206d445eb1a3097cbcf9821e5437033887f3b588a85c70fd849b000f18f06492498864992325da09de767af0303a118001b4f3d39249e28c8d944bc0c329de0
+EBUILD eselect-syntax-20070506.ebuild 600 BLAKE2B 7e4e016fdf86bbc5a2d0ea4b01bb43a366b115aeb9413fda25a901d6f81d741954e16a9113901de7a8215d8ae0ca4ad27995a48a5975c77cc3c32db7a6fc9e07 SHA512 5a13ac3d3b433bf0db7a411b8cde3a9fcd1842fde45e0486916f9fcaadcaa5cf63817c2674c2fd1c9d1b16eb77f82e672f074280cce096f8519bcb2e31d06bd1
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/eselect-syntax/eselect-syntax-20070506.ebuild b/app-vim/eselect-syntax/eselect-syntax-20070506.ebuild
new file mode 100644
index 000000000000..2af67ca705c0
--- /dev/null
+++ b/app-vim/eselect-syntax/eselect-syntax-20070506.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils vim-plugin
+
+DESCRIPTION="vim plugin: Eselect syntax highlighting, filetype and indent settings"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="vim"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+DEPEND="!<app-vim/gentoo-syntax-20070506"
+RDEPEND="${DEPEND}"
+
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="${PN}"
+VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/eselect-syntax/metadata.xml b/app-vim/eselect-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/eselect-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/exheres-syntax-20090310 b/app-vim/exheres-syntax-20090310
deleted file mode 100644
index edb8f3a9708a..000000000000
--- a/app-vim/exheres-syntax-20090310
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: exheres format highlighting
-EAPI=6
-HOMEPAGE=http://www.exherbo.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=http://dev.exherbo.org/~ahf/pub/software/releases/exheres-syntax/exheres-syntax-20090310.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=265d66dc37cf157794768e4217a1a6f8
diff --git a/app-vim/exheres-syntax-99999999 b/app-vim/exheres-syntax-99999999
deleted file mode 100644
index 58dac70cc3aa..000000000000
--- a/app-vim/exheres-syntax-99999999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: exheres format highlighting
-EAPI=6
-HOMEPAGE=http://www.exherbo.org/
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 8f6de46b0aa318aea0e8cac62ece098b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=3c325aebcc92c0af88dd128fa8aae813
diff --git a/app-vim/exheres-syntax/Manifest b/app-vim/exheres-syntax/Manifest
new file mode 100644
index 000000000000..ee5a918b07cc
--- /dev/null
+++ b/app-vim/exheres-syntax/Manifest
@@ -0,0 +1,4 @@
+DIST exheres-syntax-20090310.tar.bz2 3670 BLAKE2B 27a6f075f80b7fc2e172b9586211a248f8075affd6a20ea52cafe06cda4f6d489a56a539e6a7619b3f7ce7fd29084ea990e66efbbdef7198a6857912eb9288c8 SHA512 616ef17367c68157d715321e457aaf0c65c97329f0848cb964d8974b6a85b4147f2e192b2ea3fcbfa3970e095bd9874203ce9723c73d1ef8350200732198c79f
+EBUILD exheres-syntax-20090310.ebuild 429 BLAKE2B ac967a7af33014986c90134098220abd47f0af841b35643a04b4205eead5f728bdd07fc578b9ab42075227e2f91966717119cc4921938c861b07e9eaa8e4bb3b SHA512 9da67961cc12debd0077fa9e280617ea01f6087c28ab0fae488dcc168f63efbcd76f5a323c64b50d982a356044a57b7950bf03a4ac9f1ed68b3cd8f16bf8dfa9
+EBUILD exheres-syntax-99999999.ebuild 456 BLAKE2B 1b3e21ae23744ad4695c2733ff4193899fe12cb2a59d051600082efd0458cc8930480d6edd18ce4c89aeb77989b651f3dd5b8f05853264f363437ac48006cdef SHA512 672617538cde07bafa27bad4feeea22448f579ae9069faab5687fd08579bf7d51366e9ecca63163c7bdda030fe2ccbd721b8a4580d160544774c91474271e91a
+MISC metadata.xml 251 BLAKE2B 4951201e33801e19bf0cf7b2bb87164107d87f074a28da579e90da44077e2833c36b51b63f92780ec4aa611d482a80a03723b56175bc041adcbe5573b537072d SHA512 5c10f22ced866afcb94b97662e270d3d4164ca9f988621c13d6a7c4508da8d9e9bbb804798cd468a2cc84ae9fd61aff32c782a372b0b8de145c1ea71751bab34
diff --git a/app-vim/exheres-syntax/exheres-syntax-20090310.ebuild b/app-vim/exheres-syntax/exheres-syntax-20090310.ebuild
new file mode 100644
index 000000000000..98ebebae3200
--- /dev/null
+++ b/app-vim/exheres-syntax/exheres-syntax-20090310.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: exheres format highlighting"
+HOMEPAGE="http://www.exherbo.org/"
+SRC_URI="http://dev.exherbo.org/~ahf/pub/software/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="vim"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="exheres-syntax"
+VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild b/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild
new file mode 100644
index 000000000000..21106c1f23b8
--- /dev/null
+++ b/app-vim/exheres-syntax/exheres-syntax-99999999.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin git-r3
+
+DESCRIPTION="vim plugin: exheres format highlighting"
+HOMEPAGE="http://www.exherbo.org/"
+EGIT_REPO_URI="https://git.exherbo.org/git/exheres-syntax.git"
+
+LICENSE="vim"
+SLOT="0"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="exheres-syntax"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+ default
+ rm .gitignore Makefile || die
+}
diff --git a/app-vim/exheres-syntax/metadata.xml b/app-vim/exheres-syntax/metadata.xml
new file mode 100644
index 000000000000..bf51ac0c6417
--- /dev/null
+++ b/app-vim/exheres-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-vim/extra-syntax-4-r2 b/app-vim/extra-syntax-4-r2
deleted file mode 100644
index f1a0e0f1d360..000000000000
--- a/app-vim/extra-syntax-4-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: metapackage for all extra syntax packages
-EAPI=6
-HOMEPAGE=https://www.vim.org/
-KEYWORDS=amd64 ~mips ~ppc ppc64 x86
-LICENSE=metapackage
-RDEPEND=app-vim/bnf-syntax app-vim/brainfuck-syntax app-vim/cfengine-syntax app-vim/dhcpd-syntax app-vim/ebnf-syntax app-vim/eruby-syntax app-vim/fluxbox-syntax app-vim/gentoo-syntax app-vim/gtk-syntax app-vim/help-extra-syntax app-vim/nagios-syntax app-vim/ntp-syntax app-vim/pgn-syntax app-vim/selinux-syntax app-vim/wikipedia-syntax app-vim/xquery-syntax app-vim/xsl-syntax || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=0589a64d7502ed196f93c183e5d3a915
diff --git a/app-vim/extra-syntax/Manifest b/app-vim/extra-syntax/Manifest
new file mode 100644
index 000000000000..dc58fcfd7c1f
--- /dev/null
+++ b/app-vim/extra-syntax/Manifest
@@ -0,0 +1,2 @@
+EBUILD extra-syntax-4-r2.ebuild 763 BLAKE2B c626825376942ad8b54427dba933ef2984427e7274620c9d430e02498561ffde05f1cda9ec3c02f90b046340b2b36e99d5219fd98a7ddb9e5cc33a9666c06161 SHA512 ced8f80f55f5a1cd2baede670fe903e9f0b35a29af0ac33ae2b21dc60cc7d0fbd9bbef72ab334c8fdd9656f098036866365f3e29a7d0eb6feb0492a4bdfafefe
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/extra-syntax/extra-syntax-4-r2.ebuild b/app-vim/extra-syntax/extra-syntax-4-r2.ebuild
new file mode 100644
index 000000000000..9bd35da4565e
--- /dev/null
+++ b/app-vim/extra-syntax/extra-syntax-4-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: metapackage for all extra syntax packages"
+HOMEPAGE="https://www.vim.org/"
+LICENSE="metapackage"
+KEYWORDS="amd64 ~mips ~ppc ppc64 x86"
+SRC_URI=""
+IUSE=""
+
+RDEPEND="
+ ${RDEPEND}
+ app-vim/bnf-syntax
+ app-vim/brainfuck-syntax
+ app-vim/cfengine-syntax
+ app-vim/dhcpd-syntax
+ app-vim/ebnf-syntax
+ app-vim/eruby-syntax
+ app-vim/fluxbox-syntax
+ app-vim/gentoo-syntax
+ app-vim/gtk-syntax
+ app-vim/help-extra-syntax
+ app-vim/nagios-syntax
+ app-vim/ntp-syntax
+ app-vim/pgn-syntax
+ app-vim/selinux-syntax
+ app-vim/wikipedia-syntax
+ app-vim/xquery-syntax
+ app-vim/xsl-syntax"
+
+S="${WORKDIR}"
+
+src_install() { :; }
diff --git a/app-vim/extra-syntax/metadata.xml b/app-vim/extra-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/extra-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/ferret-1.4 b/app-vim/ferret-1.4
deleted file mode 100644
index 57338721b967..000000000000
--- a/app-vim/ferret-1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: enhanced multi-file search
-EAPI=6
-HOMEPAGE=https://github.com/wincent/ferret
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/wincent/ferret/archive/1.4.zip -> ferret-1.4.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=483a397066170d04ea72e7fbc4a9a0a6
diff --git a/app-vim/ferret-1.4-r1 b/app-vim/ferret-1.4-r1
deleted file mode 100644
index 1413fc16c100..000000000000
--- a/app-vim/ferret-1.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: enhanced multi-file search
-EAPI=6
-HOMEPAGE=https://github.com/wincent/ferret
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/wincent/ferret/archive/1.4.zip -> ferret-1.4.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=95b4b72f0178bb8797c6f17bf6a854dd
diff --git a/app-vim/ferret-1.5 b/app-vim/ferret-1.5
deleted file mode 100644
index 210e5c676552..000000000000
--- a/app-vim/ferret-1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: enhanced multi-file search
-EAPI=6
-HOMEPAGE=https://github.com/wincent/ferret
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/wincent/ferret/archive/1.5.zip -> ferret-1.5.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=95b4b72f0178bb8797c6f17bf6a854dd
diff --git a/app-vim/ferret-2.0 b/app-vim/ferret-2.0
deleted file mode 100644
index e67aa6f94f05..000000000000
--- a/app-vim/ferret-2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: enhanced multi-file search
-EAPI=6
-HOMEPAGE=https://github.com/wincent/ferret
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/wincent/ferret/archive/2.0.tar.gz -> ferret-2.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=8a569e4651e9c7a3ec05d65f8d0b4567
diff --git a/app-vim/ferret-3.0 b/app-vim/ferret-3.0
deleted file mode 100644
index 393140e7baa9..000000000000
--- a/app-vim/ferret-3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: enhanced multi-file search
-EAPI=6
-HOMEPAGE=https://github.com/wincent/ferret
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/wincent/ferret/archive/3.0.tar.gz -> ferret-3.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=8a569e4651e9c7a3ec05d65f8d0b4567
diff --git a/app-vim/ferret/Manifest b/app-vim/ferret/Manifest
new file mode 100644
index 000000000000..fd1ade8e02a7
--- /dev/null
+++ b/app-vim/ferret/Manifest
@@ -0,0 +1,10 @@
+DIST ferret-1.4.zip 38210 BLAKE2B 98aacb570a13a5b90c2eda14457c2e28febbb6de0aea6084af66f89e87ca394aabab2fbd45590e69e44f5dd98ca5664dd5ff00bd9ce28d5e6a682522ed28c1b5 SHA512 e4dacfb996c98be2ae922520387b2b37511fbe33cc934fe89d1bc3096682d74e649fc6a1ba469e1e2efe01bdc11526f0f72d06354b28fd74b884db215068655b
+DIST ferret-1.5.zip 41822 BLAKE2B 934e6bc99d1bce09701f9d15950a7a7fe53255f2b3046faaf0544d6f37551d28c638897d63944503075b54584744256579c3755915aa5d411e6d46e42d220948 SHA512 50ae3cea72b681507f76e7fde4cb5712305bc3b9e3a98d9fbfb3797d8834d7792967e76d87435442b7809b800c739108eaea1da52c7c5c7495710b564a41718a
+DIST ferret-2.0.tar.gz 33070 BLAKE2B 11e00b2b9f09238b6a598b9b85952ac0f295a3e7026a6f6aa04acaaecd5f6ddfafaed106646bd2e82d2f629d78d09c3c1b2d1bd66a23a9d6b99745ca05a88118 SHA512 305784624c06b662e83712e2348619bc5998e85553dc860681177278a766f2a315920913593108fd147f2d4bfbb5bc02f064fba628ffad05b965814b52a1ca71
+DIST ferret-3.0.tar.gz 32291 BLAKE2B c4fd3b776db97c44f93538ffcc193b0e207d5fb8cb0d982fe7fb737c2473d9512a81defc10613c6741de645e690d1f6f8c97a5c74ee70cf35f204f21aeb5c7e5 SHA512 f88575654c1990cb9c943b36242ee9786a5c234a853fc6fb321cdbf4f8b13f066fe0bad93bf80e94be407ecdba5014ac39ea0727df775ea2b3af4699a9fc4c03
+EBUILD ferret-1.4-r1.ebuild 513 BLAKE2B ec90d18794aacaecf2d70af7715d59937bfe1677ed0fc4d13d6f8ae570899d033aef0b9fa5e4c44e96349559f613a2e0eebde3f275a6c324e87bdf441e6e35d7 SHA512 61ee591d10d86b3576b55da4570cf0c1ce2e4d0775cebf8249e53b571a1e688382e036d6b87564fc4456936b548874c15695cf5b29362037678c7912b2023e4f
+EBUILD ferret-1.4.ebuild 429 BLAKE2B b9b14af06387ef658ac189d98e6e71d6fc032ea7d2b69ff8c6111119271e0281be0404317bd45d0201b87148a946b87f8f18f7ef0a801ce976cc6e65683e582d SHA512 b0a5634b21e4aa90a62a7ac33fcf273240ea8245494eb46cf3cc9234b8cfb4a3df8042feade4d4b72ec7a8bdfbaad19bd6371bba7a1803eec948c395d9878212
+EBUILD ferret-1.5.ebuild 513 BLAKE2B ec90d18794aacaecf2d70af7715d59937bfe1677ed0fc4d13d6f8ae570899d033aef0b9fa5e4c44e96349559f613a2e0eebde3f275a6c324e87bdf441e6e35d7 SHA512 61ee591d10d86b3576b55da4570cf0c1ce2e4d0775cebf8249e53b571a1e688382e036d6b87564fc4456936b548874c15695cf5b29362037678c7912b2023e4f
+EBUILD ferret-2.0.ebuild 494 BLAKE2B b6e7a2c740bce1a009500ab8f7abd3280722ec3889dbc0a77b107a6059e0c84cfac0dfa93ca14d636cac16b65c5eca2351e28a13567d679cd73145d89684cb39 SHA512 d059d8b78bdc00f983f6387ad0ffefe485734df13e53ca65ffb3c138a057879dbf9915e6a826fb6971399b2565a2748a5f436d0af34447b4b04049f0f3ee7333
+EBUILD ferret-3.0.ebuild 494 BLAKE2B b6e7a2c740bce1a009500ab8f7abd3280722ec3889dbc0a77b107a6059e0c84cfac0dfa93ca14d636cac16b65c5eca2351e28a13567d679cd73145d89684cb39 SHA512 d059d8b78bdc00f983f6387ad0ffefe485734df13e53ca65ffb3c138a057879dbf9915e6a826fb6971399b2565a2748a5f436d0af34447b4b04049f0f3ee7333
+MISC metadata.xml 440 BLAKE2B b0871983d30d46d6e350449f58f2c9b363349a3d6b564dd684e246b196e10d3539d61de4253761a3242d9eb560ada5f52b3f081c1b8c001daaf2f8959334bbbb SHA512 d7bd2e675190a561e1211895efc03cf373117842c56f6ce92a0f5e421f4a5cccf3ba2cc94deabe063697612ff3bad3eb0d7ccb620715119c34811f4128aaf81c
diff --git a/app-vim/ferret/ferret-1.4-r1.ebuild b/app-vim/ferret/ferret-1.4-r1.ebuild
new file mode 100644
index 000000000000..1ff874a4a8d1
--- /dev/null
+++ b/app-vim/ferret/ferret-1.4-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: enhanced multi-file search"
+HOMEPAGE="https://github.com/wincent/ferret"
+SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="vim"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+
+src_prepare() {
+ default
+ rm -rvf test.rb doc/.gitignore || die
+ # See bug 612282.
+ mv ftplugin/qf.vim ftplugin/${PN}qf.vim || die
+}
diff --git a/app-vim/ferret/ferret-1.4.ebuild b/app-vim/ferret/ferret-1.4.ebuild
new file mode 100644
index 000000000000..c6e382c72335
--- /dev/null
+++ b/app-vim/ferret/ferret-1.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: enhanced multi-file search"
+HOMEPAGE="https://github.com/wincent/ferret"
+SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="vim"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+
+src_prepare() {
+ default
+ rm -v test.rb || die
+}
diff --git a/app-vim/ferret/ferret-1.5.ebuild b/app-vim/ferret/ferret-1.5.ebuild
new file mode 100644
index 000000000000..1ff874a4a8d1
--- /dev/null
+++ b/app-vim/ferret/ferret-1.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: enhanced multi-file search"
+HOMEPAGE="https://github.com/wincent/ferret"
+SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="vim"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+
+src_prepare() {
+ default
+ rm -rvf test.rb doc/.gitignore || die
+ # See bug 612282.
+ mv ftplugin/qf.vim ftplugin/${PN}qf.vim || die
+}
diff --git a/app-vim/ferret/ferret-2.0.ebuild b/app-vim/ferret/ferret-2.0.ebuild
new file mode 100644
index 000000000000..d6d32cacfbdb
--- /dev/null
+++ b/app-vim/ferret/ferret-2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: enhanced multi-file search"
+HOMEPAGE="https://github.com/wincent/ferret"
+SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="vim"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+ default
+
+ rm -rv test.rb doc/.gitignore || die
+ # See bug 612282.
+ mv ftplugin/qf.vim ftplugin/${PN}qf.vim || die
+}
diff --git a/app-vim/ferret/ferret-3.0.ebuild b/app-vim/ferret/ferret-3.0.ebuild
new file mode 100644
index 000000000000..d6d32cacfbdb
--- /dev/null
+++ b/app-vim/ferret/ferret-3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: enhanced multi-file search"
+HOMEPAGE="https://github.com/wincent/ferret"
+SRC_URI="https://github.com/wincent/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="vim"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+ default
+
+ rm -rv test.rb doc/.gitignore || die
+ # See bug 612282.
+ mv ftplugin/qf.vim ftplugin/${PN}qf.vim || die
+}
diff --git a/app-vim/ferret/metadata.xml b/app-vim/ferret/metadata.xml
new file mode 100644
index 000000000000..23f63c1306ae
--- /dev/null
+++ b/app-vim/ferret/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">wincent/ferret</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/fluxbox-syntax-1.5 b/app-vim/fluxbox-syntax-1.5
deleted file mode 100644
index 457b7b961bf7..000000000000
--- a/app-vim/fluxbox-syntax-1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: fluxbox files syntax and indent
-EAPI=0
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=679
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=vim
-RDEPEND=>=app-vim/genindent-1.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/fluxbox-syntax-1.5.tar.bz2 https://dev.gentoo.org/~radhermit/vim/fluxbox-syntax-1.5.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=a89e7013bf4df89978c4640f046cbfe2
diff --git a/app-vim/fluxbox-syntax/Manifest b/app-vim/fluxbox-syntax/Manifest
new file mode 100644
index 000000000000..ddaa153c465c
--- /dev/null
+++ b/app-vim/fluxbox-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST fluxbox-syntax-1.5.tar.bz2 1376 BLAKE2B 2006668a89077febb4ec919354359cae1170156950abb553695d6424cb277bca69a5e8ffa93a9e4b09b990e96f9ee34654d34dc15320140dad589808ef9960dc SHA512 0567af6fe0994ea228ac56c3a26485ba5cce7762e3d70d6dced978e56017f6769072c83ae68125de3e03190562a7a10102bef038c02ae148cf70cc0c5951b8df
+EBUILD fluxbox-syntax-1.5.ebuild 963 BLAKE2B 4356481080d14e8f82ecdd54e39106206a9d17fd512d9c974a85f8928bd5ba12088203b785c70dc56b2e357a712d01a0003d80f6323adfe7eccc917649d946dd SHA512 9c806b238d67c86cd0349861dc857be3be14c235435eac188cf9ee70ff5851f3d67764a129f6724f4778d3e9bfba13e1d6aa657d779e206cd17fd7202d1f1552
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/fluxbox-syntax/fluxbox-syntax-1.5.ebuild b/app-vim/fluxbox-syntax/fluxbox-syntax-1.5.ebuild
new file mode 100644
index 000000000000..082606e60e31
--- /dev/null
+++ b/app-vim/fluxbox-syntax/fluxbox-syntax-1.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: fluxbox files syntax and indent"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=679"
+LICENSE="vim"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND="${RDEPEND} >=app-vim/genindent-1.0"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting and indent settings for fluxbox
+menus and similar files. Upstream don't provide us with an ftdetect file,
+but a simple one has been created for you by this ebuild. You can manually
+set the filetype using :set filetype=fluxbox if necessary."
+
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ # no ftdetect file provided. lame...
+ mkdir ftdetect
+ echo "au BufNewFile,BufRead /*/*fluxbox/*menu set filetype=fluxbox" \
+ > ftdetect/fluxbox.vim
+}
diff --git a/app-vim/fluxbox-syntax/metadata.xml b/app-vim/fluxbox-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/fluxbox-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/foldutil-3.0-r1 b/app-vim/foldutil-3.0-r1
deleted file mode 100644
index b7a4e9bcd857..000000000000
--- a/app-vim/foldutil-3.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: fold creation utility
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=158
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=>=app-vim/genutils-2.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/foldutil-3.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/foldutil-3.0.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=a84967207528a296dd2cc97161cf1aff
diff --git a/app-vim/foldutil/Manifest b/app-vim/foldutil/Manifest
new file mode 100644
index 000000000000..d2c2801f0cec
--- /dev/null
+++ b/app-vim/foldutil/Manifest
@@ -0,0 +1,3 @@
+DIST foldutil-3.0.tar.bz2 7323 BLAKE2B de59313da23a277a2eb3e971b3033202001cd1304058b5e096e33e7c28f95326169754c0e0062120099677e567c6bd79b265a69524c8b8fe55a9666ab6bde23f SHA512 a38561c4530333f5a56596b2fe19a2892f58b4fd35229536c054578b199e9b6b19c18d255aa1b078d51ac4f610d4ca49b205d1929e8be51299bee527058b3452
+EBUILD foldutil-3.0-r1.ebuild 548 BLAKE2B 345997b30841845c4a647a491fea8b130ace2a94120e93a02b7885fc22a834c88d3ca29606a9c59a410200cfbb2cc6e9e85058b46a2d9988381376e82f52004b SHA512 37eb4a1975a91049247ef690aaee8a0b97e0876c1fc0fdc7798dff35369dbe41edf2b3b8e58bcd3a07dc6155c08270203d230ab5b2cc69925d3c7704c2b0157e
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/foldutil/foldutil-3.0-r1.ebuild b/app-vim/foldutil/foldutil-3.0-r1.ebuild
new file mode 100644
index 000000000000..034686ed7a4e
--- /dev/null
+++ b/app-vim/foldutil/foldutil-3.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: fold creation utility"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=158"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+RDEPEND=">=app-vim/genutils-2.0"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides a number of commands for working with folds:
+\ :FoldNonMatching [pattern] [context]
+\ :FoldShowLines {lines} [context]
+\ :FoldEndFolding"
diff --git a/app-vim/foldutil/metadata.xml b/app-vim/foldutil/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/foldutil/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/frawor-0.2.3 b/app-vim/frawor-0.2.3
deleted file mode 100644
index 1a6d3fc464b4..000000000000
--- a/app-vim/frawor-0.2.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: modular vim framework
-EAPI=6
-HOMEPAGE=https://bitbucket.org/ZyX_I/frawor
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://bitbucket.org/ZyX_I/frawor/downloads/frawor-0.2.3.tar.xz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=6dd56e65bbb5d83d604b05626cb46c18
diff --git a/app-vim/frawor/Manifest b/app-vim/frawor/Manifest
new file mode 100644
index 000000000000..2b65db8e7e40
--- /dev/null
+++ b/app-vim/frawor/Manifest
@@ -0,0 +1,3 @@
+DIST frawor-0.2.3.tar.xz 257268 BLAKE2B 4409de0fb392841676eac2d794e0e44f64e3978dea1b72b807b7660a9feb1da3850a1ba651287f624830da4d1529daea60da2b76db37e422b6a4827e73dcf8d6 SHA512 ad8c6939875b5783b3faa0a3194e187161ba10f662a896f06ea86aebf12b172bd8d419b14a95c0d14aedfb38ebc5de73895d6d472db64dc15f567509e55188b2
+EBUILD frawor-0.2.3.ebuild 376 BLAKE2B 47753081e97ee08f5287bcd25baa15dcb652bc53e20dafc8d72cc80e21f85d44edda0936be40647a1c5f8b747f64e19d4e806c890a569a1685384c12d8ba4efa SHA512 09188548e4943975314a6c2e5ac67faab27d3112482aafd6781f9330bfd381471ee4080a8d84b251f06bcee862530d70763957b226248af029ec75ed5c9437bc
+MISC metadata.xml 329 BLAKE2B 17d5e9ce9b31695f1b5086d74864de622a4f36fd842f4abda1970ff98ed438f36edaaa96a4bf990a5b5cd54f59ea2bbfaa3b7da472ab570c2621ebb3cdc6d3cb SHA512 586688ee9f3cd9697e9236e9377691f5ac8c0e4ea3910020b1616a6454342021ae971ab734fb2e2ccf33d8a08fc44fea848d72f47a6acdf3b9999d3aa280ae24
diff --git a/app-vim/frawor/frawor-0.2.3.ebuild b/app-vim/frawor/frawor-0.2.3.ebuild
new file mode 100644
index 000000000000..6a80c16a5951
--- /dev/null
+++ b/app-vim/frawor/frawor-0.2.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: modular vim framework"
+HOMEPAGE="https://bitbucket.org/ZyX_I/frawor"
+SRC_URI="https://bitbucket.org/ZyX_I/${PN}/downloads/${P}.tar.xz"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+# Tests rely on zsh. No.
+RESTRICT="test"
diff --git a/app-vim/frawor/metadata.xml b/app-vim/frawor/metadata.xml
new file mode 100644
index 000000000000..4de8542f5d22
--- /dev/null
+++ b/app-vim/frawor/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="bitbucket">ZyX_I/frawor</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/fugitive-2.2 b/app-vim/fugitive-2.2
deleted file mode 100644
index c9465e282735..000000000000
--- a/app-vim/fugitive-2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a git wrapper for vim
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
-KEYWORDS=amd64 x86 ~ppc-macos ~x64-macos
-LICENSE=vim
-RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tpope/vim-fugitive/archive/v2.2.tar.gz -> fugitive-2.2.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=f4354fe638606a80e9b4204d1782ccf3
diff --git a/app-vim/fugitive-2.3 b/app-vim/fugitive-2.3
deleted file mode 100644
index 87ee14f8251b..000000000000
--- a/app-vim/fugitive-2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a git wrapper for vim
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
-KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos
-LICENSE=vim
-RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tpope/vim-fugitive/archive/v2.3.tar.gz -> fugitive-2.3.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=0ac3891752359c3e9a87039b6db8645c
diff --git a/app-vim/fugitive-9999 b/app-vim/fugitive-9999
deleted file mode 100644
index 60cf00df8c54..000000000000
--- a/app-vim/fugitive-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: a git wrapper for vim
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
-LICENSE=vim
-RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 8f6de46b0aa318aea0e8cac62ece098b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=0ac3891752359c3e9a87039b6db8645c
diff --git a/app-vim/fugitive/Manifest b/app-vim/fugitive/Manifest
new file mode 100644
index 000000000000..ff70228015f8
--- /dev/null
+++ b/app-vim/fugitive/Manifest
@@ -0,0 +1,6 @@
+DIST fugitive-2.2.tar.gz 30651 BLAKE2B 7e6ecf372661afcfa586097e979c996f19df85bf41d3b2409e26fe9131a48c02946614a15231accecbe8906a458698f89b66cc86f3707f2f7014e00d795786fe SHA512 763fc352e495dae6346fdedee5e3993a11fe402dbad0e9ee4b002b6b416404c46b56a061b3d9e663174b371d2d62e62e22f5a2cf8767fb6aee28b236c77d9d41
+DIST fugitive-2.3.tar.gz 30949 BLAKE2B ff62ad9f5b85fff6a06fe006884901ca0f80a5ee139032955a6af596cadf3dca18d73980da12429706102cbe8105fcbff5fb1dd6375b851f978746a5251f1d22 SHA512 8a176705c0326ac034abaf23423e58d490feb7f11dc45ad23641fafb95279094ed38475a90e7c2e7fc95c615558db75f3587740e2658f3988fa07a1957aa1039
+EBUILD fugitive-2.2.ebuild 623 BLAKE2B 3c7b51661511b4492dd76e7d1cf3976a748df0b33f9b096aaf67bc9f71aa7c44e15a94def16d318082852a7566388d71e842231dcb1648a0b05e1a99f0f96a0b SHA512 fe94a114cb46b74cbcbf65287f97d23a037e1fb9472b1e7039735410ce067f623986e4bcbcf3fcf3df459959fdf09f584a2f0e84a27027de3428e3c9f0ed944c
+EBUILD fugitive-2.3.ebuild 625 BLAKE2B 6e7c331e9a28fe7c67b150de5102f0cdca594eeb48a5dcd3baef0bd08463178daf17e1f8e30c8567d9424b2fb17139276ecf8c2b968c3e56cadcc6df84a29229 SHA512 bffbeccb7b980ac471f5b67cc4408aca6ee36e272ec61e7e5eeb205ec89b9999f2358e906aa49033bc2fb981717caa882de3b80086ec94d5c69b1254f6d8d333
+EBUILD fugitive-9999.ebuild 625 BLAKE2B 6e7c331e9a28fe7c67b150de5102f0cdca594eeb48a5dcd3baef0bd08463178daf17e1f8e30c8567d9424b2fb17139276ecf8c2b968c3e56cadcc6df84a29229 SHA512 bffbeccb7b980ac471f5b67cc4408aca6ee36e272ec61e7e5eeb205ec89b9999f2358e906aa49033bc2fb981717caa882de3b80086ec94d5c69b1254f6d8d333
+MISC metadata.xml 342 BLAKE2B cef6ff7e21df2703dc1c1138f95ad5f8e478a7c6bbd013791fd7c1b1754a2f7eaac9c84ebb42af9cef1943e7a94a880d0cedc030ff95966ac607a1b0b37dc37f SHA512 4ad3c706ea17ef2ab4e6852c6251cec3b8b5b37b687cd3ed87061adbfb791b8786bb5faa4550a73c707a0013ad8981aeda930eba8d74221cc7ca33d110ceb842
diff --git a/app-vim/fugitive/fugitive-2.2.ebuild b/app-vim/fugitive/fugitive-2.2.ebuild
new file mode 100644
index 000000000000..5f7552c24ee8
--- /dev/null
+++ b/app-vim/fugitive/fugitive-2.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/tpope/vim-fugitive.git"
+else
+ inherit vcs-snapshot
+ SRC_URI="https://github.com/tpope/vim-fugitive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 x86 ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="vim plugin: a git wrapper for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
+LICENSE="vim"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-vcs/git"
diff --git a/app-vim/fugitive/fugitive-2.3.ebuild b/app-vim/fugitive/fugitive-2.3.ebuild
new file mode 100644
index 000000000000..3ec007ea68be
--- /dev/null
+++ b/app-vim/fugitive/fugitive-2.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vim-plugin
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/tpope/vim-fugitive.git"
+else
+ inherit vcs-snapshot
+ SRC_URI="https://github.com/tpope/vim-fugitive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="vim plugin: a git wrapper for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
+LICENSE="vim"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-vcs/git"
diff --git a/app-vim/fugitive/fugitive-9999.ebuild b/app-vim/fugitive/fugitive-9999.ebuild
new file mode 100644
index 000000000000..3ec007ea68be
--- /dev/null
+++ b/app-vim/fugitive/fugitive-9999.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vim-plugin
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/tpope/vim-fugitive.git"
+else
+ inherit vcs-snapshot
+ SRC_URI="https://github.com/tpope/vim-fugitive/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="vim plugin: a git wrapper for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/"
+LICENSE="vim"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-vcs/git"
diff --git a/app-vim/fugitive/metadata.xml b/app-vim/fugitive/metadata.xml
new file mode 100644
index 000000000000..84e14fd03b22
--- /dev/null
+++ b/app-vim/fugitive/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">tpope/vim-fugitive</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/fuzzyfinder-4.2.2 b/app-vim/fuzzyfinder-4.2.2
deleted file mode 100644
index 6cbc1a4c3f6c..000000000000
--- a/app-vim/fuzzyfinder-4.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: buffer/file/command/tag/etc explorer with fuzzy matching
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1984
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=app-vim/l9 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=13961 -> fuzzyfinder-4.2.2.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=b36ed19dd92cfb2a31f9611af235525a
diff --git a/app-vim/fuzzyfinder/Manifest b/app-vim/fuzzyfinder/Manifest
new file mode 100644
index 000000000000..a76b18e32c63
--- /dev/null
+++ b/app-vim/fuzzyfinder/Manifest
@@ -0,0 +1,3 @@
+DIST fuzzyfinder-4.2.2.zip 66965 BLAKE2B 833d75be61551c776d6d918f0909b4805a4182ace928b448431c39961db999c83b61b4d0be8c6ab14aabeefd430aef857267ed1f1fc83029101198d788a6efd3 SHA512 8a4124ec876bd605fe64c9146afdd591b95d045238fbc0160547942d3c247129cd3a6ad05f23e668b0cd8f5a574192c03bcd3c9406f61625f78c4e32b35bbca3
+EBUILD fuzzyfinder-4.2.2.ebuild 492 BLAKE2B 2b1c9eb5a6701bf48d15ee4d61903f63295cbbc5aacd44b72c78cb36a61327824de230ca5589d233473ed6dee7d10d900748d91994c163865b3f990b5e530730 SHA512 04185865af9d40580d5183c20cbe274c339435b8ab29ac5dc68292b41c6e2d267ffe4630a6346bbb942b199b740a14958a0e52dea0934ee0038dc504e1ade310
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/fuzzyfinder/fuzzyfinder-4.2.2.ebuild b/app-vim/fuzzyfinder/fuzzyfinder-4.2.2.ebuild
new file mode 100644
index 000000000000..46f399bbb7bc
--- /dev/null
+++ b/app-vim/fuzzyfinder/fuzzyfinder-4.2.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: buffer/file/command/tag/etc explorer with fuzzy matching"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1984"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=13961 -> ${P}.zip"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="fuf"
+
+DEPEND="app-arch/unzip"
+RDEPEND="app-vim/l9"
+
+S="${WORKDIR}"
diff --git a/app-vim/fuzzyfinder/metadata.xml b/app-vim/fuzzyfinder/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/fuzzyfinder/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/genindent-1.1-r1 b/app-vim/genindent-1.1-r1
deleted file mode 100644
index 09739aad209c..000000000000
--- a/app-vim/genindent-1.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: library for simplifying indent files
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=678
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/genindent-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/genindent-1.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=b99d620ee2f05bd4be6690075337919e
diff --git a/app-vim/genindent/Manifest b/app-vim/genindent/Manifest
new file mode 100644
index 000000000000..d6b79d44a8ea
--- /dev/null
+++ b/app-vim/genindent/Manifest
@@ -0,0 +1,3 @@
+DIST genindent-1.1.tar.bz2 1248 BLAKE2B 761b5285ba8816ec8b64542d9e6784f9d771be8d02fc085dacfc8422dd636be600c44c973089b1922d19e8b2ec0256f66d547f35609db6d3f08eeb0998fb69e2 SHA512 aa90cfc988b08708bb25352b66196191e6cc322f2072a771cf768a0e2ace2e4e193e2e34dc0556266bd84c49055ec1d4183f1aec3d89fffc29f5ded88c26a2af
+EBUILD genindent-1.1-r1.ebuild 510 BLAKE2B fe55619751e34fe4996867d32113ee1a97a4f9980ba376c34ee65e5b7e3359f0eb05418782d2c76f1ef3051959d1db4c101a7462bb7155dc4ba3395f60172960 SHA512 35029df226de286c3cb0432ad872bbb664bf948b7cda43afe6a8466e7aaac6b952ec4d47231d52eb7ad6dd14e45cc7491f5f6f8e1ce034139abd436bf96e1eb0
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/genindent/genindent-1.1-r1.ebuild b/app-vim/genindent/genindent-1.1-r1.ebuild
new file mode 100644
index 000000000000..86333788f2f0
--- /dev/null
+++ b/app-vim/genindent/genindent-1.1-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library for simplifying indent files"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=678"
+LICENSE="vim"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides library functions and is not intended to be used
+directly by the user."
diff --git a/app-vim/genindent/metadata.xml b/app-vim/genindent/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/genindent/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/gentoo-syntax-20160530 b/app-vim/gentoo-syntax-20160530
deleted file mode 100644
index 79bca94a09da..000000000000
--- a/app-vim/gentoo-syntax-20160530
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
-EAPI=6
-HOMEPAGE=https://github.com/gentoo/gentoo-syntax
-IUSE=ignore-glep31
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/gentoo/gentoo-syntax/archive/20160530.tar.gz -> gentoo-syntax-20160530.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=79c7dbb9cf5374a586a3fc292eb90e05
diff --git a/app-vim/gentoo-syntax-20170225 b/app-vim/gentoo-syntax-20170225
deleted file mode 100644
index f54639c97e94..000000000000
--- a/app-vim/gentoo-syntax-20170225
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
-EAPI=6
-HOMEPAGE=https://github.com/gentoo/gentoo-syntax
-IUSE=ignore-glep31
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/gentoo/gentoo-syntax/archive/20170225.tar.gz -> gentoo-syntax-20170225.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=0a6045f239efc3bf4660e41c1dda0a95
diff --git a/app-vim/gentoo-syntax-99999999 b/app-vim/gentoo-syntax-99999999
deleted file mode 100644
index 0a37eba3c056..000000000000
--- a/app-vim/gentoo-syntax-99999999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
-EAPI=6
-HOMEPAGE=https://github.com/gentoo/gentoo-syntax
-IUSE=ignore-glep31
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 8f6de46b0aa318aea0e8cac62ece098b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=bce26f30f443f821f1c4b0683b2fa982
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
new file mode 100644
index 000000000000..9c88fea174d9
--- /dev/null
+++ b/app-vim/gentoo-syntax/Manifest
@@ -0,0 +1,6 @@
+DIST gentoo-syntax-20160530.tar.gz 18950 BLAKE2B 0e769cb4d67ebf1b4299a1aa0dc1bc1ce942a9e6b4f3528b5499ff83ffe9d165697576901c5ba9cca52de6e26abd0298f1f7a5383cdc0c8ca1dff0de2945080c SHA512 38881c5f16499eb053eb7a5514f6324b2a161f1392a044db0bbaf0cb71a0f17e1edebd4a685ff856a78525fbcb8c6267daa2503cfbc6f94d841cf3f6a25045bd
+DIST gentoo-syntax-20170225.tar.gz 18939 BLAKE2B 7586b45791e74e69ad6e0607bc0a4d52eba4747a6c4d9933d43db1196ceb57ac6317279c9e86f77c71bdb7379828dd96fe6d63a2933a3660f1639faf1b6df5d5 SHA512 2c01577910eccd413b85c094dbd12bf8445e2f560be1fffc4a4c3130b32587f9c298d8442b5cf12bd7d2950ab8c9e5b95a72f2f41c42c6dc939ffa2c26fd71d5
+EBUILD gentoo-syntax-20160530.ebuild 1808 BLAKE2B af7306c5b7ad151ef2da28bac70168ba6a2b0dd943fec7566b9392517ec04a851b5aa0fbea0c3cb355e9d2a79dbea352fa01d31cc8291db7a7bde5ff9a206387 SHA512 24f5f1a13094fa7afbad40c681270f867c6e9459b3558ed27c26a2664ba59f71b6f3dc34e142553f028cf1735577e6bdac6aecb030661af51faea237f2316e91
+EBUILD gentoo-syntax-20170225.ebuild 1823 BLAKE2B 1798286c3791945b838adab32855a01ad592e60d6f295d8dd31c2c95549651e17fc262bbe3f9c8d00480b6c0537a116fd26b70ae042c56983f845d64785b92e5 SHA512 1c6aa3f277c45d217d14347b32b44c14ccc3cdbea89ed8383177c51682cc2ce057f58d4f89406ee7b0289799df456575562031006110ea788523f6244dd9398e
+EBUILD gentoo-syntax-99999999.ebuild 1821 BLAKE2B 053b56d56693edde23a99b4f6fe0cd557b3bea9eba17523973a03e44f688ce17de67b5b76bd02756e6c156d48581af4e030056ed9088c0924c863e5692a6d364 SHA512 e56de9ddd61e1ac75b1f0c74da57689d999b93a30394dcfaf178ae90e59040298b4d8f9b31d7937ede740fde798aadac324912613602dafd8f20e9706a471fb5
+MISC metadata.xml 446 BLAKE2B 63902fa0fb1552a989ee9d53d36b535802ac65b468be2b74c472ae655107ca9de2695c1dd51ec98ebecda9c437caf32892560792d399a26c3814f0208212e7cc SHA512 2dc59075bad043ed183529af7484ab54e718774c275ce38e3b96af6b0461b8cf8d704dbcf37cb4aa7fb9dce2db3eb62075ff984ad7ac11fedf3f0bd2a582635c
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild
new file mode 100644
index 000000000000..8d1a5d52296a
--- /dev/null
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == 9999* ]] ; then
+ EGIT_REPO_URI="https://github.com/gentoo/gentoo-syntax.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
+HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
+LICENSE="vim"
+IUSE="ignore-glep31"
+
+VIM_PLUGIN_HELPFILES="gentoo-syntax"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+ default
+ if use ignore-glep31 ; then
+ for f in ftplugin/*.vim ; do
+ ebegin "Removing UTF-8 rules from ${f} ..."
+ sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
+ || die "waah! bad sed voodoo. need more goats."
+ eend $?
+ done
+ fi
+}
+
+pkg_postinst() {
+ vim-plugin_pkg_postinst
+
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ if use ignore-glep31 1>/dev/null ; then
+ ewarn "You have chosen to disable the rules which ensure GLEP 31"
+ ewarn "compliance. When editing ebuilds, please make sure you get"
+ ewarn "the character set correct."
+ else
+ elog "Note for developers and anyone else who edits ebuilds:"
+ elog " This release of gentoo-syntax now contains filetype rules to set"
+ elog " fileencoding for ebuilds and ChangeLogs to utf-8 as per GLEP 31."
+ elog " If you find this feature breaks things, please submit a bug and"
+ elog " assign it to vim@gentoo.org. You can use the 'ignore-glep31' USE"
+ elog " flag to remove these rules."
+ fi
+ fi
+}
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20170225.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20170225.ebuild
new file mode 100644
index 000000000000..e8e229270960
--- /dev/null
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20170225.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == 9999* ]] ; then
+ EGIT_REPO_URI="https://github.com/gentoo/gentoo-syntax.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
+HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
+LICENSE="vim"
+IUSE="ignore-glep31"
+
+VIM_PLUGIN_HELPFILES="gentoo-syntax"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+ default
+ if use ignore-glep31 ; then
+ for f in ftplugin/*.vim ; do
+ ebegin "Removing UTF-8 rules from ${f} ..."
+ sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
+ || die "waah! bad sed voodoo. need more goats."
+ eend $?
+ done
+ fi
+}
+
+pkg_postinst() {
+ vim-plugin_pkg_postinst
+
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ if use ignore-glep31 1>/dev/null ; then
+ ewarn "You have chosen to disable the rules which ensure GLEP 31"
+ ewarn "compliance. When editing ebuilds, please make sure you get"
+ ewarn "the character set correct."
+ else
+ elog "Note for developers and anyone else who edits ebuilds:"
+ elog " This release of gentoo-syntax now contains filetype rules to set"
+ elog " fileencoding for ebuilds and ChangeLogs to utf-8 as per GLEP 31."
+ elog " If you find this feature breaks things, please submit a bug and"
+ elog " assign it to vim@gentoo.org. You can use the 'ignore-glep31' USE"
+ elog " flag to remove these rules."
+ fi
+ fi
+}
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild
new file mode 100644
index 000000000000..1e9dad4bb4e4
--- /dev/null
+++ b/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == 9999* ]] ; then
+ EGIT_REPO_URI="https://github.com/gentoo/gentoo-syntax.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
+HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
+LICENSE="vim"
+IUSE="ignore-glep31"
+
+VIM_PLUGIN_HELPFILES="gentoo-syntax"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+ default
+ if use ignore-glep31 ; then
+ for f in ftplugin/*.vim ; do
+ ebegin "Removing UTF-8 rules from ${f} ..."
+ sed -i -e 's~\(setlocal fileencoding=utf-8\)~" \1~' ${f} \
+ || die "waah! bad sed voodoo. need more goats."
+ eend $?
+ done
+ fi
+}
+
+pkg_postinst() {
+ vim-plugin_pkg_postinst
+
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ if use ignore-glep31 1>/dev/null ; then
+ ewarn "You have chosen to disable the rules which ensure GLEP 31"
+ ewarn "compliance. When editing ebuilds, please make sure you get"
+ ewarn "the character set correct."
+ else
+ elog "Note for developers and anyone else who edits ebuilds:"
+ elog " This release of gentoo-syntax now contains filetype rules to set"
+ elog " fileencoding for ebuilds and ChangeLogs to utf-8 as per GLEP 31."
+ elog " If you find this feature breaks things, please submit a bug and"
+ elog " assign it to vim@gentoo.org. You can use the 'ignore-glep31' USE"
+ elog " flag to remove these rules."
+ fi
+ fi
+}
diff --git a/app-vim/gentoo-syntax/metadata.xml b/app-vim/gentoo-syntax/metadata.xml
new file mode 100644
index 000000000000..374f1cd98d23
--- /dev/null
+++ b/app-vim/gentoo-syntax/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <use>
+ <flag name="ignore-glep31">Remove GLEP 31 (UTF-8 file encodings) settings</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">gentoo/gentoo-syntax</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/genutils-2.5 b/app-vim/genutils-2.5
deleted file mode 100644
index 35ba2826443b..000000000000
--- a/app-vim/genutils-2.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: library with various useful functions
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=197
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=GPL-3
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=11399 -> genutils-2.5.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=ce0b206021ebad7ab1b9b93edd395280
diff --git a/app-vim/genutils-2.5-r1 b/app-vim/genutils-2.5-r1
deleted file mode 100644
index 2e26ee7887ff..000000000000
--- a/app-vim/genutils-2.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: library with various useful functions
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=197
-KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=11399 -> genutils-2.5.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=cf57639880e205715b0aee9b9d0a3569
diff --git a/app-vim/genutils/Manifest b/app-vim/genutils/Manifest
new file mode 100644
index 000000000000..52263a6a7f37
--- /dev/null
+++ b/app-vim/genutils/Manifest
@@ -0,0 +1,4 @@
+DIST genutils-2.5.zip 30510 BLAKE2B 4e9466844efc0cc607b22ed6aca4cb49f1b65ce569e631a2a0c7f4534e433ac70a3b57b18b8de930eb2604169f71e35c4fbca26b4a521a2ee34a48471a6c6240 SHA512 80a751038f629d58ce962a6be7d806cf2b7c35ad28f9d90e58cad32e1e462083629f2069ac23281683db026510d7e3d96d6883027d424fae3de63352b80fc5db
+EBUILD genutils-2.5-r1.ebuild 575 BLAKE2B 4d6b2df7ccb4507a477277da8f274d56770fbfbfe06edcaecb5d30b5dfd8ef5789e089a02e94d8d2ea92b0b699bc38b4950f0203831c5eae2e999de3c0dee31f SHA512 7e62d6852e6deec0b15e0fe34b7fc763f29f1862c6c0d35bc78eadd5187dc742b6062693907da5a58e2a67eb2cf1e581439a75e17933a1e46431c2290bcb7268
+EBUILD genutils-2.5.ebuild 567 BLAKE2B 542af48484cad7edba2febb8aa6694f3e4c508f48ee2cf0b03d81dccf54b200ae384df18fabf19547e75bcf3f8562acad96c814105e98b3673602636e59b5dff SHA512 76d043c8fc73223ae91309490f8834d9c5db03e3ad74457ca4b1985f670caaf5e278fe3fe76b831a7e398483dab7cc8dfff4543ff44f748eb6c2334bf7ac44e8
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/genutils/genutils-2.5-r1.ebuild b/app-vim/genutils/genutils-2.5-r1.ebuild
new file mode 100644
index 000000000000..57fc9d0c385a
--- /dev/null
+++ b/app-vim/genutils/genutils-2.5-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library with various useful functions"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=197"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=11399 -> ${P}.zip"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides library functions and is not intended to be used
+directly by the user."
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
diff --git a/app-vim/genutils/genutils-2.5.ebuild b/app-vim/genutils/genutils-2.5.ebuild
new file mode 100644
index 000000000000..ad3e2f826c81
--- /dev/null
+++ b/app-vim/genutils/genutils-2.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library with various useful functions"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=197"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=11399 -> ${P}.zip"
+LICENSE="GPL-3"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides library functions and is not intended to be used
+directly by the user."
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}
diff --git a/app-vim/genutils/metadata.xml b/app-vim/genutils/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/genutils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/gist-7.3 b/app-vim/gist-7.3
deleted file mode 100644
index 09b8317715bd..000000000000
--- a/app-vim/gist-7.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: interact with gists (gist.github.com)
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2423 https://github.com/mattn/gist-vim
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=app-vim/webapi net-misc/curl dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/mattn/gist-vim/archive/7.3.tar.gz -> gist-7.3.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=c90c9fac6780dfdd8633322c33d1c984
diff --git a/app-vim/gist/Manifest b/app-vim/gist/Manifest
new file mode 100644
index 000000000000..b946d69f43b7
--- /dev/null
+++ b/app-vim/gist/Manifest
@@ -0,0 +1,3 @@
+DIST gist-7.3.tar.gz 18170 BLAKE2B a6f281f92944203c17037a8ab9cd7e202ad491a11f7e79cf89794bfd94f188ac056c25c138fa98a9d50ebb38223e679b334c79705bf1d063e54f43297db6da40 SHA512 dbd3f638a365c8ee419140d9a934dd2c80fed181910137f61cec3c2d8d61300c21cabc9fdf85d83caa185cf78edb92990e04d49d937cd3fc546b6ae889e5cbb8
+EBUILD gist-7.3.ebuild 641 BLAKE2B 3a103330e9b8a0db424906590d6b2a076f44c9199b486aa482ced1aa473edc5df2effcdbcec9011767828487b07cbc524011e6038d02b74c68c78eacf62d4cac SHA512 bc96c7a8618ad4fd0226c0305187e6f4a1c99f39a63a4e62a50c482bffec89c863c6f4b0c7ab811f75d551d9431a5ebb43bd380894a4951c467054df132161d3
+MISC metadata.xml 328 BLAKE2B d72cba480fcc4b318e2ef5c42f25219aca6b08839b2f52945faf878abecdbb5a04dabd43612c39b48e3c9d24bb154831ad3866e4c187a0c2d7745a642d3f41aa SHA512 c7ecce29dc9fd9a7eaa2ebf61fbb0a191e3309ca87b4473d4aab058ee585287e7f7fbcaee931dda26807ff66fdb7a2b449edf9caf97ac616fcd283f34f24d710
diff --git a/app-vim/gist/gist-7.3.ebuild b/app-vim/gist/gist-7.3.ebuild
new file mode 100644
index 000000000000..adce6ea8f64d
--- /dev/null
+++ b/app-vim/gist/gist-7.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN=gist-vim
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="vim plugin: interact with gists (gist.github.com)"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2423 https://github.com/mattn/gist-vim"
+SRC_URI="https://github.com/mattn/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="amd64 x86 ~x64-macos"
+
+RDEPEND="
+ app-vim/webapi
+ net-misc/curl
+ dev-vcs/git
+"
+
+VIM_PLUGIN_HELPFILES="Gist.vim"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ default
+ rm README.md gist.vim* Makefile || die
+}
diff --git a/app-vim/gist/metadata.xml b/app-vim/gist/metadata.xml
new file mode 100644
index 000000000000..fe9c0bc2d0a3
--- /dev/null
+++ b/app-vim/gist/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mattn/gist-vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/git-patch-tags-0.2 b/app-vim/git-patch-tags-0.2
deleted file mode 100644
index 954459203087..000000000000
--- a/app-vim/git-patch-tags-0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: add git patch tags as used in linux kernel development
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3632
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/git-patch-tags-0.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/git-patch-tags-0.2.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=1b19a135c99a0261d783d027aa9f97b2
diff --git a/app-vim/git-patch-tags/Manifest b/app-vim/git-patch-tags/Manifest
new file mode 100644
index 000000000000..8b61c1941ecb
--- /dev/null
+++ b/app-vim/git-patch-tags/Manifest
@@ -0,0 +1,3 @@
+DIST git-patch-tags-0.2.tar.bz2 1508 BLAKE2B 2177c121e549726fdaf50a22d5b55e54ee47297646d2a7109fa5841ae1093516a88794060bd71a885fc257a90d666b41ddfa0d00df8858a110b694503c1502a3 SHA512 63ab541ec77ea70d79ea4e4b441c2f84cb45e0b130c1a57f4f3f1522fd9d7a4a90d137c243ca20733424602d0e75f5079b98b6ce7d39b6d2df185690020dee48
+EBUILD git-patch-tags-0.2.ebuild 356 BLAKE2B a51001f6e903e48f77bf788631cbb5bd86141df17371b0f517c17a3be6a026343b7f9888e09d6c7cd2265ee15c29373313868cf9d992231e9133cfb9308ab7d5 SHA512 599a45981b0a0ac07c2b3a6b9b27770cd555ac95ddfe72327de05f5b1060ac40c3a82f39a847b998f70e29ec9862e27520328894676f3743b719163b40bdae98
+MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-vim/git-patch-tags/git-patch-tags-0.2.ebuild b/app-vim/git-patch-tags/git-patch-tags-0.2.ebuild
new file mode 100644
index 000000000000..fc3d10475db3
--- /dev/null
+++ b/app-vim/git-patch-tags/git-patch-tags-0.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: add git patch tags as used in linux kernel development"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3632"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/git-patch-tags/metadata.xml b/app-vim/git-patch-tags/metadata.xml
new file mode 100644
index 000000000000..f1abc6411341
--- /dev/null
+++ b/app-vim/git-patch-tags/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-vim/gitgutter-20171101 b/app-vim/gitgutter-20171101
deleted file mode 100644
index 0ad1272610ce..000000000000
--- a/app-vim/gitgutter-20171101
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: shows a git diff in the sign column and stages/reverts hunks
-EAPI=6
-HOMEPAGE=https://github.com/airblade/vim-gitgutter/
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/airblade/vim-gitgutter/archive/1e60667322b7cd1bfcba98762fbba746a888d21a.tar.gz -> gitgutter-20171101.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=17bc046e420fa454c6c641a48b8273e6
diff --git a/app-vim/gitgutter-20180316 b/app-vim/gitgutter-20180316
deleted file mode 100644
index efa44c570011..000000000000
--- a/app-vim/gitgutter-20180316
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: shows a git diff in the sign column and stages/reverts hunks
-EAPI=6
-HOMEPAGE=https://github.com/airblade/vim-gitgutter/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/airblade/vim-gitgutter/archive/37bdd03d176c5e182c7e8dbdc79c3f71d2a04898.tar.gz -> gitgutter-20180316.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=890112afbdebdf52965ff8fedd6601a4
diff --git a/app-vim/gitgutter-99999999 b/app-vim/gitgutter-99999999
deleted file mode 100644
index 2b6625778584..000000000000
--- a/app-vim/gitgutter-99999999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: shows a git diff in the sign column and stages/reverts hunks
-EAPI=6
-HOMEPAGE=https://github.com/airblade/vim-gitgutter/
-LICENSE=MIT
-RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 8f6de46b0aa318aea0e8cac62ece098b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=890112afbdebdf52965ff8fedd6601a4
diff --git a/app-vim/gitgutter/Manifest b/app-vim/gitgutter/Manifest
new file mode 100644
index 000000000000..02d1fc21f979
--- /dev/null
+++ b/app-vim/gitgutter/Manifest
@@ -0,0 +1,6 @@
+DIST gitgutter-20171101.tar.gz 43534 BLAKE2B cb0b935c1b2d16a50bbecc73f4f8c657a9087bef56bef36af8ff52a7ff09d39293296eaf49507015eaeac7f4faba2a26a09a49296c28237029110068cb9f6048 SHA512 24d8ad740931df17c2c67e2a2a13e3bba7c1205ba5543f5c11353e639876f4a54e69170dc0a946660ee2e3a23a110c90f4195fa9a1ddfff19163f00d88528219
+DIST gitgutter-20180316.tar.gz 46344 BLAKE2B f981753a0f8d066b7cb5c16c49cfdd1a1aac1c6623b4645b8b1abd5719470ac181e09c8b736f8b8a14e6098b60cb8f97b114dc5c2a587b6d1875fcf27b4b12cf SHA512 15873b2cccc49f8aec9de312efedc615d6fa822b45ca8ce53cc6cc878fcaf3a6ab3f02eb5d082ff329528cce1b48358846b0aba3f9d3bc8aadd29aa57d3b1a30
+EBUILD gitgutter-20171101.ebuild 752 BLAKE2B 02fecaa88d65823737070954f3a392036694794537c1953ea218d16952a659ad5813e6e67e348c9d56e70b392e10f954dd2c31ad95fb95833e7901cc7b1d3eb1 SHA512 8ce0c16f4f4942f8e0b33790601d42b2652d8310a496bb8d2f61713c612d210a93ac9be1aa9ed88bc99da088feafc9da9967285528d55701437465bcbb06ebfd
+EBUILD gitgutter-20180316.ebuild 791 BLAKE2B 1765bd9bdeb6234d90d831181bdf2ad0ef975edcfa959e7ea309c5522bdb6779163d1e5850a6715bcc8471db15c922125e80ec248d0ad822986657984475d4c8 SHA512 5b7fab9be3eabfe64a67535937883939ea3d1ba62184f55f25f18384ddf1d24416b22d1f88d6025d0b98249536984c6f8b6d0e9b7f0c467a64c14f34dfafde11
+EBUILD gitgutter-99999999.ebuild 791 BLAKE2B 1765bd9bdeb6234d90d831181bdf2ad0ef975edcfa959e7ea309c5522bdb6779163d1e5850a6715bcc8471db15c922125e80ec248d0ad822986657984475d4c8 SHA512 5b7fab9be3eabfe64a67535937883939ea3d1ba62184f55f25f18384ddf1d24416b22d1f88d6025d0b98249536984c6f8b6d0e9b7f0c467a64c14f34dfafde11
+MISC metadata.xml 346 BLAKE2B 89acd12a36beb7b027e42b7f094bba4e229e345ad6f0024bbd3e550784459975aff10e88f5de53de3f2150000b7349ee97348723110a43130b213404292b562a SHA512 4ada20b8f4f308445854b0e0ab229271a603e38370675691790dce0303ca4c2a7f00b247363b0f13bcebe78397fd3ebbbd157403260664171b548b8964da7a0a
diff --git a/app-vim/gitgutter/gitgutter-20171101.ebuild b/app-vim/gitgutter/gitgutter-20171101.ebuild
new file mode 100644
index 000000000000..2dada9f85e8b
--- /dev/null
+++ b/app-vim/gitgutter/gitgutter-20171101.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vim-plugin
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/airblade/vim-gitgutter.git"
+ inherit git-r3
+else
+ inherit vcs-snapshot
+ COMMIT_HASH="1e60667322b7cd1bfcba98762fbba746a888d21a"
+ SRC_URI="https://github.com/airblade/vim-gitgutter/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="vim plugin: shows a git diff in the sign column and stages/reverts hunks"
+HOMEPAGE="https://github.com/airblade/vim-gitgutter/"
+LICENSE="MIT"
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-vcs/git"
+
+src_prepare() {
+ default
+ rm LICENCE README* screenshot.png || die
+ rm -rf test || die
+}
diff --git a/app-vim/gitgutter/gitgutter-20180316.ebuild b/app-vim/gitgutter/gitgutter-20180316.ebuild
new file mode 100644
index 000000000000..002f6583087d
--- /dev/null
+++ b/app-vim/gitgutter/gitgutter-20180316.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vim-plugin
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/airblade/vim-gitgutter.git"
+ inherit git-r3
+else
+ inherit vcs-snapshot
+ COMMIT_HASH="37bdd03d176c5e182c7e8dbdc79c3f71d2a04898"
+ SRC_URI="https://github.com/airblade/vim-gitgutter/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: shows a git diff in the sign column and stages/reverts hunks"
+HOMEPAGE="https://github.com/airblade/vim-gitgutter/"
+LICENSE="MIT"
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-vcs/git"
+
+src_prepare() {
+ default
+
+ # remove unwanted files
+ rm LICENCE README* screenshot.png unplace.vim || die
+ rm -r test || die
+}
diff --git a/app-vim/gitgutter/gitgutter-99999999.ebuild b/app-vim/gitgutter/gitgutter-99999999.ebuild
new file mode 100644
index 000000000000..002f6583087d
--- /dev/null
+++ b/app-vim/gitgutter/gitgutter-99999999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vim-plugin
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/airblade/vim-gitgutter.git"
+ inherit git-r3
+else
+ inherit vcs-snapshot
+ COMMIT_HASH="37bdd03d176c5e182c7e8dbdc79c3f71d2a04898"
+ SRC_URI="https://github.com/airblade/vim-gitgutter/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: shows a git diff in the sign column and stages/reverts hunks"
+HOMEPAGE="https://github.com/airblade/vim-gitgutter/"
+LICENSE="MIT"
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-vcs/git"
+
+src_prepare() {
+ default
+
+ # remove unwanted files
+ rm LICENCE README* screenshot.png unplace.vim || die
+ rm -r test || die
+}
diff --git a/app-vim/gitgutter/metadata.xml b/app-vim/gitgutter/metadata.xml
new file mode 100644
index 000000000000..8a1caee90de1
--- /dev/null
+++ b/app-vim/gitgutter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">airblade/vim-gitgutter</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/gitlog-5.1.0 b/app-vim/gitlog-5.1.0
deleted file mode 100644
index c79cb6413a6c..000000000000
--- a/app-vim/gitlog-5.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: git log and diff plugin for vim
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/
-KEYWORDS=amd64 x86
-LICENSE=Artistic
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/PAntoine/vimgitlog/archive/version_5.1.0.tar.gz -> gitlog-5.1.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=8838de35d5e3619bb30e165b044d6f9c
diff --git a/app-vim/gitlog-6.0.0 b/app-vim/gitlog-6.0.0
deleted file mode 100644
index 571748332054..000000000000
--- a/app-vim/gitlog-6.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: git log and diff plugin for vim
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/
-KEYWORDS=~amd64 ~x86
-LICENSE=Artistic
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/PAntoine/vimgitlog/archive/version_6.0.0.tar.gz -> gitlog-6.0.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=ffaf3e979e660774215ed926ffcb7a4f
diff --git a/app-vim/gitlog-9999 b/app-vim/gitlog-9999
deleted file mode 100644
index b50930c0d6d4..000000000000
--- a/app-vim/gitlog-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: git log and diff plugin for vim
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/
-LICENSE=Artistic
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 8f6de46b0aa318aea0e8cac62ece098b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=ffaf3e979e660774215ed926ffcb7a4f
diff --git a/app-vim/gitlog/Manifest b/app-vim/gitlog/Manifest
new file mode 100644
index 000000000000..7f8672b3352c
--- /dev/null
+++ b/app-vim/gitlog/Manifest
@@ -0,0 +1,6 @@
+DIST gitlog-5.1.0.tar.gz 29684 BLAKE2B 80d48890f25015c448a8acfd9ef9fb4da8e39ec61de0741d8fd9e33858a0696336b599b81ff379e0674a084d1bc80a6562721d963b4a5e60b611ff1fd741e867 SHA512 1c2bd363ce5341fcdaa80955af350084903da7e7cac1e20583d05f8812ef11e562137e2ef3bd198f787a6cc1e322f7d942135341c27186a7c987cd9d631a0eeb
+DIST gitlog-6.0.0.tar.gz 33956 BLAKE2B 5a7472db7cbf03396e3ed4e7eea417e44e538946d9432b4d94c3114b59bfeb961c6e0df4137c116f152b57986b7cbaa1aeacd59df33d709f2794f5d2607693c4 SHA512 17016057df69b22e72548d00bd8c253ace864f0551890f64e6b9a91c1411b1e0a479d6c04028583edf9f9c366418b50b758f60d197fe0a62a75c7799b68a4069
+EBUILD gitlog-5.1.0.ebuild 500 BLAKE2B 6234508aeea1aab566499ba99ce680606094205f1af6a3f0f9cea5be2c4c104ae7a5cc9c2da5b5529e5ac4b4af94ceb95776f5d7ded25aefccb920135cab0db4 SHA512 da8ed526bc9cef86e213a5b2786298ad5f24743ea50a2ccd22575cc90c35694836329203d5090480fb677dbfb10fc365fc7994d897204673560629f3628340aa
+EBUILD gitlog-6.0.0.ebuild 621 BLAKE2B 9f0c0cbe917d08f9e3a75e2ca9921007e41ca3eec8a111d7497ac0e411c858a209bcf0420b7e8e03d145419cc7d22bb1960df1ddde43a439079ef2e197acb111 SHA512 144f2c24bed882dfecd15538eb467e10ae29f29c04380b237725b808a19fe31a5fe4596a9f00a2e6e1a477921c52bcc18752f86b27f76afd7489e2994ec35fde
+EBUILD gitlog-9999.ebuild 621 BLAKE2B 9f0c0cbe917d08f9e3a75e2ca9921007e41ca3eec8a111d7497ac0e411c858a209bcf0420b7e8e03d145419cc7d22bb1960df1ddde43a439079ef2e197acb111 SHA512 144f2c24bed882dfecd15538eb467e10ae29f29c04380b237725b808a19fe31a5fe4596a9f00a2e6e1a477921c52bcc18752f86b27f76afd7489e2994ec35fde
+MISC metadata.xml 342 BLAKE2B c19182db6fcedd6a9b1117db5936015b4e0247e302b3dbf6e39ac1bdab719d9a5ab22706264004c5dfa75712ca9e9223187b10e90663139cf298ea84fcc55771 SHA512 419f19aff509708c460c7848a5e90c03a19c47c986ae6d5d07be0abb3a387a8045f89b98139d2ac0ac5abb16b9b8cd315fe3001a8808a2c1e4ee497449e23a60
diff --git a/app-vim/gitlog/gitlog-5.1.0.ebuild b/app-vim/gitlog/gitlog-5.1.0.ebuild
new file mode 100644
index 000000000000..55e58752e730
--- /dev/null
+++ b/app-vim/gitlog/gitlog-5.1.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: git log and diff plugin for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/"
+SRC_URI="https://github.com/PAntoine/vimgitlog/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Artistic"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}/vim${PN}-version_${PV}
diff --git a/app-vim/gitlog/gitlog-6.0.0.ebuild b/app-vim/gitlog/gitlog-6.0.0.ebuild
new file mode 100644
index 000000000000..658a3cb149c8
--- /dev/null
+++ b/app-vim/gitlog/gitlog-6.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/PAntoine/vimgitlog.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/PAntoine/vimgitlog/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S=${WORKDIR}/vim${PN}-version_${PV}
+fi
+
+DESCRIPTION="vim plugin: git log and diff plugin for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/"
+LICENSE="Artistic"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/gitlog/gitlog-9999.ebuild b/app-vim/gitlog/gitlog-9999.ebuild
new file mode 100644
index 000000000000..658a3cb149c8
--- /dev/null
+++ b/app-vim/gitlog/gitlog-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/PAntoine/vimgitlog.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/PAntoine/vimgitlog/archive/version_${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S=${WORKDIR}/vim${PN}-version_${PV}
+fi
+
+DESCRIPTION="vim plugin: git log and diff plugin for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/"
+LICENSE="Artistic"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/gitlog/metadata.xml b/app-vim/gitlog/metadata.xml
new file mode 100644
index 000000000000..94f21fcb2826
--- /dev/null
+++ b/app-vim/gitlog/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">PAntoine/vimgitlog</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/gitolite-syntax-20111225 b/app-vim/gitolite-syntax-20111225
deleted file mode 100644
index 6a5961cee36e..000000000000
--- a/app-vim/gitolite-syntax-20111225
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: gitolite syntax highlighting
-EAPI=4
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2900
-KEYWORDS=amd64 ~arm x86
-LICENSE=Apache-2.0
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/gitolite-syntax-20111225.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=6e7338cbf017d3460aca362de61df8f1
diff --git a/app-vim/gitolite-syntax-20130306 b/app-vim/gitolite-syntax-20130306
deleted file mode 100644
index 6ddce82dd8c9..000000000000
--- a/app-vim/gitolite-syntax-20130306
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: gitolite syntax highlighting
-EAPI=4
-HOMEPAGE=https://github.com/tmatilai/gitolite.vim
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=Apache-2.0
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tmatilai/gitolite.vim/archive/990634e95f209ffca96970da1c117c0f67697d89.tar.gz -> gitolite-syntax-20130306.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=8e58b9c910bb9c5a0ba75ebbe71c471e
diff --git a/app-vim/gitolite-syntax/Manifest b/app-vim/gitolite-syntax/Manifest
new file mode 100644
index 000000000000..5cfcf655ecfe
--- /dev/null
+++ b/app-vim/gitolite-syntax/Manifest
@@ -0,0 +1,5 @@
+DIST gitolite-syntax-20111225.tar.bz2 1833 BLAKE2B 3838617e7628685e20aaa25223d20ca3cc615449b38552b16b6750bbba5847f075f70b6e6858fdbb7e377a7332e6057da9527fd1a06ba56601b2c31b81f6ee4d SHA512 28cac71111f9d41c46e6f9f68a22760512a03650b5f1f2d77ef40e002c22c024a288ede2d6e898320d4616066409d5f8343688681169c136505235b784d3dda5
+DIST gitolite-syntax-20130306.tar.gz 2975 BLAKE2B 552f9c1e02a8089a9e6c7887f533ac6187a3d1425d0c916ca50a62076a8ee448ed4cdcb44a10d8df53ded724c68617c17ddbf7a87d935851466e441547bbeac7 SHA512 c064d06162bdb0b71d9c0638db073bba9b0577a1529eaac1a673b812fc08478e5b351954279d9d68947f0c4e3fe29ee5667741e6d229461d1ad1c7b2f535a49d
+EBUILD gitolite-syntax-20111225.ebuild 439 BLAKE2B dbf630c66eb7d2ffa4750b89f37a5819848ddf14d28949db17f859d390a3a63553247bc34da3c8e6878a2329ee546e9072256de7fa3b4ca984110f3c8451198c SHA512 001e6eec3844b4a72508fcdeb8ed092759ab6bda57791c4cd3b46fd02b6ad74f006d90cae8f7c28d9db8b72b7df529969ed23e55a15fb307031ce8415a2a63ff
+EBUILD gitolite-syntax-20130306.ebuild 602 BLAKE2B 209416dda60747b19932c333f09f531b3b336ab09d0f21260412f1fa39f2cedeac748716f83bfe6c41dac72b772b3e003860ffc14ef0fd76ddaa98fea7d26b19 SHA512 a1dcac2deb62bfda91c6e827f4d093c34c45910de7c4008f509670e6c33cbb9c6fc45e74ef17b04e116b8ee91f840122283bb969238afa827fc2a53c09e5d2d1
+MISC metadata.xml 461 BLAKE2B a9629d5aee2dbadbb4533e215b4d28f68b112c39d7a227b75bc5b9cce850fdf3fdbe8aed2502b8273f491dc1ad5f1dcf6ace306c12b5ab0fa8c472a67b7476ae SHA512 73a788e77f42a5cd329e8341b399d4f4bac29f08a4e0c4dfecb4d50b67c022b2b5c37b0462aba5fd33ba064c697b5485681ef083e5051180ad5d73489f982fab
diff --git a/app-vim/gitolite-syntax/gitolite-syntax-20111225.ebuild b/app-vim/gitolite-syntax/gitolite-syntax-20111225.ebuild
new file mode 100644
index 000000000000..0c1871883a09
--- /dev/null
+++ b/app-vim/gitolite-syntax/gitolite-syntax-20111225.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: gitolite syntax highlighting"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=2900"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 ~arm x86"
+IUSE=""
+
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+VIM_PLUGIN_HELPTEXT="Vim Syntax highlight for gitolite configuration file gitolite.conf"
diff --git a/app-vim/gitolite-syntax/gitolite-syntax-20130306.ebuild b/app-vim/gitolite-syntax/gitolite-syntax-20130306.ebuild
new file mode 100644
index 000000000000..0935015636db
--- /dev/null
+++ b/app-vim/gitolite-syntax/gitolite-syntax-20130306.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: gitolite syntax highlighting"
+HOMEPAGE="https://github.com/tmatilai/gitolite.vim"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+GIT_COMMITSH=990634e95f209ffca96970da1c117c0f67697d89
+SRC_URI="https://github.com/tmatilai/gitolite.vim/archive/${GIT_COMMITSH}.tar.gz -> ${P}.tar.gz"
+VIM_PLUGIN_HELPTEXT="Vim Syntax highlight for gitolite configuration file gitolite.conf"
+
+S=$WORKDIR/gitolite.vim-$GIT_COMMITSH
+
+src_compile() {
+ :
+}
diff --git a/app-vim/gitolite-syntax/metadata.xml b/app-vim/gitolite-syntax/metadata.xml
new file mode 100644
index 000000000000..a47dde9086f9
--- /dev/null
+++ b/app-vim/gitolite-syntax/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>idl0r@gentoo.org</email>
+ <name>Christian Ruppert</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">tmatilai/gitolite.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/gitv-1.3.1 b/app-vim/gitv-1.3.1
deleted file mode 100644
index 4f1c999e0abf..000000000000
--- a/app-vim/gitv-1.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: gitk for vim
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/
-KEYWORDS=amd64 x86 ~ppc-macos
-LICENSE=vim
-RDEPEND=dev-vcs/git app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/gregsexton/gitv/archive/v1.3.1.tar.gz -> gitv-1.3.1.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=0e14fb158027ad0885640a0f259cf34d
diff --git a/app-vim/gitv-9999 b/app-vim/gitv-9999
deleted file mode 100644
index 42299d23970a..000000000000
--- a/app-vim/gitv-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: gitk for vim
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/
-LICENSE=vim
-RDEPEND=dev-vcs/git app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 8f6de46b0aa318aea0e8cac62ece098b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=b52cd7c6207c5e1990dfea4b48677507
diff --git a/app-vim/gitv/Manifest b/app-vim/gitv/Manifest
new file mode 100644
index 000000000000..703ef2073064
--- /dev/null
+++ b/app-vim/gitv/Manifest
@@ -0,0 +1,4 @@
+DIST gitv-1.3.1.tar.gz 553719 BLAKE2B 0d775f3bb05b3a49b69c5717f13a0f923fc5e0b5366c217042ac75e13c01080828ae4cd3e759e7dca44556c2b07aafa42cf8661a3ad0f52152c5cb8f4db294ed SHA512 e6a6773dcac18fdc36c891bd592d4dcb2eb20af6253df5886582fd223e040fb8296dc606d4fb25abd7a14f9dc1a712fe0e354821e234c8f54b1b5914af55dcbc
+EBUILD gitv-1.3.1.ebuild 684 BLAKE2B 2bc4aa2ca505cdbdc6ffae142b2905357e7054d0ce647bc7d5475f123c7756337e8460c38fb3d44fa6e43a13104bf20944ba8258b1c0bb9f76988315378c88fd SHA512 574878dc0b2f68da9bd39ad5467b343420e91ccd4fca3f5c69a7b75c837669a074dbfd54ed91cd7cfa7159a3301afad86091503c822e1808a6a34708ea62a778
+EBUILD gitv-9999.ebuild 683 BLAKE2B e2ceb93cb9bbd70a5764b7f93342e878caa463f639cb7ebf907ec230d1107977537df3298ec0d25d826330aa95aa4ebff6d3a5026fe49632b3d6d5eb74c0d651 SHA512 d42619dd5673761810cc3c5ceb434c9eaeb8bf5f39e5ea4e5909387a8cd79699320217a02edc14230a5b425683ece201fefcbdfa080842da87aca415ac842dd5
+MISC metadata.xml 339 BLAKE2B 7fcb97cc60c38b475e6ba392f55db1643e547903aa5f58ab5f81573681da85cba73e18de25dc3896321a971e99b44677322db3dda99afe1200ced4bfa49dcdf6 SHA512 ca3cb18c58b214701105d230d86f6499c1df741d0631483991465daa0680e3c3a8c2adb9440d828b98cf73fb598bcf33b4eb31ade16fe7faf31210663742344e
diff --git a/app-vim/gitv/gitv-1.3.1.ebuild b/app-vim/gitv/gitv-1.3.1.ebuild
new file mode 100644
index 000000000000..0c83e952b99e
--- /dev/null
+++ b/app-vim/gitv/gitv-1.3.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/gregsexton/gitv.git"
+else
+ SRC_URI="https://github.com/gregsexton/gitv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 x86 ~ppc-macos"
+fi
+
+DESCRIPTION="vim plugin: gitk for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/"
+LICENSE="vim"
+
+VIM_PLUGIN_HELPFILES="gitv"
+
+RDEPEND="
+ dev-vcs/git
+ app-vim/fugitive"
+
+src_prepare() {
+ rm -f doc/tags addon-info.json roadmap.md || die
+ rm -r img || die
+ default
+}
diff --git a/app-vim/gitv/gitv-9999.ebuild b/app-vim/gitv/gitv-9999.ebuild
new file mode 100644
index 000000000000..665594feb07b
--- /dev/null
+++ b/app-vim/gitv/gitv-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vim-plugin
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/gregsexton/gitv.git"
+else
+ SRC_URI="https://github.com/gregsexton/gitv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~ppc-macos"
+fi
+
+DESCRIPTION="vim plugin: gitk for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/"
+LICENSE="vim"
+
+VIM_PLUGIN_HELPFILES="gitv"
+
+RDEPEND="dev-vcs/git
+ app-vim/fugitive"
+
+src_prepare() {
+ rm -f doc/tags addon-info.json roadmap.md || die
+ rm -r img || die
+ default
+}
diff --git a/app-vim/gitv/metadata.xml b/app-vim/gitv/metadata.xml
new file mode 100644
index 000000000000..2bc2f53e2dc1
--- /dev/null
+++ b/app-vim/gitv/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">gregsexton/gitv</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/gnupg-2.6 b/app-vim/gnupg-2.6
deleted file mode 100644
index 5202f75f41f8..000000000000
--- a/app-vim/gnupg-2.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=transparent editing of gpg encrypted files
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3645
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=app-crypt/gnupg || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/gnupg-2.6.tar.bz2 https://dev.gentoo.org/~radhermit/vim/gnupg-2.6.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=fc9929901bdc803cfdb788e382dfa053
diff --git a/app-vim/gnupg/Manifest b/app-vim/gnupg/Manifest
new file mode 100644
index 000000000000..57635c8c8bd9
--- /dev/null
+++ b/app-vim/gnupg/Manifest
@@ -0,0 +1,3 @@
+DIST gnupg-2.6.tar.bz2 12074 BLAKE2B d06e4637627187e1d276c3b485e22b35f0cba78a491d34f0884da7ad320f12a3443e40a7c0e7e3f27be03984380eb966d593a283d768bb834a1fefed05656dd3 SHA512 1b7307954aad751006286edebb80767951b9bd9a8eff4c4a57fa6030cb442ceca12730a82c76a2181e1da19cc4cc8be21ccd4f8a21817aedf42785d8ff4b61ac
+EBUILD gnupg-2.6.ebuild 771 BLAKE2B f3767681669d829f63e517e3919e5921c8903f231dc7138470cab808c2d82ba7a5681ad8210d0cb279af7e33bda6ad227792a9d8c24ceaf1e9172ad6b1f227f5 SHA512 16533f194b0f5f78afaf278f4722317c71cace8db2982d6d759070b079ed72c73ebaaaa38d6654b272328c9b4281a02b1ffa100262e1c6aaff457896a67e06f2
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/gnupg/gnupg-2.6.ebuild b/app-vim/gnupg/gnupg-2.6.ebuild
new file mode 100644
index 000000000000..ef344bdcf3f9
--- /dev/null
+++ b/app-vim/gnupg/gnupg-2.6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="transparent editing of gpg encrypted files"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3645"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~arm x86"
+
+RDEPEND="app-crypt/gnupg"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+ default
+
+ # There's good documentation included with the script, but it's not
+ # in a helpfile. Since there's rather too much information to include
+ # in a VIM_PLUGIN_HELPTEXT, we'll sed ourselves a help doc.
+ mkdir doc || die
+ sed -e '/" Section: Plugin header.\+$/,9999d' -e 's/^" \?//' \
+ -e 's/\(Name:\s\+\)\([^.]\+\)\.vim/\1*\2.txt*/' \
+ plugin/${PN}.vim \
+ > doc/${PN}.txt || die
+}
diff --git a/app-vim/gnupg/metadata.xml b/app-vim/gnupg/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/gnupg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/greputils-2.8-r1 b/app-vim/greputils-2.8-r1
deleted file mode 100644
index a720ad199331..000000000000
--- a/app-vim/greputils-2.8-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: interface with grep, find and id-utils
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1062
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=>=app-vim/genutils-1.18 >=app-vim/multvals-3.6.1 >=app-vim/cmdalias-1.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/greputils-2.8.tar.bz2 https://dev.gentoo.org/~radhermit/vim/greputils-2.8.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=b5eb7120b4d4d3be48c1dece80b80856
diff --git a/app-vim/greputils/Manifest b/app-vim/greputils/Manifest
new file mode 100644
index 000000000000..8aac9b20804e
--- /dev/null
+++ b/app-vim/greputils/Manifest
@@ -0,0 +1,3 @@
+DIST greputils-2.8.tar.bz2 11886 BLAKE2B 7c1a8c08393d50d044203b8190c5ce35fa75b5ab6e2b18a6e5ad2eb679ac4685c92c336fe347e03db230a6f3a459d7acfac9f4e0161ca4adb17ee90192b38641 SHA512 07a7b22a900860b982bb0596232892ad056472fa48447131ba56083caef00318886719f379c9f9296fc00fd54575ab16aae71b3d1adf2af5d05a11a45a2bd7f9
+EBUILD greputils-2.8-r1.ebuild 480 BLAKE2B 67e8437109fb5e09c370408acaea2d85d714a0448dcbb72b3680b5180733932e5f105cad46be7b072dbdf5015617d4ea7df552cf3cf838ac77db8d8c5cf4abc6 SHA512 ce50fbabacdd0264b1907d46fda725e9e989abd0ab2c4a8be8b31eef3be687491fbd5e60e045a2a66ddae0d9744bb6591ad00c8de621ca565417c7e9b7802282
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/greputils/greputils-2.8-r1.ebuild b/app-vim/greputils/greputils-2.8-r1.ebuild
new file mode 100644
index 000000000000..ad6fb677b12c
--- /dev/null
+++ b/app-vim/greputils/greputils-2.8-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: interface with grep, find and id-utils"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1062"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPURI="${HOMEPAGE}"
+
+DEPEND=""
+RDEPEND="
+ ${DEPEND}
+ >=app-vim/genutils-1.18
+ >=app-vim/multvals-3.6.1
+ >=app-vim/cmdalias-1.0"
diff --git a/app-vim/greputils/metadata.xml b/app-vim/greputils/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/greputils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/gtk-syntax-20130716 b/app-vim/gtk-syntax-20130716
deleted file mode 100644
index c8fc680bdb1f..000000000000
--- a/app-vim/gtk-syntax-20130716
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Syntax highlighting for GLib, Gtk+, Xlib, Gimp, Gnome, and more
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1000
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/gtk-syntax-20130716.tar.bz2 https://dev.gentoo.org/~radhermit/vim/gtk-syntax-20130716.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=a846cf852dd91307e9f6138943ea77fc
diff --git a/app-vim/gtk-syntax/Manifest b/app-vim/gtk-syntax/Manifest
new file mode 100644
index 000000000000..f2e7181d354c
--- /dev/null
+++ b/app-vim/gtk-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST gtk-syntax-20130716.tar.bz2 234878 BLAKE2B 0d412e1a04f4cfa0303108bf7e83e21332e1ef4d84f6f65054b860db032aa65bcc0c1ae827ba4968e650114343eeb444bbf9e985e6c4cf8cf4f69b957936a100 SHA512 a90bdf84765ebaf10946b974c7720ebb9366f7ae5e360c8254ffd54bf9eacf1d0e35cf2061ef42727ffd7df3b4d78bb9e5f3ab7392180c435f8eef06c81ff5da
+EBUILD gtk-syntax-20130716.ebuild 466 BLAKE2B e201ec0e17a09e3176aa39107b929f096396369572b37356c0fdc78bc833e5a915d605e3811acab0ee2424ca74a148d04eaabf4b93c1207409bb2673e6d9a9c9 SHA512 e66853cb49eeb3a3c3de4c2e6d0fec15ab1547f311370db6c1cba2529c87af176df751845104c8cdfa0b0bb2e92b479ef9472eb345ebf1d2277ef6a971b28b3a
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
new file mode 100644
index 000000000000..6b9d88d9d658
--- /dev/null
+++ b/app-vim/gtk-syntax/gtk-syntax-20130716.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Syntax highlighting for GLib, Gtk+, Xlib, Gimp, Gnome, and more"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1000"
+LICENSE="vim"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
diff --git a/app-vim/gtk-syntax/metadata.xml b/app-vim/gtk-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/gtk-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/gundo-2.6.2 b/app-vim/gundo-2.6.2
deleted file mode 100644
index a32079f06176..000000000000
--- a/app-vim/gundo-2.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: visualize your vim undo tree
-EAPI=6
-HOMEPAGE=https://sjl.bitbucket.io/gundo.vim/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=GPL-2+
-RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://bitbucket.org/sjl/gundo.vim/get/v2.6.2.tar.bz2 -> gundo-2.6.2.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=959f81d249671ecf03c2e95aad14135e
diff --git a/app-vim/gundo/Manifest b/app-vim/gundo/Manifest
new file mode 100644
index 000000000000..df9979976a02
--- /dev/null
+++ b/app-vim/gundo/Manifest
@@ -0,0 +1,3 @@
+DIST gundo-2.6.2.tar.bz2 144107 BLAKE2B 7915a60a77e07e49cc1a214c6e250028e61ff33e6f085960836a3e49c1562f4ff713ff4c57125f677d352ae3477bb514fd94d636ee5ba9afac5d23c4ecd70029 SHA512 e03450a1bfb0a7f5013c1493f1b25b963c2bbb37fc8fa24c1b85237bd12847c3edd7b9465caae7bdadf8923dbdcdb24930b160d7824f835417bf30725fa910b4
+EBUILD gundo-2.6.2.ebuild 726 BLAKE2B 67919bb9e15cbd444ac7732b8eb9c8bd52929b589693ad252106e376698a6a5b70b9885a5976c07fc53f0f8f5386f1adfe4434e03ff8e672fe9d1d7ee95b725e SHA512 4f5e6929413654e8cf8d11e0f6cf316c82e89763b63940f0d67b95968382a85080bc5668373fc8183d0a8a70358ab93a19bce4e529071efa6bf88a729d5baa83
+MISC metadata.xml 337 BLAKE2B 08b3c90ab9c289b83c58c3c67fa09f3306082e9d660b8ac81e75f14a44d434fec2657ca4f21ef6660ae46923abe92053a22b404ee9fd443b34775191a999a7e8 SHA512 14459476fa97a611646909941de602646af184e1de555dfff407e71b8fa935c23b5f863b58432be84c31378badabecf8893eafd454d06f8c57759a3bb8035854
diff --git a/app-vim/gundo/gundo-2.6.2.ebuild b/app-vim/gundo/gundo-2.6.2.ebuild
new file mode 100644
index 000000000000..6822904f1e76
--- /dev/null
+++ b/app-vim/gundo/gundo-2.6.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit vim-plugin python-single-r1 vcs-snapshot
+
+DESCRIPTION="vim plugin: visualize your vim undo tree"
+HOMEPAGE="https://sjl.bitbucket.io/gundo.vim/"
+SRC_URI="https://bitbucket.org/sjl/gundo.vim/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+KEYWORDS="amd64 x86 ~x64-macos"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ || (
+ app-editors/vim[python,${PYTHON_USEDEP}]
+ app-editors/gvim[python,${PYTHON_USEDEP}]
+ )
+ ${PYTHON_DEPS}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+ rm -r .gitignore .hg* package.sh README* site tests || die
+ default
+}
diff --git a/app-vim/gundo/metadata.xml b/app-vim/gundo/metadata.xml
new file mode 100644
index 000000000000..a6020bdaec7e
--- /dev/null
+++ b/app-vim/gundo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">sjl/gundo.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/haskellmode-20101118-r1 b/app-vim/haskellmode-20101118-r1
deleted file mode 100644
index 179446efd86b..000000000000
--- a/app-vim/haskellmode-20101118-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
-DESCRIPTION=vim plugin: Provides IDE-like features for Haskell development
-EAPI=6
-HOMEPAGE=http://projects.haskell.org/haskellmode-vim
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-lang/ghc[doc] net-misc/wget || ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
-SLOT=0
-SRC_URI=http://code.haskell.org/~wwolff/haskellmode/haskellmode-20101118.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=f63d0cec323bc2d2a4afaeb5e2065a25
diff --git a/app-vim/haskellmode/Manifest b/app-vim/haskellmode/Manifest
new file mode 100644
index 000000000000..c5f2a9ccb219
--- /dev/null
+++ b/app-vim/haskellmode/Manifest
@@ -0,0 +1,3 @@
+DIST haskellmode-20101118.tar.bz2 21637 BLAKE2B f64278a4d6d892068d1de85b0d19892908a5b841485cde2af419777637db353364882af76a84e406bd01c5f9d8967ef43b44edb5e40ec6b2762aa6d97975045b SHA512 c1882766c08afeda9aea9ddd072e6107f5615ee5a0916d029170ad38097a2fa7dce72bc2429618ac3889afb8d1de9ab53ddaf5beff45f873f9eb5a57b04bc6aa
+EBUILD haskellmode-20101118-r1.ebuild 1445 BLAKE2B 52e43c4142976322d081749290e635adc845dcaa6028904cbbcb8208542d7369d3abcb2188f037c7be98cfe4249ec49b5ea7e93d872e542ace97cecc27d03bfa SHA512 3861b96202de4c74315ecec6d9aa3bf32d67995db51898a74e4573427781964c4930b01f647f0ff10da1ceece70aa351b537c2c8d575ef106ec95896ee37f9be
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/haskellmode/haskellmode-20101118-r1.ebuild b/app-vim/haskellmode/haskellmode-20101118-r1.ebuild
new file mode 100644
index 000000000000..00f065cc2c85
--- /dev/null
+++ b/app-vim/haskellmode/haskellmode-20101118-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_PLUGIN_VIM_VERSION="7.1"
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Provides IDE-like features for Haskell development"
+HOMEPAGE="http://projects.haskell.org/haskellmode-vim"
+SRC_URI="http://code.haskell.org/~wwolff/haskellmode/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT=0
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+ ${RDEPEND}"
+
+RDEPEND="
+ dev-lang/ghc[doc]
+ net-misc/wget"
+
+VIM_PLUGIN_HELPFILES="haskellmode"
+VIM_PLUGIN_MESSAGES="filetype"
+
+pkg_postinst() {
+ vim-plugin_pkg_postinst
+
+ elog "You must set 'g:haddock_browser' to the path of your preferred browser, and"
+ elog "depending on your setup you may also want to change the default value of"
+ elog "'g:haddock_browser_callformat' (see ':help g:haddock_browser_callformat' for"
+ elog "full usage info). You can persist these settings in your vimrc file, for"
+ elog "example:"
+ elog
+ elog " let g:haddock_browser=\"/usr/bin/elinks\""
+ elog " let g:haddock_browser_callformat=\"%s file://%s >/dev/null 2>&1 &\""
+ elog
+ elog "To enable GHC compiler integration, also add the following to your vimrc:"
+ elog
+ elog " au BufEnter *.hs compiler ghc"
+ elog
+ elog "The first time you load haskellmode, you must generate a Haddock index. Do"
+ elog "this with the command:"
+ elog
+ elog " :ExportDocIndex"
+ elog
+ elog "Consult ${HOMEPAGE} for further setup and usage information."
+}
diff --git a/app-vim/haskellmode/metadata.xml b/app-vim/haskellmode/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/haskellmode/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/help-extra-syntax-20050106-r1 b/app-vim/help-extra-syntax-20050106-r1
deleted file mode 100644
index 546107f6b2cb..000000000000
--- a/app-vim/help-extra-syntax-20050106-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: extra syntax highlighting for help files
-EAPI=0
-HOMEPAGE=http://mysite.verizon.net/astronaut/vim/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 sparc x86
-LICENSE=public-domain
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/help-extra-syntax-20050106.tar.bz2 https://dev.gentoo.org/~radhermit/vim/help-extra-syntax-20050106.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=ed9fea3750bc1d5c6889bf7238d42d05
diff --git a/app-vim/help-extra-syntax/Manifest b/app-vim/help-extra-syntax/Manifest
new file mode 100644
index 000000000000..c1fbe37efc59
--- /dev/null
+++ b/app-vim/help-extra-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST help-extra-syntax-20050106.tar.bz2 633 BLAKE2B 2e46b9b2f46a102c9e7a8036198bfb87806ef40c87e2c5893203f174dbbbc89cb13e1743616834c9e273d5838c8ab996399d06cba7ad3ba0b692ec345d96e080 SHA512 84fde638941bc0b63b599ae0ae46dc151796409652bd99520df102b54e60497df23ee62b61d8ee2c7532029cf0183702345dffe743420dadee3e5ae6c4a2ef44
+EBUILD help-extra-syntax-20050106-r1.ebuild 641 BLAKE2B 0665c0c761feaf142b5727432e0ff1445bf93fd23f141c8f9a5c58672c500ac2e2237d80eccff090e643f7fc11c7432dec399136123f98c5429d5ea530ab0704 SHA512 32a6d2a52533865db6171a2d33a59ee5b097f855a5abde6e70135c87d19451bfb4b4c5cfa8a1ea9b3d22c61b97594c641a337b8fd43cfc9d55671f7a10e71c05
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/help-extra-syntax/help-extra-syntax-20050106-r1.ebuild b/app-vim/help-extra-syntax/help-extra-syntax-20050106-r1.ebuild
new file mode 100644
index 000000000000..9779d9eb5d87
--- /dev/null
+++ b/app-vim/help-extra-syntax/help-extra-syntax-20050106-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: extra syntax highlighting for help files"
+HOMEPAGE="http://mysite.verizon.net/astronaut/vim/"
+LICENSE="public-domain"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides additional syntax highlighting for help files."
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ # use hi def link, bug #101797 / bug #101804
+ sed -i -e 's,^hi link,hi def link,' \
+ "after/syntax/help.vim.d/extra-help-syntax.vim" || die "sed failed"
+}
diff --git a/app-vim/help-extra-syntax/metadata.xml b/app-vim/help-extra-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/help-extra-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/increment-1.1-r1 b/app-vim/increment-1.1-r1
deleted file mode 100644
index af40b61ab0b5..000000000000
--- a/app-vim/increment-1.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: easily create sequences of incremented values
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=842
-KEYWORDS=alpha amd64 ia64 ppc sparc x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/increment-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/increment-1.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=3a1ef1fd27fdfebb820d42e02fe11990
diff --git a/app-vim/increment/Manifest b/app-vim/increment/Manifest
new file mode 100644
index 000000000000..07d60f4f91ff
--- /dev/null
+++ b/app-vim/increment/Manifest
@@ -0,0 +1,3 @@
+DIST increment-1.1.tar.bz2 3058 BLAKE2B d079e0fa180b68a0616ffdf5b2ca86496f7aca2ab2e69e27e16a56dda49c96eed0ad7c53e0a0aabc9b29fcb0895247987afb28282477247046e07bb3f01630b6 SHA512 eae4fd492c02e83556646df35c57a50c07a09ea3c9cca0c8d8e15b8a49b621007e3952c23dc997d99d22dd8352852d98332180aa299ecdd4e53ffdafdc6b7a30
+EBUILD increment-1.1-r1.ebuild 379 BLAKE2B cee4fc85bc0549e5f892978f0208d74fb10cab6d82d7f54bfb578d937b34fd19b96240a676e65e275820a873a6d5bdae8a70c30d60191a56bdf085a7b8afde88 SHA512 090717ee116381d9e2b6b215a331c2055d543cf0be315e999bd606e13975115e63062675d1f18a728adaa8d9d498e586de5af997d4298355fb7751346151c649
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/increment/increment-1.1-r1.ebuild b/app-vim/increment/increment-1.1-r1.ebuild
new file mode 100644
index 000000000000..12e6a64a35e8
--- /dev/null
+++ b/app-vim/increment/increment-1.1-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: easily create sequences of incremented values"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=842"
+
+LICENSE="vim.org"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="increment.txt"
diff --git a/app-vim/increment/metadata.xml b/app-vim/increment/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/increment/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/indentpython-0.3 b/app-vim/indentpython-0.3
deleted file mode 100644
index 08bf55a741de..000000000000
--- a/app-vim/indentpython-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Indent Python code according to PEP8
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=974
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/vim-scripts/indentpython.vim/archive/0.3.tar.gz -> indentpython-0.3.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=8d4b57d31ef50b13aecdabd2a3541a5e
diff --git a/app-vim/indentpython/Manifest b/app-vim/indentpython/Manifest
new file mode 100644
index 000000000000..444220dd7ad7
--- /dev/null
+++ b/app-vim/indentpython/Manifest
@@ -0,0 +1,3 @@
+DIST indentpython-0.3.tar.gz 2305 BLAKE2B 080224b87a10d1a7cd87523b37257b099efc873a954a5af63d8046351ad67fa6a58c6d84405ca50416b735f52835029e2fe653a24cd80d66dfb851f050b2421c SHA512 a3750ad7f935be914821cdff6b55b9bca1fe4d076d6c364be3854679c8c3466f14a4df486258fbee5a24d58373bc6258080e598992b22a0897e18a170555ebd6
+EBUILD indentpython-0.3.ebuild 431 BLAKE2B 50793b88fb7e1d5e03782ad8383cc02da2199048cabd15799f21ba805d3f034adcf871244d6f356249dfc020ccb9b5380e949c810af0bfb6d47fc4d0a8d31925 SHA512 80710b0d87c4e1ca973be6c8c00274d9e23b0346662201f54c6e9aa443f65cbfa0fed107c8a1df63a7b46ab8d47d6bfaff2771d5722807aab131b340fb45de5c
+MISC metadata.xml 437 BLAKE2B 302eee78ee54aea1ade2aa9206518258d8d4d8d2382ff7f5ce786c404561aa049f0e9a1b50330fe54d3c3432d688a7ddda193161d38dc43559278f802c378d3f SHA512 a6dc546a8b543e5e568f0dace43860187d1ea909b614ade44ecf3eb6cc03507b77fd4f62da85284c191b7007376ac31ca9933171983df84b5da04bfdb8424ac7
diff --git a/app-vim/indentpython/indentpython-0.3.ebuild b/app-vim/indentpython/indentpython-0.3.ebuild
new file mode 100644
index 000000000000..d2abc1777cf7
--- /dev/null
+++ b/app-vim/indentpython/indentpython-0.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Indent Python code according to PEP8"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=974"
+SRC_URI="https://github.com/vim-scripts/${PN}.vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim.org"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+S="${WORKDIR}/${PN}.vim-${PV}"
diff --git a/app-vim/indentpython/metadata.xml b/app-vim/indentpython/metadata.xml
new file mode 100644
index 000000000000..a4ec1d420f91
--- /dev/null
+++ b/app-vim/indentpython/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">vim-scripts/indentpython.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/info-1.7-r2 b/app-vim/info-1.7-r2
deleted file mode 100644
index ba18ac004fe8..000000000000
--- a/app-vim/info-1.7-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: GNU info documentation browser
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=21
-KEYWORDS=x86 alpha sparc ia64 ppc s390 amd64
-LICENSE=BSD
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/info-1.7.tar.bz2 https://dev.gentoo.org/~radhermit/vim/info-1.7.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=455bf123669a333ccebf10543364542d
diff --git a/app-vim/info/Manifest b/app-vim/info/Manifest
new file mode 100644
index 000000000000..8423a12edb0e
--- /dev/null
+++ b/app-vim/info/Manifest
@@ -0,0 +1,3 @@
+DIST info-1.7.tar.bz2 3958 BLAKE2B 23c8f8e06e923adc6d97ac578331cd5669dfe54ba7dc470c07426dbcf475cab4cf66ceb60a1f1b79c0fc12109db4ed3fee575bde56de221a9ebf8fe99dca9d63 SHA512 8d1d00b844a7485544fe02e17a3938a08b25be8cea7cf9f5e139be5b1f1f1b37abed8d717e149154d7bb87028f4d7e94b1ded844a6f83e8e645da2a214eaa81e
+EBUILD info-1.7-r2.ebuild 636 BLAKE2B 76a4c9418a2fdfc4368892b766f45b6d2204c130ea6006909a0f2e5a8dab1dd75c08e51f7c2b1f860e0f8765cb857632b522ad62645aa4ebdb4f74fbdf42cefd SHA512 bd646d479f4a8f15f2e2184b9e1b2e8aa311d13c64cab5976857954a8ddd8583def80d431ac03259d723a6a8e462ab4c987db12115f890cbd830a81357121738
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/info/info-1.7-r2.ebuild b/app-vim/info/info-1.7-r2.ebuild
new file mode 100644
index 000000000000..5f80fab54390
--- /dev/null
+++ b/app-vim/info/info-1.7-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: GNU info documentation browser"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=21"
+LICENSE="BSD"
+KEYWORDS="x86 alpha sparc ia64 ppc s390 amd64"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT="This plugin adds the :Info command."
+
+src_prepare() {
+ default
+
+ # The 'h' key is a bad choice for help. 'H' would have been a
+ # much better choice. I sent this suggestion to the maintainer,
+ # but no reply.
+ sed -i 's/\(noremap <buffer> \)h/\1H/' plugin/info.vim || die 'sed failed'
+}
diff --git a/app-vim/info/metadata.xml b/app-vim/info/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/info/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/jedi-0.8_p20171015 b/app-vim/jedi-0.8_p20171015
deleted file mode 100644
index cb39c5c30394..000000000000
--- a/app-vim/jedi-0.8_p20171015
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm
-DEPEND=app-editors/vim[python] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: binding to the autocompletion library jedi
-EAPI=6
-HOMEPAGE=https://github.com/davidhalter/jedi-vim
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/jedi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/davidhalter/jedi-vim/archive/77924398bd594e238766153cec97ace62650f082.zip -> jedi-0.8_p20171015.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=43e8d9f45550f95b793547fb904f5563
diff --git a/app-vim/jedi/Manifest b/app-vim/jedi/Manifest
new file mode 100644
index 000000000000..3d5a3442c714
--- /dev/null
+++ b/app-vim/jedi/Manifest
@@ -0,0 +1,3 @@
+DIST jedi-0.8_p20171015.zip 43567 BLAKE2B 6065e2df567159054d99ec502ddb8ec8103e0892c9f78f6bbc2e72cad6cb3fe37d86882a72135f238fd47a747e03275aa82edee9d954459194940e8a69e1a775 SHA512 d69fa77ada22b0c75b7ec4ad1765035454312707ffb0f8a0bb0de4928e5fd21b08e39ab28b3f0ff9b37c8eb5389bc44c507fa2a08c0322510a57a91d7de028e6
+EBUILD jedi-0.8_p20171015.ebuild 824 BLAKE2B 4f953be2d3ce9601f944e849ad9fd0800304fd32cc5154bbffc4f2198cdfce55a1c6e3cbbe332e32999213a0d63a2e7a89878dfadd531955ea728fefc0111a71 SHA512 056d95e45463e930982698c031510c0b36d6276fd6870a617db179d3e8630a4793d1d3dc773adc20bc36e0ce7bcb34a06e99eb0cbb41239f630c22a91cffa99f
+MISC metadata.xml 740 BLAKE2B 82dbee0d839faa814f29236625da3bed8eaf6abf8e286c15800ae43758a017394e0b714896b721104213546554f56597a68556dec22038a730423df9a215963b SHA512 145652296b05261952034b26cf36a6fdabee22cdccf4b85914c383e1fde270ca66fcc0b5cae43294907b0730005eb3ce87feb39b716f89740277a9a133229142
diff --git a/app-vim/jedi/jedi-0.8_p20171015.ebuild b/app-vim/jedi/jedi-0.8_p20171015.ebuild
new file mode 100644
index 000000000000..f72dd11f5839
--- /dev/null
+++ b/app-vim/jedi/jedi-0.8_p20171015.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit vim-plugin python-r1 python-utils-r1
+
+# Commit Date: Sun Oct 15 20:51:54 2017 +0200
+COMMIT="77924398bd594e238766153cec97ace62650f082"
+
+DESCRIPTION="vim plugin: binding to the autocompletion library jedi"
+HOMEPAGE="https://github.com/davidhalter/jedi-vim"
+SRC_URI="https://github.com/davidhalter/jedi-vim/archive/${COMMIT}.zip -> ${P}.zip"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/jedi[${PYTHON_USEDEP}]"
+DEPEND="app-editors/vim[python]"
+
+S="${WORKDIR}/jedi-vim-${COMMIT}"
+
+# Tests are broken.
+RESTRICT="test"
+
+# Makefile tries hard to call tests so let's silence this phase.
+src_compile() { :; }
+
+src_install() {
+ vim-plugin_src_install
+}
diff --git a/app-vim/jedi/metadata.xml b/app-vim/jedi/metadata.xml
new file mode 100644
index 000000000000..e29e8e7eb84b
--- /dev/null
+++ b/app-vim/jedi/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>horea.christ@gmail.com</email>
+ <name>Horea Christian</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Jedi-vim is a VIM binding to the autocompletion library Jedi.
+ Apart from that, jedi-vim provides a number of keybindings.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">davidhalter/jedi-vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/json-20150511 b/app-vim/json-20150511
deleted file mode 100644
index 4cec6dfdd537..000000000000
--- a/app-vim/json-20150511
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a better JSON for Vim
-EAPI=5
-HOMEPAGE=https://github.com/elzr/vim-json/
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/json-20150511.tar.bz2 https://dev.gentoo.org/~radhermit/vim/json-20150511.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=1aa3088a61e12a3ae238bb4121acccf4
diff --git a/app-vim/json/Manifest b/app-vim/json/Manifest
new file mode 100644
index 000000000000..02508ad459f2
--- /dev/null
+++ b/app-vim/json/Manifest
@@ -0,0 +1,3 @@
+DIST json-20150511.tar.bz2 8620 BLAKE2B 80b01585af1a94a2e46900adba16b1165d9fa3adf922ea3a8f9cbed9512de3779593394174fc465058385237bcb9e0ff0cfd5b0e9b91d9818c0b733eaddf4547 SHA512 357ea8ea298c6e2758db75e54334ccdfcd43d3146f032c816756688f35ff163dea99df42b9f1168aaac63e50e6ccedb85ff6f37f234e9faf72c53fb9e05c9b9c
+EBUILD json-20150511.ebuild 314 BLAKE2B c775210cad7140811d1d05730f2aae987e54b0bc53dbbf915d1cb9c4b82d9559e1a0e47f76454c8c6ca0bc68df4046727e54222e450c930210384e680cbb3b80 SHA512 e2250c2af2ed047e2ce1c22e9b46a39c0bbd384f0e6892c3748740f14e685df3086005125bdd02fbdc18f0e38a6cc5a4d04b348b37823b42f662b278c04d006d
+MISC metadata.xml 337 BLAKE2B 6f8fb0b0333f7f5e8a161d3a218de86a8cb8a3f79b10d73327f3384014c691d2a15d44d33ccfa1e0324ebf5a187f24c83abf3e531182041b34db5e410c4e48d3 SHA512 5d1f6814b0a463d6b4a534a4d16b1c28d9a3ebcbd9f351ea03eca3731ee993a355053d271ea2f40cb35ae900a75902b1033866439c786a2427f973d93b90dfdc
diff --git a/app-vim/json/json-20150511.ebuild b/app-vim/json/json-20150511.ebuild
new file mode 100644
index 000000000000..945e149aa0e4
--- /dev/null
+++ b/app-vim/json/json-20150511.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: a better JSON for Vim"
+HOMEPAGE="https://github.com/elzr/vim-json/"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+src_prepare() {
+ rm *-test.* license.md || die
+}
diff --git a/app-vim/json/metadata.xml b/app-vim/json/metadata.xml
new file mode 100644
index 000000000000..853019aaa34f
--- /dev/null
+++ b/app-vim/json/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">elzr/vim-json</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/l9-1.1 b/app-vim/l9-1.1
deleted file mode 100644
index 17989ef1b60c..000000000000
--- a/app-vim/l9-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: library for vim scripts
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3252
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=13948 -> l9-1.1.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=83952fe5f3929a403b52f9b9022c065c
diff --git a/app-vim/l9/Manifest b/app-vim/l9/Manifest
new file mode 100644
index 000000000000..e54c9a8b2788
--- /dev/null
+++ b/app-vim/l9/Manifest
@@ -0,0 +1,3 @@
+DIST l9-1.1.zip 12363 BLAKE2B 35bef105c446b53115dfdc25b217da56e136ddeb0ac406fd4e793586a14e82720681d1c478bb64345e43264b9dcb2ee51a6fb15107e50e5bdf9596bf80769fa5 SHA512 75a593dd5bb7f6f3abcb6a915218755888d259ba950f3bef0f93eac189c5ed65e6646959c662a7ae9ca3a61fc80fc9e449d1590c718dda6544f86875097949d4
+EBUILD l9-1.1.ebuild 442 BLAKE2B 2ffbd6c0601311f96ffe36353545c2df135aab121ffe3fc16fe60e320682e56bffbd25c7e90612c5ad566a7cc2d680ce14514d1238fcb35a26a571feb3b96e4a SHA512 bbcd7ab7a0bf3008b2c33350bd8a884804dd17ade7ba9382e9d67bbdbd37f29e0d111a36bf94f93c1082fb1c8f89f67f30d743109c14718405d47b102411b84a
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/l9/l9-1.1.ebuild b/app-vim/l9/l9-1.1.ebuild
new file mode 100644
index 000000000000..9bee66275216
--- /dev/null
+++ b/app-vim/l9/l9-1.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library for vim scripts"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3252"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=13948 -> ${P}.zip"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}
diff --git a/app-vim/l9/metadata.xml b/app-vim/l9/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/l9/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/languagetool-1.29 b/app-vim/languagetool-1.29
deleted file mode 100644
index 159c9b77c8a9..000000000000
--- a/app-vim/languagetool-1.29
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=grammar checker for various languages
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3223
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=app-text/languagetool || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/languagetool-1.29.tar.bz2 https://dev.gentoo.org/~radhermit/vim/languagetool-1.29.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=5861e1b0db7c6f0480c39ab900e3946d
diff --git a/app-vim/languagetool-1.30 b/app-vim/languagetool-1.30
deleted file mode 100644
index 7ef167e04688..000000000000
--- a/app-vim/languagetool-1.30
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=grammar checker for various languages
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3223
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=app-text/languagetool || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/languagetool-1.30.tar.bz2 https://dev.gentoo.org/~radhermit/vim/languagetool-1.30.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=82360cb097280db05c9c4918babba7f5
diff --git a/app-vim/languagetool/Manifest b/app-vim/languagetool/Manifest
new file mode 100644
index 000000000000..3339a06c9bd2
--- /dev/null
+++ b/app-vim/languagetool/Manifest
@@ -0,0 +1,6 @@
+AUX languagetool-1.29-script.patch 1413 BLAKE2B 23aa4adc8c59689fcb18ff9b6fa0068035eaf212aedc9920d87a729cc7e4b34a32e11524cec1785d23cb08cbf9b1fe5ec5315ef4c7fdc2eb96324f06caac5c3b SHA512 b4e25e527a8af3ea5fe649bd31aa0ecf0f073a0852f1f155ecf2cbdc58d105ce114db8a12dc56ee086a9076cb15e5bde61e7340e570fff59093ed2f266247564
+DIST languagetool-1.29.tar.bz2 8059 BLAKE2B 0779ada2bfa80de9ca6e8237d5fc1891d2b99b06a438d16290cd2c6cc8c88a5202fe66f9754e98bc6519e6c24a2264e8bad7510dc43d53ae703c7e659c82c3bd SHA512 09b5bdc1d3590afe26578f687064a7a62493a11fafca903759dc1e9048cb22a04c6352127b13e4a63acb867d73d943b56fcae7f733350626f05b66a6d1f1626d
+DIST languagetool-1.30.tar.bz2 8089 BLAKE2B 518036b68b80bbc083718a23c3aa07e9d118b8c6dc4f69cfa289566924ac2bd218b45ca53e850244676351b1566b580c6fac909376087d8274c289ab20727e49 SHA512 c04115752f8a601e85b718ea8d68cbdaa7628d14c252b4bb5bd11449ae2c5558ddee3d0f3a1bc2db84364e127fc211a0c4fe51e4ff9b442ebe99aa4f9d1db935
+EBUILD languagetool-1.29.ebuild 419 BLAKE2B 628ccee730308e4069687b81600aa548d2d7cb0a267e7e54219ad1a617109152c44050734d84bec256e93a33649885c14bf009c0aaebbc748538112afe0ebebe SHA512 f22e67f2930e6f5a8de39af57dd0e36c1a4dc9bfefd48ddf4c5fd8ee8e0479a58c667558cb5bec6f251158bbad1a7b243f3eb133eec3852452fa96b9b57b2fdc
+EBUILD languagetool-1.30.ebuild 425 BLAKE2B 92c776abdd10fadb34e7b53ced866252cfe93e091f3d12d9413fcaee9769a5024fc25ff2fb3c89b60e5482db5f2c825bb54e85ccdd1056e151c023b086a887b4 SHA512 da2177d7f99694a11d5d2b820109c4016e8c872754717f9168da7c78a18d3f58c4fe7c8eadcbc927134c8c36e5adc81e5e90f1ee944d1279b100eba36cd27a14
+MISC metadata.xml 255 BLAKE2B c3c51ff357cdf3ea565d7f4bf7cb236342061e471b67eacc0a436c26d52532ce7499657a76fc92a845321318a65f9eb877573104341ddae66dc3a554a35f7362 SHA512 305ae93d2bb3da79ee181cf36bb0ca2bbac016c20555967d7281cd5c0edfc26c1450dacd7a7de57078650dab0e815be9169c0b25a24d71488185f71ae8834167
diff --git a/app-vim/languagetool/files/languagetool-1.29-script.patch b/app-vim/languagetool/files/languagetool-1.29-script.patch
new file mode 100644
index 000000000000..f2737feca8c9
--- /dev/null
+++ b/app-vim/languagetool/files/languagetool-1.29-script.patch
@@ -0,0 +1,38 @@
+Use launcher script instead of directly running from the jar file.
+
+--- languagetool-1.29/plugin/LanguageTool.vim
++++ languagetool-1.29/plugin/LanguageTool.vim
+@@ -162,23 +162,6 @@
+ endif
+ endif
+ endif
+-
+- let s:languagetool_jar = exists("g:languagetool_jar")
+- \ ? g:languagetool_jar
+- \ : $HOME . '/languagetool/languagetool-commandline.jar'
+-
+- if !filereadable(s:languagetool_jar)
+- " Hmmm, can't find the jar file. Try again with expand() in case user
+- " set it up as: let g:languagetool_jar = '$HOME/languagetool-commandline.jar'
+- let l:languagetool_jar = expand(s:languagetool_jar)
+- if !filereadable(expand(l:languagetool_jar))
+- echomsg "LanguageTool cannot be found at: " . s:languagetool_jar
+- echomsg "You need to install LanguageTool and/or set up g:languagetool_jar"
+- echomsg "to indicate the location of the languagetool-commandline.jar file."
+- return -1
+- endif
+- let s:languagetool_jar = l:languagetool_jar
+- endif
+ return 0
+ endfunction
+
+@@ -242,8 +225,7 @@
+ let l:range = a:line1 . ',' . a:line2
+ silent exe l:range . 'w!' . l:tmpfilename
+
+- let l:languagetool_cmd = 'java'
+- \ . ' -jar ' . s:languagetool_jar
++ let l:languagetool_cmd = 'languagetool'
+ \ . ' -c ' . s:languagetool_encoding
+ \ . (empty(s:languagetool_disable_rules) ? '' : ' -d '.s:languagetool_disable_rules)
+ \ . ' -l ' . s:languagetool_lang
diff --git a/app-vim/languagetool/languagetool-1.29.ebuild b/app-vim/languagetool/languagetool-1.29.ebuild
new file mode 100644
index 000000000000..271bff06b7cb
--- /dev/null
+++ b/app-vim/languagetool/languagetool-1.29.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vim-plugin
+
+MY_PN=LanguageTool
+DESCRIPTION="grammar checker for various languages"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3223"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${MY_PN}"
+
+RDEPEND="app-text/languagetool"
+
+PATCHES=( "${FILESDIR}"/${P}-script.patch )
diff --git a/app-vim/languagetool/languagetool-1.30.ebuild b/app-vim/languagetool/languagetool-1.30.ebuild
new file mode 100644
index 000000000000..b3e96c572a45
--- /dev/null
+++ b/app-vim/languagetool/languagetool-1.30.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vim-plugin
+
+MY_PN=LanguageTool
+DESCRIPTION="grammar checker for various languages"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3223"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${MY_PN}"
+
+RDEPEND="app-text/languagetool"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.29-script.patch )
diff --git a/app-vim/languagetool/metadata.xml b/app-vim/languagetool/metadata.xml
new file mode 100644
index 000000000000..84f8f1cf6bcb
--- /dev/null
+++ b/app-vim/languagetool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/lightline-9999 b/app-vim/lightline-9999
deleted file mode 100644
index f277e7e39790..000000000000
--- a/app-vim/lightline-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: A light and configurable statusline/tabline
-EAPI=6
-HOMEPAGE=https://github.com/itchyny/lightline.vim/
-LICENSE=MIT
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 8f6de46b0aa318aea0e8cac62ece098b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=48459901ef0cf6d075c1aa31ef2d3a5f
diff --git a/app-vim/lightline/Manifest b/app-vim/lightline/Manifest
new file mode 100644
index 000000000000..5a13d685d82e
--- /dev/null
+++ b/app-vim/lightline/Manifest
@@ -0,0 +1,2 @@
+EBUILD lightline-9999.ebuild 543 BLAKE2B 15bb8ad6c3ebbd1e89eb6357ba594045f94a0776eac486f415df8b529614856a0785d84d235685ec4c7f0d854e92330272c31802a10b949d666d14a7147421ac SHA512 f3cec9b22a25d7bf57aa8e42c4805530ad2988d9ad328dfcb7f017c1e0e54eb10c9d499f1a6cfd840b13c78a23c3f49d0af0870dc1919f4d49a61a8bf1deb6f6
+MISC metadata.xml 430 BLAKE2B 62d2f51b8599739f3b15b459084904ee4bd2a9736bbba7a093779aedc495586629f39f2f7511688f1f0898f27eb023acecf29ed921f56b70be921174f9bb17cc SHA512 b6fcb4818bfab07af559ff67912a956bffa0908ce29a91913088b86b7bea38e023ca1d407cacb30e48598e6d5fb5b851b72196eab5fbe7aa78362b976da535d9
diff --git a/app-vim/lightline/lightline-9999.ebuild b/app-vim/lightline/lightline-9999.ebuild
new file mode 100644
index 000000000000..a73386531e33
--- /dev/null
+++ b/app-vim/lightline/lightline-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/itchyny/lightline.vim/"
+else
+ SRC_URI="https://github.com/itchyny/${PN}.vim/archive/master.zip -> ${P}.zip"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: A light and configurable statusline/tabline"
+HOMEPAGE="https://github.com/itchyny/lightline.vim/"
+LICENSE="MIT"
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_compile() { :; }
diff --git a/app-vim/lightline/metadata.xml b/app-vim/lightline/metadata.xml
new file mode 100644
index 000000000000..3e87edaa71f7
--- /dev/null
+++ b/app-vim/lightline/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">itchyny/lightline.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/locateopen-1.3-r1 b/app-vim/locateopen-1.3-r1
deleted file mode 100644
index 96556dd6f7db..000000000000
--- a/app-vim/locateopen-1.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: open a file without supplying a path
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=858
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=vim
-RDEPEND=sys-apps/mlocate || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/locateopen-1.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/locateopen-1.3.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=c249ff1612970821eafb7379200c8208
diff --git a/app-vim/locateopen/Manifest b/app-vim/locateopen/Manifest
new file mode 100644
index 000000000000..d592150cbf90
--- /dev/null
+++ b/app-vim/locateopen/Manifest
@@ -0,0 +1,3 @@
+DIST locateopen-1.3.tar.bz2 1925 BLAKE2B fe9b4c7abc0fb26eaa75298368ae7b9440a2c6d7d25e94da80693de0f61517b50fb200536b488f485cfd3c4b243bb8abe5606dda12e07a8f6246bd644d74e8de SHA512 93d1f89eef3b877830a01a0fa609855108e3415836128d27f3b66fa6e3c57614a81e0cbcc984e39e0353883b7d8fec86c73f77a4c3f10a1cb8183b8be21a6dbe
+EBUILD locateopen-1.3-r1.ebuild 789 BLAKE2B e57d87d9e895eb0c948607d3e9925d698af6e0fa31b54ed702d4c9223ba0f4e5504680b35bcf459540adf63ed8d286e12ca6d5b8b942b5211a56e3dfb0fb3bcb SHA512 c4b981c1ae3250645e09aab373beb068a5f748b58f5f71c180bbfd8cf4d00e553ac9ca8be1b881bcba9695e8e9256f44a991dde90c1b746dc64149dadb5b77a4
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/locateopen/locateopen-1.3-r1.ebuild b/app-vim/locateopen/locateopen-1.3-r1.ebuild
new file mode 100644
index 000000000000..0074be8f297c
--- /dev/null
+++ b/app-vim/locateopen/locateopen-1.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: open a file without supplying a path"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=858"
+
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+RDEPEND="
+ ${RDEPEND}
+ sys-apps/mlocate"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides commands that hook vim into mlocate:
+\ :LocateEdit filename
+\ :LocateSplit filename
+\ :LocateSource filename
+\ :LocateRead filename
+To configure:
+\ :let g:locateopen_ignorecase = 1 \" enable ignore case mode
+\ :let g:locateopen_smartcase = 0 \" disable smart case mode
+\ :let g:locateopen_alwaysprompt = 1 \" show menu for one match"
diff --git a/app-vim/locateopen/metadata.xml b/app-vim/locateopen/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/locateopen/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/lustyexplorer-4.1 b/app-vim/lustyexplorer-4.1
deleted file mode 100644
index 3b366d4c285a..000000000000
--- a/app-vim/lustyexplorer-4.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: dynamic filesystem and buffer explorer
-EAPI=4
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1890
-KEYWORDS=~amd64 ~x86
-LICENSE=bufexplorer.vim
-RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/lustyexplorer-4.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/lustyexplorer-4.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=e948937dd1e98ab3536a63d68f0281fc
diff --git a/app-vim/lustyexplorer-4.3 b/app-vim/lustyexplorer-4.3
deleted file mode 100644
index 7259c87ce4cc..000000000000
--- a/app-vim/lustyexplorer-4.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: dynamic filesystem and buffer explorer
-EAPI=4
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1890
-KEYWORDS=~amd64 ~x86
-LICENSE=bufexplorer.vim
-RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/lustyexplorer-4.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/lustyexplorer-4.3.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=e948937dd1e98ab3536a63d68f0281fc
diff --git a/app-vim/lustyexplorer/Manifest b/app-vim/lustyexplorer/Manifest
new file mode 100644
index 000000000000..54d2f1d2e6c9
--- /dev/null
+++ b/app-vim/lustyexplorer/Manifest
@@ -0,0 +1,5 @@
+DIST lustyexplorer-4.1.tar.bz2 17098 BLAKE2B 6ede97cc83962d4bb95751a2a1a83c06178bc427e9ea2f10d4fcf235133b4ec2de5bc1f8fa8676bb555c0108be25b5e85f5ffd3351e8c6e3c6e81f021b22f091 SHA512 2f9af8c40f93333a4a734722a6ac6532fc05719165d730ac10bb0b3096a769a7a5fc2bb02fe0f457563b9ada69474265b1de6d5b3e2d9ca30503a704be496a86
+DIST lustyexplorer-4.3.tar.bz2 17373 BLAKE2B 643eb4c7573932fa63030766670d7c398e307b72e08e93e53e31b7f21086a80196c8d4d7811032b8b945306fcdc7d86d59eb6b48ce0b79f38e628d6b4bec7519 SHA512 24ffa1fe5c1698dfa6093c7cfed2f08540ce130258df5e8ec135356ecea4c1f607f11e643ab859f551e63ecbbf6fc8a615a9514e1d4798b752cc97146c29c661
+EBUILD lustyexplorer-4.1.ebuild 840 BLAKE2B a83cb9ad89137d7de6ee070a2002ee9e4b9e80f3dc8906574a04e6bde7099b5b66ffc1c49bb7fe3cb1010166a41776b8e22926b92a7d4f30cdf980be712328bd SHA512 7d0d188de896ad6be8e1f985c96dae0bb147c82500c3a7d7e839e2411adf4c9939723da829bc14dff30839a066980950b448c18945a577b4cb2e6aa4670e3a0f
+EBUILD lustyexplorer-4.3.ebuild 840 BLAKE2B a83cb9ad89137d7de6ee070a2002ee9e4b9e80f3dc8906574a04e6bde7099b5b66ffc1c49bb7fe3cb1010166a41776b8e22926b92a7d4f30cdf980be712328bd SHA512 7d0d188de896ad6be8e1f985c96dae0bb147c82500c3a7d7e839e2411adf4c9939723da829bc14dff30839a066980950b448c18945a577b4cb2e6aa4670e3a0f
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/lustyexplorer/lustyexplorer-4.1.ebuild b/app-vim/lustyexplorer/lustyexplorer-4.1.ebuild
new file mode 100644
index 000000000000..563cf2c9e83d
--- /dev/null
+++ b/app-vim/lustyexplorer/lustyexplorer-4.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: dynamic filesystem and buffer explorer"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1890"
+LICENSE="bufexplorer.vim"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="lusty-explorer.txt"
+
+RDEPEND="|| ( app-editors/vim[ruby] app-editors/gvim[ruby] )"
+
+src_prepare() {
+ # There's good documentation included with the script, but it's not
+ # in a helpfile. Since there's rather too much information to include
+ # in a VIM_PLUGIN_HELPTEXT, we'll sed ourselves a help doc.
+ mkdir "${S}"/doc
+ sed -e '0,/"$/d' -e '/" GetLatest.\+$/,9999d' -e 's/^" \?//' \
+ -e "s/\(Name Of File: \)\([^.]\+\)\.vim/\1*\2.txt*/" \
+ plugin/lusty-explorer.vim > doc/lusty-explorer.txt
+}
diff --git a/app-vim/lustyexplorer/lustyexplorer-4.3.ebuild b/app-vim/lustyexplorer/lustyexplorer-4.3.ebuild
new file mode 100644
index 000000000000..563cf2c9e83d
--- /dev/null
+++ b/app-vim/lustyexplorer/lustyexplorer-4.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: dynamic filesystem and buffer explorer"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=1890"
+LICENSE="bufexplorer.vim"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="lusty-explorer.txt"
+
+RDEPEND="|| ( app-editors/vim[ruby] app-editors/gvim[ruby] )"
+
+src_prepare() {
+ # There's good documentation included with the script, but it's not
+ # in a helpfile. Since there's rather too much information to include
+ # in a VIM_PLUGIN_HELPTEXT, we'll sed ourselves a help doc.
+ mkdir "${S}"/doc
+ sed -e '0,/"$/d' -e '/" GetLatest.\+$/,9999d' -e 's/^" \?//' \
+ -e "s/\(Name Of File: \)\([^.]\+\)\.vim/\1*\2.txt*/" \
+ plugin/lusty-explorer.vim > doc/lusty-explorer.txt
+}
diff --git a/app-vim/lustyexplorer/metadata.xml b/app-vim/lustyexplorer/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/lustyexplorer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/matrix-1.10-r1 b/app-vim/matrix-1.10-r1
deleted file mode 100644
index 608bc7b220a3..000000000000
--- a/app-vim/matrix-1.10-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Screensaver inspired by the Matrix
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1189
-KEYWORDS=amd64 ~mips ppc sparc x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/matrix-1.10.tar.bz2 https://dev.gentoo.org/~radhermit/vim/matrix-1.10.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=c09142ba42ab567619e86601beaceeea
diff --git a/app-vim/matrix/Manifest b/app-vim/matrix/Manifest
new file mode 100644
index 000000000000..3f4c2500ae8e
--- /dev/null
+++ b/app-vim/matrix/Manifest
@@ -0,0 +1,3 @@
+DIST matrix-1.10.tar.bz2 3365 BLAKE2B 71c8d4fe2117b4fa8fb31ba880b3af456f046d6f78bcec54107dab58bee1b733887752aba06f17fc6b4196ada40cc1ba7c5a7e4ddeafeeb5630f6ee1d8e44627 SHA512 9c268ced7b0a7e3117c88bfe005236f1fc61cfd74fa10d46318b739fe61a97f7bd856d125d69cf599a79efb8fb181d8876641cda65ae5dc80e4c650e7430fa85
+EBUILD matrix-1.10-r1.ebuild 431 BLAKE2B 5540aa537722fd860ea9bbc3ff4ebfaba11765d31148c5bcc0070d07a405ff66cb9402f9ffc6cbb3a3f19efa729ecb1ea70d7c2fb1ed9955701c3f50393cd5db SHA512 6c4fffbd235db17b2f593dd2e56b20d10ce2c42c285128c18b8f45251ffd0ebcfe191812a7b53426935a4e52d5f435dcd3872105a3c28c33dcc860cd5d4fc839
+MISC metadata.xml 401 BLAKE2B e62a9d3baf82371cfe83d16b48ff30e1e064087e79fad1afeee30e07f1e195e5142ee7364cd267eaea1967a34dbff097cd6033ea47e3db32c85f92cf6de88df5 SHA512 62867793f995b355e1dbb336bb5e2f2622ed6ee9467dead5b813c29c5667e4e1888c6c3ce09a2896acf31e95f0a849bce49529c959a4a209a871497fa8a9b614
diff --git a/app-vim/matrix/matrix-1.10-r1.ebuild b/app-vim/matrix/matrix-1.10-r1.ebuild
new file mode 100644
index 000000000000..91f50bb2f9ff
--- /dev/null
+++ b/app-vim/matrix/matrix-1.10-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Screensaver inspired by the Matrix"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1189"
+
+LICENSE="vim.org"
+KEYWORDS="amd64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides the :Matrix command. To exit the screensaver,
+press a key."
diff --git a/app-vim/matrix/metadata.xml b/app-vim/matrix/metadata.xml
new file mode 100644
index 000000000000..185b552dd34c
--- /dev/null
+++ b/app-vim/matrix/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ A Vim plugin which displays a screensaver based upon the falling green
+ symbols seen in the Matrix.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/merginal-2.0.2 b/app-vim/merginal-2.0.2
deleted file mode 100644
index 6541946e7c8d..000000000000
--- a/app-vim/merginal-2.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim script: fugitive extension to manage and merge git branches
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4955 https://github.com/idanarye/vim-merginal/
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/idanarye/vim-merginal/archive/2.0.2.tar.gz -> merginal-2.0.2.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=014e3acf956de31fa7e49229428d73f1
diff --git a/app-vim/merginal-2.1.0 b/app-vim/merginal-2.1.0
deleted file mode 100644
index df6ca20c70ef..000000000000
--- a/app-vim/merginal-2.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim script: fugitive extension to manage and merge git branches
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4955 https://github.com/idanarye/vim-merginal/
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/idanarye/vim-merginal/archive/2.1.0.tar.gz -> merginal-2.1.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=44179f50cf1c0d7728b3269dd26ee85f
diff --git a/app-vim/merginal-9999 b/app-vim/merginal-9999
deleted file mode 100644
index 9e6b0a2d36d8..000000000000
--- a/app-vim/merginal-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim script: fugitive extension to manage and merge git branches
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4955 https://github.com/idanarye/vim-merginal/
-LICENSE=vim
-RDEPEND=app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 8f6de46b0aa318aea0e8cac62ece098b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=44179f50cf1c0d7728b3269dd26ee85f
diff --git a/app-vim/merginal/Manifest b/app-vim/merginal/Manifest
new file mode 100644
index 000000000000..94d82ee04c23
--- /dev/null
+++ b/app-vim/merginal/Manifest
@@ -0,0 +1,6 @@
+DIST merginal-2.0.2.tar.gz 15048 BLAKE2B 0c69f383ccb076e49b1ffcd7e74944c30b0d5e61054d636873a6391b39e4da6f1613f0f0a43d79b986a4681e4e7bd27a37f872e21a0e3df4520355a646a0adcf SHA512 fd2162491e04afdcf9c81770a3082c035b32ecfd8808be035db64ba6ed4ed4076c692d067f261c093fe12b467e020bb7c6770deabecf72e6631e1248d569b721
+DIST merginal-2.1.0.tar.gz 13510 BLAKE2B c44f3873f36ee540e69f1cd87558e2601f944f430d15ae0e863adbba5383637ddbae2bee01cf1f7788f677a159da7870a83b909562813f8817d610e85f9d4a96 SHA512 3514c210a016d3446e73b7acc8a8a4cc2427e0133df81d7c644aaa1465e9c5945d3f46b7cac697f70cac990563e595305360991cdaa8244032167aea5f88eaed
+EBUILD merginal-2.0.2.ebuild 607 BLAKE2B 2428c2b690b515859198f6908e322c7e033162259b4e3cb5323a67df0c5f91541478d3d899f228b314fe71adb3766927092bf952faa23594108802e69dab9516 SHA512 74f35751efe11c57d54fd42ede098ff57f9736d76eea74cbc1ff047f0aa5a8a6ac37e91aef4079e4095ed60ec53c6caa493f8231c32a56d4142add3365f869be
+EBUILD merginal-2.1.0.ebuild 726 BLAKE2B 563099f5ecf0290cf8542523794ed261252dd979f006a5e65fb48e1abade837b66485d056681c2b2a849d1fdcb9c9f2c6f1cd8fa5cc7a1e564232fb73ffa7ab9 SHA512 0792f9864e98b518a3a5422e3d1803cb51921b12c60856553d97880aba8b75c95a9ee3f0906475c39461a6f3266e6df31e09c778f96d3ca7fce36670804d5895
+EBUILD merginal-9999.ebuild 726 BLAKE2B 563099f5ecf0290cf8542523794ed261252dd979f006a5e65fb48e1abade837b66485d056681c2b2a849d1fdcb9c9f2c6f1cd8fa5cc7a1e564232fb73ffa7ab9 SHA512 0792f9864e98b518a3a5422e3d1803cb51921b12c60856553d97880aba8b75c95a9ee3f0906475c39461a6f3266e6df31e09c778f96d3ca7fce36670804d5895
+MISC metadata.xml 345 BLAKE2B d484adbd45fa9339d6199f9978129adce0a8dc2ac1a8f0edf4dee62cd115a8043b0aadd6bc7708305516fd16caa6da8feeab3270f2e7f82bb751e916c0a2573e SHA512 c86f966d8b95d7ae380395af45af1046b3102e4c921f5a4102b4d421c707659b4e5aee25765b8af1e815cb5274963bdcae482cc4700d3196259e62ecaf6919ce
diff --git a/app-vim/merginal/merginal-2.0.2.ebuild b/app-vim/merginal/merginal-2.0.2.ebuild
new file mode 100644
index 000000000000..d74ee03f7bc0
--- /dev/null
+++ b/app-vim/merginal/merginal-2.0.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN=vim-${PN}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="vim script: fugitive extension to manage and merge git branches"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4955 https://github.com/idanarye/vim-merginal/"
+SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+RDEPEND="app-vim/fugitive"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ rm README.md || die
+ default
+}
diff --git a/app-vim/merginal/merginal-2.1.0.ebuild b/app-vim/merginal/merginal-2.1.0.ebuild
new file mode 100644
index 000000000000..fbe6b96d4612
--- /dev/null
+++ b/app-vim/merginal/merginal-2.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN=vim-${PN}
+MY_P=${MY_PN}-${PV}
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/idanarye/${MY_PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="vim script: fugitive extension to manage and merge git branches"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4955 https://github.com/idanarye/vim-merginal/"
+LICENSE="vim"
+
+RDEPEND="app-vim/fugitive"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_prepare() {
+ rm README.md || die
+ default
+}
diff --git a/app-vim/merginal/merginal-9999.ebuild b/app-vim/merginal/merginal-9999.ebuild
new file mode 100644
index 000000000000..fbe6b96d4612
--- /dev/null
+++ b/app-vim/merginal/merginal-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN=vim-${PN}
+MY_P=${MY_PN}-${PV}
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/idanarye/${MY_PN}.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/idanarye/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="vim script: fugitive extension to manage and merge git branches"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4955 https://github.com/idanarye/vim-merginal/"
+LICENSE="vim"
+
+RDEPEND="app-vim/fugitive"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_prepare() {
+ rm README.md || die
+ default
+}
diff --git a/app-vim/merginal/metadata.xml b/app-vim/merginal/metadata.xml
new file mode 100644
index 000000000000..bd94d1ea0754
--- /dev/null
+++ b/app-vim/merginal/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">idanarye/vim-merginal</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/metadata.xml b/app-vim/metadata.xml
new file mode 100644
index 000000000000..df7f60378d9b
--- /dev/null
+++ b/app-vim/metadata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ The app-vim category contains plugins, syntax file and spelling
+ packages for the Vim text editor.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie app-vim enthält Plugins und
+ Syntax-Pakete für den Vim Texteditor.
+ </longdescription>
+ <longdescription lang="es">
+ La categoría app-vim contiene extensiones y paquetes
+ de syntaxis para el editor de texto Vim.
+ </longdescription>
+ <longdescription lang="nl">
+ De app-vim categorie bevat plugins en syntax-bestanden
+ voor de vim text editor.
+ </longdescription>
+ <longdescription lang="vi">
+ Nhóm app-vim chứa các plugin và các gói syntax cho
+ trình soạn thảo văn bản Vim.
+ </longdescription>
+ <longdescription lang="it">
+ La categoria app-vim contiene estensioni e pacchetti di sintassi
+ per l'editor di testo Vim.
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria app-vim contém plugins e pacotes de sintaxe e grafia
+ para o editor de texto Vim.
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria app-vim zawiera rozszerzenia, schematy podświetlania składni
+ oraz dodatki służące do sprawdzania pisowni dla edytora tekstu Vim.
+ </longdescription>
+</catmetadata>
+
diff --git a/app-vim/minibufexpl-6.5.2 b/app-vim/minibufexpl-6.5.2
deleted file mode 100644
index e1ac0bb54edd..000000000000
--- a/app-vim/minibufexpl-6.5.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: easily switch between buffers
-EAPI=6
-HOMEPAGE=https://github.com/fholgado/minibufexpl.vim
-KEYWORDS=amd64 ~mips ppc x86
-LICENSE=bufexplorer.vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/fholgado/minibufexpl.vim/archive/v6.5.2.tar.gz -> minibufexpl-6.5.2.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=876f5ce1814b6c0be3e352350f823690
diff --git a/app-vim/minibufexpl/Manifest b/app-vim/minibufexpl/Manifest
new file mode 100644
index 000000000000..533e6c51db44
--- /dev/null
+++ b/app-vim/minibufexpl/Manifest
@@ -0,0 +1,3 @@
+DIST minibufexpl-6.5.2.tar.gz 32119 BLAKE2B 01809246c81fcc2b346e7bdc2dc114c5a80cae2e58bce54c1d2f9411980d31e4a5d0a8d434dff58d284555084e95d90079492c8ad956ad2aab9dabf03186bbf3 SHA512 325fb58b025392c5484574c4988ec95eb7374a10b67a4abe28857a0ae8d768316ef4d477b51bf442ffc1bcfb5f68dfd0c924731291b155192731055fed3569d1
+EBUILD minibufexpl-6.5.2.ebuild 556 BLAKE2B 310ceaf25b17183aef9f3d4e3b774d8e71b9959cff52fc4d222f276b2a7bcdb85b480de244e56d0b4cfe0b91357b6c0864f9e676b1ac545fee641bea5933f8f9 SHA512 d2e2392d480e3f29f25dfd2e32d4ae0748005ccaa67e625145ec0129cbfd238befe475dcbf65df961f55bfcc3fd96db52e6a3c63ae2cb7eb932781dce24cf314
+MISC metadata.xml 348 BLAKE2B bb28b16a400b2124035252bc397c76c1128f8225fd2823b757392f3b93ee7a2d1dc1948cd70edb2285a7ab0eb2925421a0e5e9ff9573e6201f1227d03549599a SHA512 9e05112037982ea5d6cf6b3b63fc0782221cf2ebc9e779baabe56f3463c2bb436fd7d0de4f5afac67ec59d12913feb9671d640fd78689efb16eb8aacc87beefb
diff --git a/app-vim/minibufexpl/metadata.xml b/app-vim/minibufexpl/metadata.xml
new file mode 100644
index 000000000000..d75188e58923
--- /dev/null
+++ b/app-vim/minibufexpl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">fholgado/minibufexpl.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/minibufexpl/minibufexpl-6.5.2.ebuild b/app-vim/minibufexpl/minibufexpl-6.5.2.ebuild
new file mode 100644
index 000000000000..ae8944a0310d
--- /dev/null
+++ b/app-vim/minibufexpl/minibufexpl-6.5.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN="${PN}.vim"
+DESCRIPTION="vim plugin: easily switch between buffers"
+HOMEPAGE="https://github.com/fholgado/minibufexpl.vim"
+SRC_URI="https://github.com/fholgado/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="bufexplorer.vim"
+KEYWORDS="amd64 ~mips ppc x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+src_prepare() {
+ default
+
+ # discard unwanted files
+ rm .gitignore README.md || die
+}
diff --git a/app-vim/molokai-0.1_p20151115 b/app-vim/molokai-0.1_p20151115
deleted file mode 100644
index 309acfdcc32b..000000000000
--- a/app-vim/molokai-0.1_p20151115
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: molokai color scheme
-EAPI=6
-HOMEPAGE=https://github.com/tomasr/molokai
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tomasr/molokai/archive/c67bdfcdb31415aa0ade7f8c003261700a885476.tar.gz -> molokai-0.1_p20151115.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=38b721b74bea69a106ca909a4071ed8a
diff --git a/app-vim/molokai/Manifest b/app-vim/molokai/Manifest
new file mode 100644
index 000000000000..0eb10ccf31a8
--- /dev/null
+++ b/app-vim/molokai/Manifest
@@ -0,0 +1,3 @@
+DIST molokai-0.1_p20151115.tar.gz 3817 BLAKE2B 595691992ab2e1820afa105ee23a123f28db7c5bca80e5b99e87b7b3b081d1d1e10f9db81686bcc98ef79042118f119b0ae191ca9e7a7b8004b95267f35dfef8 SHA512 8ba5821dfae8c723185999d038142b2061b01ec8c9c6340fd082bac0bdf78d2fcc21a8e3103f20b58bc60c38ed62966376903e85f5b9b49947d38c8c34d14908
+EBUILD molokai-0.1_p20151115.ebuild 413 BLAKE2B 5612f0535876b2bb160dc63e4fd323d4ea5c804f1db8a3d9eba470e51a859ec6927a055ff0416ad1bfe623f6cb2c5e9fade311e8e77edbe9ca5f5fbb87b24194 SHA512 164b52b698b44b950402d16e401670b06c99bfe98d592cd2b03a14bbe1f686edefd53be09081477bdcb093687c2f670b5d882b5fc73de57777adfb284b4d1138
+MISC metadata.xml 328 BLAKE2B b6667a882bb103dc34b08fc6a6384f0e9264de371f5b9eeb1a62b46978e66b0821f9e461935f0b3fdaaab129c6e30c93cc8c730151dd078a9eb3d7423a9fc653 SHA512 06b187681e64b1cdea061d8a24e96cc2f55cd18ecb8dc7235a790670cb76f5a1b6cadd571bafb1c8a23ae2e9f77935972e543be6b274cc6cef148df381c84717
diff --git a/app-vim/molokai/metadata.xml b/app-vim/molokai/metadata.xml
new file mode 100644
index 000000000000..51e9088578cb
--- /dev/null
+++ b/app-vim/molokai/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">tomasr/molokai</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/molokai/molokai-0.1_p20151115.ebuild b/app-vim/molokai/molokai-0.1_p20151115.ebuild
new file mode 100644
index 000000000000..bd91b3a6c22c
--- /dev/null
+++ b/app-vim/molokai/molokai-0.1_p20151115.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin vcs-snapshot
+
+COMMIT="c67bdfcdb31415aa0ade7f8c003261700a885476"
+
+DESCRIPTION="vim plugin: molokai color scheme"
+
+HOMEPAGE="https://github.com/tomasr/molokai"
+SRC_URI="https://github.com/tomasr/molokai/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="vim"
+KEYWORDS="amd64 x86"
diff --git a/app-vim/multiplesearch-1.3 b/app-vim/multiplesearch-1.3
deleted file mode 100644
index 811b83497e32..000000000000
--- a/app-vim/multiplesearch-1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: allows multiple highlighted searches
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=479
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=9276 -> multiplesearch-1.3.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=9387a79732b5e2d1a977ad5f76554ca3
diff --git a/app-vim/multiplesearch/Manifest b/app-vim/multiplesearch/Manifest
new file mode 100644
index 000000000000..7e6097ef5edf
--- /dev/null
+++ b/app-vim/multiplesearch/Manifest
@@ -0,0 +1,3 @@
+DIST multiplesearch-1.3.zip 6500 BLAKE2B 6ef00cdc03b46f714ced36e38e7928ccdccb2821c09d35e08fda77520b3f7ea612ca2f7818aba19d2d9b0baa1ab5fc4268b547973cc058557f618e1d5ee56739 SHA512 015e5744c0b0c496ca9263c901f29d66ea8edb75de6d39eb5b4956d977b1714611fda199be730fd77f6a9c0ceb0fe0cd74744ba3853b747f33bcdc8af92e7235
+EBUILD multiplesearch-1.3.ebuild 489 BLAKE2B 9b72f40caec4b05f9ab86b0249dc177db313e88930d0600462a23dd3d5fedd03c7f198693741b6f2ceff571ca2495e1d6da574c8c17e24d000b8d15c4790aefc SHA512 2b556dde6e5feb7e6951ba931c5f9be3072cab7d941c22e6c6c89c9ca3f11cd008b5ae230b4bdaa21270d7e84663cd5786cb80922fd9ad509ff9a5cdfab99101
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/multiplesearch/metadata.xml b/app-vim/multiplesearch/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/multiplesearch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/multiplesearch/multiplesearch-1.3.ebuild b/app-vim/multiplesearch/multiplesearch-1.3.ebuild
new file mode 100644
index 000000000000..23969f4db751
--- /dev/null
+++ b/app-vim/multiplesearch/multiplesearch-1.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: allows multiple highlighted searches"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=479"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=9276 -> ${P}.zip"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+
+VIM_PLUGIN_HELPFILES="MultipleSearch.txt"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}
diff --git a/app-vim/multvals-3.10-r1 b/app-vim/multvals-3.10-r1
deleted file mode 100644
index 81833dbb1e91..000000000000
--- a/app-vim/multvals-3.10-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: library for helping with arrays
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=171
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/multvals-3.10.tar.bz2 https://dev.gentoo.org/~radhermit/vim/multvals-3.10.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=a7ecfd9ffeb409f31fd57e92845c26c8
diff --git a/app-vim/multvals/Manifest b/app-vim/multvals/Manifest
new file mode 100644
index 000000000000..970221e9949b
--- /dev/null
+++ b/app-vim/multvals/Manifest
@@ -0,0 +1,3 @@
+DIST multvals-3.10.tar.bz2 12299 BLAKE2B 83a38101e7f43768af2682187279456ee3c131acb78b1d152de7978ebfea183cec86239a7cf2d76d1602a593f3c46f709b2194f7d2783dbe7fea636f7db3c262 SHA512 6003b7fd2c16ae7b6ee400482aead44a5b7867d9e010d689b1b25452f78f4a84335a257eef56deba241fae8967e57b877132693b1ded1b4b01c0248da472152f
+EBUILD multvals-3.10-r1.ebuild 447 BLAKE2B 8871a703bf84a6ba6673c26fe06ce4e9cd91a18ed6736572d98a8806191c983289656dbd24b6a6c2ab36320d3b7de5120b1d62443f04d9b8065ba37b5159136b SHA512 a8074c167f866069c500b53da88bceaf68372e94b02ed6b63317fb674cc45049983a764190247df64107519fedc796e3ec53e04f884bbce8befc2996c5f9a9a7
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/multvals/metadata.xml b/app-vim/multvals/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/multvals/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/multvals/multvals-3.10-r1.ebuild b/app-vim/multvals/multvals-3.10-r1.ebuild
new file mode 100644
index 000000000000..99c87201ac8f
--- /dev/null
+++ b/app-vim/multvals/multvals-3.10-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: library for helping with arrays"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=171"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides library functions and is not intended to be used
+directly by the user."
diff --git a/app-vim/nagios-syntax-1.8 b/app-vim/nagios-syntax-1.8
deleted file mode 100644
index 22c7e620cb71..000000000000
--- a/app-vim/nagios-syntax-1.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Nagios configuration files syntax
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2261
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/nagios-syntax-1.8.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=c37c7467aa2d0916a142cc67a477c7bb
diff --git a/app-vim/nagios-syntax/Manifest b/app-vim/nagios-syntax/Manifest
new file mode 100644
index 000000000000..d7ce01e42909
--- /dev/null
+++ b/app-vim/nagios-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST nagios-syntax-1.8.tar.gz 1737 BLAKE2B 73f3b40b4e79d3449cc0f62e88efa5e7d2085db6050f05a5dd774a375a477f22844c8b5603fd89aa676bc26e90d4ad21ebc377c11c05a67909d0b65e1861983e SHA512 53a17c521a66a42f0082e6a963059ff96ed5f899e2be4c50ab68cbf237d1ca6bec8476b798b4a99563a8fdd6dc6ef632de19399b5aad12bad586f0cf0161f76f
+EBUILD nagios-syntax-1.8.ebuild 554 BLAKE2B ff066fc273b15ea38db7a4b83ba00dffd4e5d72fa8ca46ab4672a765bc6c113eb87c558d82590628d0c7cde4a9fcce17a8982d87d1ca53cba25ac9b49ecd4487 SHA512 13a7c9cfb509795a07d7f4016f7673d7788162ccd316fbe8d80f998e76bd1f8518dc3143c6cc05353efce72ee42d8e5326a54d18e93c1f40b16d3cb0345c49ce
+MISC metadata.xml 452 BLAKE2B 6f55d99e5936a8deeef449a45d4a35a4ae34e6d7fa10c642153b4c815dcbffa29574dd68cb1923a61f04885a7521dc56f384550d4a85f8d58ac4830bf15fbe35 SHA512 9cab1433b109d4ee6a223b5da40a276e330cb97ea4a48a570e399ebf939de36623f052bd222c0f957cf3c7ddddd7c380d2b5a711867be32de059006d48d85b9b
diff --git a/app-vim/nagios-syntax/metadata.xml b/app-vim/nagios-syntax/metadata.xml
new file mode 100644
index 000000000000..c9bbb2b6e814
--- /dev/null
+++ b/app-vim/nagios-syntax/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ This package provides Vim syntax highlighting for Nagios configuration
+ files, and automatic filetype detection for these files based upon
+ filename.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild b/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild
new file mode 100644
index 000000000000..37286c2a11f0
--- /dev/null
+++ b/app-vim/nagios-syntax/nagios-syntax-1.8.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Nagios configuration files syntax"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2261"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="vim.org"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for Nagios configuration
+files. Detection is by filename (/etc/nagios/)."
diff --git a/app-vim/neocomplcache-7.1 b/app-vim/neocomplcache-7.1
deleted file mode 100644
index cb5bcf064f59..000000000000
--- a/app-vim/neocomplcache-7.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: ultimate auto completion system
-EAPI=4
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2620
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/neocomplcache-7.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/neocomplcache-7.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=cb6789b26882587c7387f36322c3e1bd
diff --git a/app-vim/neocomplcache-7.1-r1 b/app-vim/neocomplcache-7.1-r1
deleted file mode 100644
index 0e85f0ddf3fa..000000000000
--- a/app-vim/neocomplcache-7.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: ultimate auto completion system
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2620
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/neocomplcache-7.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/neocomplcache-7.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=c4275374cb10cd5ad826e18cc1f7468f
diff --git a/app-vim/neocomplcache/Manifest b/app-vim/neocomplcache/Manifest
new file mode 100644
index 000000000000..60743b07dc30
--- /dev/null
+++ b/app-vim/neocomplcache/Manifest
@@ -0,0 +1,4 @@
+DIST neocomplcache-7.1.tar.bz2 73724 BLAKE2B 16c04762164c6b086b4683bba71073eaed0a21b003f7d42bb7e4d5a7a1767f982b80840c229402312622e2f9b3f5c9a0759bfc8ece3b320ab38d94c406453cf9 SHA512 1ed17243722055a08bfda6b3e5524870d55377dd5998cbc5677f673974eebf5ee4019975e6b66c12c8ce5ff804d5c1512e69b7f53f56c1bb6f87638025a3210b
+EBUILD neocomplcache-7.1-r1.ebuild 415 BLAKE2B 1befd69348909cf5b299a312208ee5f0e26a58489fd9f11e1a02859c4ed713c43803888c0342a56a06487e21ac348e3cb8900f6b9052e5fa16a3c97569a890f5 SHA512 d252c5978d7e51298c84f71a5e7b50fea7a31f7b9968b94d9c6f23480573ce9f5b39075ff061457e91df9d0e56f7612fe15b2f3008fbc59467d34edf3a2c97e8
+EBUILD neocomplcache-7.1.ebuild 336 BLAKE2B 4d96faaf4563a59e747278b96d9bc20c68acfc60f9218a8f7bbebaff169499ed229b7a59a257396736458c084179c3ee0bdaab1e766904596d5bbb12584daafa SHA512 b8b71334c04e4cca889fbd3682dcb9d9c8220ccf0c8a1904f8413dc79e85d0dd540be9f25801279f8a35714d8760f474db555acc0f8550971c651fa6de7b01e8
+MISC metadata.xml 349 BLAKE2B 7c4db2d8de75be71de1de92126b543ad0a522c95d23c3a97422c02ca8dbc9dcf1211af15b32809ea4d39be09e8c89e323ed1f15cf851fc4c877fa34611b5faee SHA512 2fbc0b0ecbd013d0c7dbc2e4cfe560d46beecb157052c05635c25d9ebb836a4969879b121a07c429699d454350ddb2aaa97cdcc0e9a5e36d52eea2964df392be
diff --git a/app-vim/neocomplcache/metadata.xml b/app-vim/neocomplcache/metadata.xml
new file mode 100644
index 000000000000..077f19f1d9ba
--- /dev/null
+++ b/app-vim/neocomplcache/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">vim-scripts/neocomplcache</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/neocomplcache/neocomplcache-7.1-r1.ebuild b/app-vim/neocomplcache/neocomplcache-7.1-r1.ebuild
new file mode 100644
index 000000000000..ea0fa5e98735
--- /dev/null
+++ b/app-vim/neocomplcache/neocomplcache-7.1-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: ultimate auto completion system"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2620"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+ default
+
+ mv autoload/vital.vim "autoload/${PN}vital.vim" || die
+}
diff --git a/app-vim/neocomplcache/neocomplcache-7.1.ebuild b/app-vim/neocomplcache/neocomplcache-7.1.ebuild
new file mode 100644
index 000000000000..2e6bd637060e
--- /dev/null
+++ b/app-vim/neocomplcache/neocomplcache-7.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: ultimate auto completion system"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2620"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/nerdcommenter-2.5.0 b/app-vim/nerdcommenter-2.5.0
deleted file mode 100644
index 74b5af65d905..000000000000
--- a/app-vim/nerdcommenter-2.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: easy commenting of code for many filetypes
-EAPI=6
-HOMEPAGE=https://github.com/scrooloose/nerdcommenter https://www.vim.org/scripts/script.php?script_id=1218
-KEYWORDS=amd64 x86 ~x86-linux ~x86-macos ~sparc64-solaris
-LICENSE=WTFPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/scrooloose/nerdcommenter/archive/2.5.0.tar.gz -> nerdcommenter-2.5.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=4d22c30a06cecd6ea51efd83a53da3b7
diff --git a/app-vim/nerdcommenter-2.5.1 b/app-vim/nerdcommenter-2.5.1
deleted file mode 100644
index da8d7bcde8f2..000000000000
--- a/app-vim/nerdcommenter-2.5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: easy commenting of code for many filetypes
-EAPI=6
-HOMEPAGE=https://github.com/scrooloose/nerdcommenter https://www.vim.org/scripts/script.php?script_id=1218
-KEYWORDS=~amd64 ~x86 ~x86-linux ~x86-macos ~sparc64-solaris
-LICENSE=WTFPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/scrooloose/nerdcommenter/archive/2.5.1.tar.gz -> nerdcommenter-2.5.1.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=5e68fb8c994340d740ca824b691cd320
diff --git a/app-vim/nerdcommenter-9999 b/app-vim/nerdcommenter-9999
deleted file mode 100644
index ee0b53d1a5c2..000000000000
--- a/app-vim/nerdcommenter-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: easy commenting of code for many filetypes
-EAPI=6
-HOMEPAGE=https://github.com/scrooloose/nerdcommenter https://www.vim.org/scripts/script.php?script_id=1218
-LICENSE=WTFPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 8f6de46b0aa318aea0e8cac62ece098b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=5e68fb8c994340d740ca824b691cd320
diff --git a/app-vim/nerdcommenter/Manifest b/app-vim/nerdcommenter/Manifest
new file mode 100644
index 000000000000..2eac4cd5796b
--- /dev/null
+++ b/app-vim/nerdcommenter/Manifest
@@ -0,0 +1,6 @@
+DIST nerdcommenter-2.5.0.tar.gz 36834 BLAKE2B 517988392e0ac508f18819a088588d3ede50b634268109ec2c67907c663fb6713b55f45cd2562236c481dea86793ab5999a480f2be309e12cb43b5ccbb34d552 SHA512 8616f56d90dfe2fece0a82b888700c4c762c75b7d1cd30e32a3294d1fe7b65d506a13cfead534ae0f11a2384593d246a723e9a0042421691a5d6fb44969e7ead
+DIST nerdcommenter-2.5.1.tar.gz 36889 BLAKE2B 997fa853ea3b6950de864afc1bd7777a71085154dee484ad07b03e8d0da101151f5df5c4ffc4404714c95c7632ac7678e18eb0ef72d238403c708f7faed8aff2 SHA512 84638a3b216f7bc1535030eed8d766c30d5d7de7f6339fdb9bde65561abfa7f1f660cfa81dc057ee2d146af6df26076880b057a7ff7868e9bc55ab53291e9445
+EBUILD nerdcommenter-2.5.0.ebuild 700 BLAKE2B ce6a3b2077cc5af0638b6b9b3f85b26ee87c6797e45f43d1966c94cdd8a5739d12717bddaeea96935a546ebcf9398caae8bee9d87aff7b912026c86d7adf81a3 SHA512 ec7d771ebc2e4a446a1698ae1e145bea999a7d1969f2052a081dc41792267a55e0df334ec67db20af70815560c4966564bd1a876c89468dcc2cd30e20e95646e
+EBUILD nerdcommenter-2.5.1.ebuild 702 BLAKE2B 23d6be5ab27752b61d4e05683a7ee75b2215e4634fa19cfc168ada658e9bd9dd9ad13a2f195fcde897c5b90bc3f6ccdd2ad6a47b50141b3c6088342ae1f55671 SHA512 d40dffb035f647352c2027e0a02324c061432d869a87801e303adef3b3eaa83d259cb803541ff44da16eb2e6c69f7f470e6a73a0e3953345741310446ad070f6
+EBUILD nerdcommenter-9999.ebuild 702 BLAKE2B 23d6be5ab27752b61d4e05683a7ee75b2215e4634fa19cfc168ada658e9bd9dd9ad13a2f195fcde897c5b90bc3f6ccdd2ad6a47b50141b3c6088342ae1f55671 SHA512 d40dffb035f647352c2027e0a02324c061432d869a87801e303adef3b3eaa83d259cb803541ff44da16eb2e6c69f7f470e6a73a0e3953345741310446ad070f6
+MISC metadata.xml 338 BLAKE2B 654c3b28cc5544f0f9b62d9b6c75f5e3a87e6e13e775ab2d4d0c65a276403c1b8cb0c3e49c72aed4564c39561a395d2dc621efbfb158caa1c28b1cdb79cc7800 SHA512 fd7585ceac792841d94bd11039d0f2367ecbb2a5d297213b6679aecd22a3f64d64f627421e3447ae6f01035bfb1ab7208b5d0c53a9d402085c9c5bf48b43eedc
diff --git a/app-vim/nerdcommenter/metadata.xml b/app-vim/nerdcommenter/metadata.xml
new file mode 100644
index 000000000000..d44387bc0e20
--- /dev/null
+++ b/app-vim/nerdcommenter/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">scrooloose/nerdcommenter</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/nerdcommenter/nerdcommenter-2.5.0.ebuild b/app-vim/nerdcommenter/nerdcommenter-2.5.0.ebuild
new file mode 100644
index 000000000000..7d944d15a29a
--- /dev/null
+++ b/app-vim/nerdcommenter/nerdcommenter-2.5.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/scrooloose/nerdcommenter.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 x86 ~x86-linux ~x86-macos ~sparc64-solaris"
+fi
+
+DESCRIPTION="vim plugin: easy commenting of code for many filetypes"
+HOMEPAGE="https://github.com/scrooloose/nerdcommenter https://www.vim.org/scripts/script.php?script_id=1218"
+LICENSE="WTFPL-2 "
+
+VIM_PLUGIN_HELPFILES="NERD_commenter.txt"
+
+src_prepare() {
+ default
+ rm README.md Rakefile || die
+}
diff --git a/app-vim/nerdcommenter/nerdcommenter-2.5.1.ebuild b/app-vim/nerdcommenter/nerdcommenter-2.5.1.ebuild
new file mode 100644
index 000000000000..e698dd51a16b
--- /dev/null
+++ b/app-vim/nerdcommenter/nerdcommenter-2.5.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/scrooloose/nerdcommenter.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-macos ~sparc64-solaris"
+fi
+
+DESCRIPTION="vim plugin: easy commenting of code for many filetypes"
+HOMEPAGE="https://github.com/scrooloose/nerdcommenter https://www.vim.org/scripts/script.php?script_id=1218"
+LICENSE="WTFPL-2 "
+
+VIM_PLUGIN_HELPFILES="NERD_commenter.txt"
+
+src_prepare() {
+ default
+ rm README.md Rakefile || die
+}
diff --git a/app-vim/nerdcommenter/nerdcommenter-9999.ebuild b/app-vim/nerdcommenter/nerdcommenter-9999.ebuild
new file mode 100644
index 000000000000..e698dd51a16b
--- /dev/null
+++ b/app-vim/nerdcommenter/nerdcommenter-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/scrooloose/nerdcommenter.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-macos ~sparc64-solaris"
+fi
+
+DESCRIPTION="vim plugin: easy commenting of code for many filetypes"
+HOMEPAGE="https://github.com/scrooloose/nerdcommenter https://www.vim.org/scripts/script.php?script_id=1218"
+LICENSE="WTFPL-2 "
+
+VIM_PLUGIN_HELPFILES="NERD_commenter.txt"
+
+src_prepare() {
+ default
+ rm README.md Rakefile || die
+}
diff --git a/app-vim/nerdtree-5.0.0 b/app-vim/nerdtree-5.0.0
deleted file mode 100644
index c11ea1de6098..000000000000
--- a/app-vim/nerdtree-5.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: A tree explorer plugin for navigating the filesystem
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=WTFPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/scrooloose/nerdtree/archive/5.0.0.tar.gz -> nerdtree-5.0.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=aa7b7de7c07a080c01de3f9ff71043ed
diff --git a/app-vim/nerdtree-9999 b/app-vim/nerdtree-9999
deleted file mode 100644
index 236b8a5c3fa3..000000000000
--- a/app-vim/nerdtree-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: A tree explorer plugin for navigating the filesystem
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree
-LICENSE=WTFPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 8f6de46b0aa318aea0e8cac62ece098b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=c881dc56654796fc990e9484a1094f97
diff --git a/app-vim/nerdtree-tabs-1.4.7 b/app-vim/nerdtree-tabs-1.4.7
deleted file mode 100644
index 49e47ff2ea7f..000000000000
--- a/app-vim/nerdtree-tabs-1.4.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: NERDTree and tabs in vim
-EAPI=6
-HOMEPAGE=https://github.com/jistr/vim-nerdtree-tabs
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=app-vim/nerdtree || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/jistr/vim-nerdtree-tabs/archive/v1.4.7.tar.gz -> nerdtree-tabs-1.4.7.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=562dbab2a9dda102b4d82dfee3ed66a0
diff --git a/app-vim/nerdtree-tabs/Manifest b/app-vim/nerdtree-tabs/Manifest
new file mode 100644
index 000000000000..1539ccaf230d
--- /dev/null
+++ b/app-vim/nerdtree-tabs/Manifest
@@ -0,0 +1,3 @@
+DIST nerdtree-tabs-1.4.7.tar.gz 11135 BLAKE2B 0c2e5a5616a7e4a22600d20f0d759e95755194a3d867034e3c1f66025f3e19c1df0b38f34f99f7ba2a2ba640000543db5e29096b705d51f5c98098965fa9c562 SHA512 f11172f0f64628752c7b523c7f65864a35b57ac83c966dd765402489c52b78c6a86bca65b99f788f2abf0b3d489e188dcfc9e75b342818dacbae221930aa6449
+EBUILD nerdtree-tabs-1.4.7.ebuild 505 BLAKE2B 6abe437598610432e6872c5f382c9f98064ced90b20ade4cc8237579c5edc4b2192c9562a3420658fc271b6275775af3608e3fa7f7220da9cc835756b152b3bb SHA512 31fb9e6a514fd90aedec1784c655584618b52ddfcdb4beba3bc4cad7450fdcbdcae56c522217b4388970653914fd2cb2dc4eed5feb4ea9ca494f4a4ca3317953
+MISC metadata.xml 432 BLAKE2B af435bf8c76e3068c6d3ebd86379779b6ac4322c5b84ae89ea6da203524d0de8137661bb7a183eb37b4086ffddb7c25f0b0d136184f3aeade22ec26e02cce474 SHA512 52c60fed04ea58d04749f4c9c645b252b83b4b8ddd0b6b813329b2be250e78a2f7a55c71a737288cd1f832922da54f5ea7eb5ac0bc3b3350494f7ada6e480b39
diff --git a/app-vim/nerdtree-tabs/metadata.xml b/app-vim/nerdtree-tabs/metadata.xml
new file mode 100644
index 000000000000..345b182b51ca
--- /dev/null
+++ b/app-vim/nerdtree-tabs/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">jistr/vim-nerdtree-tabs</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/nerdtree-tabs/nerdtree-tabs-1.4.7.ebuild b/app-vim/nerdtree-tabs/nerdtree-tabs-1.4.7.ebuild
new file mode 100644
index 000000000000..85793d95a23d
--- /dev/null
+++ b/app-vim/nerdtree-tabs/nerdtree-tabs-1.4.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: NERDTree and tabs in vim"
+HOMEPAGE="https://github.com/jistr/vim-nerdtree-tabs"
+SRC_URI="https://github.com/jistr/vim-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="app-vim/nerdtree"
+
+S="${WORKDIR}/vim-${P}"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_prepare() {
+ default
+ rm LICENSE README.md || die
+}
diff --git a/app-vim/nerdtree/Manifest b/app-vim/nerdtree/Manifest
new file mode 100644
index 000000000000..86c4fab7baea
--- /dev/null
+++ b/app-vim/nerdtree/Manifest
@@ -0,0 +1,4 @@
+DIST nerdtree-5.0.0.tar.gz 56162 BLAKE2B d4451ae6968454c6281e63233db13f0c5c834eab1a69662b2850d0cfa91f7255a51cbe5113c16224a57eef86862a032607c6eb1a7cc300af169491ce40e9cebe SHA512 7de6e7978604e89e2c03cadf74ff4a57545ff73a643039fdfe76f277e773374b5b5f9bbd5d8f3307df4af867f88fc687f9bb5e28ff9e90d11fecdef8bdb83d1a
+EBUILD nerdtree-5.0.0.ebuild 523 BLAKE2B db5eba02fb0e36219d1f5dcf163405599417964731240b80e8b299539a3a2475a6c9ef5ec3d05831f1af527cedd37a8f3d9cb1bd125d30f1b9151d9280e3592a SHA512 629735c0c41c0ec4ebec6b7ac4795402ba64c635af602ea9f6bee6e4526a5aa8cbf2705d99583e519850064348787f260b7223b05b94ad5a28b33d7f5c5268a5
+EBUILD nerdtree-9999.ebuild 668 BLAKE2B fc7d8bb32d825138c13e015ca6ca531caa547fa87ec87dc61bacf0897e8259ea675d6509ae7768ace8231dc29d2c99fe7cb236cf83a061857525195d3afb4398 SHA512 c6f79c9053a1f4dd98fb25345adfc992765544638402df0e0e6494cc5230d7901df53399eb9279b35d8d9064ebcca1e829a321ba1ad429af48f175a9efa7b247
+MISC metadata.xml 333 BLAKE2B de49a7c07d2268dc5550bd2bc842240e53a087e370a093dc08a5360b157e0411cc9dc99e210f1012afeee6123a55f46fda13187a9e6d857b5429e336f5ef6ae8 SHA512 703134609bdd4d7ed256d4c6e3f045fec2ad056d0348af8e97bf6513c5e63139ce0084e8ebca8fe56c925d5ad7fb7146256f932094ee21846a0f8915f0dc5dea
diff --git a/app-vim/nerdtree/metadata.xml b/app-vim/nerdtree/metadata.xml
new file mode 100644
index 000000000000..4167319572b2
--- /dev/null
+++ b/app-vim/nerdtree/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">scrooloose/nerdtree</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/nerdtree/nerdtree-5.0.0.ebuild b/app-vim/nerdtree/nerdtree-5.0.0.ebuild
new file mode 100644
index 000000000000..d01ff3cf26ae
--- /dev/null
+++ b/app-vim/nerdtree/nerdtree-5.0.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: A tree explorer plugin for navigating the filesystem"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree"
+SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="WTFPL-2"
+KEYWORDS="amd64 x86 ~x64-macos"
+
+VIM_PLUGIN_HELPFILES="NERD_tree"
+
+src_prepare() {
+ rm LICENCE || die
+}
diff --git a/app-vim/nerdtree/nerdtree-9999.ebuild b/app-vim/nerdtree/nerdtree-9999.ebuild
new file mode 100644
index 000000000000..249a0a771d90
--- /dev/null
+++ b/app-vim/nerdtree/nerdtree-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/scrooloose/nerdtree.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="vim plugin: A tree explorer plugin for navigating the filesystem"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree"
+LICENSE="WTFPL-2"
+
+VIM_PLUGIN_HELPFILES="NERD_tree"
+
+src_prepare() {
+ rm LICENCE screenshot.png || die
+ default
+}
diff --git a/app-vim/nginx-syntax-0.3.3 b/app-vim/nginx-syntax-0.3.3
deleted file mode 100644
index 22b3fa04da06..000000000000
--- a/app-vim/nginx-syntax-0.3.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Nginx configuration files syntax
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1886
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/nginx-syntax-0.3.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/nginx-syntax-0.3.3.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=ca2ae5c96ea54b6b6be2d18cfbc53332
diff --git a/app-vim/nginx-syntax/Manifest b/app-vim/nginx-syntax/Manifest
new file mode 100644
index 000000000000..136f2e97626a
--- /dev/null
+++ b/app-vim/nginx-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST nginx-syntax-0.3.3.tar.bz2 5675 BLAKE2B d642a6f34b10f1f4d32c772a3c434e30cba5a26c03234c76658c15a9216723a12893414699db9c998e31445c658db0d33db0e4967713b2863b73e71a059e09e3 SHA512 0142c9b825b9f9c262145c0d202651f020e5b3f3f3548ecbdd713cf66c5f7098b974e7d16eedfa9d722c2efdfbd9732097bf8b293a610a64c21571ec66a5886d
+EBUILD nginx-syntax-0.3.3.ebuild 355 BLAKE2B de8ff25a6ab1c969c10868a3165c9025069667bb2373924aed59d0c69f0d15578328f112e549f82c6b9828710fbb804919c0b8471fca67b9270f79cee3e33f2c SHA512 c098336b0a7932e64eac0d4c7727a3f5c2b557cab8a3a851d409fdb192860bedf26003df23f7d2ee9abe1b8e937153dd79885342295843025c404c8d9803d4e8
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/nginx-syntax/metadata.xml b/app-vim/nginx-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/nginx-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild b/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
new file mode 100644
index 000000000000..0b7197d395bb
--- /dev/null
+++ b/app-vim/nginx-syntax/nginx-syntax-0.3.3.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Nginx configuration files syntax"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1886"
+LICENSE="vim"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
diff --git a/app-vim/notes-0.33.4 b/app-vim/notes-0.33.4
deleted file mode 100644
index 28844ce07ca7..000000000000
--- a/app-vim/notes-0.33.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: easy note taking in vim
-EAPI=5
-HOMEPAGE=http://peterodding.com/code/vim/notes/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-vim/vim-misc-1.17.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/xolox/vim-notes/archive/0.33.4.tar.gz -> notes-0.33.4.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=8029c0059bda23ccf3f7d1d39d13b5ab
diff --git a/app-vim/notes/Manifest b/app-vim/notes/Manifest
new file mode 100644
index 000000000000..04ee974aa4b1
--- /dev/null
+++ b/app-vim/notes/Manifest
@@ -0,0 +1,3 @@
+DIST notes-0.33.4.tar.gz 239372 BLAKE2B f326c5d6adf25cce9261ac555541261750926c55f73d3a3f57885f7f03f9fae97e03f20882cb74f5fcd78b1ec06c2e0a5b1eb977aadf6a9771c679205a4a48e9 SHA512 7f2147e786582e69760c6d76d7144bc1fd0f8934ce6574184e16f463f5ca9c21e9e0fc87f88b56922b8195b26be7b0f99435cef773ccbc360077cf568b98b98a
+EBUILD notes-0.33.4.ebuild 688 BLAKE2B e222ddbabb1bc5791c7aad52f476d9cc19cf70c8cc25decce0d59e6ecf544d5593ae04ad3a732945012635f85dd00186639d8be399e1a062ca8eda0a6db24c67 SHA512 e643ca31ca9124cc94db3727999fe66189233c2ce3985d66b036fa9493e839da7e053b3deba489be3aecf42371f8825126f79463d414fb418d1cd1c0f54640bb
+MISC metadata.xml 339 BLAKE2B 7d1ee9c5de677bd78ad2a5e0bca15deb9dc48bbfa56c7da216d47c0924fdab4e28c9db8878177471d2d4a7504770cf0395fd03a786d807971d07b61c31d8d7bb SHA512 ebc2c6981c7bb2ad9c8281e69d29203e5700bd5b930ee17feb16e5f1f581eb164971bcfc5584eb639404d70e2f13a3b8c51f4514759798ecc47ee8ec4776bbd1
diff --git a/app-vim/notes/metadata.xml b/app-vim/notes/metadata.xml
new file mode 100644
index 000000000000..2e0c837525af
--- /dev/null
+++ b/app-vim/notes/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">xolox/vim-notes</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/notes/notes-0.33.4.ebuild b/app-vim/notes/notes-0.33.4.ebuild
new file mode 100644
index 000000000000..9006ecc51f8c
--- /dev/null
+++ b/app-vim/notes/notes-0.33.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: easy note taking in vim"
+HOMEPAGE="http://peterodding.com/code/vim/notes/"
+SRC_URI="https://github.com/xolox/vim-notes/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ >=app-vim/vim-misc-1.17.6"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}/vim-${P}
+
+src_prepare() {
+ # remove unnecessary files
+ rm addon-info.json INSTALL.md README.md || die
+
+ python_fix_shebang .
+}
diff --git a/app-vim/ntp-syntax-20031001-r1 b/app-vim/ntp-syntax-20031001-r1
deleted file mode 100644
index b28b9d1d63b4..000000000000
--- a/app-vim/ntp-syntax-20031001-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: ntp.conf syntax highlighting
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=778
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/ntp-syntax-20031001.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ntp-syntax-20031001.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=87015ced6530f34301dca513ab95e1f0
diff --git a/app-vim/ntp-syntax/Manifest b/app-vim/ntp-syntax/Manifest
new file mode 100644
index 000000000000..73ceef8c8418
--- /dev/null
+++ b/app-vim/ntp-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST ntp-syntax-20031001.tar.bz2 1636 BLAKE2B 43cf45ba4d6096c1f07a89c8e006d3fb6ca1b81e6d0e25a11541ea17cff96979e1221f48141799fb26655b3337017dd06d900bbc087b25efeb666cb45dbe5de6 SHA512 3c427dcd2cc065f3ae76c694ba57954c090a565c389aa4dd277e828eef1e25cf0c21781821526267728b1e2b30486007f618a2ba2f422be079cd540d8471c5d8
+EBUILD ntp-syntax-20031001-r1.ebuild 447 BLAKE2B e9c177df0ebc7fc8e2db68279806c17b6dbaa0faa8b7fce94e55477b520ed1b293bc65f018e5977bf4c962839f4346ae25f8b89b5b028fe03ff81289df9a5b37 SHA512 f921ee26611e776a3abfbf986a67ca80ec99ef2c333197b7ad341b68f4a52c1076683a565c2aee0f75c621fac823f047783e4506c0281c9bf4022ee95c395f96
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/ntp-syntax/metadata.xml b/app-vim/ntp-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/ntp-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild b/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
new file mode 100644
index 000000000000..3f0a9615a1f8
--- /dev/null
+++ b/app-vim/ntp-syntax/ntp-syntax-20031001-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: ntp.conf syntax highlighting"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=778"
+
+LICENSE="vim"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+
+VIM_PLUGIN_HELPTEXT="This plugin provides syntax highlighting for ntp.conf files."
diff --git a/app-vim/omnicppcomplete-0.41 b/app-vim/omnicppcomplete-0.41
deleted file mode 100644
index c1d02f88a68b..000000000000
--- a/app-vim/omnicppcomplete-0.41
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
-DESCRIPTION=vim plugin: C/C++ omni-completion with ctags database
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1520
-KEYWORDS=amd64 x86
-LICENSE=vim.org
-RDEPEND=>=dev-util/ctags-5.7 || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
-SLOT=0
-SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=7722 -> omnicppcomplete-0.41.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=53c40f653e9c0a113d07645bed938fe6
diff --git a/app-vim/omnicppcomplete/Manifest b/app-vim/omnicppcomplete/Manifest
new file mode 100644
index 000000000000..09b605154c88
--- /dev/null
+++ b/app-vim/omnicppcomplete/Manifest
@@ -0,0 +1,3 @@
+DIST omnicppcomplete-0.41.zip 38331 BLAKE2B bc85f1a90edbb837363a09d28db6c36842a90952f8965ee9005dff0aeea1e63bf68ff8ce37f09da36f245f3ef3aca36b9cbc5439d0c1c2c6c759fb0d4b276cfd SHA512 565703f0e21f818308dbfbfaaec981eb522621568dee5b021bb8fe243da464b1d7defa45dc1cc2ac3370b3b3c67fb39dcb0dd7a1535a4dfe2ad81218f4ac71f3
+EBUILD omnicppcomplete-0.41.ebuild 530 BLAKE2B 8ce6a1080d9d2cc6a43f1ff52ed775f8a630845cd0ab980c2518bcd2fa5eab50ec3feb7024f42013835c7cd666edf5cbb634c7c1654e0897379cad05774067f0 SHA512 6cdfc30ef7ef07e307e8e223f342009eb0e394745faa4d46b146c7f55de32ff4c977d6f6d675769cf23badf7ef8bb9f0eac5a0282a9d7de023774c067e0aa42e
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/omnicppcomplete/metadata.xml b/app-vim/omnicppcomplete/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/omnicppcomplete/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/omnicppcomplete/omnicppcomplete-0.41.ebuild b/app-vim/omnicppcomplete/omnicppcomplete-0.41.ebuild
new file mode 100644
index 000000000000..31f04ffd5232
--- /dev/null
+++ b/app-vim/omnicppcomplete/omnicppcomplete-0.41.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_PLUGIN_VIM_VERSION="7.0"
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: C/C++ omni-completion with ctags database"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1520"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=7722 -> ${P}.zip"
+
+LICENSE="vim.org"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=">=dev-util/ctags-5.7"
+
+S="${WORKDIR}"
+
+VIM_PLUGIN_HELPFILES="${PN}"
diff --git a/app-vim/pathogen-2.4 b/app-vim/pathogen-2.4
deleted file mode 100644
index 40b459eee751..000000000000
--- a/app-vim/pathogen-2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: manage your runtimepath
-EAPI=5
-HOMEPAGE=https://github.com/tpope/vim-pathogen/ https://www.vim.org/scripts/script.php?script_id=2332
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tpope/vim-pathogen/archive/v2.4.tar.gz -> pathogen-2.4.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=4f72db80e2a5de8b633d60c35fcd4050
diff --git a/app-vim/pathogen/Manifest b/app-vim/pathogen/Manifest
new file mode 100644
index 000000000000..93c658b45f22
--- /dev/null
+++ b/app-vim/pathogen/Manifest
@@ -0,0 +1,3 @@
+DIST pathogen-2.4.tar.gz 6458 BLAKE2B ce28371994938ab4386a6e0a45a9b096443129b7e8de47c92a4c1fa819b7c2aef1e32153866fd1d86a60f7ee2fe2c59ae972700cc22dec263364ef8f51ebe24c SHA512 54da8755991e5c52c5a9258c92ce5731434a15873df44d12e9491ed9bff1f9ebfe2a1c1b94a9ea3615b38aa1833d511bb03c65e85955d96373b6bffceae89fbe
+EBUILD pathogen-2.4.ebuild 444 BLAKE2B 5a59957e8a27c402f4879183be28f52ccc74e026454b4832a06717ce3b1bb872ca3951ca8b21fb2f19453e13b7df443d10ae212a9e2da6de58b09025add38cde SHA512 b8ad5bce4f40f0037d1a36936c3ff4fc0b3b06dfde995cc07302e052dd5673d8a50b385085f2d4cdd0f261f1c71a10dd63e5cf9101501ed6c1d22c86cebb92a0
+MISC metadata.xml 342 BLAKE2B 19ba916c65add7bdf0dd77211eaf660c28cf2c377ec2a81b852745a5cb2c9576d8555619f7855a233af89e0460176761d80b751f8db7d76f1044efa665a52443 SHA512 c4839875a6c09fbc05ba0f94aa1a5b9f81c4f22c9972ac96113c48266a3a7b0f0417c8198b9df181eb0c7374960d8e49f241cc75a4efff598a821914f5560425
diff --git a/app-vim/pathogen/metadata.xml b/app-vim/pathogen/metadata.xml
new file mode 100644
index 000000000000..e3b8e4389c73
--- /dev/null
+++ b/app-vim/pathogen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">tpope/vim-pathogen</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/pathogen/pathogen-2.4.ebuild b/app-vim/pathogen/pathogen-2.4.ebuild
new file mode 100644
index 000000000000..fc4009c0861d
--- /dev/null
+++ b/app-vim/pathogen/pathogen-2.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: manage your runtimepath"
+HOMEPAGE="https://github.com/tpope/vim-pathogen/ https://www.vim.org/scripts/script.php?script_id=2332"
+SRC_URI="https://github.com/tpope/vim-pathogen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="amd64 x86 ~x64-macos"
+
+S=${WORKDIR}/vim-${P}
diff --git a/app-vim/pdv-1.0.1-r1 b/app-vim/pdv-1.0.1-r1
deleted file mode 100644
index e99a94251677..000000000000
--- a/app-vim/pdv-1.0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: PDV (phpDocumentor for Vim)
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1355
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/pdv-1.0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/pdv-1.0.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=5d086a19c606a2d289b8537965f3344f
diff --git a/app-vim/pdv/Manifest b/app-vim/pdv/Manifest
new file mode 100644
index 000000000000..a2b19d32740b
--- /dev/null
+++ b/app-vim/pdv/Manifest
@@ -0,0 +1,3 @@
+DIST pdv-1.0.1.tar.bz2 4473 BLAKE2B f0f41f97730e3a9b5b7f29228652e11eb1f6dafd37e349653c2ec511e84719c615d15ed692ed60f8928a98388614682da009fb1b704bbbeade13523754a5eeaf SHA512 4d7cff977b690d6bf54885aeeff201033b3445aa118c4cf57ebde9cd71ea6e0e548d6c3419e7344aecfe4ca54de01f306406fe3d2aadc7d05d010093792b679c
+EBUILD pdv-1.0.1-r1.ebuild 539 BLAKE2B 8dcf066de9c56b547e08991b0709d41f31eaeb4ef1853b462989fce802b5c2f784a4db3589c4b23d7086c1929ff4d6d18960e6bce8dda3f989fa2691ed8ea8ca SHA512 fccfe55173ec6745572a341e1a44c1fccc3aaea88a6937c6837a98aa5f43ee0eeb9802032ed718163c63e9680f3962bc164b7de4ad3aa19e8a330f2167a8ea93
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/pdv/metadata.xml b/app-vim/pdv/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/pdv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/pdv/pdv-1.0.1-r1.ebuild b/app-vim/pdv/pdv-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..b1472b47ca6f
--- /dev/null
+++ b/app-vim/pdv/pdv-1.0.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: PDV (phpDocumentor for Vim)"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1355"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT="To use this plugin, you should map the PhpDoc() function
+to something. For example, add the following to your ~/.vimrc:
+
+imap <C-o> ^[:set paste<CR>:exe PhpDoc()<CR>:set nopaste<CR>i
+
+For more info, see:
+${HOMEPAGE}"
diff --git a/app-vim/perl-support-5.3.2 b/app-vim/perl-support-5.3.2
deleted file mode 100644
index a81e6565530f..000000000000
--- a/app-vim/perl-support-5.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=556
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2 GPL-2+
-RDEPEND=dev-perl/Perl-Tags dev-perl/Perl-Critic || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/perl-support-5.3.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/perl-support-5.3.2.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=e8aa4931adc36b18586208bf26b12ccd
diff --git a/app-vim/perl-support-5.4 b/app-vim/perl-support-5.4
deleted file mode 100644
index ee38fdc33805..000000000000
--- a/app-vim/perl-support-5.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=556
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2 GPL-2+
-RDEPEND=!ppc? ( dev-perl/Devel-NYTProf ) dev-perl/Perl-Tidy dev-perl/Perl-Tags dev-perl/Perl-Critic || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/WolfgangMehner/perl-support/archive/version-5.4.tar.gz -> perl-support-5.4.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=7cf245e9774630d7efe64d645becfbb4
diff --git a/app-vim/perl-support/Manifest b/app-vim/perl-support/Manifest
new file mode 100644
index 000000000000..10dcef145d16
--- /dev/null
+++ b/app-vim/perl-support/Manifest
@@ -0,0 +1,5 @@
+DIST perl-support-5.3.2.tar.bz2 178598 BLAKE2B d02aae9d65e9f0d5274cbeb44db1ed7de844ef87fa73fd8bfe8c27ccd27584e1937d9a0a824e6f10013554c8259307ebd73d3f188b98897709b1d5d2a03ca548 SHA512 1eff321b0c5184b58737e79de379fbe431b32fbe5a140914b950d024ee9b512393b46cf4e45cafe50289ee9f9d4747984534efeade399882a17237a1a1ca1161
+DIST perl-support-5.4.tar.gz 267155 BLAKE2B 1144623092164bcf436e789d2ea587c08916aafd1514facf28696b23035feeacada610c8f9d4f9c45f29bdea32b9f9b7a3151b918cf08839e10caadb0485cc9d SHA512 d9d06ea2299be6135b5423aa7f062874736d7aa8118428a9abcd20c53eea410f0d384d0a79324e5ad0101105aa0aa10eb23f031084f34908f879633e5d18c795
+EBUILD perl-support-5.3.2.ebuild 681 BLAKE2B 9ed6690671cb926f850511b18506c35ca5367e3f5c8e7b3708733f82943ea2e6488da5a56ea2a29a6748a267c0ee15007ff92898cdc06e69a3910b098534cfcf SHA512 069bbb143cf6e0355525270078027dafe93e7a3db18ada114f0bac594e28b7d10e367a517d4f7cfa68719c63e9dc6619df384c039949bc1585d723482ffaefd8
+EBUILD perl-support-5.4.ebuild 1367 BLAKE2B 2bbe788dfa2684dd654109b3244e0418758c5367af94537f45aa43800c17c35a0edb9a634cc4c5a07f757205b687dc8e8513aab493797a2678e6a473edf03f6d SHA512 b88d24ad64021c37d07fc2889ba0c501b2a9bd7694d2f31df31a91b93734808145c99d26b1f78e3e5dd9fcca6669cec8cf60e65eedbde71865825d48e0c7aaaa
+MISC metadata.xml 342 BLAKE2B 833b0fbd6f25308df363e08b01459c646084cee5c00d9dd0e83fdf08ff71543de4f3a4244f0ce2c1a838b9ae8a387ad693a228c50add92a790ee948ff582f9a6 SHA512 9d55373f4445d1bf4f3dd7db2c3b7973321fc2f461254d21f9968bea94ff8a8511129232fe4a30d3aacd723209d70566cb3ae1594efe0f28873f3bcee7b009f1
diff --git a/app-vim/perl-support/metadata.xml b/app-vim/perl-support/metadata.xml
new file mode 100644
index 000000000000..c450d9618260
--- /dev/null
+++ b/app-vim/perl-support/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">vim-scripts/perl-support.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/perl-support/perl-support-5.3.2.ebuild b/app-vim/perl-support/perl-support-5.3.2.ebuild
new file mode 100644
index 000000000000..6c23b96a3409
--- /dev/null
+++ b/app-vim/perl-support/perl-support-5.3.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=556"
+LICENSE="GPL-2 GPL-2+"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+VIM_PLUGIN_HELPFILES="perlsupport.txt"
+
+RDEPEND="
+ dev-perl/Perl-Tags
+ dev-perl/Perl-Critic"
+
+src_prepare() {
+ # Don't set tabstop and shiftwidth
+ sed -i '/=4/s/^/"/' ftplugin/perl.vim || die
+}
+
+src_install() {
+ dodoc ${PN}/doc/{ChangeLog,perl-hot-keys.pdf}
+ rm -r ${PN}/doc/ || die
+
+ vim-plugin_src_install
+}
diff --git a/app-vim/perl-support/perl-support-5.4.ebuild b/app-vim/perl-support/perl-support-5.4.ebuild
new file mode 100644
index 000000000000..740c39da3f61
--- /dev/null
+++ b/app-vim/perl-support/perl-support-5.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=556"
+SRC_URI="https://github.com/WolfgangMehner/perl-support/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2 GPL-2+"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+VIM_PLUGIN_HELPFILES="perlsupport.txt"
+
+RDEPEND="
+ !ppc? ( dev-perl/Devel-NYTProf )
+ dev-perl/Perl-Tidy
+ dev-perl/Perl-Tags
+ dev-perl/Perl-Critic"
+
+S="${WORKDIR}/${PN}-version-${PV}"
+
+src_prepare() {
+ # Don't set tabstop and shiftwidth
+ sed -i '/=4/s/^/"/' ftplugin/perl.vim || die
+}
+
+src_install() {
+ dodoc ${PN}/doc/{ChangeLog,perl-hot-keys.pdf}
+ rm -r ${PN}/doc/ || die
+
+ vim-plugin_src_install
+}
+
+pkg_postinst() {
+ elog "${PN} can utilize the following modules on top of the ones installed as"
+ elog "dependencies:"
+ elog
+ elog "Devel::SmallProf - per-line Perl profiler"
+ elog "Devel::FastProf - per-line Perl profiler"
+ elog "Devel::ptkdb - Perl debugger using a Tk GUI"
+ elog "Pod::Pdf - A POD to PDF translator"
+ elog "YAPE::Regex::Explain - regular expression analyzer"
+ elog
+ elog "You may need to install them separately if you would like to use them."
+}
diff --git a/app-vim/perlomni-2.5 b/app-vim/perlomni-2.5
deleted file mode 100644
index 3c401c50d534..000000000000
--- a/app-vim/perlomni-2.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=app-arch/unzip dev-lang/perl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a vim plugin with Perl omni completion functions
-EAPI=6
-HOMEPAGE=https://github.com/c9s/perlomni.vim
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=vim.org
-RDEPEND=app-arch/unzip dev-lang/perl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/c9s/perlomni.vim/archive/v2.5.zip -> perlomni-2.5.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=4753a6cc44a7dd9de7f2713e25e495f4
diff --git a/app-vim/perlomni/Manifest b/app-vim/perlomni/Manifest
new file mode 100644
index 000000000000..b06c80e99e6c
--- /dev/null
+++ b/app-vim/perlomni/Manifest
@@ -0,0 +1,3 @@
+DIST perlomni-2.5.zip 26871 BLAKE2B 02a905b42580d2c66f50182fc2cae1aad4a3cde1fbef5c48a6870a810069c53b24b2cfa4e2ecf16c3e60d0a6588359b337e0652e21bbda442dd04b5d3bb2b5aa SHA512 aeb4bb6efef859145a942271ac4e08c99af3aed45024ca2d5affe2e72c356fa4e8f9cef78ff8a1796426ec9d2339ea2b83f07b224a1b4b98598aec5f6f45b0d7
+EBUILD perlomni-2.5.ebuild 656 BLAKE2B ff5470af52d19945802a02b37fd8d043ae65383cf3a09e035fbe34234ff22567b954f7fec67d1c92c7be9da89518e3e862a5f6f278a163802b436d31879a102f SHA512 675a2db99220e16c04eda42c852949a9ce39d1f9f1a7043942a1ba888d80a97d4c1e6f7097b405e980c5474e472cfed6726c1c6d9a6ba8720b1b623ff9307413
+MISC metadata.xml 425 BLAKE2B 5413dd0212d6fd1846cfc504352d543b1be51053ac9cc140aa05db59c1f6a4a44208ae7ac798c95fec0b233b97d8581486765def9afe910c2da059f9c8eb83f2 SHA512 8ad19bbe8fd10660518b2b20d8c94307a0322031615bfbed081b24c977bc8d999fd3a5878698be85d41d4090c1dbf632887ef9ab99fbfb068596b17c5be78c2b
diff --git a/app-vim/perlomni/metadata.xml b/app-vim/perlomni/metadata.xml
new file mode 100644
index 000000000000..6dfc1d1aaf2a
--- /dev/null
+++ b/app-vim/perlomni/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">c9s/perlomni.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/perlomni/perlomni-2.5.ebuild b/app-vim/perlomni/perlomni-2.5.ebuild
new file mode 100644
index 000000000000..8ec957c7ec19
--- /dev/null
+++ b/app-vim/perlomni/perlomni-2.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: a vim plugin with Perl omni completion functions"
+HOMEPAGE="https://github.com/c9s/perlomni.vim"
+SRC_URI="https://github.com/c9s/${PN}.vim/archive/v${PV}.zip -> ${P}.zip"
+LICENSE="vim.org"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+DEPEND="
+ app-arch/unzip
+ dev-lang/perl"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}.vim-${PV}"
+
+src_prepare() {
+ default
+ local CLEANUP=(
+ Makefile
+ config.mk
+ README.mkd
+ README.mkd.old
+ win32-install.bat
+ TODO
+ )
+ rm -v "${CLEANUP[@]}" || die
+}
+
+src_compile() { :; }
diff --git a/app-vim/pfsyntax-1.3 b/app-vim/pfsyntax-1.3
deleted file mode 100644
index a767005c7f63..000000000000
--- a/app-vim/pfsyntax-1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: pf syntax highlighting for vim
-EAPI=6
-HOMEPAGE=https://github.com/vim-scripts/pf.vim
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/vim-scripts/pf.vim/archive/1.3.tar.gz -> pfsyntax-1.3.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=659d0b2d67bc004a2dd1cf0ad75980d1
diff --git a/app-vim/pfsyntax/Manifest b/app-vim/pfsyntax/Manifest
new file mode 100644
index 000000000000..89ded159cec9
--- /dev/null
+++ b/app-vim/pfsyntax/Manifest
@@ -0,0 +1,3 @@
+DIST pfsyntax-1.3.tar.gz 1540 BLAKE2B fd590d18815d947a20f76fa5b4d197131f1fa9170ef7b0b2409c2782188706a300cebda20c89f90f861836ae440f509f10588eac4bb947fda14043d3eff44819 SHA512 6967cee9a039f405a4b42a44678d5c632eb93ef48486c03a6929991d31ac03677cba4223f49c14e6c9d73b15db9469b3fa3c0f2586b4994d25634d0885121c5b
+EBUILD pfsyntax-1.3.ebuild 408 BLAKE2B fc31fbd6f8e65d1ac9d502133b18ea9b22371c8b719c31de7a0c45a5c22d52a6342c048d64ed601e070e52d3e8fd79a2148863714b2520880c096e142e6e8030 SHA512 e2f853e414ac2feb140983c28fc53392f0a928a0c86666371df1555e595a1e2a29c59e85ef80795df23a92822bc202d5b0f4b35b530506f168094056b116b22d
+MISC metadata.xml 255 BLAKE2B c3c51ff357cdf3ea565d7f4bf7cb236342061e471b67eacc0a436c26d52532ce7499657a76fc92a845321318a65f9eb877573104341ddae66dc3a554a35f7362 SHA512 305ae93d2bb3da79ee181cf36bb0ca2bbac016c20555967d7281cd5c0edfc26c1450dacd7a7de57078650dab0e815be9169c0b25a24d71488185f71ae8834167
diff --git a/app-vim/pfsyntax/metadata.xml b/app-vim/pfsyntax/metadata.xml
new file mode 100644
index 000000000000..84f8f1cf6bcb
--- /dev/null
+++ b/app-vim/pfsyntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/pfsyntax/pfsyntax-1.3.ebuild b/app-vim/pfsyntax/pfsyntax-1.3.ebuild
new file mode 100644
index 000000000000..24a79b205df9
--- /dev/null
+++ b/app-vim/pfsyntax/pfsyntax-1.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN="pf.vim"
+
+DESCRIPTION="vim plugin: pf syntax highlighting for vim"
+HOMEPAGE="https://github.com/vim-scripts/pf.vim"
+SRC_URI="https://github.com/vim-scripts/pf.vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/app-vim/pgn-syntax-1.0 b/app-vim/pgn-syntax-1.0
deleted file mode 100644
index b9d2d87a8466..000000000000
--- a/app-vim/pgn-syntax-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: PGN (chess Portable Game Notation) syntax highlighting
-EAPI=0
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=677
-KEYWORDS=alpha amd64 ia64 ~mips ppc ppc64 sparc x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/pgn-syntax-1.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/pgn-syntax-1.0.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=d96168391f7214150dd166c183130b45
diff --git a/app-vim/pgn-syntax/Manifest b/app-vim/pgn-syntax/Manifest
new file mode 100644
index 000000000000..7dfc3cc788b3
--- /dev/null
+++ b/app-vim/pgn-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST pgn-syntax-1.0.tar.bz2 675 BLAKE2B b89caf025d9856f19d5d7221c4f8747949a513932e8a5dc908b1324e823d0df592b8536d01aadd59bfc61674314a922ecd2a55d5a38f009011e755ad45679116 SHA512 8754881ac77d84359609fc55a00fa91f4dbad6e66778c7d9418fb7ed401c8fc063c1bb84d2574368827db0ecdbcd20c6f9e25808a691021f8d0b3afdb3360c5f
+EBUILD pgn-syntax-1.0.ebuild 442 BLAKE2B 0603e1984bb6f80f1ec7cacade106723c33f75082804088323da15ce45132c8bcdb6f9dfe74fa9d441b70f82af9196550f20fecc4c63087971c1e60c7c375fc4 SHA512 c1ef261f1eee0083531b5897e05a8a0195314032ecd7251b8e9e1495c5f3a6c02ad1fcdbd64129c46beac9acd72d6fd821ec42628142cfe819430cf7c6fda675
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/pgn-syntax/metadata.xml b/app-vim/pgn-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/pgn-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/pgn-syntax/pgn-syntax-1.0.ebuild b/app-vim/pgn-syntax/pgn-syntax-1.0.ebuild
new file mode 100644
index 000000000000..f12033db3066
--- /dev/null
+++ b/app-vim/pgn-syntax/pgn-syntax-1.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: PGN (chess Portable Game Notation) syntax highlighting"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=677"
+
+LICENSE="vim.org"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for PGN files."
diff --git a/app-vim/phpdocs-0.26-r1 b/app-vim/phpdocs-0.26-r1
deleted file mode 100644
index 67f3f2b89fe8..000000000000
--- a/app-vim/phpdocs-0.26-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: PHPDoc Support in VIM
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=520
-KEYWORDS=alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/phpdocs-0.26.tar.bz2 https://dev.gentoo.org/~radhermit/vim/phpdocs-0.26.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=5bf03db80add709865b8ee52c17cecde
diff --git a/app-vim/phpdocs/Manifest b/app-vim/phpdocs/Manifest
new file mode 100644
index 000000000000..424a333b557b
--- /dev/null
+++ b/app-vim/phpdocs/Manifest
@@ -0,0 +1,3 @@
+DIST phpdocs-0.26.tar.bz2 3772 BLAKE2B e14b0a2ddce2ab375adf845e06f9d760bb09611a930d5a2988d1e33bcf2d2890c5be81b1d148f48d8fc96a87b871a19abdb1223a00a13b611b6ba2dbc62d44fe SHA512 625717ce5e8cfe8ee6fb76611df28838f6bdf54905af138dccf6e2870c29c36f6c618872d81990833c06d30ab3f010445d2d31fb4173eb8b245113f8b5c87bcc
+EBUILD phpdocs-0.26-r1.ebuild 505 BLAKE2B d10422a2fc993b57020c079256c8fdeb51eec091cdd2b2dfcbe968a8d6f130203852dfe44b9ed36bfff2dbaa6a5cf7ebdfe38d802f0ba543d39d2e2d55492828 SHA512 931f5f51c378e05ebe78ebc7c1bb6df2db4256e4dcc9b4435e24878b4e55890c156c882bac0302bc7250af4b83d931b75484cd8b1ad36aa40cb85d7c0e459488
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/phpdocs/metadata.xml b/app-vim/phpdocs/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/phpdocs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/phpdocs/phpdocs-0.26-r1.ebuild b/app-vim/phpdocs/phpdocs-0.26-r1.ebuild
new file mode 100644
index 000000000000..40740286d0df
--- /dev/null
+++ b/app-vim/phpdocs/phpdocs-0.26-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: PHPDoc Support in VIM"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=520"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+VIM_PLUGIN_HELPURI="https://www.vim.org/scripts/script.php?script_id=520"
+
+src_prepare() {
+ default
+ sed -i 's/\r$//' "${S}"/plugin/phpdoc.vim || die "sed failed"
+}
diff --git a/app-vim/project-1.4.1 b/app-vim/project-1.4.1
deleted file mode 100644
index 6ed5f28c4d9e..000000000000
--- a/app-vim/project-1.4.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Managing multiple projects with multiple sources like an IDE
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=69
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=6273 -> project-1.4.1.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=7e41e6e7e4562348834fe3d13242f9de
diff --git a/app-vim/project/Manifest b/app-vim/project/Manifest
new file mode 100644
index 000000000000..a7cb0b11a964
--- /dev/null
+++ b/app-vim/project/Manifest
@@ -0,0 +1,3 @@
+DIST project-1.4.1.tar.gz 20705 BLAKE2B 34dcbb500ab83cb0f80c0f7b0a5a17d3e17b04847453041e09cdbb508524e61da2ef75dc5c21ebe448d8c6d9057f1dd6c324753191d54c5f7169b647ee3a9f6c SHA512 315d76a375dda2ba6e5523b80e83b6e53590a31713eb8da4ee976e0698a35eb0419ce88bb2eb3b1793e272a9f23ada1b29c7e8f1460cb36f5b57204cbbb54852
+EBUILD project-1.4.1.ebuild 462 BLAKE2B 229e5e0c854c525a4537e69fa8cce7ff9d2a03df5473bc4013b27ced4d0d27564874f7bd9d044c86a04d8b123946f9fadbc7c06275d4a7b031e5c1846296a975 SHA512 1e58c47eceae807b014b862809768c21ec18206a73f43c01323cb3973f3cfcce1d578674f482cbe1f4ed1ddeff127b6153245a2ec75fbdde3d006858dadfb9ee
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/project/metadata.xml b/app-vim/project/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/project/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/project/project-1.4.1.ebuild b/app-vim/project/project-1.4.1.ebuild
new file mode 100644
index 000000000000..b90a25189c63
--- /dev/null
+++ b/app-vim/project/project-1.4.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Managing multiple projects with multiple sources like an IDE"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=69"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=6273 -> ${P}.tar.gz"
+
+LICENSE="vim.org"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+S=${WORKDIR}
+
+VIM_PLUGIN_HELPFILES="${PN}"
diff --git a/app-vim/puppet-syntax-3.0.1 b/app-vim/puppet-syntax-3.0.1
deleted file mode 100644
index d3aae702ef73..000000000000
--- a/app-vim/puppet-syntax-3.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=!<app-admin/puppet-3.0.1 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Puppet configuration files syntax
-EAPI=4
-HOMEPAGE=http://puppetlabs.com/
-KEYWORDS=amd64 ~arm hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris
-LICENSE=Apache-2.0 GPL-2
-RDEPEND=!<app-admin/puppet-3.0.1 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~tampakrap/tarballs/puppet-syntax-3.0.1.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=505238d48936b0f61aa2df388cb529d4
diff --git a/app-vim/puppet-syntax/Manifest b/app-vim/puppet-syntax/Manifest
new file mode 100644
index 000000000000..a97e88622407
--- /dev/null
+++ b/app-vim/puppet-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST puppet-syntax-3.0.1.tar.gz 3548 BLAKE2B b053234203b45cf1748cc72e329c35322dfa48a4d7b39261301398a8d1026035e929a7afe3fa80d59ef67472ebfc317442250e0aa0292047ab38eda9860600b9 SHA512 fb96360e784da578d2ab77a021befe874644cf964c1ca2d8b34b316296872a67679606ad0dfd4ab90027b7d259900af20d831d5e3359d76649e0c6f43546938b
+EBUILD puppet-syntax-3.0.1.ebuild 558 BLAKE2B d357be2e9bde63c42ad22a24a4da64ef4816bc5ac65ce0f8136e4bc132266b5b07d43edb28618c530469ad25e8fe7759866629d4a06aaa0915addf517320190c SHA512 4fe127ba436c49e32ac7379127984c527e7ba3ed8a44d0f2888373938dd4b721e313174c442e7a5d07d5c7da1ca0d85169895fd0f248ffbd4d75b6b22c640cc0
+MISC metadata.xml 363 BLAKE2B de2b732638a0b8b0430ac0aaf25635fdbf86493507d787280c14b8c0da5713d31490d7ff89f4cf1347b7952021336d97f355a45f11653ac027722e977ced20d9 SHA512 cf7d45285491a9c11a9bff7354c6bd726eb0e359114a447321642056d199f117921b3bd15d9a427c5b7af2371c0e10ecffa634cf824df2b59997aca9ce6ff3e6
diff --git a/app-vim/puppet-syntax/metadata.xml b/app-vim/puppet-syntax/metadata.xml
new file mode 100644
index 000000000000..f1f6747112d6
--- /dev/null
+++ b/app-vim/puppet-syntax/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+</maintainer>
+<maintainer type="project">
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-vim/puppet-syntax/puppet-syntax-3.0.1.ebuild b/app-vim/puppet-syntax/puppet-syntax-3.0.1.ebuild
new file mode 100644
index 000000000000..17c83d9b6be0
--- /dev/null
+++ b/app-vim/puppet-syntax/puppet-syntax-3.0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Puppet configuration files syntax"
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="https://dev.gentoo.org/~tampakrap/tarballs/${P}.tar.gz"
+LICENSE="Apache-2.0 GPL-2"
+KEYWORDS="amd64 ~arm hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for Puppet configuration
+files."
+
+DEPEND="!<app-admin/puppet-3.0.1"
+RDEPEND=${DEPEND}
diff --git a/app-vim/pushpop-4.0-r1 b/app-vim/pushpop-4.0-r1
deleted file mode 100644
index b6be45985876..000000000000
--- a/app-vim/pushpop-4.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: pushd / popd from the vim commandline
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=129
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=>=app-vim/genutils-1.1 >=app-vim/cmdalias-1.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/pushpop-4.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/pushpop-4.0.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=48d51f76bf22ba5375f16661218359d0
diff --git a/app-vim/pushpop/Manifest b/app-vim/pushpop/Manifest
new file mode 100644
index 000000000000..7c0b6460bfce
--- /dev/null
+++ b/app-vim/pushpop/Manifest
@@ -0,0 +1,3 @@
+DIST pushpop-4.0.tar.bz2 7486 BLAKE2B 6f0a4d7f91d1e7c4c2409485784070efa99257f3f96c257a23f9f444fe4e08307fb3e1dd695ba6a205e290fa1f15768bdd9c6346c9b52cd6151cb83eb6b1ea10 SHA512 84f61908ab25ea6028c0f77d935286ffe3b8905400e455e1d123ca6e53cca2422e066adfcd8e75d2ad1d63d7e01524fea286a2eeeda3dd0968076be6a4229684
+EBUILD pushpop-4.0-r1.ebuild 515 BLAKE2B e3c9ed7c918dbc9dad4a40d73a88e1fad6519c2dc9745d4d9c46a619860303cb568ef9d47a4da492ba5273ed4173ab6dff4f87adc436a3cff3fd0b300402338c SHA512 1ebf0e50acd63147772025f958fbf309cf8f6b227674c8ec1f338f41c04f1a882ab6910d614fea4815e145bad8ed2f852f2cf0cac438de3b5da38c06e5f03ab8
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/pushpop/metadata.xml b/app-vim/pushpop/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/pushpop/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/pushpop/pushpop-4.0-r1.ebuild b/app-vim/pushpop/pushpop-4.0-r1.ebuild
new file mode 100644
index 000000000000..e17bb1a022ce
--- /dev/null
+++ b/app-vim/pushpop/pushpop-4.0-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: pushd / popd from the vim commandline"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=129"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+RDEPEND="
+ >=app-vim/genutils-1.1
+ >=app-vim/cmdalias-1.0"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides :Pushd and :Popd commands which emulate bash's pushd
+and popd functions."
diff --git a/app-vim/pyclewn-2.0.1 b/app-vim/pyclewn-2.0.1
deleted file mode 100644
index 122ae38736f9..000000000000
--- a/app-vim/pyclewn-2.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=|| ( >=app-editors/vim-7.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=app-editors/gvim-7.3[netbeans,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) app-arch/vimball || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=Pyclewn allows using vim as a front end to a debugger (pdb or gdb)
-EAPI=5
-HOMEPAGE=http://pyclewn.sourceforge.net/
-IUSE=python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=app-editors/gvim-7.3[netbeans,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) app-arch/vimball python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyclewn/pyclewn-2.0.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f5cbd76333df0181d8408e23dbb3cc4b
diff --git a/app-vim/pyclewn-2.1-r1 b/app-vim/pyclewn-2.1-r1
deleted file mode 100644
index 98d1d74089d5..000000000000
--- a/app-vim/pyclewn-2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3[netbeans] ) app-arch/vimball || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Pyclewn allows using vim as a front end to a debugger (pdb or gdb)
-EAPI=5
-HOMEPAGE=http://pyclewn.sourceforge.net/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3[netbeans] ) app-arch/vimball python_targets_python2_7? ( dev-python/pdb-clone[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pdb-clone[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyclewn/pyclewn-2.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=352d067177c19bc6446ac8964b8d47f7
diff --git a/app-vim/pyclewn/Manifest b/app-vim/pyclewn/Manifest
new file mode 100644
index 000000000000..ceb4ff37d5c7
--- /dev/null
+++ b/app-vim/pyclewn/Manifest
@@ -0,0 +1,5 @@
+DIST pyclewn-2.0.1.tar.gz 124914 BLAKE2B e1dc12174d2ac640476a36714a8ef221f64db4b19c9509a179bc0cf573200de0f1f888bcc3bb69f433064e2de2d881845099f609468e12ed72e5c547623d44e5 SHA512 996acbedbb7922109925f188efba4c71e83f1823c029f92dc00bb21449f024232ef55df0c74a9fd4bfa7229523ed9ad4301aa9dbb8a3c20424082fc6939f63db
+DIST pyclewn-2.1.tar.gz 129697 BLAKE2B 0dfef92cb36ea9fa89c7f0d85ed45e21c634732fc2d3d888dd792de22529bea86719f8ac8ed870dd5ab00efbfdb08011013a36880781abf9e0c64a62b2aa301a SHA512 346b98a9e37957a5bf97b8901247f56fa8e38bddac38727867773cf4e78e555d6a85848c4c400d1faf1159ba61122cfd4931c95a67e3b2abdfaae7996beb4f1b
+EBUILD pyclewn-2.0.1.ebuild 1057 BLAKE2B 1412bfe77432b791290c9a4d707fcc3c41c17384e4f35fb730d920a3c7dec35f4a7c674e2a107ec952413f88d1eb837c262b9fd9dc35c4c3b104bc29a52fcf83 SHA512 729fe02cffcd975dc3735c5c003bfb8db1d5b1044ff395afb776de09efc0c2dac828cb74600acec811a5e311fa27f096641c03cea19f6bd2d92c2e107f1c271e
+EBUILD pyclewn-2.1-r1.ebuild 1120 BLAKE2B 5bb45ffde48cb5571ef0c529b3017bfca6205cf6b0a17a0f111229525b1b76efcb0f741a3ea9f9a1dee5c6c1632521688f33844f4f0f62b7e1b015fbbffafd2c SHA512 d9671d291b255388bb8f6d2de19f6e7177cb6a3f322d72fa640a747c6bfde9e32f8e3d780632902872c5753b6c1f920be5a11fe11196fb647d21888e783a851f
+MISC metadata.xml 499 BLAKE2B 4955bd7a080dc2ae909143477040d191cb48ab4badfd47b6b7c11fd4686139bbbe77475f005e10c3b2bba50d0615b94600a55cda57a7d02ecaaffe1e504219dd SHA512 30b127677f0d5a9afce208e5cbb00c9b98f6d7e771ef273155f9acad764da789e71249289104e8006420cf5ff62075bb7572527150f9b339e0e51cb219c76a81
diff --git a/app-vim/pyclewn/metadata.xml b/app-vim/pyclewn/metadata.xml
new file mode 100644
index 000000000000..a93aab33c5ba
--- /dev/null
+++ b/app-vim/pyclewn/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>maksbotan@gentoo.org</email>
+ <name>Maxim Koltsov</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pypi">pyclewn</remote-id>
+ <remote-id type="sourceforge">pyclewn</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/pyclewn/pyclewn-2.0.1.ebuild b/app-vim/pyclewn/pyclewn-2.0.1.ebuild
new file mode 100644
index 000000000000..cd2bed6c6c96
--- /dev/null
+++ b/app-vim/pyclewn/pyclewn-2.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4} )
+inherit eutils vim-plugin distutils-r1
+
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+DESCRIPTION="Pyclewn allows using vim as a front end to a debugger (pdb or gdb)"
+HOMEPAGE="http://pyclewn.sourceforge.net/"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="|| (
+ >=app-editors/vim-7.3[${PYTHON_USEDEP}]
+ >=app-editors/gvim-7.3[netbeans,${PYTHON_USEDEP}]
+)"
+DEPEND="${CDEPEND}
+ app-arch/vimball
+"
+RDEPEND="${DEPEND}
+ $(python_gen_cond_dep \
+ 'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})
+"
+
+SLOT="0"
+
+#Completely broken (runs vim), disable for now
+#python_test() {
+# esetup.py test
+#}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ vimball -x -C "${ED}"/usr/share/vim/vimfiles lib/clewn/runtime/${P}.vmb || die "Extracting vimball failed"
+}
+
+pkg_postinst() {
+ vim-plugin_pkg_postinst
+
+ optfeature "C/C++ debugging" sys-devel/gdb
+ optfeature "Python debugging" dev-python/pdb-clone
+}
diff --git a/app-vim/pyclewn/pyclewn-2.1-r1.ebuild b/app-vim/pyclewn/pyclewn-2.1-r1.ebuild
new file mode 100644
index 000000000000..403ecdc6fe16
--- /dev/null
+++ b/app-vim/pyclewn/pyclewn-2.1-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit eutils vim-plugin distutils-r1
+
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+DESCRIPTION="Pyclewn allows using vim as a front end to a debugger (pdb or gdb)"
+HOMEPAGE="http://pyclewn.sourceforge.net/"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="|| (
+ >=app-editors/vim-7.3
+ >=app-editors/gvim-7.3[netbeans]
+)"
+
+DEPEND="
+ ${CDEPEND}
+ app-arch/vimball"
+
+RDEPEND="
+ ${DEPEND}
+ $(python_gen_cond_dep \
+ 'dev-python/pdb-clone[${PYTHON_USEDEP}]' python{2_7,3_5})
+ $(python_gen_cond_dep \
+ 'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3})"
+
+SLOT="0"
+
+#Completely broken (runs vim), disable for now
+#python_test() {
+# esetup.py test
+#}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ vimball -x -C "${ED}"/usr/share/vim/vimfiles lib/clewn/runtime/${P}.vmb || die "Extracting vimball failed"
+}
+
+pkg_postinst() {
+ vim-plugin_pkg_postinst
+
+ optfeature "C/C++ debugging" sys-devel/gdb
+ optfeature "Python debugging" dev-python/pdb-clone
+}
diff --git a/app-vim/pydiction-1.2.3 b/app-vim/pydiction-1.2.3
deleted file mode 100644
index baf5a04999b3..000000000000
--- a/app-vim/pydiction-1.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Tab-complete your Python code
-EAPI=6
-HOMEPAGE=https://rkulla.github.io/pydiction/
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=vim
-RDEPEND=dev-lang/python:* || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/pydiction-1.2.3.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=7f51bfb0df96cc750bcee482d6af490b
diff --git a/app-vim/pydiction-1.2.3-r1 b/app-vim/pydiction-1.2.3-r1
deleted file mode 100644
index 12c5c95f2f60..000000000000
--- a/app-vim/pydiction-1.2.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: tab-complete your Python code
-EAPI=6
-HOMEPAGE=https://rkulla.github.io/pydiction/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=vim
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/pydiction-1.2.3.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=5d8f563ed642592cc2de0c2843383fc4
diff --git a/app-vim/pydiction-1.2.3-r2 b/app-vim/pydiction-1.2.3-r2
deleted file mode 100644
index b2c83cc11d94..000000000000
--- a/app-vim/pydiction-1.2.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: tab-complete your Python code
-EAPI=6
-HOMEPAGE=https://rkulla.github.io/pydiction/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=vim
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/pydiction-1.2.3.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=7085fb3ed79ad23feb6d7e1d171a0f5a
diff --git a/app-vim/pydiction/Manifest b/app-vim/pydiction/Manifest
new file mode 100644
index 000000000000..e0c7ac91ad00
--- /dev/null
+++ b/app-vim/pydiction/Manifest
@@ -0,0 +1,5 @@
+DIST pydiction-1.2.3.zip 475441 BLAKE2B 709d4de30d21ff0ba27b5b0c11276731bdef03d754c1799857ceba7edbea4fc0640714cda4103ed58878b02cc00feed5d6b08df2647139fa84910cf92db51dea SHA512 91da1d8a9be89095072724d77bdcaa342fbd5479f5027d7ed7bb2d4a382c7385b2b7fae91c1cd94605232b34a96370a86096e3c32db0d106cbcda2a82f409922
+EBUILD pydiction-1.2.3-r1.ebuild 701 BLAKE2B 9b75ffd2cacdb6aca0ed5d9086df249745d749cac7182625511c066865e0c3e0bb0f3a791797c213dbe1d01e8de4afbea6c6e1343b5a1124d4cf41fcc78d0ad0 SHA512 60c6cab108c87042e3b01e3a2329429cba70f883d97bf7217e7e5b07c7553745c07bb74d7e250b736af21a99e831b70b0610a8cda6fdff0f100f85d6b13e2856
+EBUILD pydiction-1.2.3-r2.ebuild 948 BLAKE2B 51e04a857b036fa362a5cc42da933f55628d561ab73e98c543ac2af6e3046549adb67801814d5e915a6fbb201ad3664beb46aff72bcd9a05cbdb5787372d02d1 SHA512 3b0a0cc5082d460987d4b16a127980528ff37eee2842a3b31c1d6a915b1ea0a437a3404c88184c4021083679d10bebe88e6137b105af7582bd96e4aef64b394a
+EBUILD pydiction-1.2.3.ebuild 598 BLAKE2B 240a494c6547fafa7d1f98a241a9e3072e4c758b1dcb7bc9f3bd6996d33ba94df765fd5ff8993729d49570e96416bc59b60c15644971625fec7e7786e79b2b56 SHA512 11d845c3d011daab5bcc676581a347974731166f689e7c2e41f6a0fe680f865079c2275d14632c3cbd901b187bb1ee3a829a07ceec77f32332f66ec74ca6d5e6
+MISC metadata.xml 361 BLAKE2B 4cd18ca933890f32a2aca909c66c48ea1539fc4d4d558657e5fb76c66a26be7c9b24882b7688b54407e044ba1e4d641e659da10065360ddba91dad4aa391da5e SHA512 f205ce2b8f61bcc7d966345b9928efccdc2adb4ce6a36166c774134bd8959a3757a3a9a556aaa2d6c6f7b71b945be84e41903a58e66f844c4258326a66b2b667
diff --git a/app-vim/pydiction/metadata.xml b/app-vim/pydiction/metadata.xml
new file mode 100644
index 000000000000..8fafbfec1948
--- /dev/null
+++ b/app-vim/pydiction/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/pydiction/pydiction-1.2.3-r1.ebuild b/app-vim/pydiction/pydiction-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..0e9e20b9d9ba
--- /dev/null
+++ b/app-vim/pydiction/pydiction-1.2.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit vim-plugin python-r1
+
+DESCRIPTION="vim plugin: tab-complete your Python code"
+HOMEPAGE="https://rkulla.github.io/pydiction/"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.zip"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="app-arch/unzip"
+RDEPEND="${PYTHON_DEPS}"
+
+S="${WORKDIR}/${PN}-master"
+
+src_install() {
+ insinto "/usr/share/${PN}"
+ local pyfiles=( complete-dict pydiction.py )
+ doins "${pyfiles[@]}"
+ rm -v "${pyfiles[@]}" || die
+ vim-plugin_src_install
+}
diff --git a/app-vim/pydiction/pydiction-1.2.3-r2.ebuild b/app-vim/pydiction/pydiction-1.2.3-r2.ebuild
new file mode 100644
index 000000000000..a0972c26972c
--- /dev/null
+++ b/app-vim/pydiction/pydiction-1.2.3-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit vim-plugin python-r1
+
+DESCRIPTION="vim plugin: tab-complete your Python code"
+HOMEPAGE="https://rkulla.github.io/pydiction/"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.zip"
+
+LICENSE="vim"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="app-arch/unzip"
+RDEPEND="${PYTHON_DEPS}"
+
+S="${WORKDIR}/${PN}-master"
+
+src_install() {
+ # Rename pydiction script.
+ mv "${PN}.py" "${PN}" || die
+
+ # We're going to remove those files in a second
+ # otherwise they're installed by Portage.
+ local pyfiles=( complete-dict "${PN}" )
+ insinto "/usr/share/${P}"
+ doins complete-dict
+
+ # pydiction is treated a singular script that lives on its own.
+ python_foreach_impl python_doscript "${PN}"
+ rm -v "${pyfiles[@]}" || die
+
+ vim-plugin_src_install
+}
diff --git a/app-vim/pydiction/pydiction-1.2.3.ebuild b/app-vim/pydiction/pydiction-1.2.3.ebuild
new file mode 100644
index 000000000000..c4fae8228716
--- /dev/null
+++ b/app-vim/pydiction/pydiction-1.2.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Tab-complete your Python code"
+HOMEPAGE="https://rkulla.github.io/pydiction/"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.zip"
+LICENSE="vim"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-lang/python:*"
+
+S="${WORKDIR}/${PN}-master"
+
+src_install() {
+ insinto "/usr/share/${PN}"
+ local pyfiles=( complete-dict pydiction.py )
+ doins "${pyfiles[@]}"
+ rm -v "${pyfiles[@]}" || die
+ vim-plugin_src_install
+}
diff --git a/app-vim/pydoc-2.0-r1 b/app-vim/pydoc-2.0-r1
deleted file mode 100644
index e2691f7b2d34..000000000000
--- a/app-vim/pydoc-2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup unpack
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: integrates python documentation view and search tool
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=910 https://github.com/fs111/pydoc.vim
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/fs111/pydoc.vim/tarball/2.0 -> pydoc-2.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=fffe92990272f48836de524383acf212
diff --git a/app-vim/pydoc/Manifest b/app-vim/pydoc/Manifest
new file mode 100644
index 000000000000..38bfc6234c90
--- /dev/null
+++ b/app-vim/pydoc/Manifest
@@ -0,0 +1,3 @@
+DIST pydoc-2.0.tar.gz 2795 BLAKE2B d780265c474081431e43076db9e5bc244677d9deaaa44bbd6ba2c2bdce7e88b8e2f0c6a9e14ca5a3a4bda7925b5c5bc108a34d5d6fecaabe9f0a025774b101ca SHA512 bea2e0dcb82090803b45e0cbccf5ad610a39f22d04c099e5e946e2b3707c9cbd69b85e3f1024a73760d1ff81a0199aeeb3bab20546307676953156eff7185214
+EBUILD pydoc-2.0-r1.ebuild 633 BLAKE2B 8527539ebbeb627acaa4a88657d01f4930f15cd34af125ec63041f145f65f0d6d3a81e654a5badd64fe935baa32ad302acdfc3a4a0000bb036aeef7072355f39 SHA512 a5ba3b471425088e75d756248255a46d7a7216ca07dfc9fa147583ee4bfa36fae9968017eca5f7944260c4bcaed1a123e9771f48abae0aa850bd21aef6c23235
+MISC metadata.xml 424 BLAKE2B cd8fb601b39c8ff1247498a196bf776d70b0765661f866b355675b5d8ac76a713bf007b8aafa503d438ac7fb49295e6f09df9d4b1d9d7fc1cba323fd139eea12 SHA512 b64ab21cb93c8d24a87fc0434baac17c21ef9a4a23d4d2622d6c733a043d84aab2c3cb00acc41edd9c61e8599cfcfddeb50025ea0135f9f10c0f5ee243f61dab
diff --git a/app-vim/pydoc/metadata.xml b/app-vim/pydoc/metadata.xml
new file mode 100644
index 000000000000..2b82c379a010
--- /dev/null
+++ b/app-vim/pydoc/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">fs111/pydoc.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/pydoc/pydoc-2.0-r1.ebuild b/app-vim/pydoc/pydoc-2.0-r1.ebuild
new file mode 100644
index 000000000000..775d576a1d3b
--- /dev/null
+++ b/app-vim/pydoc/pydoc-2.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="vim plugin: integrates python documentation view and search tool"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=910 https://github.com/fs111/pydoc.vim"
+SRC_URI="https://github.com/fs111/${PN}.vim/tarball/${PV} -> ${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="app-arch/unzip"
+RDEPEND="${PYTHON_DEPS}"
+
+src_unpack() {
+ default
+ mv * "${P}" || die
+}
diff --git a/app-vim/pytest-1.1.4 b/app-vim/pytest-1.1.4
deleted file mode 100644
index 5d1915e43466..000000000000
--- a/app-vim/pytest-1.1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: run tests with py.test from within vim
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3424
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/pytest || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=18178 -> pytest-1.1.4.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=d03a3b652c5d1e2354aa2ed9a31837b0
diff --git a/app-vim/pytest/Manifest b/app-vim/pytest/Manifest
new file mode 100644
index 000000000000..ecedb6eebaa0
--- /dev/null
+++ b/app-vim/pytest/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-1.1.4.tar.gz 10550 BLAKE2B 3da7659db866c25c57ba74f9db40c161faea228b389cc06be973778c5c389ac5ba6d46d16c2d47a4e9640e92b68344d7896400ae1b795725c95410013df55da5 SHA512 94240b763c332e5cd46169af86c6e775993a8ec48e5ad4138cda1dcc5798e2f40f61c484a04a91f9d7a351f3f583c72e56254bda9af8843b2a99aa451d1a8930
+EBUILD pytest-1.1.4.ebuild 498 BLAKE2B baff4400e53a36763028b567fd83186ff36670d36273c6ae80916c2cfff88e4661f684542a07cb057b22dd90fe4db7e8099e0e593cb2fdf32aac9fd44a2880cb SHA512 229083fb4672c3e068df4f48aaeb56ae34aeaba73565b29a03ca1722ba2f51cfae6b62af0af307a5540803e8cc7025fc6911c10a9102a1245e8a5b40eb828c95
+MISC metadata.xml 340 BLAKE2B c19b6303750b370db31319e743bdc49127368a5374b0d843dd433fc0e7b5582b41a2d4571356acb50d01a8a0b76d0fc267c47c740e1d221464914fe56781cd1c SHA512 5b3eb98fdc674b48cdf126bc027b5c9c09145e9020fb2b54788452e1329e64890fe78628dcf7098266b1ea72db038520959233e1ef89ce479eeab259ac31650c
diff --git a/app-vim/pytest/metadata.xml b/app-vim/pytest/metadata.xml
new file mode 100644
index 000000000000..6c8987e6f46f
--- /dev/null
+++ b/app-vim/pytest/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/pytest/pytest-1.1.4.ebuild b/app-vim/pytest/pytest-1.1.4.ebuild
new file mode 100644
index 000000000000..f037f84ce118
--- /dev/null
+++ b/app-vim/pytest/pytest-1.1.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: run tests with py.test from within vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3424"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=18178 -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="dev-python/pytest"
+
+S="${WORKDIR}/${PN}.vim"
diff --git a/app-vim/python-mode-0.6.18-r3 b/app-vim/python-mode-0.6.18-r3
deleted file mode 100644
index 48608b7ebf2b..000000000000
--- a/app-vim/python-mode-0.6.18-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Provide python code looking for bugs, refactoring and other useful things
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3
-RDEPEND=dev-python/astng dev-python/autopep8 dev-python/pyflakes dev-python/pylint dev-python/rope dev-python/ropemode || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/klen/python-mode/archive/0.6.18.tar.gz -> python-mode-0.6.18.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=06e72119d3229e607e574ccaa44a5ec8
diff --git a/app-vim/python-mode-0.6.18-r4 b/app-vim/python-mode-0.6.18-r4
deleted file mode 100644
index 16534da6bc2e..000000000000
--- a/app-vim/python-mode-0.6.18-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Provide python code looking for bugs, refactoring and other useful things
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-python/astng[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/autopep8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyflakes[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pylint[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/rope[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/ropemode[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/klen/python-mode/archive/0.6.18.tar.gz -> python-mode-0.6.18.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=1446bd2bb8667da2f2e9d47c1900023c
diff --git a/app-vim/python-mode-0.9.0 b/app-vim/python-mode-0.9.0
deleted file mode 100644
index 9c18bcf6ace0..000000000000
--- a/app-vim/python-mode-0.9.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Provide python code looking for bugs, refactoring and other useful things
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=dev-python/rope dev-python/astng dev-python/pylint dev-python/pyflakes dev-python/autopep8 dev-python/ropemode || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/klen/python-mode/archive/0.9.0.tar.gz -> python-mode-0.9.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=a84124956eb480308b6680dd35f1ab20
diff --git a/app-vim/python-mode-0.9.0-r1 b/app-vim/python-mode-0.9.0-r1
deleted file mode 100644
index 6f139366499b..000000000000
--- a/app-vim/python-mode-0.9.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Provide python code looking for bugs, refactoring and other useful things
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/rope[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/astng[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pylint[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyflakes[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/autopep8[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/ropemode[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/klen/python-mode/archive/0.9.0.tar.gz -> python-mode-0.9.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=283f660fcba34dd5c1955d7b784d8c17
diff --git a/app-vim/python-mode/Manifest b/app-vim/python-mode/Manifest
new file mode 100644
index 000000000000..f9fba336ce33
--- /dev/null
+++ b/app-vim/python-mode/Manifest
@@ -0,0 +1,8 @@
+AUX python-mode-0.6.18-dont-add-cwd-to-syspath.patch 496 BLAKE2B c936b7966d7135d921f22d7750b56a246d3b9e2c89576eb17a063de9429df9fae9b2f0cd8dc11cd6e517f33aa9a5c4196effc0605468c288b98a49433c81f89e SHA512 3008c54ec29aa0c6f9a96874bf970ddf6264b26090df55336a493ac4d69f52a8e2cb938323c064c158dc6fa7f8b94f5ae1d4761fc4b093c14bb7664e9a196696
+DIST python-mode-0.6.18.tar.gz 386846 BLAKE2B 8fd330ddce4a9107e9ca3248a727e4291b3474810360962425ef4afab25eff8a5a7319bedd91ad7899d160b2f48a28ab8f56a27d5557859f6fb3d906f7d11758 SHA512 0e3159a055304443c8b15590c424ac0f4a4303e343882ff91f01f5b959274931dea83969ab1dcd19ce95894c7da5be60699d51b852dc73165a99a271feec4e64
+DIST python-mode-0.9.0.tar.gz 671985 BLAKE2B 3bfbbcd11953fbecc0214b66271ab37bfee4476aed5d9a6f0e82c9111d9f6e1404839340079c49f4b73608c899a12c7af2a5a1044f104a3aafdef3c8bd20310e SHA512 03aef010a95241abf9605ca334d95a2c0b917c61aea23f794e574acd56ba5d958032975d17d1af40a5edccd90f0172783a26fc301d799fd619bfd263da685161
+EBUILD python-mode-0.6.18-r3.ebuild 1554 BLAKE2B 66181b3a79742443316b446b1ecf9814217f3eaee2176ac3dfb7d0ce70590ae5eee592e90ceed5ee43265a60a761c58a91c9b77d981f2a4e31a0ba9198302bc0 SHA512 3276c95a1be4212fd8b3915aa999cdf114a90e1a4da98f555d7aab0af5ecc6a0202658864271e9214fd7b8725fd6e72b57834e628fe299977b7695d6f72af8de
+EBUILD python-mode-0.6.18-r4.ebuild 1862 BLAKE2B 20cd3c9c6bb42814f1103c27ff5b06d0e0b2334c923ceaa0ae0abd85774fccc180f875401686b96316ae3220e8e07dcea0256afb66fc687d58fd97c8733da255 SHA512 185c89c26be4533f2be897feb7810aa4dacd96c222ed200b807c52d59a3f374f764e6e412fbe15e9cf54f88c4fd65b30d6d612417d7c44111952fa7b40c3b666
+EBUILD python-mode-0.9.0-r1.ebuild 1194 BLAKE2B 0216204c6807cda3666fb928b086e0020aea538b816ef1efd48476f7a6f916e7bbc430881b5a5fb199f113529fed879812baa5d76b3bb06bf1bae7d2e1ddb38e SHA512 67d5059cd4bf8314161ac0fd7595364ca000c7613fba9eecc167955eb016a982e062154c7ea5e9ac16af0603e847700407fa3ec1e67cfc5a4458f72e862df255
+EBUILD python-mode-0.9.0.ebuild 990 BLAKE2B 7bb298fcca9fe332131d40a39ad81234794cffd285ff2d8bea80e826d540e4bc14807d0641947dfd9bbce9fd95e2ba3ca1afd3683cacdb5635989e42a5b35067 SHA512 4ed92ab57405e5903afb64c1029eb3a3fd866c9a966663ddbde65c0157a736ede66b2659ac82ec4845712eaec0897828fcc91d24edce109605ce6f1ef95d5f7a
+MISC metadata.xml 590 BLAKE2B fe1ad1cbd9d75eea115d7a6e24f3fda0fcebcd3fbca6627e822a50934ab02665bf6eecab920f000592b0572d8995d653cd8cd9dda5cfe12b3a9616459f2dc72c SHA512 b6fbd9c3f197ca6b1df05584448514c12f78eefa1a7f80fa74c0a46ab3e6fdce1b3824fdff22060cf056fce1463ee4af62b7988c7a5025942e7ed072ad9f2d99
diff --git a/app-vim/python-mode/files/python-mode-0.6.18-dont-add-cwd-to-syspath.patch b/app-vim/python-mode/files/python-mode-0.6.18-dont-add-cwd-to-syspath.patch
new file mode 100644
index 000000000000..fb92614233bd
--- /dev/null
+++ b/app-vim/python-mode/files/python-mode-0.6.18-dont-add-cwd-to-syspath.patch
@@ -0,0 +1,15 @@
+https://github.com/klen/python-mode/issues/162
+--- a/ftplugin/python/init-pymode.vim
++++ b/ftplugin/python/init-pymode.vim
+@@ -46,10 +46,9 @@ if !pymode#Default('g:pymode_path', 1) || g:pymode_path
+ python << EOF
+ import sys, vim, os
+
+-curpath = vim.eval("getcwd()")
+ libpath = os.path.join(vim.eval("expand('<sfile>:p:h:h:h')"), 'pylibs')
+
+-sys.path = [libpath, curpath] + vim.eval("g:pymode_paths") + sys.path
++sys.path = [libpath] + vim.eval("g:pymode_paths") + sys.path
+ EOF
+
+ endif " }}}
diff --git a/app-vim/python-mode/metadata.xml b/app-vim/python-mode/metadata.xml
new file mode 100644
index 000000000000..40d7427cf17f
--- /dev/null
+++ b/app-vim/python-mode/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription>
+ Python-mode is a vim plugin that allows you to use the pylint, rope,
+ pydoc, pyflakes, pep8, mccabe libraries in vim to provide features like
+ python code looking for bugs, refactoring and some other useful
+ things.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">klen/python-mode</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/python-mode/python-mode-0.6.18-r3.ebuild b/app-vim/python-mode/python-mode-0.6.18-r3.ebuild
new file mode 100644
index 000000000000..6900bfbcd9bb
--- /dev/null
+++ b/app-vim/python-mode/python-mode-0.6.18-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+VIM_PLUGIN_MESSAGES="filetype"
+VIM_PLUGIN_HELPFILES="PythonModeCommands"
+VIM_PLUGIN_HELPURI="https://github.com/klen/python-mode"
+
+inherit vim-plugin eutils
+
+DESCRIPTION="Provide python code looking for bugs, refactoring and other useful things"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode"
+SRC_URI="https://github.com/klen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+ dev-python/astng
+ dev-python/autopep8
+ dev-python/pyflakes
+ dev-python/pylint
+ dev-python/rope
+ dev-python/ropemode
+ "
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-dont-add-cwd-to-syspath.patch
+
+ # debundling fun
+ rm -rf pylibs/pylama/{pep8.py,pyflakes} pylibs/{autopep8.py}
+ #rm -rf pylibs/{rope,ropemode} #475686
+ sed -e 's/from .pep8/from pep8/g' \
+ -e 's/from .pyflakes/from pyflakes/g' \
+ -i pylibs/pylama/utils.py || die
+ # there's still pylint left, I failed to debundle it :/
+
+ mv pylint.ini "${T}" || die
+ sed -e "s|expand(\"<sfile>:p:h:h\")|\"${EPREFIX}/usr/share/${PN}\"|" \
+ -i autoload/pymode.vim || die # use custom path
+}
+
+src_install() {
+ vim-plugin_src_install
+ insinto usr/share/${PN}
+ doins "${T}"/pylint.ini
+}
+
+pkg_postinst() {
+ vim-plugin_pkg_postinst
+ einfo "If you use custom pylintrc make sure you append the contents of"
+ einfo " ${EPREFIX}/usr/share/${PN}/pylint.ini"
+ einfo "to it. Otherwise PyLint command will not work properly."
+}
diff --git a/app-vim/python-mode/python-mode-0.6.18-r4.ebuild b/app-vim/python-mode/python-mode-0.6.18-r4.ebuild
new file mode 100644
index 000000000000..0cfa612859c5
--- /dev/null
+++ b/app-vim/python-mode/python-mode-0.6.18-r4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_PLUGIN_MESSAGES="filetype"
+VIM_PLUGIN_HELPFILES="PythonModeCommands"
+VIM_PLUGIN_HELPURI="https://github.com/klen/python-mode"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="Provide python code looking for bugs, refactoring and other useful things"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode"
+SRC_URI="https://github.com/klen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ || (
+ app-editors/vim[python,${PYTHON_USEDEP}]
+ app-editors/gvim[python,${PYTHON_USEDEP}]
+ )
+ dev-python/astng[${PYTHON_USEDEP}]
+ dev-python/autopep8[${PYTHON_USEDEP}]
+ dev-python/pyflakes[${PYTHON_USEDEP}]
+ dev-python/pylint[${PYTHON_USEDEP}]
+ dev-python/rope[${PYTHON_USEDEP}]
+ dev-python/ropemode[${PYTHON_USEDEP}]"
+
+src_prepare() {
+ eapply "${FILESDIR}"/${P}-dont-add-cwd-to-syspath.patch
+ eapply_user
+
+ # debundling fun
+ rm -rf pylibs/pylama/{pep8.py,pyflakes} pylibs/{autopep8.py}
+ #rm -rf pylibs/{rope,ropemode} #475686
+ sed -e 's/from .pep8/from pep8/g' \
+ -e 's/from .pyflakes/from pyflakes/g' \
+ -i pylibs/pylama/utils.py || die
+ # there's still pylint left, I failed to debundle it :/
+
+ mv pylint.ini "${T}" || die
+ sed -e "s|expand(\"<sfile>:p:h:h\")|\"${EPREFIX}/usr/share/${PN}\"|" \
+ -i autoload/pymode.vim || die # use custom path
+}
+
+src_install() {
+ vim-plugin_src_install
+ insinto usr/share/${PN}
+ doins "${T}"/pylint.ini
+}
+
+pkg_postinst() {
+ vim-plugin_pkg_postinst
+ einfo "If you use custom pylintrc make sure you append the contents of"
+ einfo " ${EPREFIX}/usr/share/${PN}/pylint.ini"
+ einfo "to it. Otherwise PyLint command will not work properly."
+}
diff --git a/app-vim/python-mode/python-mode-0.9.0-r1.ebuild b/app-vim/python-mode/python-mode-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..4bb9eea27f02
--- /dev/null
+++ b/app-vim/python-mode/python-mode-0.9.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_PLUGIN_MESSAGES="filetype"
+VIM_PLUGIN_HELPFILES="PythonModeCommands"
+VIM_PLUGIN_HELPURI="https://github.com/klen/python-mode"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="Provide python code looking for bugs, refactoring and other useful things"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode"
+SRC_URI="https://github.com/klen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-python/rope[${PYTHON_USEDEP}]
+ dev-python/astng[${PYTHON_USEDEP}]
+ dev-python/pylint[${PYTHON_USEDEP}]
+ dev-python/pyflakes[${PYTHON_USEDEP}]
+ dev-python/autopep8[${PYTHON_USEDEP}]
+ dev-python/ropemode[${PYTHON_USEDEP}]"
+
+RESTRICT="test"
+
+src_prepare() {
+ default
+
+ sed -e "s|expand(\"<sfile>:p:h:h\")|\"${EPREFIX}/usr/share/${PN}\"|" \
+ -i autoload/pymode.vim || die # use custom path
+}
+
+src_install() {
+ vim-plugin_src_install
+ insinto "usr/share/${PN}"
+}
+
+pkg_postinst() {
+ vim-plugin_pkg_postinst
+}
diff --git a/app-vim/python-mode/python-mode-0.9.0.ebuild b/app-vim/python-mode/python-mode-0.9.0.ebuild
new file mode 100644
index 000000000000..ea6be080f04c
--- /dev/null
+++ b/app-vim/python-mode/python-mode-0.9.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_PLUGIN_MESSAGES="filetype"
+VIM_PLUGIN_HELPFILES="PythonModeCommands"
+VIM_PLUGIN_HELPURI="https://github.com/klen/python-mode"
+
+inherit vim-plugin eutils
+
+DESCRIPTION="Provide python code looking for bugs, refactoring and other useful things"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3770 https://github.com/klen/python-mode"
+SRC_URI="https://github.com/klen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/rope
+ dev-python/astng
+ dev-python/pylint
+ dev-python/pyflakes
+ dev-python/autopep8
+ dev-python/ropemode"
+
+RESTRICT="test"
+
+src_prepare() {
+ default
+
+ sed -e "s|expand(\"<sfile>:p:h:h\")|\"${EPREFIX}/usr/share/${PN}\"|" \
+ -i autoload/pymode.vim || die # use custom path
+}
+
+src_install() {
+ vim-plugin_src_install
+ insinto usr/share/${PN}
+}
+
+pkg_postinst() {
+ vim-plugin_pkg_postinst
+}
diff --git a/app-vim/rails-5.1 b/app-vim/rails-5.1
deleted file mode 100644
index 1a99bf2ac9d4..000000000000
--- a/app-vim/rails-5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: aids developing Ruby on Rails applications
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1567 https://github.com/tpope/vim-rails/
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tpope/vim-rails/archive/v5.1.tar.gz -> rails-5.1.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=72ed0972470e3fb540cc27a7d384993c
diff --git a/app-vim/rails-5.2 b/app-vim/rails-5.2
deleted file mode 100644
index b7e315dd4e2c..000000000000
--- a/app-vim/rails-5.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: aids developing Ruby on Rails applications
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1567 https://github.com/tpope/vim-rails/
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tpope/vim-rails/archive/v5.2.tar.gz -> rails-5.2.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=72ed0972470e3fb540cc27a7d384993c
diff --git a/app-vim/rails/Manifest b/app-vim/rails/Manifest
new file mode 100644
index 000000000000..c7339bb3c12b
--- /dev/null
+++ b/app-vim/rails/Manifest
@@ -0,0 +1,5 @@
+DIST rails-5.1.tar.gz 57639 BLAKE2B 71873d4428a72b02efc1a516a8cdfebacd6505c914af54e1b59abda1db65b4a52afa7fbdb641311350068e490d08b0f850ea02701cfa02d3e60b67240e9ee84d SHA512 15aac8a66c84c939ad7628480ebae8008644a09c4901d1c20c09945232f39ccff236f4d0926dc4f902b9373bda30dc6740d76f7f580e5e74892cb16749ad5a11
+DIST rails-5.2.tar.gz 60940 BLAKE2B 315b4bc96768682fdc8012eed63c9f3881e3e647f3fb065ac3c13b767325c13ff3c69f7c92d626f6cd01705b7bd56361b4a4bbe5c1626f9db0a41233285d6f92 SHA512 0a704545b864eed46513747ab3a9f0d3537e3d6a5d01cb1cf628131f79b4b72f90e567df26364e3344adef423ccf96586367a97d0e7d4a8be9c72f54e842a810
+EBUILD rails-5.1.ebuild 560 BLAKE2B 4a0f6b31ab8602c9222f66938b4ac21a514eed7bb314fa57974e5aa7cdf8489335d8a689eefb3bd4a9913339b945fa7a7570068cce7a9b64339fb8b4e4be69cf SHA512 79d7c57c6f7c2bc1cc982809b4dd3fc662f0c01409379e4ae96b3605ed1cf0663d1afeba5383afc4052e6c5b5eaf26c02a12b7108e1745977eff4bc0ccff4e84
+EBUILD rails-5.2.ebuild 560 BLAKE2B 4a0f6b31ab8602c9222f66938b4ac21a514eed7bb314fa57974e5aa7cdf8489335d8a689eefb3bd4a9913339b945fa7a7570068cce7a9b64339fb8b4e4be69cf SHA512 79d7c57c6f7c2bc1cc982809b4dd3fc662f0c01409379e4ae96b3605ed1cf0663d1afeba5383afc4052e6c5b5eaf26c02a12b7108e1745977eff4bc0ccff4e84
+MISC metadata.xml 339 BLAKE2B 6cff8149c1b1c38a8d6b9f12d9f2840a41e643b2f602d388d81dbf7774cd3cd9485c9d91c4801d4a04e17521b9d58317dae7250683dddd78d9951cd576624ddf SHA512 6c08bc15b40f53439632423b8139d2b10cb3a3e2d237e973efb08ab95e2ab306557cea32eb11fd31aceb4d03b2392f981595d181a9c2815801bbc6938be9903c
diff --git a/app-vim/rails/metadata.xml b/app-vim/rails/metadata.xml
new file mode 100644
index 000000000000..2294b568b512
--- /dev/null
+++ b/app-vim/rails/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">tpope/vim-rails</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/rails/rails-5.1.ebuild b/app-vim/rails/rails-5.1.ebuild
new file mode 100644
index 000000000000..10a6335781c2
--- /dev/null
+++ b/app-vim/rails/rails-5.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN="vim-rails"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="vim plugin: aids developing Ruby on Rails applications"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1567 https://github.com/tpope/vim-rails/"
+SRC_URI="https://github.com/tpope/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ rm *.markdown || die
+}
diff --git a/app-vim/rails/rails-5.2.ebuild b/app-vim/rails/rails-5.2.ebuild
new file mode 100644
index 000000000000..10a6335781c2
--- /dev/null
+++ b/app-vim/rails/rails-5.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN="vim-rails"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="vim plugin: aids developing Ruby on Rails applications"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1567 https://github.com/tpope/vim-rails/"
+SRC_URI="https://github.com/tpope/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ rm *.markdown || die
+}
diff --git a/app-vim/rainbow_parentheses-1.0 b/app-vim/rainbow_parentheses-1.0
deleted file mode 100644
index c4ac06aba7c1..000000000000
--- a/app-vim/rainbow_parentheses-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Colour parentheses to differentiate nest levels
-EAPI=6
-HOMEPAGE=https://github.com/kien/rainbow_parentheses.vim
-KEYWORDS=alpha amd64 ia64 ppc sparc x86
-LICENSE=vim
-RDEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/rainbow_parentheses-1.0.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=de1f6eed4cf7d37fcd53266628307097
diff --git a/app-vim/rainbow_parentheses/Manifest b/app-vim/rainbow_parentheses/Manifest
new file mode 100644
index 000000000000..3b9db51a3aae
--- /dev/null
+++ b/app-vim/rainbow_parentheses/Manifest
@@ -0,0 +1,3 @@
+DIST rainbow_parentheses-1.0.zip 2827 BLAKE2B 655905c1b54d5c885e1a06fe4403786b76958ba47d0facae3d3a1e657ae0a702b3f939383e2f617f5bdca9b33193dd52196eff5915236180e0d9d4a6a4e22e79 SHA512 326310058a7dd25fbd47105334cc1a6a059d40842afe48164922b7869af344dc230a5f3b329c13d5d0ae9779814507defa8d0ff56b951556e8f2bd685313e569
+EBUILD rainbow_parentheses-1.0.ebuild 465 BLAKE2B 9bd56a696c95e0a3b349333c4d4b07369904aac70e456cf7ffcfbf1dfed6baa85d32377290a8d2b7519792e3fad3e54e0343cb8fa93027d25f806ba6241e638c SHA512 26bd9fb6ed5a1ad321d80c87077b757d88c9a00ad8f053e634f603fe7352dd70ed8b26067d60cac8f49c96f459b8cc471fc2f68eae6171612095b79102668d5b
+MISC metadata.xml 454 BLAKE2B 36c6cd350f7fec2a1e473f7c9fc071943d5de82826e7cd66159542710137ecee788fcd3390d8271a36cd8c1f7a4b99e4c864dd92667e502630fc3243f03084fd SHA512 a4b31f36a2f9097b165e424cafdeb772ece04ecbfc5b7813e17ae13eb5ee4a15f1e180fa20ac722087ba2968385c766ff76be1599dd584a01d804604c732dd63
diff --git a/app-vim/rainbow_parentheses/metadata.xml b/app-vim/rainbow_parentheses/metadata.xml
new file mode 100644
index 000000000000..d73a957169b3
--- /dev/null
+++ b/app-vim/rainbow_parentheses/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">kien/rainbow_parentheses.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/rainbow_parentheses/rainbow_parentheses-1.0.ebuild b/app-vim/rainbow_parentheses/rainbow_parentheses-1.0.ebuild
new file mode 100644
index 000000000000..c9f0a4f2d4cd
--- /dev/null
+++ b/app-vim/rainbow_parentheses/rainbow_parentheses-1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Colour parentheses to differentiate nest levels"
+HOMEPAGE="https://github.com/kien/rainbow_parentheses.vim"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.zip"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+
+DEPEND="app-arch/unzip"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}.vim-master"
diff --git a/app-vim/recover-0.18 b/app-vim/recover-0.18
deleted file mode 100644
index 1bb2ac0d230c..000000000000
--- a/app-vim/recover-0.18
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: show differences for recovered files
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3068 https://github.com/chrisbra/Recover.vim
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/recover-0.18.tar.bz2 https://dev.gentoo.org/~radhermit/vim/recover-0.18.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=5dab36abb546a16d5d1096312dd357ef
diff --git a/app-vim/recover/Manifest b/app-vim/recover/Manifest
new file mode 100644
index 000000000000..ebe47cfc7f52
--- /dev/null
+++ b/app-vim/recover/Manifest
@@ -0,0 +1,3 @@
+DIST recover-0.18.tar.bz2 8137 BLAKE2B 9904a598fb7b203d53c4385cfbdbd92b369226cf91c384ca5ef2bec8d9e3385ec25806a302489db50ba1cb2a4a3d77a76eaf244aa3b23ad90602e5c873a4f88e SHA512 fe31626bd9bfacf299536f4943b65d61262da8bfec9c83b085e67a52833d8fe8c5ecc81fade50c451cfe2889e0cfa938401635a2c9471ebd31191fc1c7beeb71
+EBUILD recover-0.18.ebuild 372 BLAKE2B 3d950e87d22c51e84df8ded50e9690713ca98ef4173b3f82fa26f4fb56fa155a5a7c18ed6120aa689aef242fc9088b6b018aa1f68ff5842c42597a9afc695dc0 SHA512 00e7d2be45dcf4cc3ab2cec86a1559636d313d4d275da2baca215ddb6fafc8ac1172e442699a2c0c729f8918f45f74ab9b0808129475934a9d1fa2ed87cab2c6
+MISC metadata.xml 344 BLAKE2B b33b5e379ce8b7c968f86475183efc7ac54576e5b73726514e98e3dc896e520c6120fdfb83db74793585c4154fdb32ee5980891d5b7a439e6e598fd347a339a2 SHA512 7295a8980ce4a1e57fafa002cb40fed1af649626ee9bf544332c4689fa0ecc9af4c5d8f60dc52edebe1e9929ee635d2b0342d4482caa981fa4b12e1a4160c7c8
diff --git a/app-vim/recover/metadata.xml b/app-vim/recover/metadata.xml
new file mode 100644
index 000000000000..2a6d61b908b9
--- /dev/null
+++ b/app-vim/recover/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">chrisbra/Recover.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/recover/recover-0.18.ebuild b/app-vim/recover/recover-0.18.ebuild
new file mode 100644
index 000000000000..7512b666fb1b
--- /dev/null
+++ b/app-vim/recover/recover-0.18.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: show differences for recovered files"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3068 https://github.com/chrisbra/Recover.vim"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/reload-0.6.17 b/app-vim/reload-0.6.17
deleted file mode 100644
index c2cfd8bbfe89..000000000000
--- a/app-vim/reload-0.6.17
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: automatic reloading of vim scripts
-EAPI=5
-HOMEPAGE=http://peterodding.com/code/vim/reload/
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=app-vim/vim-misc-1.8.5 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/xolox/vim-reload/archive/0.6.17.tar.gz -> reload-0.6.17.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=0bb163e78140db9105f01189f6ab6e68
diff --git a/app-vim/reload/Manifest b/app-vim/reload/Manifest
new file mode 100644
index 000000000000..fa711be0bd68
--- /dev/null
+++ b/app-vim/reload/Manifest
@@ -0,0 +1,3 @@
+DIST reload-0.6.17.tar.gz 7028 BLAKE2B bb8e843e1092c7e155546da5aea67280ca4b028c037547434f00e15bed29d7fae062289bc8ca506ed9be17674ce63494f72273797ff7022aa95b46405b0a4a63 SHA512 639ffcea9bf94b0a8346850078f59ff332ff6180b042d2c22662d5c637307969644607ca3f19e2648a1ef9a019788ef1f83be52b627ca6784e16d1b7bddc39cd
+EBUILD reload-0.6.17.ebuild 508 BLAKE2B a5642419a143c3b680ee272b26b84915dc48a050eb87db6ea48608a83437603049caa25c37fc8891aeab5d2583d9afd502d4bc73dfe197aab909b732ed1e6db0 SHA512 fa6ca4568cd17547e9e7a3a506911e4cad913ab9008e5b9c0d230a47e46a9ed375ce405d99fa80a25592e9913dbff601679a4aae9b25ad324eded6f7d6833e40
+MISC metadata.xml 340 BLAKE2B 56fe3809eaede079c4a3000728dad4f75d21b2cf6212517fc45b48e8882d317ba73522e8861dd9e3b94fecbe541d03e48816e69585ee9d667d4401504fc9e08d SHA512 25a88a091f9cb2756f5e28361ec31f79997114271499c3522f47ddd2a86d8dc9bba42e533e004a040b7598dc380ef84480966a1d3641e333f423a810223bc1ec
diff --git a/app-vim/reload/metadata.xml b/app-vim/reload/metadata.xml
new file mode 100644
index 000000000000..e94902a72acb
--- /dev/null
+++ b/app-vim/reload/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">xolox/vim-reload</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/reload/reload-0.6.17.ebuild b/app-vim/reload/reload-0.6.17.ebuild
new file mode 100644
index 000000000000..b55fba2bf075
--- /dev/null
+++ b/app-vim/reload/reload-0.6.17.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: automatic reloading of vim scripts"
+HOMEPAGE="http://peterodding.com/code/vim/reload/"
+SRC_URI="https://github.com/xolox/vim-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+RDEPEND=">=app-vim/vim-misc-1.8.5"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}/vim-${P}
+
+src_prepare() {
+ rm addon-info.json *.md || die
+}
diff --git a/app-vim/repeat-1.1 b/app-vim/repeat-1.1
deleted file mode 100644
index 6be49d360152..000000000000
--- a/app-vim/repeat-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: use the repeat command "." with plugin maps
-EAPI=5
-HOMEPAGE=https://github.com/tpope/vim-repeat/ https://www.vim.org/scripts/script.php?script_id=2136
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tpope/vim-repeat/archive/v1.1.tar.gz -> repeat-1.1.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=8c8c241b5b279c95dae7defc75980bce
diff --git a/app-vim/repeat/Manifest b/app-vim/repeat/Manifest
new file mode 100644
index 000000000000..4246ab9ecc14
--- /dev/null
+++ b/app-vim/repeat/Manifest
@@ -0,0 +1,3 @@
+DIST repeat-1.1.tar.gz 2621 BLAKE2B 22573f49d69ca5b798c9e6e480c605a6de515cde40913b73ce7db2f0a045e14b850d5ed00fc960b1214f851c138763f89e0d43ca78e7f0961cfaa3721c072d8a SHA512 9df73c7049f38a93da5e6bd36dc0fe833ec23394540de1b6929159910ec9f18af2a76211af612bc8f3c92d9c7f2faacd72a65d7d593584689ac6a7068df60bf9
+EBUILD repeat-1.1.ebuild 529 BLAKE2B de9f5792d816291cd4c29c54289a25d0888ae921afb622a85ffb763112e70f3b44018b2dbbc7cc1a1383a768d0c2a6904806bb3b422fe8e5a04252bd8bc4c9a9 SHA512 4890212fd43d9a5b8b744849e88b1939655d233d313be2848787fa40742a79146914c0d12acf2ffb88c571fb0d9795e6045cc64c47bd0037997cd0f311c7b68d
+MISC metadata.xml 340 BLAKE2B 57a4452d4baca17d9de632e2df1edfac3987af64fe3e920810fd01ded99b9a745267e658c7596d7a2f67cf6987fca3652e96a093ebaf625ec659da4a9c06a32a SHA512 126d76f034905a45118eaf05237228af870c065ed967ead33818101d13dad96cfa6ccdccbb4e394e69fe5d698bce0ffbbd4c03315a11866c9b56f5189dbfb6fd
diff --git a/app-vim/repeat/metadata.xml b/app-vim/repeat/metadata.xml
new file mode 100644
index 000000000000..c61e73016706
--- /dev/null
+++ b/app-vim/repeat/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">tpope/vim-repeat</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/repeat/repeat-1.1.ebuild b/app-vim/repeat/repeat-1.1.ebuild
new file mode 100644
index 000000000000..c2506991860e
--- /dev/null
+++ b/app-vim/repeat/repeat-1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN="vim-repeat"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="vim plugin: use the repeat command \".\" with plugin maps"
+HOMEPAGE="https://github.com/tpope/vim-repeat/ https://www.vim.org/scripts/script.php?script_id=2136"
+SRC_URI="https://github.com/tpope/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ rm *.markdown || die
+}
diff --git a/app-vim/ri-browser-1.2 b/app-vim/ri-browser-1.2
deleted file mode 100644
index e8e60967eced..000000000000
--- a/app-vim/ri-browser-1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: interface for browsing ri/ruby documentation
-EAPI=0
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=494
-KEYWORDS=~amd64 ~ppc ~x86 ~sparc
-LICENSE=public-domain
-RDEPEND=dev-lang/ruby || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/ri-browser-1.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ri-browser-1.2.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=5a85c89b2c3fe81f4468f7034055b915
diff --git a/app-vim/ri-browser/Manifest b/app-vim/ri-browser/Manifest
new file mode 100644
index 000000000000..79058f567340
--- /dev/null
+++ b/app-vim/ri-browser/Manifest
@@ -0,0 +1,3 @@
+DIST ri-browser-1.2.tar.bz2 6499 BLAKE2B b35b066d955cddc4e6ca63d9799388dd7102b0b7e91ccbd4e3625bab48974eb67cde88bc94fa7e139c45a61dac4747c98047b4b41f1fcc48d71676f01f80452a SHA512 98ce57ee9368d22c26b7c9e4a609add45296ed0af1b6a2ca0929344ab7cfb92b6640bf61ecf77b16831236594be54449fac38a2d62520676a55737abee24e305
+EBUILD ri-browser-1.2.ebuild 433 BLAKE2B 1ec3e4bc27ae329a25c46a456456b01eb06cd7432c8966efcbe1b6ee6559f4505915046396d737e252f745e19eaf2be14c652cf6ffcacd6485310bb7f90f31f0 SHA512 2ce865126235fd0106477c46b8826ba7b8e1769d0beb3efa42bd5e27ceb5ac64d02e9314e90f99b59b7cea73cea02302e66366ef1a1ad99ec8053e248e198d74
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/ri-browser/metadata.xml b/app-vim/ri-browser/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/ri-browser/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/ri-browser/ri-browser-1.2.ebuild b/app-vim/ri-browser/ri-browser-1.2.ebuild
new file mode 100644
index 000000000000..577094484201
--- /dev/null
+++ b/app-vim/ri-browser/ri-browser-1.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: interface for browsing ri/ruby documentation"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=494"
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~sparc"
+IUSE=""
+
+RDEPEND="dev-lang/ruby"
+
+VIM_PLUGIN_HELPFILES="ri.txt"
+VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/rust-vim-1_pre20180125 b/app-vim/rust-vim-1_pre20180125
deleted file mode 100644
index 46c07155eb7e..000000000000
--- a/app-vim/rust-vim-1_pre20180125
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Vim configuration for Rust
-EAPI=6
-HOMEPAGE=https://www.rust-lang.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( MIT Apache-2.0 )
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/rust-lang/rust.vim/tarball/8e75da9834abb22f8d7ece3f4ca4324a14fa18a6 -> rust-vim-1_pre20180125.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=4ff343d568aee392a6c33b44290e1875
diff --git a/app-vim/rust-vim/Manifest b/app-vim/rust-vim/Manifest
new file mode 100644
index 000000000000..d3793e806ac8
--- /dev/null
+++ b/app-vim/rust-vim/Manifest
@@ -0,0 +1,3 @@
+DIST rust-vim-1_pre20180125.tar.gz 24497 BLAKE2B b6c45074aba1c52b2f3e96a15f05abb64bde864af3c5b2b61ddf237183426c67d5b3b4dacd78ee4f394d9f0411362186889df9a24e50edd350aaa1178f93bd59 SHA512 845899ad5ba753e2efd3deddcb077749f094163b9923574e34a8edb5d5d0772929315f4f2452f8238f832c2fd4cfa669ab1351df17c74ed2e6cacc783b071ffd
+EBUILD rust-vim-1_pre20180125.ebuild 437 BLAKE2B 8fd9ef9e7b8eb5264fcc22d6c6432fbae89139c4573e72034f6bfa3357f72ccbf28b1064bf10683f8c45ee6dbadd087388c5893a3e53626bf7d72582d483be71 SHA512 e99b0d3f46e3ed04a312e3affdf28739938b94837fa93c09246e8ba10a3677253e5d07118447a3d39d961a457e6f8b976cd72c383aeab944787ec637496e3db7
+MISC metadata.xml 466 BLAKE2B 7670303d76161c05828cb3ee7b349cb52ad02014dbbcec5887baad9ec2e1f53e2f388aa5782e3182a5478f64ac31afa5394e52f46539d4451adb9842a2655946 SHA512 c5f50d3f28ebd55380e26b349a3410eff3aef28f37a42174c018fb49e37aaafa17021d73fc02503c8ee7482536a8b18ee8b75e4eeaf6ea1d1dfa58530e283307
diff --git a/app-vim/rust-vim/metadata.xml b/app-vim/rust-vim/metadata.xml
new file mode 100644
index 000000000000..170cf0d86713
--- /dev/null
+++ b/app-vim/rust-vim/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>hilobakho@gmail.com</email>
+ <name>Mykyta Holubakha</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Gentoo Proxy Maintainers Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">rust-lang/rust.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/rust-vim/rust-vim-1_pre20180125.ebuild b/app-vim/rust-vim/rust-vim-1_pre20180125.ebuild
new file mode 100644
index 000000000000..18018bd9e7a2
--- /dev/null
+++ b/app-vim/rust-vim/rust-vim-1_pre20180125.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin vcs-snapshot
+
+MY_PN="${PN/-/.}"
+REF="8e75da9834abb22f8d7ece3f4ca4324a14fa18a6"
+
+DESCRIPTION="Vim configuration for Rust"
+HOMEPAGE="https://www.rust-lang.org/"
+SRC_URI="https://github.com/rust-lang/${MY_PN}/tarball/${REF} -> ${P}.tar.gz"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/salt-vim-20151119 b/app-vim/salt-vim-20151119
deleted file mode 100644
index 71109c688ec0..000000000000
--- a/app-vim/salt-vim-20151119
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Vim files for working on Salt files
-EAPI=5
-HOMEPAGE=https://github.com/saltstack/salt-vim
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=!<=app-admin/salt-2015.5.6 !~app-admin/salt-2015.8.0 !~app-admin/salt-2015.8.1 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/saltstack/salt-vim/archive/5b15d379fbcbb84f82c6a345abc08cea9d374be9.tar.gz -> salt-vim-20151119.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=fc2c710e031622cca007f562339f0d3b
diff --git a/app-vim/salt-vim/Manifest b/app-vim/salt-vim/Manifest
new file mode 100644
index 000000000000..4dffae46bd96
--- /dev/null
+++ b/app-vim/salt-vim/Manifest
@@ -0,0 +1,3 @@
+DIST salt-vim-20151119.tar.gz 4009 BLAKE2B fc11e5b7ab54283c1e595b4dae608697504f5673862fb627455ae29768b2948a3fcb81117ae6f9bea460412927b22d95d8ea071013bc41848a624c035a7d5609 SHA512 4267263836c986c33d19739afc8ff710234f3519b3f2ed5f4ddd1a929691e02563dd87a0d722d098a2038610b3b0d5021d00497b25cc00bd6ec6b6fcfedb9105
+EBUILD salt-vim-20151119.ebuild 561 BLAKE2B fe01ff408b9e8556b43c201339e924a1e87d13ec91387fea7bd2c1e3f5245a5423856b97d39d8a031ab146f1816f4211c885faf7da7ba67ebd39b816b1b9ca5b SHA512 502822db571a73106316d59012f877b75d794d6c692c8779c7448c851ef03459f317f01bcd5dbeaa9ffe567f04aa2d1ec0576831bc215393ac1f642e2ca3e68f
+MISC metadata.xml 442 BLAKE2B 83791e635a49aeda35b19391dbc091d91440f5e319e00397798e1b708f876546ffc729353472e07f56935b735a449c22cea49d94a481baea008b94971f917084 SHA512 070c99868fe3b9929748607fd0fb8d93860cce5eacbc84603c1dae349552908f9b18b61cf3814cb3042289aedc8e41c36c86ce4cdd18c9755fac2b11fb7dd880
diff --git a/app-vim/salt-vim/metadata.xml b/app-vim/salt-vim/metadata.xml
new file mode 100644
index 000000000000..3ba57bdb5a2e
--- /dev/null
+++ b/app-vim/salt-vim/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>chutzpah@gentoo.org</email>
+ <name>Patrick McLean</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">saltstack/salt-vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/salt-vim/salt-vim-20151119.ebuild b/app-vim/salt-vim/salt-vim-20151119.ebuild
new file mode 100644
index 000000000000..b3685d8b5efd
--- /dev/null
+++ b/app-vim/salt-vim/salt-vim-20151119.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+SALT_VIM_HASH="5b15d379fbcbb84f82c6a345abc08cea9d374be9"
+
+DESCRIPTION="Vim files for working on Salt files"
+HOMEPAGE="https://github.com/saltstack/salt-vim"
+SRC_URI="https://github.com/saltstack/${PN}/archive/${SALT_VIM_HASH}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="!<=app-admin/salt-2015.5.6
+ !~app-admin/salt-2015.8.0
+ !~app-admin/salt-2015.8.1"
+
+S="${WORKDIR}/salt-vim-${SALT_VIM_HASH}"
diff --git a/app-vim/scala-syntax-1.0-r1 b/app-vim/scala-syntax-1.0-r1
deleted file mode 100644
index f0ffa7d5908c..000000000000
--- a/app-vim/scala-syntax-1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Scala syntax highlighting, filetype and indent settings
-EAPI=6
-HOMEPAGE=https://www.scala-lang.org/
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/scala-syntax-1.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=6940232e46fec0a04e6500997ca6a179
diff --git a/app-vim/scala-syntax/Manifest b/app-vim/scala-syntax/Manifest
new file mode 100644
index 000000000000..20622ae9a709
--- /dev/null
+++ b/app-vim/scala-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST scala-syntax-1.0.tar.gz 3622 BLAKE2B 9537b7867a164f1e855dc210645b5dd4c7ac095f8fb27b061c83cf9ca88032adfac3ca618523cb5ef208b1f968e5ae7c26d5e774e4ace870a44e05ed22d6d24e SHA512 b9d4b5f5b0077fdf1c4cfa4ea88e7262c45119d53451bd744490c79a0f5c2890d0f13f0bf58598114899ce6e0cb918fa2933f0194e1e60d9283749ad584347b2
+EBUILD scala-syntax-1.0-r1.ebuild 375 BLAKE2B 5314495b57c0a7ad1fecbe84ccc96a5ae73ec626bcb3377e3fec1228d430396830d971867206113e1ff583582c15236a6bdebf309871c3875f49880e9b8ad3ec SHA512 e764094b8b551763184ac3deef685a95d7d28716f5e859be53c2ef63f03867b48a7d918855b9eb0ef343ee42eae075c2e2c358ab4be83139cc6e1e8ac49e3831
+MISC metadata.xml 220 BLAKE2B eabf3517ba7e5b67320254eeb2b07adf1dbe0c3432b693973bc25a3e3dc8ed160b7313f9f8ae64d994ac272487b785f33202d9640bb5a7ace9f56ceb42978a19 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc
diff --git a/app-vim/scala-syntax/metadata.xml b/app-vim/scala-syntax/metadata.xml
new file mode 100644
index 000000000000..294c350c6960
--- /dev/null
+++ b/app-vim/scala-syntax/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/scala-syntax/scala-syntax-1.0-r1.ebuild b/app-vim/scala-syntax/scala-syntax-1.0-r1.ebuild
new file mode 100644
index 000000000000..ec2f77f792ba
--- /dev/null
+++ b/app-vim/scala-syntax/scala-syntax-1.0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Scala syntax highlighting, filetype and indent settings"
+HOMEPAGE="https://www.scala-lang.org/"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="amd64 x86"
+IUSE=""
diff --git a/app-vim/screen-1.5 b/app-vim/screen-1.5
deleted file mode 100644
index 96fcc21f7962..000000000000
--- a/app-vim/screen-1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: simulate a split shell with screen or tmux
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2711
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=|| ( app-misc/screen app-misc/tmux ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/vim-scripts/Screen-vim---gnu-screentmux/tarball/1.5 -> screen-1.5.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=5d76eb2f1d9e00552b770787df0f48bc
diff --git a/app-vim/screen/Manifest b/app-vim/screen/Manifest
new file mode 100644
index 000000000000..69c5c3b28585
--- /dev/null
+++ b/app-vim/screen/Manifest
@@ -0,0 +1,3 @@
+DIST screen-1.5.tar.gz 16395 BLAKE2B 5fa885a0c1f149b8f4228e4d724af4589368601466f87838bb597bbfebddde8c92b5199c1ee8f220ca6c9298709f4bd2467211d97ec70c2c42e579dc2a793001 SHA512 eef9fbe327b1ef16cb5d5ffb851b04c6d4c8f1b8ef215ae9a0f05c91eaa39538bb470fc1ecd2cbb7697ec23a4fdce2515b97818b47050cbfc4fe7da199648549
+EBUILD screen-1.5.ebuild 563 BLAKE2B fc002ca5bbe95c8670392f36cb8daa93ee73f0c1b337c660414c965dcfd36f4219acd3e20929d30499c4bf9aa8803e453ccf140290587d7d2a077b88251d9be6 SHA512 fb2a3ecde80947de48c15a3275de808aefa55054b71c0d972e10e488355f49fcbc3b6e547be83f205fadf8b988ff7b2c1dac9b55431dbb548cbb68c66bcfbf39
+MISC metadata.xml 363 BLAKE2B 48314a7e338d84a79ad374f1ed872be01a423b38d5bc4306823e8d748bfd7993a51460cba684f78218df55b642417c0464077ac02128a8fb22278407f81faf88 SHA512 0396f42997f43d9feeddfcf10787c98722380b77986b193c4216764391fda7ff901b2616202f607ac1182a92b44dca9097b07a79f7980929350d970cb6154a7d
diff --git a/app-vim/screen/metadata.xml b/app-vim/screen/metadata.xml
new file mode 100644
index 000000000000..fedfc9aeeb89
--- /dev/null
+++ b/app-vim/screen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">vim-scripts/Screen-vim---gnu-screentmux</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/screen/screen-1.5.ebuild b/app-vim/screen/screen-1.5.ebuild
new file mode 100644
index 000000000000..f2a15aa2def7
--- /dev/null
+++ b/app-vim/screen/screen-1.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin vcs-snapshot
+
+MY_PN="Screen-vim---gnu-screentmux"
+DESCRIPTION="vim plugin: simulate a split shell with screen or tmux"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2711"
+SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
+LICENSE="public-domain"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="screen.txt"
+
+RDEPEND="|| ( app-misc/screen app-misc/tmux )"
+
+src_prepare() {
+ rm README || die
+}
diff --git a/app-vim/searchcomplete-1.1-r1 b/app-vim/searchcomplete-1.1-r1
deleted file mode 100644
index 44d43e4a1e99..000000000000
--- a/app-vim/searchcomplete-1.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: tab completion in searches
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=474
-KEYWORDS=alpha sparc x86 ia64 ppc amd64
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/searchcomplete-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/searchcomplete-1.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=1a1c90ea449aae4266893b70b85063e8
diff --git a/app-vim/searchcomplete/Manifest b/app-vim/searchcomplete/Manifest
new file mode 100644
index 000000000000..035ea6c526d3
--- /dev/null
+++ b/app-vim/searchcomplete/Manifest
@@ -0,0 +1,3 @@
+DIST searchcomplete-1.1.tar.bz2 1204 BLAKE2B 0259eea8117d2e27eb939b1d8f5a05d4d2d6b9b6b493372c5d15a7a2a379b112e7eb2c385392e37d5ef3ac2d1e77fdaa7640a6579af3c4e55a1dea8e63b4ce64 SHA512 8c30b446c330665d303935f07566aa0b3ac8bbb89a3068d5da40209f3a4d17dc3371245dd7bef567030b1a33653f9c481cd1165ee200b0c73723da5f5aea2043
+EBUILD searchcomplete-1.1-r1.ebuild 393 BLAKE2B 76a60dd633e56c128203d6a8c3f5e1643b14243f979b8f8158f47083cd2cb1b397f28a7ab64f37b141de3d22e051c874fa605c9aff67ae59104205d14dc0f6af SHA512 8aff4b8f34b8678db54a335a1d03456eea8f7a8743aac0e17edbe780053e93f5cdace9472355d4a1061384f95875f47e3f9fbbd61a371206e85b2b896c9188ea
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/searchcomplete/metadata.xml b/app-vim/searchcomplete/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/searchcomplete/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/searchcomplete/searchcomplete-1.1-r1.ebuild b/app-vim/searchcomplete/searchcomplete-1.1-r1.ebuild
new file mode 100644
index 000000000000..de6531885534
--- /dev/null
+++ b/app-vim/searchcomplete/searchcomplete-1.1-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: tab completion in searches"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=474"
+LICENSE="GPL-2"
+KEYWORDS="alpha sparc x86 ia64 ppc amd64"
+IUSE=""
+
+VIM_PLUGIN_HELPURI="http://www.vim.org/scripts/script.php?script_id=474"
diff --git a/app-vim/securemodelines-20140926 b/app-vim/securemodelines-20140926
deleted file mode 100644
index 454289935e32..000000000000
--- a/app-vim/securemodelines-20140926
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: secure, user-configurable modeline support
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1876 https://github.com/ciaranm/securemodelines
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/securemodelines-20140926.tar.bz2 https://dev.gentoo.org/~radhermit/vim/securemodelines-20140926.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=03945aa4306bdcf539fbd2f9b6789982
diff --git a/app-vim/securemodelines/Manifest b/app-vim/securemodelines/Manifest
new file mode 100644
index 000000000000..cbc834309e92
--- /dev/null
+++ b/app-vim/securemodelines/Manifest
@@ -0,0 +1,3 @@
+DIST securemodelines-20140926.tar.bz2 1562 BLAKE2B 14b58973e25eb91970f62733840a8db20680cc57266e68129d6a490fac970951044a350d936e497797892bf428de737226c9c57c986de5816c0e771bc65418e0 SHA512 15a948781751998d832f445e7c3ad936e5c034fcc9936d977c5cf05215dd541a235fc066f7e774b151fac2afb2b0a59665d13f6f981cc59d4e1135f06f6cdc35
+EBUILD securemodelines-20140926.ebuild 515 BLAKE2B 87bf25ee67f4c45771d8ad0b29fca69e2920c2973cf411600fdc565d7d5d10431186ee99a69e1bffbc0f00e0eb5b6a7328f704b42a75b5de9b84ddb8de4761a5 SHA512 de5054e7363f275d53ae8cfb407a938d7bb30b5b6c9bd9263a7fee1e798d46cea69e5ed988d1fd3ad7b6e580ba2383dfcd4bd916ca3dd98a3dcab2b6a5f179a1
+MISC metadata.xml 621 BLAKE2B 1917398769758c657f0975c986e7ee09056ad2a87782a47523bcc558a2ac1644da90c8310add6e86b29c697264ef817f2bb6f08738cb9df3668a9ed13d416bb2 SHA512 ca9e3cce0633bacbb643201bc746e9c6397e9803c6b6c717c1a6e8fd2582e85e61f9fe7c8ea3ea575de6150ded96a0d26ce0fb6ac973884c37c19ce28ded9204
diff --git a/app-vim/securemodelines/metadata.xml b/app-vim/securemodelines/metadata.xml
new file mode 100644
index 000000000000..419ac8208807
--- /dev/null
+++ b/app-vim/securemodelines/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Vim's internal modeline support allows all sorts of annoying and
+ potentially insecure options to be set. This script implements a much
+ more heavily restricted modeline parser that permits only user-specified
+ options to be set.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">ciaranm/securemodelines</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/securemodelines/securemodelines-20140926.ebuild b/app-vim/securemodelines/securemodelines-20140926.ebuild
new file mode 100644
index 000000000000..1027ea74755f
--- /dev/null
+++ b/app-vim/securemodelines/securemodelines-20140926.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: secure, user-configurable modeline support"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1876 https://github.com/ciaranm/securemodelines"
+LICENSE="vim"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+
+VIM_PLUGIN_HELPTEXT="Make sure that you disable vim's builtin modeline support if you have
+enabled it in your .vimrc."
diff --git a/app-vim/selinux-syntax-20041225 b/app-vim/selinux-syntax-20041225
deleted file mode 100644
index 4d2c4aceb5ed..000000000000
--- a/app-vim/selinux-syntax-20041225
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: SELinux type enforcement policy syntax
-EAPI=0
-HOMEPAGE=http://www.cip.ifi.lmu.de/~bleher/selinux/
-KEYWORDS=alpha amd64 ia64 ~mips ppc ppc64 sparc x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/selinux-syntax-20041225.tar.bz2 https://dev.gentoo.org/~radhermit/vim/selinux-syntax-20041225.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=54622e4e4c36d505ff0f18cfba60ffdd
diff --git a/app-vim/selinux-syntax/Manifest b/app-vim/selinux-syntax/Manifest
new file mode 100644
index 000000000000..0cb9cb4c3317
--- /dev/null
+++ b/app-vim/selinux-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST selinux-syntax-20041225.tar.bz2 1411 BLAKE2B 426db3b7698ec8b0bcac90f3098a14f100d5cfa3d5ac36791ada0c6cd1d83053446e82f85eeee181253df9f2c69a2fd82871a96ca73d3a737d4cb5b4fc50f234 SHA512 ff048bc00a7774a8ab265bcaae4e5f7c2a3de48027ebfa4e8cf23611089fa33bbec90edda83b1341df618706d99c6b4fb52111abdc48b68e9924cde0ac1fe4d5
+EBUILD selinux-syntax-20041225.ebuild 447 BLAKE2B db9f2c2fb7b3bf5cc9c8b7acd7a4f16aeda6e417aeac453de09793a5cb4973971d2b8c9fb53821cd0321719db358ab51cbc50b355789db8c6bc10a3f4a3265bc SHA512 df1d9cca51ed9e05a347a965c53d6030153683884e6ac431408c4ed22654c0df10da5e7e339661fd6cadf6bfc6a75917e17483cc1bba3cede8f08ebce6203f17
+MISC metadata.xml 360 BLAKE2B 1f19a9b29777df127caf7afb342b3d8d65adfd4817d6109c0f3ee900cb34138559e6156557153c84edb6116a34de5b6108402c9bec973c388d409bf77bd2b5de SHA512 6d2aa6636d95c12b37ff47e212b8bb61df9fdc7484627a0111a34cc50363d13128e79f1f20f43059e5c92c09727584762dd80695f791a0cc040561521f777834
diff --git a/app-vim/selinux-syntax/metadata.xml b/app-vim/selinux-syntax/metadata.xml
new file mode 100644
index 000000000000..bf7daabc0193
--- /dev/null
+++ b/app-vim/selinux-syntax/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+<maintainer type="project">
+ <email>hardened@gentoo.org</email>
+ <name>Gentoo Hardened</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/selinux-syntax/selinux-syntax-20041225.ebuild b/app-vim/selinux-syntax/selinux-syntax-20041225.ebuild
new file mode 100644
index 000000000000..c4b496a2c7db
--- /dev/null
+++ b/app-vim/selinux-syntax/selinux-syntax-20041225.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: SELinux type enforcement policy syntax"
+HOMEPAGE="http://www.cip.ifi.lmu.de/~bleher/selinux/"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for SELinux type enforcement
+policy (*.te) files."
diff --git a/app-vim/session-2.13.1 b/app-vim/session-2.13.1
deleted file mode 100644
index 3d753057b75f..000000000000
--- a/app-vim/session-2.13.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: extended session management for vim
-EAPI=6
-HOMEPAGE=http://peterodding.com/code/vim/session/
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=app-vim/vim-misc-1.17.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/xolox/vim-session/archive/2.13.1.tar.gz -> session-2.13.1.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=554bc3340efcd93b2560d41749feecb6
diff --git a/app-vim/session/Manifest b/app-vim/session/Manifest
new file mode 100644
index 000000000000..e3025062d793
--- /dev/null
+++ b/app-vim/session/Manifest
@@ -0,0 +1,3 @@
+DIST session-2.13.1.tar.gz 79688 BLAKE2B 772350bd96bea4ef0fd83e0eac214d308c6c40965b3236c8b8c645bc59058ac0a78427563174f4dcf7d88d2514d1437d825f1486693ea52adc281a393de95b9a SHA512 44a7ca107da6710f70705646b4ace26a92abfd56802dc38e22e620f4155c3752d4c880b0055089d85d52b54e34a5c7b47bfc4c39721bd3569ec335c4d3a91efe
+EBUILD session-2.13.1.ebuild 546 BLAKE2B 3196f42af4d0834acdda9aae58fef9bacba452be1692a7c80e59268a938dda19fdeeb90c17a5a579e4c7a05cbb73dfdf1180fabd971a3ecaeb36fb7f4dafa237 SHA512 88853782788b608dcc2550de424401ff9c08f12ca5cc008fbc9c70a588ca395fda4912e74a08071a63f2f670a2b51320dc111a21369c1e169a161180d5b784cc
+MISC metadata.xml 341 BLAKE2B fefd9ce3965829cbb3f1e52e8d5ac4f9e131871ba62057fde0628d5f76bf66a9c6eddc0ca5328033d25e4917f8210e2496dded7a5c866033a8dd259370e61d27 SHA512 0b53b76b4e8c3639b707c5d5b4ed05fd3577f3f37d243b5554ecda6b52e608ffd4a1b724184eda3da4584493f3b55870763100c627c5dc58af434f85927f6961
diff --git a/app-vim/session/metadata.xml b/app-vim/session/metadata.xml
new file mode 100644
index 000000000000..ca843562ba5c
--- /dev/null
+++ b/app-vim/session/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">xolox/vim-session</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/session/session-2.13.1.ebuild b/app-vim/session/session-2.13.1.ebuild
new file mode 100644
index 000000000000..8af04e2940db
--- /dev/null
+++ b/app-vim/session/session-2.13.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: extended session management for vim"
+HOMEPAGE="http://peterodding.com/code/vim/session/"
+SRC_URI="https://github.com/xolox/vim-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND=">=app-vim/vim-misc-1.17.6"
+
+S=${WORKDIR}/vim-${P}
+
+src_prepare() {
+ default
+
+ # remove unneeded files
+ rm addon-info.json *.md || die
+}
diff --git a/app-vim/showmarks-2.2-r1 b/app-vim/showmarks-2.2-r1
deleted file mode 100644
index ee2ff8860f6b..000000000000
--- a/app-vim/showmarks-2.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: show location marks visually
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=152
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=public-domain
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/showmarks-2.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/showmarks-2.2.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=89d9c8c5f69b9d0416e20becabf7f89e
diff --git a/app-vim/showmarks/Manifest b/app-vim/showmarks/Manifest
new file mode 100644
index 000000000000..e571173f4f5f
--- /dev/null
+++ b/app-vim/showmarks/Manifest
@@ -0,0 +1,3 @@
+DIST showmarks-2.2.tar.bz2 8195 BLAKE2B 2be7ef6fc040fcc6d808771ac45523148685b466b5eb7ffc6c5b31f4a2387375c84aae931ffcb6494ecaa9cd9713567e9f7fa19981678cdffaecc38aa9f27bdf SHA512 0121070d8b8c51b3b31c1d052b368fac304ee38e413881e67e2b9336b1edcae6af165c592d592f42c502834856d2c097b575571286574ba83a51d4fc9964b7a3
+EBUILD showmarks-2.2-r1.ebuild 837 BLAKE2B dec7dcb428bd6a829f04984f71b90f74a907194c6b33e543ab6d46b1708898a5811c2ae79cb5f0f9903a7533b6b79868857cc88ffb5ccb5dbebc93aab71926c0 SHA512 b23952082f53b138cbde105fe8a0cffbc96396891135bb074659b6566dd19ec99afe642374efbb4e78ce2f822aae4b0b80f0c342fe4912a8154b61ef096930ee
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/showmarks/metadata.xml b/app-vim/showmarks/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/showmarks/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/showmarks/showmarks-2.2-r1.ebuild b/app-vim/showmarks/showmarks-2.2-r1.ebuild
new file mode 100644
index 000000000000..a28e80f254c9
--- /dev/null
+++ b/app-vim/showmarks/showmarks-2.2-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: show location marks visually"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=152"
+
+LICENSE="public-domain"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="showmarks.txt"
+
+src_prepare() {
+ default
+
+ mkdir "${S}"/doc || die "can't make doc dir"
+
+ # This plugin uses an 'automatic HelpExtractor' variant. This causes
+ # problems for us during the unmerge. Fortunately, sed can fix this
+ # for us.
+ sed -e '1,/^" HelpExtractorDoc:$/d' \
+ "${S}"/plugin/showmarks.vim > "${S}"/doc/showmarks.txt \
+ || die "help extraction failed"
+ sed -i -e '/^" HelpExtractor:$/,$d' "${S}"/plugin/showmarks.vim \
+ || die "help extract remove failed"
+}
diff --git a/app-vim/sleuth-1.0 b/app-vim/sleuth-1.0
deleted file mode 100644
index 4b8c0dd882c3..000000000000
--- a/app-vim/sleuth-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: heuristically set buffer options
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/sleuth-1.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/sleuth-1.0.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=58b84c785968427d828580d2fda8474e
diff --git a/app-vim/sleuth-1.1 b/app-vim/sleuth-1.1
deleted file mode 100644
index c581115c6f5d..000000000000
--- a/app-vim/sleuth-1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: heuristically set buffer options
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/sleuth-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/sleuth-1.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=7134ef3efe87786bc9c05251d35617e1
diff --git a/app-vim/sleuth/Manifest b/app-vim/sleuth/Manifest
new file mode 100644
index 000000000000..f15fb1a2095f
--- /dev/null
+++ b/app-vim/sleuth/Manifest
@@ -0,0 +1,5 @@
+DIST sleuth-1.0.tar.bz2 1839 BLAKE2B 884c1e3ad2e5202e4827d9973611584dff0ec7c0dff6f310a192a757daa2ae8342c62d15f075249550880843f3596b195ab358ba186a764cdc51080abce5d76c SHA512 19fb158a28bfa02e7364208f11911d0afcda77f4a35a410202b0342130e48b99b52db56aa687b2484ba0ac9595970ae040c349e7a0fd350f07c40b6b58d43a13
+DIST sleuth-1.1.tar.bz2 1972 BLAKE2B ca16a57f180bde63fd06510013c7e695ebe9111d42975b577932f860321286379dc71bb840135ce1d60f1f27de942792889ff9de974b1366988b2407413838c8 SHA512 76a2bbb651452cb7a2336cebed5f7e8ff79e995bc7ba11d36089f7e58f607df031306bf38fd161e7af728aa6699b37fa8c2c322b8a8cfa7889dfaa3e96d400c9
+EBUILD sleuth-1.0.ebuild 373 BLAKE2B 1a683ea8f794fd99d7dda89f8baff41f1b30a2d1d213f93dba95dbc1ea67865867018779a00fc360f87f197e5f2d636e886c99a8718860c9de16aaee3ba96667 SHA512 30d62c1d33372545fa8cbc731bc5057e325ff69d8312045efff8e79f724439f7c240ae9077cd007abed80582aad2880eb6916afb0958f6581dee312a45a2f8af
+EBUILD sleuth-1.1.ebuild 363 BLAKE2B 3973cc74eea58e535fa0c5c414ae68a64946a8bf2b426951708f08fc43dc1e53dac2140db118451baa039c1d1210e3adb80503cbac62fb66cd7415850624498c SHA512 867b893046fe1b7bcd335789799f1b75a031d5b8a130082785ef54f26d15b6515da26f2fffa037df86e629648a943aed4d9dc38f489b06f52a9d8290146d71d4
+MISC metadata.xml 340 BLAKE2B 0e3a5e7cb9c253bdcb3944d5717482fb61d2ffadb701c02a40c5cec18887a129da2b3eaa1e3f30f5f262093b0f5292f6fbb018119e8bcf1a4a4f848c5caf0978 SHA512 53ef8e8ee6f87ce5bb69f75ac07f0b59bb4e699a6ba6ef8cef6191d3cc887fcf18efa84a92d2403c925cfd8276245c4087298077b3a379f1017effe19dba488e
diff --git a/app-vim/sleuth/metadata.xml b/app-vim/sleuth/metadata.xml
new file mode 100644
index 000000000000..675d6cf8ebc9
--- /dev/null
+++ b/app-vim/sleuth/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">tpope/vim-sleuth</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/sleuth/sleuth-1.0.ebuild b/app-vim/sleuth/sleuth-1.0.ebuild
new file mode 100644
index 000000000000..fa42aff92d2b
--- /dev/null
+++ b/app-vim/sleuth/sleuth-1.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: heuristically set buffer options"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="${PN}"
diff --git a/app-vim/sleuth/sleuth-1.1.ebuild b/app-vim/sleuth/sleuth-1.1.ebuild
new file mode 100644
index 000000000000..f3ba9c8c9560
--- /dev/null
+++ b/app-vim/sleuth/sleuth-1.1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: heuristically set buffer options"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
diff --git a/app-vim/slimv-0.9.12-r1 b/app-vim/slimv-0.9.12-r1
deleted file mode 100644
index 4da6847ad06b..000000000000
--- a/app-vim/slimv-0.9.12-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: aid Lisp development by providing a SLIME-like Lisp and Clojure REPL
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2531 https://github.com/kovisoft/slimv
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=public-domain
-RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( dev-lisp/clisp dev-lang/clojure dev-lisp/abcl dev-lisp/clozurecl dev-lisp/ecls dev-lisp/sbcl ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://bitbucket.org/kovisoft/slimv/get/0.9.12.tar.bz2 -> slimv-0.9.12.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=a20008c6e80aaa3c11398629a9678721
diff --git a/app-vim/slimv-0.9.13_p20170910 b/app-vim/slimv-0.9.13_p20170910
deleted file mode 100644
index fd49925e069b..000000000000
--- a/app-vim/slimv-0.9.13_p20170910
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: aid Lisp development by providing a SLIME-like Lisp and Clojure REPL
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2531 https://github.com/kovisoft/slimv
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain
-RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( dev-lisp/abcl dev-lisp/ecls dev-lisp/sbcl dev-lisp/clisp dev-lang/clojure dev-lisp/clozurecl ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/kovisoft/slimv/archive/acf9b30be71c54db4f4875d257b905941ca69ed8.tar.gz -> slimv-0.9.13_p20170910.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=cac5d213afb1869d3b21b3afd2277d5a
diff --git a/app-vim/slimv/Manifest b/app-vim/slimv/Manifest
new file mode 100644
index 000000000000..eb32fc60e48f
--- /dev/null
+++ b/app-vim/slimv/Manifest
@@ -0,0 +1,5 @@
+DIST slimv-0.9.12.tar.bz2 614025 BLAKE2B 8740e905a12b28715f953fecfdde3c7d6b4eeb74fc190c433bdb7120b3a6af5d5c9c2ced3f57a43ab8b9bd1402cb15462892343bb621f8b56453d98a909ff882 SHA512 7ccf617780c5d6b8d25738546cb9df6986b4409748a5938e8d9112b057d34626a6b8525fb8622db06d0f300d6ec38f7513ef2c0e49df3bcd89614888887ca057
+DIST slimv-0.9.13_p20170910.tar.gz 634493 BLAKE2B af7963e1d1b60b20294c935ecd076220777eec333b4e91bac82a111b727ce71c312c347b865f9e0c9072c0f94b40dc920b15feaf10f8683e1bba7590a177e62e SHA512 562e08866d62a6af5c20064a4533da7f0577ceb43391fac59acc0bb9c76319e3520c951c325277edbb2d0461fa227b91456c54ec5d9d1e3bca18d344f3e9a5e2
+EBUILD slimv-0.9.12-r1.ebuild 899 BLAKE2B 778bc0eb8febd46e7b42943bb4fcc4a1257bf136a342891655b6c80f2f496ef2ac62f6eddffe5c63ea75323188a05c2eb5906951213f41b6383e638454bc0908 SHA512 6549c954e0f2f2031b32470d8cd0061f01dcc0043af885e195d1b42fb9224436e5e79ddd94328c5d357c7aaee71ea370f2f4fee0f5ee9596e4d2a5e0fbe07b8b
+EBUILD slimv-0.9.13_p20170910.ebuild 1001 BLAKE2B 598a50667d0c3155f3c516eab3a677e39c94a069ef998aa167d7feb91ff6037eab2db25728dd0db28e2f1464b1808987c2f271223896ea37e4a2736025bd7cbc SHA512 18da1cc235a2c0838e5fc1ad670d6b4afed98ae22e5c5847be636e4d29cedb0f60187d676106558047bb241c80a39307426047a79b2cf6327821fa46d773a0a3
+MISC metadata.xml 1220 BLAKE2B 7d60a456299acdd198b51276a1016fec37007bdb6220efaa786889b0d046de73d14724e2a8bd5efaec84e0c850ff69bdaf344bbedcafa132a0a8c0c45fad051e SHA512 11c6fb3a83ea65ea97e57e70b24d9e011d48fb456bff15ea8b501e0dab767f73c78ae1c63e662423599252dee9969c1983b17fd1505533b3ee26f3afde2a3b29
diff --git a/app-vim/slimv/metadata.xml b/app-vim/slimv/metadata.xml
new file mode 100644
index 000000000000..0f0e597cc1b6
--- /dev/null
+++ b/app-vim/slimv/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Slimv tries to mimic a subset of SLIME's (Superior Lisp Interaction Mode
+ for Emacs) functionality inside Vim. The script defines functions and
+ keybindings to send s-expressions to a console mode Lisp or Clojure REPL
+ (Read-Eval-Print Loop).
+
+ Slimv runs its own REPL or connects to a running REPL started by a
+ previous Slimv session, the connection is established when the first
+ Slimv command is executed (e.g. an s-expression is evaluated). The Lisp
+ REPL buffer can also be opened inside Vim as a Vim buffer with syntax
+ highlighting and autoindenting, Lisp commands may be entered in the
+ command line, just as in a regular REPL. The script also has a basic
+ support for Clojure REPL.
+
+ The script also supports a number of other features provided by SLIME
+ including profiling, paredit mode, and hyperspec lookups.
+ </longdescription>
+ <upstream>
+ <remote-id type="bitbucket">kovisoft/slimv</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/slimv/slimv-0.9.12-r1.ebuild b/app-vim/slimv/slimv-0.9.12-r1.ebuild
new file mode 100644
index 000000000000..1d601bfbaeef
--- /dev/null
+++ b/app-vim/slimv/slimv-0.9.12-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin vcs-snapshot
+
+DESCRIPTION="vim plugin: aid Lisp development by providing a SLIME-like Lisp and Clojure REPL"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2531 https://github.com/kovisoft/slimv"
+SRC_URI="https://bitbucket.org/kovisoft/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+LICENSE="public-domain"
+KEYWORDS="amd64 x86"
+
+RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
+ ${PYTHON_DEPS}
+ || (
+ dev-lisp/clisp
+ dev-lang/clojure
+ dev-lisp/abcl
+ dev-lisp/clozurecl
+ dev-lisp/ecls
+ dev-lisp/sbcl
+ )"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+ # remove emacs related files
+ rm -r slime swank-clojure || die
+}
diff --git a/app-vim/slimv/slimv-0.9.13_p20170910.ebuild b/app-vim/slimv/slimv-0.9.13_p20170910.ebuild
new file mode 100644
index 000000000000..9f4e50a10ec2
--- /dev/null
+++ b/app-vim/slimv/slimv-0.9.13_p20170910.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin vcs-snapshot
+
+# Commit Date: July 10th 2017
+COMMIT="acf9b30be71c54db4f4875d257b905941ca69ed8"
+
+DESCRIPTION="vim plugin: aid Lisp development by providing a SLIME-like Lisp and Clojure REPL"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2531 https://github.com/kovisoft/slimv"
+SRC_URI="https://github.com/kovisoft/slimv/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ || (
+ app-editors/vim[python,${PYTHON_USEDEP}]
+ app-editors/gvim[python,${PYTHON_USEDEP}]
+ )
+ ${PYTHON_DEPS}
+ || (
+ dev-lisp/abcl
+ dev-lisp/ecls
+ dev-lisp/sbcl
+ dev-lisp/clisp
+ dev-lang/clojure
+ dev-lisp/clozurecl
+ )"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+ default
+ # remove emacs related files
+ rm -r slime swank-clojure || die
+}
diff --git a/app-vim/snipmate-0.87-r1 b/app-vim/snipmate-0.87-r1
deleted file mode 100644
index eb915603b9f3..000000000000
--- a/app-vim/snipmate-0.87-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: TextMate-style snippets
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2540 https://github.com/garbas/vim-snipmate
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=app-vim/vim-addon-mw-utils app-vim/tlib || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/garbas/vim-snipmate/archive/v0.87.tar.gz -> snipmate-0.87.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=b5ad62f2d6f1d418b3abbb37d4002ff8
diff --git a/app-vim/snipmate/Manifest b/app-vim/snipmate/Manifest
new file mode 100644
index 000000000000..666e77ed674e
--- /dev/null
+++ b/app-vim/snipmate/Manifest
@@ -0,0 +1,3 @@
+DIST snipmate-0.87.tar.gz 20624 BLAKE2B 74e8c9f594c711d9be95768dd9c76f82f7c1a68de94f55090be8251c27970ebd47488d1b364d6e0b66c7d5d3d2ce68e98e832555e5aa4d83f53b6f72f044ee66 SHA512 36ef13676e0ff8085456883ad09c111158be6051251a15b428a05d3caee678a6c8ab092694fdf876ecdf19b93e04cb8ff67108dda83ab602250f5ae42602e6b9
+EBUILD snipmate-0.87-r1.ebuild 631 BLAKE2B 79fb01823ca16bccd3edd391ab888563207b1bf56a22f2e7687492faf6c133bbc474ff4b0d810f94278636fa3567c7082ef7a00f8e953c672372c05a245f7bf0 SHA512 c595627fdf4d26634b2927a3485bb0c1d17279cd8a471a18b970e0fcc1c7f01ce6776f64203f7f1c6b06bb0d0fd072cad389b2ed4cdd885548ecc27f618684ff
+MISC metadata.xml 333 BLAKE2B 85580e0392b9e766d9ce511441b4320fa0025fbae223ed72b0c4c8debfda9303e846c76dc2dd11bf3cbd0ac88d5cb5f4d553a9874004799bb0a524cfc2251c3c SHA512 e74edb9123ce65fe8ba73a41b21ed68702f7e9e6c902ce5d4b3dca9caee585747720444ab71866c6472a3ef1cf3cbcc12668248d3180ec03184af3d29a2406f3
diff --git a/app-vim/snipmate/metadata.xml b/app-vim/snipmate/metadata.xml
new file mode 100644
index 000000000000..e1b691100398
--- /dev/null
+++ b/app-vim/snipmate/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">garbas/vim-snipmate</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/snipmate/snipmate-0.87-r1.ebuild b/app-vim/snipmate/snipmate-0.87-r1.ebuild
new file mode 100644
index 000000000000..4397b174c5a4
--- /dev/null
+++ b/app-vim/snipmate/snipmate-0.87-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN=vim-${PN}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="vim plugin: TextMate-style snippets"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2540 https://github.com/garbas/vim-snipmate"
+SRC_URI="https://github.com/garbas/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+ app-vim/vim-addon-mw-utils
+ app-vim/tlib
+"
+
+S=${WORKDIR}/${MY_P}
+
+VIM_PLUGIN_HELPFILES="SnipMate"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+ rm addon-info.json || die
+}
diff --git a/app-vim/splice-1.0.1 b/app-vim/splice-1.0.1
deleted file mode 100644
index 02cb2eb1a370..000000000000
--- a/app-vim/splice-1.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: resolve conflicts during three-way merges
-EAPI=5
-HOMEPAGE=https://sjl.bitbucket.org/splice.vim/ http://vim.sourceforge.net/scripts/script.php?script_id=4026
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://gentoo/splice-1.0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/splice-1.0.1.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=59179f4a343549865bde83d412336b0e
diff --git a/app-vim/splice-1.1.0 b/app-vim/splice-1.1.0
deleted file mode 100644
index 8cb5adf6aa14..000000000000
--- a/app-vim/splice-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: resolve conflicts during three-way merges
-EAPI=6
-HOMEPAGE=https://bitbucket.org/sjl/splice.vim http://vim.sourceforge.net/scripts/script.php?script_id=4026
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://bitbucket.org/sjl/splice.vim/get/v1.1.0.tar.gz -> splice-1.1.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=896e74d2c7eed37d4ac512402844f8eb
diff --git a/app-vim/splice/Manifest b/app-vim/splice/Manifest
new file mode 100644
index 000000000000..b4d715bb861a
--- /dev/null
+++ b/app-vim/splice/Manifest
@@ -0,0 +1,5 @@
+DIST splice-1.0.1.tar.bz2 12369 BLAKE2B ce43b38a74dd8c51c4fb2d23951119c259595dcc3f5bbeb5524d747a373ba7e71dc2bf4df957b48dca5aba5f2c04bb18bbe83d9551f63d2b055cdeddbc523713 SHA512 65826a9054163f59d8dc0a558e3b748f27015bb6075e8d158214e6824c922599552a69c7d09364599285d6effdfc42fa6dd98e858a8bfa47ebc21a4d18394ede
+DIST splice-1.1.0.tar.gz 15513 BLAKE2B 8517d8c2fef2ccb85267a69c606e861a7c5498af2c23454ce58fb4e6035b13d71fab08c7fe09198b99453a1475062a7916814ef2018adbb849b48fac32e16d51 SHA512 3008c5628ca7b05be451521f9e1f0f2d8dcc8c968e95f2791e76a355b2c9f3b85c62faa319a2f1427f223094b3e606577d19a61b2384b78cbd6d40f497e4ad37
+EBUILD splice-1.0.1.ebuild 714 BLAKE2B 8fa5503c2b6890d44042de0f9b1efa6c448d40906c5b74a2a474b991368fb6308856e3469068a6831a4b09f77c16715a7b754add1024dd0dafe1d2675e628245 SHA512 c9700ac764a36afd97ccec149dd45d8a8236eae470ecb3939b7856be70efdfeea87748c8ecb061eaec0813ccc57c93de06efd3eed28995e7adb5d5ae3e4dcf61
+EBUILD splice-1.1.0.ebuild 895 BLAKE2B 045d92ea5a059198aed734dc79190b543836dfb452a3fa637c53de4aa8a9d222f7c357e9969fda9f34965e27e0a95e5db14ce085856d00d1df7e5c06cb5d4bc7 SHA512 69fcde94ee3b9c1d76629c6e067a53fd1d93f5e8d7919b560a98d4a2f0ab380789de4a467617375ca2a0da8e6d50dc5ad3e30f25c1e3e9e184cebbd8f593d4b4
+MISC metadata.xml 379 BLAKE2B ae1816407de2de76d021e1577e8dacf863585fe190af44b9af8b0247cfbd61fc834601b87412d1d048655924bac586fef79d869bf553213f566a81372cc545d6 SHA512 76d8d1f9dbdd2aa7fa54e8d4dde8a34fa62e69e5e20154545572f3c083df1fddf7e3ed286d1077f63cd4a46bdb7bcf3617700fedd2c77800e1dc4d15ac67e9b0
diff --git a/app-vim/splice/metadata.xml b/app-vim/splice/metadata.xml
new file mode 100644
index 000000000000..d67ea981ad1a
--- /dev/null
+++ b/app-vim/splice/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">vim</remote-id>
+ <remote-id type="bitbucket">sjl/splice.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/splice/splice-1.0.1.ebuild b/app-vim/splice/splice-1.0.1.ebuild
new file mode 100644
index 000000000000..60628b4e9474
--- /dev/null
+++ b/app-vim/splice/splice-1.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="vim plugin: resolve conflicts during three-way merges"
+HOMEPAGE="https://sjl.bitbucket.org/splice.vim/ http://vim.sourceforge.net/scripts/script.php?script_id=4026"
+
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ || (
+ app-editors/vim[python]
+ app-editors/gvim[python]
+ )"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+ rm LICENSE.markdown || die
+}
+
+src_install() {
+ vim-plugin_src_install
+ python_optimize "${ED}"/usr/share/vim/vimfiles/autoload/splicelib
+}
diff --git a/app-vim/splice/splice-1.1.0.ebuild b/app-vim/splice/splice-1.1.0.ebuild
new file mode 100644
index 000000000000..f74cf9af1d36
--- /dev/null
+++ b/app-vim/splice/splice-1.1.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit vim-plugin python-single-r1 vcs-snapshot
+
+DESCRIPTION="vim plugin: resolve conflicts during three-way merges"
+HOMEPAGE="https://bitbucket.org/sjl/splice.vim http://vim.sourceforge.net/scripts/script.php?script_id=4026"
+SRC_URI="https://bitbucket.org/sjl/${PN}.vim/get/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ || (
+ app-editors/vim[python,${PYTHON_USEDEP}]
+ app-editors/gvim[python,${PYTHON_USEDEP}]
+ )"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+ default
+ rm .[a-z]* Makefile LICENSE.markdown package.sh || die
+ rm -r site || die
+}
+
+src_install() {
+ vim-plugin_src_install
+ python_optimize "${ED}"/usr/share/vim/vimfiles/autoload/splicelib
+}
diff --git a/app-vim/sudoedit-0.21 b/app-vim/sudoedit-0.21
deleted file mode 100644
index f384bcd3c9fa..000000000000
--- a/app-vim/sudoedit-0.21
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: edit files using sudo or su
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2709 https://github.com/chrisbra/SudoEdit.vim
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( app-admin/sudo sys-apps/shadow ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/sudoedit-0.21.tar.bz2 https://dev.gentoo.org/~radhermit/vim/sudoedit-0.21.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=c6f24345f59ee0aaaf9737fcf0b18037
diff --git a/app-vim/sudoedit/Manifest b/app-vim/sudoedit/Manifest
new file mode 100644
index 000000000000..a38a54b0bddb
--- /dev/null
+++ b/app-vim/sudoedit/Manifest
@@ -0,0 +1,3 @@
+DIST sudoedit-0.21.tar.bz2 12483 BLAKE2B 52ccec0655cc87433e526d1a430980ad688d673e7485310b88a51673d5ba7af7fabf10a703b7b7d63dd0375eb34c3fbdf44ad709bed9785d608f542d3e8d87de SHA512 60d5fde0ef82c4ccba2b62c75651cb1ed1dfc2a4e2815785dcaf4e515222a4d2bed193cdd8323a742109cb43a4123d27db39776a562b150b93ffdb9beec12d3c
+EBUILD sudoedit-0.21.ebuild 518 BLAKE2B 3e4f4bccfb44b4e42d083baac42fded1dacd60329f4f755465838931400c251854294a554aff8b8f15dd40a1e65dbd3c5e46d6377463e2ead81fe32dec3c59c0 SHA512 b66e967068a1c0f9b3caf52b38dcfeb3cb5d7575b3d56200e5ebee52e18d422b53c92daef87a5f5f786b82a5b744154ae93d21aa2935d0c69dd4681b97fabc29
+MISC metadata.xml 345 BLAKE2B 5de36eee6452d7c53d3126e853cda9adf7ce22f76c65246a3e6cdcffbac6035b67d66c148b897d3e3f3f17627989711373638f6251d1100d02741274386bcbd3 SHA512 d142b12bdcea40b3bdec43b9c1309eea2a6463c552c864e1d71bdc63189288e0a76958a8452d79bcbcc1d9a80da26aa895176ae08c7b52555756ed695afab37e
diff --git a/app-vim/sudoedit/metadata.xml b/app-vim/sudoedit/metadata.xml
new file mode 100644
index 000000000000..ad1ce6e291f1
--- /dev/null
+++ b/app-vim/sudoedit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">chrisbra/SudoEdit.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/sudoedit/sudoedit-0.21.ebuild b/app-vim/sudoedit/sudoedit-0.21.ebuild
new file mode 100644
index 000000000000..c2dac75eec6a
--- /dev/null
+++ b/app-vim/sudoedit/sudoedit-0.21.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: edit files using sudo or su"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2709 https://github.com/chrisbra/SudoEdit.vim"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+VIM_PLUGIN_HELPFILES="SudoEdit.txt"
+
+RDEPEND="|| ( app-admin/sudo sys-apps/shadow )"
+
+src_prepare() {
+ # remove unused windows related files
+ rm autoload/{sudo.cmd,SudoEdit.vbs} || die
+}
diff --git a/app-vim/supertab-2.1 b/app-vim/supertab-2.1
deleted file mode 100644
index bb61bc306570..000000000000
--- a/app-vim/supertab-2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: enhanced Tab key functionality
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1643 https://github.com/ervandew/supertab/
-KEYWORDS=amd64 ~mips ppc x86
-LICENSE=BSD
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/ervandew/supertab/archive/2.1.tar.gz -> supertab-2.1.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=d02827d26a89968338a2ba79499a643f
diff --git a/app-vim/supertab/Manifest b/app-vim/supertab/Manifest
new file mode 100644
index 000000000000..a1eb7de1aa13
--- /dev/null
+++ b/app-vim/supertab/Manifest
@@ -0,0 +1,3 @@
+DIST supertab-2.1.tar.gz 16585 BLAKE2B 8c9adcd1e4cd27ea3c6ef33215287b3f6734ea6dba8ff1ae4852db387c26fadcad9fa9c6ee57800c662d6da815af2e7e91682bbb768b6d15ee661063af30bfa2 SHA512 6daec863968be9aaefecb3388a8626f4ebf1c76899e460463fc64a56f15f743d3eae36b03588b5450a2c49b63ecdec8faf3476eda1a07cc48caf731eff77a592
+EBUILD supertab-2.1.ebuild 507 BLAKE2B f9ffa97068960076ac7a36898cea6f2c88dc29d2a1e9333a1137b1f22edaee6af9486b696a6dd41ecd9852a51c1574eb89f9565182e095de797b116c11ccbebb SHA512 15d1e6f033c7a36c14a99390b28ef9f52cd2555e9293c7e9a90f16565118ce008021fb084d66244453e211b2db5e403ea3884e5707dbebd32f71a4c5e8c1aedb
+MISC metadata.xml 341 BLAKE2B 33e39fad500b2aaad60543debd41b6d80d713c6ec168ee2e9eb7edb47f4e3d2c621a5bc2f32b24c27d549d6daeb3213c2a2ce2e81f1e8ba492e789da22d11036 SHA512 e1c44cd31882c2aeaee01a4112c8ba3c6d57bfba3d1b30ee0d1f9726569d4249528b2ea1c2d7b5beeddca28dbf443e1b9bc788381510a4ff8ce56b2788d17425
diff --git a/app-vim/supertab/metadata.xml b/app-vim/supertab/metadata.xml
new file mode 100644
index 000000000000..5865f0ad42ec
--- /dev/null
+++ b/app-vim/supertab/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">ervandew/supertab</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/supertab/supertab-2.1.ebuild b/app-vim/supertab/supertab-2.1.ebuild
new file mode 100644
index 000000000000..6e48c8901b53
--- /dev/null
+++ b/app-vim/supertab/supertab-2.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: enhanced Tab key functionality"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1643 https://github.com/ervandew/supertab/"
+SRC_URI="https://github.com/ervandew/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="amd64 ~mips ppc x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+ rm Makefile .gitignore || die
+}
diff --git a/app-vim/surround-2.1-r1 b/app-vim/surround-2.1-r1
deleted file mode 100644
index 39b8748f0005..000000000000
--- a/app-vim/surround-2.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Delete/change/add parentheses/quotes/XML-tags & much more
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1697
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/surround-2.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/surround-2.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=c58999fc8c5e5fff5696a104ad21083b
diff --git a/app-vim/surround/Manifest b/app-vim/surround/Manifest
new file mode 100644
index 000000000000..4f64e4e3d01e
--- /dev/null
+++ b/app-vim/surround/Manifest
@@ -0,0 +1,3 @@
+DIST surround-2.1.tar.bz2 8441 BLAKE2B 11e222ddb9626a938dd5b02555117eba84cf1426e8c26dd8b31bc817ce53359615c8d14620b62d24b64f3c4cd9764423a24e07ad2efc0beb01d6269737e0e780 SHA512 2b4283f77dac468ab91cdc941ac2dd5a2b99a35c23d6ffdc1e1c819a04bf45ecb934c5a111898ed45539a02d1f1ce6c702da80685f609944cbec9bdd25a1e22e
+EBUILD surround-2.1-r1.ebuild 354 BLAKE2B 927a86bba357a456f7c572da5bb55679a9340e8d3780a9e23ff216f83c0a50b8bf85e5c0986c09253d79040c3494eb91d088f1246bae8dbe52b3a1b39b27024e SHA512 40d9e1508141f50b79b7b428979d23655b4c5d42c1d027bb8ea651bda173494e1e38efb495007163f13b74a8296de844aeeba7a2176d6494d38d0e27ef685cb3
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/surround/metadata.xml b/app-vim/surround/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/surround/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/surround/surround-2.1-r1.ebuild b/app-vim/surround/surround-2.1-r1.ebuild
new file mode 100644
index 000000000000..c74a7ec85aeb
--- /dev/null
+++ b/app-vim/surround/surround-2.1-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Delete/change/add parentheses/quotes/XML-tags & much more"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1697"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/syntastic-3.8.0 b/app-vim/syntastic-3.8.0
deleted file mode 100644
index 14d4cf664bf1..000000000000
--- a/app-vim/syntastic-3.8.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: syntax checking using external tools
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2736 https://github.com/scrooloose/syntastic/
-KEYWORDS=amd64 x86
-LICENSE=WTFPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/scrooloose/syntastic/archive/3.8.0.tar.gz -> syntastic-3.8.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=2ed62fc9d6b5522a27f0fd4a22a776ce
diff --git a/app-vim/syntastic-9999 b/app-vim/syntastic-9999
deleted file mode 100644
index cb9d0e920c6b..000000000000
--- a/app-vim/syntastic-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: syntax checking using external tools
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2736 https://github.com/scrooloose/syntastic/
-LICENSE=WTFPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 8f6de46b0aa318aea0e8cac62ece098b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=912be59823b5b0367bf4e3c46adb7f28
diff --git a/app-vim/syntastic/Manifest b/app-vim/syntastic/Manifest
new file mode 100644
index 000000000000..82fc9b4f8c40
--- /dev/null
+++ b/app-vim/syntastic/Manifest
@@ -0,0 +1,4 @@
+DIST syntastic-3.8.0.tar.gz 253425 BLAKE2B a003b9166aba2915b5421ac02544d128b8befca0af4f15c880f56ad046fad0ca7c202e6f7dda44588a6ad4ac3b77a3ed3602613855c6755261b5941d45464eff SHA512 b2f7fb07d457169a397a1ed42141e099cad14ded0b43f54a11060f2952843387396fcc539ffc9aaa1aa137ae62801e346a73c6de6035a0504706c59e40acef5c
+EBUILD syntastic-3.8.0.ebuild 968 BLAKE2B 192fbe2617ebebb7972c10ae0dc49ab9cabdad96bb0940b0cb324137cd222a19c4d290013d1c2e99b2096386b9cdfdeb01bf6fdb32274be808c6918938ebf38f SHA512 6c2b2d068b07a2a7ec8677ea4582a626b19ea066d7801eace97a4a0ea4431329c31694841fcf1687af43ab72d6ed64b6ca2635e24b8685e7c9173b538d6b8e21
+EBUILD syntastic-9999.ebuild 970 BLAKE2B a5a68d1c7af2c455cc0dbd23d60259ec5ab007f7f3eeb479da216e9c5454abd686e4055f9f0a505f232b33bd2a208e805cc2a1419b53c7cb38c3bd520b94ef45 SHA512 005215fa23cdec125e9888d109ba5a59d47f32540512f9c8d08d32a098aea1a774f6284374f89250c8a8fdc50a13df6e1f1ee13b531ec6ab653ed490e6705f47
+MISC metadata.xml 344 BLAKE2B dae79c875127b2b2034e1f41e65b94b9ff472f58b9d5ce8aa3920db428d468a0015a6ce252522fc158b9823fbff2bd7ff3ba1facc8cf061b775dfaca2b600f70 SHA512 ef01f82c783947320dcb2bdafbcc9545cd2ead7fedb18ccfda335c13d246f980cdd6b31c6e5a2f78f6f75b1ffbc18471a8e8f6c615ba1a75180b362602b6cf85
diff --git a/app-vim/syntastic/metadata.xml b/app-vim/syntastic/metadata.xml
new file mode 100644
index 000000000000..b2babe02672b
--- /dev/null
+++ b/app-vim/syntastic/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">scrooloose/syntastic</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/syntastic/syntastic-3.8.0.ebuild b/app-vim/syntastic/syntastic-3.8.0.ebuild
new file mode 100644
index 000000000000..2c2f54a9780a
--- /dev/null
+++ b/app-vim/syntastic/syntastic-3.8.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vim-plugin
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/scrooloose/syntastic.git"
+else
+ SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="vim plugin: syntax checking using external tools"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2736 https://github.com/scrooloose/syntastic/"
+LICENSE="WTFPL-2"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_prepare() {
+ default
+ rm -r _assets LICENCE README.markdown || die
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "Syntastic has many optional dependencies depending on the type"
+ elog "of syntax checking being performed. Look in the related files in"
+ elog "the syntax_checkers directory to help figure out what programs"
+ elog "different languages need."
+ fi
+}
diff --git a/app-vim/syntastic/syntastic-9999.ebuild b/app-vim/syntastic/syntastic-9999.ebuild
new file mode 100644
index 000000000000..6776db4e00ef
--- /dev/null
+++ b/app-vim/syntastic/syntastic-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vim-plugin
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/scrooloose/syntastic.git"
+else
+ SRC_URI="https://github.com/scrooloose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: syntax checking using external tools"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2736 https://github.com/scrooloose/syntastic/"
+LICENSE="WTFPL-2"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_prepare() {
+ default
+ rm -r _assets LICENCE README.markdown || die
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ elog "Syntastic has many optional dependencies depending on the type"
+ elog "of syntax checking being performed. Look in the related files in"
+ elog "the syntax_checkers directory to help figure out what programs"
+ elog "different languages need."
+ fi
+}
diff --git a/app-vim/tagbar-2.6.1 b/app-vim/tagbar-2.6.1
deleted file mode 100644
index 86739e9bff96..000000000000
--- a/app-vim/tagbar-2.6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: display tags of the current file ordered by scope
-EAPI=5
-HOMEPAGE=https://majutsushi.github.com/tagbar/ https://www.vim.org/scripts/script.php?script_id=3465
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=>=dev-util/ctags-5.5 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/majutsushi/tagbar/archive/v2.6.1.tar.gz -> tagbar-2.6.1.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=7065e8097490cbbed253d5b5418dca3d
diff --git a/app-vim/tagbar-2.7 b/app-vim/tagbar-2.7
deleted file mode 100644
index f0db0f49d8a5..000000000000
--- a/app-vim/tagbar-2.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: display tags of the current file ordered by scope
-EAPI=6
-HOMEPAGE=https://majutsushi.github.com/tagbar/ https://www.vim.org/scripts/script.php?script_id=3465
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=>=dev-util/ctags-5.5 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/majutsushi/tagbar/archive/v2.7.tar.gz -> tagbar-2.7.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=f588c7b52dd7d8bbe214edcf6dbda42a
diff --git a/app-vim/tagbar/Manifest b/app-vim/tagbar/Manifest
new file mode 100644
index 000000000000..bcb5ecc3b2ac
--- /dev/null
+++ b/app-vim/tagbar/Manifest
@@ -0,0 +1,5 @@
+DIST tagbar-2.6.1.tar.gz 51639 BLAKE2B 623f56dfb1ce7abde3281d9e1564e300f30cbfa9242772532025dd3d85640118b85ad3f68d20d6806ff3d994ba753722e096098231f750195569afc47635487e SHA512 eb0f29dc2f08d943e1ac0c0fe97ed72a49b85e22d105815a5557e205532be379d3ce8429c5303b917c005b465a7385161ff2edc96efc0fc312178155c67a7c22
+DIST tagbar-2.7.tar.gz 59027 BLAKE2B 6966ee9c412b0e7c9dd562f479ab4ae3fb4574034a32e33257ce95850f2861e333682d01d605f1c39dd6675a506e1792fed8a470b08152d14046bea215292698 SHA512 d964d3055f1679aad86b0756cc444a4857eb29ca22f2bd3567ad6c8d073e75d0c8823109038415f5bd1d269bbf8e36da6f34d70fedee54c10f90535ef79ff3c8
+EBUILD tagbar-2.6.1.ebuild 500 BLAKE2B 84300000ac7c06dcc5b1c2576022bd6918f475977de6f7eb1becea74fcb0cf3ddfa22bdef017572446fc4d3e2453683df706fc3ad5552ca432a0fbcef7680b65 SHA512 ebd88ae5174fa3b8438f3e77d088c0606d1148c4ed494395ff97908525a1d81f2d87d2001a9fda08c2b15ab0c9624ef6c437dd61c5358cf650962059ac50527e
+EBUILD tagbar-2.7.ebuild 549 BLAKE2B 2d0ccd8b0f6bc4e0e6d4407c20f7f608a88345e7e4f9a40fe544a9805d38d825ae8ba0e987a4e3e95b8e89b9de71a7237cdc45665fbc34aee67a073d10d0887e SHA512 53abc5047d1ad81ce73a8761d65ca969c3f17c4e37333a417a4568915a8edd38f3909fe400f3e5fe8ce2aea51bf55a4d0572e4b363ec9403954fba2eb41da47d
+MISC metadata.xml 341 BLAKE2B 4a1c8210c02cd207a9772371a9f4a02308352360991a6d8734579a3fe79a40716b6fd310b16ba6359e869843cf8b3e80be9dbb62636cfb1eaa924d3217a31e65 SHA512 adfd265c7224b9d6f4013721066f15e26baf908c0c89b0357f0a6d92797ee08eecfaa6b3c28d5117b88e258f6a0eb2fbd2704c701a11da6dd6095511a298eefe
diff --git a/app-vim/tagbar/metadata.xml b/app-vim/tagbar/metadata.xml
new file mode 100644
index 000000000000..f571998c87da
--- /dev/null
+++ b/app-vim/tagbar/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">majutsushi/tagbar</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/tagbar/tagbar-2.6.1.ebuild b/app-vim/tagbar/tagbar-2.6.1.ebuild
new file mode 100644
index 000000000000..a1c2e7fb7e0a
--- /dev/null
+++ b/app-vim/tagbar/tagbar-2.6.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: display tags of the current file ordered by scope"
+HOMEPAGE="https://majutsushi.github.com/tagbar/
+ https://www.vim.org/scripts/script.php?script_id=3465"
+SRC_URI="https://github.com/majutsushi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+RDEPEND=">=dev-util/ctags-5.5"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/tagbar/tagbar-2.7.ebuild b/app-vim/tagbar/tagbar-2.7.ebuild
new file mode 100644
index 000000000000..211696e57ae9
--- /dev/null
+++ b/app-vim/tagbar/tagbar-2.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: display tags of the current file ordered by scope"
+HOMEPAGE="https://majutsushi.github.com/tagbar/
+ https://www.vim.org/scripts/script.php?script_id=3465"
+SRC_URI="https://github.com/majutsushi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-util/ctags-5.5"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+ rm LICENSE || die
+ default
+}
diff --git a/app-vim/taglist-4.6 b/app-vim/taglist-4.6
deleted file mode 100644
index d2bdbbb72182..000000000000
--- a/app-vim/taglist-4.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: ctags-based source code browser
-EAPI=5
-HOMEPAGE=http://vim-taglist.sourceforge.net/
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=vim
-RDEPEND=dev-util/ctags || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/taglist-4.6.tar.bz2 https://dev.gentoo.org/~radhermit/vim/taglist-4.6.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=0915761b2830fc4f2a31f228c53ee44c
diff --git a/app-vim/taglist/Manifest b/app-vim/taglist/Manifest
new file mode 100644
index 000000000000..833d321e452f
--- /dev/null
+++ b/app-vim/taglist/Manifest
@@ -0,0 +1,4 @@
+AUX taglist-3.4-ebuilds.patch 451 BLAKE2B 4d22d3ceaa1af58b804710cd1af60b402c6295a269d51fd39bb78911e3a44f0a775c52676ca6d939a9c9c8a99ecdd17996b3c3ad0b4c9bade0866ccedd742eec SHA512 9fbff7c21e0c3bc73738dbb28ce8a10bf9f5b052d669468940f471988e8e15862b75104db1b0cdd209a679c4d72f58b3c147f5fdaaf8248e5ed0bc18f3615684
+DIST taglist-4.6.tar.bz2 40344 BLAKE2B e6377f8ac353f77ee7656b95eae0d79722f66ade3f575de14194aa7c2ced7e30d2d3e62ba3873db8b0b3e2985d360f3b4f100072d0bb26617941d3d632ab5cc4 SHA512 64686f2685cf4f9b09eeb7e1981a1b9d514cce2f6ea4bdf3e3613037d9818556ad6ed95740a84b4d73eba3fa1d5d58a41f15e1bc0a1403c50a810f5a704f3073
+EBUILD taglist-4.6.ebuild 501 BLAKE2B e9ad234475fe6f897d1f5b94ec0896a98c1dcf63f4f17360809260766cdaa096f1f9818cf95982695347111e62167f54a7e1f0fe058a2a93bd0a45d8075e47dd SHA512 a292c887ebda9ff2372c54c5755926f3d6a710f2931218ec2d301a5fa8b67ad5625a3f89aaaa1aeb7f759e96bafaa734ce8556d1c7f0d448f22588ce29959218
+MISC metadata.xml 330 BLAKE2B 4c578f7ca8885b73f0a298749a5f1335815b25ea619b65200d8d5acf9a6b27502fe00a13b0ab0bd6684c604f87099f0740857054d9e6e62865dc800fa09a4e1a SHA512 0965202e6286e18810375b491ed126f12a309958cb726c259c549c38b1813468e0d17a1d00d01dab882f5ea069cb03aa5c1d4ce09399fb2efefadfe70aaf5dde
diff --git a/app-vim/taglist/files/taglist-3.4-ebuilds.patch b/app-vim/taglist/files/taglist-3.4-ebuilds.patch
new file mode 100644
index 000000000000..8fcc928d4497
--- /dev/null
+++ b/app-vim/taglist/files/taglist-3.4-ebuilds.patch
@@ -0,0 +1,12 @@
+--- taglist-3.4/plugin/taglist.vim.orig 2004-10-02 00:12:58.400215576 +0100
++++ taglist-3.4/plugin/taglist.vim 2004-10-02 00:26:28.535056360 +0100
+@@ -205,6 +205,9 @@
+ let s:tlist_def_cobol_settings = 'cobol;d:data;f:file;g:group;p:paragraph;' .
+ \ 'P:program;s:section'
+
++" ebuilds
++let s:tlist_def_ebuild_settings = 'sh;f:function'
++
+ " eiffel language
+ let s:tlist_def_eiffel_settings = 'eiffel;c:class;f:feature'
+
diff --git a/app-vim/taglist/metadata.xml b/app-vim/taglist/metadata.xml
new file mode 100644
index 000000000000..8b75cc7efb06
--- /dev/null
+++ b/app-vim/taglist/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">vim-taglist</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/taglist/taglist-4.6.ebuild b/app-vim/taglist/taglist-4.6.ebuild
new file mode 100644
index 000000000000..b4214d29c76e
--- /dev/null
+++ b/app-vim/taglist/taglist-4.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin eutils
+
+DESCRIPTION="vim plugin: ctags-based source code browser"
+HOMEPAGE="http://vim-taglist.sourceforge.net/"
+LICENSE="vim"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+
+RDEPEND="dev-util/ctags"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.4-ebuilds.patch
+}
diff --git a/app-vim/tasklist-1.0.1 b/app-vim/tasklist-1.0.1
deleted file mode 100644
index de0a96a85643..000000000000
--- a/app-vim/tasklist-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Highlight FIXME/TODO/CUSTOM keywords in a separate list
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2607
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/vim-scripts/tasklist.vim/tarball/1.0.1 -> tasklist-1.0.1.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=d257192b49698ebbad6033028c25980c
diff --git a/app-vim/tasklist/Manifest b/app-vim/tasklist/Manifest
new file mode 100644
index 000000000000..85ec58318e8f
--- /dev/null
+++ b/app-vim/tasklist/Manifest
@@ -0,0 +1,3 @@
+DIST tasklist-1.0.1.tar.gz 4066 BLAKE2B d55e12f28546f400b34e11636814205e94c3c82656a068c9774fb23fcfd336fae059efcf307043b6bcbaccb939a4a4ed8d02c9a5944381bece096c57f6092ade SHA512 623ec5b147e485abe3e246796a6ed67dd8325ef37708e589c4568897da10ba70076eb5dffd9fb9333fc29d045c316cf382950de13f616873334fc734875600b9
+EBUILD tasklist-1.0.1.ebuild 448 BLAKE2B 0f02ae5f3206b69f4a07d7bd34d2d902033bc072e2586acc79ae64ef9a1d4cae028697df017acc15718ac80f36ddb6664ad2a89deeac65a17c53f7fa59c18d18 SHA512 2ddd17c8ed2a27feb12eb8c6fb0e1a089d9e940a17962d34f7c54e947aa715f30f3d6267ec806ca2136f16e63ad485633e7a8efc6fd677b8a526b74031a408a4
+MISC metadata.xml 450 BLAKE2B 3a688d7ebb054fc8ee455e92001c40c1325c614b18800f6b31d7dca2d47621016fc831e4785745fae6bce770b3eec6d403b5de3a4b4cf373f60a17b97cb80e99 SHA512 2f047ee53729d6cf9fa63861c3f4246767541fbc16d21df0f6b75bb153a77f0e2b68d67e20a1544944f19ffb00e8363c6a374c9d414c242cf218aaf0f3ce69af
diff --git a/app-vim/tasklist/metadata.xml b/app-vim/tasklist/metadata.xml
new file mode 100644
index 000000000000..550fea50c1c9
--- /dev/null
+++ b/app-vim/tasklist/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">vim-scripts/tasklist.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/tasklist/tasklist-1.0.1.ebuild b/app-vim/tasklist/tasklist-1.0.1.ebuild
new file mode 100644
index 000000000000..b855acd97181
--- /dev/null
+++ b/app-vim/tasklist/tasklist-1.0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="Highlight FIXME/TODO/CUSTOM keywords in a separate list"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2607"
+SRC_URI="https://github.com/vim-scripts/${PN}.vim/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_unpack() {
+ default
+ mv vim-* "${P}" || die
+}
diff --git a/app-vim/tcomment-3.08.1 b/app-vim/tcomment-3.08.1
deleted file mode 100644
index 7ac4d9148b87..000000000000
--- a/app-vim/tcomment-3.08.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: an extensible and universal comment toggler
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1173 https://github.com/tomtom/tcomment_vim
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tomtom/tcomment_vim/archive/3.08.1.tar.gz -> tcomment-3.08.1.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=99e65b329c9a897cede5d64e86b4b104
diff --git a/app-vim/tcomment-9999 b/app-vim/tcomment-9999
deleted file mode 100644
index f11d2ea6637b..000000000000
--- a/app-vim/tcomment-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: an extensible and universal comment toggler
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1173 https://github.com/tomtom/tcomment_vim
-LICENSE=GPL-3
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 8f6de46b0aa318aea0e8cac62ece098b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=528764994e8393568365451f72f900ec
diff --git a/app-vim/tcomment/Manifest b/app-vim/tcomment/Manifest
new file mode 100644
index 000000000000..c1febf9388cb
--- /dev/null
+++ b/app-vim/tcomment/Manifest
@@ -0,0 +1,4 @@
+DIST tcomment-3.08.1.tar.gz 49918 BLAKE2B df63a01432101e018a39f7b54dec0b91b415263e2b6c0f3e63521e1abe2247a005a1fc900cd6d18cfd908f75ae4b5767a5f7dc21ae620985d3465676c456a389 SHA512 609d5eb1e7785fb1af829000ab27ab63ac2bb7550bcd0f91c7c35f0a8c4b879e5348745f57b11d1e24d37920056ca55da8863e15e40d6fe289617d5d898a4177
+EBUILD tcomment-3.08.1.ebuild 707 BLAKE2B 2ca1a8f759cd34b3e06c66fc605b6a51fffb078fe62b7988d36de10fb625de3ba73723d89c5121355a1299a9a2fb6f57d55b59cdbe1f889545f27f4619260ff1 SHA512 c93726d4f1769f8b802fddefe6b3150ee6d8e9a6ea239e558f4c19896ec76ee94943c3dcacaf1a9a668cc905a17f0014d0058f7f1147f16aaeac731e645056e7
+EBUILD tcomment-9999.ebuild 709 BLAKE2B 41d87b0f5a50a279b6e7e91143b19a86be3fa9042dcd6959197221b1247523fe06c100f6bebf8e222c443d460590a51966c568e8b9b321fd5671c867d4db0d7e SHA512 ff91f4eb1cfcccc3628bc574014fbcd3fb569cbb45c92777fae3f1a9ec7c5002883f6b569912e0c3773db379825b88c501ede4fe08ce32ff36d8f504a60870e7
+MISC metadata.xml 343 BLAKE2B ad814cdda87bdad08597d6bce76f080143b2ed26239dc162b9d79b11476c6b9cce49b1ec362136569f952673442482399ea7a0a44d392497417a665a378faec7 SHA512 f8b176729889aea616f7ca8e3f0de17519debc53a102e4db499aa2e6a196482a5bc47b235fcaa88249c748ea7a583b2d0b31a5498571fdf3fa7520882e8c6257
diff --git a/app-vim/tcomment/metadata.xml b/app-vim/tcomment/metadata.xml
new file mode 100644
index 000000000000..9e97359a2544
--- /dev/null
+++ b/app-vim/tcomment/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">tomtom/tcomment_vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/tcomment/tcomment-3.08.1.ebuild b/app-vim/tcomment/tcomment-3.08.1.ebuild
new file mode 100644
index 000000000000..2e4d330ed1d7
--- /dev/null
+++ b/app-vim/tcomment/tcomment-3.08.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN="tcomment_vim"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/tomtom/nerdtree.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="amd64 x86"
+ S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="vim plugin: an extensible and universal comment toggler"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1173 https://github.com/tomtom/tcomment_vim"
+LICENSE="GPL-3"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+ default
+ rm -r README LICENSE.TXT etc spec addon* || die
+}
diff --git a/app-vim/tcomment/tcomment-9999.ebuild b/app-vim/tcomment/tcomment-9999.ebuild
new file mode 100644
index 000000000000..4b803fc97fe3
--- /dev/null
+++ b/app-vim/tcomment/tcomment-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN="tcomment_vim"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/tomtom/nerdtree.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+ S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="vim plugin: an extensible and universal comment toggler"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1173 https://github.com/tomtom/tcomment_vim"
+LICENSE="GPL-3"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+ default
+ rm -r README LICENSE.TXT etc spec addon* || die
+}
diff --git a/app-vim/thlnk-1.2.1-r1 b/app-vim/thlnk-1.2.1-r1
deleted file mode 100644
index 9e4f47d2bfc5..000000000000
--- a/app-vim/thlnk-1.2.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: linking in plaintext
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=293
-KEYWORDS=alpha amd64 ia64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/thlnk-1.2.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/thlnk-1.2.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=db5762d780fc7b29c12cf937bca1f382
diff --git a/app-vim/thlnk/Manifest b/app-vim/thlnk/Manifest
new file mode 100644
index 000000000000..f930f20ef3ac
--- /dev/null
+++ b/app-vim/thlnk/Manifest
@@ -0,0 +1,3 @@
+DIST thlnk-1.2.1.tar.bz2 35428 BLAKE2B 0121b4e6a949ad1dd447560052479de8a62248098ffd6397d49b94c33e1a19d4a76c9ed63b3306cc6e484dd8efbd7434f52c2fbed741c976526d620c278fde98 SHA512 c3de0452a5a5d068f9c64d7ef1f7e390a3f870546a7ab2daec41d301c19f57d4a0e254fd45de4775455746312f48f3223b6ddbaa80159a0ff56cf707b9cc0945
+EBUILD thlnk-1.2.1-r1.ebuild 366 BLAKE2B 9db16803e8d6cb75fce739cef96729c68529606368aed34389816d5267a00fc72d5b3953d3b0fde94c8d4e92562ae829b4c927c7436570d8cc71ec4defc38dab SHA512 e4e66f84a059a301ae8b88ddfcd27149aab6530a2d14bd94e5a5c937ed6c45fcdb7d52e63d359a5aaf8e526975f5e9cc790d3d1d38f97e514133a4f6bce88c43
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/thlnk/metadata.xml b/app-vim/thlnk/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/thlnk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/thlnk/thlnk-1.2.1-r1.ebuild b/app-vim/thlnk/thlnk-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..430077ec35f1
--- /dev/null
+++ b/app-vim/thlnk/thlnk-1.2.1-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: linking in plaintext"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=293"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="thlnk thlnk-reference-manual"
diff --git a/app-vim/tlib-1.20 b/app-vim/tlib-1.20
deleted file mode 100644
index 4972c7d33a75..000000000000
--- a/app-vim/tlib-1.20
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a library of utility functions
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1863 https://github.com/tomtom/tlib_vim
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tomtom/tlib_vim/archive/1.20.tar.gz -> tlib-1.20.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=53aded34394d5f5f9c39ca2912eccea8
diff --git a/app-vim/tlib/Manifest b/app-vim/tlib/Manifest
new file mode 100644
index 000000000000..828c1aad2198
--- /dev/null
+++ b/app-vim/tlib/Manifest
@@ -0,0 +1,3 @@
+DIST tlib-1.20.tar.gz 111202 BLAKE2B 0ee6c662e1658607706516adab9b770942ec948633a75879b5a516b46989a34744acde52d10d5b2ea58af6e7215f1241b18c53267d643d4c2e08da425a93169e SHA512 d8a344483da2a174324dc81472b5d3bdb811e54af22a1599c5567019d33bafdf499845d3efeabf081ecf17dc6965c69640a6a01b208811529e86266ba1871218
+EBUILD tlib-1.20.ebuild 566 BLAKE2B e2b86ca767d1afabe247cb4f18cbc09cd6f43bba431e826b9f28b419cb0cb162bf6f5adcb544916f2b216d2a975361e96e2a5bd838d417e1ffa24257215d8b3a SHA512 658fb2ce850438a65f1b59a1b70298372fa133e004559a7a6917a892e923e95ca8d90ae88f45b1722cf99407566bb45dde41bc485cad8ba0e09653e01af7db61
+MISC metadata.xml 329 BLAKE2B 87f979ae53b0fca4bbf6966613d9ef71365ed69a0b790bd41d526536f3e04b63e435dea3647c7b19fc31ec81bb8df70c1d830c6ec0545f1a5f63f3c1da14d923 SHA512 d36d9443ce025d73d277cc67387418ad73458be408932bf200609b6fa133b06b87598377866c89b8f9606674b54540b19c6f63afdc5ca9696225f1976bcdab48
diff --git a/app-vim/tlib/metadata.xml b/app-vim/tlib/metadata.xml
new file mode 100644
index 000000000000..5eb011848cb6
--- /dev/null
+++ b/app-vim/tlib/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">tomtom/tlib_vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/tlib/tlib-1.20.ebuild b/app-vim/tlib/tlib-1.20.ebuild
new file mode 100644
index 000000000000..3b64cc06f5e7
--- /dev/null
+++ b/app-vim/tlib/tlib-1.20.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+MY_PN=${PN}_vim
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="vim plugin: a library of utility functions"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1863 https://github.com/tomtom/tlib_vim"
+SRC_URI="https://github.com/tomtom/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ rm -r test samples addon-info.json || die
+}
diff --git a/app-vim/tmpl-0.1-r1 b/app-vim/tmpl-0.1-r1
deleted file mode 100644
index 8982e669789a..000000000000
--- a/app-vim/tmpl-0.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Syntax for Sam Tregar's HTML::Template
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=254
-KEYWORDS=x86 alpha ia64 sparc amd64 ppc
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/tmpl-0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/tmpl-0.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=93aef8027e08a50dceddbed66438181e
diff --git a/app-vim/tmpl/Manifest b/app-vim/tmpl/Manifest
new file mode 100644
index 000000000000..8724bbe1e65b
--- /dev/null
+++ b/app-vim/tmpl/Manifest
@@ -0,0 +1,3 @@
+DIST tmpl-0.1.tar.bz2 1165 BLAKE2B f7b5d2d79fdefe9c46c544fb9d98e0b76586d05a43ac49947278dfd43b8c9dc19eda0876b3c9f4e8e8a068cc89e011ec2ee5fe4afee142a759d8b33822dbae76 SHA512 c50d15be556224544ae99bb1a4ec78fca6d0cc4c1df11c4ef5302ce851b8f92baca04e498774cd1352ca3f1a8789498e7f47bb371828da13a7703a2f654ab51c
+EBUILD tmpl-0.1-r1.ebuild 404 BLAKE2B 74c425831306593b875af19de01f2009ad3b268555ee10f6f786efc8d941314c0a0b824ec5c8653faafb97096e07b0c925bd101fd14ac7940e71d651d0acaa5e SHA512 3dd552b304a6561e2f6546ba2377847f8a48873b212b7df101548862fdd791d5c6b4817cc12871337756b686a8398e2add33027f8771d72c6a530b073422e70b
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/tmpl/metadata.xml b/app-vim/tmpl/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/tmpl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/tmpl/tmpl-0.1-r1.ebuild b/app-vim/tmpl/tmpl-0.1-r1.ebuild
new file mode 100644
index 000000000000..c61adb98ae8b
--- /dev/null
+++ b/app-vim/tmpl/tmpl-0.1-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Syntax for Sam Tregar's HTML::Template"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=254"
+LICENSE="vim"
+KEYWORDS="x86 alpha ia64 sparc amd64 ppc"
+IUSE=""
+
+VIM_PLUGIN_HELPURL="https://www.vim.org/scripts/script.php?script_id=254"
diff --git a/app-vim/toggle-0.5-r1 b/app-vim/toggle-0.5-r1
deleted file mode 100644
index e1c5a26067ad..000000000000
--- a/app-vim/toggle-0.5-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: quickly toggle boolean-type keywords
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=895
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/toggle-0.5.tar.bz2 https://dev.gentoo.org/~radhermit/vim/toggle-0.5.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=43afc2203a3ee1b7cdca5a7dc497bf3a
diff --git a/app-vim/toggle/Manifest b/app-vim/toggle/Manifest
new file mode 100644
index 000000000000..596610f63602
--- /dev/null
+++ b/app-vim/toggle/Manifest
@@ -0,0 +1,3 @@
+DIST toggle-0.5.tar.bz2 2790 BLAKE2B 365bffd541cfb40c7fea59049a4b7ef0caf0ef105a5ab382e740f3400b399715227d2d5433875583dfb31ac847c0a90d5436e6ef2aa1f8327eebc868484146c6 SHA512 bac60e8e09cb3d82ba1569c333174fa58596fcd009181a56feabeeba4590942805a14cf08c3ff3dc7920e8481d14b3bb659bb85ad1c8bd85ca66a5d491dae05c
+EBUILD toggle-0.5-r1.ebuild 444 BLAKE2B 330b74daf6af3acb0c9ba20655d675f469491042144ffc4bcf0a9a5b53260e74adbeff3ef4a570e23742a428b415fb14ecedee4b40cf3fcaa9e1185e5fe3cf14 SHA512 7afea8db84084cdbb61ae2fa565badc57453afad4adb0475c6eef5a23fcc4ed35c75da4e4c255c38288991febf7b440cbea348a666be43e4010bd97b2ffc51af
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/toggle/metadata.xml b/app-vim/toggle/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/toggle/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/toggle/toggle-0.5-r1.ebuild b/app-vim/toggle/toggle-0.5-r1.ebuild
new file mode 100644
index 000000000000..7e312a8c91de
--- /dev/null
+++ b/app-vim/toggle/toggle-0.5-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: quickly toggle boolean-type keywords"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=895"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin will toggle true/false, on/off, yes/no and so on when <C-T>
+is pressed."
diff --git a/app-vim/tt2-syntax-1.13-r1 b/app-vim/tt2-syntax-1.13-r1
deleted file mode 100644
index 27073ec216b0..000000000000
--- a/app-vim/tt2-syntax-1.13-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: syntax highlighting for perl module Template-Toolkit
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=830
-KEYWORDS=amd64 arm ppc ppc64 x86 ~x86-fbsd
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/tt2-syntax-1.13.tar.bz2 https://dev.gentoo.org/~radhermit/vim/tt2-syntax-1.13.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=95d76a711c5f9fd00400f85f565e3597
diff --git a/app-vim/tt2-syntax/Manifest b/app-vim/tt2-syntax/Manifest
new file mode 100644
index 000000000000..fba209b3cfc5
--- /dev/null
+++ b/app-vim/tt2-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST tt2-syntax-1.13.tar.bz2 2991 BLAKE2B 07efcef9b28b8c44ff55d970dec2a9bff73c6e67adc3f03e6c09beca5552599b87150af08f82211f48ff79fb595f5324c60d1917a5f0378e769643b80c19b503 SHA512 0e7f5ca2b5dd53598778bb85a76fbb8be52ce789221342cb5ab51a5084c7d679b8b2f5cee4f8f05db9648a5828471eeba3d0367959f09d280d9c098a9c21e52e
+EBUILD tt2-syntax-1.13-r1.ebuild 445 BLAKE2B 89c1e67ecd039afac311e70d95959334ce1a26a6518009ac7ec6fda0213e9adeb47a6c60790f1c78ef41430c7ca53fc54c48f663e3de7097426ce6fad2aa6ce0 SHA512 e996ab70a54ed861feb1f2ed03ed43344a6f7ab1077be81971725f1b07ba9b831fd5def7f5284cdc2e2bc1b355bbef09e1ac9809b9a267e277e3d11753f4953d
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/tt2-syntax/metadata.xml b/app-vim/tt2-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/tt2-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild b/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
new file mode 100644
index 000000000000..ea3b7184e7e5
--- /dev/null
+++ b/app-vim/tt2-syntax/tt2-syntax-1.13-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: syntax highlighting for perl module Template-Toolkit"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=830"
+LICENSE="vim"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~x86-fbsd"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for perl module Template-Toolkit"
diff --git a/app-vim/txtfmt-2.4-r1 b/app-vim/txtfmt-2.4-r1
deleted file mode 100644
index adefcbba11cb..000000000000
--- a/app-vim/txtfmt-2.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: rich text highlighting in vim
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2208
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=13856 -> txtfmt-2.4.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=942bcb15a9e2939fb0f6f444343ca62e
diff --git a/app-vim/txtfmt-3.1 b/app-vim/txtfmt-3.1
deleted file mode 100644
index 2c4b434e699c..000000000000
--- a/app-vim/txtfmt-3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: rich text highlighting in vim
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2208
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=24489 -> txtfmt-3.1.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=e429223644befd479cc4ca9b5a906e87
diff --git a/app-vim/txtfmt/Manifest b/app-vim/txtfmt/Manifest
new file mode 100644
index 000000000000..3d9d88c9de83
--- /dev/null
+++ b/app-vim/txtfmt/Manifest
@@ -0,0 +1,5 @@
+DIST txtfmt-2.4.tar.gz 127123 BLAKE2B c7623a462ae9a2562b9455ca94b013bc1555bb13d50b37f0edc27a297a420d24462e0f6a8140c8e18fd89ec400276b3fdbb5f76ea164f2e857f3849bf232c9f7 SHA512 4f3a32c34b11477a7b78fca47367754093b04dbe60bdfee16d2f05c992a82f9f64fb82b8dc811afd43fd4206f426c88ade95943cc1686e6bf57813596b9652f8
+DIST txtfmt-3.1.tar.gz 172348 BLAKE2B aa44aef49665f034dcb0528bc6795f716540088b59e026bb079e49e5d2b9f6034f99afa220cb63b7e534257e2fc249c779b2ad0fb8ef01d3fa99e609b70e059e SHA512 bdef5350626ee5251fbf3cb4a4270e72f0b8ab29948f0469cfadbcf0735ccd7c104b34a25e43d4ff147ed48de3667fba472080f81f72d5a4687467e5c44af5d1
+EBUILD txtfmt-2.4-r1.ebuild 494 BLAKE2B 544795019ce148e5205abfb875cf089e6685df151154f1b1f1e14d18157e9d53b87067d6e819d75cf2f3e544d2ed0fa453220d0f1c08f877edf26d7c0a3f8167 SHA512 9ed7c98d43b353df1a79397a314ba49498971b86fa092c21eef63c8b1d6da94423354e795a98915eb7125f9892900c74d1d64c5894bed46c93015f93d89c871f
+EBUILD txtfmt-3.1.ebuild 494 BLAKE2B 00b2bab10554cbd0e1492d71ceee9cb266ec4e50addab0226e47272f5144c146a4cf0c7aa5806f7c5a8b7720ad67dcb2230ad390cf17595b3887d8ac83e428f6 SHA512 6cc89e452783dea9206d1da9a59b176b11ea263ab24b6e5242542b42e3eb1e2f9b315c75c445ca0701de1aae2d9e7a694aee957d62cdfd807f96c4888cd49368
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/txtfmt/metadata.xml b/app-vim/txtfmt/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/txtfmt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/txtfmt/txtfmt-2.4-r1.ebuild b/app-vim/txtfmt/txtfmt-2.4-r1.ebuild
new file mode 100644
index 000000000000..4adcc7962d62
--- /dev/null
+++ b/app-vim/txtfmt/txtfmt-2.4-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: rich text highlighting in vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2208"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=13856 -> ${P}.tar.gz"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}
+
+src_prepare() {
+ default
+ rm indent_patch.txt || die
+}
diff --git a/app-vim/txtfmt/txtfmt-3.1.ebuild b/app-vim/txtfmt/txtfmt-3.1.ebuild
new file mode 100644
index 000000000000..97b915a6b3ba
--- /dev/null
+++ b/app-vim/txtfmt/txtfmt-3.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: rich text highlighting in vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2208"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=24489 -> ${P}.tar.gz"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+S=${WORKDIR}
+
+src_prepare() {
+ default
+ rm indent_patch.txt || die
+}
diff --git a/app-vim/udev-syntax-20051016-r2 b/app-vim/udev-syntax-20051016-r2
deleted file mode 100644
index edbebf3653a3..000000000000
--- a/app-vim/udev-syntax-20051016-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: syntax highlighting for udev rules files
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1381
-KEYWORDS=amd64 hppa ~mips ppc sparc x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/udev-syntax-20051016.tar.bz2 https://dev.gentoo.org/~radhermit/vim/udev-syntax-20051016.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=c63c0049e409386db5fc0974ea6e8807
diff --git a/app-vim/udev-syntax/Manifest b/app-vim/udev-syntax/Manifest
new file mode 100644
index 000000000000..975d0a73483b
--- /dev/null
+++ b/app-vim/udev-syntax/Manifest
@@ -0,0 +1,4 @@
+AUX udev-syntax-20051016-ftdetect.patch 371 BLAKE2B aeeba09718dd8292ff9a7c8092597eacf422bd49c703e526158c1130e436fe6c342e08cd4c974e762ba8b1dba45166437831806e7c889d5656b7ab6d78b382ef SHA512 41369f811f4ce28f182ac61c3113f38248aee839a9d52ee6ba83a48d3689873b9afe69bc938d2c40c06d2fa94b72c2e904a4b338dc24d6131492eb05192395cd
+DIST udev-syntax-20051016.tar.bz2 1161 BLAKE2B c8274fbe552bdf54f5d241b270512df8d95f43ccd4da2e9c794d7470e77d5399dc35ba396b2beddf752e656cd889107fa10d792be11c4dccba0adea4f8418727 SHA512 3952cddd2598eb4e09fd6bc7538419c9dbb3eb94d55a81418fc66b5c3fb46f34853d4b97a5475f3330b752d4dbdd3bcf22a3f47c73d1d3e18b5efcc2b4696e34
+EBUILD udev-syntax-20051016-r2.ebuild 567 BLAKE2B 59d1270555e4e474bcbc81e4f060a1abe60f4632ac0d150781e2f8d8c1e8da0b58dd5e2c9fa81be283162320f940c376304775d25a549c69e6491888255986a7 SHA512 a7e7d921e63a991c329e9f4b598c1eebe0aa6dc53735f644e020311edcf674cacd695fb418795fc14bf95b108fc30d0c58a8f20350ad040771c3a00872912ec2
+MISC metadata.xml 346 BLAKE2B 28b85271f3e53d5f31591cdae5ae0fd675c580019a44b0c769f32aa09da0324a8fd35787f5802747d721f5cac91a94ecb97976faa668c4859627d016efaf99c0 SHA512 c9cf56d93687fad1a2ae0d37518f46704a481a5ed288baf5e714ee4898f1ef304101453e2f53a05e5e079bd2e042ee403546e8f8c2787a92852910162c3150f0
diff --git a/app-vim/udev-syntax/files/udev-syntax-20051016-ftdetect.patch b/app-vim/udev-syntax/files/udev-syntax-20051016-ftdetect.patch
new file mode 100644
index 000000000000..3792be01ce23
--- /dev/null
+++ b/app-vim/udev-syntax/files/udev-syntax-20051016-ftdetect.patch
@@ -0,0 +1,6 @@
+diff -ru udev-syntax-20051016/ftdetect/udev.vim udev-syntax-20051016/ftdetect/udev.vim
+--- udev-syntax-20051016/ftdetect/udev.vim 2007-01-10 16:11:32.876871120 +0100
++++ udev-syntax-20051016/ftdetect/udev.vim 2007-01-10 16:12:04.412703024 +0100
+@@ -1,4 +1,4 @@
+-au BufNewFile,BufRead *udev.rules* set filetype=udev
++au BufNewFile,BufRead *udev/rules.d* set filetype=udev
diff --git a/app-vim/udev-syntax/metadata.xml b/app-vim/udev-syntax/metadata.xml
new file mode 100644
index 000000000000..77e95b35d8e7
--- /dev/null
+++ b/app-vim/udev-syntax/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Vim syntax highlighting for udev.rules files.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/udev-syntax/udev-syntax-20051016-r2.ebuild b/app-vim/udev-syntax/udev-syntax-20051016-r2.ebuild
new file mode 100644
index 000000000000..85154af6b846
--- /dev/null
+++ b/app-vim/udev-syntax/udev-syntax-20051016-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: syntax highlighting for udev rules files"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1381"
+LICENSE="vim"
+KEYWORDS="amd64 hppa ~mips ppc sparc x86"
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for udev.rules files. These files
+are automatically detected by filename; manual loading is also possible,
+via :set filetype=udev"
+
+PATCHES=( "${FILESDIR}/${P}-ftdetect.patch" )
diff --git a/app-vim/undotree-5.0 b/app-vim/undotree-5.0
deleted file mode 100644
index 1d489d84774f..000000000000
--- a/app-vim/undotree-5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: display your undo history in a graph
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4177 https://github.com/mbbill/undotree
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/mbbill/undotree/archive/rel_5.0.tar.gz -> undotree-5.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=957b5e2aaf7d4b63205f27ed15bee523
diff --git a/app-vim/undotree-9999 b/app-vim/undotree-9999
deleted file mode 100644
index 5a731891cc9c..000000000000
--- a/app-vim/undotree-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: display your undo history in a graph
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4177 https://github.com/mbbill/undotree
-LICENSE=BSD
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 8f6de46b0aa318aea0e8cac62ece098b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=bc6b5d2995b36f175e7d2eb1667a5b27
diff --git a/app-vim/undotree/Manifest b/app-vim/undotree/Manifest
new file mode 100644
index 000000000000..3516689bec45
--- /dev/null
+++ b/app-vim/undotree/Manifest
@@ -0,0 +1,4 @@
+DIST undotree-5.0.tar.gz 13646 BLAKE2B 12fb31433b95ac980cae9d313ccb7cd30d0a63a25f440027ae0dd8cd240a80aa825582f60a88b44346f392f8e52c7ff5d86a87d8891b0adc3fcf17daf0c86ce3 SHA512 093202633000c15db731c9664b606ced7dd4d259f9fac04e886509a440eb5e31de073250eb400be0b1e4cdabb393d1d88bbcb88fa162c89a3783c961b33d33a0
+EBUILD undotree-5.0.ebuild 429 BLAKE2B 75a918dcac1810cd1df0b59aace9f5397a932d45596e96f7acfedae7508e90220ec05e3ce1b05ebc2e8fbceb410c39d3c9863686de27f33fcaab02548c345fd2 SHA512 f9beb5ea6481b928cfb3118b709f310328ea3e57634e9fbcd19d7383a292cd7761ba9d5c8ff53dfa0e64149d4b54d48d64ce319e4fb056401ae7083c19cb6075
+EBUILD undotree-9999.ebuild 375 BLAKE2B 8f9af682845764821ef513fbb6073ada622d71db6613535025b79a04403bebea5a20fce419472b0034908376ae24e58cd3e5647a87e132256734477251fcd34b SHA512 f9ab75289ae10de12e2a53fdf9db5df5d21dd316e9802ec4a9a946436e4c9e684910562c5b72d5a66602fcbcd45ff0087909ca27852087528f90bada84d27fd2
+MISC metadata.xml 339 BLAKE2B 3794ae7391ce0454ad19c2b24694ece64bb98808bd4e82d001de32af28e6784266ec3edd4ce275a6549316a6245dad1a3eb4e683d9a84076323b23cd5e84b814 SHA512 1a0531dae60fb8686cde296f695ededc1ac678f55672a73d802a0f6eba101d0c9bab0c4610a3d6a297e885660b635830c251b5db5c06ba8fcb126abc2df5a914
diff --git a/app-vim/undotree/metadata.xml b/app-vim/undotree/metadata.xml
new file mode 100644
index 000000000000..db90240ffc50
--- /dev/null
+++ b/app-vim/undotree/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">mbbill/undotree</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/undotree/undotree-5.0.ebuild b/app-vim/undotree/undotree-5.0.ebuild
new file mode 100644
index 000000000000..f494f607ca9f
--- /dev/null
+++ b/app-vim/undotree/undotree-5.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin vcs-snapshot
+
+DESCRIPTION="vim plugin: display your undo history in a graph"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4177 https://github.com/mbbill/undotree"
+SRC_URI="https://github.com/mbbill/${PN}/archive/rel_${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="amd64 x86"
diff --git a/app-vim/undotree/undotree-9999.ebuild b/app-vim/undotree/undotree-9999.ebuild
new file mode 100644
index 000000000000..af6935936207
--- /dev/null
+++ b/app-vim/undotree/undotree-9999.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin git-r3
+
+EGIT_REPO_URI="https://github.com/mbbill/undotree.git"
+DESCRIPTION="vim plugin: display your undo history in a graph"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4177 https://github.com/mbbill/undotree"
+LICENSE="BSD"
diff --git a/app-vim/unite-4.0-r1 b/app-vim/unite-4.0-r1
deleted file mode 100644
index d952eb12ef3a..000000000000
--- a/app-vim/unite-4.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: unite all sources
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3396
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=!app-vim/neocomplcache || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/unite-4.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/unite-4.0.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=a46e7cbb546406b4d6a2beeb982174f2
diff --git a/app-vim/unite/Manifest b/app-vim/unite/Manifest
new file mode 100644
index 000000000000..555328545911
--- /dev/null
+++ b/app-vim/unite/Manifest
@@ -0,0 +1,3 @@
+DIST unite-4.0.tar.bz2 80472 BLAKE2B 8150ac276f4e64458f3ab08dc48ddb4167a36162bdb291e59fb376e2a061b80f1760a195667a2794a7657f32367714dd60874cfcd2c363366dcbfde07a3224f0 SHA512 e554e48d740b0ce6406d8512a0c769e25f78b763d267bbbf8228197835b724154f33452571c771fede1415a9b3108deb096e3bc90291a95e8a3b00d216287928
+EBUILD unite-4.0-r1.ebuild 348 BLAKE2B 4a0f045c6287bd886920c8c77636e3d5aabe44812ce57f83b32b45c10791692d1e1af7f7aec5f474826f89879c4c269646bc2ad233d44d364119987bb2ed0da2 SHA512 42406dc5ce47d57b57b9cea11e2bf3634de53387b6bb491ddcf98cb8ec9b10598c9065bca13e69ef163a3cb4953d42a27690f728902a2ccb1cfc60981a601861
+MISC metadata.xml 669 BLAKE2B ef1526852b482b0429416f74a8a1bbe44e000ad792ca0a7cafbd1989da9c480f27f7590bbd76f06de18dc932e6979d912b458c6b181aa5201b96c4024ef726c3 SHA512 9a1b6ee71975656291278d75923247438be875af17abf1395a08ac3e9c8ee10b72830f0380117fad38214257ab01fbec35e45b0ce9ae7791a96a1f10cf065426
diff --git a/app-vim/unite/metadata.xml b/app-vim/unite/metadata.xml
new file mode 100644
index 000000000000..393dd84dde7c
--- /dev/null
+++ b/app-vim/unite/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Unite searches and displays information from arbitrary sources like files,
+ buffers, recently used files or registers. You can run one of defined action
+ on a target displayed.
+
+ The differences between unite and similar plugins like fuzzyfinder or ku are
+ that unite doesn't use the built-in completion interface of Vim, and integrates
+ sources at the same time.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/unite/unite-4.0-r1.ebuild b/app-vim/unite/unite-4.0-r1.ebuild
new file mode 100644
index 000000000000..8c036e471faa
--- /dev/null
+++ b/app-vim/unite/unite-4.0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: unite all sources"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3396"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="!app-vim/neocomplcache"
diff --git a/app-vim/uptime-1.3-r1 b/app-vim/uptime-1.3-r1
deleted file mode 100644
index 999c06c32610..000000000000
--- a/app-vim/uptime-1.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: display vim uptimes
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=965
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/uptime-1.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/uptime-1.3.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=38fac03777abde3bdbf16f16f9ce2019
diff --git a/app-vim/uptime/Manifest b/app-vim/uptime/Manifest
new file mode 100644
index 000000000000..08ef3427b710
--- /dev/null
+++ b/app-vim/uptime/Manifest
@@ -0,0 +1,3 @@
+DIST uptime-1.3.tar.bz2 2315 BLAKE2B d0237ff2b22820de85d4f0e4e7a85bff082cfe24af61b00b523a2df6db0bb22943303bf2ed09796f50ba7a49a16cce6d06b3ff06cc26cc8a7d4802693412bcf9 SHA512 42291261eb9f7246b68c32bef08599f604a5e1186eccff0b4ea118bb336e79a5c84cfbc2a834d5e50db3c2341c95c05f2961589efc3e459d3c6dac5f5baf50e4
+EBUILD uptime-1.3-r1.ebuild 347 BLAKE2B bf294a60505c8dba9b4997ec0a7adb4b88beb0394401af91a5da4377dd3f9a49cff127cd700951a4f97cd41c27d3f431b5b99482e94a1582bd1f6424223f4f48 SHA512 bec31ea1a1147cb2896b8e8cb37eb0667023f9419023673bd0c8a45899aaa5d87c93013a7437c722928f7c67d7c07900eb67b23de4dce34b1393b3e9da674bd1
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/uptime/metadata.xml b/app-vim/uptime/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/uptime/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/uptime/uptime-1.3-r1.ebuild b/app-vim/uptime/uptime-1.3-r1.ebuild
new file mode 100644
index 000000000000..c1c65ceeca84
--- /dev/null
+++ b/app-vim/uptime/uptime-1.3-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: display vim uptimes"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=965"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="uptime"
diff --git a/app-vim/vcscommand-1.99.47 b/app-vim/vcscommand-1.99.47
deleted file mode 100644
index 4fa023b28a5b..000000000000
--- a/app-vim/vcscommand-1.99.47
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: CVS/SVN/SVK/git/bzr/hg integration plugin
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=90
-KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=MIT
-RDEPEND=!app-vim/cvscommand || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/vcscommand-1.99.47.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vcscommand-1.99.47.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=47333c9076bc3fe984169c738bcad2a2
diff --git a/app-vim/vcscommand/Manifest b/app-vim/vcscommand/Manifest
new file mode 100644
index 000000000000..79ecc6ff9eab
--- /dev/null
+++ b/app-vim/vcscommand/Manifest
@@ -0,0 +1,3 @@
+DIST vcscommand-1.99.47.tar.bz2 27281 BLAKE2B 2c2e04fd986029ce9eb6fcc683666bf403947f15ad9b8e3ff1029b03f959b4d6c5b2173f5696516e76556f790094f06d45308a2af7e789d61a66cb5b253e1beb SHA512 df9180cc3a87dc5fab52d149c1f87993822658edabd77965756fa8ba05ef6f1c5a4f336b54d0b18e3c2bba8f53324ca60526258953a85ce170ab065b5f2e11c7
+EBUILD vcscommand-1.99.47.ebuild 438 BLAKE2B 7f0d648f0f51d3bd55517d671f5adba3c90f22384772b0ef8f4b25c378cd22d8dc97476205b803d8fe5de8508e49f47e7fc9f10135f2fef7e3e7ba12adae549f SHA512 53c1d7e023fc12b46960069854f350915609b14131467d2d874ccc070afdf27c3cc8ecc56f3427e715a06dd931b2e144b499a9c367abf4f50597e7cd47daa9e8
+MISC metadata.xml 472 BLAKE2B 11aab283f9bc2648abd064f56fabbce6863e1137de9d52e95ac21eaca684de2c0585891ea3ffcb92423a6181119468c653800cc9b6853fe2f858feafe373c7b0 SHA512 1fe14c8bf9e490646436b8ebd10898f79ea5614a894382397b07dcded1d37f2b8534858c38db7cb2fc859d839a1973f685e96cb9340b2b254273e9e627e3c970
diff --git a/app-vim/vcscommand/metadata.xml b/app-vim/vcscommand/metadata.xml
new file mode 100644
index 000000000000..8dacacbba2cd
--- /dev/null
+++ b/app-vim/vcscommand/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+</maintainer>
+<longdescription lang="en">
+ VIM 7 plugin useful for manipulating files controlled by CVS, SVN, SVK, git,
+ bzr, and hg within VIM, including committing changes and performing diffs
+ using the vimdiff system.
+</longdescription>
+</pkgmetadata>
diff --git a/app-vim/vcscommand/vcscommand-1.99.47.ebuild b/app-vim/vcscommand/vcscommand-1.99.47.ebuild
new file mode 100644
index 000000000000..9199a9fb5e6e
--- /dev/null
+++ b/app-vim/vcscommand/vcscommand-1.99.47.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: CVS/SVN/SVK/git/bzr/hg integration plugin"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=90"
+LICENSE="MIT"
+KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+
+RDEPEND="!app-vim/cvscommand"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/vim-addon-mw-utils-20121105 b/app-vim/vim-addon-mw-utils-20121105
deleted file mode 100644
index eab7ff9d6244..000000000000
--- a/app-vim/vim-addon-mw-utils-20121105
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: interpret a file by function and cache file automatically
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2940 https://github.com/MarcWeber/vim-addon-mw-utils
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/vim-addon-mw-utils-20121105.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vim-addon-mw-utils-20121105.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=a9a18854ad9c70cb3dfbf2be1da2efbb
diff --git a/app-vim/vim-addon-mw-utils/Manifest b/app-vim/vim-addon-mw-utils/Manifest
new file mode 100644
index 000000000000..787c906dcf35
--- /dev/null
+++ b/app-vim/vim-addon-mw-utils/Manifest
@@ -0,0 +1,3 @@
+DIST vim-addon-mw-utils-20121105.tar.bz2 10071 BLAKE2B c32216879a1873829f44777cde0b455d68694214c48e4f18e0302a026bbab7f9705016fc00158c6c9db69c59d2914ffc15dd385f79814781e517f71109dbac99 SHA512 15104f23416e8dbeb25d60e9b94c0c04434df19bbd3fa418285a1b1106a95dc6bf28cc472014fe431d80086217110c58f267d3d1b5d855bdf85fc4d4fe870346
+EBUILD vim-addon-mw-utils-20121105.ebuild 370 BLAKE2B 44f828edc2453a83c8e3ffb60af93366544d8f0f0124168b3098fe691f01ed4b4a8a0c30b035d5b7a7aa35841174f2cbcefff2624862bba199cd8f1f56995fe7 SHA512 0a3b58d5b84617c801ea6c1cc0fd323650b429534d431066847bf799dbe83f344c45396da0e3d1cdcb828271ec47ba0f529f442f9a3f9ea3222355de6057e6a2
+MISC metadata.xml 342 BLAKE2B 91bce96b9a5ef212e7fbc6e520a4c7ef11a4bc8d998d1afa4ff25b5885002d66b9d4578488ba3d9050f00ff608cdca20d96ead3d528c17d76c42363264c8db00 SHA512 ab292ae32011a7ff8367839fe3972e3e2dbe2db977ee81b0a619847d50288be8f2204604c19cb2e4e4942a98980d8ab886395a60b96dbdbfad2e5a739734954b
diff --git a/app-vim/vim-addon-mw-utils/metadata.xml b/app-vim/vim-addon-mw-utils/metadata.xml
new file mode 100644
index 000000000000..96018bf9a027
--- /dev/null
+++ b/app-vim/vim-addon-mw-utils/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">MarcWeber/vim-addon-mw-utils</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-addon-mw-utils/vim-addon-mw-utils-20121105.ebuild b/app-vim/vim-addon-mw-utils/vim-addon-mw-utils-20121105.ebuild
new file mode 100644
index 000000000000..e1a865ff200a
--- /dev/null
+++ b/app-vim/vim-addon-mw-utils/vim-addon-mw-utils-20121105.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: interpret a file by function and cache file automatically"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2940 https://github.com/MarcWeber/vim-addon-mw-utils"
+LICENSE="GPL-3"
+KEYWORDS="amd64 x86"
diff --git a/app-vim/vim-autoclose-2.0 b/app-vim/vim-autoclose-2.0
deleted file mode 100644
index 2eec0185fd00..000000000000
--- a/app-vim/vim-autoclose-2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: open-close pair of characters
-EAPI=6
-HOMEPAGE=https://github.com/Townk/vim-autoclose
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~monsieurp/packages/vim-autoclose-2.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=35a0d0487429c1c0ae670cab8175ebf5
diff --git a/app-vim/vim-autoclose/Manifest b/app-vim/vim-autoclose/Manifest
new file mode 100644
index 000000000000..958b77fa467c
--- /dev/null
+++ b/app-vim/vim-autoclose/Manifest
@@ -0,0 +1,3 @@
+DIST vim-autoclose-2.0.tar.gz 35779 BLAKE2B bf1536b3cdeecfc261ee30687d53ac2dd7632e21e877a67a99aa21e1d9e4389e3d1d3de764c76d94a8d97fa2bad1c7877276a5defa6b2ca137f1a8e866e902b0 SHA512 2604c2c16f25eb60bf660ba4f80d40d9aa51af38cc59a2727f0c705ba2abe5302a58dc60a71c791cc6aa002477587d1dadcc8a9269a93c5a9405a86251f4fcd9
+EBUILD vim-autoclose-2.0.ebuild 389 BLAKE2B d865dc00c7975075ed2d6ff4627d2e6fd7f86e55aeea70e6736995ad7729c481976361611cfc2008986f9578aeba4e6d60e2434a5e5e960b64fdfde551b833ca SHA512 ea690cb014599f55d7c658d76186a898ca3e7f787966bece9d2538dd94bf9a08a6ce62226ed10834013b4bb10e81eec5cddd18b33832da138aa018d63db1af17
+MISC metadata.xml 445 BLAKE2B bb09273cbcd52c149f21155f0b234ee70f2946038e509427f7ef6f3842af9825e41a569a8350ef93d671db7830d7c14269a21e399d640ee172edc02ba082daea SHA512 a78dd7130e0cba7566721294c9e3c7c90481f4eaff8d0d84ad3ad015c9afff79e0972335f9cb7bf9ac15e3f083853a6160c5654d6a0ab6dd2f20c047b4e7f8a5
diff --git a/app-vim/vim-autoclose/metadata.xml b/app-vim/vim-autoclose/metadata.xml
new file mode 100644
index 000000000000..0e5ce60b28e0
--- /dev/null
+++ b/app-vim/vim-autoclose/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Townk/vim-autoclose</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-autoclose/vim-autoclose-2.0.ebuild b/app-vim/vim-autoclose/vim-autoclose-2.0.ebuild
new file mode 100644
index 000000000000..b831f463e574
--- /dev/null
+++ b/app-vim/vim-autoclose/vim-autoclose-2.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: open-close pair of characters"
+HOMEPAGE="https://github.com/Townk/vim-autoclose"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+src_unpack() {
+ default
+ mv * "${P}" || die
+}
diff --git a/app-vim/vim-commentary-1.3_p20180530 b/app-vim/vim-commentary-1.3_p20180530
deleted file mode 100644
index 77e6f868c55e..000000000000
--- a/app-vim/vim-commentary-1.3_p20180530
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: comment stuff out
-EAPI=6
-HOMEPAGE=https://github.com/tpope/vim-commentary
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tpope/vim-commentary/archive/7f2127b1dfc57811112785985b46ff2289d72334.tar.gz -> vim-commentary-1.3_p20180530.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=bbbf5e12023dd203cd58d2587a656a66
diff --git a/app-vim/vim-commentary/Manifest b/app-vim/vim-commentary/Manifest
new file mode 100644
index 000000000000..5c7ed952dfd6
--- /dev/null
+++ b/app-vim/vim-commentary/Manifest
@@ -0,0 +1,3 @@
+DIST vim-commentary-1.3_p20180530.tar.gz 3062 BLAKE2B 72018b6e84313a5c7f44b994f1892724155bcecb14f3142d83a5b10ba8e8b813859bf3af660ebea840c196a6c9bd40c6daccfcdbfef47967be83a19201b65ce0 SHA512 a2aa9db16f12006842aaa61b69c1279bca046f840de9342cb0a3d0af7fc7a5bf0905ea87762f7519e858d4e04d4fea8b0e4efca7d4bc346ce2c5b76fa78d321f
+EBUILD vim-commentary-1.3_p20180530.ebuild 441 BLAKE2B 41fc32d94bcd6f499ddac3f730f845fedeb5cd6ae7525c679b6d7adf4151a5761a05e01c66c79b466f216f6f2111c1da9df9a86dc7ee53ddea2b3ab170a4cfde SHA512 eecdbab7ab1cbe5d36a9a4515da0566cef11ad273c570a51f425fad8d3b513ad12dc55f414c5ab8c5e1304ebe3673476d4e250cdb0241473e4d9b9332cee73d7
+MISC metadata.xml 334 BLAKE2B 4aa8711aba5240ff427b6b09abe504aabb86d128f3574a7c3c43d0b552300b0f89e6725f0d738c1659d65b6399c29d4cf7e658be8240442735c7fcc2fb7a032d SHA512 31d1c930133ebac9def519a58e99d4e7dc1c7c303cc2ed3866731eaf357e23ceac6b6cf4b37ca67599c743442d353f6bc640ed2a7e8278c7cfaf10b34d50238b
diff --git a/app-vim/vim-commentary/metadata.xml b/app-vim/vim-commentary/metadata.xml
new file mode 100644
index 000000000000..0f541f75ae23
--- /dev/null
+++ b/app-vim/vim-commentary/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">tpope/vim-commentary</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-commentary/vim-commentary-1.3_p20180530.ebuild b/app-vim/vim-commentary/vim-commentary-1.3_p20180530.ebuild
new file mode 100644
index 000000000000..a717143cd472
--- /dev/null
+++ b/app-vim/vim-commentary/vim-commentary-1.3_p20180530.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin vcs-snapshot
+
+# Commit Date: 30 May 2018
+COMMIT="7f2127b1dfc57811112785985b46ff2289d72334"
+
+DESCRIPTION="vim plugin: comment stuff out"
+HOMEPAGE="https://github.com/tpope/vim-commentary"
+SRC_URI="https://github.com/tpope/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/vim-flake8-1.6 b/app-vim/vim-flake8-1.6
deleted file mode 100644
index 62218092369a..000000000000
--- a/app-vim/vim-flake8-1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: runs the currently open file through flake8
-EAPI=6
-HOMEPAGE=https://github.com/nvie/vim-flake8
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=dev-python/flake8 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/nvie/vim-flake8/archive/1.6.tar.gz -> vim-flake8-1.6.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=f9ac2fbf18d73d0c7a5bd51bb810e3f5
diff --git a/app-vim/vim-flake8/Manifest b/app-vim/vim-flake8/Manifest
new file mode 100644
index 000000000000..ed011b53e30b
--- /dev/null
+++ b/app-vim/vim-flake8/Manifest
@@ -0,0 +1,3 @@
+DIST vim-flake8-1.6.tar.gz 5345 BLAKE2B dd726798a49231841f9fcb915999cf965a42b8b5f593a66f97268bc6d7993584d5f9ed0cfc50508bc57d60c5dcd19c8476e86ae26fb8be9c1dcf7007db2d0323 SHA512 a4208478f9754ef2d188a51e3262c449ef16b48fc0208425795d71c304118c129ae20a723fff96863291bae66237f1479a591cc23e5ec90222e0614d2dcccce9
+EBUILD vim-flake8-1.6.ebuild 402 BLAKE2B eb5c93251f30ef79ce9d76954d24f739e7dc4465ffdf9d6fae92747b065e058b5bb0e89961d77d526039f0bc023d47d19e8bfb50b3c7d07a02877c7c6b5e825e SHA512 e597905db4f37dc796bdd01cb6d2e5e5c121c6483347a7189dcfd16e36445636bbd8cadb3182fb3be9e14493bb9a44a8cf1569d9587e6a8806412698b76d8c6f
+MISC metadata.xml 424 BLAKE2B 3229e40038f1b81d9e30930a93fd292caacefb1425f4fe070348ccfacc377fd52a972735eff894cbbc01f838c2ba1d0f5a1f1fd84d3a9a2b76cf952a185914a5 SHA512 eaa032b9c9f247340b0eceffea35d85c14259024eac52195f3aab1d7916ea028b44a4ee4e1a8d1b95cf002972a82f0bf36b8425248da684ef794c8afbe632ac5
diff --git a/app-vim/vim-flake8/metadata.xml b/app-vim/vim-flake8/metadata.xml
new file mode 100644
index 000000000000..f1026b7729be
--- /dev/null
+++ b/app-vim/vim-flake8/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">nvie/vim-flake8</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-flake8/vim-flake8-1.6.ebuild b/app-vim/vim-flake8/vim-flake8-1.6.ebuild
new file mode 100644
index 000000000000..8ff3e0444938
--- /dev/null
+++ b/app-vim/vim-flake8/vim-flake8-1.6.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: runs the currently open file through flake8"
+HOMEPAGE="https://github.com/nvie/vim-flake8"
+SRC_URI="https://github.com/nvie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+RDEPEND="dev-python/flake8"
diff --git a/app-vim/vim-go-1.13 b/app-vim/vim-go-1.13
deleted file mode 100644
index 8fac44bfeeda..000000000000
--- a/app-vim/vim-go-1.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Go development plugin for Vim
-EAPI=6
-HOMEPAGE=https://github.com/fatih/vim-go
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/fatih/vim-go/archive/v1.13.tar.gz -> vim-go-1.13.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=7c8a1db2b94e4b929f4f894e5ad2a394
diff --git a/app-vim/vim-go/Manifest b/app-vim/vim-go/Manifest
new file mode 100644
index 000000000000..d24ed6b18398
--- /dev/null
+++ b/app-vim/vim-go/Manifest
@@ -0,0 +1,3 @@
+DIST vim-go-1.13.tar.gz 870173 BLAKE2B a2f67cef249191cf91caf45c120e471301a89ee365ba9add839edea17990ff3aba7238965dac1c71a89d2004dfcfd486319fc4f1474c7ee94d3845724cd9b289 SHA512 c2aa31104168f3a8e1f96b0ad2c51dc1c2e5a1de3db76f0009edfb38bf60ebfcd9bd8a86fedb6ff6d6d789973a557d6ed03e38e67159bc43c5231449b0253c25
+EBUILD vim-go-1.13.ebuild 585 BLAKE2B a46b8e468163abddf2ec305b76e24fe82ab82f631dbf773bf927c0962f55303b21e2eeba36e44a0c2d172160c65fa6ec02cde729260783b0ae9c7a5e0f199fe5 SHA512 4d7b8ba229f5c1318993517923701078909ac0fda31c34ea296b62e5e16395a7bb926ea9811b6fbfc8df4e660435bdc1407da209dc4dbb56cb7f887854e31e73
+MISC metadata.xml 326 BLAKE2B 2c1d1ecf6dc417d2646fbeeebbd2bf1191c93f6439df663e863cebe0b33cfea5040bbe3f1b85107f5370395d9472c4f903379c3a5cf925a997789c492ac0cc66 SHA512 0075500c50b5ad7cf5610fbc4bb71e3ee3d655bc089916371ee0d66731387a2268df98ed6d7fcad6e70db28d6852b48c2e6742e131b7c5d50fc7a9656807fc60
diff --git a/app-vim/vim-go/metadata.xml b/app-vim/vim-go/metadata.xml
new file mode 100644
index 000000000000..a34620b83509
--- /dev/null
+++ b/app-vim/vim-go/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">fatih/vim-go</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-go/vim-go-1.13.ebuild b/app-vim/vim-go/vim-go-1.13.ebuild
new file mode 100644
index 000000000000..39d68cf0d91e
--- /dev/null
+++ b/app-vim/vim-go/vim-go-1.13.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Go development plugin for Vim"
+HOMEPAGE="https://github.com/fatih/vim-go"
+SRC_URI="https://github.com/fatih/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="$PN"
+
+RESTRICT="test"
+
+src_compile() {
+ # safely skip `make test` triggered by `make` as it runs `go get` commands
+ # TODO: see :GoInstallBinaries (https://github.com/fatih/vim-go/blob/master/doc/vim-go.txt)
+ :;
+}
diff --git a/app-vim/vim-hoogle-1.3 b/app-vim/vim-hoogle-1.3
deleted file mode 100644
index b1c7c4c2a46e..000000000000
--- a/app-vim/vim-hoogle-1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: use hoogle within vim
-EAPI=6
-HOMEPAGE=https://github.com/Twinside/vim-hoogle
-KEYWORDS=~amd64 ~x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/Twinside/vim-hoogle/archive/31823f830843385f53a3da7a5bfaf678494383c4.tar.gz -> vim-hoogle-1.3.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=fc27d8bf42c1250e323cdb11fae79600
diff --git a/app-vim/vim-hoogle/Manifest b/app-vim/vim-hoogle/Manifest
new file mode 100644
index 000000000000..122cdffa6a86
--- /dev/null
+++ b/app-vim/vim-hoogle/Manifest
@@ -0,0 +1,3 @@
+DIST vim-hoogle-1.3.tar.gz 3337 BLAKE2B 2c80577171535aa45609f84e66cb3efc52a7028638075260aea8c1ee35839d79ab834e55f30f3401a3eb4b5daa24ba358d01b9edd1203779043db2fb2133077d SHA512 ea0d2b723e913836dbff5947e7de4fb5dda19ab1d3bd51cd315b28499f1b6c771b037b16eec6a88862d27f675a9ddac11eb5d8d5a5b3ee3e2eeb7620ed4d565a
+EBUILD vim-hoogle-1.3.ebuild 478 BLAKE2B ea79729ca6fedef925abac88da8b43c81cc295c6b982a4eb53963d2241cda212b69c4ea5c93f9353f3e927c797c6835ae31a467cfa0f2252982e7024926a2e03 SHA512 b62c15abf6b0b4c67aa6ede9ee4f9021ea97ef6c97a40c2a44fa4b5cd679b851c2ad473ddd9b2912e2c14e17a8d3514a7fd775679908383a5b2ba300a86e0f15
+MISC metadata.xml 333 BLAKE2B 07e7bfb41401bd5fb26dbf781135fe5f779b2df52bdb08dc9c459f7cbcd9145b1f682215bbf372ff1b99bbd08ec13fc13a389fac154999950e074f772caac0cf SHA512 b24d12456a6fed3864c3159aa935ad04875970f1995b4b6d21fdc3e04dee04c20561a489494c0cc8d8f1d59b880a8bb6156ecd2966ca196b17f9ec0746c78def
diff --git a/app-vim/vim-hoogle/metadata.xml b/app-vim/vim-hoogle/metadata.xml
new file mode 100644
index 000000000000..ee47616d507b
--- /dev/null
+++ b/app-vim/vim-hoogle/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">Twinside/vim-hoogle</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-hoogle/vim-hoogle-1.3.ebuild b/app-vim/vim-hoogle/vim-hoogle-1.3.ebuild
new file mode 100644
index 000000000000..1dee86affdcf
--- /dev/null
+++ b/app-vim/vim-hoogle/vim-hoogle-1.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MASTER_COMMIT_HASH="31823f830843385f53a3da7a5bfaf678494383c4"
+
+DESCRIPTION="vim plugin: use hoogle within vim"
+HOMEPAGE="https://github.com/Twinside/vim-hoogle"
+SRC_URI="https://github.com/Twinside/${PN}/archive/${MASTER_COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim.org"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}-${MASTER_COMMIT_HASH}"
diff --git a/app-vim/vim-latex-1.10.0 b/app-vim/vim-latex-1.10.0
deleted file mode 100644
index 0d49eac41e1f..000000000000
--- a/app-vim/vim-latex-1.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=A comprehensive set of tools to view, edit and compile LaTeX documents
-EAPI=6
-HOMEPAGE=http://vim-latex.sourceforge.net/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=vim
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( app-editors/vim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-editors/gvim[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) virtual/latex-base !app-vim/vimtex || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://sourceforge/vim-latex/vim-latex-1.10.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=a121fd783f46aee95730a5130112204f
diff --git a/app-vim/vim-latex/Manifest b/app-vim/vim-latex/Manifest
new file mode 100644
index 000000000000..f58b85f20d87
--- /dev/null
+++ b/app-vim/vim-latex/Manifest
@@ -0,0 +1,3 @@
+DIST vim-latex-1.10.0.tar.gz 260820 BLAKE2B 2314ad5ded3bea51def3172e8f2b7a7483839b58804f9d8c1cc1c8f1139c1da731f91525691d47dba57d07a7db85c371e87c5ce0d3d22a004a9402df7e7cad3a SHA512 1d22b675c124e402a280dcc3a675b49a92fb9f4d42efdda0ea97be26379cd6c023589a35e165f4231524d853380e22411901bfbcc98f171c938ba800821a1213
+EBUILD vim-latex-1.10.0.ebuild 1572 BLAKE2B b3ed9e89f7149ccd79c4db2c5a90af6b44609c489c0008f6176c6f51c0145c4f35fd7a51e9e6c780596ec3e42a88269e12569ef850f4e255c4ed436eb12f8d7e SHA512 748534b202c3a2cb725ae30fcdcf86f3cffc1102b3e5af2c4bb3899c5a23217d52e32cd9f7b38f06b797eade0bd92af6fe8bffa2e1a6033f64510b0efab0a966
+MISC metadata.xml 328 BLAKE2B bcf4c9979e43da6c141669c218e852e7a0c062d900c35790709e393f6cabc56f646f7a84e8057d9dbafa0a73e5786135a7cfe3ef825af867500bcd502f03a61f SHA512 e14b88742b6d8143cb578ddac61dbc0ac5e84c90659e8d9b5c40882ebdf35dc001b1ffae26eb90617434b2c8a898055c838738bf7cf18a45cd2a2ce66a30bdce
diff --git a/app-vim/vim-latex/metadata.xml b/app-vim/vim-latex/metadata.xml
new file mode 100644
index 000000000000..20ffb74c87d2
--- /dev/null
+++ b/app-vim/vim-latex/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">vim-latex</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-latex/vim-latex-1.10.0.ebuild b/app-vim/vim-latex/vim-latex-1.10.0.ebuild
new file mode 100644
index 000000000000..beb4e7760e64
--- /dev/null
+++ b/app-vim/vim-latex/vim-latex-1.10.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="A comprehensive set of tools to view, edit and compile LaTeX documents"
+HOMEPAGE="http://vim-latex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ || (
+ app-editors/vim[python,${PYTHON_USEDEP}]
+ app-editors/gvim[python,${PYTHON_USEDEP}]
+ )
+ virtual/latex-base
+ !app-vim/vimtex"
+
+VIM_PLUGIN_HELPFILES="latex-suite.txt latex-suite-quickstart.txt latexhelp.txt imaps.txt"
+
+src_compile() { :; }
+
+src_install() {
+ # remove unused metadata
+ rm vim-latex.metainfo.xml || die
+
+ # don't mess up vim's doc dir with random files
+ mv doc mydoc || die
+ mkdir doc || die
+ mv mydoc/*.txt doc/ || die
+ rm -rf mydoc || die
+
+ # don't install buggy tags scripts, use ctags instead
+ rm latextags ltags || die
+
+ vim-plugin_src_install
+
+ # use executable permissions (bug #352403)
+ fperms a+x /usr/share/vim/vimfiles/ftplugin/latex-suite/outline.py
+
+ python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+ vim-plugin_pkg_postinst
+
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ echo
+ elog "To use the vim-latex plugin add:"
+ elog " filetype plugin on"
+ elog ' set grepprg=grep\ -nH\ $*'
+ elog " let g:tex_flavor='latex'"
+ elog "to your ~/.vimrc-file"
+ echo
+ fi
+}
diff --git a/app-vim/vim-misc-1.17.6 b/app-vim/vim-misc-1.17.6
deleted file mode 100644
index 1f1e3440f11a..000000000000
--- a/app-vim/vim-misc-1.17.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: miscellaneous auto-load scripts
-EAPI=5
-HOMEPAGE=http://peterodding.com/code/vim/misc/
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/xolox/vim-misc/archive/1.17.6.tar.gz -> vim-misc-1.17.6.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=46ec834add770feb8d0715812473a3e4
diff --git a/app-vim/vim-misc/Manifest b/app-vim/vim-misc/Manifest
new file mode 100644
index 000000000000..fb24b0967910
--- /dev/null
+++ b/app-vim/vim-misc/Manifest
@@ -0,0 +1,3 @@
+DIST vim-misc-1.17.6.tar.gz 56548 BLAKE2B 59db23c8c272e3e12a8835b9cf9ad5d53be84c4d01d1f8ae3c6c42d55736aed1e018114af1eb14e16b6006a7527addb9a52cf59bf0d42e742b45e9abaa2174ba SHA512 04896559a9179e4f117de4ae78564309c9459ebb78ba1f9aceb7c3abf064e38d403567d01c347eb9ec0a09ed57c8ae51e01c4967e393c58c7b613cf926663e64
+EBUILD vim-misc-1.17.6.ebuild 474 BLAKE2B fba074973a32faf54930c62a1b4a4726bdda03bd075cdcbb7d6a9c00a2b864752dfcbf6b1d79a2e8125be5b49ddd7158b12cbd7404ec137d825a00a756f94856 SHA512 8c5aee37849f8db0fac0d11d1c431a3fc3f78252e77105dc0b52da406db541a08df9277166ef03225fae82eacf35a3b352a906b3fc01a1643490e06ba0f39858
+MISC metadata.xml 338 BLAKE2B 3e043a196cc0c084cf13cc903aba4c820dc1a219c259556d0e9817c0d26979d4ca8536b0a84953869e9e3598bd2dddf5899f7743bcfc373c888b738efa8f5b55 SHA512 c0c91d66a5125ffe1ebd4442bcc808024151a1019e2aaeb64802d3b0a6423ad5b5dcae7956244ffa81a97386f5642434730e11c0bc435fa8a94fa2e8936a5e7d
diff --git a/app-vim/vim-misc/metadata.xml b/app-vim/vim-misc/metadata.xml
new file mode 100644
index 000000000000..fd589251215a
--- /dev/null
+++ b/app-vim/vim-misc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">xolox/vim-misc</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-misc/vim-misc-1.17.6.ebuild b/app-vim/vim-misc/vim-misc-1.17.6.ebuild
new file mode 100644
index 000000000000..10ce26e479ee
--- /dev/null
+++ b/app-vim/vim-misc/vim-misc-1.17.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: miscellaneous auto-load scripts"
+HOMEPAGE="http://peterodding.com/code/vim/misc/"
+SRC_URI="https://github.com/xolox/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="misc.txt"
+
+src_prepare() {
+ rm INSTALL.md addon-info.json autoload/xolox/misc/echo.exe || die
+}
diff --git a/app-vim/vim-multiple-cursors-2.2-r1 b/app-vim/vim-multiple-cursors-2.2-r1
deleted file mode 100644
index b41b8fd36cd1..000000000000
--- a/app-vim/vim-multiple-cursors-2.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Sublime Text's awesome multiple selection feature for Vim
-EAPI=6
-HOMEPAGE=https://github.com/terryma/vim-multiple-cursors
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/terryma/vim-multiple-cursors/archive/v2.2.tar.gz -> vim-multiple-cursors-2.2.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=079ccb4e353be6bd1350f7bb01e14662
diff --git a/app-vim/vim-multiple-cursors/Manifest b/app-vim/vim-multiple-cursors/Manifest
new file mode 100644
index 000000000000..e8bc697d750c
--- /dev/null
+++ b/app-vim/vim-multiple-cursors/Manifest
@@ -0,0 +1,3 @@
+DIST vim-multiple-cursors-2.2.tar.gz 1055659 BLAKE2B b21336295a800e0458ff4f14a5a2d2c254ee9d1341fc0011a1b6bfe702f1e300d96d8e52f998333d3dab0c3a25b8ef12af828c479ba33ebe486399ed87a37b23 SHA512 109e8117a692e05c450ba30e0a4f635bfd24f08125d06b22c0e850e03e89e193e2ef7b415c8356d326b44ca93254b390d44ee417e8a0ee59fe9a805cf157c0e0
+EBUILD vim-multiple-cursors-2.2-r1.ebuild 694 BLAKE2B 9334ba36a1429fe63e0e6cc4c6ed01ec558d5f082c623952578414c8fbefbc26dbd494825b706de941f1d8ecd21519d39927dbc532f660b02337d7478789e05a SHA512 2d8c4b2c46833706500b83d5b3e8db2d82317726f03c298938de0ae3c255d310c076c080dceb6790a127f35a296b11042463924b16a459a8abbc51266400493b
+MISC metadata.xml 450 BLAKE2B 666dd9af7dd6cb28cad6e6fba8cfbc30bb4dd15b91218793ef13794d6c5498c3e581fdc6fcfa0a49e94df9b761557b58f306078410973393f304b1a928d68309 SHA512 0294668ca3ce283c851e27bcb6854e8fa1189ebb6daadbf2583b05014b2c34efd31194e114b4d7286641673272b8036da8aa7d7358febb1521927a660044ef97
diff --git a/app-vim/vim-multiple-cursors/metadata.xml b/app-vim/vim-multiple-cursors/metadata.xml
new file mode 100644
index 000000000000..b6f784080ccc
--- /dev/null
+++ b/app-vim/vim-multiple-cursors/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>tamiko@gentoo.org</email>
+ <name>Matthias Maier</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">terryma/vim-multiple-cursors</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-multiple-cursors/vim-multiple-cursors-2.2-r1.ebuild b/app-vim/vim-multiple-cursors/vim-multiple-cursors-2.2-r1.ebuild
new file mode 100644
index 000000000000..ebf1fe13f8be
--- /dev/null
+++ b/app-vim/vim-multiple-cursors/vim-multiple-cursors-2.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Sublime Text's awesome multiple selection feature for Vim"
+HOMEPAGE="https://github.com/terryma/vim-multiple-cursors"
+SRC_URI="https://github.com/terryma/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+src_install() {
+ default
+ vim-plugin_src_install
+ rm -r \
+ "${ED}"/usr/share/vim/vimfiles/spec \
+ "${ED}"/usr/share/vim/vimfiles/assets \
+ "${ED}"/usr/share/doc/${PF}/MIT-LICENSE.txt \
+ "${ED}"/usr/share/doc/${PF}/Rakefile \
+ "${ED}"/usr/share/doc/${PF}/Gemfile.lock \
+ || die "rm failed"
+}
diff --git a/app-vim/vim-r-1.0 b/app-vim/vim-r-1.0
deleted file mode 100644
index d8276b524657..000000000000
--- a/app-vim/vim-r-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: integrate vim with R
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2628
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain
-RDEPEND=dev-lang/R || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/vim-r-1.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vim-r-1.0.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=6f7b65ff63081140af9eeeb5b693d25e
diff --git a/app-vim/vim-r-1.2.6 b/app-vim/vim-r-1.2.6
deleted file mode 100644
index 2258b3a0d510..000000000000
--- a/app-vim/vim-r-1.2.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: integrate vim with R
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2628
-KEYWORDS=~amd64 ~x86
-LICENSE=public-domain
-RDEPEND=dev-lang/R || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/vim-r-1.2.6.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vim-r-1.2.6.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=6f7b65ff63081140af9eeeb5b693d25e
diff --git a/app-vim/vim-r/Manifest b/app-vim/vim-r/Manifest
new file mode 100644
index 000000000000..e45b04a6a640
--- /dev/null
+++ b/app-vim/vim-r/Manifest
@@ -0,0 +1,5 @@
+DIST vim-r-1.0.tar.bz2 82116 BLAKE2B cd4b6c44644b1f5675ec5f893ddfed4a87879afb4ea97c338ff948d6e29065369e4da1a86a29b3c217e4556a43a926a05e07b32cef1f5756cfcf2bfa527ca887 SHA512 9df3bf35da9da6f650c3de23f0a7607e5e02a6193e1f2352d8129668d0ad37a63088a6ae7ac77831952aa7d35bde2d2d7b6f592a15dc856eaf64a1cbb5cd07cc
+DIST vim-r-1.2.6.tar.bz2 76361 BLAKE2B 0f3596f7cf249562700db24b837a77b2edf8295ab23bd1bf3dff2f59970033ffc2de6017f26e1a5b53aed240aea4c20e8bce673aabcced45ec4f7eef027a972f SHA512 187b31068d32c22c182650571dc5af68cc804562ffdc6b4902729735e4000b1ca4e0636d6b5617f3c2f36403eb4f0b1adc35d2387b5c110286da2ea2254f9009
+EBUILD vim-r-1.0.ebuild 553 BLAKE2B ed4b75bc221d24b99d9834ccbc818ff370846818543fe1bf2ceedabdcc8d718b074597244894fc1562d9ab6c17951ad45b7bc7f4a8f887fb5c82864ab9b51fb4 SHA512 b976f84cf060db8830311816ff9bc1e2961f6e1720ffac650c732a86e8b7a61c487f7aeca3f235d2e632d112d6d2ae93781abc18764b98ad6849649b0fa6ecff
+EBUILD vim-r-1.2.6.ebuild 553 BLAKE2B ed4b75bc221d24b99d9834ccbc818ff370846818543fe1bf2ceedabdcc8d718b074597244894fc1562d9ab6c17951ad45b7bc7f4a8f887fb5c82864ab9b51fb4 SHA512 b976f84cf060db8830311816ff9bc1e2961f6e1720ffac650c732a86e8b7a61c487f7aeca3f235d2e632d112d6d2ae93781abc18764b98ad6849649b0fa6ecff
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vim-r/metadata.xml b/app-vim/vim-r/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/vim-r/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/vim-r/vim-r-1.0.ebuild b/app-vim/vim-r/vim-r-1.0.ebuild
new file mode 100644
index 000000000000..c02b63c38175
--- /dev/null
+++ b/app-vim/vim-r/vim-r-1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: integrate vim with R"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2628"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/R"
+
+VIM_PLUGIN_HELPFILES="r-plugin.txt"
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "This plugin requires the vimcom R package to be installed,"
+ elog "see https://github.com/jalvesaq/VimCom for instructions."
+ fi
+}
diff --git a/app-vim/vim-r/vim-r-1.2.6.ebuild b/app-vim/vim-r/vim-r-1.2.6.ebuild
new file mode 100644
index 000000000000..c02b63c38175
--- /dev/null
+++ b/app-vim/vim-r/vim-r-1.2.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: integrate vim with R"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=2628"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/R"
+
+VIM_PLUGIN_HELPFILES="r-plugin.txt"
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "This plugin requires the vimcom R package to be installed,"
+ elog "see https://github.com/jalvesaq/VimCom for instructions."
+ fi
+}
diff --git a/app-vim/vim-rest-console-2.3.0 b/app-vim/vim-rest-console-2.3.0
deleted file mode 100644
index 5a80be03497e..000000000000
--- a/app-vim/vim-rest-console-2.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a REST console for vim
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/diepm/vim-rest-console/archive/v2.3.0.tar.gz -> vim-rest-console-2.3.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=8d43314f05b15b642291f70a1d4346c9
diff --git a/app-vim/vim-rest-console-2.4.0 b/app-vim/vim-rest-console-2.4.0
deleted file mode 100644
index 70555548f7de..000000000000
--- a/app-vim/vim-rest-console-2.4.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=a REST console for vim
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/diepm/vim-rest-console/archive/v2.4.0.tar.gz -> vim-rest-console-2.4.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=883989ce748dbdd24d8f85c261b9ce69
diff --git a/app-vim/vim-rest-console-2.5.0 b/app-vim/vim-rest-console-2.5.0
deleted file mode 100644
index 03cf5af01ff5..000000000000
--- a/app-vim/vim-rest-console-2.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=a REST console for vim
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/diepm/vim-rest-console/archive/v2.5.0.tar.gz -> vim-rest-console-2.5.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=883989ce748dbdd24d8f85c261b9ce69
diff --git a/app-vim/vim-rest-console-2.6.0 b/app-vim/vim-rest-console-2.6.0
deleted file mode 100644
index 8c8ce149175d..000000000000
--- a/app-vim/vim-rest-console-2.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=a REST console for vim
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/diepm/vim-rest-console/archive/v2.6.0.tar.gz -> vim-rest-console-2.6.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=71450107ba04ab39e08dde459b53158d
diff --git a/app-vim/vim-rest-console/Manifest b/app-vim/vim-rest-console/Manifest
new file mode 100644
index 000000000000..e6781c4feb98
--- /dev/null
+++ b/app-vim/vim-rest-console/Manifest
@@ -0,0 +1,9 @@
+DIST vim-rest-console-2.3.0.tar.gz 11584 BLAKE2B cb4a6b8a7f1280b329dc9a0b261519172a4c39c40f9a8f5fa4967f4530f089dcfbd5e0088dcb2b8067216e7d7fb623a3e720e9a2aefb9d376a36830f54bf771a SHA512 04fa4cc2177b87a6d69ad50d0e45f411169d178e4990280afde730c461cb718acd09dc034e61c51f73974369d9be9300281f1e60adf8084730977caa27c65da2
+DIST vim-rest-console-2.4.0.tar.gz 11795 BLAKE2B 84683c5ac65f429a1c4db0d792da76ad733b3700d1ae7d00baab6495465e27dede8c042c999f125f35b25c50039684dc919ffaf806c1d5c202c7cd4c2edb90ba SHA512 77f06a9cee534eda2e414c4b0b0fdbdf335b1a397ab9c45b4331f211db1dbeb89bd0a73906945b0ed08c8b795c4be444b9ffcd2c06e145a43b3efb456aa64666
+DIST vim-rest-console-2.5.0.tar.gz 11945 BLAKE2B 3959372c834cc51c0c74c39036633520bd753ebece30d4164a98f5b960f1e8756d7e526f840249ca0dde7dfc0b742f06c7b7e197a9578f30eb2644a345468f0d SHA512 1c2e2dafdcdd57216bac08adfaef4e5f3dc2331b13fd969064bd460681838cb4eb830644e33e9397388b0ff76b68d992523ba1c258c2385d6daae5ad87cbdd58
+DIST vim-rest-console-2.6.0.tar.gz 15935 BLAKE2B 93c9d9637b67c5fd3b7a765b2bddb2942798d93605f2e558abc95d338116d9325e08b1717c8326824c915f71388af84d70ac8ddea1baead12137c7564da57ddf SHA512 d75b9071eed1bdae604c3fc3457c319a8893ba01001c6b27b8bbea038e9964597bb1a7a2e03ac1d6d9e35e9d96ee350f1eaf6c12f2e8f53929f3f511a470170d
+EBUILD vim-rest-console-2.3.0.ebuild 515 BLAKE2B 71a57ed293aa27a54dcd3ad49d32c6b98093182414bab1eb327af76548f5e0302681f3d2b22e5b87e84d2d067f7cc8193565895befb4b2d74ff0cc8d8d76c84a SHA512 41891e407febfdd8ed20bb32769ff02c6ad4cff4e87671ac80a5caa44514fda4697c4a15fb0e72cba54df78759518cd43d17860565aa7397a89a72299e187a8e
+EBUILD vim-rest-console-2.4.0.ebuild 503 BLAKE2B 6d6aa62e54f52eba682e83109ca093bb44fc28ea32358e6dc83c190c9d881c84c164aaffdb3cfe405396af7b5930a5060c8c736eee25517d4d31904e9d9cdc30 SHA512 49cc3feafd5d7d8c695ff9b47d2c9f8966235e7d0403a8a56d9822795a58a3ed06ae9240c54165698fca489efcb231d1eb84cb3dda8c2848a5a011b7305ebf28
+EBUILD vim-rest-console-2.5.0.ebuild 503 BLAKE2B 6d6aa62e54f52eba682e83109ca093bb44fc28ea32358e6dc83c190c9d881c84c164aaffdb3cfe405396af7b5930a5060c8c736eee25517d4d31904e9d9cdc30 SHA512 49cc3feafd5d7d8c695ff9b47d2c9f8966235e7d0403a8a56d9822795a58a3ed06ae9240c54165698fca489efcb231d1eb84cb3dda8c2848a5a011b7305ebf28
+EBUILD vim-rest-console-2.6.0.ebuild 512 BLAKE2B 7f5b52a7803fdc77763ec0a2798e32411331e5cb829c9c04ad712109ddcb1d1581448759402d67b2ccfacaa5bfea64e6506b9c91e9685ab8dbe99483d2c258e7 SHA512 e465333ac587532d31916fc2fa344ca0482cd60f17048810949655ab80d7f2bc69387e80be16c8a917654addf0f129debee3d95a5cb48b5c13e28d9916003179
+MISC metadata.xml 346 BLAKE2B 64567ecfbad2ce7bd1b18616c8d7f6460246f48bac01f7dee59316088ada121ebe0f57f5dc6c796e5c1478f250ea08352a1b44869de2b47bb22319f1dad23eef SHA512 9139fde3f2e37523a44c0ae9f4745952e562012ac7338fb533a1698d8b1545c92c431e01c2f3b57ed5e02b651e5a72205205c927005bf23e2e7771c9d2701ba6
diff --git a/app-vim/vim-rest-console/metadata.xml b/app-vim/vim-rest-console/metadata.xml
new file mode 100644
index 000000000000..2d3e3d904848
--- /dev/null
+++ b/app-vim/vim-rest-console/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">diepm/vim-rest-console</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-rest-console/vim-rest-console-2.3.0.ebuild b/app-vim/vim-rest-console/vim-rest-console-2.3.0.ebuild
new file mode 100644
index 000000000000..f9e7a6f06827
--- /dev/null
+++ b/app-vim/vim-rest-console/vim-rest-console-2.3.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: a REST console for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console"
+SRC_URI="https://github.com/diepm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="net-misc/curl"
+
+src_prepare() {
+ rm *.md *.json *.rest || die
+}
diff --git a/app-vim/vim-rest-console/vim-rest-console-2.4.0.ebuild b/app-vim/vim-rest-console/vim-rest-console-2.4.0.ebuild
new file mode 100644
index 000000000000..1a51e85303b6
--- /dev/null
+++ b/app-vim/vim-rest-console/vim-rest-console-2.4.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="a REST console for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console"
+SRC_URI="https://github.com/diepm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="net-misc/curl"
+
+src_prepare() {
+ rm *.md *.json *.rest || die
+}
diff --git a/app-vim/vim-rest-console/vim-rest-console-2.5.0.ebuild b/app-vim/vim-rest-console/vim-rest-console-2.5.0.ebuild
new file mode 100644
index 000000000000..1a51e85303b6
--- /dev/null
+++ b/app-vim/vim-rest-console/vim-rest-console-2.5.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="a REST console for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console"
+SRC_URI="https://github.com/diepm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="net-misc/curl"
+
+src_prepare() {
+ rm *.md *.json *.rest || die
+}
diff --git a/app-vim/vim-rest-console/vim-rest-console-2.6.0.ebuild b/app-vim/vim-rest-console/vim-rest-console-2.6.0.ebuild
new file mode 100644
index 000000000000..54eb296ba217
--- /dev/null
+++ b/app-vim/vim-rest-console/vim-rest-console-2.6.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="a REST console for vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console"
+SRC_URI="https://github.com/diepm/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="net-misc/curl"
+
+src_prepare() {
+ rm *.md *.json *.rest || die
+ default
+}
diff --git a/app-vim/vim-spell-cs-20061021-r1 b/app-vim/vim-spell-cs-20061021-r1
deleted file mode 100644
index c3af8a155531..000000000000
--- a/app-vim/vim-spell-cs-20061021-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=vim spell files: Czech (cs)
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/vim-spell-cs-20061021.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=dcbab36cbbdc52fbb66d54b706a0ad78
diff --git a/app-vim/vim-spell-cs/Manifest b/app-vim/vim-spell-cs/Manifest
new file mode 100644
index 000000000000..3fa59c80b30d
--- /dev/null
+++ b/app-vim/vim-spell-cs/Manifest
@@ -0,0 +1,3 @@
+DIST vim-spell-cs-20061021.tar.bz2 1320356 BLAKE2B 0583ecb357ab3180c637211c6565e5e8e61e2739e41b25a3a704944d7216b8c54ebc249734af25d92de1c9a69bc9021d538df78953773570d7f84f70ff6705a9 SHA512 cb9cae6dab11c5cbbe16e0902b18cdbea81dbd7844eda4774f45c6e5a5f3eebb09e062a37845a0e6ff5bc5c0abf7219001824768c0e058998a7c922790006e99
+EBUILD vim-spell-cs-20061021-r1.ebuild 258 BLAKE2B 8d974edbce8a3d4c63c31c9e974a4fe3abd402d1f488ef6d96ad5d140cfdcb8040dbc2820b50392aeb483e1c565fcc117c7daceaabfd92e69849c94f3fa107d7 SHA512 b352e663756e3b175b151479f15bc95e93ff6ab8234196c79e176dc3ad242aa8361340454dc9eba80837d207987914dae2434a7b2f7e4bb913fd7c84954d8bda
+MISC metadata.xml 635 BLAKE2B a5c4352453a9744b9a580993e6f535445d1d2198778546e029e78bd871b9c2024e782b90d3d092b18cc1176f0703bf517e68e69b83ddbcfc7f371fb583d861b2 SHA512 10959e90745e992de4f48937f07ae9e37f6344327eb0b704c11f0cbc0af2744ff4abf45868a706825f53db65c8661e269998db8e83f049390da811abb5b98728
diff --git a/app-vim/vim-spell-cs/metadata.xml b/app-vim/vim-spell-cs/metadata.xml
new file mode 100644
index 000000000000..ca2f9ddd03e8
--- /dev/null
+++ b/app-vim/vim-spell-cs/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>jkt@kde.org</email>
+ <name>Jan Kundrát</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Vim spell files for Czech (cs). Supported character sets are cp1250,
+ iso-8859-2, and UTF-8.
+ </longdescription>
+ <longdescription lang="cs">
+ Kontrola českého pravopisu pro Vim. Podporuje kódování cp1250,
+ iso-8859-2 a UTF-8.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-cs/vim-spell-cs-20061021-r1.ebuild b/app-vim/vim-spell-cs/vim-spell-cs-20061021-r1.ebuild
new file mode 100644
index 000000000000..06beb4f9d9d1
--- /dev/null
+++ b/app-vim/vim-spell-cs/vim-spell-cs-20061021-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="Czech"
+
+inherit vim-spell
+
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+KEYWORDS="amd64 sparc x86"
+LICENSE="GPL-2"
diff --git a/app-vim/vim-spell-da-20060116-r1 b/app-vim/vim-spell-da-20060116-r1
deleted file mode 100644
index cc1f5b379d80..000000000000
--- a/app-vim/vim-spell-da-20060116-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=vim spell files: Danish (da)
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/vim-spell-da-20060116.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=d21ea7b448f515ebe14192a0efd464b7
diff --git a/app-vim/vim-spell-da/Manifest b/app-vim/vim-spell-da/Manifest
new file mode 100644
index 000000000000..df5f56efff4e
--- /dev/null
+++ b/app-vim/vim-spell-da/Manifest
@@ -0,0 +1,3 @@
+DIST vim-spell-da-20060116.tar.bz2 629196 BLAKE2B fd8829e2920514ddd2e6c224521d6337b3e18d0cec1bfbfa89ff93aac35fa22d9a908ea353b969c0cd3e6c86bbee8bca58fa5e80c01141aa74c6a54dd016214c SHA512 0d055972b15acdd2ea7166711e344b1718975f7de6a49653240fb2e1bb31a82a8174e46de83f38d93d226782b97e2c58aff50cc0efab95dcde3d53b80205f444
+EBUILD vim-spell-da-20060116-r1.ebuild 276 BLAKE2B e3e21ed341a4c999d68ac4c3e0e047001189df6f12d065e7622abb14a8adae1f00eadfd254bcbc952c86ef05be4911ef8fea97ac0d97cc800d7bf7c51858bbf6 SHA512 50ca2086b9f15a81705fb8f4005befea20f14b3a4b6fd8356b94418db89bb8c7508cd3ef3383d6efc37da1d147be2408f0691fcf7f87e4678e9abca75fb3b7e9
+MISC metadata.xml 380 BLAKE2B 9663ddc26c4b2e454365796824d351e6b35410e8eccd8bdec574e17d6fa4b3b6207e24cc4867324b6a0fbe18d2dc1626a0c565f25703bb1a8337d3ffb3ec879d SHA512 0e165d32c9cc2878b696b33ab8a9d1cac4e41ae0e45a019075be7ea8057acff4a40ec947a74c5edb42e31fb0357f284260efcb30914bfd1fe27aed1f5ff54f9a
diff --git a/app-vim/vim-spell-da/metadata.xml b/app-vim/vim-spell-da/metadata.xml
new file mode 100644
index 000000000000..a27b65aadec6
--- /dev/null
+++ b/app-vim/vim-spell-da/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Vim spell files for Danish (da). Supported character sets are UTF-8,
+ latin-1.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-da/vim-spell-da-20060116-r1.ebuild b/app-vim/vim-spell-da/vim-spell-da-20060116-r1.ebuild
new file mode 100644
index 000000000000..3fff3c7aafb9
--- /dev/null
+++ b/app-vim/vim-spell-da/vim-spell-da-20060116-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="Danish"
+
+inherit vim-spell
+
+KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86"
+LICENSE="GPL-2"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-de-20080213-r1 b/app-vim/vim-spell-de-20080213-r1
deleted file mode 100644
index ca2aa4ecc61b..000000000000
--- a/app-vim/vim-spell-de-20080213-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=vim spell files: German (de)
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ppc sparc x86 ~arm ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/vim-spell-de-20080213.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=cddb55e740a589751db97d7d41df22a6
diff --git a/app-vim/vim-spell-de/Manifest b/app-vim/vim-spell-de/Manifest
new file mode 100644
index 000000000000..0758ae381464
--- /dev/null
+++ b/app-vim/vim-spell-de/Manifest
@@ -0,0 +1,3 @@
+DIST vim-spell-de-20080213.tar.bz2 11171578 BLAKE2B ac344c6d9d72fabe9f950859bc6e7f880b72484622dda12ac5b9e59e485a158a4d9d4948210aa96031328fd446abdd9ff786dad7b6b8c1f8dfc185cc2b35fea6 SHA512 6b18d527a61573f865dc51bad1c8f4aca17453c2605c390e330a52f041f1392c438190dcc6168803bf415b4e9e470055a52013ee16ea32c7a8c42b2843fb3698
+EBUILD vim-spell-de-20080213-r1.ebuild 314 BLAKE2B d03b5085d11a3a18106e2c59b5dc82a297c44cf2279ea78efaef15b2deb852545241bf03932a2c5b9b71930b58aab138f29f40f0409d79552b9252044fef527f SHA512 8661aaa8fe25f8d3d3676b6c4eb590cca61cc9af462e16f9f00d6dd3a864cdd3a296f5704bf1e964ff1f1c83a0ffdf0cbb09be65113658a844bcbf3c072f2897
+MISC metadata.xml 383 BLAKE2B 918dbe67b13e140ec5a9c848d95261d93d2c0295d0202625dbe8749357082803a1846df04eb309fb23c2777e8be1c17974b425bbdf0a1b7424256b5099f4597d SHA512 ada270f71eeddd0c7395561b48093bf12933507593334d74e33999432cb2c4665d3f7008779141dab56f4d33e8e6bd08805a125d9643a0cc493025c8fea6784f
diff --git a/app-vim/vim-spell-de/metadata.xml b/app-vim/vim-spell-de/metadata.xml
new file mode 100644
index 000000000000..25210cdaf8e5
--- /dev/null
+++ b/app-vim/vim-spell-de/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Vim spell files for German (de). Supported character sets are UTF-8
+ and latin-1.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-de/vim-spell-de-20080213-r1.ebuild b/app-vim/vim-spell-de/vim-spell-de-20080213-r1.ebuild
new file mode 100644
index 000000000000..bb19502e99b0
--- /dev/null
+++ b/app-vim/vim-spell-de/vim-spell-de-20080213-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="German"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc sparc x86 ~arm ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-el-20080402-r1 b/app-vim/vim-spell-el-20080402-r1
deleted file mode 100644
index cfb9252b184e..000000000000
--- a/app-vim/vim-spell-el-20080402-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=vim spell files: Greek (el)
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/vim-spell-el-20080402.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=14f946c5643db7573e3fd97e404fb1b1
diff --git a/app-vim/vim-spell-el/Manifest b/app-vim/vim-spell-el/Manifest
new file mode 100644
index 000000000000..164350408740
--- /dev/null
+++ b/app-vim/vim-spell-el/Manifest
@@ -0,0 +1,3 @@
+DIST vim-spell-el-20080402.tar.bz2 3360601 BLAKE2B a3ab008a4786838aa6b85c061d899e8348ff19cf8aa1763b8661715c5017486363d03be1431f7dd228a6ce5a7ee8b85bd98a8cd8e2fd44e91d0751dd206a1d10 SHA512 5cf68b43e213c3d6f36c96c7414927314e25bd45283759490628cd40c6b4052e6f4c7b43db27e9a3393dc32c8960452f94ba42e279c4dad4a5a5520e338d38e9
+EBUILD vim-spell-el-20080402-r1.ebuild 252 BLAKE2B 662207fc1364605006efeddf71548332d9e8601a9f79ce94e3ac8e702adefc161da364a7fd9142f5901038ad927ec7750b3b34f581d655fe83901d6cfe9a31c1 SHA512 952a3d19ac0b16cff7372f90bc1c245c5f765e8840df478043cd190c510ee5f3c19616bff33b2437911418bf29ddd500621cf7c7bef60753032e8f8212287978
+MISC metadata.xml 375 BLAKE2B d67b18ff863f2ecf420be84cb28a759568282416897059913915d5c4126bb3b29c625d0d7c679800a1e5a109612d6fba64caeb033719c59018b3ca13f6d876c6 SHA512 bea1fc36ab389418f57fc9d66dc6c2c4a20da1b11fdb4ab6e412dea40a8c0ec4dc58525cd1d0e6839c257ffa61f4859079f3dc3df28e028f0b6482e0eda6e220
diff --git a/app-vim/vim-spell-el/metadata.xml b/app-vim/vim-spell-el/metadata.xml
new file mode 100644
index 000000000000..8202659c959a
--- /dev/null
+++ b/app-vim/vim-spell-el/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription>
+ Vim spell files for Greek (el). Supported character sets are UTF-8 and
+ ISO-8859-7.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-el/vim-spell-el-20080402-r1.ebuild b/app-vim/vim-spell-el/vim-spell-el-20080402-r1.ebuild
new file mode 100644
index 000000000000..9a30994df196
--- /dev/null
+++ b/app-vim/vim-spell-el/vim-spell-el-20080402-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="Greek"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-en-20060123-r1 b/app-vim/vim-spell-en-20060123-r1
deleted file mode 100644
index 9c8333979bba..000000000000
--- a/app-vim/vim-spell-en-20060123-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=vim spell files: English (en)
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD LGPL-2.1 public-domain
-SLOT=0
-SRC_URI=mirror://gentoo/vim-spell-en-20060123.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=da732fbb5765a50218e6d64a87a0406a
diff --git a/app-vim/vim-spell-en/Manifest b/app-vim/vim-spell-en/Manifest
new file mode 100644
index 000000000000..6b65754443c0
--- /dev/null
+++ b/app-vim/vim-spell-en/Manifest
@@ -0,0 +1,3 @@
+DIST vim-spell-en-20060123.tar.bz2 1819791 BLAKE2B 943265e3db6f0c47ed71381e12bcc23cc0f8636b40c5a694d49064a5f27a845b37810cc5468fcfcebbf9f37537ab574467fd6cc25a3e61966b2851d3d4353a34 SHA512 145a4cbf976b5472b2474f9d84978e9907f0dabdee05fa55b0b4ce5f56dc27ef568e8c28fe67d9d8b86a33e0392b1fc6af6f44d6f147ce894070b58e40109dc0
+EBUILD vim-spell-en-20060123-r1.ebuild 343 BLAKE2B 39b82e33d8b909aa8c47283e4f2bab756903ac0f48f5b0ec2dfb552411a92baeac9f590df719af54f6417a663255f7e15d9485aca0ca469315ddc8c59bbd9af4 SHA512 7c917329462c25c39b043e06c5eb7372fccd51dc6fc8c8af04319e9e003b1482a498ee2bd155516cab94e2d230d153b271f9dc8ccd73fc403b5538f809f009f7
+MISC metadata.xml 391 BLAKE2B 4a8585e7b3e3e7e6507b50f5d236d92f90e3bf8739940de0aea3298a845cb694d2a8df0239ab48f6aa7f2dc6145a9bf2c0efba1395fb81b03f53b34d776bb9e8 SHA512 365599ae6c6ab09d6efb59870c5a640cac2442fe1c3c584c94a4218baaeb4905540e9572e650ee808b15070e4860fa286224c5cd68dfd0bbc1de675113919425
diff --git a/app-vim/vim-spell-en/metadata.xml b/app-vim/vim-spell-en/metadata.xml
new file mode 100644
index 000000000000..2011f80d0660
--- /dev/null
+++ b/app-vim/vim-spell-en/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Vim spell files for English (en). Supported character sets are UTF-8,
+ latin-1 and ASCII.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-en/vim-spell-en-20060123-r1.ebuild b/app-vim/vim-spell-en/vim-spell-en-20060123-r1.ebuild
new file mode 100644
index 000000000000..765ba9b7bfcd
--- /dev/null
+++ b/app-vim/vim-spell-en/vim-spell-en-20060123-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="English"
+
+inherit vim-spell
+
+KEYWORDS="~alpha amd64 ~arm ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+LICENSE="BSD LGPL-2.1 public-domain"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-es-20060208-r1 b/app-vim/vim-spell-es-20060208-r1
deleted file mode 100644
index f38e8a883006..000000000000
--- a/app-vim/vim-spell-es-20060208-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=vim spell files: Spanish (es)
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 ppc sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/vim-spell-es-20060208.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=14c30cab0c52cddf32249d02696ed227
diff --git a/app-vim/vim-spell-es/Manifest b/app-vim/vim-spell-es/Manifest
new file mode 100644
index 000000000000..21f0cd635b51
--- /dev/null
+++ b/app-vim/vim-spell-es/Manifest
@@ -0,0 +1,3 @@
+DIST vim-spell-es-20060208.tar.bz2 2417510 BLAKE2B a10bde19d08b272576b06cc6c78234b1c6218b44eea9a16cbe3a43935f1f80f2910ebb04e5efdf85e55dfe510d9cf4943b027249b138d4cb37499c67b3d4ce55 SHA512 e035e587191eabc78672ff4cb72c637e8f582480c67ab79b93879de6791d09484108ddd213213186a0fef02869012d28d31793274a638ac7c87fe9e2aeeadec2
+EBUILD vim-spell-es-20060208-r1.ebuild 271 BLAKE2B 7f76e09acb97dad4fcfcd1e1a1b74242b8190e298dc7756d4b2541b78b69c136366834784d149e593eeed32127cf6374a14ecbdb1704234bcb165f3e4931005a SHA512 3fbec6df33ed0c804715a1b8cf3778d344a1c2ff062beafe8f6690bc8b0f22f85aa62ac728125c33e545277643fc018211702bcdf8a2c82fbb2fdd5db41859a7
+MISC metadata.xml 395 BLAKE2B 1ce23cc85056f6787000ae66a1254e10e44372b48f78790a990b886921349deecba27e2450d60e590f7265b0fc77298fee525f725798e01d4ba8c6bf3ca4cec8 SHA512 a495a85b7630e9f0849fd15c7a1d7809e547a2851c556771b79d56980621666d8eced0fad73cd6caba8a9405456b273dc7fd2161d4189dde25a679ded94aeaaa
diff --git a/app-vim/vim-spell-es/metadata.xml b/app-vim/vim-spell-es/metadata.xml
new file mode 100644
index 000000000000..b02d68b4342b
--- /dev/null
+++ b/app-vim/vim-spell-es/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Vim spell files for Spanish (es). Supported character sets are UTF-8 and
+ latin1.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-es/vim-spell-es-20060208-r1.ebuild b/app-vim/vim-spell-es/vim-spell-es-20060208-r1.ebuild
new file mode 100644
index 000000000000..ae416bcc3eb5
--- /dev/null
+++ b/app-vim/vim-spell-es/vim-spell-es-20060208-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="Spanish"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha amd64 ppc sparc x86"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-fr-20060121-r1 b/app-vim/vim-spell-fr-20060121-r1
deleted file mode 100644
index d449912af884..000000000000
--- a/app-vim/vim-spell-fr-20060121-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=vim spell files: French (fr)
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/vim-spell-fr-20060121.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=20b1ef4483564241e9a31ed488d9ceee
diff --git a/app-vim/vim-spell-fr/Manifest b/app-vim/vim-spell-fr/Manifest
new file mode 100644
index 000000000000..52f2f0620129
--- /dev/null
+++ b/app-vim/vim-spell-fr/Manifest
@@ -0,0 +1,3 @@
+DIST vim-spell-fr-20060121.tar.bz2 408587 BLAKE2B 9a3678b2aa4e8e7c9a4c56e0e856dc2892ef00c58c2442b196e257db11c63032bce4e69c934c47a9a91296cbb44bd2c3921ae191f4b982ff80c1532b313daeef SHA512 2f826751d450bae22aff918004e980fb3f9065fdf418bc0071510b8b0fa2d4bae3d4c9563231e4e6be8320a39018d8b2bee0ea06c6206c3b5a60b6c3d4db2575
+EBUILD vim-spell-fr-20060121-r1.ebuild 263 BLAKE2B 1c3cc0241c3071ab360006e44617ab56aa5f7a499c15cca5dce4b68c5d34b5b781def2def531af0890b4b562f8f93ce11f6b479e101f8b7c1fabea3a4cac9f54 SHA512 744a8f2787325054c15f5552e3571392549c14673a40bc93ebd9de7aa704316fd8d57fb99779b4cf4c09424cfb1cf6f73f24f56321a46fc2dff456ffcb1d015e
+MISC metadata.xml 390 BLAKE2B 3b7b0c0100aea76040496fb026d8ad1ef851b61a8a06ed2183eb5bf72fa9120ea1a6f06be8538c5e7f61e9cad1f6caaa253b8ca079012233ab09b2cebe118d39 SHA512 8cf1056f85a5012b21bbd8607791a9c5924b30e7468e253dded8cadbf54e48b83c1d60d6e39a62b79cd443efd06cc30429ba06b4f0c3818a1627e9ccf1b2adc8
diff --git a/app-vim/vim-spell-fr/metadata.xml b/app-vim/vim-spell-fr/metadata.xml
new file mode 100644
index 000000000000..9664b0a03706
--- /dev/null
+++ b/app-vim/vim-spell-fr/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Vim spell files for French (fr). Supported character sets are UTF-8,
+ latin-1 and ASCII.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-fr/vim-spell-fr-20060121-r1.ebuild b/app-vim/vim-spell-fr/vim-spell-fr-20060121-r1.ebuild
new file mode 100644
index 000000000000..4bb0a44c917a
--- /dev/null
+++ b/app-vim/vim-spell-fr/vim-spell-fr-20060121-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="French"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc sparc x86"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-he-20100312-r1 b/app-vim/vim-spell-he-20100312-r1
deleted file mode 100644
index 2cf498ac3761..000000000000
--- a/app-vim/vim-spell-he-20100312-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=vim spell files: Hebrew (he)
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/vim-spell-he-20100312.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=3d889ea4bb6ce6b75a5087961ffa7c95
diff --git a/app-vim/vim-spell-he/Manifest b/app-vim/vim-spell-he/Manifest
new file mode 100644
index 000000000000..434b677a6727
--- /dev/null
+++ b/app-vim/vim-spell-he/Manifest
@@ -0,0 +1,3 @@
+DIST vim-spell-he-20100312.tar.bz2 177495 BLAKE2B d85d2fbd2d7b66c6d8bd1fa5447107f9411ef0bdf191eb8fc094d5de85abab39b22c83e6626e580ac722fe75ee807ba7d728eccad1941ea5d52e8190639d9697 SHA512 c6cb7c7eca7b842ceb0aa8b62e0afb215403004fb76d11ef2bfd55398657799e92dfc7d6ed3802008bd7f5bc3caf8cf15697fbfb64f935361c6958d26c7e5775
+EBUILD vim-spell-he-20100312-r1.ebuild 253 BLAKE2B 41f92dd04d16c566cbc919b87509b87c8d01f2570a833c6892685362ecd428a695e8c9a7b621ed3b4127d0996a9a5618a3177d9e56711fb22d2c26756c73db0b SHA512 ac9284a440a8777237dd0f94b2443ad711719004f19d4679ea12c8df9a3bd00a29cbbc0c208816ea3686b0c104e53f01356475707176c93705df62cd6c1757f5
+MISC metadata.xml 376 BLAKE2B cda25b90973d1eaf622ffba511191bf2038f41cdac97096ca3942321d586f0c44aac490e4342a435d8e4e88b4957af25c50c8ead1a2e68757a8b424dfe45bd48 SHA512 aa8a05990413c093f8e9b7ea7e99a8701a3127492362690cc9ab273a23a83ab71f113d03680fac4d23d65968fa48709740726ca6c73ae71f2afcf7437f74857c
diff --git a/app-vim/vim-spell-he/metadata.xml b/app-vim/vim-spell-he/metadata.xml
new file mode 100644
index 000000000000..22067f199f87
--- /dev/null
+++ b/app-vim/vim-spell-he/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription>
+ Vim spell files for Hebrew (he). Supported character sets are UTF-8 and
+ ISO-8859-8.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-he/vim-spell-he-20100312-r1.ebuild b/app-vim/vim-spell-he/vim-spell-he-20100312-r1.ebuild
new file mode 100644
index 000000000000..cf4ae8d5c5c8
--- /dev/null
+++ b/app-vim/vim-spell-he/vim-spell-he-20100312-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="Hebrew"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-hu-20100312-r1 b/app-vim/vim-spell-hu-20100312-r1
deleted file mode 100644
index 46fe895aeb14..000000000000
--- a/app-vim/vim-spell-hu-20100312-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=vim spell files: Hungarian (hu)
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/vim-spell-hu-20100312.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=8ea3b1d3e1ec1e2eb4fc51e87dd7e061
diff --git a/app-vim/vim-spell-hu/Manifest b/app-vim/vim-spell-hu/Manifest
new file mode 100644
index 000000000000..d8a9fdcf522d
--- /dev/null
+++ b/app-vim/vim-spell-hu/Manifest
@@ -0,0 +1,3 @@
+DIST vim-spell-hu-20100312.tar.bz2 2516564 BLAKE2B 34fba5a304a6761024312783b575cc6264ed82dcb132db514bac2d357e3c811ce9b3e953d572bd19cd190ef1578f14f91b09affb972250c35982624c9f6d8621 SHA512 44c94f84c3edd94020fdae430723b2e264113d29f5e295e6593274741ef094a8fe1dfa1d692cddc266f2cb3d58fa5601f80576d4ca55fd185c1213e983a3fb99
+EBUILD vim-spell-hu-20100312-r1.ebuild 256 BLAKE2B d068473605ce5343131ca9605aaf378e2caf2c6993a56b8442afd08ad49da9589021af2728255b3ebdfe9b04d4aa1ff9d6eb57f3856bad28debf1b4815e35f91 SHA512 84ef71dd81356e4a6060febb4dd483cfdb68715083ecb9d75e6d044264130496df25a41be9eb0e83d3f12a9e9f612cd92c8e0853dec8da60b82dc1df80f80111
+MISC metadata.xml 388 BLAKE2B 39e8cc1509905f5035aa99bbd75496fe59ae7074ce8d1c8239dda901a8c982aac645a9b1d760b16661d7840b15aa51df6ec0bffe802d40d5a6455c363d88ec16 SHA512 83b6bd49cfe90820c36e56f4b2e822ec58f7dcaca24c2194877f516f09ec82d460bf201d702468d74d9218e9bab19e42fe66ee9af49b8be5adbf54e590170179
diff --git a/app-vim/vim-spell-hu/metadata.xml b/app-vim/vim-spell-hu/metadata.xml
new file mode 100644
index 000000000000..b6bfa7f4fd95
--- /dev/null
+++ b/app-vim/vim-spell-hu/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription>
+ Vim spell files for Hungarian (hu). Supported character sets are UTF-8,
+ ISO-8859-2 and CP-1250.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-hu/vim-spell-hu-20100312-r1.ebuild b/app-vim/vim-spell-hu/vim-spell-hu-20100312-r1.ebuild
new file mode 100644
index 000000000000..64ddfc5c5f35
--- /dev/null
+++ b/app-vim/vim-spell-hu/vim-spell-hu-20100312-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="Hungarian"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-it-20100312-r1 b/app-vim/vim-spell-it-20100312-r1
deleted file mode 100644
index 4c6a6f695570..000000000000
--- a/app-vim/vim-spell-it-20100312-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=vim spell files: Italian (it)
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/vim-spell-it-20100312.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=944db227d7309272a8aab89fb449bbe8
diff --git a/app-vim/vim-spell-it/Manifest b/app-vim/vim-spell-it/Manifest
new file mode 100644
index 000000000000..0a1901fff1ac
--- /dev/null
+++ b/app-vim/vim-spell-it/Manifest
@@ -0,0 +1,3 @@
+DIST vim-spell-it-20100312.tar.bz2 874072 BLAKE2B 44f84ffccc7195345a0981e3de0506869db6414e83cf87b55d759ab54eac8633cb5049683ddd023c8b7272912b492e14cbbbb600af6556b725405ef6c8756c9f SHA512 7f215d65a798c64c33f38c52205f5c15ce132361d078eb0c48ea5058c97da21b25c24952b15a2737b6b8d1de1d5bb6fbbc880acb57834e6d00773ce97c80de5d
+EBUILD vim-spell-it-20100312-r1.ebuild 254 BLAKE2B a95d57d3f55cd5c87cb068e37c783e91381dc8e26894b151c8101a721b93d42930e4b482e91ab0acd627b1fc2a2488bb35ebc50f357906a93b37aefb3e7d49da SHA512 b119201093a06b330d68813e366bff0625ef95bc6b82915e88eb57fe6da28d7aedf7060ca9f2372935e42cfd56fdea50bba5b50d8c81cbebfc8ae7e4a68f45e5
+MISC metadata.xml 373 BLAKE2B af050e4ef54517b5319be6d2de77c42cdd4011f094d649e6717e7cd31945b28a77ca6ae4c3d058721d2ce94d477d47630caf68c8934f8671c1215d7c83dd8d8a SHA512 24301bc530f8b8d182f8a2ac5d0ba705e7d46af37f989a62e73ed46e08d32b2b36c7c4ba6a6308ae26b8c7a4502104664318e6546d5cf2bb2ba34b7c1d04bb30
diff --git a/app-vim/vim-spell-it/metadata.xml b/app-vim/vim-spell-it/metadata.xml
new file mode 100644
index 000000000000..cd13f1a69e42
--- /dev/null
+++ b/app-vim/vim-spell-it/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription>
+ Vim spell files for Italian (it). Supported character sets are UTF-8 and
+ latin1.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-it/vim-spell-it-20100312-r1.ebuild b/app-vim/vim-spell-it/vim-spell-it-20100312-r1.ebuild
new file mode 100644
index 000000000000..b60a2329e26f
--- /dev/null
+++ b/app-vim/vim-spell-it/vim-spell-it-20100312-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="Italian"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-nl-20051007-r1 b/app-vim/vim-spell-nl-20051007-r1
deleted file mode 100644
index 9146b1d96312..000000000000
--- a/app-vim/vim-spell-nl-20051007-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=vim spell files: Dutch (nl)
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/vim-spell-nl-20051007.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=d738d5251eb2a67067059aa3504eff5f
diff --git a/app-vim/vim-spell-nl/Manifest b/app-vim/vim-spell-nl/Manifest
new file mode 100644
index 000000000000..14dc1c6648c8
--- /dev/null
+++ b/app-vim/vim-spell-nl/Manifest
@@ -0,0 +1,3 @@
+DIST vim-spell-nl-20051007.tar.bz2 670750 BLAKE2B c9597f3a5eeabd8550e1974d52720fa11b37ac29b3fa6e8fa5ad79a67ab945c25e07d1a546f6dd4aafec66664376fef7c94085cfbaef983352769df8af1bcd39 SHA512 5d62c84178c91e139516181e35c6e2802aaeb1897e70f50dcad93f7ad7efad1e9f983334bc7d3a3a3355e20a535c2e81096583a3ee11aab0f49698f4dee03c5e
+EBUILD vim-spell-nl-20051007-r1.ebuild 297 BLAKE2B c5e516c2d7a1ecf4e7cfe271e33e618c76f0d54ca84f960b02f1bf994cc36f207472b34d04607b1e4bbd7a785fe116c84f1a77a79ce99377534286fb654409d3 SHA512 9e462eb73ceab0a04942ccf4d801d5612fe41e08fbf32be6c4af8c5e41f39538877a20fc49b0f44fd9718565e6188b9ebe3f0dcc9ca7e26796476d42c5c3f39d
+MISC metadata.xml 383 BLAKE2B 1f7c4b912918c7d7b9bdfb700d094d612847cbedc808e0d24047355e5cc1607810a5bb3fb79c724332d781794c8187db4c5c8287695001df09e185a0df8fa0d1 SHA512 fc8b540bcdfff4d5eb72d82cefc763fe8186cf43be7a80057d7ea2942739fb665eac6694352eb3d46bc7ffb1a153dafee1f64e417ac09875c75244129c97c35a
diff --git a/app-vim/vim-spell-nl/metadata.xml b/app-vim/vim-spell-nl/metadata.xml
new file mode 100644
index 000000000000..756e08e56d3e
--- /dev/null
+++ b/app-vim/vim-spell-nl/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Vim spell files for Dutch (nl). Supported character sets are UTF-8,
+ and latin-1.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-nl/vim-spell-nl-20051007-r1.ebuild b/app-vim/vim-spell-nl/vim-spell-nl-20051007-r1.ebuild
new file mode 100644
index 000000000000..f7606b3c7698
--- /dev/null
+++ b/app-vim/vim-spell-nl/vim-spell-nl-20051007-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="Dutch"
+
+inherit vim-spell
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-pl-20060218-r1 b/app-vim/vim-spell-pl-20060218-r1
deleted file mode 100644
index b2a942e07ebd..000000000000
--- a/app-vim/vim-spell-pl-20060218-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=vim spell files: Polish (pl)
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=CC-BY-SA-2.0
-SLOT=0
-SRC_URI=mirror://gentoo/vim-spell-pl-20060218.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=ff0a7c56524b8fbf7308b427c608443c
diff --git a/app-vim/vim-spell-pl/Manifest b/app-vim/vim-spell-pl/Manifest
new file mode 100644
index 000000000000..379665edca74
--- /dev/null
+++ b/app-vim/vim-spell-pl/Manifest
@@ -0,0 +1,3 @@
+DIST vim-spell-pl-20060218.tar.bz2 1489524 BLAKE2B ca0fcea6fc9f876a896f80f572d734ea12299e57a1c3b861e24aa8f287a061a2f5f1351ac9f57177b3c2ccde00f3fedb8321749135ef1b03da23b9f7670a848f SHA512 a83900e0cf0702c70498bbf47c9db5048205d0a70ed8fcd7c984353987fa5a97334093cce7844ad639a80a910bdfa644302191d8f27d465af4a53bcaa42acde0
+EBUILD vim-spell-pl-20060218-r1.ebuild 270 BLAKE2B 694399ba1acaf6093006d1d6491713b259d65333006136d76e0b1bf5509a62e48687dc78e6c6e11b8bd9f4f616484edf7ae3898947111c3665c77291612f2ae3 SHA512 816a13ced155545d386d65a8551988074baa629721e88d8147dcd0eb10f55631a9d8e3353aa8c6e593faa8ad95968faab1e6dd9bc887bc31354b9ddb23793b51
+MISC metadata.xml 394 BLAKE2B 88a722af4733a7323ba8dc451a6869cbe4e8c45689cf0bd98234f140425a7d2c1b5790111620ad6cd88589d38ba24a33ecf466c4280273439b152a48c176d64e SHA512 a26bef5bdb42cda8e3f34937de3294d6c792ba8e575d2ab69b3b2e0caa2e9856e6de1f0a1453d08829fbc76f96c3babcdafc414737ec47c5b6672fe304d32c65
diff --git a/app-vim/vim-spell-pl/metadata.xml b/app-vim/vim-spell-pl/metadata.xml
new file mode 100644
index 000000000000..91a799e6df0a
--- /dev/null
+++ b/app-vim/vim-spell-pl/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Vim spell files for Polish (pl). Supported character sets are UTF-8,
+ ISO-8859-2 and CP1250.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-pl/vim-spell-pl-20060218-r1.ebuild b/app-vim/vim-spell-pl/vim-spell-pl-20060218-r1.ebuild
new file mode 100644
index 000000000000..64a2e416337c
--- /dev/null
+++ b/app-vim/vim-spell-pl/vim-spell-pl-20060218-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="Polish"
+
+inherit vim-spell
+
+LICENSE="CC-BY-SA-2.0"
+KEYWORDS="amd64 ppc sparc x86"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-pt-20100312-r1 b/app-vim/vim-spell-pt-20100312-r1
deleted file mode 100644
index 141d06b35402..000000000000
--- a/app-vim/vim-spell-pt-20100312-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=vim spell files: Portuguese (pt)
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 LGPL-2.1 MPL-1.1
-SLOT=0
-SRC_URI=mirror://gentoo/vim-spell-pt-20100312.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=1b65793379b6fe78371228cd388f19e5
diff --git a/app-vim/vim-spell-pt/Manifest b/app-vim/vim-spell-pt/Manifest
new file mode 100644
index 000000000000..dba322ac2c5a
--- /dev/null
+++ b/app-vim/vim-spell-pt/Manifest
@@ -0,0 +1,3 @@
+DIST vim-spell-pt-20100312.tar.bz2 2018267 BLAKE2B 98875d8d7fa0bc1a0a2ef5f9cd2b2fd1d85f50236491c965055f6edf2220f06bf98669c497ff67458aeeafa77a19cfd034dd4200c9689fc40eb5d6806a9605c2 SHA512 0bd90524a4066f1b7d29ad85389557718cae5d3b6815a0037e2ca55987658278f0a1aa5e02614fc84a5862721a58404d8582d62ee6e8d15ef954e004481af49e
+EBUILD vim-spell-pt-20100312-r1.ebuild 274 BLAKE2B c70d29ec0550c295fa5a62075759ed42fdba60ed4578b109083cdaf664b1687b4a637329bf34968a8e113b5a9d04f00a02f4aeb1b7c2e35a62adfb2cff59e162 SHA512 889a0d5822a04da186f7c46aca8aac14ba29e47031c5dbd9a4095d5b40ed3fe6e66ae03f969a19176e1ef1bf2ecd99aa9488f5fa0da8b17be9c4b75fecf12cc0
+MISC metadata.xml 376 BLAKE2B 7a05f508873c90b43b6673f5f20cd95aa1fd209119c73b9560dc4a90f3e1a275e2d3a19a380cf0558887e2d4875296678ce7dedf4f0108057e9a2e021fd9e25b SHA512 da8126fd7b6d5a92d2c53dd678194071cb0b26d550a58ae2439a820be573b92fddca9522f0fe4d99724b0960aa7f2b9fa075589f44ad73bfe55741ece6d94340
diff --git a/app-vim/vim-spell-pt/metadata.xml b/app-vim/vim-spell-pt/metadata.xml
new file mode 100644
index 000000000000..8cf406951664
--- /dev/null
+++ b/app-vim/vim-spell-pt/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription>
+ Vim spell files for Portuguese (pt). Supported character sets are UTF-8
+ and latin1.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-pt/vim-spell-pt-20100312-r1.ebuild b/app-vim/vim-spell-pt/vim-spell-pt-20100312-r1.ebuild
new file mode 100644
index 000000000000..1f3bab60513f
--- /dev/null
+++ b/app-vim/vim-spell-pt/vim-spell-pt-20100312-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="Portuguese"
+
+inherit vim-spell
+
+LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
+KEYWORDS="amd64 x86"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-ru-20070506-r1 b/app-vim/vim-spell-ru-20070506-r1
deleted file mode 100644
index 971eb0214e00..000000000000
--- a/app-vim/vim-spell-ru-20070506-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=vim spell files: Russian (ru)
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=myspell-ru_RU-AlexanderLebedev
-SLOT=0
-SRC_URI=mirror://gentoo/vim-spell-ru-20070506.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-spell dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=6257fea729e58a7076ff8186856d8985
diff --git a/app-vim/vim-spell-ru/Manifest b/app-vim/vim-spell-ru/Manifest
new file mode 100644
index 000000000000..c8f2ed305042
--- /dev/null
+++ b/app-vim/vim-spell-ru/Manifest
@@ -0,0 +1,3 @@
+DIST vim-spell-ru-20070506.tar.bz2 7232867 BLAKE2B 7d2ffed642764ea9dde8464d1dd1135a24ff60b6279995a27e17b32e70fd3ed9bc0d8ad2f7864d6ffbbcef5f83c03ec01f9b59f9afd9dc9f2a35ef175c40c0d4 SHA512 268ff4c56299ed06e329c8342c3d9ec567278c8a8c0a90d56f6320052d7ee38b17b1724e0f8fbf72d616285a9d7ba3a8e7a1f5f4d78ff8bdc41c73655eebdf33
+EBUILD vim-spell-ru-20070506-r1.ebuild 289 BLAKE2B d552f171a2ea777873f46c00d5dfa0df6d8898e0be69dc880f73e155d67b835acdbcf71511e295dc40d888c24b1c99e232f63abcbf1d3215dfbae3a631869c67 SHA512 d14149ce7743ae908d56419c2897bb6c9b7b14547cff1f7854831bd5e5666143c0e2fadc8d268e262bc416c92c5adff6b4893bfead5853e3212e8ead8814d6ee
+MISC metadata.xml 645 BLAKE2B 7c27a6e05d833918d690715157f2cda87e95646a99ce50cfed9480c2a8c6c436fd7fe2c570b5f757aaffc8f8f1fed2f603b8c09f852ef87b00655d03516aea24 SHA512 dea1e29b3b235ccc9f3cbda4d057ed8bf77c7df394631f89095a674f17760f6b051738e9e2bc4db2d63b49d900a5a8f3db4447fb6feaa419b5b459c983fd3891
diff --git a/app-vim/vim-spell-ru/metadata.xml b/app-vim/vim-spell-ru/metadata.xml
new file mode 100644
index 000000000000..9575a80b2219
--- /dev/null
+++ b/app-vim/vim-spell-ru/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ Vim spell files for Russian (ru). Supported character sets are UTF-8,
+ koi8-r and cp1251.
+ </longdescription>
+ <longdescription lang="ru">
+ Файлы необходимые для проверки правописания Русского языка (ru) в vim'е.
+ Поддерживаемые кодировки UTF-8, koi8-r and cp1251.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/vim-spell-ru/vim-spell-ru-20070506-r1.ebuild b/app-vim/vim-spell-ru/vim-spell-ru-20070506-r1.ebuild
new file mode 100644
index 000000000000..c0fdb3071a2a
--- /dev/null
+++ b/app-vim/vim-spell-ru/vim-spell-ru-20070506-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="Russian"
+
+inherit vim-spell
+
+LICENSE="myspell-ru_RU-AlexanderLebedev"
+KEYWORDS="amd64 ppc sparc x86"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-tmux-3.0.0 b/app-vim/vim-tmux-3.0.0
deleted file mode 100644
index 865979d3f2cc..000000000000
--- a/app-vim/vim-tmux-3.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: tmux support for vim
-EAPI=6
-HOMEPAGE=https://github.com/tmux-plugins/vim-tmux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd
-LICENSE=vim.org
-RDEPEND=!<app-misc/tmux-2.5-r2 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/tmux-plugins/vim-tmux/archive/v3.0.0.tar.gz -> vim-tmux-3.0.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=0f47a9125b9dd2184b26a2e66784c9dc
diff --git a/app-vim/vim-tmux/Manifest b/app-vim/vim-tmux/Manifest
new file mode 100644
index 000000000000..807453de4b7d
--- /dev/null
+++ b/app-vim/vim-tmux/Manifest
@@ -0,0 +1,3 @@
+DIST vim-tmux-3.0.0.tar.gz 9658 BLAKE2B 188485b4c74e60292aa153693246c9e612cbc4736accb7aafad3ee901084023b3f40374212afe2139c634b8457c2ec871f0cf5e6d02beb69fc3c433f26b8610d SHA512 d251ff07b0702e4f9969d02a9c32924db62f77b71250fda175053883abc35c18932f9869ea0514df1b7acb9cc65f6b39e2b8c640ad77ff36a19ceaa74d13d77b
+EBUILD vim-tmux-3.0.0.ebuild 556 BLAKE2B 4b7af70822955d4135f9d6745b3b4d5210335ff143d6bfe3f6407373e6b9ceb1562fb672ed83fa8051074205c6a4f12daa8ae1ddd5ebb388509ca3a44dca97b4 SHA512 2ca554af0c52d9af4e9f57d47d2d05b1848350b6fca2e580190dc2d7b0a485094735de2be99d6a942881363ae6178529a6f9356be7b49b4aa7f934ed14522cff
+MISC metadata.xml 556 BLAKE2B e9419237fa1f3b2b3c15d1adf7ca5afdc0da4a1fd051a4b46d839a67079170487c85e05e121c64b4ec4cc82064e217898831db1ed0a2018c345b227c44554ebe SHA512 181979dee06b24a1d4f1b3b325558c628fcdb0ee4d628c7002777f7e460e8a35026f021bb21c79db243fd067d16168c7db804a33c10be0c59f6bb22d46cbf9a9
diff --git a/app-vim/vim-tmux/metadata.xml b/app-vim/vim-tmux/metadata.xml
new file mode 100644
index 000000000000..2e81ab74af54
--- /dev/null
+++ b/app-vim/vim-tmux/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Tools Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">tmux-plugins/vim-tmux</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild b/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
new file mode 100644
index 000000000000..ab382fc6fe5a
--- /dev/null
+++ b/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: tmux support for vim"
+HOMEPAGE="https://github.com/tmux-plugins/vim-tmux"
+SRC_URI="https://github.com/tmux-plugins/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="vim.org"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
+
+# Bug 603526.
+# Remove this line once this version is marked stable
+# and the old ones are gone.
+RDEPEND="!<app-misc/tmux-2.5-r2"
diff --git a/app-vim/vim2hs-0.1_p20171106 b/app-vim/vim2hs-0.1_p20171106
deleted file mode 100644
index d171456748bf..000000000000
--- a/app-vim/vim2hs-0.1_p20171106
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: collection of vimscripts for Haskell development
-EAPI=6
-HOMEPAGE=https://github.com/dag/vim2hs
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/ghc || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/dag/vim2hs/archive/f2afd55704bfe0a2d66e6b270d247e9b8a7b1664.tar.gz -> vim2hs-0.1_p20171106.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=136d66c3be6e260b9d18e8a72ef71dbc
diff --git a/app-vim/vim2hs/Manifest b/app-vim/vim2hs/Manifest
new file mode 100644
index 000000000000..2be313a067d4
--- /dev/null
+++ b/app-vim/vim2hs/Manifest
@@ -0,0 +1,3 @@
+DIST vim2hs-0.1_p20171106.tar.gz 259627 BLAKE2B 48a6bd773709ea1df0efcd3fe580cec353ef3c3ae7aadd4693313c3bc294238d5f73ccc84c32f75edd3e708a2be74c22efbe077d448b1dd3102e89c0ded6efe6 SHA512 835ea1344f055af06843a327bf7294ae9fe0e735455b3c21d4fba56eab75f19b578ff8cd962f6527efee0e0f89084c9c2cd86d3944e0ac35b89b33a6047df4a0
+EBUILD vim2hs-0.1_p20171106.ebuild 663 BLAKE2B 6af8233fead7dacf920a4578dcfb4b26ff0deb7ace8f833c3da4d9b03e3d2493b5a0109349490eed526baf3e49c7763eb33d704f785d6b085728ae5e1f0e4173 SHA512 b4f1e04861efcc67e0d9c678a6dc2d9dc75c872ba1961702825cb2f146f75b3eab80c0992cf14b444ac4fdeca5f084a92f2c543156ed5b1416e5900b86cf71cb
+MISC metadata.xml 324 BLAKE2B 8da3e1442be9222548ab482b68fe4604afba6ab2e5c143d1550f8f92e5f205575bee4fe5efbb7ea680fecb301f1a55b1bc9a5b0942aa26311b898513f954d736 SHA512 6e87e1076ba13e49fa20313e9761cee9628350e718ab871bfd2bab0409f69dc9afa48d7d530540be8af5d7b10d2c7a14269fc70839ae63351a2a3d3f82e1481c
diff --git a/app-vim/vim2hs/metadata.xml b/app-vim/vim2hs/metadata.xml
new file mode 100644
index 000000000000..cf984477fc49
--- /dev/null
+++ b/app-vim/vim2hs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">dag/vim2hs</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/vim2hs/vim2hs-0.1_p20171106.ebuild b/app-vim/vim2hs/vim2hs-0.1_p20171106.ebuild
new file mode 100644
index 000000000000..9b0f7392446e
--- /dev/null
+++ b/app-vim/vim2hs/vim2hs-0.1_p20171106.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin vcs-snapshot
+
+# Commit Date: 16 Apr 2014
+COMMIT="f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"
+
+DESCRIPTION="vim plugin: collection of vimscripts for Haskell development"
+HOMEPAGE="https://github.com/dag/vim2hs"
+SRC_URI="https://github.com/dag/vim2hs/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/ghc"
+
+src_compile() { :; }
+
+src_install() {
+ # We want a stripped-down version of these.
+ local f
+ for f in screenshots/*; do
+ bzip2 -9 "${f}" || die
+ done
+ vim-plugin_src_install
+}
diff --git a/app-vim/vimagit-1.7.1 b/app-vim/vimagit-1.7.1
deleted file mode 100644
index 5bafc278aa0f..000000000000
--- a/app-vim/vimagit-1.7.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: ease your git workflow within vim
-EAPI=6
-HOMEPAGE=https://github.com/jreybert/vimagit
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/jreybert/vimagit/archive/1.7.1.tar.gz -> vimagit-1.7.1.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=a99c6c3c300fc94a64bfac2bc65d69cf
diff --git a/app-vim/vimagit-1.7.2 b/app-vim/vimagit-1.7.2
deleted file mode 100644
index a5ef60b534e8..000000000000
--- a/app-vim/vimagit-1.7.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: ease your git workflow within vim
-EAPI=6
-HOMEPAGE=https://github.com/jreybert/vimagit
-KEYWORDS=~amd64 ~x86
-LICENSE=vim
-RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/jreybert/vimagit/archive/1.7.2.tar.gz -> vimagit-1.7.2.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=99f74496ab576a65b6a85d3f152c35a3
diff --git a/app-vim/vimagit-9999 b/app-vim/vimagit-9999
deleted file mode 100644
index da4c8fc158c7..000000000000
--- a/app-vim/vimagit-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: ease your git workflow within vim
-EAPI=6
-HOMEPAGE=https://github.com/jreybert/vimagit
-LICENSE=vim
-RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 8f6de46b0aa318aea0e8cac62ece098b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=99f74496ab576a65b6a85d3f152c35a3
diff --git a/app-vim/vimagit/Manifest b/app-vim/vimagit/Manifest
new file mode 100644
index 000000000000..1e428795d22c
--- /dev/null
+++ b/app-vim/vimagit/Manifest
@@ -0,0 +1,6 @@
+DIST vimagit-1.7.1.tar.gz 35302 BLAKE2B e8e46f399ef700d971e61a233af41a3735faf29fe95baa53b6e0888c0b708a1bfcee051bb9afc90348585f3cb3cf9278fe47a1ed17096d956ccecbc45398c4bc SHA512 8ce2959c135da90b880ccdcd66e71661c7908f250d47a24ede025762a6e9422cebcf8fd516bf99e475605f4278e232713c66293781ceb95f47a22031e9260a71
+DIST vimagit-1.7.2.tar.gz 37398 BLAKE2B c7e0a82ebb7a1d1ae5e2c5aa0c6c8f8a2b45fa65a193b6dcd8a97822d4ecb99ba60dd86156390db4de0fb0ce39883e67a1b17157d8c259a0ad6559a52cefbeb2 SHA512 8b825da4b411732db022b1a3f25f6f779ba5e58df5ca4d404e985b16a4811f911c626674f1a7f4a285d78369f4c7ad3a33b7ffa2b50f1a4a94372a3c5fb29a15
+EBUILD vimagit-1.7.1.ebuild 528 BLAKE2B ff657862f6b37886aa82517fc7425c1b4099ab6e7da1f06fc4bd9078e0732a5887a10a51f993d163d090c9a406d9597407d216598a055bb4571a817d63f10838 SHA512 c40090e5f0c543911e41d4edb33be1775806fb67ede5d32690c5513539f9861d30a8013bb2ae378ef38c4020daa7cb76d275648ecbf43721484005fbfbdec382
+EBUILD vimagit-1.7.2.ebuild 579 BLAKE2B 414fd63cd4037e489408da8cdcca4b93aeeef0a6a588366adb000cdcdd54fbe649f73ff0649409fdc74f1781f5fc6fea4ce837e15d1703b155f096d9fed15400 SHA512 52896f63772d399f5e6da40c3e622c6b87e7a8e7c65978883b60715dd4882d5aec2450bf3c766cc23de6851750030dd8bf3b26867bc963aafe1c21c59c9f6a0c
+EBUILD vimagit-9999.ebuild 579 BLAKE2B 414fd63cd4037e489408da8cdcca4b93aeeef0a6a588366adb000cdcdd54fbe649f73ff0649409fdc74f1781f5fc6fea4ce837e15d1703b155f096d9fed15400 SHA512 52896f63772d399f5e6da40c3e622c6b87e7a8e7c65978883b60715dd4882d5aec2450bf3c766cc23de6851750030dd8bf3b26867bc963aafe1c21c59c9f6a0c
+MISC metadata.xml 340 BLAKE2B d17f938b8d8441774f98d8780bb3cd59d2b716a7f74533a16c54f7cf9c10b565bd0f82d513b48ffa7e10e15c8456bcaa8b51cc91b246cf5fff2e691424637be0 SHA512 f9c0871441cc968a62ebc15e75f7f3977a827b7c303b3cf721cadb5030deb9af5356667e149bdd7fb02af63398fe6226e24bc11a770e3c4d6a03c5c9d241d60b
diff --git a/app-vim/vimagit/metadata.xml b/app-vim/vimagit/metadata.xml
new file mode 100644
index 000000000000..5b153f66c473
--- /dev/null
+++ b/app-vim/vimagit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">jreybert/vimagit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/vimagit/vimagit-1.7.1.ebuild b/app-vim/vimagit/vimagit-1.7.1.ebuild
new file mode 100644
index 000000000000..1583759b0cc2
--- /dev/null
+++ b/app-vim/vimagit/vimagit-1.7.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vim-plugin
+
+if [[ ${PV} == 9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/jreybert/vimagit.git"
+else
+ SRC_URI="https://github.com/jreybert/vimagit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: ease your git workflow within vim"
+HOMEPAGE="https://github.com/jreybert/vimagit"
+LICENSE="vim"
+VIM_PLUGIN_HELPFILES="${PN}"
+
+RDEPEND="dev-vcs/git"
diff --git a/app-vim/vimagit/vimagit-1.7.2.ebuild b/app-vim/vimagit/vimagit-1.7.2.ebuild
new file mode 100644
index 000000000000..5e291f76fe70
--- /dev/null
+++ b/app-vim/vimagit/vimagit-1.7.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vim-plugin
+
+if [[ ${PV} == 9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/jreybert/vimagit.git"
+else
+ SRC_URI="https://github.com/jreybert/vimagit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: ease your git workflow within vim"
+HOMEPAGE="https://github.com/jreybert/vimagit"
+LICENSE="vim"
+VIM_PLUGIN_HELPFILES="${PN}"
+
+RDEPEND="dev-vcs/git"
+
+src_prepare() {
+ rm _config.yml || die
+ default
+}
diff --git a/app-vim/vimagit/vimagit-9999.ebuild b/app-vim/vimagit/vimagit-9999.ebuild
new file mode 100644
index 000000000000..5e291f76fe70
--- /dev/null
+++ b/app-vim/vimagit/vimagit-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vim-plugin
+
+if [[ ${PV} == 9999* ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/jreybert/vimagit.git"
+else
+ SRC_URI="https://github.com/jreybert/vimagit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: ease your git workflow within vim"
+HOMEPAGE="https://github.com/jreybert/vimagit"
+LICENSE="vim"
+VIM_PLUGIN_HELPFILES="${PN}"
+
+RDEPEND="dev-vcs/git"
+
+src_prepare() {
+ rm _config.yml || die
+ default
+}
diff --git a/app-vim/vimbuddy-0.9.2-r1 b/app-vim/vimbuddy-0.9.2-r1
deleted file mode 100644
index 3fd77e914c63..000000000000
--- a/app-vim/vimbuddy-0.9.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: vimbuddy for the status line
-EAPI=6
-HOMEPAGE=https://github.com/vim-scripts/vimbuddy.vim
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc sparc x86
-LICENSE=public-domain
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/vim-scripts/vimbuddy.vim/archive/0.9.2.tar.gz -> vimbuddy-0.9.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=2acd04356e4de8b2e76c54d7c4f96f1f
diff --git a/app-vim/vimbuddy/Manifest b/app-vim/vimbuddy/Manifest
new file mode 100644
index 000000000000..7e237f772230
--- /dev/null
+++ b/app-vim/vimbuddy/Manifest
@@ -0,0 +1,3 @@
+DIST vimbuddy-0.9.2.tar.gz 1152 BLAKE2B cc7ea6fcffa05bacbcbcab2850486c648cc9dd4fe2d7896865ef17acef6c9cf8b05ee33a14fd212b156b4ee9c4c04a8abb764c320a74b0cfead545f1ab3f9636 SHA512 feca2b303e677cdc0ed1a02e92c54ae293ccd380006667ea49c93ea804975bf8c40044c11e2599ad3e81062a453465249120fc7daaf2eea994d8d81d3d2f87cb
+EBUILD vimbuddy-0.9.2-r1.ebuild 522 BLAKE2B 8de3dc2f2ff9fd958223f5e3c3bd3c9de1e67b4bc804ba9a76d4d9b97f9ae5a50d44178e874df56ee45bfedf0731d880fb3ef7856d64294383dfdfef9c2a0e28 SHA512 d5ee85db3eda08cc926289d974eab498f24a2e4911339ff9c8c6a96888450c2f79217e52b684caa073c9127ec348fdc4d514faf384fc7f63dfe98a6454dccfef
+MISC metadata.xml 338 BLAKE2B 2e474bc2ecade1fe907cfe44bb86943ee572783d3bfc849c900a05d9c6056d15b989c80e348a3d65596140ce1485c6d516f8f856d5901d0317831b553e243176 SHA512 1a949dd9cc669a43a63ac53b3429325ab44873aee6ffa02c8e8f1abfd64d47c6645c1c4fd4a312cba81de1196abee5ceee5510e59b6637bc19cd34880ff32048
diff --git a/app-vim/vimbuddy/metadata.xml b/app-vim/vimbuddy/metadata.xml
new file mode 100644
index 000000000000..0cf1ee0aac77
--- /dev/null
+++ b/app-vim/vimbuddy/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">vim-scripts/vimbuddy.vim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/vimbuddy/vimbuddy-0.9.2-r1.ebuild b/app-vim/vimbuddy/vimbuddy-0.9.2-r1.ebuild
new file mode 100644
index 000000000000..1a9eeea4e49e
--- /dev/null
+++ b/app-vim/vimbuddy/vimbuddy-0.9.2-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin eutils
+
+DESCRIPTION="vim plugin: vimbuddy for the status line"
+HOMEPAGE="https://github.com/vim-scripts/vimbuddy.vim"
+SRC_URI="https://github.com/vim-scripts/${PN}.vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
+
+S="${WORKDIR}/${PN}.vim-${PV}"
+
+VIM_PLUGIN_HELPURI="http://www.vim.org/scripts/script.php?script_id=8"
diff --git a/app-vim/vimcalc-1.3-r2 b/app-vim/vimcalc-1.3-r2
deleted file mode 100644
index 3cbd7a75eef4..000000000000
--- a/app-vim/vimcalc-1.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup test
-DEPEND=app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: provides an interactive calculator inside vim
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3329
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=15317 -> vimcalc-1.3.zip
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=b3a93241be5054d0c279f0c6bbb1e363
diff --git a/app-vim/vimcalc/Manifest b/app-vim/vimcalc/Manifest
new file mode 100644
index 000000000000..2f85d5e40c09
--- /dev/null
+++ b/app-vim/vimcalc/Manifest
@@ -0,0 +1,3 @@
+DIST vimcalc-1.3.zip 24993 BLAKE2B 8cfd0a399b4888fa4e9244f7f6a315f97a3e74c78879c281d596a1a5c109711933b66b44493a2ee3c136e1159d937c95707b06c54a5342457494a3c945dcf66f SHA512 1b377f284a7b68d200b08bdacee2080a60412e6ba1fd530eb0075dbc84fba30b37cec45e60d916aa80d057809b79f4d816f3a85f903d0e2fc7d06240dcdbb600
+EBUILD vimcalc-1.3-r2.ebuild 963 BLAKE2B 53db13c995c4e07119bd6da43967f657f24c86e487aa2b1b897656bf5cdea224db211ea501e375e98d1f2b28e8f80318b4e2a0930ea02eabe93ba084f573f2e2 SHA512 0df90e193f0fb553ce840ae499821fdd83d135787e64124d4bc767e4fdeee5dbb29ea180bd0507ce80a38ba50aaab156349f8fac49542ef9eb631d4f39fe4ba9
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vimcalc/metadata.xml b/app-vim/vimcalc/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/vimcalc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/vimcalc/vimcalc-1.3-r2.ebuild b/app-vim/vimcalc/vimcalc-1.3-r2.ebuild
new file mode 100644
index 000000000000..151fa8451f7a
--- /dev/null
+++ b/app-vim/vimcalc/vimcalc-1.3-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: provides an interactive calculator inside vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3329"
+SRC_URI="https://www.vim.org/scripts/download_script.php?src_id=15317 -> ${P}.zip"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="vimcalc"
+
+DEPEND="
+ app-arch/unzip
+ ${PYTHON_DEPS}"
+
+RDEPEND="
+ || ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
+ ${PYTHON_DEPS}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_prepare() {
+ # Remove .DS_Store files that should not be installed
+ find -type f -name '.DS*' -delete || die
+}
+
+src_test() {
+ cd plugin || die
+ "${PYTHON}" tests.py || die "Tests failed"
+}
+
+src_install() {
+ rm plugin/tests.py || die
+ vim-plugin_src_install
+}
diff --git a/app-vim/vimcdoc-1.9.0 b/app-vim/vimcdoc-1.9.0
deleted file mode 100644
index 315ae4bae5c8..000000000000
--- a/app-vim/vimcdoc-1.9.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=online vim documentation translated into Chinese
-EAPI=6
-HOMEPAGE=http://vimcdoc.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://sourceforge/vimcdoc/vimcdoc-1.9.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=cb77845350d433bf01c2fa789c0569bb
diff --git a/app-vim/vimcdoc-2.1.0 b/app-vim/vimcdoc-2.1.0
deleted file mode 100644
index 94217bed6310..000000000000
--- a/app-vim/vimcdoc-2.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=online vim documentation translated into Chinese
-EAPI=6
-HOMEPAGE=http://vimcdoc.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://sourceforge/vimcdoc/vimcdoc-2.1.0.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=cb77845350d433bf01c2fa789c0569bb
diff --git a/app-vim/vimcdoc/Manifest b/app-vim/vimcdoc/Manifest
new file mode 100644
index 000000000000..d0d4744cb220
--- /dev/null
+++ b/app-vim/vimcdoc/Manifest
@@ -0,0 +1,5 @@
+DIST vimcdoc-1.9.0.tar.gz 1969682 BLAKE2B 296fb6f246d92f8c5aa917bdc68870d568892cc2a64158121f7c69878ea8e3bdcfbe1f8b060dca11e24e0fad7ab0cfbe4db8e3d756e7f4715bfc72b32c3d2ef7 SHA512 f12e6e12d481d6cf718c97aecc1619c11d5c19ef647155ed66c8c6b79f7a82ca36249e7f60aeb246404dbb31c68eced135c53247f0d99acaf05bc8e7a5679fc9
+DIST vimcdoc-2.1.0.tar.gz 2228306 BLAKE2B 099727487067f5ff1e28ab1d8562edc6377984e557c9fa8b467102cd7df069f6bfed7d2149c59f8b5d8aa6e2352905533cdc6c6c1869a8e2494c4b1601df6056 SHA512 31df2f9b37d0fe00205afc66a920633fae770bca569c3d71376cc4b27af42f6f8bd6aa9f997b5007bad65ca4525a1847e396b64083ca7dd12748153e4d216096
+EBUILD vimcdoc-1.9.0.ebuild 332 BLAKE2B 4148d5f0345255a6d7b8d8205289a307e9bcad5487d1efaf66bd92cbbb16ee2a78f7cb609b1b0a9c893bfc543ca54fc1f1d5c90200fbcec83a41343c96c00724 SHA512 e078268c7d1d113c4e995a3a18389314f6c0df6f8ab278ae550c8a10c31408fa6e925137fb8a39ad1ae32b0e617e0fecd0fc14a7b114bcff5a4825998b5e10bb
+EBUILD vimcdoc-2.1.0.ebuild 332 BLAKE2B 4148d5f0345255a6d7b8d8205289a307e9bcad5487d1efaf66bd92cbbb16ee2a78f7cb609b1b0a9c893bfc543ca54fc1f1d5c90200fbcec83a41343c96c00724 SHA512 e078268c7d1d113c4e995a3a18389314f6c0df6f8ab278ae550c8a10c31408fa6e925137fb8a39ad1ae32b0e617e0fecd0fc14a7b114bcff5a4825998b5e10bb
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vimcdoc/metadata.xml b/app-vim/vimcdoc/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/vimcdoc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/vimcdoc/vimcdoc-1.9.0.ebuild b/app-vim/vimcdoc/vimcdoc-1.9.0.ebuild
new file mode 100644
index 000000000000..5eec3b7044fb
--- /dev/null
+++ b/app-vim/vimcdoc/vimcdoc-1.9.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="online vim documentation translated into Chinese"
+HOMEPAGE="http://vimcdoc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="vim.org"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/vimcdoc/vimcdoc-2.1.0.ebuild b/app-vim/vimcdoc/vimcdoc-2.1.0.ebuild
new file mode 100644
index 000000000000..5eec3b7044fb
--- /dev/null
+++ b/app-vim/vimcdoc/vimcdoc-2.1.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="online vim documentation translated into Chinese"
+HOMEPAGE="http://vimcdoc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="vim.org"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-vim/vimclojure-2.3.6-r3 b/app-vim/vimclojure-2.3.6-r3
deleted file mode 100644
index e2bab4538ad7..000000000000
--- a/app-vim/vimclojure-2.3.6-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Clojure syntax highlighting, filetype and indent settings
-EAPI=6
-HOMEPAGE=https://github.com/vim-scripts/VimClojure
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-lang/clojure || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/vim-scripts/VimClojure/archive/2.3.6.tar.gz -> vimclojure-2.3.6.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=873c22cd71fa602a325078e1399e6ee9
diff --git a/app-vim/vimclojure/Manifest b/app-vim/vimclojure/Manifest
new file mode 100644
index 000000000000..361f6f1302de
--- /dev/null
+++ b/app-vim/vimclojure/Manifest
@@ -0,0 +1,3 @@
+DIST vimclojure-2.3.6.tar.gz 32456 BLAKE2B 7c80611516cf7e1d46400c8cc8c9f9f8146ce8f1ce2fc7458ad9e5a7c778f54496f3a1b2fe47a6cc9cb28cb8f6f0e0e67ace77a09c7258f1585cb76758d6e908 SHA512 186fd5607ccaa4b4344aed4d165d257d0518b3fe19d7b9d858b11a672f68c601bbd453fde7189dd61c3fc2f0b8517c3481579355bf5405ab90517dc48900fd51
+EBUILD vimclojure-2.3.6-r3.ebuild 1112 BLAKE2B f09d2572c902d2c2532e12a5ed56077958a19c09c814d00ccc441427c9444b06e09fdcab793f2fd2df75e2675aa12f7c27acd2b7a5fa63a4b065815670e0a4e6 SHA512 f37b8683a73d2db3b273c97cc6ef43889779b05a34b4748f64d95b83de715ade037b495f85ab378a6b00c0ca37eaaa1569470ede434bd337e2e02bf006fc85fd
+MISC metadata.xml 404 BLAKE2B 3a8d975056ed280081818051d51dd60de3d8d8da257b9be8ad8855e5ac9356ad78a9748dc307bc0c7b63ab7f5143abec09c24317d73e699fdb04e90e9f669888 SHA512 492984271208a8c95a7ea91cfe48d11c7f6c9052ac3e062e53667173e77c70e2c20fadc6dd15a953196e131a4bb810127335272595a183b84163435928561832
diff --git a/app-vim/vimclojure/metadata.xml b/app-vim/vimclojure/metadata.xml
new file mode 100644
index 000000000000..939141a74d5d
--- /dev/null
+++ b/app-vim/vimclojure/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">vim-scripts/VimClojure</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/vimclojure/vimclojure-2.3.6-r3.ebuild b/app-vim/vimclojure/vimclojure-2.3.6-r3.ebuild
new file mode 100644
index 000000000000..6d3c5d62b0e7
--- /dev/null
+++ b/app-vim/vimclojure/vimclojure-2.3.6-r3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN="VimClojure"
+
+DESCRIPTION="vim plugin: Clojure syntax highlighting, filetype and indent settings"
+HOMEPAGE="https://github.com/vim-scripts/VimClojure"
+SRC_URI="https://github.com/vim-scripts/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="dev-lang/clojure"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DOCS=( doc/LICENSE.txt )
+
+# Files with similar names are already installed by app-vim/slimv.
+DUPLICATE_FILES=(
+ indent/clojure.vim
+ ftdetect/clojure.vim
+)
+
+src_prepare() {
+ default
+
+ # Remove .bat files.
+ find . -type f -name \*.bat -exec rm -v {} \; || die
+
+ # Let's simply rename ${DUPLICATE_FILES[@]}.
+ local f
+ for f in "${DUPLICATE_FILES[@]}"; do
+ [[ -f "${f}" ]] || die "Couldn't find ${f}"
+ bname="${f##*/}"
+ path="${f%/*}"
+ noext="${bname%%.*}"
+ newname="${path}/${PN}_${noext}.vim"
+ mv -v "${f}" "${newname}" || die
+ done
+}
+
+src_install() {
+ einstalldocs
+ rm -rv "${DOCS[@]}" bin || die
+ vim-plugin_src_install
+}
diff --git a/app-vim/vimcommander-0.81 b/app-vim/vimcommander-0.81
deleted file mode 100644
index 28ab9a7dc55a..000000000000
--- a/app-vim/vimcommander-0.81
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Total Commander style file explorer
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=808
-KEYWORDS=alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/vimcommander-0.81.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimcommander-0.81.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=76a454d5c6e2c5e761a8d2f6b0850de1
diff --git a/app-vim/vimcommander/Manifest b/app-vim/vimcommander/Manifest
new file mode 100644
index 000000000000..6a498a67c2c1
--- /dev/null
+++ b/app-vim/vimcommander/Manifest
@@ -0,0 +1,3 @@
+DIST vimcommander-0.81.tar.bz2 8447 BLAKE2B 62cfde9c053db718c8b35126826fe14fdde625c2341a22cd779dc13d9972a0b28a19f3f1efbb6dd6fddd96b6487478d113b055d132029e77d170b6b378c92f1d SHA512 903c97cd56d24f9c568b863c52f69878bc3aab7f8728de38697437bf0c0697b585b1d5ac5d824d472518dabf0f2367dff24b1881742b7d28c0f5452d74c37fab
+EBUILD vimcommander-0.81.ebuild 388 BLAKE2B 1e3442992200e3355c2da689e11334b194c0fd1db0f92d56bfe10832e592b2db0d3ae28667f11bb19bf76e7c35bfb934aae26e9e5bca1e6097fd6c387c85fa68 SHA512 15a4ddc94f0f6cab59b4895bcb94df042c58a55f874d975f0cf77b4de90726e3186762a0387538613a40e9a642616070ffa68634b33c7edd7efb42b8fe17aa72
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vimcommander/metadata.xml b/app-vim/vimcommander/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/vimcommander/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/vimcommander/vimcommander-0.81.ebuild b/app-vim/vimcommander/vimcommander-0.81.ebuild
new file mode 100644
index 000000000000..991351f9bd3b
--- /dev/null
+++ b/app-vim/vimcommander/vimcommander-0.81.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Total Commander style file explorer"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=808"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/vimoutliner-0.3.6 b/app-vim/vimoutliner-0.3.6
deleted file mode 100644
index 7b96e8c54a82..000000000000
--- a/app-vim/vimoutliner-0.3.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: easy and fast outlining
-EAPI=6
-HOMEPAGE=https://github.com/vimoutliner/vimoutliner
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/vimoutliner/vimoutliner/archive/v0.3.6.zip -> vimoutliner-0.3.6.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=0751bc668f9f8163d4ad82a85a1498cf
diff --git a/app-vim/vimoutliner-0.3.6-r1 b/app-vim/vimoutliner-0.3.6-r1
deleted file mode 100644
index 1af0929d0151..000000000000
--- a/app-vim/vimoutliner-0.3.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: easy and fast outlining
-EAPI=6
-HOMEPAGE=https://github.com/vimoutliner/vimoutliner
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/autopep8 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/vimoutliner/vimoutliner/archive/v0.3.6.zip -> vimoutliner-0.3.6.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=9da6cd188c6e0e2711265c94b017a4f3
diff --git a/app-vim/vimoutliner-0.4.0_p20180301 b/app-vim/vimoutliner-0.4.0_p20180301
deleted file mode 100644
index a344a495c2dd..000000000000
--- a/app-vim/vimoutliner-0.4.0_p20180301
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup unpack
-DEPEND=dev-python/autopep8 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Vim plugin for easy and fast outlining
-EAPI=6
-HOMEPAGE=https://github.com/vimoutliner/vimoutliner
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/autopep8 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/vimoutliner/vimoutliner/archive/4f12628247940d98eedd594961695dc504261058.tar.gz -> vimoutliner-0.4.0_p20180301.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=753271d530e6748bd15c08c6712c09fe
diff --git a/app-vim/vimoutliner/Manifest b/app-vim/vimoutliner/Manifest
new file mode 100644
index 000000000000..ff43fa0cf88c
--- /dev/null
+++ b/app-vim/vimoutliner/Manifest
@@ -0,0 +1,7 @@
+AUX vimoutliner-0.3.6-fix-shebangs.patch 972 BLAKE2B 2b747133ecc49f4654131bbb963ac23ae291d186cfed97e944fd5e757cbe3288e5dafc243f4caea2acbeb56c27e92d257565a84fbcc8a4900a6287056e8e38bf SHA512 44bb6760c11a21ab817141cae5817cc4d5b88a5c94ca4e30238d9e009f080d5ae98522dcde910d5352090e7bf998ad47fa658a56bb16bb50ca905b14e5d2df2b
+DIST vimoutliner-0.3.6.zip 249053 BLAKE2B 329fbf73423291598a104881299200153c6d98cf75f3884c690879dc3460c4190c09eefec55415589f16a426ee76911a8ee7761a158d76b9e84360f5fadb83eb SHA512 20d348ff1b1b9572956fdc56b75e742b25b7deac2637fa6972a1e451edc1f679d8255847a291b84c80866a9ad8a37421524b8eb33565a1bb32ff2b75d0b68dde
+DIST vimoutliner-0.4.0_p20180301.tar.gz 367361 BLAKE2B a97df5c154e6ed9b3209bd90bd57b4166877f02b9513351fda0e841de84334a1e592e1ed56b46cc59bc6bb64f3c763cdca81df3f8696f3c348a8ef4744124c02 SHA512 f9f369e7e7f09dac04b58a27a86dc2121b3aacd0002537db348517e779fd1b7c9e88ae905b4b42aace10f79cb8f91acada1ad58e26f2257e46d1af98347eab62
+EBUILD vimoutliner-0.3.6-r1.ebuild 1271 BLAKE2B 5c96a349d8b94b4e5fa80e5c1acf9c4b60d8ff70a353b2a0099a16f09555147db386b339b47d1db18e9bbf2eea869ac49a2bbb2cee2ffa6fadc7c143192337d3 SHA512 e31218e7927c424c9964412beaceb797383e38b2f114ca9732edc269f414b1b90d1e28c8e5fd00992b1871e22b3c079ceeedd67e39ff71fd0c6983d7d2f258c1
+EBUILD vimoutliner-0.3.6.ebuild 694 BLAKE2B 7e0c7ddda16ac846fe5794192e6d24eafa25b8910b5fe259568c8ff7dc92117d8711fa61364abf0be8008e7c0a42e2726eb70a26e5d38eff8e09bff6de35cd90 SHA512 61b12471b3bdf1ff68ea13260c73d12df79e4a2d704758f40ebc276bb3e051c4681bf66af07b636452d28a52f0bb4168f5360e4d2deed19aaf025924ae2aacc4
+EBUILD vimoutliner-0.4.0_p20180301.ebuild 1056 BLAKE2B fe31bb24b29306a003e36030daeab78f0c1ae4501145f5a00a70b9d12bfc63601638dbc293ed2380aadbd40836244dfb2202e7738fc3512cb1bacfe532860934 SHA512 b753d9c8b73d9a1ffe21780b9d80bd76a222b1baa4c3a795f7e5ae97efa2e0a114faece37981c41ad2a842b0ec73b6fe6f55f1d015068467d6421e467be982ce
+MISC metadata.xml 337 BLAKE2B c4ae899109190b6ad14fcc71ff0dbea76f7ab6b731992174b4623847291d63bb8cbdc7e73cd92343beafdba086e0b54c4cda686593ef8b836f8add578b0459d0 SHA512 782f682a6837436ee5db28f818b2168035fbae243aa466077053e17842fec96672d702b818ad28a9f1d0b8fa1a1e2fb79b056d2e31bc09d5bf522d5f18ea1c7b
diff --git a/app-vim/vimoutliner/files/vimoutliner-0.3.6-fix-shebangs.patch b/app-vim/vimoutliner/files/vimoutliner-0.3.6-fix-shebangs.patch
new file mode 100644
index 000000000000..a363d96b34f6
--- /dev/null
+++ b/app-vim/vimoutliner/files/vimoutliner-0.3.6-fix-shebangs.patch
@@ -0,0 +1,21 @@
+--- a/vimoutliner/scripts/outline_freemind/outline_freemind.py 2017-08-24 21:20:25.138762046 +0000
++++ b/vimoutliner/scripts/outline_freemind/outline_freemind.py 2017-08-24 21:20:34.484797791 +0000
+@@ -1,3 +1,4 @@
++#!/usr/bin/python
+ '''Read in an otl file and generate an xml mind map viewable in freemind
+
+ Make sure that you check that round trip on your file works.
+--- a/vimoutliner/scripts/outline_freemind/otl.py 2017-08-24 21:23:08.194385573 +0000
++++ b/vimoutliner/scripts/outline_freemind/otl.py 2017-08-24 21:23:14.756410662 +0000
+@@ -1,3 +1,4 @@
++#!/usr/bin/python
+ # Some integer IDs
+ # headings are 1, 2, 3, ....
+ bodynowrap = -1 # ;
+--- a/vimoutliner/scripts/outline_freemind/freemind_outline.py 2017-08-25 08:07:01.985459421 +0000
++++ b/vimoutliner/scripts/outline_freemind/freemind_outline.py 2017-08-25 08:07:11.244502161 +0000
+@@ -1,3 +1,4 @@
++#!/usr/bin/python
+ '''Converts a freemind xml .mm file to an outline file compatable with vim
+ outliner.
+
diff --git a/app-vim/vimoutliner/metadata.xml b/app-vim/vimoutliner/metadata.xml
new file mode 100644
index 000000000000..8472d599577a
--- /dev/null
+++ b/app-vim/vimoutliner/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">vimoutliner/vimoutliner</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
new file mode 100644
index 000000000000..d639684e4902
--- /dev/null
+++ b/app-vim/vimoutliner/vimoutliner-0.3.6-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="vim plugin: easy and fast outlining"
+HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+VIM_PLUGIN_HELPFILES="vimoutliner"
+VIM_PLUGIN_MESSAGES="filetype"
+
+PATCHES=( "${FILESDIR}/${P}-fix-shebangs.patch" )
+
+RDEPEND="dev-python/autopep8"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+ sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim || die
+ sed -i -e 's/g:vo_modules2load/g:vo_modules_load/' vimoutliner/vimoutlinerrc || die
+ rm -v install.sh || die
+ find "${S}" -type f -exec chmod a+r {} \; || die
+}
+
+src_compile() {
+ local pyscript _pyscript
+ for pyscript in $(find "${S}" -type f -name \*.py); do
+ _pyscript=$(basename "${pyscript}")
+ einfo "Processing ${_pyscript}"
+ sed -i -e 's#[ \t]*$##g;' "${pyscript}" || die
+ 2to3 --no-diffs -w -n "${pyscript}" 2> /dev/null || die
+ autopep8 -i "${pyscript}" || die
+ python_fix_shebang -q "${pyscript}" || die
+ eend $?
+ done
+}
diff --git a/app-vim/vimoutliner/vimoutliner-0.3.6.ebuild b/app-vim/vimoutliner/vimoutliner-0.3.6.ebuild
new file mode 100644
index 000000000000..36ebfb95a0a7
--- /dev/null
+++ b/app-vim/vimoutliner/vimoutliner-0.3.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: easy and fast outlining"
+HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.zip -> ${P}.zip"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+
+VIM_PLUGIN_HELPFILES="vimoutliner"
+VIM_PLUGIN_MESSAGES="filetype"
+
+src_prepare() {
+ default
+ sed -i -e '/^if exists/,/endif/d' ftdetect/vo_base.vim || die
+ sed -i -e 's/g:vo_modules2load/g:vo_modules_load/' vimoutliner/vimoutlinerrc || die
+ rm -v install.sh || die
+ find "${S}" -type f -exec chmod a+r {} \; || die
+}
diff --git a/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301.ebuild b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301.ebuild
new file mode 100644
index 000000000000..693542279762
--- /dev/null
+++ b/app-vim/vimoutliner/vimoutliner-0.4.0_p20180301.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin vcs-snapshot
+
+# Commit Date: 1 Mar 2018
+COMMIT="4f12628247940d98eedd594961695dc504261058"
+
+DESCRIPTION="Vim plugin for easy and fast outlining"
+HOMEPAGE="https://github.com/vimoutliner/vimoutliner"
+SRC_URI="https://github.com/vimoutliner/vimoutliner/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+VIM_PLUGIN_HELPFILES="vimoutliner"
+VIM_PLUGIN_MESSAGES="filetype"
+
+RDEPEND="dev-python/autopep8"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ default
+
+ sed -i -e '1s:^:#!/usr/bin/python\n:' vimoutliner/scripts/otl2latex/otl2latex.py
+ find "${S}" -type f -exec chmod a+r {} \; || die
+}
+
+src_compile() {
+ local pyscript _pyscript
+ for pyscript in $(find "${S}" -type f -name \*.py); do
+ _pyscript=$(basename "${pyscript}")
+ [ ${_pyscript} == "otl.py" ] && continue
+ python_fix_shebang -q "${pyscript}"
+ done
+}
diff --git a/app-vim/vimpress-2.1.5 b/app-vim/vimpress-2.1.5
deleted file mode 100644
index 8dfb5dc2906c..000000000000
--- a/app-vim/vimpress-2.1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: manage wordpress blogs from vim
-EAPI=4
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3510
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( app-editors/vim[python] app-editors/gvim[python] ) dev-lang/python:2.7 dev-python/markdown || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/vim-scripts/VimRepress/tarball/2.1.5 -> vimpress-2.1.5.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=5a896ff47216bd41d0da5b2b40b52fb2
diff --git a/app-vim/vimpress-3.2.0 b/app-vim/vimpress-3.2.0
deleted file mode 100644
index 675b4e98ed67..000000000000
--- a/app-vim/vimpress-3.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: manage wordpress blogs from vim
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3510
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://gentoo/vimpress-3.2.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimpress-3.2.0.tar.bz2
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=0e7a9e8d1deff34450c294ebf5a6fafa
diff --git a/app-vim/vimpress/Manifest b/app-vim/vimpress/Manifest
new file mode 100644
index 000000000000..4f5d60e6920d
--- /dev/null
+++ b/app-vim/vimpress/Manifest
@@ -0,0 +1,5 @@
+DIST vimpress-2.1.5.tar.gz 11341 BLAKE2B 4376c187b22fdd937ea88e3454e8058daf1eb2614376babc9689e8358be629a04894410300f1e48dc550de2e64ceb1c56c87efd4e45392866e03450d0680eaef SHA512 34bbf205ecc92dee4ab897bd3d3d34fc808acdd0a60eb3c3e763056aa2c0487d9423a1e5e9fe252d0da5a8ecaaa7a64a3dc406bea472942a35ada4875b30db47
+DIST vimpress-3.2.0.tar.bz2 11456 BLAKE2B 39be21c2a65418f8e9e370997db5c64fc79f6ae608a85ba8c19ea2e0010823002caa35e1f7fb887fd20176eb987c23a7719b14c4a7a8acb9818dc3802d35557a SHA512 793f013ccc42180e095c2e8cc847719479418cc0b184688924520f0782ee27e99a7fc64e44bf5c25f2a720b19dd813a4756fc90b87c18e13766ef0ce7772334a
+EBUILD vimpress-2.1.5.ebuild 635 BLAKE2B 34b161dd2c3b25c6f270352d5e8936006c7dec8aca77c752f0b25d2ad6278524b2fc19d3b799964696a204f54f34c215c6dba5f96d5fe47ae5dc214ffcfce85c SHA512 e18dc336db615eb40f73a426cbe71c8f604aaeee2104eacca0b8ee6006daeb67e1561f43ce71e57933aa7ca977ba350df61d0c8a1c59ad60e5910a87b198e1ea
+EBUILD vimpress-3.2.0.ebuild 573 BLAKE2B 8f9d3ab01e72512eeee14e5d6f28545df4f74dfb5e8b481a2c4c8f22799a37fd669cddf47c4f8e9de7ed05adeb970c3b71046e1099e34ae05144dc1a5956f1a0 SHA512 8d3f43cdb27cf936b7ab7d9247b974b956bd3876dbbbcaec5fe02b0e5bc5766bdc19b802454c67ba9ee7c01fc65cc20b674b1b6c1279c6becd777dc344149b2b
+MISC metadata.xml 336 BLAKE2B 5154fbe13f738bf9020da237e4e8bafc26c160f0bcee4f042263e17d34f9bfdc9fc673e5a7ee15f8221dc6b1530131c1567049822c5540c34c2362b6b37316b5 SHA512 f2f18b31a5a60c51d7d563d8a53814625a6310ad2925ef297275a75ed5b40f475a25aa7089a0f641335e2c73d889d39e6473f224644c572ffe3118cf03fe4c90
diff --git a/app-vim/vimpress/metadata.xml b/app-vim/vimpress/metadata.xml
new file mode 100644
index 000000000000..11cff59d4bb2
--- /dev/null
+++ b/app-vim/vimpress/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">vim-scripts/VimRepress</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/vimpress/vimpress-2.1.5.ebuild b/app-vim/vimpress/vimpress-2.1.5.ebuild
new file mode 100644
index 000000000000..179ad0ebfd0b
--- /dev/null
+++ b/app-vim/vimpress/vimpress-2.1.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vim-plugin
+
+MY_PN="VimRepress"
+DESCRIPTION="vim plugin: manage wordpress blogs from vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3510"
+SRC_URI="https://github.com/vim-scripts/${MY_PN}/tarball/${PV} -> ${P}.tar.gz"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )
+ dev-lang/python:2.7
+ dev-python/markdown"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_unpack() {
+ unpack ${A}
+ mv *-${MY_PN}-* "${S}"
+}
+
+src_prepare() {
+ rm README || die
+}
diff --git a/app-vim/vimpress/vimpress-3.2.0.ebuild b/app-vim/vimpress/vimpress-3.2.0.ebuild
new file mode 100644
index 000000000000..863178d710d4
--- /dev/null
+++ b/app-vim/vimpress/vimpress-3.2.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: manage wordpress blogs from vim"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=3510"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="|| ( app-editors/vim[python,${PYTHON_USEDEP}] app-editors/gvim[python,${PYTHON_USEDEP}] )
+ ${PYTHON_DEPS}
+ dev-python/markdown[${PYTHON_USEDEP}]"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/vimpython-1.13-r1 b/app-vim/vimpython-1.13-r1
deleted file mode 100644
index 1998186e7fc3..000000000000
--- a/app-vim/vimpython-1.13-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: A set of menus/shortcuts to work with Python files
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=30
-KEYWORDS=alpha amd64 ia64 ppc sparc x86
-LICENSE=vim
-RDEPEND=dev-lang/python:* || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/vimpython-1.13.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimpython-1.13.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=25e7c1dde405500e6342ff29cbb3b049
diff --git a/app-vim/vimpython-1.13-r2 b/app-vim/vimpython-1.13-r2
deleted file mode 100644
index 19742cf9afe7..000000000000
--- a/app-vim/vimpython-1.13-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: A set of menus/shortcuts to work with Python files
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=30
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86
-LICENSE=vim
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://gentoo/vimpython-1.13.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimpython-1.13.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=0a39a5e770fc6ab052d1d723b60d6678
diff --git a/app-vim/vimpython/Manifest b/app-vim/vimpython/Manifest
new file mode 100644
index 000000000000..e573857c719c
--- /dev/null
+++ b/app-vim/vimpython/Manifest
@@ -0,0 +1,4 @@
+DIST vimpython-1.13.tar.bz2 4270 BLAKE2B 7973aea8ea397f3f2edcf8a2845ab47cad3015925dd9e42e37a7ada47f25073b68d6d8f8c378a86d90e39c0aae63aba784753679b4d04a5aad268db157400ae2 SHA512 467217ad160f02d3ecdc8c43e35966e496e6c5f99bef115bd4905795c0fd5b8f68f68bc8edd64ca1dbb1c6fbc088ef6ae996f524f0343943702f2a92dcc144ce
+EBUILD vimpython-1.13-r1.ebuild 385 BLAKE2B fb67a5dc1f6072159f92d02dbbc205e8869ddbc8b62669098cae1533f7b7fe5fd80e2783690e2b504ea4a5cf390d1a3a7df4a9d98ed9a97a47b42ae749f0c15a SHA512 5427cad779f09e12eb12510db56ebd6eee635127725120a0a95276de44121a9d757223eff8e2ec52b7ef44b64892db8ed60628c00acd31e52c3309c6d5cdbfa4
+EBUILD vimpython-1.13-r2.ebuild 489 BLAKE2B 6785bc25b55ad9b91d3e4d460b9ddbcba703dca50fc26ebab397293c71700edd2bf998ccba4b123547f5cf953f22881e4b55c04cb6fd06b0690d1926b9d07424 SHA512 af5170c50b4e02820bf9bf2562dca919d9066f73a19873a79359166dcb5fcde97cf76a78d7c192c24f6147e6fde1bebfecca83375e6584563ee1e73995131a16
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/vimpython/metadata.xml b/app-vim/vimpython/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/vimpython/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/vimpython/vimpython-1.13-r1.ebuild b/app-vim/vimpython/vimpython-1.13-r1.ebuild
new file mode 100644
index 000000000000..1801d3944d58
--- /dev/null
+++ b/app-vim/vimpython/vimpython-1.13-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: A set of menus/shortcuts to work with Python files"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=30"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-lang/python:*"
diff --git a/app-vim/vimpython/vimpython-1.13-r2.ebuild b/app-vim/vimpython/vimpython-1.13-r2.ebuild
new file mode 100644
index 000000000000..08a1107fa94f
--- /dev/null
+++ b/app-vim/vimpython/vimpython-1.13-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit vim-plugin python-single-r1
+
+DESCRIPTION="vim plugin: A set of menus/shortcuts to work with Python files"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=30"
+LICENSE="vim"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="app-arch/unzip"
+RDEPEND="${PYTHON_DEPS}"
diff --git a/app-vim/vimtex-20160324 b/app-vim/vimtex-20160324
deleted file mode 100644
index d41856752802..000000000000
--- a/app-vim/vimtex-20160324
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a modern vim plugin for editing LaTeX files
-EAPI=5
-HOMEPAGE=https://github.com/lervag/vimtex
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=!app-vim/vim-latex virtual/latex-base dev-tex/latexmk || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/vimtex-20160324.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimtex-20160324.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=99cb912dba22ace9b7333bc1521ef1c9
diff --git a/app-vim/vimtex-20180324 b/app-vim/vimtex-20180324
deleted file mode 100644
index 43b651770fd4..000000000000
--- a/app-vim/vimtex-20180324
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a modern vim plugin for editing LaTeX files
-EAPI=6
-HOMEPAGE=https://github.com/lervag/vimtex
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=!app-vim/vim-latex !app-vim/automatictexplugin virtual/latex-base dev-tex/latexmk || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/lervag/vimtex/archive/17d809706edcb277f1ee7fa5e33aff3619926fe4.tar.gz -> vimtex-20180324.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=f71aa35c69672944424bc99cdde15a29
diff --git a/app-vim/vimtex-99999999 b/app-vim/vimtex-99999999
deleted file mode 100644
index 689e90539df3..000000000000
--- a/app-vim/vimtex-99999999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare unpack
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: a modern vim plugin for editing LaTeX files
-EAPI=6
-HOMEPAGE=https://github.com/lervag/vimtex
-LICENSE=MIT
-RDEPEND=!app-vim/vim-latex !app-vim/automatictexplugin virtual/latex-base dev-tex/latexmk || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f git-r3 8f6de46b0aa318aea0e8cac62ece098b vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=f71aa35c69672944424bc99cdde15a29
diff --git a/app-vim/vimtex/Manifest b/app-vim/vimtex/Manifest
new file mode 100644
index 000000000000..69aaf348dd74
--- /dev/null
+++ b/app-vim/vimtex/Manifest
@@ -0,0 +1,6 @@
+DIST vimtex-20160324.tar.bz2 95040 BLAKE2B a6ea2c0ace2aea108545347e0dd624dd838005d752d3e823d230f6fff04ba37f82c98ff472b06b6b5b58a8481824ba1ffad3c756d50a96ea9c79e8e506783131 SHA512 0c0d2a95f3b62239f47113f5b8876728d6d9fddf7e526477e92ef1f09317cb607ddd3b2aa07f6e8bebd357308adf21e4c353795952dc30372b493963bd0554ff
+DIST vimtex-20180324.tar.gz 684092 BLAKE2B 4472c9e62c5795b621a9230fbd7ea1f018c6df440f58065e7b439f64ae67f4064b158094c8d0b8a6eba6202bc9e6729b792fced02ea9deeaf400f0240537795d SHA512 59038aff6ec761a9f73db7d638a70e9ea5ba4d3ef4bd9283f3a62beb5e412f1a3c752dd0d739dc4c9c5e33e4a00a84a91da56e8fea2b8113b7ef73d219997409
+EBUILD vimtex-20160324.ebuild 427 BLAKE2B 54ac66daf12d36f6311b0afe67b4c4e3b754c1327af576c01a7b2d6968229b2804ed716216e973deca59d294e5502a79bf7ee935f26cb8093c810ea5dc09c26f SHA512 6445a566b4cee4841ce7c40b96610d4b3e5e3f60e4eb35aac6e525c2d1b7ef9d79c6281e00f2e5fbb7d0f230fc5109e221d35769d4a957f21cf36d95767a379b
+EBUILD vimtex-20180324.ebuild 777 BLAKE2B f8d569e8e090bf9ba22ff28ad2f4a41098cd3eead7207f1c3c117c3c7ba366b0bd51623c2d96a4c21b55c19d84e8953c2f4a2a9ef74c56eb0eb33bf92cfbdfca SHA512 15f6d678fd0f06df76e0e6a59d483e57a22c7b4c25d707bdaabf5fe4750da076daec9a4e674fa70e4b76e40d7fb44c1b375371a88974c677d9e4c85f490f7a87
+EBUILD vimtex-99999999.ebuild 777 BLAKE2B f8d569e8e090bf9ba22ff28ad2f4a41098cd3eead7207f1c3c117c3c7ba366b0bd51623c2d96a4c21b55c19d84e8953c2f4a2a9ef74c56eb0eb33bf92cfbdfca SHA512 15f6d678fd0f06df76e0e6a59d483e57a22c7b4c25d707bdaabf5fe4750da076daec9a4e674fa70e4b76e40d7fb44c1b375371a88974c677d9e4c85f490f7a87
+MISC metadata.xml 337 BLAKE2B 7cdee52f7b90fb4f600900bf2766b17b00992c1f947bb590a95d17a83ea6d3a9d48d7da4dfef2de1b2101118729ea95298fab28798dee7ec77977fdb659a3e27 SHA512 d2be801e0e552815e32e818ed13172288ebaa4505d6074dcabfaac760fab3227d019e4ddb8610062ceb5680e8b0cd543bd169333eefc80cefc6f5bf790801a0f
diff --git a/app-vim/vimtex/metadata.xml b/app-vim/vimtex/metadata.xml
new file mode 100644
index 000000000000..761c713e285d
--- /dev/null
+++ b/app-vim/vimtex/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">lervag/vimtex</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/vimtex/vimtex-20160324.ebuild b/app-vim/vimtex/vimtex-20160324.ebuild
new file mode 100644
index 000000000000..3b8069b4db5a
--- /dev/null
+++ b/app-vim/vimtex/vimtex-20160324.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: a modern vim plugin for editing LaTeX files"
+HOMEPAGE="https://github.com/lervag/vimtex"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+RDEPEND="!app-vim/vim-latex
+ virtual/latex-base
+ dev-tex/latexmk"
+
+src_prepare() {
+ rm -rf *.md test || die
+}
diff --git a/app-vim/vimtex/vimtex-20180324.ebuild b/app-vim/vimtex/vimtex-20180324.ebuild
new file mode 100644
index 000000000000..d4031034c014
--- /dev/null
+++ b/app-vim/vimtex/vimtex-20180324.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/lervag/vimtex.git"
+ inherit git-r3
+else
+ inherit vcs-snapshot
+ COMMIT_HASH="17d809706edcb277f1ee7fa5e33aff3619926fe4"
+ SRC_URI="https://github.com/lervag/vimtex/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: a modern vim plugin for editing LaTeX files"
+HOMEPAGE="https://github.com/lervag/vimtex"
+LICENSE="MIT"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+RDEPEND="
+ !app-vim/vim-latex
+ !app-vim/automatictexplugin
+ virtual/latex-base
+ dev-tex/latexmk
+"
+
+src_prepare() {
+ default
+
+ # remove unwanted files
+ rm -r *.md media test || die
+}
diff --git a/app-vim/vimtex/vimtex-99999999.ebuild b/app-vim/vimtex/vimtex-99999999.ebuild
new file mode 100644
index 000000000000..d4031034c014
--- /dev/null
+++ b/app-vim/vimtex/vimtex-99999999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+if [[ ${PV} == 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/lervag/vimtex.git"
+ inherit git-r3
+else
+ inherit vcs-snapshot
+ COMMIT_HASH="17d809706edcb277f1ee7fa5e33aff3619926fe4"
+ SRC_URI="https://github.com/lervag/vimtex/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="vim plugin: a modern vim plugin for editing LaTeX files"
+HOMEPAGE="https://github.com/lervag/vimtex"
+LICENSE="MIT"
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+RDEPEND="
+ !app-vim/vim-latex
+ !app-vim/automatictexplugin
+ virtual/latex-base
+ dev-tex/latexmk
+"
+
+src_prepare() {
+ default
+
+ # remove unwanted files
+ rm -r *.md media test || die
+}
diff --git a/app-vim/voom-5.1 b/app-vim/voom-5.1
deleted file mode 100644
index c518e968dca5..000000000000
--- a/app-vim/voom-5.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: emulates a two-pane text outliner
-EAPI=5
-HOMEPAGE=https://vim-voom.github.com/ https://www.vim.org/scripts/script.php?script_id=2657
-KEYWORDS=amd64 x86
-LICENSE=CC0-1.0
-RDEPEND=|| ( app-editors/vim[python] app-editors/gvim[python] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/voom-5.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/voom-5.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=d7ae306c90b504a32135bb6e0b7ee474
diff --git a/app-vim/voom-5.1-r1 b/app-vim/voom-5.1-r1
deleted file mode 100644
index 5ce832020cff..000000000000
--- a/app-vim/voom-5.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: emulates a two-pane text outliner
-EAPI=6
-HOMEPAGE=https://vim-voom.github.com/ https://www.vim.org/scripts/script.php?script_id=2657
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=CC0-1.0
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://gentoo/voom-5.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/voom-5.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=14e7a791ad3a19bc94c68bdb973eb829
diff --git a/app-vim/voom/Manifest b/app-vim/voom/Manifest
new file mode 100644
index 000000000000..1757ec48dd4d
--- /dev/null
+++ b/app-vim/voom/Manifest
@@ -0,0 +1,4 @@
+DIST voom-5.1.tar.bz2 102211 BLAKE2B 3835fb8f41638ca2ff91c106d94ee04aca3b6b3efcb44c7f023faba164512a96ff5b310b6fba3604ba2abe10e1371102997a3a9c67df28772fd68910836d2eb1 SHA512 3798c6d5079ebdf4f447f62613340e46a6b593e0a97226b0aecc90889c6cd2f6f2ce36eb88395a12a0e27ff3803c7693f1c56443928914bfea134d8a75df8c91
+EBUILD voom-5.1-r1.ebuild 571 BLAKE2B 24492913fe6eee9eecd498e3f887f829e29dccf1742034866b4d5fb42b76d1b9e0379ed0b5bd785f1e902b5d66978cb2a733fd6e5c3d2ced7b5e2749626d3e6d SHA512 7c6df11bc6670fc264fe9d022a7510fa7fcb1297ab02f6877718f389eb2807ec62dccf9fbb357030bfa1553f0f0a308e032c71371acf8553f6312b231100571a
+EBUILD voom-5.1.ebuild 430 BLAKE2B 2ea7160d3a98943bd45094e74d453313a55a399ec379aa1adfd62578a4d605c070c5c20c2175363f5d1a8525e0e7ae27d7fe2beaf1b20695b48f4de0976bb753 SHA512 2084dcade6865875468e6822a9096950aed77d51674b4ba712cfecdc1c28961a0a72cca14d60703472fef7f249926b2b1ca5ce1551e1481310fc80b794da010f
+MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-vim/voom/metadata.xml b/app-vim/voom/metadata.xml
new file mode 100644
index 000000000000..f1abc6411341
--- /dev/null
+++ b/app-vim/voom/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-vim/voom/voom-5.1-r1.ebuild b/app-vim/voom/voom-5.1-r1.ebuild
new file mode 100644
index 000000000000..661ae4f5bd8b
--- /dev/null
+++ b/app-vim/voom/voom-5.1-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1 vim-plugin
+
+DESCRIPTION="vim plugin: emulates a two-pane text outliner"
+HOMEPAGE="https://vim-voom.github.com/ https://www.vim.org/scripts/script.php?script_id=2657"
+
+LICENSE="CC0-1.0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="${PYTHON_DEPS}
+ || (
+ app-editors/vim[python,${PYTHON_USEDEP}]
+ app-editors/gvim[python,${PYTHON_USEDEP}]
+ )"
diff --git a/app-vim/voom/voom-5.1.ebuild b/app-vim/voom/voom-5.1.ebuild
new file mode 100644
index 000000000000..d47fb9125ab0
--- /dev/null
+++ b/app-vim/voom/voom-5.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: emulates a two-pane text outliner"
+HOMEPAGE="https://vim-voom.github.com/ https://www.vim.org/scripts/script.php?script_id=2657"
+LICENSE="CC0-1.0"
+KEYWORDS="amd64 x86"
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+RDEPEND="|| ( app-editors/vim[python] app-editors/gvim[python] )"
diff --git a/app-vim/webapi-0.2 b/app-vim/webapi-0.2
deleted file mode 100644
index 7dc524a39f36..000000000000
--- a/app-vim/webapi-0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: interface to Web APIs
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4019
-KEYWORDS=amd64 x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/webapi-0.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/webapi-0.2.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=65a5c486f41713df22bc343f2e9a3c05
diff --git a/app-vim/webapi-0.3 b/app-vim/webapi-0.3
deleted file mode 100644
index 0065f0b64060..000000000000
--- a/app-vim/webapi-0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: interface to Web APIs
-EAPI=6
-HOMEPAGE=https://github.com/mattn/webapi-vim
-KEYWORDS=~amd64 ~x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/mattn/webapi-vim/archive/0.3.tar.gz -> webapi-0.3.tar.gz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=d57cd303299f860636c95d5c94eb65b8
diff --git a/app-vim/webapi/Manifest b/app-vim/webapi/Manifest
new file mode 100644
index 000000000000..f042d0b4bcf4
--- /dev/null
+++ b/app-vim/webapi/Manifest
@@ -0,0 +1,5 @@
+DIST webapi-0.2.tar.bz2 20690 BLAKE2B 5438a88c94f77cbe5ce2a79b11c4da31199cc071b35a22fc78b01c9f4c1195d830353639ca05d3c95182fe3ae5c177cddec9d6acd0b2de198a3f77de5e1ad92f SHA512 ca513053c361041bfaeeea11a0bb70c8e6e011985dc5ba801c654f919dd7d94304b6ff475ce49525909b575e7cc0d9233b56cab2326adc6a689e05c5faf4a3da
+DIST webapi-0.3.tar.gz 26388 BLAKE2B 878e9f760f9940b81647359fb8779d6386b4bd2d2190c77f2ef886a12a6d293f6f0e5829e05fe98e0c842cb927186f9e4a02dcddcdfe99d5e13d52ae43e7f775 SHA512 215516872a32f8d967a9bff6d13916d6571399184728c422babf486152fc4c3f57aa4a7fa7591d7205d4b2dd99138c36796d1f2d186d494d74cf5dd2fa7cdec8
+EBUILD webapi-0.2.ebuild 328 BLAKE2B 1dbcbbb4a1ae8fa48871f527564061c5c1b8a4ba3ccb846ff82e4496af55bdb2f2834a7b79f6c4795517af4e0dfb8be3fa9f8cfcb1a59ed92fa38f4ac8935330 SHA512 3621693275ed6aa6b0b9ab14c79648b8d5cabf609e7ff2ef5df3d45b85de5d58c6560df7103dfc4b2a2ba67dbbaefcaf19f8651ad045ba0af6f76d726e7814e6
+EBUILD webapi-0.3.ebuild 468 BLAKE2B 81ad741b8522f2557471e33fca8e53184b1150a1ef54f61bebf5687cfb5eab502b3d1d2976c0568a0ee34d5d1a7c24f1372256faa579a1b58f5e8215b5af6ad6 SHA512 9c92be9f70769f76b709f8e8fc73de3db05bec9299434dab5644941617f95cc619ddeac137d13c998f4ba5daaacaa68a982fa6e001b43dc0a7d9d2d345970a30
+MISC metadata.xml 245 BLAKE2B d4f5ef381d0a479a17bfde792cd6828e5fa0ecdd26732c1a13c97fcae2f22396b879fb430aaea7680920d5ba897f78cfbb6e50bb2f65165613a5a0ba1f7dc609 SHA512 6d6d35ccbb839c939bc663cecb55e2178f5fd4e455ee3088b8847416d558dd3e7969f4c78bc445ff29503d6906fec12d302d7249e9adc8cb708d0790e681e5a2
diff --git a/app-vim/webapi/metadata.xml b/app-vim/webapi/metadata.xml
new file mode 100644
index 000000000000..f1abc6411341
--- /dev/null
+++ b/app-vim/webapi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-vim/webapi/webapi-0.2.ebuild b/app-vim/webapi/webapi-0.2.ebuild
new file mode 100644
index 000000000000..220b40e270c5
--- /dev/null
+++ b/app-vim/webapi/webapi-0.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: interface to Web APIs"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4019"
+LICENSE="BSD"
+KEYWORDS="amd64 x86 ~x64-macos"
+IUSE=""
+
+RDEPEND="net-misc/curl"
diff --git a/app-vim/webapi/webapi-0.3.ebuild b/app-vim/webapi/webapi-0.3.ebuild
new file mode 100644
index 000000000000..7a9673e4e753
--- /dev/null
+++ b/app-vim/webapi/webapi-0.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: interface to Web APIs"
+HOMEPAGE="https://github.com/mattn/webapi-vim"
+SRC_URI="https://github.com/mattn/${PN}-vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+
+RDEPEND="net-misc/curl"
+
+S="${WORKDIR}/${PN}-vim-${PV}"
+
+src_prepare() {
+ default
+ rm -v Makefile || die
+}
diff --git a/app-vim/wikipedia-syntax-20101113-r1 b/app-vim/wikipedia-syntax-20101113-r1
deleted file mode 100644
index 5b148625d241..000000000000
--- a/app-vim/wikipedia-syntax-20101113-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Wikipedia syntax highlighting
-EAPI=6
-HOMEPAGE=https://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim
-KEYWORDS=amd64 hppa ~mips ppc ppc64 x86
-LICENSE=CC-BY-SA-3.0
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/wikipedia-syntax-20101113.tar.bz2 https://dev.gentoo.org/~radhermit/vim/wikipedia-syntax-20101113.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=32bdb07cac9f3ff7ced3507b8d82b824
diff --git a/app-vim/wikipedia-syntax/Manifest b/app-vim/wikipedia-syntax/Manifest
new file mode 100644
index 000000000000..46718e7ee462
--- /dev/null
+++ b/app-vim/wikipedia-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST wikipedia-syntax-20101113.tar.bz2 3463 BLAKE2B ee37c972eaf884e6c5130356638c7309481f4e37b7c08056770d9600e35ef67b1480fd0b8f4eb68a10df9caf8f4152e325d501d752e799eb5b43de8f5b012ce4 SHA512 e0e52d4cf6e6e5a3f6cb32b0dc22c91c6b3b58292f1e0d67cb4de4ed2675d7f6bbb069d37e6a59b0cfad201c082322e3cb5300639e39447bbcda22d99c88b4b4
+EBUILD wikipedia-syntax-20101113-r1.ebuild 502 BLAKE2B 966545aa0d4669bdaf237ee1dc37a5d03480895e12934d0ee7cfa827f7a1f440cc18d2d543bfc2856151d7d5a3bd80e0a2d24b72b3c06b49681d38a99ddea7c7 SHA512 6a2dde4868eb2ce282f7b43896d26acd4ec9eb8001391d3a4ef322960c687c38b0fe346003f21ed3857c42118e36c20c8dffd7b67e0d01f3cb6062a28802a2bf
+MISC metadata.xml 441 BLAKE2B b7ca0f393018de1391ced7bccaee3b2e1a57f148e9afc2305c6aacad8bd2f2bbf7fb787008598274e595017f6150c66eff622f58923a9baf5647ec5dd1155d35 SHA512 46bd57e33bc8214c4823ea84d1cebe83a55e7bc7b01e67d88fca2bbc3bf2e2eebad2041a76b6a70702e51bd934723b5a337f326ab33970a534b15e46c2177c45
diff --git a/app-vim/wikipedia-syntax/metadata.xml b/app-vim/wikipedia-syntax/metadata.xml
new file mode 100644
index 000000000000..9f257c75a967
--- /dev/null
+++ b/app-vim/wikipedia-syntax/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <longdescription lang="en">
+ This package provides Vim syntax highlighting for Wikipedia
+ files, and automatic filetype detection for these files based upon
+ filename.
+ </longdescription>
+</pkgmetadata>
diff --git a/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r1.ebuild b/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r1.ebuild
new file mode 100644
index 000000000000..200a7be789da
--- /dev/null
+++ b/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Wikipedia syntax highlighting"
+HOMEPAGE="https://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim"
+LICENSE="CC-BY-SA-3.0"
+KEYWORDS="amd64 hppa ~mips ppc ppc64 x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for Wikipedia article
+files. Detection is by filename (*.wiki)."
+
+VIM_PLUGIN_MESSAGES="filetype"
diff --git a/app-vim/xquery-syntax-0.1-r2 b/app-vim/xquery-syntax-0.1-r2
deleted file mode 100644
index ce7a1929d60d..000000000000
--- a/app-vim/xquery-syntax-0.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: XQuery syntax highlighting
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=803
-KEYWORDS=alpha amd64 ia64 ~mips ppc ppc64 sparc x86
-LICENSE=vim.org
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/xquery-syntax-0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/xquery-syntax-0.1.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=231e93dc3a2907d33ebda2e1c08ae6cb
diff --git a/app-vim/xquery-syntax/Manifest b/app-vim/xquery-syntax/Manifest
new file mode 100644
index 000000000000..75f8027f3bb0
--- /dev/null
+++ b/app-vim/xquery-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST xquery-syntax-0.1.tar.bz2 1552 BLAKE2B e33f5359d3059c7558516939e2ce14c906f12fd4b7c5d035cdbadc9485e1fc992e50a2c38685d27ffae40dc7b22375c6825ae414131846ff0c19d68484750ad0 SHA512 277503e2d7089702c58b2e04a48345e579b6cfdee5042da90e8401b914c1d515c811cbf71f6dedbeee4a21e7a4807bd0d694323ddb2bd6b9437edaaba5a0f2fd
+EBUILD xquery-syntax-0.1-r2.ebuild 584 BLAKE2B 0bf0662e91084d66fa5cc858a50dd2742a81ba095601391d86ed0a2af94bd9b82f0903ab27273ea05fa724cb0f5957a730786313bb35cd6b1b48be5cec051c43 SHA512 e159a1c317efe2e189cd3652f2c4ca255d5ea89b77924a2d8437a9b15e2474a4fb39f30db2bcf43f3eae8be13af9060998f9ef796c616d491b9321c7b19383ae
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/xquery-syntax/metadata.xml b/app-vim/xquery-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/xquery-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/xquery-syntax/xquery-syntax-0.1-r2.ebuild b/app-vim/xquery-syntax/xquery-syntax-0.1-r2.ebuild
new file mode 100644
index 000000000000..4261c5cc64e3
--- /dev/null
+++ b/app-vim/xquery-syntax/xquery-syntax-0.1-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: XQuery syntax highlighting"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=803"
+
+LICENSE="vim.org"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPTEXT=\
+"This plugin provides syntax highlighting for XQuery files."
+
+src_prepare() {
+ default
+ # use hi def link. Bug #101788, bug #101804.
+ sed -i -e 's,^hi\(ghlight\)\? link,hi def link,' syntax/xquery.vim \
+ || die "sed failed"
+}
diff --git a/app-vim/xsl-syntax-0.3.11-r2 b/app-vim/xsl-syntax-0.3.11-r2
deleted file mode 100644
index fe94f93f8cc0..000000000000
--- a/app-vim/xsl-syntax-0.3.11-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: Syntax for XSLT (with HTML and others)
-EAPI=6
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=257
-KEYWORDS=alpha amd64 ia64 ~mips ppc ppc64 sparc x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/xsl-syntax-0.3.11.tar.bz2 https://dev.gentoo.org/~radhermit/vim/xsl-syntax-0.3.11.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=f7cc8054139a4977add36d7ae989f03f
diff --git a/app-vim/xsl-syntax/Manifest b/app-vim/xsl-syntax/Manifest
new file mode 100644
index 000000000000..c2eca61b6c80
--- /dev/null
+++ b/app-vim/xsl-syntax/Manifest
@@ -0,0 +1,3 @@
+DIST xsl-syntax-0.3.11.tar.bz2 5770 BLAKE2B d7d06bf7e2537c8c6c1419f557e4c29042a1af6dd31850c28feccbd342a1beb60dded565f48b715d021ebe3279e0d4a75daa3063e7e8347a1977f97947a0a92a SHA512 e09f0f6ebe023a681560a12e919c9573abc2bf0f1a6fe1bda233ca296fa4fa81bead99aeb7eafb387f04e199f7601d8ce6593c767be1b3e94ff73135ea0f4361
+EBUILD xsl-syntax-0.3.11-r2.ebuild 565 BLAKE2B dcc903b148fe5514884f4e3d39b0b6c00f904f06ec1c11b19cfefae577c1993d7d56d2fc7718a362b3288bb03b0cd1d8ea47d9d49face56ae29841c87b2e96f9 SHA512 d214c81fb756080531fa1b8bb3c48b79cf33c9821fdd2bb0fe24de3dce20831b62d78be2ab955cec6b6e19eb1c07222160ef3defca3cc732914dec1e54f1c02d
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/xsl-syntax/metadata.xml b/app-vim/xsl-syntax/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/xsl-syntax/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/xsl-syntax/xsl-syntax-0.3.11-r2.ebuild b/app-vim/xsl-syntax/xsl-syntax-0.3.11-r2.ebuild
new file mode 100644
index 000000000000..8bc90a7472cb
--- /dev/null
+++ b/app-vim/xsl-syntax/xsl-syntax-0.3.11-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Syntax for XSLT (with HTML and others)"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=257"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+VIM_PLUGIN_HELPURI="https://www.vim.org/scripts/script.php?script_id=257"
+
+src_prepare() {
+ default
+ # hi link is evil. See bug #101787, bug #101804.
+ sed -i -e 's,^hi link,hi def link,' syntax/xsl.vim || die "sed failed"
+}
diff --git a/app-vim/yankring-19.0 b/app-vim/yankring-19.0
deleted file mode 100644
index 27bf1400ccc6..000000000000
--- a/app-vim/yankring-19.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: maintains a history of previous yanks and deletes
-EAPI=5
-HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1234
-KEYWORDS=amd64 x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/yankring-19.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/yankring-19.0.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=0ac47f21430b8b16b23424406bd136f2
diff --git a/app-vim/yankring/Manifest b/app-vim/yankring/Manifest
new file mode 100644
index 000000000000..c8fdfab8dc43
--- /dev/null
+++ b/app-vim/yankring/Manifest
@@ -0,0 +1,3 @@
+DIST yankring-19.0.tar.bz2 36512 BLAKE2B 7bd68ded17ae506f67099d1fe8d41aa2b77aad6b9ebfba37c242e185ba3ba17ed72f6096ec404bea3a88b120ddd80e4871fb7a8eb005124932b9b3eebe2a1f9c SHA512 714d619e572f739c6d02b32d1da1ede449dccd45c4a74441c4806df1c6fdf51033da84412534dc021b0d082f72925ddcd9b29b5b0b1afcca34a79d0133263b18
+EBUILD yankring-19.0.ebuild 344 BLAKE2B ecf277aeae90edade3a7a56c22302aabf107ed678b660b5c743d86800891180f5733268665afa71016e5a6d5ef3e10faf86be1eca583c128a7635b7135ce6ace SHA512 77f677215da8e1e33287173ba15c6dbdcbfc8a08040a5d81920e8433e7dff0a569c0df2e602393c418afa7e846fdceb3ba87e8cdd3c16fd11307d88c6a06d816
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/yankring/metadata.xml b/app-vim/yankring/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/yankring/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/yankring/yankring-19.0.ebuild b/app-vim/yankring/yankring-19.0.ebuild
new file mode 100644
index 000000000000..5f82da839157
--- /dev/null
+++ b/app-vim/yankring/yankring-19.0.ebuild
@@ -0,0 +1,11 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: maintains a history of previous yanks and deletes"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=1234"
+LICENSE="vim"
+KEYWORDS="amd64 x86"
+VIM_PLUGIN_HELPFILES="${PN}.txt"
diff --git a/app-vim/youcompleteme-20130910 b/app-vim/youcompleteme-20130910
deleted file mode 100644
index defbabd787b7..000000000000
--- a/app-vim/youcompleteme-20130910
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] clang? ( >=sys-devel/clang-3.3 ) || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) test? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) sys-devel/make >=dev-util/cmake-3.9.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: a code-completion engine for Vim
-EAPI=5
-HOMEPAGE=https://valloric.github.io/YouCompleteMe/
-IUSE=+clang test python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] clang? ( >=sys-devel/clang-3.3 ) || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~radhermit/vim/youcompleteme-20130910.tar.xz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a3fb258035ce35d52d68b7b6405b03b2
diff --git a/app-vim/youcompleteme-99999999 b/app-vim/youcompleteme-99999999
deleted file mode 100644
index d05f00c592a9..000000000000
--- a/app-vim/youcompleteme-99999999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] clang? ( >=sys-devel/clang-3.3 ) dev-libs/boost[python,threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) test? ( >=dev-python/mock-1.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-cpp/gtest-1.8.0 ) sys-devel/make >=dev-util/cmake-3.9.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=vim plugin: a code-completion engine for Vim
-EAPI=5
-HOMEPAGE=https://valloric.github.io/YouCompleteMe/
-IUSE=+clang test python_targets_python2_7
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] clang? ( >=sys-devel/clang-3.3 ) dev-libs/boost[python,threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) dev-python/bottle[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/jedi[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/sh[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/waitress[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 7db901256449fef43c3aaa4d486c1c63 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a02867f107d14fc6cecdc1cce308275e
diff --git a/app-vim/youcompleteme/Manifest b/app-vim/youcompleteme/Manifest
new file mode 100644
index 000000000000..12f660b7f355
--- /dev/null
+++ b/app-vim/youcompleteme/Manifest
@@ -0,0 +1,4 @@
+DIST youcompleteme-20130910.tar.xz 2340104 BLAKE2B 1d50eae1e53d1acc3e9599ade6c5686602cf28997574dcf128b1ed1f812548c51e0c5ad45547ec12fc44d7391ce539c7cd8785ae823978ce18b870dd794f07a2 SHA512 c1022a27ced00e8ba8e9aa25029a0032805331cf0f80342aaaf9d7d4ec7780a098ffbd315068f19f6c98b00c4b4b43e59c7fa40070057e097ca40f6398b53b6b
+EBUILD youcompleteme-20130910.ebuild 1874 BLAKE2B da7bff5e1747bcc76e13f616790c2054b142e9a3854525c5fe9369d9926442e92cdc981de69bada42e200bbfd64a221587140fd08977762f9e8998f6479868fb SHA512 01415a479a88c945f7e97d62afa5dfb86154cef797245da312b65f3b355944f211367ffc8f64a02f440698d4d46b8dae996554c27463ca1f8d39e8d4209de7a1
+EBUILD youcompleteme-99999999.ebuild 2872 BLAKE2B 0671b442ae0b4b1c8379b89dc384c83196d8f683d370a957f6bdd076f40dcdba9175177fcec9733ada197f4479fe722e112c2e29fe3dee6090b8dc82684858ab SHA512 7eafb0cd1a7d2e8bf51ea6e1465b1f0d51ff422e418ca399a970d8baad2f7651b6cadd2c4655f9c4b65088375feb6ec7f431e2c5410536433e46e993a7203039
+MISC metadata.xml 372 BLAKE2B b057ef7819a6a3018c88a692b3f94befe2b3055d3d014790bfdf4de690cdd9e589e12b1d802e5487af104b5cb7d87395e7c0a4130dde622a3a48d7c2f3c507a2 SHA512 3afacd989d495928012e5a1b1c2bb6d14209cbcb1e347a24c1c0881c758642cc8457ee7b6202b8d129e3f08dc21492792715fc5452f8ffc33f719da9a447fdac
diff --git a/app-vim/youcompleteme/metadata.xml b/app-vim/youcompleteme/metadata.xml
new file mode 100644
index 000000000000..1b0669747edd
--- /dev/null
+++ b/app-vim/youcompleteme/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <use>
+ <flag name="clang">Enable semantic support for C-family languages using <pkg>sys-devel/clang</pkg></flag>
+ </use>
+</pkgmetadata>
diff --git a/app-vim/youcompleteme/youcompleteme-20130910.ebuild b/app-vim/youcompleteme/youcompleteme-20130910.ebuild
new file mode 100644
index 000000000000..6e36f48e89f6
--- /dev/null
+++ b/app-vim/youcompleteme/youcompleteme-20130910.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib python-single-r1 cmake-utils vim-plugin
+
+if [[ ${PV} == 9999* ]] ; then
+ EGIT_REPO_URI="https://github.com/Valloric/YouCompleteMe.git"
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~x86"
+ SRC_URI="https://dev.gentoo.org/~radhermit/vim/${P}.tar.xz"
+fi
+
+DESCRIPTION="vim plugin: a code-completion engine for Vim"
+HOMEPAGE="https://valloric.github.io/YouCompleteMe/"
+
+LICENSE="GPL-3"
+IUSE="+clang test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ clang? ( >=sys-devel/clang-3.3 )
+ || (
+ app-editors/vim[python,${PYTHON_USEDEP}]
+ app-editors/gvim[python,${PYTHON_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ test? (
+ >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+ )"
+
+CMAKE_IN_SOURCE_BUILD=1
+CMAKE_USE_DIR=${S}/cpp
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_prepare() {
+ if ! use test ; then
+ sed -i '/^add_subdirectory( tests )/d' cpp/ycm/CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_use clang CLANG_COMPLETER)
+ $(cmake-utils_use_use clang SYSTEM_LIBCLANG)
+ )
+ cmake-utils_src_configure
+}
+
+src_test() {
+ # TODO: use system gtest
+ cd "${S}"/cpp || die
+ emake ycm_core_tests
+ cd ycm/tests || die
+ LD_LIBRARY_PATH="${EROOT}"/usr/$(get_libdir)/llvm \
+ "${S}"/cpp/ycm/tests/ycm_core_tests || die
+
+ cd "${S}"/python/ycm || die
+ nosetests --verbose || die
+}
+
+src_install() {
+ dodoc *.md
+ rm -r *.md *.sh COPYING.txt cpp || die
+ find python -name *test* -exec rm -rf {} + || die
+ rm python/libclang.so || die
+
+ vim-plugin_src_install
+
+ python_optimize "${ED}"
+ python_fix_shebang "${ED}"
+}
+
+pkg_postinst() {
+ vim-plugin_pkg_postinst
+
+ [[ -z ${REPLACING_VERSIONS} ]] && \
+ optfeature "better python autocompletion" dev-python/jedi
+}
diff --git a/app-vim/youcompleteme/youcompleteme-99999999.ebuild b/app-vim/youcompleteme/youcompleteme-99999999.ebuild
new file mode 100644
index 000000000000..b41a7b847a87
--- /dev/null
+++ b/app-vim/youcompleteme/youcompleteme-99999999.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib python-single-r1 cmake-utils vim-plugin
+
+if [[ ${PV} == 9999* ]] ; then
+ EGIT_REPO_URI="https://github.com/Valloric/YouCompleteMe.git"
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~x86"
+ SRC_URI="https://dev.gentoo.org/~radhermit/vim/${P}.tar.xz"
+fi
+
+DESCRIPTION="vim plugin: a code-completion engine for Vim"
+HOMEPAGE="https://valloric.github.io/YouCompleteMe/"
+
+LICENSE="GPL-3"
+IUSE="+clang test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ clang? ( >=sys-devel/clang-3.3 )
+ dev-libs/boost[python,threads,${PYTHON_USEDEP}]
+ || (
+ app-editors/vim[python,${PYTHON_USEDEP}]
+ app-editors/gvim[python,${PYTHON_USEDEP}]
+ )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ dev-python/bottle[${PYTHON_USEDEP}]
+ virtual/python-futures[${PYTHON_USEDEP}]
+ dev-python/jedi[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/sh[${PYTHON_USEDEP}]
+ dev-python/waitress[${PYTHON_USEDEP}]
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ test? (
+ >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/nose-1.3.0[${PYTHON_USEDEP}]
+ >=dev-cpp/gtest-1.8.0
+ )
+"
+
+CMAKE_IN_SOURCE_BUILD=1
+CMAKE_USE_DIR=${S}/third_party/ycmd/cpp
+
+VIM_PLUGIN_HELPFILES="${PN}"
+
+src_prepare() {
+ if ! use test; then
+ sed -i '/^add_subdirectory( tests )/d' third_party/ycmd/cpp/ycm/CMakeLists.txt || die
+ fi
+
+ for third_party_module in requests pythonfutures; do
+ if [[ -d "${third_party_module}" ]]; then
+ rm -r "${S}"/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}"
+ fi
+ done
+
+ # Argparse is included in python 2.7
+ for third_party_module in argparse bottle jedi waitress sh requests; do
+ if [[ -d "${third_party_module}" ]]; then
+ rm -r "${S}"/third_party/ycmd/third_party/${third_party_module} || die "Failed to remove third party module ${third_party_module}"
+ fi
+ done
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_use clang CLANG_COMPLETER)
+ $(cmake-utils_use_use clang SYSTEM_LIBCLANG)
+ -DUSE_SYSTEM_BOOST=ON
+ -DUSE_SYSTEM_GMOCK=ON
+ )
+ cmake-utils_src_configure
+}
+
+src_test() {
+ cd "${S}/third_party/ycmd/cpp/ycm/tests" || die
+ LD_LIBRARY_PATH="${EROOT}"/usr/$(get_libdir)/llvm \
+ ./ycm_core_tests || die
+
+ cd "${S}"/python/ycm || die
+
+ local dirs=( "${S}"/third_party/*/ "${S}"/third_party/ycmd/third_party/*/ )
+ local -x PYTHONPATH=${PYTHONPATH}:$(IFS=:; echo "${dirs[*]}")
+
+ nosetests --verbose || die
+}
+
+src_install() {
+ dodoc *.md third_party/ycmd/*.md
+ rm -r *.md *.sh COPYING.txt third_party/ycmd/cpp || die
+ rm -r third_party/ycmd/{*.md,*.sh} || die
+ find python -name *test* -exec rm -rf {} + || die
+ egit_clean
+ rm third_party/ycmd/libclang.so* || die
+
+ vim-plugin_src_install
+
+ python_optimize "${ED}"
+ python_fix_shebang "${ED}"
+}
diff --git a/app-vim/zenburn-2.25 b/app-vim/zenburn-2.25
deleted file mode 100644
index b3c7d854a4b7..000000000000
--- a/app-vim/zenburn-2.25
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Low-contrast color scheme for Vim
-EAPI=6
-HOMEPAGE=https://github.com/jnurmine/Zenburn
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=GPL-1
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=https://github.com/jnurmine/Zenburn/archive/v2.25.zip -> zenburn-2.25.zip
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=a17776a3858eea144a9ef68823b5c1ee
diff --git a/app-vim/zenburn/Manifest b/app-vim/zenburn/Manifest
new file mode 100644
index 000000000000..70b1529badbd
--- /dev/null
+++ b/app-vim/zenburn/Manifest
@@ -0,0 +1,3 @@
+DIST zenburn-2.25.zip 8167 BLAKE2B 71a1a74a8ac7e76591cad3c2c9da3399aa6b5e242bec070b98486862de08c8864b824f98b2bd958e913750230202dd12b0003cda76a00fce8656c20db769f2a7 SHA512 4c448724682cc05ddcc60ed03e0368082ba42031e84960bdb21fd457daca07cfda05a54b68283b4524360bf97e0959fe018a14ea2edc5980d88b7b6b96105ce5
+EBUILD zenburn-2.25.ebuild 429 BLAKE2B 8c9e3a2cb2d66bc286d4977c5a8b58c144537b464fb8ca213ebf26aa3dc79dc5a8f142b97b0ce4b349f432efb73a76d03930289de4ab59bc180728937df33bc6 SHA512 1f04fdf364f6f309a5ccb0130734a51a152da536d81567088f9f04bf285e6fd1ae23b5363ee2941fa4266de52a3d2f5e76de33a7e31b69514de38c270ed9d6c5
+MISC metadata.xml 425 BLAKE2B 7b16c41040090b5e0c43e75db0637ef1bd38c600616499f1cbac877789ee7e78aa659c21663369a9705fe4d994986b3a1c97866efbf302052aa0f46fad5fcbe1 SHA512 66ba23df2866a13c9117fe6d51ebda94bcec609a588f1560ac5fbe86f20b6a38f279796ee2105b07fb968bd5c0e04db31b290d43dc9227540b20548af5e24025
diff --git a/app-vim/zenburn/metadata.xml b/app-vim/zenburn/metadata.xml
new file mode 100644
index 000000000000..2c84d77fc719
--- /dev/null
+++ b/app-vim/zenburn/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>monsieurp@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">jnurmine/Zenburn</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-vim/zenburn/zenburn-2.25.ebuild b/app-vim/zenburn/zenburn-2.25.ebuild
new file mode 100644
index 000000000000..ca115c1f72a5
--- /dev/null
+++ b/app-vim/zenburn/zenburn-2.25.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin
+
+MY_PN="Zenburn"
+
+DESCRIPTION="Low-contrast color scheme for Vim"
+HOMEPAGE="https://github.com/jnurmine/Zenburn"
+SRC_URI="https://github.com/jnurmine/${MY_PN}/archive/v${PV}.zip -> ${P}.zip"
+LICENSE="GPL-1"
+KEYWORDS="amd64 ppc ppc64 x86"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/app-vim/zoomwin-24 b/app-vim/zoomwin-24
deleted file mode 100644
index 5d55c107cc0a..000000000000
--- a/app-vim/zoomwin-24
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=vim plugin: brief-style window zooming
-EAPI=4
-HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=508
-KEYWORDS=alpha amd64 ia64 ~mips ppc sparc x86
-LICENSE=vim
-RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-SLOT=0
-SRC_URI=mirror://gentoo/zoomwin-24.tar.bz2 https://dev.gentoo.org/~radhermit/vim/zoomwin-24.tar.bz2
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=9c9090942b551d1f915a942c7ec77460
diff --git a/app-vim/zoomwin/Manifest b/app-vim/zoomwin/Manifest
new file mode 100644
index 000000000000..604014c295e2
--- /dev/null
+++ b/app-vim/zoomwin/Manifest
@@ -0,0 +1,3 @@
+DIST zoomwin-24.tar.bz2 7928 BLAKE2B fc841f859635c58738a52ed55fdea997eaaaa867984347a0977c0818a24517ad580bbc3386567304d5812e20fa0015fbf3cbc116b50b7a56f361d5140a25e8ab SHA512 fb20958813c1cd956c25f34c9355454b5003cf1a2d3582149c07ea3cdb4630a0407f2407f3a8f96abec37659e75facef13094d6d1ec2972b937dab8bdf9d61a9
+EBUILD zoomwin-24.ebuild 354 BLAKE2B 6cbd8a74db41da78a9c247dcc2ae90d412bda045be702a39b5685151e10df6a263aedd65fd8b849abe96cc07be055a0fdf29f797c1c8fe5fc51f7018769f80e4 SHA512 42289997c6eb206a6aba453c9b4bae5330f32227af4c5bb3c8e855bf190e0145f26082e34e4b1322656ae14c303c17090765841f1ba380aede11175ebd56d84e
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/zoomwin/metadata.xml b/app-vim/zoomwin/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/zoomwin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>vim@gentoo.org</email>
+ <name>Gentoo Vim Project</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/app-vim/zoomwin/zoomwin-24.ebuild b/app-vim/zoomwin/zoomwin-24.ebuild
new file mode 100644
index 000000000000..6b8008f13afe
--- /dev/null
+++ b/app-vim/zoomwin/zoomwin-24.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: brief-style window zooming"
+HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=508"
+LICENSE="vim"
+KEYWORDS="alpha amd64 ia64 ~mips ppc sparc x86"
+IUSE=""
+
+VIM_PLUGIN_HELPFILES="zoomwin"