add stuff for newer portages and enable colors by default

Package-Manager: portage-2.0.51.22-r1

2 files changed, 18 insertions, 18 deletions

diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 2e2a7b2ccebf..a094c3ba7783 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -13,7 +13,7 @@ MD5 b6b8e30beb4e577ac5d8d58bced6b326 files/digest-nano-1.3.6 62
 MD5 ebe8f2a4d216c558d080645929ad7176 files/nano-1.3.6-nomac.patch 883
 MD5 bbdbc4c41e290e7658f6a6d06b3ac6f4 files/digest-nano-1.2.4 62
 MD5 60ac26176596b3e131acc70a327fde01 files/nano-1.3.6-debug-typo.patch 415
-MD5 1dc6cc0231305e0268bd17287b429db2 files/nanorc-gentoo 1866
+MD5 9a8e42933b39f8f9ed5770d3174e4d87 files/nanorc-gentoo 1863
 MD5 eabfefc7d73cdd882c2ac8ca7a676970 files/nanorc-man 330
 MD5 061dd7ec0e2fef8722c1c46d2a09b327 files/nanorc-patch 258
 MD5 9ecacdb9e41a6ddb3200113238ca4b2b files/nanorc-sh 646
diff --git a/app-editors/nano/files/nanorc-gentoo b/app-editors/nano/files/nanorc-gentoo
index 6b6344a3eb48..1b7e16cf3bc7 100644
--- a/app-editors/nano/files/nanorc-gentoo
+++ b/app-editors/nano/files/nanorc-gentoo
@@ -1,28 +1,28 @@
 
 ## Here is an example for ebuilds/eclasses
 ##
-# syntax "ebuild" "\.e(build|class)$"
+syntax "ebuild" "\.e(build|class)$"
 ## All the standard portage functions
-# color brightgreen "^src_(unpack|compile|install|test)" "^pkg_(config|nofetch|setup|(pre|post)(inst|rm))"
+color brightgreen "^src_(unpack|compile|install|test)" "^pkg_(config|nofetch|setup|(pre|post)(inst|rm))"
 ## Highlight bash related syntax
-# color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\>"
-# color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
-# color green "-(e|d|f|r|g|u|w|x|L)\>"
-# color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
+color green "\<(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\>"
+color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color green "-(e|d|f|r|g|u|w|x|L)\>"
+color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
 ## Highlight variables ... official portage ones in red, all others in bright red
-# color brightred "\$\{?[a-zA-Z_0-9]+\}?"
-# color red "\<(ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT)\>"
-# color red "\<(S|D|T|PV|PF|P|PN|A)\>" "\<C(XX)?FLAGS\>" "\<LDFLAGS\>" "\<C(HOST|TARGET|BUILD)\>"
+color brightred "\$\{?[a-zA-Z_0-9]+\}?"
+color red "\<(ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)\>"
+color red "\<(S|D|T|PV|PF|P|PN|A)\>" "\<C(XX)?FLAGS\>" "\<LDFLAGS\>" "\<C(HOST|TARGET|BUILD)\>"
 ## Highlight portage commands
-# color magenta "\<use(_(with|enable))?\> [!a-z0-9X -]*" "inherit.*"
-# color brightblue "e(begin|end|conf|install|make|warn|infon?|error|patch)"
-# color brightblue "\<die\>" "\<use(_(with|enable))?\>" "\<inherit\>" "\<has\>" "\<(has|best)_version\>" "\<unpack\>"
-# color brightblue "\<(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|env)\>"
-# color brightblue "\<do(python|sed|dir|hard|sym|html|jar|mo)\>" "\<keepdir\>"
-# color brightblue "prepall(|docs|info|man|strip)" "prep(info|lib|lib\.so|man|strip)"
-# color brightblue "\<(|doc|ins|exe)into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>"
+color magenta "\<use(_(with|enable))?\> [!a-zA-Z0-9_+ -]*" "inherit.*"
+color brightblue "e(begin|end|conf|install|make|warn|infon?|error|patch)"
+color brightblue "\<die\>" "\<use(_(with|enable))?\>" "\<inherit\>" "\<has\>" "\<(has|best)_version\>" "\<unpack\>"
+color brightblue "\<(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|env|pam|menu|icon)\>"
+color brightblue "\<do(python|sed|dir|hard|sym|html|jar|mo)\>" "\<keepdir\>"
+color brightblue "prepall(|docs|info|man|strip)" "prep(info|lib|lib\.(so|a)|man|strip)"
+color brightblue "\<(|doc|ins|exe)into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>"
 ## Highlight common commands used in ebuilds
-# color blue "\<make\>" "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|let|ln|mkdir|mv|rm|sed|set|tar|touch|unset)\>"
+color blue "\<make\>" "\<(cat|cd|chmod|chown|cp|echo|env|export|grep|let|ln|mkdir|mv|rm|sed|set|tar|touch|unset)\>"
 ## Highlight comments (doesnt work that well)
 # color yellow "#.*$"
 ## Highlight strings (doesnt work that well)