Match more files in /etc/portage #485602 by Michael Rowell.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 34 insertions, 21 deletions

diff --git a/app-editors/nano/ChangeLog b/app-editors/nano/ChangeLog
index 164c2bd90dd3..217167dd5a94 100644
--- a/app-editors/nano/ChangeLog
+++ b/app-editors/nano/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/nano
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.301 2013/08/15 17:04:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.302 2013/09/28 11:13:54 vapier Exp $
+
+  28 Sep 2013; Mike Frysinger <vapier@gentoo.org>
+  files/nano-2.3.1-gentoo-nanorc.patch:
+  Match more files in /etc/portage #485602 by Michael Rowell.
 
   15 Aug 2013; Mike Frysinger <vapier@gentoo.org> nano-2.3.2.ebuild:
   Mark m68k stable #471406.
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 3770b1e1401b..a88107190360 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -9,7 +9,7 @@ AUX nano-1.3.12-path.patch 6465 SHA256 ebc54d890a3d2ab8c435b4cee3790e8920c055db9
 AUX nano-1.3.12-scroll.patch 1357 SHA256 5f44b124d829c3a1d98be782de90728e425e8cd8c7fac73fe36c8dfaa97d4773 SHA512 7e385f2fe22607d6b75fbe9c382b678d62a743d185e964c3e8f6e603263aec586e16ba97f8681454b23450b3114e1eaff4794a0c05c5df355a367a5d9cca4fd7 WHIRLPOOL 5d5b29ed8ad24e37eb36aea4709ae3e1d47862b0026805150d228bc958c656d87b09b86233749cc92f36b6b0162be97d6d200589afef763a585afa802f98b7bc
 AUX nano-2.3.1-bind-unbind-docs.patch 4736 SHA256 a41294bf31130b9a25d77f8bab7d6ba4638a9e7a1c19e07c20bd48a3152519db SHA512 c63849a33bf0dc03e0b3f7209bb91e2e8cdf52ba1ec16259d732f3c90dcc8281f442720ab4bb0e029f0bb01163a09dea54bd728e662c15d8e922bf8584b334ed WHIRLPOOL 36faef259be3e26f3022b4c23fae058a369b05ba58d1483c9774cb232f50c309332abd9985fd8b68238d65cfca94cc4aaf9f702398dbd3b81e87986c22e6efca
 AUX nano-2.3.1-drop-target.patch 833 SHA256 a8fc698463c35f96ae2124bbc608d0eb4bd7bfad32b2a8972d79147088fd9090 SHA512 3dcf5d2601f4ca6037e470287890c0e935ccae3085694ac271699437bc9d8cc3abf607779596993cb0f1e2abaa000cc90c2e4e6cbbfa6793e2360c167931da95 WHIRLPOOL 6ad87ba6a7bc504fc3aec65828c161a546f1d0e3db2db24c6666d36a2022d2bf04c64678cffcd9b9a169dc4d8da3d06190b6595fc87b443682d09b21c9ea26fb
-AUX nano-2.3.1-gentoo-nanorc.patch 5355 SHA256 87b29d6bbf1b94585dff1cb72a3142d69fe856a32f2a0173112b19a9641c1fd3 SHA512 211ecde8df18df270f10d418a3e04ec53be14612d0d9d52ea5e664dc1759015508d5dc065a4d7ef5505d9b1b43efc6410019098771ad1912ddc5761605062452 WHIRLPOOL 70f103f53eb2d870331ba8eac7568b884cbaacf61ff3684174b90a851a7acef85e1fe1782db35d8d7fd51bd2644a69ddb73f99f426b13d478bf14cfe93531972
+AUX nano-2.3.1-gentoo-nanorc.patch 5649 SHA256 3be2b678adaf4bf0e11dfda282d019b8eb1974cd1f5175bb44c0b8db5182d349 SHA512 ca7217c6fe998302e528dff3485af673e70e6bd07df429116030a75c9da105c6985f999197dffe062000f085eb7c4b149ecd4cbac4b3ed2093d18e182bbf4c39 WHIRLPOOL 57b6b8369818d6957f292e0a7323bc499bd0f6c1ab23250453cc679eceba69390631d01029097284f3eb7cbc6c8c06cfafd5f9668e089e3b3a715e4cb0cdfad6
 AUX nano-2.3.1-ncurses-pkg-config.patch 1401 SHA256 dbb472978eb92d4a5518710daaa5861f20e2d2d29c9e683b5f1d125e303018c2 SHA512 83920c1b0a934cf025abffb8ce786373313233e2383ee8de683bb27fca47186958c7c0ebb8b117ae7eed31e1e158fc6339765fe988a60c17f6964cc802496e04 WHIRLPOOL 8c6eb4b7a134bb0d8a710e9499136673a628e761793caccd71edca73e047d3c99c6dfa797f19f585e13dd0addccb085e778b39510985af53d307e645c2884e7b
 AUX nano-2.3.1-shell-nanorc.patch 2089 SHA256 ca46218301c47fc2e0088cc109adc47d45dcd57425f98e7900d7e4a5ac3c0152 SHA512 e94a8345cd934f49833b2d415e7c72c266eeb04755ab6b986b42b86d3863235bc8f879429ba9e3336ec91d383dbd07eb95dcceaaae468ea6436c2c66dc1710e1 WHIRLPOOL 3dfa102243a615043e483005eb2fe48f87ba5e0b54bcdc8356e24601a99960ab27bcd8fe991def2f0de312be3c7bdc580e54d7cbc55f603e0c1b64f8b52c09b4
 AUX nano-2.3.2-bind-unbind-docs.patch 4732 SHA256 881060d028dc24ef55d80fff790971b5da633d92f0bce754fa88feb0df11537c SHA512 92badd7e08b326621a3dbba488b23988185d56e56e60054dc537926612e4e4c97755d73d902e171b3160039a488a9ba33dce8d6db56294b3b88cc7749588a9eb WHIRLPOOL 83e08cec1793132597aadffa8c994514e3a9ad5db93d5874dcf187ecd0c9729855cf1c63aa282179256154d6b2cb681c377e5a18e3d479ea6e56a4de3692f08f
@@ -28,22 +28,22 @@ EBUILD nano-2.3.1-r1.ebuild 2085 SHA256 a7b97a50b3c313d572d05d8fa708f556598820a4
 EBUILD nano-2.3.1-r2.ebuild 2282 SHA256 2dd46647f746f83b3ba8f20ea5404a7a1389ff7a4dbae72b1cf740ded4b27d0f SHA512 2bada0976f648b1932acc7ba7cc154248ad0d5ea77519d721eba9888329eace8bd2e7325f063797501ae67c4a9677d045df81d2df03d9ddbf4d081fdc4107fd5 WHIRLPOOL 4733384799f9ba600f993e9871c52d4b0ddc78de32916f49d29c02b1163208a523506c29dd60460bdcb486ede0940c0c51d61e3fd091befdd433a2318a22ee13
 EBUILD nano-2.3.1.ebuild 2226 SHA256 c5d2d20d13bf85f122958c5f169701aeda6e388fe34e16e4989e759534a1f155 SHA512 96c316e4f45a57310c4c2ffbae1dd07dec669f37b0323e28889a89ef3b2b7e1d1d6b9ab1d8c5c30f7a6a763572470742e97a4e3c7a1c53eda79a01593edf4f7c WHIRLPOOL 930349f02d5f79c4400f1388c80f6a0381f6f8e72dffb693d9a3534f968cef2a344d6a0811786ee5ea71114f371e14f208b99cb5716556940af57adef0c4e6a8
 EBUILD nano-2.3.2.ebuild 2348 SHA256 b59edfa34b0b3e11249169ad2328e13f4d4449079c2b50e4b31ccbfdef752fdd SHA512 427343e03984fcffa6925d36698d5e72a9f6fc699652701d38daeed67a0a19846c63b012ff76cbef164f1de301a8d02c232b113089ff452e26d5bf0bc5efa0fe WHIRLPOOL 81f02e60e62297c7ff766c48385eadb3bb76834b372f8adee745bbc191a0092602fa71e3fc4e41ffbffa2785eda98ab0c7dcba833e561cbdbe397e4dfbbc51ab
-MISC ChangeLog 35152 SHA256 fd344de5a6437a2b38e35c99137c63d625b817e7223624108dd27b1e11733c6d SHA512 9b30d40404f8d1e278da7c0a9138a19b9afce21dda137fef6781624e9759fd5d7e43ea010a7303e4373baac09ce8fd5e44e1e10dc8d367942671bc1c8af6961c WHIRLPOOL ebed003b6e209e31d65903d6668f21fe4f6909ce8885acc9b5b7108ba37a683c1e8cbde445700b88561b6ae7684a3c30b41d3e904eb713141309b8cc7c69f0e9
+MISC ChangeLog 35305 SHA256 58845d8f7c36872719208bde8be03ebc7bdb6d0201c6c5bac9c62392029554f9 SHA512 3e02989f5b85b7be328d318a20039ff7728ed6144f9727866a20ed5eb5999f4d98059bd9d6efb8044e6f38887d16797ac7ae54c2919527f551571e19a62ffc6b WHIRLPOOL d1e50384cdbd9367996fe0529aaec9f72d570938a927242605eb3106ee9c44b89b1ecffe2eda4510084f80820e1b0c70779f7c3f8f0521828c88f786f4da0d79
 MISC metadata.xml 1495 SHA256 b6af8e3dc22f6d9ea0acd4b446469298e8bff0ca8834aa56fe0a6baa129399c9 SHA512 b2e0ec89520c02263d660a5a3d570e426999967af183344b066b2dd293fc958018f7c360a1df02ae5207b24f32914bc800311ea985043c60459a83abdf237da9 WHIRLPOOL 138f93840416fd75eefccaa6cf48d4f5fd908987b505ba4621157e85ca997dc1f6cc6bbf21059d8b0dec3f358605547a364a5b4982b8f43b52fe6d1be130da81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSDQp6AAoJELEHsLL7fEFWf/EP/2wmrxmzXKTupRBM+HP0Q/u+
-osXshRYH6gwJadzC5vF+0prAIqPn+pZMcaOJBEqYmxVWa631Z5qqWk5Iou0fBw/f
-iXTWS5ezWXb0fFl4TeS1LKZRp3zACw4IFrZCm6Bqj4qIXKu1HspPisjDXN7qhhIQ
-FdqEo+C/55DACSrXQghVhnzPoyPBb5wtz6YJ/9fYgIZycn65egYkCXdoz3vtk7QY
-BKHcGZ62kNWrKSMFMIYWR5fjTKFZKlhjoTggK7XLO2rgspqhXlvDv4ZbwpHTKDnZ
-C1Vk0L10gk/QJdPT10mjmv9I7OO5fgjsjKq3ytb4B8JJ3tLHT5sBuv71nQiDljii
-8WGQ2MW6CIGud2eSqHj5Xx8EIichdGpldTgwpFvtltj8k2vZg/7MHWy5HpHyxscZ
-kXLhaRORwXzmLrNFZ2pqBeF81npiSizAy13Q6BpOneUIb+YJdDoVtUmkZ5eY8w3O
-QFI7ztE1lh5TyZscgd7YL33AHS/6qT/P40jkY4DBLqUDRN/UuFlcwpr3YTBSityr
-SEl47BsxsRUHJrifo2c3mxF5qXIuypjgZQ6UzyThGPHx78Ad1KBbTc1iaIWMSW17
-HOPpXhsUnEFKbvCA96Mk/OmDSfBz/kB2ck6cnjyuuQvG4bkDEFMkdf7SU4hg+Lsq
-t9zkgtgWUDwBjBzZLCKN
-=JfrK
+iQIcBAEBCAAGBQJSRrn0AAoJELEHsLL7fEFWGXcP/1Bc86q/ZT20NVaZ8+AOZPc1
+8iWYaFQA4PNtQuyz3SM33GA4sOw2smEm9/+GI3WNjIrg7Jqdov3aUG71P3H/X69o
+RQjNfLCmgh9chYIKXmtOC+5fo6qvefPEt3bLPC73fJNSmV7e3Ld8OAjaHgYWaX9A
+L3QDLZcEgePhHxvDEkzd6f6nEeOeJgERzmUcPILUS+k0A85K89qmHU8gejglBO5n
+hWaz8zXPC1/lxDG8bv5PgBv0GbcdJBhKqIE71QV7RqlzGAblyZ+TvjyX0oPF61v2
+/Ls0f8NlqOWuD9av0n9caX2iFwDlVIe0BQ2okN4fD/LlZSJC3poAGk80OIjupOuG
+3Ljsw2zlGWoplIowgE8IgEg3ettsADbx0os8HDeRRurPNeyXP34q7t3wWdf5x1St
+0/sqBFPm/ci0YTIlNa/ITiB8646lMVaG5RArM+KdSCrcJuJoXr3i6EYGIbde0R3L
+yIYDx8QIoJZSveyR/nreWknHyL+Bb4kd6RxjkBlDIFWoi8w6c7MujvOdUHNL6vte
+Ru65cQZ2H83hsG/2xdeejf5Hbf6HFwM7pVwlyBUdr5V+MqxbQSFcBxDC5mgdUQXa
+2SKRw5RAwdfzj0III/muelGW5DBwRVRDJLHK57wqK8EV191EiF8lcPD9sGs9picE
+BaC+YGLEdnpaw5PQxCcH
+=rOuh
 -----END PGP SIGNATURE-----
diff --git a/app-editors/nano/files/nano-2.3.1-gentoo-nanorc.patch b/app-editors/nano/files/nano-2.3.1-gentoo-nanorc.patch
index 2fed6f0c9678..2dad1d3c6699 100644
--- a/app-editors/nano/files/nano-2.3.1-gentoo-nanorc.patch
+++ b/app-editors/nano/files/nano-2.3.1-gentoo-nanorc.patch
@@ -1,4 +1,4 @@
-From b7e6bbe4ee980a5bb166bae8cd5603301cb6e22f Mon Sep 17 00:00:00 2001
+From 7051588fee7a20a69c67c8899b3e6c35ebf51fbf Mon Sep 17 00:00:00 2001
 From: Mike Frysinger <vapier@gentoo.org>
 Date: Sat, 25 Aug 2012 23:03:22 -0400
 Subject: [PATCH] gentoo syntax: update
@@ -9,11 +9,11 @@ Much of this is based on work by Davide.
 Reported-by: Davide Pesavento <pesa@gentoo.org>
 Signed-off-by: Mike Frysinger <vapier@gentoo.org>
 ---
- doc/syntax/gentoo.nanorc |   44 ++++++++++++++++++++++++++------------------
- 1 file changed, 26 insertions(+), 18 deletions(-)
+ doc/syntax/gentoo.nanorc | 46 +++++++++++++++++++++++++++-------------------
+ 1 file changed, 27 insertions(+), 19 deletions(-)
 
 diff --git a/doc/syntax/gentoo.nanorc b/doc/syntax/gentoo.nanorc
-index 2ad1597..55dd101 100644
+index 2ad1597..ad89fce 100644
 --- a/doc/syntax/gentoo.nanorc
 +++ b/doc/syntax/gentoo.nanorc
 @@ -2,30 +2,38 @@
@@ -73,6 +73,15 @@ index 2ad1597..55dd101 100644
  ## Highlight comments (doesnt work that well)
  color yellow "(^|[[:space:]])#.*$"
  ## Highlight strings (doesnt work that well)
+@@ -35,7 +43,7 @@ color ,green "[[:space:]]+$"
+ 
+ ## Here is an example for Portage control files
+ ##
+-syntax "/etc/portage" "\.(keywords|mask|unmask|use)(/.+)?$"
++syntax "/etc/portage" "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$"
+ ## Base text:
+ color green "^.+$"
+ ## Use flags:
 -- 
-1.7.9.7
+1.8.3.2