subject:"\[gentoo\-commits\] proj\/gentoo\-syntax\:master commit in\: syntax\/"

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2024-03-29 Thread Michał Górny

commit: 2bbb23d32d0546e78e7ecc3b310951b86c781780
Author: TK05 <6148136+TK05  users  noreply  github  com>
AuthorDate: Fri Mar 29 07:13:28 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Mar 29 14:14:57 2024 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=2bbb23d3

Forcefully unset b:current_syntax

Closes: https://github.com/gentoo/gentoo-syntax/pull/65
Signed-off-by: Michał Górny  gentoo.org>

 syntax/ebuild.vim  | 2 +-
 syntax/gentoo-conf-d.vim   | 2 +-
 syntax/gentoo-env-d.vim| 2 +-
 syntax/gentoo-init-d.vim   | 2 +-
 syntax/gentoo-metadata.vim | 2 +-
 syntax/glep.vim| 2 +-
 syntax/guidexml.vim| 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index f998ab8..9f134ee 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -19,7 +19,7 @@ endif
 
 let is_bash=1
 runtime! syntax/sh.vim
-unlet b:current_syntax
+unlet! b:current_syntax
 
 runtime syntax/gentoo-common.vim
 

diff --git a/syntax/gentoo-conf-d.vim b/syntax/gentoo-conf-d.vim
index e00701f..25c08f3 100644
--- a/syntax/gentoo-conf-d.vim
+++ b/syntax/gentoo-conf-d.vim
@@ -19,7 +19,7 @@ endif
 
 let is_bash=1
 runtime! syntax/sh.vim
-unlet b:current_syntax
+unlet! b:current_syntax
 
 runtime syntax/gentoo-common.vim
 syn cluster shCommentGroup add=GentooBug

diff --git a/syntax/gentoo-env-d.vim b/syntax/gentoo-env-d.vim
index bbe5753..dbc2657 100644
--- a/syntax/gentoo-env-d.vim
+++ b/syntax/gentoo-env-d.vim
@@ -19,7 +19,7 @@ endif
 
 let is_bash=1
 runtime! syntax/sh.vim
-unlet b:current_syntax
+unlet! b:current_syntax
 
 runtime syntax/gentoo-common.vim
 syn cluster shCommentGroup add=GentooBug

diff --git a/syntax/gentoo-init-d.vim b/syntax/gentoo-init-d.vim
index 33bcd33..e6df59a 100644
--- a/syntax/gentoo-init-d.vim
+++ b/syntax/gentoo-init-d.vim
@@ -22,7 +22,7 @@ endif
 
 let is_bash=1
 runtime! syntax/sh.vim
-unlet b:current_syntax
+unlet! b:current_syntax
 
 runtime syntax/gentoo-common.vim
 syn cluster shCommentGroup add=GentooBug

diff --git a/syntax/gentoo-metadata.vim b/syntax/gentoo-metadata.vim
index 8cae9a2..77f0a9f 100644
--- a/syntax/gentoo-metadata.vim
+++ b/syntax/gentoo-metadata.vim
@@ -16,7 +16,7 @@ if exists("b:current_syntax")
 endif
 
 runtime! syntax/xml.vim
-unlet b:current_syntax
+unlet! b:current_syntax
 
 syn cluster xmlTagHook add=metadataElement
 

diff --git a/syntax/glep.vim b/syntax/glep.vim
index f72077f..f9bec37 100644
--- a/syntax/glep.vim
+++ b/syntax/glep.vim
@@ -17,7 +17,7 @@ if exists("b:current_syntax")
 endif
 
 runtime! syntax/rst.vim
-unlet b:current_syntax
+unlet! b:current_syntax
 
 " Headings in GLEPs (rst doesn't highlight these)
 syn match  glepHeading1 
/^\(\(-\{2,\}\|=\{2,\}\|'\{2,\}\)\n\)\S.\+\n\(-\{2,\}\|=\{2,\}\|'\{2,\}\)$/

diff --git a/syntax/guidexml.vim b/syntax/guidexml.vim
index 9750b0c..57b224f 100644
--- a/syntax/guidexml.vim
+++ b/syntax/guidexml.vim
@@ -16,7 +16,7 @@ if exists("b:current_syntax")
 endif
 
 runtime! syntax/xml.vim
-unlet b:current_syntax
+unlet! b:current_syntax
 
 syn cluster xmlTagHook add=guidexmlElement
 syn keyword guidexmlElement contained mainpage guide news title subtitle

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2023-06-14 Thread Michał Górny

commit: 865f01aa04434838f0ed1915734e2200759d925b
Author: Paul Zander  gmail  com>
AuthorDate: Wed Jun 14 12:04:40 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jun 14 14:25:31 2023 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=865f01aa

syntax/ebuild.vim: Add eqawarn

Closes: https://github.com/gentoo/gentoo-syntax/pull/62
Signed-off-by: Michał Górny  gentoo.org>

 syntax/ebuild.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 17c774c..f998ab8 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -29,7 +29,7 @@ syn match bkshFunction
"^\s*\<\h[0-9a-zA-Z_\-\.]*\>\s*()"  skipwhite skipnl conta
 
 " Default keywords
 syn keyword EbuildCoreKeyword use has_version best_version use_with use_enable
-syn keyword EbuildCoreKeyword keepdir econf die einstall einfo ewarn eerror 
diropts
+syn keyword EbuildCoreKeyword keepdir econf die einstall einfo ewarn eqawarn 
eerror diropts
 syn keyword EbuildCoreKeyword dobin docinto dodoc doexe doheader doinfo doins
 syn keyword EbuildCoreKeyword dolib dolib.a dolib.so doman dosbin dosym emake 
exeinto
 syn keyword EbuildCoreKeyword exeopts fowners fperms insinto insopts into 
libopts newbin

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2023-03-11 Thread Michał Górny

commit: 2e5d9f8dfacbabb2a929277e8cf0cb83b40aaf60
Author: Anna Vyalkova  sysrq  in>
AuthorDate: Sat Mar 11 15:18:52 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Mar 11 20:41:49 2023 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=2e5d9f8d

glep: loosen email regexp

Signed-off-by: Anna Vyalkova  sysrq.in>
Closes: https://github.com/gentoo/gentoo-syntax/pull/56
Signed-off-by: Michał Górny  gentoo.org>

 syntax/glep.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/glep.vim b/syntax/glep.vim
index f1ca81c..f72077f 100644
--- a/syntax/glep.vim
+++ b/syntax/glep.vim
@@ -36,7 +36,7 @@ syn region glepHeaders start=/\%^\(.*:\)\@=/ end=/^$/ 
contains=glepHeaderKey
 syn region glepTripleDash start=/\%^---$/ end=/^---$/ contains=glepHeaderKey
 syn region glepHeaderKey contained start=/^[A-Za-z0-9]/ end=/:/ 
nextgroup=glepHeaderValue skipwhite
 syn region glepHeaderValue contained start=/\S/ end=/^\S\|^$/me=e-1 
contains=glepHeaderEmail,glepHeaderCVSVar
-syn match  glepHeaderEmail contained /<[-a-zA-Z0-9\_\.]\+@[-a-zA-Z0-9\_\.]\+>/
+syn match  glepHeaderEmail contained 
/<[^<>@[:space:]]\+@[^<>@.[:space:]]\+\.[^<>@[:space:]]\+>/
 syn region glepHeaderCVSVar contained start=/\$\S\+:/ end=/\$/
 syn keyword glepTODO TODO FIXME

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2023-03-11 Thread Michał Górny

commit: 1cf5f4e1a4fa7f745b16e118a48e060d0f98ec2b
Author: Anna Vyalkova  sysrq  in>
AuthorDate: Sat Mar 11 16:50:52 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Mar 11 20:41:48 2023 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=1cf5f4e1

gentoo-package-common: loosen email regexp

Signed-off-by: Anna Vyalkova  sysrq.in>
Signed-off-by: Michał Górny  gentoo.org>

 syntax/gentoo-package-common.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/gentoo-package-common.vim b/syntax/gentoo-package-common.vim
index fb258c5..1d17d59 100644
--- a/syntax/gentoo-package-common.vim
+++ b/syntax/gentoo-package-common.vim
@@ -13,7 +13,7 @@ runtime syntax/gentoo-common.vim
 syn region GentooPackageComment start=/#/ end=/$/
 \ contains=GentooPackageEmail,GentooPackageDate,GentooBug
 
-syn match  GentooPackageEmail contained 
/<[a-zA-Z0-9\-\_]\+@[a-zA-Z0-9\-\_\.]\+>/
+syn match  GentooPackageEmail contained 
/<[^<>@[:space:]]\+@[^<>@.[:space:]]\+\.[^<>@[:space:]]\+>/
 syn match  GentooPackageDate  contained 
/(\(\d\d\?\s\w\+\|\w\+\s\d\d\?\)\s\d\{4\})/
 
 syn match  GentooPackageAtom /^[\ \t]*[^ \t\n#]\+\S*\/\S\+/

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2023-03-08 Thread Michał Górny

commit: 347fa38461e86eda45f10a275b038386d4f608e1
Author: Patrick McLean  sony  com>
AuthorDate: Fri Mar  3 19:09:11 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Mar  9 05:46:02 2023 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=347fa384

syntax/ebuild.vim: Add support for check-reqs.eclass

Signed-off-by: Patrick McLean  sony.com>
Closes: https://github.com/gentoo/gentoo-syntax/pull/55
Signed-off-by: Michał Górny  gentoo.org>

 syntax/ebuild.vim | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 7c6138b..17c774c 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -275,6 +275,9 @@ syn keyword EbuildTmpfilesKeyword dotmpfiles newtmpfiles 
tmpfiles_process
 syn keyword EbuildUdevKeyword get_udevdir udev_dorules udev_newrules 
udev_reload
 syn keyword EbuildDeprecatedKeyword udev_get_udevdir
 
+" check-reqs
+syn keyword EbuildCheckReqsKeyword check-reqs_pkg_setup check-reqs_pkg_pretend
+
 " EXPORT_FUNCTIONS
 syn match EbuildExportFunctions /EXPORT_FUNCTIONS/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
 syn match EbuildExportFunctionsFunc contained /\S\+\(\s\|$\)\@=/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
@@ -344,7 +347,8 @@ syn cluster EbuildThings 
add=EbuildDependApacheKeyword,EbuildApacheModuleKeyword
 syn cluster EbuildThings 
add=EbuildVirtualXKeyword,EbuildGnome2Keyword,EbuildAutoKeyword
 syn cluster EbuildThings 
add=EbuildDeprecatedKeyword,EbuildUnpackerKeyword,EbuildUserKeyword
 syn cluster EbuildThings 
add=EbuildCDROMKeyword,EbuildLinuxInfoKeyword,EbuildDistutilsFunction
-syn cluster EbuildThings 
add=EbuildCMakeKeyword,EbuildTmpfilesKeyword,EbuildUdevKeyword
+syn cluster EbuildThings 
add=EbuildCMakeKeyword,EbuildCMakeFunction,EbuildTmpfilesKeyword
+syn cluster EbuildThings add=EbuildUdevKeyword,EbuildCheckReqsKeyword
 
 syn cluster shCommandSubList add=@EbuildThings
 syn cluster shCommentGroup add=GentooBug
@@ -389,6 +393,7 @@ hi def link EbuildUserKeywordIdentifier
 hi def link EbuildCMakeKeyword   Identifier
 hi def link EbuildTmpfilesKeywordIdentifier
 hi def link EbuildUdevKeywordIdentifier
+hi def link EbuildCheckReqsKeyword   Identifier
 hi def link EbuildDistutilsFunction  Special
 
 hi def link EclassDocumentationTag   Identifier

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2023-03-08 Thread Michał Górny

commit: 9dcae15c83ee35b69320313decc42f115714cbfa
Author: Patrick McLean  sony  com>
AuthorDate: Fri Mar  3 19:08:12 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Mar  9 05:46:01 2023 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=9dcae15c

syntax/ebuild.vim: Add support for tmpfiles.eclass

Signed-off-by: Patrick McLean  sony.com>
Signed-off-by: Michał Górny  gentoo.org>

 syntax/ebuild.vim | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 0027d5c..e87e031 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -268,6 +268,9 @@ syn keyword EbuildCMakeKeyword cmake_build mycmakeargs 
MYCMAKEARGS
 syn keyword EbuildCMakeKeyword cmake_src_prepare cmake_src_configure 
cmake_src_compile
 syn keyword EbuildCMakeKeyword cmake_src_test cmake_src_install
 
+" tmpfiles
+syn keyword EbuildTmpfilesKeyword dotmpfiles newtmpfiles tmpfiles_process
+
 " EXPORT_FUNCTIONS
 syn match EbuildExportFunctions /EXPORT_FUNCTIONS/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
 syn match EbuildExportFunctionsFunc contained /\S\+\(\s\|$\)\@=/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
@@ -337,7 +340,7 @@ syn cluster EbuildThings 
add=EbuildDependApacheKeyword,EbuildApacheModuleKeyword
 syn cluster EbuildThings 
add=EbuildVirtualXKeyword,EbuildGnome2Keyword,EbuildAutoKeyword
 syn cluster EbuildThings 
add=EbuildDeprecatedKeyword,EbuildUnpackerKeyword,EbuildUserKeyword
 syn cluster EbuildThings 
add=EbuildCDROMKeyword,EbuildLinuxInfoKeyword,EbuildDistutilsFunction
-syn cluster EbuildThings add=EbuildCMakeKeyword
+syn cluster EbuildThings add=EbuildCMakeKeyword,EbuildTmpfilesKeyword
 
 syn cluster shCommandSubList add=@EbuildThings
 syn cluster shCommentGroup add=GentooBug
@@ -380,6 +383,7 @@ hi def link EbuildLinuxInfoKeyword   Identifier
 hi def link EbuildUnpackerKeywordIdentifier
 hi def link EbuildUserKeywordIdentifier
 hi def link EbuildCMakeKeyword   Identifier
+hi def link EbuildTmpfilesKeywordIdentifier
 hi def link EbuildDistutilsFunction  Special
 
 hi def link EclassDocumentationTag   Identifier

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2023-03-08 Thread Michał Górny

commit: 3af5be21dba86a4ccdc399ac39eb7ec294efe6d6
Author: Patrick McLean  sony  com>
AuthorDate: Fri Mar  3 19:06:42 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Mar  9 05:46:00 2023 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=3af5be21

syntax/ebuild.vim: Add support for cmake.eclass

Signed-off-by: Patrick McLean  sony.com>
Signed-off-by: Michał Górny  gentoo.org>

 syntax/ebuild.vim | 8 
 1 file changed, 8 insertions(+)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index c012801..0027d5c 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -262,6 +262,12 @@ syn keyword EbuildUnpackerKeyword unpack_pdv 
unpack_makeself
 syn keyword EbuildDeprecatedKeyword enewuser enewgroup
 syn keyword EbuildUserKeyword egetent
 
+" cmake
+syn keyword EbuildCMakeKeyword cmake_run_in cmake_comment_add_subdirectory 
cmake_use_find_package
+syn keyword EbuildCMakeKeyword cmake_build mycmakeargs MYCMAKEARGS
+syn keyword EbuildCMakeKeyword cmake_src_prepare cmake_src_configure 
cmake_src_compile
+syn keyword EbuildCMakeKeyword cmake_src_test cmake_src_install
+
 " EXPORT_FUNCTIONS
 syn match EbuildExportFunctions /EXPORT_FUNCTIONS/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
 syn match EbuildExportFunctionsFunc contained /\S\+\(\s\|$\)\@=/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
@@ -331,6 +337,7 @@ syn cluster EbuildThings 
add=EbuildDependApacheKeyword,EbuildApacheModuleKeyword
 syn cluster EbuildThings 
add=EbuildVirtualXKeyword,EbuildGnome2Keyword,EbuildAutoKeyword
 syn cluster EbuildThings 
add=EbuildDeprecatedKeyword,EbuildUnpackerKeyword,EbuildUserKeyword
 syn cluster EbuildThings 
add=EbuildCDROMKeyword,EbuildLinuxInfoKeyword,EbuildDistutilsFunction
+syn cluster EbuildThings add=EbuildCMakeKeyword
 
 syn cluster shCommandSubList add=@EbuildThings
 syn cluster shCommentGroup add=GentooBug
@@ -372,6 +379,7 @@ hi def link EbuildCDROMKeyword   Identifier
 hi def link EbuildLinuxInfoKeyword   Identifier
 hi def link EbuildUnpackerKeywordIdentifier
 hi def link EbuildUserKeywordIdentifier
+hi def link EbuildCMakeKeyword   Identifier
 hi def link EbuildDistutilsFunction  Special
 
 hi def link EclassDocumentationTag   Identifier

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2023-03-08 Thread Michał Górny

commit: 47e9abb525baecff9fabd4a94228acd006626e8a
Author: Patrick McLean  sony  com>
AuthorDate: Fri Mar  3 19:05:30 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Mar  9 05:45:59 2023 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=47e9abb5

syntax/ebuild.vim: Add dostrip, ver_cut, ver_rs, ver_test

Signed-off-by: Patrick McLean  sony.com>
Signed-off-by: Michał Górny  gentoo.org>

 syntax/ebuild.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 85468c9..c012801 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -38,6 +38,7 @@ syn keyword EbuildCoreKeyword doinitd doconfd doenvd domo 
dodir ebegin eend
 syn keyword EbuildCoreKeyword newconfd newdoc newenvd newinitd newlib.a 
newlib.so
 syn keyword EbuildCoreKeyword hasv usev usex elog eapply eapply_user
 syn keyword EbuildCoreKeyword einstalldocs in_iuse get_libdir
+syn keyword EbuildCoreKeyword dostrip ver_cut ver_rs ver_test
 
 " Deprecated and banned functions
 syn keyword EbuildDeprecatedKeyword check_KV dohard dohtml prepall prepalldocs

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2023-03-08 Thread Michał Górny

commit: 69a03c0912f426aba62eef8ed0368832fa376729
Author: Patrick McLean  sony  com>
AuthorDate: Fri Mar  3 19:08:49 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Mar  9 05:46:01 2023 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=69a03c09

syntax/ebuild.vim: Add support for udev.eclass

Signed-off-by: Patrick McLean  sony.com>
Signed-off-by: Michał Górny  gentoo.org>

 syntax/ebuild.vim | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index e87e031..7c6138b 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -271,6 +271,10 @@ syn keyword EbuildCMakeKeyword cmake_src_test 
cmake_src_install
 " tmpfiles
 syn keyword EbuildTmpfilesKeyword dotmpfiles newtmpfiles tmpfiles_process
 
+" udev
+syn keyword EbuildUdevKeyword get_udevdir udev_dorules udev_newrules 
udev_reload
+syn keyword EbuildDeprecatedKeyword udev_get_udevdir
+
 " EXPORT_FUNCTIONS
 syn match EbuildExportFunctions /EXPORT_FUNCTIONS/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
 syn match EbuildExportFunctionsFunc contained /\S\+\(\s\|$\)\@=/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
@@ -340,7 +344,7 @@ syn cluster EbuildThings 
add=EbuildDependApacheKeyword,EbuildApacheModuleKeyword
 syn cluster EbuildThings 
add=EbuildVirtualXKeyword,EbuildGnome2Keyword,EbuildAutoKeyword
 syn cluster EbuildThings 
add=EbuildDeprecatedKeyword,EbuildUnpackerKeyword,EbuildUserKeyword
 syn cluster EbuildThings 
add=EbuildCDROMKeyword,EbuildLinuxInfoKeyword,EbuildDistutilsFunction
-syn cluster EbuildThings add=EbuildCMakeKeyword,EbuildTmpfilesKeyword
+syn cluster EbuildThings 
add=EbuildCMakeKeyword,EbuildTmpfilesKeyword,EbuildUdevKeyword
 
 syn cluster shCommandSubList add=@EbuildThings
 syn cluster shCommentGroup add=GentooBug
@@ -384,6 +388,7 @@ hi def link EbuildUnpackerKeywordIdentifier
 hi def link EbuildUserKeywordIdentifier
 hi def link EbuildCMakeKeyword   Identifier
 hi def link EbuildTmpfilesKeywordIdentifier
+hi def link EbuildUdevKeywordIdentifier
 hi def link EbuildDistutilsFunction  Special
 
 hi def link EclassDocumentationTag   Identifier

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2023-01-31 Thread Michał Górny

commit: e6a77894505eba7d655fe99d8c84defbd2982106
Author: Sergey Alirzaev  riseup  net>
AuthorDate: Wed Feb  1 01:58:03 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Feb  1 05:00:10 2023 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=e6a77894

syntax/gentoo-make-conf: Awareness of a few more variables

PORTAGE_SCHEDULING_POLICY
BINPKG_COMPRESS
BINPKG_COMPRESS_FLAGS

Signed-off-by: Sergey Alirzaev  riseup.net>
Closes: https://github.com/gentoo/gentoo-syntax/pull/53
Signed-off-by: Michał Górny  gentoo.org>

 syntax/gentoo-make-conf.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/gentoo-make-conf.vim b/syntax/gentoo-make-conf.vim
index 80171f0..444ce14 100644
--- a/syntax/gentoo-make-conf.vim
+++ b/syntax/gentoo-make-conf.vim
@@ -31,7 +31,7 @@ syn match   GentooMakeConfEMISCIX 
/\\.\|\$\({[^}]\+}\|[a-zA-Z0-9\-\_]\+\)/ conta
 " naughty
 syn match   GentooMakeConfEMISCN 
/LDFLAGS\|ASFLAGS\|ARCH\|ELIBC\|KERNEL\|USERLAND/ contained 
nextgroup=GentooMakeConfEMISCE
 " known but not handled specially
-syn match   GentooMakeConfEMISCK 
/GENTOO_MIRRORS\|SYNC\|PORTAGE_NICENESS\|PORTDIR_OVERLAY\|PORTAGE_GPG_DIR\|PORTAGE_GPG_KEY\|SIGNED_OFF_BY\|CONFIG_PROTECT_MASK\|CONFIG_PROTECT\|FETCHCOMMAND\|RESUMECOMMAND\|AUTOCLEAN\|BUILD_PREFIX\|CBUILD\|CLEAN_DELAY\|COLLISION_IGNORE\|DISTDIR\|DOC_SYMLINKS_DIR\|EMERGE_DEFAULT_OPTS\|HTTP_PROXY\|FTP_PROXY\|NOCOLOR\|PKGDIR\|PORT_LOGDIR\|PORT_LOGDIR_CLEAN\|PORTAGE_BINHOST\|PORTAGE_BINHOST_HEADER_URI\|PORTAGE_BINPKG_FORMAT\|PORTAGE_BINPKG_TAR_OPTS\|PORTAGE_COMPRESS\|PORTAGE_COMPRESS_FLAGS\|PORTAGE_ELOG_CLASSES\|PORTAGE_ELOG_COMMAND\|PORTAGE_ELOG_MAILFROM\|PORTAGE_ELOG_MAILURI\|PORTAGE_ELOG_SYSTEM\|PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS\|PORTAGE_FETCH_RESUME_MIN_SIZE\|PORTAGE_LOGDIR\|PORTAGE_LOGDIR_CLEAN\|PORTAGE_RSYNC_EXTRA_OPTS\|PORTAGE_RSYNC_OPTS\|PORTAGE_RSYNC_INITIAL_TIMEOUT\|PORTAGE_RSYNC_RETRIES\|PORTAGE_TMPDIR\|PORTAGE_WORKDIR_MODE\|PORTDIR\|ROOT\|RSYNC_EXCLUDEFROM\|RSYNC_RETRIES\|RSYNC_TIMEOUT\|RPMDIR\|USE_ORDER\|LINGUAS\|EXTRA_ECONF\|PORTAGE_TMPFS\
 
|INSTALL_MASK\|QA_STRICT_EXECSTACK\|QA_STRICT_WX_LOAD\|QA_STRICT_TEXTRELS\|PORTAGE_IONICE_COMMAND\|PORTAGE_LOG_FILTER_FILE_CMD/
 contained nextgroup=GentooMakeConfEMISCE
+syn match   GentooMakeConfEMISCK 
/GENTOO_MIRRORS\|SYNC\|PORTAGE_NICENESS\|PORTDIR_OVERLAY\|PORTAGE_GPG_DIR\|PORTAGE_GPG_KEY\|SIGNED_OFF_BY\|CONFIG_PROTECT_MASK\|CONFIG_PROTECT\|FETCHCOMMAND\|RESUMECOMMAND\|AUTOCLEAN\|BUILD_PREFIX\|CBUILD\|CLEAN_DELAY\|COLLISION_IGNORE\|DISTDIR\|DOC_SYMLINKS_DIR\|EMERGE_DEFAULT_OPTS\|HTTP_PROXY\|FTP_PROXY\|NOCOLOR\|PKGDIR\|PORT_LOGDIR\|PORT_LOGDIR_CLEAN\|PORTAGE_BINHOST\|PORTAGE_BINHOST_HEADER_URI\|PORTAGE_BINPKG_FORMAT\|PORTAGE_BINPKG_TAR_OPTS\|PORTAGE_COMPRESS\|PORTAGE_COMPRESS_FLAGS\|PORTAGE_ELOG_CLASSES\|PORTAGE_ELOG_COMMAND\|PORTAGE_ELOG_MAILFROM\|PORTAGE_ELOG_MAILURI\|PORTAGE_ELOG_SYSTEM\|PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS\|PORTAGE_FETCH_RESUME_MIN_SIZE\|PORTAGE_LOGDIR\|PORTAGE_LOGDIR_CLEAN\|PORTAGE_RSYNC_EXTRA_OPTS\|PORTAGE_RSYNC_OPTS\|PORTAGE_RSYNC_INITIAL_TIMEOUT\|PORTAGE_RSYNC_RETRIES\|PORTAGE_TMPDIR\|PORTAGE_WORKDIR_MODE\|PORTDIR\|ROOT\|RSYNC_EXCLUDEFROM\|RSYNC_RETRIES\|RSYNC_TIMEOUT\|RPMDIR\|USE_ORDER\|LINGUAS\|EXTRA_ECONF\|PORTAGE_TMPFS\
 
|INSTALL_MASK\|QA_STRICT_EXECSTACK\|QA_STRICT_WX_LOAD\|QA_STRICT_TEXTRELS\|PORTAGE_IONICE_COMMAND\|PORTAGE_LOG_FILTER_FILE_CMD\|PORTAGE_SCHEDULING_POLICY\|BINPKG_COMPRESS\|BINPKG_COMPRESS_FLAGS/
 contained nextgroup=GentooMakeConfEMISCE
 " common eclass stuff
 syn match GentooMakeConfEMISCKE 
/EBEEP_IGNORE\|EPAUSE_IGNORE\|CHECKREQS_DONOTHING\|BREAKME\|ECHANGELOG_USER\|CCACHE_SIZE\|CCACHE_DIR\|CCACHE_SLOPPINESS\|DISTCC_DIR/
 contained nextgroup=GentooMakeConfEMISCE

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2022-07-12 Thread Michał Górny

commit: dc914aa7dd15b5e7d2779a281ac02692061b6f07
Author: Anna Vyalkova  sysrq  in>
AuthorDate: Wed Jul 13 01:05:01 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jul 13 05:21:28 2022 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=dc914aa7

syntax/ebuild: update eclassdoc syntax

* rename ECLASS-VARIABLE to ECLASS_VARIABLE
* highlight tags that don't take a value

Signed-off-by: Anna Vyalkova  sysrq.in>
Closes: https://github.com/gentoo/gentoo-syntax/pull/48
Signed-off-by: Michał Górny  gentoo.org>

 syntax/ebuild.vim | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 7578ee6..85468c9 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -267,10 +267,12 @@ syn match EbuildExportFunctionsFunc contained 
/\S\+\(\s\|$\)\@=/ skipwhite nextg
 syn match EbuildExportFunctionsFuncE contained 
/\S\+\(\s\|$\)\@=\(\${\S\+}\|pkg_pretend\|pkg_nofetch\|pkg_setup\|src_unpack\|src_prepare\|src_configure\|src_compile\|src_test\|src_install\|pkg_preinst\|pkg_postinst\|pkg_prerm\|pkg_postrm\|pkg_config\|pkg_info\)\@

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2022-05-02 Thread Michał Górny

commit: 2b77af2d85b1bdc8d78f65f41d6673c240bbc7a1
Author: WANG Xuerui  gentoo  org>
AuthorDate: Thu Feb  3 17:32:41 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May  2 19:06:37 2022 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=2b77af2d

make.conf: add loong/~loong to recognized keywords

Signed-off-by: WANG Xuerui  gentoo.org>
Closes: https://github.com/gentoo/gentoo-syntax/pull/40
Signed-off-by: Michał Górny  gentoo.org>

 syntax/gentoo-make-conf.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/gentoo-make-conf.vim b/syntax/gentoo-make-conf.vim
index b37dee3..80171f0 100644
--- a/syntax/gentoo-make-conf.vim
+++ b/syntax/gentoo-make-conf.vim
@@ -71,8 +71,8 @@ syn match   GentooMakeConfEAKE /=/ contained 
nextgroup=GentooMakeConfEAKV skipwh
 syn cluster GentooMakeConfEAKIC 
add=GentooMakeConfEAKIS,GentooMakeConfEAKIU,GentooMakeConfEAKIB,GentooMakeConfEAKIX
 syn region  GentooMakeConfEAKV contained start=/"/ end=/"/ 
contains=@GentooMakeConfEAKIC
 " do not change keyword order!
-syn match   GentooMakeConfEAKIS 
/alpha\|amd64\|amd64-fbsd\|amd64-linux\|arm\|arm64\|arm64-linux\|arm-linux\|hppa\|ia64\|m68k\|m68k-mint\|mips\|ppc\|ppc64\|ppc64-linux\|ppc-aix\|ppc-macos\|riscv\|s390\|sh\|sparc\|sparc64-solaris\|sparc-solaris\|x64-cygwin\|x64-macos\|x64-solaris\|x86\|x86-cygwin\|x86-fbsd\|x86-linux\|x86-macos\|x86-solaris\|x86-winnt/
 contained
-syn match   GentooMakeConfEAKIU 
/\~\(alpha\|amd64\|amd64-fbsd\|amd64-linux\|arm\|arm64\|arm64-linux\|arm-linux\|hppa\|ia64\|m68k\|m68k-mint\|mips\|ppc\|ppc64\|ppc64-linux\|ppc-aix\|ppc-macos\|riscv\|s390\|sh\|sparc\|sparc64-solaris\|sparc-solaris\|x64-cygwin\|x64-macos\|x64-solaris\|x86\|x86-cygwin\|x86-fbsd\|x86-linux\|x86-macos\|x86-solaris\|x86-winnt\)/
 contained
+syn match   GentooMakeConfEAKIS 
/alpha\|amd64\|amd64-fbsd\|amd64-linux\|arm\|arm64\|arm64-linux\|arm-linux\|hppa\|ia64\|loong\|m68k\|m68k-mint\|mips\|ppc\|ppc64\|ppc64-linux\|ppc-aix\|ppc-macos\|riscv\|s390\|sh\|sparc\|sparc64-solaris\|sparc-solaris\|x64-cygwin\|x64-macos\|x64-solaris\|x86\|x86-cygwin\|x86-fbsd\|x86-linux\|x86-macos\|x86-solaris\|x86-winnt/
 contained
+syn match   GentooMakeConfEAKIU 
/\~\(alpha\|amd64\|amd64-fbsd\|amd64-linux\|arm\|arm64\|arm64-linux\|arm-linux\|hppa\|ia64\|loong\|m68k\|m68k-mint\|mips\|ppc\|ppc64\|ppc64-linux\|ppc-aix\|ppc-macos\|riscv\|s390\|sh\|sparc\|sparc64-solaris\|sparc-solaris\|x64-cygwin\|x64-macos\|x64-solaris\|x86\|x86-cygwin\|x86-fbsd\|x86-linux\|x86-macos\|x86-solaris\|x86-winnt\)/
 contained
 syn match   GentooMakeConfEAKIB /-[a-zA-Z0-9\-\_]\+/ contained
 syn match   GentooMakeConfEAKIX /\\.\|\$\({[^}]\+}\|[a-zA-Z0-9\-\_]\+\)/ 
contained

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2022-02-20 Thread Michał Górny

commit: 7c4da79abe0d70a73f725d804ff06dd3f9f6a806
Author: Anna “CyberTailor”  sysrq  in>
AuthorDate: Thu Feb 17 16:18:30 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb 20 15:59:52 2022 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=7c4da79a

syntax/gentoo-make-conf: highlight F(C)FLAGS

Signed-off-by: Anna Vyalkova  sysrq.in>
Signed-off-by: Michał Górny  gentoo.org>

 syntax/gentoo-make-conf.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/syntax/gentoo-make-conf.vim b/syntax/gentoo-make-conf.vim
index d66033c..e843177 100644
--- a/syntax/gentoo-make-conf.vim
+++ b/syntax/gentoo-make-conf.vim
@@ -118,8 +118,9 @@ hi def link GentooMakeConfEAPIN Error
 hi def link GentooMakeConfEAPIX Preproc
 " }}}
 
-" C*FLAGS {{{
+" C*FLAGS and F*FLAGS {{{
 syn match   GentooMakeConfECFLAGS /C\(XX\)\?FLAGS/ contained 
nextgroup=GentooMakeConfECFLAGSE skipwhite
+syn match   GentooMakeConfECFLAGS /FC\?FLAGS/ contained 
nextgroup=GentooMakeConfECFLAGSE skipwhite
 syn match   GentooMakeConfECFLAGSE /=/ contained 
nextgroup=GentooMakeConfECFLAGSV,GentooMakeConfECFLAGSVNoQ skipwhite
 syn cluster GentooMakeConfECFLAGSIC 
add=GentooMakeConfECFLAGSIB1,GentooMakeConfECFLAGSIB2,GentooMakeConfECFLAGSIB3,GentooMakeConfECFLAGSIX
 syn region  GentooMakeConfECFLAGSV contained start=/"/ end=/"/ 
contains=@GentooMakeConfECFLAGSIC

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2022-02-20 Thread Michał Górny

commit: 8bea21a028e324ec231742f2a1e3b16bd58914dc
Author: Anna “CyberTailor”  sysrq  in>
AuthorDate: Thu Feb 17 16:45:50 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb 20 15:59:53 2022 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=8bea21a0

syntax/gentoo-make-conf: don't skipwhite to `=`

It is illegal in bash.

Signed-off-by: Anna Vyalkova  sysrq.in>
Signed-off-by: Michał Górny  gentoo.org>

 syntax/gentoo-make-conf.vim | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/syntax/gentoo-make-conf.vim b/syntax/gentoo-make-conf.vim
index 0f6cb65..e2d9db4 100644
--- a/syntax/gentoo-make-conf.vim
+++ b/syntax/gentoo-make-conf.vim
@@ -21,7 +21,7 @@ syn cluster GentooMakeConfEC 
add=GentooMakeConfEUse,GentooMakeConfEAK,GentooMake
 syn region  GentooMakeConfE start=/^/ end=/$/ 
contains=@GentooMakeConfEC,GentooMakeConfComment
 
 " MISC {{{
-syn match   GentooMakeConfEMISC /[a-zA-Z0-9\-\_]\+\([^a-zA-Z0-9\-\_]\)\@=/ 
contained nextgroup=GentooMakeConfEMISCE skipwhite
+syn match   GentooMakeConfEMISC /[a-zA-Z0-9\-\_]\+\([^a-zA-Z0-9\-\_]\)\@=/ 
contained nextgroup=GentooMakeConfEMISCE
 
 syn match   GentooMakeConfEMISCE /=/ contained 
nextgroup=GentooMakeConfEMISCV,GentooMakeConfEMISCVNoQ skipwhite
 syn region  GentooMakeConfEMISCV contained start=/"/ end=/"/ 
contains=GentooMakeConfEMISCIX
@@ -29,11 +29,11 @@ syn region  GentooMakeConfEMISCVNoQ contained start=/[^ "]/ 
end=/\s\|$/ contains
 syn match   GentooMakeConfEMISCIX /\\.\|\$\({[^}]\+}\|[a-zA-Z0-9\-\_]\+\)/ 
contained
 
 " naughty
-syn match   GentooMakeConfEMISCN 
/LDFLAGS\|ASFLAGS\|ARCH\|ELIBC\|KERNEL\|USERLAND/ contained 
nextgroup=GentooMakeConfEMISCE skipwhite
+syn match   GentooMakeConfEMISCN 
/LDFLAGS\|ASFLAGS\|ARCH\|ELIBC\|KERNEL\|USERLAND/ contained 
nextgroup=GentooMakeConfEMISCE
 " known but not handled specially
-syn match   GentooMakeConfEMISCK 
/GENTOO_MIRRORS\|SYNC\|PORTAGE_NICENESS\|PORTDIR_OVERLAY\|PORTAGE_GPG_DIR\|PORTAGE_GPG_KEY\|SIGNED_OFF_BY\|CONFIG_PROTECT_MASK\|CONFIG_PROTECT\|FETCHCOMMAND\|RESUMECOMMAND\|AUTOCLEAN\|BUILD_PREFIX\|CBUILD\|CLEAN_DELAY\|COLLISION_IGNORE\|DISTDIR\|DOC_SYMLINKS_DIR\|EMERGE_DEFAULT_OPTS\|HTTP_PROXY\|FTP_PROXY\|NOCOLOR\|PKGDIR\|PORT_LOGDIR\|PORT_LOGDIR_CLEAN\|PORTAGE_BINHOST\|PORTAGE_BINHOST_HEADER_URI\|PORTAGE_BINPKG_FORMAT\|PORTAGE_BINPKG_TAR_OPTS\|PORTAGE_COMPRESS\|PORTAGE_COMPRESS_FLAGS\|PORTAGE_ELOG_CLASSES\|PORTAGE_ELOG_COMMAND\|PORTAGE_ELOG_MAILFROM\|PORTAGE_ELOG_MAILURI\|PORTAGE_ELOG_SYSTEM\|PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS\|PORTAGE_FETCH_RESUME_MIN_SIZE\|PORTAGE_LOGDIR\|PORTAGE_LOGDIR_CLEAN\|PORTAGE_RSYNC_EXTRA_OPTS\|PORTAGE_RSYNC_OPTS\|PORTAGE_RSYNC_INITIAL_TIMEOUT\|PORTAGE_RSYNC_RETRIES\|PORTAGE_TMPDIR\|PORTAGE_WORKDIR_MODE\|PORTDIR\|ROOT\|RSYNC_EXCLUDEFROM\|RSYNC_RETRIES\|RSYNC_TIMEOUT\|RPMDIR\|USE_ORDER\|LINGUAS\|EXTRA_ECONF\|PORTAGE_TMPFS\
 
|INSTALL_MASK\|QA_STRICT_EXECSTACK\|QA_STRICT_WX_LOAD\|QA_STRICT_TEXTRELS\|PORTAGE_IONICE_COMMAND\|PORTAGE_LOG_FILTER_FILE_CMD/
 contained nextgroup=GentooMakeConfEMISCE skipwhite
+syn match   GentooMakeConfEMISCK 
/GENTOO_MIRRORS\|SYNC\|PORTAGE_NICENESS\|PORTDIR_OVERLAY\|PORTAGE_GPG_DIR\|PORTAGE_GPG_KEY\|SIGNED_OFF_BY\|CONFIG_PROTECT_MASK\|CONFIG_PROTECT\|FETCHCOMMAND\|RESUMECOMMAND\|AUTOCLEAN\|BUILD_PREFIX\|CBUILD\|CLEAN_DELAY\|COLLISION_IGNORE\|DISTDIR\|DOC_SYMLINKS_DIR\|EMERGE_DEFAULT_OPTS\|HTTP_PROXY\|FTP_PROXY\|NOCOLOR\|PKGDIR\|PORT_LOGDIR\|PORT_LOGDIR_CLEAN\|PORTAGE_BINHOST\|PORTAGE_BINHOST_HEADER_URI\|PORTAGE_BINPKG_FORMAT\|PORTAGE_BINPKG_TAR_OPTS\|PORTAGE_COMPRESS\|PORTAGE_COMPRESS_FLAGS\|PORTAGE_ELOG_CLASSES\|PORTAGE_ELOG_COMMAND\|PORTAGE_ELOG_MAILFROM\|PORTAGE_ELOG_MAILURI\|PORTAGE_ELOG_SYSTEM\|PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS\|PORTAGE_FETCH_RESUME_MIN_SIZE\|PORTAGE_LOGDIR\|PORTAGE_LOGDIR_CLEAN\|PORTAGE_RSYNC_EXTRA_OPTS\|PORTAGE_RSYNC_OPTS\|PORTAGE_RSYNC_INITIAL_TIMEOUT\|PORTAGE_RSYNC_RETRIES\|PORTAGE_TMPDIR\|PORTAGE_WORKDIR_MODE\|PORTDIR\|ROOT\|RSYNC_EXCLUDEFROM\|RSYNC_RETRIES\|RSYNC_TIMEOUT\|RPMDIR\|USE_ORDER\|LINGUAS\|EXTRA_ECONF\|PORTAGE_TMPFS\
 
|INSTALL_MASK\|QA_STRICT_EXECSTACK\|QA_STRICT_WX_LOAD\|QA_STRICT_TEXTRELS\|PORTAGE_IONICE_COMMAND\|PORTAGE_LOG_FILTER_FILE_CMD/
 contained nextgroup=GentooMakeConfEMISCE
 " common eclass stuff
-syn match GentooMakeConfEMISCKE 
/EBEEP_IGNORE\|EPAUSE_IGNORE\|CHECKREQS_DONOTHING\|BREAKME\|ECHANGELOG_USER\|CCACHE_SIZE\|CCACHE_DIR\|CCACHE_SLOPPINESS\|DISTCC_DIR/
 contained nextgroup=GentooMakeConfEMISCE skipwhite
+syn match GentooMakeConfEMISCKE 
/EBEEP_IGNORE\|EPAUSE_IGNORE\|CHECKREQS_DONOTHING\|BREAKME\|ECHANGELOG_USER\|CCACHE_SIZE\|CCACHE_DIR\|CCACHE_SLOPPINESS\|DISTCC_DIR/
 contained nextgroup=GentooMakeConfEMISCE
 
 hi def link GentooMakeConfEMISC   Keyword
 hi def link GentooMakeConfEMISCK  Identifier
@@ -46,7 +46,7 @@ hi def link GentooMakeConfEMISCIX Preproc
 " }}}
 
 " USE {{{
-syn keyword GentooMakeConfEUse USE contained nextgroup=GentooMakeConfEUseE 
skipwhite
+syn keyword

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2022-02-20 Thread Michał Górny

commit: b45300366c9dde34326336277687e28ce5568982
Author: Anna “CyberTailor”  sysrq  in>
AuthorDate: Thu Feb 17 16:54:46 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb 20 15:59:54 2022 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=b4530036

syntax/gentoo-make-conf: add ALLOW_TEST

Signed-off-by: Anna Vyalkova  sysrq.in>
Closes: https://github.com/gentoo/gentoo-syntax/pull/43
Signed-off-by: Michał Górny  gentoo.org>

 syntax/gentoo-make-conf.vim | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/syntax/gentoo-make-conf.vim b/syntax/gentoo-make-conf.vim
index e2d9db4..b37dee3 100644
--- a/syntax/gentoo-make-conf.vim
+++ b/syntax/gentoo-make-conf.vim
@@ -17,7 +17,7 @@ endif
 
 runtime syntax/gentoo-common.vim
 
-syn cluster GentooMakeConfEC 
add=GentooMakeConfEUse,GentooMakeConfEAK,GentooMakeConfEAL,GentooMakeConfEAP,GentooMakeConfECFLAGS,GentooMakeConfELDFLAGS,GentooMakeConfEMAKEOPTS,GentooMakeConfECHOST,GentooMakeConfEFEATURES,GentooMakeConfEMISC,GentooMakeConfEMISCK,GentooMakeConfEMISCKE,GentooMakeConfEMISCN
+syn cluster GentooMakeConfEC 
add=GentooMakeConfEUse,GentooMakeConfEAK,GentooMakeConfEAL,GentooMakeConfEAP,GentooMakeConfEAT,GentooMakeConfECFLAGS,GentooMakeConfELDFLAGS,GentooMakeConfEMAKEOPTS,GentooMakeConfECHOST,GentooMakeConfEFEATURES,GentooMakeConfEMISC,GentooMakeConfEMISCK,GentooMakeConfEMISCKE,GentooMakeConfEMISCN
 syn region  GentooMakeConfE start=/^/ end=/$/ 
contains=@GentooMakeConfEC,GentooMakeConfComment
 
 " MISC {{{
@@ -118,6 +118,20 @@ hi def link GentooMakeConfEAPIN Error
 hi def link GentooMakeConfEAPIX Preproc
 " }}}
 
+" ALLOW_TEST {{{
+syn match   GentooMakeConfEAT /ALLOW_TEST/ contained 
nextgroup=GentooMakeConfEATE
+syn match   GentooMakeConfEATE /=/ contained nextgroup=GentooMakeConfEATV 
skipwhite
+syn cluster GentooMakeConfEATIC add=GentooMakeConfEATIP,GentooMakeConfEATIX
+syn region  GentooMakeConfEATV contained start=/"/ end=/"/ 
contains=@GentooMakeConfEATIC
+syn match   GentooMakeConfEATIP /\s*\(network\|all\)\s*/ contained
+syn match   GentooMakeConfEATIX /\\.\|\$\({[^}]\+}\|[a-zA-Z0-9\-\_]\+\)/ 
contained
+
+hi def link GentooMakeConfEAT   Identifier
+hi def link GentooMakeConfEATV  String
+hi def link GentooMakeConfEATIP Keyword
+hi def link GentooMakeConfEATIX Preproc
+" }}}
+
 " C*FLAGS and F*FLAGS {{{
 syn match   GentooMakeConfECFLAGS /C\(XX\)\?FLAGS/ contained 
nextgroup=GentooMakeConfECFLAGSE
 syn match   GentooMakeConfECFLAGS /FC\?FLAGS/ contained 
nextgroup=GentooMakeConfECFLAGSE

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2022-02-20 Thread Michał Górny

commit: c87f5cd5cc30796e4b80cd54c7352963f5826582
Author: Anna “CyberTailor”  sysrq  in>
AuthorDate: Thu Feb 17 16:38:53 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb 20 15:59:53 2022 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=c87f5cd5

syntax/gentoo-make-conf: more known variables

New variables:
* SIGNED_OFF_BY
* PORTAGE_BINHOST_HEADER_URI
* PORTAGE_BINPKG_FORMAT
* PORTAGE_LOG_FILTER_FILE_CMD
* CCACHE_SLOPPINESS

Changes variables:
* CHECKREQS_ACTION -> CHECKREQS_DONOTHING

Signed-off-by: Anna Vyalkova  sysrq.in>
Signed-off-by: Michał Górny  gentoo.org>

 syntax/gentoo-make-conf.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/gentoo-make-conf.vim b/syntax/gentoo-make-conf.vim
index e843177..0f6cb65 100644
--- a/syntax/gentoo-make-conf.vim
+++ b/syntax/gentoo-make-conf.vim
@@ -31,9 +31,9 @@ syn match   GentooMakeConfEMISCIX 
/\\.\|\$\({[^}]\+}\|[a-zA-Z0-9\-\_]\+\)/ conta
 " naughty
 syn match   GentooMakeConfEMISCN 
/LDFLAGS\|ASFLAGS\|ARCH\|ELIBC\|KERNEL\|USERLAND/ contained 
nextgroup=GentooMakeConfEMISCE skipwhite
 " known but not handled specially
-syn match   GentooMakeConfEMISCK 
/GENTOO_MIRRORS\|SYNC\|PORTAGE_NICENESS\|PORTDIR_OVERLAY\|PORTAGE_GPG_DIR\|PORTAGE_GPG_KEY\|CONFIG_PROTECT_MASK\|CONFIG_PROTECT\|FETCHCOMMAND\|RESUMECOMMAND\|AUTOCLEAN\|BUILD_PREFIX\|CBUILD\|CLEAN_DELAY\|COLLISION_IGNORE\|DISTDIR\|DOC_SYMLINKS_DIR\|EMERGE_DEFAULT_OPTS\|HTTP_PROXY\|FTP_PROXY\|NOCOLOR\|PKGDIR\|PORT_LOGDIR\|PORT_LOGDIR_CLEAN\|PORTAGE_BINHOST\|PORTAGE_BINHOST\|PORTAGE_BINPKG_TAR_OPTS\|PORTAGE_COMPRESS\|PORTAGE_COMPRESS_FLAGS\|PORTAGE_ELOG_CLASSES\|PORTAGE_ELOG_COMMAND\|PORTAGE_ELOG_MAILFROM\|PORTAGE_ELOG_MAILURI\|PORTAGE_ELOG_SYSTEM\|PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS\|PORTAGE_FETCH_RESUME_MIN_SIZE\|PORTAGE_LOGDIR\|PORTAGE_LOGDIR_CLEAN\|PORTAGE_RSYNC_EXTRA_OPTS\|PORTAGE_RSYNC_OPTS\|PORTAGE_RSYNC_INITIAL_TIMEOUT\|PORTAGE_RSYNC_RETRIES\|PORTAGE_TMPDIR\|PORTAGE_WORKDIR_MODE\|PORTDIR\|ROOT\|RSYNC_EXCLUDEFROM\|RSYNC_RETRIES\|RSYNC_TIMEOUT\|RPMDIR\|USE_ORDER\|LINGUAS\|EXTRA_ECONF\|PORTAGE_TMPFS\|INSTALL_MASK\|QA_STRICT_EXECSTACK\|QA_STRICT_WX_
 LOAD\|QA_STRICT_TEXTRELS\|PORTAGE_IONICE_COMMAND/ contained 
nextgroup=GentooMakeConfEMISCE skipwhite
+syn match   GentooMakeConfEMISCK 
/GENTOO_MIRRORS\|SYNC\|PORTAGE_NICENESS\|PORTDIR_OVERLAY\|PORTAGE_GPG_DIR\|PORTAGE_GPG_KEY\|SIGNED_OFF_BY\|CONFIG_PROTECT_MASK\|CONFIG_PROTECT\|FETCHCOMMAND\|RESUMECOMMAND\|AUTOCLEAN\|BUILD_PREFIX\|CBUILD\|CLEAN_DELAY\|COLLISION_IGNORE\|DISTDIR\|DOC_SYMLINKS_DIR\|EMERGE_DEFAULT_OPTS\|HTTP_PROXY\|FTP_PROXY\|NOCOLOR\|PKGDIR\|PORT_LOGDIR\|PORT_LOGDIR_CLEAN\|PORTAGE_BINHOST\|PORTAGE_BINHOST_HEADER_URI\|PORTAGE_BINPKG_FORMAT\|PORTAGE_BINPKG_TAR_OPTS\|PORTAGE_COMPRESS\|PORTAGE_COMPRESS_FLAGS\|PORTAGE_ELOG_CLASSES\|PORTAGE_ELOG_COMMAND\|PORTAGE_ELOG_MAILFROM\|PORTAGE_ELOG_MAILURI\|PORTAGE_ELOG_SYSTEM\|PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS\|PORTAGE_FETCH_RESUME_MIN_SIZE\|PORTAGE_LOGDIR\|PORTAGE_LOGDIR_CLEAN\|PORTAGE_RSYNC_EXTRA_OPTS\|PORTAGE_RSYNC_OPTS\|PORTAGE_RSYNC_INITIAL_TIMEOUT\|PORTAGE_RSYNC_RETRIES\|PORTAGE_TMPDIR\|PORTAGE_WORKDIR_MODE\|PORTDIR\|ROOT\|RSYNC_EXCLUDEFROM\|RSYNC_RETRIES\|RSYNC_TIMEOUT\|RPMDIR\|USE_ORDER\|LINGUAS\|EXTRA_ECONF\|PORTAGE_TMPFS\
 
|INSTALL_MASK\|QA_STRICT_EXECSTACK\|QA_STRICT_WX_LOAD\|QA_STRICT_TEXTRELS\|PORTAGE_IONICE_COMMAND\|PORTAGE_LOG_FILTER_FILE_CMD/
 contained nextgroup=GentooMakeConfEMISCE skipwhite
 " common eclass stuff
-syn match GentooMakeConfEMISCKE 
/EBEEP_IGNORE\|EPAUSE_IGNORE\|CHECKREQS_ACTION\|BREAKME\|ECHANGELOG_USER\|CCACHE_SIZE\|CCACHE_DIR\|DISTCC_DIR/
 contained nextgroup=GentooMakeConfEMISCE skipwhite
+syn match GentooMakeConfEMISCKE 
/EBEEP_IGNORE\|EPAUSE_IGNORE\|CHECKREQS_DONOTHING\|BREAKME\|ECHANGELOG_USER\|CCACHE_SIZE\|CCACHE_DIR\|CCACHE_SLOPPINESS\|DISTCC_DIR/
 contained nextgroup=GentooMakeConfEMISCE skipwhite
 
 hi def link GentooMakeConfEMISC   Keyword
 hi def link GentooMakeConfEMISCK  Identifier

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2021-09-01 Thread Michał Górny

commit: 07f6f93065ffc2aa6fe398eebbf31013a092701b
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Sep  1 16:20:03 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Sep  1 16:20:03 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=07f6f930

Update eclassdoc tags

Signed-off-by: Michał Górny  gentoo.org>

 syntax/ebuild.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index a7edf68..7578ee6 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -267,7 +267,7 @@ syn match EbuildExportFunctionsFunc contained 
/\S\+\(\s\|$\)\@=/ skipwhite nextg
 syn match EbuildExportFunctionsFuncE contained 
/\S\+\(\s\|$\)\@=\(\${\S\+}\|pkg_pretend\|pkg_nofetch\|pkg_setup\|src_unpack\|src_prepare\|src_configure\|src_compile\|src_test\|src_install\|pkg_preinst\|pkg_postinst\|pkg_prerm\|pkg_postrm\|pkg_config\|pkg_info\)\@

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2021-04-28 Thread Michał Górny

commit: 9b016fd42ba37395d9299e1e811b282b29effb63
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Apr 28 07:26:42 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Apr 28 07:26:42 2021 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=9b016fd4

Add support for epytest & eunittest highlighting

Signed-off-by: Michał Górny  gentoo.org>

 syntax/ebuild.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index aea9e7c..a7edf68 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -183,6 +183,7 @@ syn keyword EbuildPythonKeyword python_newexe 
python_doscript python_newscript
 syn keyword EbuildPythonKeyword python_moduleinto python_domodule 
python_doheader
 syn keyword EbuildPythonKeyword python_wrapper_setup python_is_python3 
python_is_installed
 syn keyword EbuildPythonKeyword python_fix_shebang python_export_utf8_locale 
build_sphinx
+syn keyword EbuildPythonKeyword epytest eunittest
 
 " python-r1, python-single-r1 and python-any-r1
 syn keyword EbuildPythonKeyword python_gen_usedep python_gen_useflags 
python_gen_cond_dep

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2020-12-16 Thread Michał Górny

commit: 4cc031a5d3384ee9cc3225ff038a633be6b7125f
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Dec 16 13:32:05 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Dec 16 13:32:05 2020 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=4cc031a5

Revert "make use and unuse highlights always red and green"

This does not work with people with different terminal color set.

Reverts: 5cc93fd715b9d0c1d73adae904fde0767d4671a1
Signed-off-by: Michał Górny  gentoo.org>

 syntax/gentoo-make-conf.vim   | 4 ++--
 syntax/gentoo-package-use.vim | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/syntax/gentoo-make-conf.vim b/syntax/gentoo-make-conf.vim
index 89f9bc0..d66033c 100644
--- a/syntax/gentoo-make-conf.vim
+++ b/syntax/gentoo-make-conf.vim
@@ -58,8 +58,8 @@ syn match   GentooMakeConfEUseIX 
/\\.\|\$\({[^}]\+}\|[a-zA-Z0-9\-\_]\+\)/ contai
 
 hi def link GentooMakeConfEUse   Identifier
 hi def link GentooMakeConfEUseV  String
-hi def  GentooMakeConfEUseID ctermfg=Red
-hi def  GentooMakeConfEUseIE ctermfg=DarkGreen
+hi def link GentooMakeConfEUseID Keyword
+hi def link GentooMakeConfEUseIE Special
 hi def link GentooMakeConfEUseIG Preproc
 hi def link GentooMakeConfEUseIB Error
 hi def link GentooMakeConfEUseIX Preproc

diff --git a/syntax/gentoo-package-use.vim b/syntax/gentoo-package-use.vim
index 557eecd..0a97da3 100644
--- a/syntax/gentoo-package-use.vim
+++ b/syntax/gentoo-package-use.vim
@@ -33,8 +33,8 @@ syn match  GentooPackageUseExpand contained
 syn cluster GentooPackagePostAtom contains=GentooPackageUseUse,
 \ GentooPackageUseUnuse,GentooPackageUseExpand
 
-hi def  GentooPackageUseUse  ctermfg=DarkGreen
-hi def  GentooPackageUseUnusectermfg=Red
+hi def link GentooPackageUseUse  Special
+hi def link GentooPackageUseUnuseKeyword
 hi def link GentooPackageUseExpand   Type
 
 let b:current_syntax = "gentoo-package-use"

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2020-10-05 Thread Michał Górny

commit: 5cc93fd715b9d0c1d73adae904fde0767d4671a1
Author: Cássio Ribeiro Alves de Ávila  protonmail  
com>
AuthorDate: Thu Oct  1 14:12:05 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Oct  5 15:25:45 2020 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=5cc93fd7

make use and unuse highlights always red and green

Signed-off-by: Cássio Ribeiro Alves de Ávila  yandex.com>
Closes: https://github.com/gentoo/gentoo-syntax/pull/32
Signed-off-by: Michał Górny  gentoo.org>

 syntax/gentoo-make-conf.vim   | 4 ++--
 syntax/gentoo-package-use.vim | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/syntax/gentoo-make-conf.vim b/syntax/gentoo-make-conf.vim
index d66033c..89f9bc0 100644
--- a/syntax/gentoo-make-conf.vim
+++ b/syntax/gentoo-make-conf.vim
@@ -58,8 +58,8 @@ syn match   GentooMakeConfEUseIX 
/\\.\|\$\({[^}]\+}\|[a-zA-Z0-9\-\_]\+\)/ contai
 
 hi def link GentooMakeConfEUse   Identifier
 hi def link GentooMakeConfEUseV  String
-hi def link GentooMakeConfEUseID Keyword
-hi def link GentooMakeConfEUseIE Special
+hi def  GentooMakeConfEUseID ctermfg=Red
+hi def  GentooMakeConfEUseIE ctermfg=DarkGreen
 hi def link GentooMakeConfEUseIG Preproc
 hi def link GentooMakeConfEUseIB Error
 hi def link GentooMakeConfEUseIX Preproc

diff --git a/syntax/gentoo-package-use.vim b/syntax/gentoo-package-use.vim
index 0a97da3..557eecd 100644
--- a/syntax/gentoo-package-use.vim
+++ b/syntax/gentoo-package-use.vim
@@ -33,8 +33,8 @@ syn match  GentooPackageUseExpand contained
 syn cluster GentooPackagePostAtom contains=GentooPackageUseUse,
 \ GentooPackageUseUnuse,GentooPackageUseExpand
 
-hi def link GentooPackageUseUse  Special
-hi def link GentooPackageUseUnuseKeyword
+hi def  GentooPackageUseUse  ctermfg=DarkGreen
+hi def  GentooPackageUseUnusectermfg=Red
 hi def link GentooPackageUseExpand   Type
 
 let b:current_syntax = "gentoo-package-use"

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2019-12-13 Thread Michał Górny

commit: 57840aad812b8b7d0826cff78da7ade4cd8c29a8
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Dec 13 10:51:51 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Dec 13 10:51:51 2019 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=57840aad

syntax/ebuild.vim: Account for sphinx_compile_all properly

Signed-off-by: Michał Górny  gentoo.org>

 syntax/ebuild.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 1190a2a..aea9e7c 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -211,6 +211,7 @@ syn keyword EbuildDistutilsKeyword 
distutils-r1_python_prepare_all
 syn keyword EbuildDistutilsKeyword distutils-r1_python_compile
 syn keyword EbuildDistutilsKeyword distutils-r1_python_install
 syn keyword EbuildDistutilsKeyword distutils-r1_python_install_all
+syn keyword EbuildDistutilsKeyword sphinx_compile_all
 syn match EbuildDistutilsKeyword "esetup\.py"
 
 " distutils-r1 global helpers

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2019-12-12 Thread Michał Górny

commit: 7e531d18506ec307e8d5df8229ca10617caa4f5a
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Dec 13 07:16:14 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Dec 13 07:16:14 2019 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=7e531d18

syntax/ebuild.vim: Remove duplicate python_compile_all

Signed-off-by: Michał Górny  gentoo.org>

 syntax/ebuild.vim | 1 -
 1 file changed, 1 deletion(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 30b9e8b..1190a2a 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -221,7 +221,6 @@ syn keyword EbuildDistutilsKeyword distutils_enable_sphinx
 syn keyword EbuildDistutilsFunction python_prepare python_prepare_all
 syn keyword EbuildDistutilsFunction python_configure python_configure_all
 syn keyword EbuildDistutilsFunction python_compile python_compile_all
-syn keyword EbuildDistutilsFunction python_compile_all sphinx_compile_all
 syn keyword EbuildDistutilsFunction python_test python_test_all
 syn keyword EbuildDistutilsFunction python_install python_install_all

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2019-11-27 Thread Michał Górny

commit: 1594586af0f37d3df38c739279eef899724a8931
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Nov 27 08:06:38 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Nov 27 08:06:38 2019 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=1594586a

syntax/ebuild.vim: Add python_check_deps too

Signed-off-by: Michał Górny  gentoo.org>

 syntax/ebuild.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 18fb2af..694537b 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -189,6 +189,7 @@ syn keyword EbuildPythonKeyword python_gen_usedep 
python_gen_useflags python_gen
 syn keyword EbuildPythonKeyword python_gen_impl_dep python_copy_sources 
python_foreach_impl
 syn keyword EbuildPythonKeyword python_setup python_replicate_script 
python_gen_any_dep
 syn keyword EbuildPythonKeyword python-single-r1_pkg_setup 
python-any-r1_pkg_setup
+syn keyword EbuildPythonKeyword python_check_deps
 
 " deprecated functions
 syn keyword EbuildDeprecatedKeyword python_parallel_foreach_impl 
python_export_best

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2019-11-27 Thread Michał Górny

commit: 26a31e34d1fb805f9235fdc196769c0faac302a8
Author: Patrick McLean  sony  com>
AuthorDate: Tue Nov 26 22:15:22 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Nov 27 08:06:31 2019 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=26a31e34

syntax/ebuild.vim: add new helpers for distutils-r1/python-r1

Closes: https://github.com/gentoo/gentoo-syntax/pull/25
Signed-off-by: Michał Górny  gentoo.org>

 syntax/ebuild.vim | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index b6ecb06..18fb2af 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -182,7 +182,7 @@ syn keyword EbuildPythonKeyword python_optimize 
python_scriptinto python_doexe
 syn keyword EbuildPythonKeyword python_newexe python_doscript python_newscript
 syn keyword EbuildPythonKeyword python_moduleinto python_domodule 
python_doheader
 syn keyword EbuildPythonKeyword python_wrapper_setup python_is_python3 
python_is_installed
-syn keyword EbuildPythonKeyword python_fix_shebang python_export_utf8_locale
+syn keyword EbuildPythonKeyword python_fix_shebang python_export_utf8_locale 
build_sphinx
 
 " python-r1, python-single-r1 and python-any-r1
 syn keyword EbuildPythonKeyword python_gen_usedep python_gen_useflags 
python_gen_cond_dep
@@ -212,10 +212,15 @@ syn keyword EbuildDistutilsKeyword 
distutils-r1_python_install
 syn keyword EbuildDistutilsKeyword distutils-r1_python_install_all
 syn match EbuildDistutilsKeyword "esetup\.py"
 
+" distutils-r1 global helpers
+syn keyword EbuildDistutilsKeyword distutils_enable_tests
+syn keyword EbuildDistutilsKeyword distutils_enable_sphinx
+
 " distutils-r1 sub-phases
 syn keyword EbuildDistutilsFunction python_prepare python_prepare_all
 syn keyword EbuildDistutilsFunction python_configure python_configure_all
 syn keyword EbuildDistutilsFunction python_compile python_compile_all
+syn keyword EbuildDistutilsFunction python_compile_all sphinx_compile_all
 syn keyword EbuildDistutilsFunction python_test python_test_all
 syn keyword EbuildDistutilsFunction python_install python_install_all

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2019-11-27 Thread Michał Górny

commit: a94450f4f1634083999b89f0571feb9a001f537a
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Nov 27 08:07:46 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Nov 27 08:07:46 2019 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=a94450f4

syntax/ebuild.vim: Mark enewuser & enewgroup deprecated

Signed-off-by: Michał Górny  gentoo.org>

 syntax/ebuild.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 694537b..30b9e8b 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -257,7 +257,8 @@ syn keyword EbuildLinuxInfoKeyword set_arch_to_kernel 
set_arch_to_portage
 syn keyword EbuildUnpackerKeyword unpack_pdv unpack_makeself
 
 " user
-syn keyword EbuildUserKeyword egetent enewuser enewgroup
+syn keyword EbuildDeprecatedKeyword enewuser enewgroup
+syn keyword EbuildUserKeyword egetent
 
 " EXPORT_FUNCTIONS
 syn match EbuildExportFunctions /EXPORT_FUNCTIONS/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2019-09-30 Thread Michał Górny

commit: d09e3a3cf3b9c37b1cf0cd7e4952e24c46bfb9fe
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Sep 30 07:27:46 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Sep 30 07:27:46 2019 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=d09e3a3c

gentoo-mirrors: Support HTTPS, add more colors

Signed-off-by: Michał Górny  gentoo.org>

 syntax/gentoo-mirrors.vim | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/syntax/gentoo-mirrors.vim b/syntax/gentoo-mirrors.vim
index 686465b..66071d3 100644
--- a/syntax/gentoo-mirrors.vim
+++ b/syntax/gentoo-mirrors.vim
@@ -19,11 +19,17 @@ endif
 runtime syntax/gentoo-package-common.vim
 
 syn match  GentooMirrorsAtom /^[^# \t]\+/
-\ nextgroup=GentooMirrorsUrl skipwhite
-syn region GentooMirrorsUrl contained start=/\(http\|ftp\):\/\// 
end=/\(\s\)\@=\|$/
-\ nextgroup=GentooMirrorsUrl skipwhite
+\ nextgroup=GentooMirrorsHttpUrl,GentooMirrorsHttpsUrl,GentooMirrorsFtpUrl 
skipwhite
+syn region GentooMirrorsHttpUrl contained start=/http:\/\// end=/\(\s\)\@=\|$/
+\ nextgroup=GentooMirrorsHttpUrl,GentooMirrorsHttpsUrl,GentooMirrorsFtpUrl 
skipwhite
+syn region GentooMirrorsHttpsUrl contained start=/https:\/\// 
end=/\(\s\)\@=\|$/
+\ nextgroup=GentooMirrorsHttpUrl,GentooMirrorsHttpsUrl,GentooMirrorsFtpUrl 
skipwhite
+syn region GentooMirrorsFtpUrl contained start=/ftp:\/\// end=/\(\s\)\@=\|$/
+\ nextgroup=GentooMirrorsHttpUrl,GentooMirrorsHttpsUrl,GentooMirrorsFtpUrl 
skipwhite
 
 hi def link GentooMirrorsAtom Identifier
-hi def link GentooMirrorsUrl  String
+hi def link GentooMirrorsHttpUrl  String
+hi def link GentooMirrorsHttpsUrl Keyword
+hi def link GentooMirrorsFtpUrl   Special
 
 let b:current_syntax = "gentoo-mirrors"

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2019-05-25 Thread Michał Górny

commit: a58553ac4f1134655db739c67bdab7c659f72ed3
Author: Michał Górny  gentoo  org>
AuthorDate: Sat May 25 06:40:34 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat May 25 06:40:34 2019 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=a58553ac

Add PORTAGE_LOGDIR*

Closes: https://github.com/gentoo/gentoo-syntax/issues/24
Signed-off-by: Michał Górny  gentoo.org>

 syntax/gentoo-make-conf.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/gentoo-make-conf.vim b/syntax/gentoo-make-conf.vim
index 7966d4a..17f91f9 100644
--- a/syntax/gentoo-make-conf.vim
+++ b/syntax/gentoo-make-conf.vim
@@ -31,7 +31,7 @@ syn match   GentooMakeConfEMISCIX 
/\\.\|\$\({[^}]\+}\|[a-zA-Z0-9\-\_]\+\)/ conta
 " naughty
 syn match   GentooMakeConfEMISCN 
/LDFLAGS\|ASFLAGS\|ARCH\|ELIBC\|KERNEL\|USERLAND/ contained 
nextgroup=GentooMakeConfEMISCE skipwhite
 " known but not handled specially
-syn match   GentooMakeConfEMISCK 
/GENTOO_MIRRORS\|SYNC\|PORTAGE_NICENESS\|PORTDIR_OVERLAY\|PORTAGE_GPG_DIR\|PORTAGE_GPG_KEY\|CONFIG_PROTECT_MASK\|CONFIG_PROTECT\|FETCHCOMMAND\|RESUMECOMMAND\|AUTOCLEAN\|BUILD_PREFIX\|CBUILD\|CLEAN_DELAY\|COLLISION_IGNORE\|DISTDIR\|DOC_SYMLINKS_DIR\|EMERGE_DEFAULT_OPTS\|HTTP_PROXY\|FTP_PROXY\|NOCOLOR\|PKGDIR\|PORT_LOGDIR\|PORTAGE_BINHOST\|PORTAGE_BINHOST\|PORTAGE_BINPKG_TAR_OPTS\|PORTAGE_COMPRESS\|PORTAGE_COMPRESS_FLAGS\|PORTAGE_ELOG_CLASSES\|PORTAGE_ELOG_COMMAND\|PORTAGE_ELOG_MAILFROM\|PORTAGE_ELOG_MAILURI\|PORTAGE_ELOG_SYSTEM\|PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS\|PORTAGE_FETCH_RESUME_MIN_SIZE\|PORTAGE_RSYNC_EXTRA_OPTS\|PORTAGE_RSYNC_OPTS\|PORTAGE_RSYNC_INITIAL_TIMEOUT\|PORTAGE_RSYNC_RETRIES\|PORTAGE_TMPDIR\|PORTAGE_WORKDIR_MODE\|PORTDIR\|ROOT\|RSYNC_EXCLUDEFROM\|RSYNC_RETRIES\|RSYNC_TIMEOUT\|RPMDIR\|USE_ORDER\|LINGUAS\|EXTRA_ECONF\|PORTAGE_TMPFS\|INSTALL_MASK\|QA_STRICT_EXECSTACK\|QA_STRICT_WX_LOAD\|QA_STRICT_TEXTRELS\|PORTAGE_IONICE_COMMAND/
 contain
 ed nextgroup=GentooMakeConfEMISCE skipwhite
+syn match   GentooMakeConfEMISCK 
/GENTOO_MIRRORS\|SYNC\|PORTAGE_NICENESS\|PORTDIR_OVERLAY\|PORTAGE_GPG_DIR\|PORTAGE_GPG_KEY\|CONFIG_PROTECT_MASK\|CONFIG_PROTECT\|FETCHCOMMAND\|RESUMECOMMAND\|AUTOCLEAN\|BUILD_PREFIX\|CBUILD\|CLEAN_DELAY\|COLLISION_IGNORE\|DISTDIR\|DOC_SYMLINKS_DIR\|EMERGE_DEFAULT_OPTS\|HTTP_PROXY\|FTP_PROXY\|NOCOLOR\|PKGDIR\|PORT_LOGDIR\|PORT_LOGDIR_CLEAN\|PORTAGE_BINHOST\|PORTAGE_BINHOST\|PORTAGE_BINPKG_TAR_OPTS\|PORTAGE_COMPRESS\|PORTAGE_COMPRESS_FLAGS\|PORTAGE_ELOG_CLASSES\|PORTAGE_ELOG_COMMAND\|PORTAGE_ELOG_MAILFROM\|PORTAGE_ELOG_MAILURI\|PORTAGE_ELOG_SYSTEM\|PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS\|PORTAGE_FETCH_RESUME_MIN_SIZE\|PORTAGE_LOGDIR\|PORTAGE_LOGDIR_CLEAN\|PORTAGE_RSYNC_EXTRA_OPTS\|PORTAGE_RSYNC_OPTS\|PORTAGE_RSYNC_INITIAL_TIMEOUT\|PORTAGE_RSYNC_RETRIES\|PORTAGE_TMPDIR\|PORTAGE_WORKDIR_MODE\|PORTDIR\|ROOT\|RSYNC_EXCLUDEFROM\|RSYNC_RETRIES\|RSYNC_TIMEOUT\|RPMDIR\|USE_ORDER\|LINGUAS\|EXTRA_ECONF\|PORTAGE_TMPFS\|INSTALL_MASK\|QA_STRICT_EXECSTACK\|QA_STRICT_WX_
 LOAD\|QA_STRICT_TEXTRELS\|PORTAGE_IONICE_COMMAND/ contained 
nextgroup=GentooMakeConfEMISCE skipwhite
 " common eclass stuff
 syn match GentooMakeConfEMISCKE 
/EBEEP_IGNORE\|EPAUSE_IGNORE\|CHECKREQS_ACTION\|BREAKME\|ECHANGELOG_USER\|CCACHE_SIZE\|CCACHE_DIR\|DISTCC_DIR/
 contained nextgroup=GentooMakeConfEMISCE skipwhite

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2019-05-25 Thread Michał Górny

commit: 8ea63adaace0baa0ac4117523e18f120a521238f
Author: Michał Górny  gentoo  org>
AuthorDate: Sat May 25 06:44:35 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat May 25 06:44:35 2019 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=8ea63ada

make.conf: Update arch list

Signed-off-by: Michał Górny  gentoo.org>

 syntax/gentoo-make-conf.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/gentoo-make-conf.vim b/syntax/gentoo-make-conf.vim
index 17f91f9..d66033c 100644
--- a/syntax/gentoo-make-conf.vim
+++ b/syntax/gentoo-make-conf.vim
@@ -71,8 +71,8 @@ syn match   GentooMakeConfEAKE /=/ contained 
nextgroup=GentooMakeConfEAKV skipwh
 syn cluster GentooMakeConfEAKIC 
add=GentooMakeConfEAKIS,GentooMakeConfEAKIU,GentooMakeConfEAKIB,GentooMakeConfEAKIX
 syn region  GentooMakeConfEAKV contained start=/"/ end=/"/ 
contains=@GentooMakeConfEAKIC
 " do not change keyword order!
-syn match   GentooMakeConfEAKIS 
/alpha\|amd64\|arm\|hppa\|ia64\|m68k\|mips\|ppc-macos\|ppc64\|ppc\|s390\|sh\|sparc\|x86-obsd\|x86-fbsd\|x86/
 contained
-syn match   GentooMakeConfEAKIU 
/\~\(alpha\|amd64\|arm\|hppa\|ia64\|m68k\|mips\|ppc-macos\|ppc64\|ppc\|s390\|sh\|sparc\|x86-obsd\|x86-fbsd\|x86\)/
 contained
+syn match   GentooMakeConfEAKIS 
/alpha\|amd64\|amd64-fbsd\|amd64-linux\|arm\|arm64\|arm64-linux\|arm-linux\|hppa\|ia64\|m68k\|m68k-mint\|mips\|ppc\|ppc64\|ppc64-linux\|ppc-aix\|ppc-macos\|riscv\|s390\|sh\|sparc\|sparc64-solaris\|sparc-solaris\|x64-cygwin\|x64-macos\|x64-solaris\|x86\|x86-cygwin\|x86-fbsd\|x86-linux\|x86-macos\|x86-solaris\|x86-winnt/
 contained
+syn match   GentooMakeConfEAKIU 
/\~\(alpha\|amd64\|amd64-fbsd\|amd64-linux\|arm\|arm64\|arm64-linux\|arm-linux\|hppa\|ia64\|m68k\|m68k-mint\|mips\|ppc\|ppc64\|ppc64-linux\|ppc-aix\|ppc-macos\|riscv\|s390\|sh\|sparc\|sparc64-solaris\|sparc-solaris\|x64-cygwin\|x64-macos\|x64-solaris\|x86\|x86-cygwin\|x86-fbsd\|x86-linux\|x86-macos\|x86-solaris\|x86-winnt\)/
 contained
 syn match   GentooMakeConfEAKIB /-[a-zA-Z0-9\-\_]\+/ contained
 syn match   GentooMakeConfEAKIX /\\.\|\$\({[^}]\+}\|[a-zA-Z0-9\-\_]\+\)/ 
contained

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2018-09-15 Thread Michał Górny

commit: 4d59255ef1ac4ef419cc6f553056ce6b5b2bdb9b
Author: Stefan Strogin  gmail  com>
AuthorDate: Thu Sep 13 14:55:21 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Sep 15 19:18:01 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=4d59255e

syntax/ebuild: Update flag-o-matic keywords

Closes: https://github.com/gentoo/gentoo-syntax/pull/22

 syntax/ebuild.vim | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index e89d4cf..b6ecb06 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -78,9 +78,13 @@ syn keyword EbuildDeprecatedKeyword ebeep epause 
built_with_use
 " flag-o-matic
 syn keyword EbuildFlagoKeyword setup-allowed-flags filter-flags 
filter-lfs-flags append-lfs-flags
 syn keyword EbuildFlagoKeyword append-flags replace-flags replace-cpu-flags 
is-flag filter-mfpmath
-syn keyword EbuildFlagoKeyword strip-flags test_flag test_version_info 
strip-unsupported-flags get-flag
-syn keyword EbuildFlagoKeyword has_hardened has_pic has_pie has_ssp_all 
has_ssp has_m64 has_m32
-syn keyword EbuildFlagoKeyword replace-sparc64-flags append-ldflags 
filter-ldflags fstack-flags gcc2-flags
+syn keyword EbuildFlagoKeyword strip-flags test-flag test_version_info 
strip-unsupported-flags get-flag
+syn keyword EbuildFlagoKeyword replace-sparc64-flags append-ldflags 
filter-ldflags
+syn keyword EbuildFlagoKeyword append-cflags append-cppflags append-cxxflags 
append-fflags
+syn keyword EbuildFlagoKeyword is-flagq is-ldflagq is-ldflag test-flag-CC 
test-flag-CXX
+syn keyword EbuildFlagoKeyword test-flag-F77 test-flag-FC test-flags-CC 
test-flags-CXX
+syn keyword EbuildFlagoKeyword test-flags-F77 test-flags-FC test-flags 
append-libs
+syn keyword EbuildFlagoKeyword raw-ldflags no-as-needed
 
 " libtool
 syn keyword EbuildLibtoolKeyword elibtoolize uclibctoolize darwintoolize

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2018-08-21 Thread Michał Górny

commit: 2c53a6edbd65fd15397b41ff3bc1470af44d5b56
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Aug 21 08:01:42 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug 21 08:01:42 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=2c53a6ed

syntax/gentoo-package-license: Distinct hi for @group/-disable

 syntax/gentoo-package-license.vim | 15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/syntax/gentoo-package-license.vim 
b/syntax/gentoo-package-license.vim
index 7e64c73..a80c3cd 100644
--- a/syntax/gentoo-package-license.vim
+++ b/syntax/gentoo-package-license.vim
@@ -18,10 +18,17 @@ endif
 
 runtime syntax/gentoo-package-common.vim
 
-syn match  GentooPackageLicenseLicense contained 
/-\?@\?\([a-zA-Z0-9\-_.+]\+\|\*\)/
-\ nextgroup=GentooPackageLicenseLicense skipwhite
-syn cluster GentooPackagePostAtom contains=GentooPackageLicenseLicense
+syn match  GentooPackageLicenseLicense contained /\([a-zA-Z0-9\-_.+]\+\|\*\)/
+\ nextgroup=@GentooPackagePostAtom skipwhite
+syn match  GentooPackageLicenseUnLicense contained 
/-\([a-zA-Z0-9\-_.+]\+\|\*\)/
+\ nextgroup=@GentooPackagePostAtom skipwhite
+syn match  GentooPackageLicenseLicenseGroup contained /-\?@[a-zA-Z0-9\-_.+]\+/
+\ nextgroup=@GentooPackagePostAtom skipwhite
+syn cluster GentooPackagePostAtom contains=GentooPackageLicenseLicense,
+\ GentooPackageLicenseUnLicense,GentooPackageLicenseLicenseGroup
 
-hi def link GentooPackageLicenseLicense  Keyword
+hi def link GentooPackageLicenseLicense  Special
+hi def link GentooPackageLicenseUnLicenseKeyword
+hi def link GentooPackageLicenseLicenseGroup Type
 
 let b:current_syntax = "gentoo-package-license"

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2018-08-21 Thread Michał Górny

commit: 6b3d0382cbe80f40321f897bfdec93fd54a13554
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Aug 21 06:59:39 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug 21 06:59:39 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=6b3d0382

syntax/gentoo-make-conf: Remove USE_EXPAND var highlights

Bug: https://bugs.gentoo.org/588530

 syntax/gentoo-make-conf.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/gentoo-make-conf.vim b/syntax/gentoo-make-conf.vim
index 205b1ab..7966d4a 100644
--- a/syntax/gentoo-make-conf.vim
+++ b/syntax/gentoo-make-conf.vim
@@ -31,7 +31,7 @@ syn match   GentooMakeConfEMISCIX 
/\\.\|\$\({[^}]\+}\|[a-zA-Z0-9\-\_]\+\)/ conta
 " naughty
 syn match   GentooMakeConfEMISCN 
/LDFLAGS\|ASFLAGS\|ARCH\|ELIBC\|KERNEL\|USERLAND/ contained 
nextgroup=GentooMakeConfEMISCE skipwhite
 " known but not handled specially
-syn match   GentooMakeConfEMISCK 
/GENTOO_MIRRORS\|SYNC\|PORTAGE_NICENESS\|PORTDIR_OVERLAY\|PORTAGE_GPG_DIR\|PORTAGE_GPG_KEY\|CONFIG_PROTECT_MASK\|CONFIG_PROTECT\|FETCHCOMMAND\|RESUMECOMMAND\|AUTOCLEAN\|BUILD_PREFIX\|CBUILD\|CLEAN_DELAY\|COLLISION_IGNORE\|DISTDIR\|DOC_SYMLINKS_DIR\|EMERGE_DEFAULT_OPTS\|HTTP_PROXY\|FTP_PROXY\|NOCOLOR\|PKGDIR\|PORT_LOGDIR\|PORTAGE_BINHOST\|PORTAGE_BINHOST\|PORTAGE_BINPKG_TAR_OPTS\|PORTAGE_COMPRESS\|PORTAGE_COMPRESS_FLAGS\|PORTAGE_ELOG_CLASSES\|PORTAGE_ELOG_COMMAND\|PORTAGE_ELOG_MAILFROM\|PORTAGE_ELOG_MAILURI\|PORTAGE_ELOG_SYSTEM\|PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS\|PORTAGE_FETCH_RESUME_MIN_SIZE\|PORTAGE_RSYNC_EXTRA_OPTS\|PORTAGE_RSYNC_OPTS\|PORTAGE_RSYNC_INITIAL_TIMEOUT\|PORTAGE_RSYNC_RETRIES\|PORTAGE_TMPDIR\|PORTAGE_WORKDIR_MODE\|PORTDIR\|ROOT\|RSYNC_EXCLUDEFROM\|RSYNC_RETRIES\|RSYNC_TIMEOUT\|RPMDIR\|USE_ORDER\|LINGUAS\|VIDEO_CARDS\|INPUT_DEVICES\|CAMERAS\|EXTRA_ECONF\|ALSA_CARDS\|ALSA_PCM_PLUGINS\|PORTAGE_TMPFS\|INSTALL_MASK\|QA_STRICT_EXECSTACK\|QA_
 
STRICT_WX_LOAD\|QA_STRICT_TEXTRELS\|APACHE2_MODULES\|APACHE2_MPMS\|CROSSCOMPILE_OPTS\|DVB_CARDS\|FOO2ZJS_DEVICES\|LCD_DEVICES\|LIRC_DEVICES\|MISDN_CARDS\|PORTAGE_IONICE_COMMAND/
 contained nextgroup=GentooMakeConfEMISCE skipwhite
+syn match   GentooMakeConfEMISCK 
/GENTOO_MIRRORS\|SYNC\|PORTAGE_NICENESS\|PORTDIR_OVERLAY\|PORTAGE_GPG_DIR\|PORTAGE_GPG_KEY\|CONFIG_PROTECT_MASK\|CONFIG_PROTECT\|FETCHCOMMAND\|RESUMECOMMAND\|AUTOCLEAN\|BUILD_PREFIX\|CBUILD\|CLEAN_DELAY\|COLLISION_IGNORE\|DISTDIR\|DOC_SYMLINKS_DIR\|EMERGE_DEFAULT_OPTS\|HTTP_PROXY\|FTP_PROXY\|NOCOLOR\|PKGDIR\|PORT_LOGDIR\|PORTAGE_BINHOST\|PORTAGE_BINHOST\|PORTAGE_BINPKG_TAR_OPTS\|PORTAGE_COMPRESS\|PORTAGE_COMPRESS_FLAGS\|PORTAGE_ELOG_CLASSES\|PORTAGE_ELOG_COMMAND\|PORTAGE_ELOG_MAILFROM\|PORTAGE_ELOG_MAILURI\|PORTAGE_ELOG_SYSTEM\|PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS\|PORTAGE_FETCH_RESUME_MIN_SIZE\|PORTAGE_RSYNC_EXTRA_OPTS\|PORTAGE_RSYNC_OPTS\|PORTAGE_RSYNC_INITIAL_TIMEOUT\|PORTAGE_RSYNC_RETRIES\|PORTAGE_TMPDIR\|PORTAGE_WORKDIR_MODE\|PORTDIR\|ROOT\|RSYNC_EXCLUDEFROM\|RSYNC_RETRIES\|RSYNC_TIMEOUT\|RPMDIR\|USE_ORDER\|LINGUAS\|EXTRA_ECONF\|PORTAGE_TMPFS\|INSTALL_MASK\|QA_STRICT_EXECSTACK\|QA_STRICT_WX_LOAD\|QA_STRICT_TEXTRELS\|PORTAGE_IONICE_COMMAND/
 contain
 ed nextgroup=GentooMakeConfEMISCE skipwhite
 " common eclass stuff
 syn match GentooMakeConfEMISCKE 
/EBEEP_IGNORE\|EPAUSE_IGNORE\|CHECKREQS_ACTION\|BREAKME\|ECHANGELOG_USER\|CCACHE_SIZE\|CCACHE_DIR\|DISTCC_DIR/
 contained nextgroup=GentooMakeConfEMISCE skipwhite

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2018-08-21 Thread Michał Górny

commit: ad00dd068848520811e07034af2bc9fa5d2266e7
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Aug 21 07:51:10 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug 21 07:51:31 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=ad00dd06

syntax/gentoo-package-use: Support '*' and '-*' flag wildcards

 syntax/gentoo-package-use.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/gentoo-package-use.vim b/syntax/gentoo-package-use.vim
index 251367e..0a97da3 100644
--- a/syntax/gentoo-package-use.vim
+++ b/syntax/gentoo-package-use.vim
@@ -19,11 +19,11 @@ endif
 runtime syntax/gentoo-package-common.vim
 
 syn match  GentooPackageUseUse contained
-\ /[a-zA-Z0-9][a-zA-Z0-9\-_]*\(:\)\@!/
+\ /\([a-zA-Z0-9][a-zA-Z0-9\-_]*\|\*\)\(:\)\@!/
 \ nextgroup=GentooPackageUseUse,GentooPackageUseUnuse,
 \ GentooPackageUseExpand skipwhite
 syn match  GentooPackageUseUnuse contained
-\ /-[a-zA-Z0-9][a-zA-Z0-9\-_]*\(:\)\@!/
+\ /-\([a-zA-Z0-9][a-zA-Z0-9\-_]*\|\*\)\(:\)\@!/
 \ nextgroup=GentooPackageUseUse,GentooPackageUseUnuse,
 \ GentooPackageUseExpand skipwhite
 syn match  GentooPackageUseExpand contained

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2018-08-21 Thread Michał Górny

commit: 4451cbdf4026a828232ba87b73f69feed54b41ab
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Aug 21 07:10:51 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug 21 07:10:51 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=4451cbdf

syntax: Move package.*/etc. common rules to common file

 syntax/gentoo-mirrors.vim| 11 +--
 syntax/gentoo-package-common.vim | 21 +
 syntax/gentoo-package-keywords.vim   | 11 +--
 syntax/gentoo-package-license.vim| 11 +--
 syntax/gentoo-package-mask.vim   | 12 +---
 syntax/gentoo-package-properties.vim | 11 +--
 syntax/gentoo-package-use.vim| 13 +
 syntax/gentoo-use-desc.vim   |  6 +-
 8 files changed, 28 insertions(+), 68 deletions(-)

diff --git a/syntax/gentoo-mirrors.vim b/syntax/gentoo-mirrors.vim
index d5b09f6..686465b 100644
--- a/syntax/gentoo-mirrors.vim
+++ b/syntax/gentoo-mirrors.vim
@@ -16,22 +16,13 @@ if exists("b:current_syntax")
 finish
 endif
 
-runtime syntax/gentoo-common.vim
-
-syn region GentooMirrorsComment start=/#/ end=/$/
-\ contains=GentooMirrorsEmail,GentooMirrorsDate,GentooBug
-
-syn match  GentooMirrorsEmail contained 
/<[a-zA-Z0-9\-\_]\+@[a-zA-Z0-9\-\_\.]\+>/
-syn match  GentooMirrorsDate  contained 
/(\(\d\d\?\s\w\+\|\w\+\s\d\d\?\)\s\d\{4\})/
+runtime syntax/gentoo-package-common.vim
 
 syn match  GentooMirrorsAtom /^[^# \t]\+/
 \ nextgroup=GentooMirrorsUrl skipwhite
 syn region GentooMirrorsUrl contained start=/\(http\|ftp\):\/\// 
end=/\(\s\)\@=\|$/
 \ nextgroup=GentooMirrorsUrl skipwhite
 
-hi def link GentooMirrorsComment  Comment
-hi def link GentooMirrorsEmailSpecial
-hi def link GentooMirrorsDate Number
 hi def link GentooMirrorsAtom Identifier
 hi def link GentooMirrorsUrl  String
 

diff --git a/syntax/gentoo-package-common.vim b/syntax/gentoo-package-common.vim
new file mode 100644
index 000..1e8091e
--- /dev/null
+++ b/syntax/gentoo-package-common.vim
@@ -0,0 +1,21 @@
+" Vim syntax file
+" Language:Gentoo package.*/use.desc/etc. common rules
+" Author:  Michał Górny 
+" Copyright:   Copyright (c) 2018 Michał Górny
+" Licence: You may redistribute this under the same terms as Vim itself
+
+if  || v:version < 603
+finish
+endif
+
+runtime syntax/gentoo-common.vim
+
+syn region GentooPackageComment start=/#/ end=/$/
+\ contains=GentooPackageEmail,GentooPackageDate,GentooBug
+
+syn match  GentooPackageEmail contained 
/<[a-zA-Z0-9\-\_]\+@[a-zA-Z0-9\-\_\.]\+>/
+syn match  GentooPackageDate  contained 
/(\(\d\d\?\s\w\+\|\w\+\s\d\d\?\)\s\d\{4\})/
+
+hi def link GentooPackageComment  Comment
+hi def link GentooPackageEmailSpecial
+hi def link GentooPackageDate Number

diff --git a/syntax/gentoo-package-keywords.vim 
b/syntax/gentoo-package-keywords.vim
index 190954f..4315d91 100644
--- a/syntax/gentoo-package-keywords.vim
+++ b/syntax/gentoo-package-keywords.vim
@@ -16,22 +16,13 @@ if exists("b:current_syntax")
 finish
 endif
 
-runtime syntax/gentoo-common.vim
-
-syn region GentooPackageKeywordsComment start=/#/ end=/$/
-\ contains=GentooPackageKeywordsEmail,GentooPackageKeywordsDate,GentooBug
-
-syn match  GentooPackageKeywordsEmail contained 
/<[a-zA-Z0-9\-\_]\+@[a-zA-Z0-9\-\_\.]\+>/
-syn match  GentooPackageKeywordsDate  contained 
/(\(\d\d\?\s\w\+\|\w\+\s\d\d\?\)\s\d\{4\})/
+runtime syntax/gentoo-package-common.vim
 
 syn match  GentooPackageKeywordsAtom /^[\ \t]*[^ \t\n#]\+\S\+\/\S\+/
 \ nextgroup=GentooPackageKeywordsKeyword skipwhite
 syn match  GentooPackageKeywordsKeyword contained 
/-\?[-~]\?\([a-z0-9\-]\+\|\*\)/
 \ nextgroup=GentooPackageKeywordsKeyword skipwhite
 
-hi def link GentooPackageKeywordsComment  Comment
-hi def link GentooPackageKeywordsEmailSpecial
-hi def link GentooPackageKeywordsDate Number
 hi def link GentooPackageKeywordsAtom Identifier
 hi def link GentooPackageKeywordsKeyword  Keyword
 

diff --git a/syntax/gentoo-package-license.vim 
b/syntax/gentoo-package-license.vim
index 824d70a..8764a66 100644
--- a/syntax/gentoo-package-license.vim
+++ b/syntax/gentoo-package-license.vim
@@ -16,22 +16,13 @@ if exists("b:current_syntax")
 finish
 endif
 
-runtime syntax/gentoo-common.vim
-
-syn region GentooPackageLicenseComment start=/#/ end=/$/
-\ contains=GentooPackageLicenseEmail,GentooPackageLicenseDate,GentooBug
-
-syn match  GentooPackageLicenseEmail contained 
/<[a-zA-Z0-9\-\_]\+@[a-zA-Z0-9\-\_\.]\+>/
-syn match  GentooPackageLicenseDate  contained 
/(\(\d\d\?\s\w\+\|\w\+\s\d\d\?\)\s\d\{4\})/
+runtime syntax/gentoo-package-common.vim
 
 syn match  GentooPackageLicenseAtom /^[^ \t\n#]\+\S\+\/\S\+/
 \ nextgroup=GentooPackageLicenseLicense skipwhite
 syn match  GentooPackageLicenseLicense contained 
/-\?@\?\([a-zA-Z0-9\-_.+]\+\|\*\)/

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2018-08-21 Thread Michał Górny

commit: 03db9c991553a1e2db9df635bc973fa320f9d615
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Aug 21 07:23:11 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug 21 07:23:11 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=03db9c99

syntax: Move atom definition into gentoo-package-common

 syntax/gentoo-package-common.vim | 4 
 syntax/gentoo-package-keywords.vim   | 4 +---
 syntax/gentoo-package-license.vim| 4 +---
 syntax/gentoo-package-mask.vim   | 4 
 syntax/gentoo-package-properties.vim | 4 +---
 syntax/gentoo-package-use.vim| 6 ++
 6 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/syntax/gentoo-package-common.vim b/syntax/gentoo-package-common.vim
index 1e8091e..fe234c7 100644
--- a/syntax/gentoo-package-common.vim
+++ b/syntax/gentoo-package-common.vim
@@ -16,6 +16,10 @@ syn region GentooPackageComment start=/#/ end=/$/
 syn match  GentooPackageEmail contained 
/<[a-zA-Z0-9\-\_]\+@[a-zA-Z0-9\-\_\.]\+>/
 syn match  GentooPackageDate  contained 
/(\(\d\d\?\s\w\+\|\w\+\s\d\d\?\)\s\d\{4\})/
 
+syn match  GentooPackageAtom /^[\ \t]*[^ \t\n#]\+\S\+\/\S\+/
+\ nextgroup=@GentooPackagePostAtom skipwhite
+
 hi def link GentooPackageComment  Comment
 hi def link GentooPackageEmailSpecial
 hi def link GentooPackageDate Number
+hi def link GentooPackageAtom Identifier

diff --git a/syntax/gentoo-package-keywords.vim 
b/syntax/gentoo-package-keywords.vim
index 4315d91..85bc35b 100644
--- a/syntax/gentoo-package-keywords.vim
+++ b/syntax/gentoo-package-keywords.vim
@@ -18,12 +18,10 @@ endif
 
 runtime syntax/gentoo-package-common.vim
 
-syn match  GentooPackageKeywordsAtom /^[\ \t]*[^ \t\n#]\+\S\+\/\S\+/
-\ nextgroup=GentooPackageKeywordsKeyword skipwhite
 syn match  GentooPackageKeywordsKeyword contained 
/-\?[-~]\?\([a-z0-9\-]\+\|\*\)/
 \ nextgroup=GentooPackageKeywordsKeyword skipwhite
+syn cluster GentooPackagePostAtom contains=GentooPackageKeywordsKeyword
 
-hi def link GentooPackageKeywordsAtom Identifier
 hi def link GentooPackageKeywordsKeyword  Keyword
 
 let b:current_syntax = "gentoo-package-keywords"

diff --git a/syntax/gentoo-package-license.vim 
b/syntax/gentoo-package-license.vim
index 8764a66..7e64c73 100644
--- a/syntax/gentoo-package-license.vim
+++ b/syntax/gentoo-package-license.vim
@@ -18,12 +18,10 @@ endif
 
 runtime syntax/gentoo-package-common.vim
 
-syn match  GentooPackageLicenseAtom /^[^ \t\n#]\+\S\+\/\S\+/
-\ nextgroup=GentooPackageLicenseLicense skipwhite
 syn match  GentooPackageLicenseLicense contained 
/-\?@\?\([a-zA-Z0-9\-_.+]\+\|\*\)/
 \ nextgroup=GentooPackageLicenseLicense skipwhite
+syn cluster GentooPackagePostAtom contains=GentooPackageLicenseLicense
 
-hi def link GentooPackageLicenseAtom Identifier
 hi def link GentooPackageLicenseLicense  Keyword
 
 let b:current_syntax = "gentoo-package-license"

diff --git a/syntax/gentoo-package-mask.vim b/syntax/gentoo-package-mask.vim
index d08ec0e..1f4e75b 100644
--- a/syntax/gentoo-package-mask.vim
+++ b/syntax/gentoo-package-mask.vim
@@ -18,8 +18,4 @@ endif
 
 runtime syntax/gentoo-package-common.vim
 
-syn match  GentooPackageMaskAtom /^[^ \t\n#]\+\S\+\/\S\+/
-
-hi def link GentooPackageMaskAtom Identifier
-
 let b:current_syntax = "gentoo-package-mask"

diff --git a/syntax/gentoo-package-properties.vim 
b/syntax/gentoo-package-properties.vim
index faf15ad..014381a 100644
--- a/syntax/gentoo-package-properties.vim
+++ b/syntax/gentoo-package-properties.vim
@@ -18,12 +18,10 @@ endif
 
 runtime syntax/gentoo-package-common.vim
 
-syn match  GentooPackagePropertiesAtom /^[^ \t\n#]\+\S\+\/\S\+/
-\ nextgroup=GentooPackagePropertiesProperty skipwhite
 syn match  GentooPackagePropertiesProperty contained 
/-\?\([a-zA-Z0-9\-_]\+\|\*\)/
 \ nextgroup=GentooPackagePropertiesProperty skipwhite
+syn cluster GentooPackagePostAtom contains=GentooPackagePropertiesProperty
 
-hi def link GentooPackagePropertiesAtom Identifier
 hi def link GentooPackagePropertiesProperty Keyword
 
 let b:current_syntax = "gentoo-package-properties"

diff --git a/syntax/gentoo-package-use.vim b/syntax/gentoo-package-use.vim
index 7136467..30f0b95 100644
--- a/syntax/gentoo-package-use.vim
+++ b/syntax/gentoo-package-use.vim
@@ -18,9 +18,6 @@ endif
 
 runtime syntax/gentoo-package-common.vim
 
-syn match  GentooPackageUseAtom /^[^ \t\n#]\+\S\+\/\S\+/
-\ nextgroup=GentooPackageUseUse,GentooPackageUseUnuse,
-\ GentooPackageUseExpand skipwhite
 syn match  GentooPackageUseUse contained
 \ /[a-zA-Z0-9][a-zA-Z0-9\-_]*\(:\)\@!/
 \ nextgroup=GentooPackageUseUse,GentooPackageUseUnuse,
@@ -33,8 +30,9 @@ syn match  GentooPackageUseExpand contained
 \ /[a-zA-Z0-9][a-zA-Z0-9\-_]*:/
 \ nextgroup=GentooPackageUseUse,GentooPackageUseUnuse
 \ skipwhite
+syn cluster GentooPackagePostAtom

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2018-08-21 Thread Michał Górny

commit: 76c9ab7ff4535cb2cfb3d38d40adc7e7f87f96b8
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Aug 21 07:58:26 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug 21 07:58:26 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=76c9ab7f

syntax/gentoo-package-keywords: Use distinct highlights for st/~/**

 syntax/gentoo-package-keywords.vim | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/syntax/gentoo-package-keywords.vim 
b/syntax/gentoo-package-keywords.vim
index 85bc35b..95bdeeb 100644
--- a/syntax/gentoo-package-keywords.vim
+++ b/syntax/gentoo-package-keywords.vim
@@ -18,10 +18,17 @@ endif
 
 runtime syntax/gentoo-package-common.vim
 
-syn match  GentooPackageKeywordsKeyword contained 
/-\?[-~]\?\([a-z0-9\-]\+\|\*\)/
-\ nextgroup=GentooPackageKeywordsKeyword skipwhite
-syn cluster GentooPackagePostAtom contains=GentooPackageKeywordsKeyword
+syn match  GentooPackageKeywordsStableKeyword contained 
/-\?\([a-z0-9\-]\+\|\*\)/
+\ nextgroup=@GentooPackagePostAtom skipwhite
+syn match  GentooPackageKeywordsKeyword contained /-\?\~\([a-z0-9\-]\+\|\*\)/
+\ nextgroup=@GentooPackagePostAtom skipwhite
+syn match  GentooPackageKeywordsAllKeyword contained /-\?\*\*/
+\ nextgroup=@GentooPackagePostAtom skipwhite
+syn cluster GentooPackagePostAtom contains=GentooPackageKeywordsKeyword,
+\ GentooPackageKeywordsStableKeyword,GentooPackageKeywordsAllKeyword
 
 hi def link GentooPackageKeywordsKeyword  Keyword
+hi def link GentooPackageKeywordsStableKeywordSpecial
+hi def link GentooPackageKeywordsAllKeyword   Type
 
 let b:current_syntax = "gentoo-package-keywords"

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2018-08-21 Thread Michał Górny

commit: 69c62fba89217c2f9e26086d32f0e5917c7423a7
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Aug 21 07:49:17 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug 21 07:49:17 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=69c62fba

syntax/gentoo-package-use: Color USE_EXPAND distinctly

 syntax/gentoo-package-use.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/gentoo-package-use.vim b/syntax/gentoo-package-use.vim
index 30f0b95..251367e 100644
--- a/syntax/gentoo-package-use.vim
+++ b/syntax/gentoo-package-use.vim
@@ -35,6 +35,6 @@ syn cluster GentooPackagePostAtom 
contains=GentooPackageUseUse,
 
 hi def link GentooPackageUseUse  Special
 hi def link GentooPackageUseUnuseKeyword
-hi def link GentooPackageUseExpand   Statement
+hi def link GentooPackageUseExpand   Type
 
 let b:current_syntax = "gentoo-package-use"

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2018-08-21 Thread Michał Górny

commit: 3a424a1a9bc37c46fa841208a897b693eff3cf34
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Aug 21 07:39:20 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug 21 07:39:20 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=3a424a1a

syntax/gentoo-package-common: Fix handling 1-char atoms (e.g. '*')

 syntax/gentoo-package-common.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/gentoo-package-common.vim b/syntax/gentoo-package-common.vim
index fe234c7..fb258c5 100644
--- a/syntax/gentoo-package-common.vim
+++ b/syntax/gentoo-package-common.vim
@@ -16,7 +16,7 @@ syn region GentooPackageComment start=/#/ end=/$/
 syn match  GentooPackageEmail contained 
/<[a-zA-Z0-9\-\_]\+@[a-zA-Z0-9\-\_\.]\+>/
 syn match  GentooPackageDate  contained 
/(\(\d\d\?\s\w\+\|\w\+\s\d\d\?\)\s\d\{4\})/
 
-syn match  GentooPackageAtom /^[\ \t]*[^ \t\n#]\+\S\+\/\S\+/
+syn match  GentooPackageAtom /^[\ \t]*[^ \t\n#]\+\S*\/\S\+/
 \ nextgroup=@GentooPackagePostAtom skipwhite
 
 hi def link GentooPackageComment  Comment

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2018-08-20 Thread Michał Górny

commit: 47fb36a2ef522919704b0403fcc82b7e1bb8770a
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Aug 20 20:29:07 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Aug 20 20:29:27 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=47fb36a2

syntax/ebuild: Detect whitespace errors inside functions too

Bug: https://bugs.gentoo.org/637104

 syntax/ebuild.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index f9f0eba..1fb0ce4 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -320,6 +320,7 @@ syn cluster EbuildThings 
add=EbuildCDROMKeyword,EbuildLinuxInfoKeyword,EbuildDis
 syn cluster shCommandSubList add=@EbuildThings
 syn cluster shCommentGroup add=GentooBug
 syn cluster shDblQuoteList add=EbuildErrorC
+syn cluster shExprList2 add=GentooError
 
 hi def link EbuildCoreKeywordKeyword
 hi def link EbuildDeprecatedKeyword  Error

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2018-08-20 Thread Michał Górny

commit: 9b572f92349cf63d44ff457e2942838d7e1385e3
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Aug 20 20:36:07 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Aug 20 20:36:07 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=9b572f92

syntax/ebuild: Also detect whitespace errors in double quotes

Include our whitespace error thingies in the list of thingies for
double-quotes.  Sadly, the shell syntax highlighting seems to miss
a list for single quotes.

Bug: https://bugs.gentoo.org/637104

 syntax/ebuild.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 1fb0ce4..e89d4cf 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -319,7 +319,7 @@ syn cluster EbuildThings 
add=EbuildCDROMKeyword,EbuildLinuxInfoKeyword,EbuildDis
 
 syn cluster shCommandSubList add=@EbuildThings
 syn cluster shCommentGroup add=GentooBug
-syn cluster shDblQuoteList add=EbuildErrorC
+syn cluster shDblQuoteList add=EbuildErrorC,GentooError
 syn cluster shExprList2 add=GentooError
 
 hi def link EbuildCoreKeywordKeyword

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2018-08-20 Thread Michał Górny

commit: 0c91fccc7bf5477812de0438a6f7dc79fa65f5bf
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Aug 20 20:33:41 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Aug 20 20:33:55 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=0c91fccc

syntax/gentoo-common: Detect mixed tab-space indent

Bug: https://bugs.gentoo.org/637104

 syntax/gentoo-common.vim | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/syntax/gentoo-common.vim b/syntax/gentoo-common.vim
index b3e2ae8..37879b3 100644
--- a/syntax/gentoo-common.vim
+++ b/syntax/gentoo-common.vim
@@ -14,6 +14,8 @@ syn match  GentooBug contained /\(\([gG]entoo \|[dD]ebian 
\|[sS]ource[Ff]orge \)
 syn region  GentooError start=/^ / end=/$/
 " trailing whitespace
 syn match   GentooError /\s\+$/
+" mixed tab and space indentation
+syn match   GentooError /\s*\(\t \| \t\)\s*/
 
 hi def link GentooBugUnderlined
 hi def link GentooError  Error

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2018-08-20 Thread Michał Górny

commit: 6d6e37e194b230b5713cb3853e1516903342df48
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Aug 20 20:09:38 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Aug 20 20:09:38 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=6d6e37e1

syntax/ebuild: Highlight DESCRIPTION if too long

Bug: https://bugs.gentoo.org/637100

 syntax/ebuild.vim | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index a6b5299..f9f0eba 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -299,6 +299,9 @@ syn match   EbuildErrorC /`which.*`\|$(which.*)/
 " Special homepage handling
 syn match EbuildHomePageError 
/^HOMEPAGE=.*\(\${[^}]*}\?\|\([^\\]\)\@<=\$[^{]\w*\).*$/
 
+" Too long descriptions
+syn match   EbuildErrorC /^DESCRIPTION=['"].\{81,\}['"]$/
+
 " clusters
 syn cluster EbuildThings 
contains=EbuildCoreKeyword,EbuildFunctions,EbuildInherit,EbuildEutilsKeyword
 syn cluster EbuildThings 
add=EbuildLibtoolKeyword,EbuildFixHeadTailsKeyword,EbuildWebappKeyword

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2018-08-14 Thread Michał Górny

commit: 8c5364a2740f3a363e261542bb7800f7999de057
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug 12 07:30:26 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug 14 13:58:33 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=8c5364a2

syntax/ebuild.vim: Support more eclassdoc tags

Closes: https://github.com/gentoo/gentoo-syntax/pull/20

 syntax/ebuild.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index c9e8cea..a6b5299 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -255,7 +255,7 @@ syn match EbuildExportFunctionsFunc contained 
/\S\+\(\s\|$\)\@=/ skipwhite nextg
 syn match EbuildExportFunctionsFuncE contained 
/\S\+\(\s\|$\)\@=\(\${\S\+}\|pkg_pretend\|pkg_nofetch\|pkg_setup\|src_unpack\|src_prepare\|src_configure\|src_compile\|src_test\|src_install\|pkg_preinst\|pkg_postinst\|pkg_prerm\|pkg_postrm\|pkg_config\|pkg_info\)\@

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2018-08-14 Thread Michał Górny

commit: 1f9fef4cdffa63f49d0133910df0c5f527cb43f3
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Sep 15 12:56:21 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug 14 13:55:26 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=1f9fef4c

syntax/glep: Support --- around the preamble

 syntax/glep.vim | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/syntax/glep.vim b/syntax/glep.vim
index ba652e4..f1ca81c 100644
--- a/syntax/glep.vim
+++ b/syntax/glep.vim
@@ -33,6 +33,7 @@ syn region glepFoldH4 start=/^\S.\+\n'\{2,\}$/ 
end=/\(\n\n\S.\+\n[-=']\{2,\}\)\@
 
 " Headers at the top of a GLEP
 syn region glepHeaders start=/\%^\(.*:\)\@=/ end=/^$/ contains=glepHeaderKey
+syn region glepTripleDash start=/\%^---$/ end=/^---$/ contains=glepHeaderKey
 syn region glepHeaderKey contained start=/^[A-Za-z0-9]/ end=/:/ 
nextgroup=glepHeaderValue skipwhite
 syn region glepHeaderValue contained start=/\S/ end=/^\S\|^$/me=e-1 
contains=glepHeaderEmail,glepHeaderCVSVar
 syn match  glepHeaderEmail contained /<[-a-zA-Z0-9\_\.]\+@[-a-zA-Z0-9\_\.]\+>/
@@ -51,6 +52,7 @@ hi  link glepHeading4   Preproc
 hi  link glepHeading5   Special
 
 hi  link glepHeadersDefine
+hi  link glepTripleDash Define
 hi  link glepHeaderKey  Keyword
 hi  link glepHeaderValueString
 hi  link glepHeaderEmailSpecial

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2018-08-14 Thread Michał Górny

commit: 55406362c11d3178bb0a1c3774d770059fb4a90a
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Sep 15 13:02:00 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug 14 13:55:18 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=55406362

syntax/glep: Handle header continuations correctly

RFC 2822 headers are continued on the next line if it starts with
whitespace. Update the syntax highlighting to handle that correctly.

Closes: https://github.com/gentoo/gentoo-syntax/pull/15

 syntax/glep.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/glep.vim b/syntax/glep.vim
index cb2b1e7..ba652e4 100644
--- a/syntax/glep.vim
+++ b/syntax/glep.vim
@@ -34,7 +34,7 @@ syn region glepFoldH4 start=/^\S.\+\n'\{2,\}$/ 
end=/\(\n\n\S.\+\n[-=']\{2,\}\)\@
 " Headers at the top of a GLEP
 syn region glepHeaders start=/\%^\(.*:\)\@=/ end=/^$/ contains=glepHeaderKey
 syn region glepHeaderKey contained start=/^[A-Za-z0-9]/ end=/:/ 
nextgroup=glepHeaderValue skipwhite
-syn region glepHeaderValue contained start=/\S/ end=/$/ 
contains=glepHeaderEmail,glepHeaderCVSVar
+syn region glepHeaderValue contained start=/\S/ end=/^\S\|^$/me=e-1 
contains=glepHeaderEmail,glepHeaderCVSVar
 syn match  glepHeaderEmail contained /<[-a-zA-Z0-9\_\.]\+@[-a-zA-Z0-9\_\.]\+>/
 syn region glepHeaderCVSVar contained start=/\$\S\+:/ end=/\$/
 syn keyword glepTODO TODO FIXME

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2016-03-06 Thread Tim Harder

commit: 0a73aafc90fec9e9e58b41e95c5f6570b19baf48
Author: Tim Harder  gentoo  org>
AuthorDate: Sat Mar  5 23:47:10 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Mar  5 23:47:22 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=0a73aafc

syntax/ebuild: esetup.py needs to be a syntax match not keyword

Otherwise it doesn't work properly due to the '.' character.

 syntax/ebuild.vim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 3d2da4a..c9e8cea 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -201,11 +201,12 @@ syn keyword EbuildDeprecatedKeyword distutils_src_test 
distutils_src_install dis
 syn keyword EbuildDeprecatedKeyword distutils_pkg_postrm
 
 " distutils-r1
-syn keyword EbuildDistutilsKeyword esetup.py distutils_install_for_testing
+syn keyword EbuildDistutilsKeyword distutils_install_for_testing
 syn keyword EbuildDistutilsKeyword distutils-r1_python_prepare_all
 syn keyword EbuildDistutilsKeyword distutils-r1_python_compile
 syn keyword EbuildDistutilsKeyword distutils-r1_python_install
 syn keyword EbuildDistutilsKeyword distutils-r1_python_install_all
+syn match EbuildDistutilsKeyword "esetup\.py"
 
 " distutils-r1 sub-phases
 syn keyword EbuildDistutilsFunction python_prepare python_prepare_all

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2016-03-06 Thread Tim Harder

commit: 55630d84018333d6497bce79b325d981382edebc
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb 19 13:06:30 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Mar  5 23:31:10 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=55630d84

syntax/ebuild: Update for bash-completion-r1

 syntax/ebuild.vim | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index f7b1523..fa6a94f 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -114,8 +114,12 @@ syn keyword EbuildVersionatorKeyword 
delete_version_separator delete_all_version
 " cvs
 syn keyword EbuildCVSKeyword cvs_fetch cvs_src_unpack
 
-" bash-completion
-syn keyword EbuildBashCompKeyword dobashcompletion bash-completion_pkg_postinst
+" bash-completion (removed)
+syn keyword EbuildDeprecatedKeyword dobashcompletion 
bash-completion_pkg_postinst
+
+" bash-completion-r1
+syn keyword EbuildBashCompKeyword dobashcomp newbashcomp get_bashcompdir
+syn keyword EbuildBashCompKeyword get_bashhelpersdir bashcomp_alias
 
 " vim-plugin
 syn keyword EbuildVimPluginKeyword vim-plugin_src_install 
vim-plugin_pkg_postinst vim-plugin_pkg_postrm

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2016-03-06 Thread Tim Harder

commit: e786462c67ef23c547dadfa681075ada1752c0b5
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb 19 13:33:39 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Mar  5 23:31:10 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=e786462c

syntax/ebuild: Update for distutils-r1

 syntax/ebuild.vim | 25 -
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 438900f..3d2da4a 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -195,10 +195,24 @@ syn keyword EbuildPerlModuleKeyword 
perl-module_src_install perl-module_pkg_setu
 syn keyword EbuildPerlModuleKeyword perl-module_pkg_postinst 
perl-module_pkg_prerm perl-module_pkg_postrm
 syn keyword EbuildPerlModuleKeyword perlinfo fixlocalpod updatepod
 
-" distutils
-syn keyword EbuildDistutilsKeyword distutils_src_unpack distutils_src_prepare 
distutils_src_compile
-syn keyword EbuildDistutilsKeyword distutils_src_test distutils_src_install 
distutils_pkg_postinst
-syn keyword EbuildDistutilsKeyword distutils_pkg_postrm
+" distutils (deprecated)
+syn keyword EbuildDeprecatedKeyword distutils_src_unpack distutils_src_prepare 
distutils_src_compile
+syn keyword EbuildDeprecatedKeyword distutils_src_test distutils_src_install 
distutils_pkg_postinst
+syn keyword EbuildDeprecatedKeyword distutils_pkg_postrm
+
+" distutils-r1
+syn keyword EbuildDistutilsKeyword esetup.py distutils_install_for_testing
+syn keyword EbuildDistutilsKeyword distutils-r1_python_prepare_all
+syn keyword EbuildDistutilsKeyword distutils-r1_python_compile
+syn keyword EbuildDistutilsKeyword distutils-r1_python_install
+syn keyword EbuildDistutilsKeyword distutils-r1_python_install_all
+
+" distutils-r1 sub-phases
+syn keyword EbuildDistutilsFunction python_prepare python_prepare_all
+syn keyword EbuildDistutilsFunction python_configure python_configure_all
+syn keyword EbuildDistutilsFunction python_compile python_compile_all
+syn keyword EbuildDistutilsFunction python_test python_test_all
+syn keyword EbuildDistutilsFunction python_install python_install_all
 
 " depend.apache
 syn keyword EbuildDependApacheKeyword need_apache need_apache1 need_apache2
@@ -297,7 +311,7 @@ syn cluster EbuildThings 
add=EbuildPerlModuleKeyword,EbuildDistutilsKeyword
 syn cluster EbuildThings 
add=EbuildDependApacheKeyword,EbuildApacheModuleKeyword,EbuildPamKeyword
 syn cluster EbuildThings 
add=EbuildVirtualXKeyword,EbuildGnome2Keyword,EbuildAutoKeyword
 syn cluster EbuildThings 
add=EbuildDeprecatedKeyword,EbuildUnpackerKeyword,EbuildUserKeyword
-syn cluster EbuildThings add=EbuildCDROMKeyword,EbuildLinuxInfoKeyword
+syn cluster EbuildThings 
add=EbuildCDROMKeyword,EbuildLinuxInfoKeyword,EbuildDistutilsFunction
 
 syn cluster shCommandSubList add=@EbuildThings
 syn cluster shCommentGroup add=GentooBug
@@ -338,6 +352,7 @@ hi def link EbuildCDROMKeyword   Identifier
 hi def link EbuildLinuxInfoKeyword   Identifier
 hi def link EbuildUnpackerKeywordIdentifier
 hi def link EbuildUserKeywordIdentifier
+hi def link EbuildDistutilsFunction  Special
 
 hi def link EclassDocumentation  Identifier

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2016-03-06 Thread Tim Harder

commit: 0796cab42a0550d5b38109a295eeb43fe3df0506
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb 19 12:49:44 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Mar  5 23:31:10 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=0796cab4

syntax/ebuild: Add missed default_src_install

 syntax/ebuild.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 9bed29a..fdf4653 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -56,6 +56,7 @@ syn keyword EbuildFunctions pkg_info src_prepare src_configure
 syn keyword EbuildFunctions default
 syn keyword EbuildFunctions default_pkg_nofetch default_src_unpack 
default_src_prepare
 syn keyword EbuildFunctions default_src_configure default_src_compile 
default_src_test
+syn keyword EbuildFunctions default_src_install
 
 " Inherit
 syn keyword EbuildInherit inherit

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2016-03-06 Thread Tim Harder

commit: 564de7f3295ea34411b2dae1f15de01809a435e5
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb 19 13:08:29 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Mar  5 23:31:10 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=564de7f3

syntax/ebuild: Remove traces of gcc.eclass

 syntax/ebuild.vim | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 8a02f03..a23e98a 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -82,11 +82,6 @@ syn keyword EbuildFlagoKeyword strip-flags test_flag 
test_version_info strip-uns
 syn keyword EbuildFlagoKeyword has_hardened has_pic has_pie has_ssp_all 
has_ssp has_m64 has_m32
 syn keyword EbuildFlagoKeyword replace-sparc64-flags append-ldflags 
filter-ldflags fstack-flags gcc2-flags
 
-" gcc
-syn keyword EbuildGCCKeyword gcc-getCC gcc-getCXX gcc-fullversion gcc-version 
gcc-major-version
-syn keyword EbuildGCCKeyword gcc-minor-version gcc-micro-version gcc-libpath 
gcc-libstdcxx-version
-syn keyword EbuildGCCKeyword gcc-libstdcxx-major-version gcc2-flags
-
 " libtool
 syn keyword EbuildLibtoolKeyword elibtoolize uclibctoolize darwintoolize
 
@@ -277,7 +272,7 @@ syn match EbuildHomePageError 
/^HOMEPAGE=.*\(\${[^}]*}\?\|\([^\\]\)\@<=\$[^{]\w*
 " clusters
 syn cluster EbuildThings 
contains=EbuildCoreKeyword,EbuildFunctions,EbuildInherit,EbuildEutilsKeyword
 syn cluster EbuildThings 
add=EbuildLibtoolKeyword,EbuildFixHeadTailsKeyword,EbuildWebappKeyword
-syn cluster EbuildThings 
add=EbuildFlagoKeyword,EbuildError,EbuildGCCKeyword,EbuildVersionatorKeyword
+syn cluster EbuildThings 
add=EbuildFlagoKeyword,EbuildError,EbuildVersionatorKeyword
 syn cluster EbuildThings 
add=EbuildLibtoolKeyword,EbuildHomePageError,EbuildErrorC,EbuildCVSKeyword
 syn cluster EbuildThings 
add=EbuildBashCompKeyword,EbuildVimPluginKeyword,EbuildVimDocKeyword
 syn cluster EbuildThings add=EbuildFdoMimeKeyword,EbuildMultilibKeyword
@@ -300,7 +295,6 @@ hi def link EbuildInheritInclude
 
 hi def link EbuildEutilsKeyword  Identifier
 hi def link EbuildFlagoKeyword   Identifier
-hi def link EbuildGCCKeyword Identifier
 hi def link EbuildLibtoolKeyword Identifier
 hi def link EbuildFixHeadTailsKeywordIdentifier
 hi def link EbuildFdoMimeKeyword Identifier

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2016-03-06 Thread Tim Harder

commit: 9aa001065e72315399266398b3fa93a575fafe66
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb 19 12:48:27 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Mar  5 23:31:10 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=9aa00106

syntax/ebuild: Highlight banned & deprecated functions as errors

 syntax/ebuild.vim | 18 --
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index e46dffe..9bed29a 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -28,18 +28,22 @@ runtime syntax/gentoo-common.vim
 syn match bkshFunction "^\s*\<\h[0-9a-zA-Z_\-\.]*\>\s*()"  skipwhite 
skipnl contains=bkshFunctionParen
 
 " Default keywords
-syn keyword EbuildCoreKeyword use has_version best_version use_with use_enable 
check_KV
+syn keyword EbuildCoreKeyword use has_version best_version use_with use_enable
 syn keyword EbuildCoreKeyword keepdir econf die einstall einfo ewarn eerror 
diropts
-syn keyword EbuildCoreKeyword dobin docinto dodoc doexe dohard doheader dohtml 
doinfo doins
+syn keyword EbuildCoreKeyword dobin docinto dodoc doexe doheader doinfo doins
 syn keyword EbuildCoreKeyword dolib dolib.a dolib.so doman dosbin dosym emake 
exeinto
 syn keyword EbuildCoreKeyword exeopts fowners fperms insinto insopts into 
libopts newbin
-syn keyword EbuildCoreKeyword newexe newheader newins newman newsbin prepall 
prepalldocs
-syn keyword EbuildCoreKeyword prepallinfo prepallman prepallstrip has unpack 
dosed into
-syn keyword EbuildCoreKeyword doinitd doconfd doenvd dojar domo dodir ebegin 
eend
+syn keyword EbuildCoreKeyword newexe newheader newins newman newsbin has 
unpack into
+syn keyword EbuildCoreKeyword doinitd doconfd doenvd domo dodir ebegin eend
 syn keyword EbuildCoreKeyword newconfd newdoc newenvd newinitd newlib.a 
newlib.so
-syn keyword EbuildCoreKeyword hasq hasv useq usev usex elog eapply eapply_user
+syn keyword EbuildCoreKeyword hasv usev usex elog eapply eapply_user
 syn keyword EbuildCoreKeyword einstalldocs in_iuse get_libdir
 
+" Deprecated and banned functions
+syn keyword EbuildDeprecatedKeyword check_KV dohard dohtml prepall prepalldocs
+syn keyword EbuildDeprecatedKeyword prepallinfo prepallman prepallstrip dosed
+syn keyword EbuildDeprecatedKeyword dojar hasq useq
+
 " Sandbox
 syn keyword EbuildCoreKeyword addread addwrite adddeny addpredict
 
@@ -266,12 +270,14 @@ syn cluster EbuildThings 
add=EbuildSVNKeyword,EbuildAltKeyword,EbuildRPMKeyword,
 syn cluster EbuildThings 
add=EbuildCheckKernelKeyword,EbuildPerlModuleKeyword,EbuildDistutilsKeyword
 syn cluster EbuildThings 
add=EbuildDependApacheKeyword,EbuildApacheModuleKeyword,EbuildPamKeyword
 syn cluster EbuildThings 
add=EbuildVirtualXKeyword,EbuildGnome2Keyword,EbuildAutoKeyword
+syn cluster EbuildThings add=EbuildDeprecatedKeyword
 
 syn cluster shCommandSubList add=@EbuildThings
 syn cluster shCommentGroup add=GentooBug
 syn cluster shDblQuoteList add=EbuildErrorC
 
 hi def link EbuildCoreKeywordKeyword
+hi def link EbuildDeprecatedKeyword  Error
 hi def link EbuildFunctions  Special
 hi def link EbuildInheritInclude

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2016-03-06 Thread Tim Harder

commit: 7fb8792577613f0f2fb2ad5a81ed75785411d5f1
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb 19 13:07:53 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Mar  5 23:31:10 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=7fb87925

syntax/ebuild: Remove traces of 64-bit

 syntax/ebuild.vim | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index fa6a94f..8a02f03 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -138,9 +138,6 @@ syn keyword EbuildMultilibKeyword 
create_ml_includes-tidy_path create_ml_include
 syn keyword EbuildMultilibKeyword create_ml_includes-makedestdirs 
create_ml_includes-allfiles
 syn keyword EbuildMultilibKeyword create_ml_includes-sym_for_dir
 
-" 64-bit
-syn keyword Ebuild64bitKeyword 64-bit
-
 " toolchain-funcs
 syn keyword EbuildToolFuncsKeyword tc-getPROG tc-getAR tc-getAS tc-getCC 
tc-getCXX tc-getLD tc-getNM
 syn keyword EbuildToolFuncsKeyword tc-getRANLIB tc-getF77 tc-getGCJ 
tc-getBUILD_CC tc-export ninj
@@ -283,7 +280,7 @@ syn cluster EbuildThings 
add=EbuildLibtoolKeyword,EbuildFixHeadTailsKeyword,Ebui
 syn cluster EbuildThings 
add=EbuildFlagoKeyword,EbuildError,EbuildGCCKeyword,EbuildVersionatorKeyword
 syn cluster EbuildThings 
add=EbuildLibtoolKeyword,EbuildHomePageError,EbuildErrorC,EbuildCVSKeyword
 syn cluster EbuildThings 
add=EbuildBashCompKeyword,EbuildVimPluginKeyword,EbuildVimDocKeyword
-syn cluster EbuildThings 
add=EbuildFdoMimeKeyword,EbuildMultilibKeyword,Ebuild64bitKeyword
+syn cluster EbuildThings add=EbuildFdoMimeKeyword,EbuildMultilibKeyword
 syn cluster EbuildThings 
add=EbuildCronKeyword,EbuildGamesKeyword,EbuildToolFuncsKeyword
 syn cluster EbuildThings 
add=EbuildSVNKeyword,EbuildAltKeyword,EbuildRPMKeyword,EbuildPythonKeyword
 syn cluster EbuildThings 
add=EbuildCheckKernelKeyword,EbuildPerlModuleKeyword,EbuildDistutilsKeyword
@@ -314,7 +311,6 @@ hi def link EbuildBashCompKeywordIdentifier
 hi def link EbuildVimPluginKeyword   Identifier
 hi def link EbuildVimDocKeyword  Identifier
 hi def link EbuildMultilibKeywordIdentifier
-hi def link Ebuild64bitKeyword   Identifier
 hi def link EbuildCronKeywordIdentifier
 hi def link EbuildGamesKeyword   Identifier
 hi def link EbuildToolFuncsKeyword   Identifier

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2016-03-06 Thread Tim Harder

commit: e9f8dd3f758c000d4eb90c3ec08530adc3135096
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb 19 13:09:40 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Mar  5 23:31:10 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=e9f8dd3f

syntax/ebuild: Deprecate games.eclass keywords

 syntax/ebuild.vim | 13 ++---
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index a23e98a..ca134ac 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -143,11 +143,11 @@ syn keyword EbuildToolFuncsKeyword gcc-minor-version 
gcc-micro-version gen_usr_l
 " cron
 syn keyword EbuildCronKeyword docrondir docron docrontab cron_pkg_postinst
 
-" games
-syn keyword EbuildGamesKeyword egamesconf egamesinstall gameswrapper 
dogamesbin dogamessbin dogameslib
-syn keyword EbuildGamesKeyword dogameslib.a dogameslib.so newgamesbin 
newgamessbin gamesowners gamesperms
-syn keyword EbuildGamesKeyword prepgamesdirs gamesenv games_pkg_setup 
games_src_compile games_pkg_postinst
-syn keyword EbuildGamesKeyword games_ut_unpack games_umod_unpack 
games_make_wrapper
+" games (deprecated)
+syn keyword EbuildDeprecatedKeyword egamesconf egamesinstall gameswrapper 
dogamesbin dogamessbin dogameslib
+syn keyword EbuildDeprecatedKeyword dogameslib.a dogameslib.so newgamesbin 
newgamessbin gamesowners gamesperms
+syn keyword EbuildDeprecatedKeyword prepgamesdirs gamesenv games_pkg_setup 
games_src_compile games_pkg_postinst
+syn keyword EbuildDeprecatedKeyword games_ut_unpack games_umod_unpack 
games_make_wrapper
 
 " subversion
 syn keyword EbuildSVNKeyword subversion_fetch subversion_bootstrap 
subversion_src_unpack
@@ -276,7 +276,7 @@ syn cluster EbuildThings 
add=EbuildFlagoKeyword,EbuildError,EbuildVersionatorKey
 syn cluster EbuildThings 
add=EbuildLibtoolKeyword,EbuildHomePageError,EbuildErrorC,EbuildCVSKeyword
 syn cluster EbuildThings 
add=EbuildBashCompKeyword,EbuildVimPluginKeyword,EbuildVimDocKeyword
 syn cluster EbuildThings add=EbuildFdoMimeKeyword,EbuildMultilibKeyword
-syn cluster EbuildThings 
add=EbuildCronKeyword,EbuildGamesKeyword,EbuildToolFuncsKeyword
+syn cluster EbuildThings add=EbuildCronKeyword,EbuildToolFuncsKeyword
 syn cluster EbuildThings 
add=EbuildSVNKeyword,EbuildAltKeyword,EbuildRPMKeyword,EbuildPythonKeyword
 syn cluster EbuildThings 
add=EbuildCheckKernelKeyword,EbuildPerlModuleKeyword,EbuildDistutilsKeyword
 syn cluster EbuildThings 
add=EbuildDependApacheKeyword,EbuildApacheModuleKeyword,EbuildPamKeyword
@@ -306,7 +306,6 @@ hi def link EbuildVimPluginKeyword   Identifier
 hi def link EbuildVimDocKeyword  Identifier
 hi def link EbuildMultilibKeywordIdentifier
 hi def link EbuildCronKeywordIdentifier
-hi def link EbuildGamesKeyword   Identifier
 hi def link EbuildToolFuncsKeyword   Identifier
 hi def link EbuildSVNKeyword Identifier
 hi def link EbuildAltKeyword Identifier

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2016-03-06 Thread Tim Harder

commit: 3a75be9bb83536b36bd9a6d6e747158dce5d30aa
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb 19 13:28:07 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Mar  5 23:31:10 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=3a75be9b

syntax/ebuild: Remove traces of check-kernel.eclass

 syntax/ebuild.vim | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index d690629..438900f 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -189,10 +189,6 @@ syn keyword EbuildPythonKeyword python-single-r1_pkg_setup 
python-any-r1_pkg_set
 " deprecated functions
 syn keyword EbuildDeprecatedKeyword python_parallel_foreach_impl 
python_export_best
 
-" check-kernel
-syn keyword EbuildCheckKernelKeyword check_version_h get_KV_info is_2_4_kernel 
is_2_5_kernel is_2_6_kernel
-syn keyword EbuildCheckKernelKeyword kernel_supports_modules
-
 " perl-module
 syn keyword EbuildPerlModuleKeyword perl-module_src_prep 
perl-module_src_compile perl-module_src_test
 syn keyword EbuildPerlModuleKeyword perl-module_src_install 
perl-module_pkg_setup perl-module_pkg_preinst
@@ -297,7 +293,7 @@ syn cluster EbuildThings 
add=EbuildBashCompKeyword,EbuildVimPluginKeyword,Ebuild
 syn cluster EbuildThings add=EbuildFdoMimeKeyword,EbuildMultilibKeyword
 syn cluster EbuildThings add=EbuildCronKeyword,EbuildToolFuncsKeyword
 syn cluster EbuildThings 
add=EbuildSVNKeyword,EbuildAltKeyword,EbuildRPMKeyword,EbuildPythonKeyword
-syn cluster EbuildThings 
add=EbuildCheckKernelKeyword,EbuildPerlModuleKeyword,EbuildDistutilsKeyword
+syn cluster EbuildThings add=EbuildPerlModuleKeyword,EbuildDistutilsKeyword
 syn cluster EbuildThings 
add=EbuildDependApacheKeyword,EbuildApacheModuleKeyword,EbuildPamKeyword
 syn cluster EbuildThings 
add=EbuildVirtualXKeyword,EbuildGnome2Keyword,EbuildAutoKeyword
 syn cluster EbuildThings 
add=EbuildDeprecatedKeyword,EbuildUnpackerKeyword,EbuildUserKeyword
@@ -330,7 +326,6 @@ hi def link EbuildSVNKeyword Identifier
 hi def link EbuildAltKeyword Identifier
 hi def link EbuildRPMKeyword Identifier
 hi def link EbuildPythonKeyword  Identifier
-hi def link EbuildCheckKernelKeyword Identifier
 hi def link EbuildPerlModuleKeyword  Identifier
 hi def link EbuildDistutilsKeyword   Identifier
 hi def link EbuildDependApacheKeywordIdentifier

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2016-03-06 Thread Tim Harder

commit: 9216ee5b0ccc95b0c122523c7470e9adce870742
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb 19 13:27:38 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Mar  5 23:31:10 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=9216ee5b

syntax/ebuild: Update for python-r1

 syntax/ebuild.vim | 39 +--
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index ca134ac..d690629 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -159,16 +159,35 @@ syn keyword EbuildAltKeyword alternatives_pkg_postrm
 " rpm
 syn keyword EbuildRPMKeyword rpm_unpack rpm_src_unpack
 
-" python
-syn keyword EbuildPythonKeyword python_pkg_setup python_convert_shebangs 
python_clean_installation_image
-syn keyword EbuildPythonKeyword python_src_prepare python_src_configure 
python_src_compile python_src_test
-syn keyword EbuildPythonKeyword python_src_install python_execute_function 
python_copy_sources
-syn keyword EbuildPythonKeyword python_generate_wrapper_scripts 
python_set_active_version python_need_rebuild
-syn keyword EbuildPythonKeyword PYTHON python_get_implementation 
python_get_implementational_package
-syn keyword EbuildPythonKeyword python_get_includedir python_get_libdir 
python_get_sitedir python_get_library
-syn keyword EbuildPythonKeyword python_get_version python_execute_nosetests 
python_execute_py.test
-syn keyword EbuildPythonKeyword python_execute_trial python_enable_pyc 
python_disable_pyc python_mod_optimize
-syn keyword EbuildPythonKeyword python_mod_cleanup
+" python (deprecated)
+syn keyword EbuildDeprecatedKeyword python_pkg_setup python_convert_shebangs 
python_clean_installation_image
+syn keyword EbuildDeprecatedKeyword python_src_prepare python_src_configure 
python_src_compile python_src_test
+syn keyword EbuildDeprecatedKeyword python_src_install python_execute_function
+syn keyword EbuildDeprecatedKeyword python_generate_wrapper_scripts 
python_set_active_version python_need_rebuild
+syn keyword EbuildDeprecatedKeyword PYTHON python_get_implementation 
python_get_implementational_package
+syn keyword EbuildDeprecatedKeyword python_get_libdir python_get_library
+syn keyword EbuildDeprecatedKeyword python_get_version 
python_execute_nosetests python_execute_py.test
+syn keyword EbuildDeprecatedKeyword python_execute_trial python_enable_pyc 
python_disable_pyc python_mod_optimize
+syn keyword EbuildDeprecatedKeyword python_mod_cleanup
+
+" python-utils-r1
+syn keyword EbuildPythonKeyword python_export python_get_sitedir 
python_get_includedir
+syn keyword EbuildPythonKeyword python_get_library_path python_get_CFLAGS 
python_get_LIBS
+syn keyword EbuildPythonKeyword python_get_PYTHON_CONFIG python_get_scriptdir
+syn keyword EbuildPythonKeyword python_optimize python_scriptinto python_doexe
+syn keyword EbuildPythonKeyword python_newexe python_doscript python_newscript
+syn keyword EbuildPythonKeyword python_moduleinto python_domodule 
python_doheader
+syn keyword EbuildPythonKeyword python_wrapper_setup python_is_python3 
python_is_installed
+syn keyword EbuildPythonKeyword python_fix_shebang python_export_utf8_locale
+
+" python-r1, python-single-r1 and python-any-r1
+syn keyword EbuildPythonKeyword python_gen_usedep python_gen_useflags 
python_gen_cond_dep
+syn keyword EbuildPythonKeyword python_gen_impl_dep python_copy_sources 
python_foreach_impl
+syn keyword EbuildPythonKeyword python_setup python_replicate_script 
python_gen_any_dep
+syn keyword EbuildPythonKeyword python-single-r1_pkg_setup 
python-any-r1_pkg_setup
+
+" deprecated functions
+syn keyword EbuildDeprecatedKeyword python_parallel_foreach_impl 
python_export_best
 
 " check-kernel
 syn keyword EbuildCheckKernelKeyword check_version_h get_KV_info is_2_4_kernel 
is_2_5_kernel is_2_6_kernel

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2016-03-06 Thread Tim Harder

commit: 09b6105a516d7033eab0038d6086c565071a4208
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb 19 13:03:05 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Mar  5 23:31:10 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=09b6105a

syntax/ebuild: Update eutils for banned, removed and moved functions

 syntax/ebuild.vim | 37 -
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index fdf4653..f7b1523 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -63,16 +63,18 @@ syn keyword EbuildInherit inherit
 
 " autotools
 syn keyword EbuildAutoKeyword eautoreconf eaclocal _elibtoolize eautoconf 
eautoheader eautomake
+
 " eutils
-syn keyword EbuildEutilsKeyword gen_usr_ldscript draw_line epatch have_NPTL 
get_number_of_jobs egetent
-syn keyword EbuildEutilsKeyword emktemp enewuser enewgroup edos2unix 
make_desktop_entry unpack_pdv
-syn keyword EbuildEutilsKeyword unpack_makeself check_license cdrom_get_cds 
cdrom_load_next
-syn keyword EbuildEutilsKeyword cdrom_locate_file_on_cd strip-linguas epause 
ebeep built_with_use
-syn keyword EbuildEutilsKeyword make_session_desktop domenu doicon newicon 
find_unpackable_file unpack_pdv
-syn keyword EbuildEutilsKeyword set_arch_to_kernel set_arch_to_portage 
preserve_old_lib
-syn keyword EbuildEutilsKeyword preserve_old_lib_notify built_with_use 
epunt_cxx dopamd newpamd
+syn keyword EbuildEutilsKeyword draw_line epatch have_NPTL get_number_of_jobs
+syn keyword EbuildEutilsKeyword emktemp edos2unix make_desktop_entry 
strip-linguas
+syn keyword EbuildEutilsKeyword make_session_desktop domenu doicon newicon
+syn keyword EbuildEutilsKeyword preserve_old_lib preserve_old_lib_notify 
epunt_cxx
 syn keyword EbuildEutilsKeyword make_wrapper
 
+" deprecated & banned eutils functions
+syn keyword EbuildDeprecatedKeyword draw_line have_NPTL get_number_of_jobs 
check_license
+syn keyword EbuildDeprecatedKeyword ebeep epause built_with_use
+
 " flag-o-matic
 syn keyword EbuildFlagoKeyword setup-allowed-flags filter-flags 
filter-lfs-flags append-lfs-flags
 syn keyword EbuildFlagoKeyword append-flags replace-flags replace-cpu-flags 
is-flag filter-mfpmath
@@ -140,7 +142,7 @@ syn keyword EbuildToolFuncsKeyword tc-getPROG tc-getAR 
tc-getAS tc-getCC tc-getC
 syn keyword EbuildToolFuncsKeyword tc-getRANLIB tc-getF77 tc-getGCJ 
tc-getBUILD_CC tc-export ninj
 syn keyword EbuildToolFuncsKeyword tc-is-cross-compiler tc-ninja_magic_to_arch 
tc-arch-kernel tc-arch
 syn keyword EbuildToolFuncsKeyword tc-endian gcc-fullversion gcc-version 
gcc-major-version
-syn keyword EbuildToolFuncsKeyword gcc-minor-version gcc-micro-version
+syn keyword EbuildToolFuncsKeyword gcc-minor-version gcc-micro-version 
gen_usr_ldscript
 
 " cron
 syn keyword EbuildCronKeyword docrondir docron docrontab cron_pkg_postinst
@@ -209,6 +211,18 @@ syn keyword EbuildGnome2Keyword gnome2_src_configure 
gnome2_src_compile gnome2_s
 syn keyword EbuildGnome2Keyword gnome2_gconf_install gnome2_gconf_uninstal 
gnome2_omf_fix
 syn keyword EbuildGnome2Keyword gnome2_scrollkeeper_update gnome2_pkg_postinst 
gnome2_pkg_postrm
 
+" cdrom
+syn keyword EbuildCDROMKeyword cdrom_get_cds cdrom_load_next
+
+" linux-info
+syn keyword EbuildLinuxInfoKeyword set_arch_to_kernel set_arch_to_portage
+
+" unpacker
+syn keyword EbuildUnpackerKeyword unpack_pdv unpack_makeself
+
+" user
+syn keyword EbuildUserKeyword egetent enewuser enewgroup
+
 " EXPORT_FUNCTIONS
 syn match EbuildExportFunctions /EXPORT_FUNCTIONS/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
 syn match EbuildExportFunctionsFunc contained /\S\+\(\s\|$\)\@=/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
@@ -271,7 +285,8 @@ syn cluster EbuildThings 
add=EbuildSVNKeyword,EbuildAltKeyword,EbuildRPMKeyword,
 syn cluster EbuildThings 
add=EbuildCheckKernelKeyword,EbuildPerlModuleKeyword,EbuildDistutilsKeyword
 syn cluster EbuildThings 
add=EbuildDependApacheKeyword,EbuildApacheModuleKeyword,EbuildPamKeyword
 syn cluster EbuildThings 
add=EbuildVirtualXKeyword,EbuildGnome2Keyword,EbuildAutoKeyword
-syn cluster EbuildThings add=EbuildDeprecatedKeyword
+syn cluster EbuildThings 
add=EbuildDeprecatedKeyword,EbuildUnpackerKeyword,EbuildUserKeyword
+syn cluster EbuildThings add=EbuildCDROMKeyword,EbuildLinuxInfoKeyword
 
 syn cluster shCommandSubList add=@EbuildThings
 syn cluster shCommentGroup add=GentooBug
@@ -312,6 +327,10 @@ hi def link EbuildPamKeyword Identifier
 hi def link EbuildVirtualXKeywordIdentifier
 hi def link EbuildGnome2Keyword  Identifier
 hi def link EbuildAutoKeywordIdentifier
+hi def link EbuildCDROMKeyword   Identifier
+hi def link EbuildLinuxInfoKeyword   Identifier
+hi def link EbuildUnpackerKeywordIdentifier
+hi def link EbuildUserKeywordIdentifier

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2016-03-06 Thread Tim Harder

commit: e52b2ec0fc88921d27e07f88acafecac6461c862
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Feb 18 22:43:22 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Sat Mar  5 23:31:09 2016 +
URL:https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=e52b2ec0

ebuild syntax: Update for EAPI 6 keywords

 syntax/ebuild.vim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 6f3cb92..e46dffe 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -37,7 +37,8 @@ syn keyword EbuildCoreKeyword newexe newheader newins newman 
newsbin prepall pre
 syn keyword EbuildCoreKeyword prepallinfo prepallman prepallstrip has unpack 
dosed into
 syn keyword EbuildCoreKeyword doinitd doconfd doenvd dojar domo dodir ebegin 
eend
 syn keyword EbuildCoreKeyword newconfd newdoc newenvd newinitd newlib.a 
newlib.so
-syn keyword EbuildCoreKeyword hasq hasv useq usev usex elog
+syn keyword EbuildCoreKeyword hasq hasv useq usev usex elog eapply eapply_user
+syn keyword EbuildCoreKeyword einstalldocs in_iuse get_libdir
 
 " Sandbox
 syn keyword EbuildCoreKeyword addread addwrite adddeny addpredict
@@ -117,7 +118,7 @@ syn keyword EbuildVimPluginKeyword update_vim_afterscripts 
display_vim_plugin_he
 syn keyword EbuildVimDocKeyword update_vim_helptags
 
 " multilib
-syn keyword EbuildMultilibKeyword has_multilib_profile get_libdir 
get_multilibdir get_libdir_override
+syn keyword EbuildMultilibKeyword has_multilib_profile get_multilibdir 
get_libdir_override
 syn keyword EbuildMultilibKeyword get_abi_var get_abi_CFLAGS get_abi_LDFLAGS 
get_abi_CHOST
 syn keyword EbuildMultilibKeyword get_abi_FAKE_TARGETS get_abi_CDEFINE 
get_abi_LIBDIR get_install_abis
 syn keyword EbuildMultilibKeyword get_all_abis get_all_libdirs is_final_abi 
number_abis get_ml_incdir

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2014-11-29 Thread Tim Harder

commit: 8e7f4bc702f7bc418a02327984f35941341f61e1
Author: Tim Harder radhermit AT gentoo DOT org
AuthorDate: Sat Nov 29 08:07:08 2014 +
Commit: Tim Harder radhermit AT gentoo DOT org
CommitDate: Sat Nov 29 08:07:08 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-syntax.git;a=commit;h=8e7f4bc7

support pkg_info phase for EXPORT_FUNCTIONS

X-Gentoo-Bug: 531086

---
 syntax/ebuild.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 497d743..6f3cb92 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -206,7 +206,7 @@ syn keyword EbuildGnome2Keyword gnome2_scrollkeeper_update 
gnome2_pkg_postinst g
  EXPORT_FUNCTIONS
 syn match EbuildExportFunctions /EXPORT_FUNCTIONS/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
 syn match EbuildExportFunctionsFunc contained /\S\+\(\s\|$\)\@=/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
-syn match EbuildExportFunctionsFuncE contained 
/\S\+\(\s\|$\)\@=\(\${\S\+}\|pkg_pretend\|pkg_nofetch\|pkg_setup\|src_unpack\|src_prepare\|src_configure\|src_compile\|src_test\|src_install\|pkg_preinst\|pkg_postinst\|pkg_prerm\|pkg_postrm\|pkg_config\)\@!/
 skipwhite nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
+syn match EbuildExportFunctionsFuncE contained 
/\S\+\(\s\|$\)\@=\(\${\S\+}\|pkg_pretend\|pkg_nofetch\|pkg_setup\|src_unpack\|src_prepare\|src_configure\|src_compile\|src_test\|src_install\|pkg_preinst\|pkg_postinst\|pkg_prerm\|pkg_postrm\|pkg_config\|pkg_info\)\@!/
 skipwhite nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
 
  Eclass documentation
 syn match EclassDocumentation 
/@\(BLURB\|CODE\|DESCRIPTION\|ECLASS-VARIABLE\|ECLASS\|EXAMPLE\|FUNCTION\|MAINTAINER\|RETURN\|USAGE\|VARIABLE\):/
 contained

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2014-11-29 Thread Tim Harder

commit: a7779eb763656f52ab9057b549e9883cbc43660a
Author: Tim Harder radhermit AT gentoo DOT org
AuthorDate: Sat Nov 29 16:48:37 2014 +
Commit: Tim Harder radhermit AT gentoo DOT org
CommitDate: Sat Nov 29 16:48:37 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-syntax.git;a=commit;h=a7779eb7

metadata: update possible upstream tag names

---
 syntax/gentoo-metadata.vim | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/syntax/gentoo-metadata.vim b/syntax/gentoo-metadata.vim
index 55e359e..8cae9a2 100644
--- a/syntax/gentoo-metadata.vim
+++ b/syntax/gentoo-metadata.vim
@@ -19,6 +19,7 @@ runtime! syntax/xml.vim
 unlet b:current_syntax
 
 syn cluster xmlTagHook add=metadataElement
+
 syn match metadataElement contained 'packages'
 syn match metadataElement contained 'herd'
 syn match metadataElement contained 'maintainer'
@@ -27,6 +28,15 @@ syn match metadataElement contained 'name'
 syn match metadataElement contained 'description'
 syn match metadataElement contained 'longdescription'
 
+ upstream metadata info
+syn cluster xmlTagHook add=upstreamMetadata
+syn match upstreamMetadata contained 'upstream'
+syn match upstreamMetadata contained 'maintainer'
+syn match upstreamMetadata contained 'changelog'
+syn match upstreamMetadata contained 'doc'
+syn match upstreamMetadata contained 'bugs-to'
+syn match upstreamMetadata contained 'remote-id'
+
  Glep 56
  TODO add support for required attributes
 syn match metadataElement contained 'use'
@@ -38,5 +48,6 @@ syn match metadataElement contained 'catmetadata'
 syn match metadataElement contained 'pkgmetadata'
 
 hi def link metadataElement Keyword
+hi def link upstreamMetadata Keyword
 
 let b:current_syntax = gentoo-metadata

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2014-11-28 Thread Tim Harder

commit: 32f79ee279545aa7532138090f6a745bdf26cc5c
Author: Tim Harder radhermit AT gentoo DOT org
AuthorDate: Sat Nov 29 04:39:27 2014 +
Commit: Tim Harder radhermit AT gentoo DOT org
CommitDate: Sat Nov 29 04:39:27 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-syntax.git;a=commit;h=32f79ee2

add pkg_pretend to function pattern lists

---
 syntax/ebuild.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 9ea2c15..7a1eafa 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -43,7 +43,7 @@ syn keyword EbuildCoreKeyword hasq hasv useq usev usex elog
 syn keyword EbuildCoreKeyword addread addwrite adddeny addpredict
 
  Recognised functions
-syn keyword EbuildFunctions pkg_nofetch pkg_setup src_unpack src_compile 
src_test src_install
+syn keyword EbuildFunctions pkg_pretend pkg_nofetch pkg_setup src_unpack 
src_compile src_test src_install
 syn keyword EbuildFunctions pkg_preinst pkg_postinst pkg_prerm pkg_postrm 
pkg_config
 syn keyword EbuildFunctions pkg_info src_prepare src_configure
 
@@ -206,7 +206,7 @@ syn keyword EbuildGnome2Keyword gnome2_scrollkeeper_update 
gnome2_pkg_postinst g
  EXPORT_FUNCTIONS
 syn match EbuildExportFunctions /EXPORT_FUNCTIONS/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
 syn match EbuildExportFunctionsFunc contained /\S\+\(\s\|$\)\@=/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
-syn match EbuildExportFunctionsFuncE contained 
/\S\+\(\s\|$\)\@=\(pkg_nofetch\|pkg_setup\|src_unpack\|src_prepare\|src_configure\|src_compile\|src_test\|src_install\|pkg_preinst\|pkg_postinst\|pkg_prerm\|pkg_postrm\|pkg_config\)\@!/
 skipwhite nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
+syn match EbuildExportFunctionsFuncE contained 
/\S\+\(\s\|$\)\@=\(pkg_pretend\|pkg_nofetch\|pkg_setup\|src_unpack\|src_prepare\|src_configure\|src_compile\|src_test\|src_install\|pkg_preinst\|pkg_postinst\|pkg_prerm\|pkg_postrm\|pkg_config\)\@!/
 skipwhite nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
 
  Eclass documentation
 syn match EclassDocumentation 
/@\(BLURB\|CODE\|DESCRIPTION\|ECLASS-VARIABLE\|ECLASS\|EXAMPLE\|FUNCTION\|MAINTAINER\|RETURN\|USAGE\|VARIABLE\):/
 contained

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2014-11-28 Thread Tim Harder

commit: 91de08b764593b7a7d4f60cae85f90763930e873
Author: Tim Harder radhermit AT gentoo DOT org
AuthorDate: Sat Nov 29 04:33:25 2014 +
Commit: Tim Harder radhermit AT gentoo DOT org
CommitDate: Sat Nov 29 04:33:25 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-syntax.git;a=commit;h=91de08b7

Revert wrap some long lines

This breaks some pattern matching (bug #531076).

---
 syntax/ebuild.vim   |  4 +---
 syntax/gentoo-make-conf.vim | 25 -
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 3f7cc0c..9ea2c15 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -206,9 +206,7 @@ syn keyword EbuildGnome2Keyword gnome2_scrollkeeper_update 
gnome2_pkg_postinst g
  EXPORT_FUNCTIONS
 syn match EbuildExportFunctions /EXPORT_FUNCTIONS/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
 syn match EbuildExportFunctionsFunc contained /\S\+\(\s\|$\)\@=/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
-syn match EbuildExportFunctionsFuncE contained 
/\S\+\(\s\|$\)\@=\(pkg_nofetch\|pkg_setup
-
\|src_unpack\|src_prepare\|src_configure\|src_compile\|src_test\|src_install\|pkg_preinst
-\|pkg_postinst\|pkg_prerm\|pkg_postrm\|pkg_config\)\@!/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
+syn match EbuildExportFunctionsFuncE contained 
/\S\+\(\s\|$\)\@=\(pkg_nofetch\|pkg_setup\|src_unpack\|src_prepare\|src_configure\|src_compile\|src_test\|src_install\|pkg_preinst\|pkg_postinst\|pkg_prerm\|pkg_postrm\|pkg_config\)\@!/
 skipwhite nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
 
  Eclass documentation
 syn match EclassDocumentation 
/@\(BLURB\|CODE\|DESCRIPTION\|ECLASS-VARIABLE\|ECLASS\|EXAMPLE\|FUNCTION\|MAINTAINER\|RETURN\|USAGE\|VARIABLE\):/
 contained

diff --git a/syntax/gentoo-make-conf.vim b/syntax/gentoo-make-conf.vim
index fe48952..41ae65c 100644
--- a/syntax/gentoo-make-conf.vim
+++ b/syntax/gentoo-make-conf.vim
@@ -17,10 +17,7 @@ endif
 
 runtime syntax/gentoo-common.vim
 
-syn cluster GentooMakeConfEC 
add=GentooMakeConfEUse,GentooMakeConfEAK,GentooMakeConfEAL,
-
\GentooMakeConfEAP,GentooMakeConfECFLAGS,GentooMakeConfELDFLAGS,GentooMakeConfEMAKEOPTS,
-
\GentooMakeConfECHOST,GentooMakeConfEFEATURES,GentooMakeConfEMISC,GentooMakeConfEMISCK,
-\GentooMakeConfEMISCKE,GentooMakeConfEMISCN
+syn cluster GentooMakeConfEC 
add=GentooMakeConfEUse,GentooMakeConfEAK,GentooMakeConfEAL,GentooMakeConfEAP,GentooMakeConfECFLAGS,GentooMakeConfELDFLAGS,GentooMakeConfEMAKEOPTS,GentooMakeConfECHOST,GentooMakeConfEFEATURES,GentooMakeConfEMISC,GentooMakeConfEMISCK,GentooMakeConfEMISCKE,GentooMakeConfEMISCN
 syn region  GentooMakeConfE start=/^/ end=/$/ 
contains=@GentooMakeConfEC,GentooMakeConfComment
 
  MISC {{{
@@ -34,22 +31,9 @@ syn match   GentooMakeConfEMISCIX 
/\\.\|\$\({[^}]\+}\|[a-zA-Z0-9\-\_]\+\)/ conta
  naughty
 syn match   GentooMakeConfEMISCN 
/LDFLAGS\|ASFLAGS\|ARCH\|ELIBC\|KERNEL\|USERLAND/ contained 
nextgroup=GentooMakeConfEMISCE skipwhite
  known but not handled specially
-syn match   GentooMakeConfEMISCK 
/GENTOO_MIRRORS\|SYNC\|PORTAGE_NICENESS\|PORTDIR_OVERLAY
-
\|PORTAGE_GPG_DIR\|PORTAGE_GPG_KEY\|CONFIG_PROTECT_MASK\|CONFIG_PROTECT\|FETCHCOMMAND
-
\|RESUMECOMMAND\|AUTOCLEAN\|BUILD_PREFIX\|CBUILD\|CLEAN_DELAY\|COLLISION_IGNORE\|DISTDIR
-
\|DOC_SYMLINKS_DIR\|EMERGE_DEFAULT_OPTS\|HTTP_PROXY\|FTP_PROXY\|NOCOLOR\|PKGDIR\|PORT_LOGDIR
-
\|PORTAGE_BINHOST\|PORTAGE_BINHOST\|PORTAGE_BINPKG_TAR_OPTS\|PORTAGE_COMPRESS\|PORTAGE_COMPRESS_FLAGS
-
\|PORTAGE_ELOG_CLASSES\|PORTAGE_ELOG_COMMAND\|PORTAGE_ELOG_MAILFROM\|PORTAGE_ELOG_MAILURI
-
\|PORTAGE_ELOG_SYSTEM\|PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS\|PORTAGE_FETCH_RESUME_MIN_SIZE
-
\|PORTAGE_RSYNC_EXTRA_OPTS\|PORTAGE_RSYNC_OPTS\|PORTAGE_RSYNC_INITIAL_TIMEOUT\|PORTAGE_RSYNC_RETRIES
-
\|PORTAGE_TMPDIR\|PORTAGE_WORKDIR_MODE\|PORTDIR\|ROOT\|RSYNC_EXCLUDEFROM\|RSYNC_RETRIES
-
\|RSYNC_TIMEOUT\|RPMDIR\|USE_ORDER\|LINGUAS\|VIDEO_CARDS\|INPUT_DEVICES\|CAMERAS\|EXTRA_ECONF
-
\|ALSA_CARDS\|ALSA_PCM_PLUGINS\|PORTAGE_TMPFS\|INSTALL_MASK\|QA_STRICT_EXECSTACK\|QA_STRICT_WX_LOAD
-
\|QA_STRICT_TEXTRELS\|APACHE2_MODULES\|APACHE2_MPMS\|CROSSCOMPILE_OPTS\|DVB_CARDS\|FOO2ZJS_DEVICES
-\|LCD_DEVICES\|LIRC_DEVICES\|MISDN_CARDS/ contained 
nextgroup=GentooMakeConfEMISCE skipwhite
+syn match   GentooMakeConfEMISCK

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2014-11-28 Thread Tim Harder

commit: 50486e33f5e6e87a5489738a941d021051e30814
Author: Tim Harder radhermit AT gentoo DOT org
AuthorDate: Sat Nov 29 04:56:29 2014 +
Commit: Tim Harder radhermit AT gentoo DOT org
CommitDate: Sat Nov 29 04:56:29 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-syntax.git;a=commit;h=50486e33

add proper PORTAGE_IONICE_COMMAND highlighting for make.conf

X-Gentoo-Bug: 513702

---
 syntax/gentoo-make-conf.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/gentoo-make-conf.vim b/syntax/gentoo-make-conf.vim
index 41ae65c..205b1ab 100644
--- a/syntax/gentoo-make-conf.vim
+++ b/syntax/gentoo-make-conf.vim
@@ -31,7 +31,7 @@ syn match   GentooMakeConfEMISCIX 
/\\.\|\$\({[^}]\+}\|[a-zA-Z0-9\-\_]\+\)/ conta
  naughty
 syn match   GentooMakeConfEMISCN 
/LDFLAGS\|ASFLAGS\|ARCH\|ELIBC\|KERNEL\|USERLAND/ contained 
nextgroup=GentooMakeConfEMISCE skipwhite
  known but not handled specially
-syn match   GentooMakeConfEMISCK 
/GENTOO_MIRRORS\|SYNC\|PORTAGE_NICENESS\|PORTDIR_OVERLAY\|PORTAGE_GPG_DIR\|PORTAGE_GPG_KEY\|CONFIG_PROTECT_MASK\|CONFIG_PROTECT\|FETCHCOMMAND\|RESUMECOMMAND\|AUTOCLEAN\|BUILD_PREFIX\|CBUILD\|CLEAN_DELAY\|COLLISION_IGNORE\|DISTDIR\|DOC_SYMLINKS_DIR\|EMERGE_DEFAULT_OPTS\|HTTP_PROXY\|FTP_PROXY\|NOCOLOR\|PKGDIR\|PORT_LOGDIR\|PORTAGE_BINHOST\|PORTAGE_BINHOST\|PORTAGE_BINPKG_TAR_OPTS\|PORTAGE_COMPRESS\|PORTAGE_COMPRESS_FLAGS\|PORTAGE_ELOG_CLASSES\|PORTAGE_ELOG_COMMAND\|PORTAGE_ELOG_MAILFROM\|PORTAGE_ELOG_MAILURI\|PORTAGE_ELOG_SYSTEM\|PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS\|PORTAGE_FETCH_RESUME_MIN_SIZE\|PORTAGE_RSYNC_EXTRA_OPTS\|PORTAGE_RSYNC_OPTS\|PORTAGE_RSYNC_INITIAL_TIMEOUT\|PORTAGE_RSYNC_RETRIES\|PORTAGE_TMPDIR\|PORTAGE_WORKDIR_MODE\|PORTDIR\|ROOT\|RSYNC_EXCLUDEFROM\|RSYNC_RETRIES\|RSYNC_TIMEOUT\|RPMDIR\|USE_ORDER\|LINGUAS\|VIDEO_CARDS\|INPUT_DEVICES\|CAMERAS\|EXTRA_ECONF\|ALSA_CARDS\|ALSA_PCM_PLUGINS\|PORTAGE_TMPFS\|INSTALL_MASK\|QA_STRICT_EXECSTACK\|QA_
 
STRICT_WX_LOAD\|QA_STRICT_TEXTRELS\|APACHE2_MODULES\|APACHE2_MPMS\|CROSSCOMPILE_OPTS\|DVB_CARDS\|FOO2ZJS_DEVICES\|LCD_DEVICES\|LIRC_DEVICES\|MISDN_CARDS/
 contained nextgroup=GentooMakeConfEMISCE skipwhite
+syn match   GentooMakeConfEMISCK 
/GENTOO_MIRRORS\|SYNC\|PORTAGE_NICENESS\|PORTDIR_OVERLAY\|PORTAGE_GPG_DIR\|PORTAGE_GPG_KEY\|CONFIG_PROTECT_MASK\|CONFIG_PROTECT\|FETCHCOMMAND\|RESUMECOMMAND\|AUTOCLEAN\|BUILD_PREFIX\|CBUILD\|CLEAN_DELAY\|COLLISION_IGNORE\|DISTDIR\|DOC_SYMLINKS_DIR\|EMERGE_DEFAULT_OPTS\|HTTP_PROXY\|FTP_PROXY\|NOCOLOR\|PKGDIR\|PORT_LOGDIR\|PORTAGE_BINHOST\|PORTAGE_BINHOST\|PORTAGE_BINPKG_TAR_OPTS\|PORTAGE_COMPRESS\|PORTAGE_COMPRESS_FLAGS\|PORTAGE_ELOG_CLASSES\|PORTAGE_ELOG_COMMAND\|PORTAGE_ELOG_MAILFROM\|PORTAGE_ELOG_MAILURI\|PORTAGE_ELOG_SYSTEM\|PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS\|PORTAGE_FETCH_RESUME_MIN_SIZE\|PORTAGE_RSYNC_EXTRA_OPTS\|PORTAGE_RSYNC_OPTS\|PORTAGE_RSYNC_INITIAL_TIMEOUT\|PORTAGE_RSYNC_RETRIES\|PORTAGE_TMPDIR\|PORTAGE_WORKDIR_MODE\|PORTDIR\|ROOT\|RSYNC_EXCLUDEFROM\|RSYNC_RETRIES\|RSYNC_TIMEOUT\|RPMDIR\|USE_ORDER\|LINGUAS\|VIDEO_CARDS\|INPUT_DEVICES\|CAMERAS\|EXTRA_ECONF\|ALSA_CARDS\|ALSA_PCM_PLUGINS\|PORTAGE_TMPFS\|INSTALL_MASK\|QA_STRICT_EXECSTACK\|QA_
 
STRICT_WX_LOAD\|QA_STRICT_TEXTRELS\|APACHE2_MODULES\|APACHE2_MPMS\|CROSSCOMPILE_OPTS\|DVB_CARDS\|FOO2ZJS_DEVICES\|LCD_DEVICES\|LIRC_DEVICES\|MISDN_CARDS\|PORTAGE_IONICE_COMMAND/
 contained nextgroup=GentooMakeConfEMISCE skipwhite
  common eclass stuff
 syn match GentooMakeConfEMISCKE 
/EBEEP_IGNORE\|EPAUSE_IGNORE\|CHECKREQS_ACTION\|BREAKME\|ECHANGELOG_USER\|CCACHE_SIZE\|CCACHE_DIR\|DISTCC_DIR/
 contained nextgroup=GentooMakeConfEMISCE skipwhite

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2014-11-28 Thread Tim Harder

commit: 7a6071bfd2e8bd250a7e5da8a3895ab1c9b36a0a
Author: Tim Harder radhermit AT gentoo DOT org
AuthorDate: Sat Nov 29 07:03:21 2014 +
Commit: Tim Harder radhermit AT gentoo DOT org
CommitDate: Sat Nov 29 07:03:21 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-syntax.git;a=commit;h=7a6071bf

fix minor spelling errors

---
 syntax/ebuild.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 7a1eafa..649bc47 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -210,7 +210,7 @@ syn match EbuildExportFunctionsFuncE contained 
/\S\+\(\s\|$\)\@=\(pkg_pretend\|p
 
  Eclass documentation
 syn match EclassDocumentation 
/@\(BLURB\|CODE\|DESCRIPTION\|ECLASS-VARIABLE\|ECLASS\|EXAMPLE\|FUNCTION\|MAINTAINER\|RETURN\|USAGE\|VARIABLE\):/
 contained
- use shComment (sh.vim), make it compatbile with other comment hightlights
+ use shComment (sh.vim), make it compatible with other comment highlights
 syn match  shComment^\s*\zs#.*$   contains=EclassDocumentation
 syn match  shComment\s\zs#.*$ contains=EclassDocumentation

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2014-11-28 Thread Tim Harder

commit: c1f92729082781148a27689eb983ecc3736ba387
Author: Tim Harder radhermit AT gentoo DOT org
AuthorDate: Sat Nov 29 07:15:45 2014 +
Commit: Tim Harder radhermit AT gentoo DOT org
CommitDate: Sat Nov 29 07:15:45 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-syntax.git;a=commit;h=c1f92729

allow bracketed variables in exported functions for eclasses

X-Gentoo-Bug: 496458

---
 syntax/ebuild.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 649bc47..497d743 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -206,7 +206,7 @@ syn keyword EbuildGnome2Keyword gnome2_scrollkeeper_update 
gnome2_pkg_postinst g
  EXPORT_FUNCTIONS
 syn match EbuildExportFunctions /EXPORT_FUNCTIONS/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
 syn match EbuildExportFunctionsFunc contained /\S\+\(\s\|$\)\@=/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
-syn match EbuildExportFunctionsFuncE contained 
/\S\+\(\s\|$\)\@=\(pkg_pretend\|pkg_nofetch\|pkg_setup\|src_unpack\|src_prepare\|src_configure\|src_compile\|src_test\|src_install\|pkg_preinst\|pkg_postinst\|pkg_prerm\|pkg_postrm\|pkg_config\)\@!/
 skipwhite nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
+syn match EbuildExportFunctionsFuncE contained 
/\S\+\(\s\|$\)\@=\(\${\S\+}\|pkg_pretend\|pkg_nofetch\|pkg_setup\|src_unpack\|src_prepare\|src_configure\|src_compile\|src_test\|src_install\|pkg_preinst\|pkg_postinst\|pkg_prerm\|pkg_postrm\|pkg_config\)\@!/
 skipwhite nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
 
  Eclass documentation
 syn match EclassDocumentation 
/@\(BLURB\|CODE\|DESCRIPTION\|ECLASS-VARIABLE\|ECLASS\|EXAMPLE\|FUNCTION\|MAINTAINER\|RETURN\|USAGE\|VARIABLE\):/
 contained

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2014-11-28 Thread Tim Harder

commit: a3a9d028acae0af472beb7c29eb9e6da9a508b02
Author: Tim Harder radhermit AT gentoo DOT org
AuthorDate: Sat Nov 29 07:48:42 2014 +
Commit: Tim Harder radhermit AT gentoo DOT org
CommitDate: Sat Nov 29 07:48:42 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-syntax.git;a=commit;h=a3a9d028

remove special highlighting for gentoo cvs headers

This feels pointless and causes bug #297282 anyway.

---
 syntax/gentoo-common.vim | 6 --
 1 file changed, 6 deletions(-)

diff --git a/syntax/gentoo-common.vim b/syntax/gentoo-common.vim
index d509833..b3e2ae8 100644
--- a/syntax/gentoo-common.vim
+++ b/syntax/gentoo-common.vim
@@ -8,10 +8,6 @@ if compatible || v:version  603
 finish
 endif
 
-syn region GentooHeaderBlock start=/\%^\(#\)\@=/ end=/^$/ contains=GentooHeader
-syn region GentooHeader contained start=/^#/ end=/$/ 
contains=GentooHeaderCVSVar
-syn region GentooHeaderCVSVar contained start=/\$\S\+:/ end=/\$/
-
 syn match  GentooBug contained /\(\([gG]entoo \|[dD]ebian \|[sS]ource[Ff]orge 
\)\?[Bb]ug \(#\s*\)\?\|#\)\d\{1,\}/
 
  bad space
@@ -19,7 +15,5 @@ syn region  GentooError start=/^ / end=/$/
  trailing whitespace
 syn match   GentooError /\s\+$/
 
-hi def link GentooHeader Comment
-hi def link GentooHeaderCVSVar   PreProc
 hi def link GentooBugUnderlined
 hi def link GentooError  Error

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2014-11-01 Thread Tim Harder

commit: 9c8f50feb8230b5b78259811cbf52395f495d9ce
Author: Tim Harder radhermit AT gentoo DOT org
AuthorDate: Sat Nov  1 23:44:13 2014 +
Commit: Tim Harder radhermit AT gentoo DOT org
CommitDate: Sat Nov  1 23:44:13 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-syntax.git;a=commit;h=9c8f50fe

don't be overly strict with ebuild keywords

Don't flag noarch keywords that Funtoo uses (* and ~*) as errors.

---
 syntax/ebuild.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index 8db1b2c..c18c20a 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -224,8 +224,8 @@ syn match   EbuildError /^\(P\|PN\|PV\|PR\|PVR\|PF\|A\)=/
 syn match   EbuildError ~^S=\?\${\?WORKDIR}\?/\${\?P}\?\?\s*$~
  not allowed
 syn match   EbuildError /SLOT\s*=\s*\(\|''\|$\)/
- not allowed
-syn match   EbuildError /KEYWORDS\s*=\s*.*[^-]\*.*/
+ Don't be overly strict (Funtoo allows * and ~* as noarch ebuild keywords)
+ syn match   EbuildError /KEYWORDS\s*=\s*.*[^-]\*.*/
  evil syntax, ask Mr_Bones_
 syn match   EbuildError /^[a-zA-Z0-9\-\_]\+ ()/
 syn match   EbuildError /^[a-zA-Z0-9\-\_]\+(){/

[gentoo-commits] proj/gentoo-syntax:master commit in: syntax/

2014-11-01 Thread Tim Harder

commit: d674b748745a77879bc6233c8c836e98d00860f3
Author: Tim Harder radhermit AT gentoo DOT org
AuthorDate: Sat Nov  1 23:48:25 2014 +
Commit: Tim Harder radhermit AT gentoo DOT org
CommitDate: Sun Nov  2 00:10:29 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-syntax.git;a=commit;h=d674b748

wrap some long lines

---
 syntax/ebuild.vim   |  4 +++-
 syntax/gentoo-make-conf.vim | 25 +
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/syntax/ebuild.vim b/syntax/ebuild.vim
index c18c20a..c85beef 100644
--- a/syntax/ebuild.vim
+++ b/syntax/ebuild.vim
@@ -206,7 +206,9 @@ syn keyword EbuildGnome2Keyword gnome2_scrollkeeper_update 
gnome2_pkg_postinst g
  EXPORT_FUNCTIONS
 syn match EbuildExportFunctions /EXPORT_FUNCTIONS/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
 syn match EbuildExportFunctionsFunc contained /\S\+\(\s\|$\)\@=/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
-syn match EbuildExportFunctionsFuncE contained 
/\S\+\(\s\|$\)\@=\(pkg_nofetch\|pkg_setup\|src_unpack\|src_prepare\|src_configure\|src_compile\|src_test\|src_install\|pkg_preinst\|pkg_postinst\|pkg_prerm\|pkg_postrm\|pkg_config\)\@!/
 skipwhite nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
+syn match EbuildExportFunctionsFuncE contained 
/\S\+\(\s\|$\)\@=\(pkg_nofetch\|pkg_setup
+
\|src_unpack\|src_prepare\|src_configure\|src_compile\|src_test\|src_install\|pkg_preinst
+\|pkg_postinst\|pkg_prerm\|pkg_postrm\|pkg_config\)\@!/ skipwhite 
nextgroup=EbuildExportFunctionsFunc,EbuildExportFunctionsFuncE
 
  Eclass documentation
 syn match EclassDocumentation 
/@\(BLURB\|CODE\|DESCRIPTION\|ECLASS-VARIABLE\|ECLASS\|EXAMPLE\|FUNCTION\|MAINTAINER\|RETURN\|USAGE\|VARIABLE\):/
 contained

diff --git a/syntax/gentoo-make-conf.vim b/syntax/gentoo-make-conf.vim
index 50b63bd..4d3c2b3 100644
--- a/syntax/gentoo-make-conf.vim
+++ b/syntax/gentoo-make-conf.vim
@@ -17,7 +17,10 @@ endif
 
 runtime syntax/gentoo-common.vim
 
-syn cluster GentooMakeConfEC 
add=GentooMakeConfEUse,GentooMakeConfEAK,GentooMakeConfEAL,GentooMakeConfEAP,GentooMakeConfECFLAGS,GentooMakeConfELDFLAGS,GentooMakeConfEMAKEOPTS,GentooMakeConfECHOST,GentooMakeConfEFEATURES,GentooMakeConfEMISC,GentooMakeConfEMISCK,GentooMakeConfEMISCKE,GentooMakeConfEMISCN
+syn cluster GentooMakeConfEC 
add=GentooMakeConfEUse,GentooMakeConfEAK,GentooMakeConfEAL,
+
\GentooMakeConfEAP,GentooMakeConfECFLAGS,GentooMakeConfELDFLAGS,GentooMakeConfEMAKEOPTS,
+
\GentooMakeConfECHOST,GentooMakeConfEFEATURES,GentooMakeConfEMISC,GentooMakeConfEMISCK,
+\GentooMakeConfEMISCKE,GentooMakeConfEMISCN
 syn region  GentooMakeConfE start=/^/ end=/$/ 
contains=@GentooMakeConfEC,GentooMakeConfComment
 
  MISC {{{
@@ -31,9 +34,22 @@ syn match   GentooMakeConfEMISCIX 
/\\.\|\$\({[^}]\+}\|[a-zA-Z0-9\-\_]\+\)/ conta
  naughty
 syn match   GentooMakeConfEMISCN 
/LDFLAGS\|ASFLAGS\|ARCH\|ELIBC\|KERNEL\|USERLAND/ contained 
nextgroup=GentooMakeConfEMISCE skipwhite
  known but not handled specially
-syn match   GentooMakeConfEMISCK 
/GENTOO_MIRRORS\|SYNC\|PORTAGE_NICENESS\|PORTDIR_OVERLAY\|PORTAGE_GPG_DIR\|PORTAGE_GPG_KEY\|CONFIG_PROTECT_MASK\|CONFIG_PROTECT\|FETCHCOMMAND\|RESUMECOMMAND\|AUTOCLEAN\|BUILD_PREFIX\|CBUILD\|CLEAN_DELAY\|COLLISION_IGNORE\|DISTDIR\|DOC_SYMLINKS_DIR\|EMERGE_DEFAULT_OPTS\|HTTP_PROXY\|FTP_PROXY\|NOCOLOR\|PKGDIR\|PORT_LOGDIR\|PORTAGE_BINHOST\|PORTAGE_BINHOST\|PORTAGE_BINPKG_TAR_OPTS\|PORTAGE_COMPRESS\|PORTAGE_COMPRESS_FLAGS\|PORTAGE_ELOG_CLASSES\|PORTAGE_ELOG_COMMAND\|PORTAGE_ELOG_MAILFROM\|PORTAGE_ELOG_MAILURI\|PORTAGE_ELOG_SYSTEM\|PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS\|PORTAGE_FETCH_RESUME_MIN_SIZE\|PORTAGE_RSYNC_EXTRA_OPTS\|PORTAGE_RSYNC_OPTS\|PORTAGE_RSYNC_INITIAL_TIMEOUT\|PORTAGE_RSYNC_RETRIES\|PORTAGE_TMPDIR\|PORTAGE_WORKDIR_MODE\|PORTDIR\|ROOT\|RSYNC_EXCLUDEFROM\|RSYNC_RETRIES\|RSYNC_TIMEOUT\|RPMDIR\|USE_ORDER\|LINGUAS\|VIDEO_CARDS\|INPUT_DEVICES\|CAMERAS\|EXTRA_ECONF\|ALSA_CARDS\|ALSA_PCM_PLUGINS\|PORTAGE_TMPFS\|INSTALL_MASK\|QA_STRICT_EXECSTACK\|QA_
 
STRICT_WX_LOAD\|QA_STRICT_TEXTRELS\|APACHE2_MODULES\|APACHE2_MPMS\|CROSSCOMPILE_OPTS\|DVB_CARDS\|FOO2ZJS_DEVICES\|LCD_DEVICES\|LIRC_DEVICES\|MISDN_CARDS/
 contained nextgroup=GentooMakeConfEMISCE skipwhite
+syn match   GentooMakeConfEMISCK 
/GENTOO_MIRRORS\|SYNC\|PORTAGE_NICENESS\|PORTDIR_OVERLAY
+
\|PORTAGE_GPG_DIR\|PORTAGE_GPG_KEY\|CONFIG_PROTECT_MASK\|CONFIG_PROTECT\|FETCHCOMMAND
+
\|RESUMECOMMAND\|AUTOCLEAN\|BUILD_PREFIX\|CBUILD\|CLEAN_DELAY\|COLLISION_IGNORE\|DISTDIR
+
\|DOC_SYMLINKS_DIR\|EMERGE_DEFAULT_OPTS\|HTTP_PROXY\|FTP_PROXY\|NOCOLOR\|PKGDIR\|PORT_LOGDIR
+
\|PORTAGE_BINHOST\|PORTAGE_BINHOST\|PORTAGE_BINPKG_TAR_OPTS\|PORTAGE_COMPRESS\|PORTAGE_COMPRESS_FLAGS
+
\|PORTAGE_ELOG_CLASSES\|PORTAGE_ELOG_COMMAND\|PORTAGE_ELOG_MAILFROM\|PORTAGE_ELOG_MAILURI
+
\|PORTAGE_ELOG_SYSTEM\|PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS\|PORTAGE_FETCH_RESUME_MIN_SIZE
+

66 matches

Mail list logo