gentoo resync : 14.07.2018

7 files changed, 0 insertions, 231 deletions

diff --git a/app-misc/grc/files/conf.configure b/app-misc/grc/files/conf.configure
deleted file mode 100644
index 8f26c601eba8..000000000000
--- a/app-misc/grc/files/conf.configure
+++ /dev/null
@@ -1,27 +0,0 @@
-# cache functions
-regexp=\b(loading|updating|creating) cache\b
-colours=yellow bold
-.........
-# checking
-regexp=\bchecking\s*(for|if|whether|command|how|that)?(\s*to)?\b
-colours=yellow
-.........
-# result is complex
-regexp=\.\.\. .*$
-colours=cyan
-.........
-# check succeeded
-regexp=\.\.\.( \(cached\))? yes$
-colours=blue bold
-.........
-# check did not succeed
-regexp=\.\.\.( \(cached\))? no$
-colours=magenta
-.........
-# ... should be normal
-regexp=\.\.\.
-colours=default
-.........
-# creating stuff
-regexp=\bcreating\b
-colours=green
diff --git a/app-misc/grc/files/grc-1.4-ipv6.patch b/app-misc/grc/files/grc-1.4-ipv6.patch
deleted file mode 100644
index 81945ea42618..000000000000
--- a/app-misc/grc/files/grc-1.4-ipv6.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- conf.netstat | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/conf.netstat b/conf.netstat
-index 2dd96e3..ec2779b 100644
---- a/conf.netstat
-+++ b/conf.netstat
-@@ -19,7 +19,7 @@ regexp=^IPX.*[\dABCDEF]+:[\dABCDEF]+
- colours=green
- =======
- # protocols
--regexp=(^tcp|^udp|^unix|^IPX|STREAM|DGRAM)
-+regexp=(^tcp6|^tcp|^udp6|^udp|^unix|^IPX|STREAM|DGRAM)
- colours=bold blue
- =======
- # status
diff --git a/app-misc/grc/files/grc-1.4-support-more-files.patch b/app-misc/grc/files/grc-1.4-support-more-files.patch
deleted file mode 100644
index d90fe86bb16f..000000000000
--- a/app-misc/grc/files/grc-1.4-support-more-files.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- grc-1.4.orig/conf.gcc
-+++ grc-1.4/conf.gcc
-@@ -1,7 +1,7 @@
- # 
--regexp=\bgcc\b
--colours=yellow
--count=more
-+regexp=\b(g?cc|[gc]\+\+|g?as|ld)\b
-+colours=white bold
-+count=once
- .........
- # 
- regexp=^[^:\s]*?:\d+:
-@@ -15,6 +15,10 @@
- regexp=\`[A-Za-z0-9_():&*]+( const)?\'
- colours=magenta
- .........
-+# compilation method modifiers
-+regexp=\s\-(O\d?|f\S+|pthread|g\S*|c|W\S,\S+)\b
-+colours=yellow
-+.........
- # -O
- regexp=\-O\d 
- colours=green
-@@ -27,7 +31,7 @@
- # stderr to grcat 
- #
- # warning
--regexp=warning:.*
-+regexp=[Ww]arning[:\b]
- colours=white
- .........
- regexp=warning:
-@@ -35,7 +39,7 @@
- count=once
- .........
- # error
--regexp=error:.*
-+regexp=[Ee]rror[:\b]
- colours=bold white
- .........
- regexp=error:
---- grc-1.4.orig/grc.conf
-+++ grc-1.4/grc.conf
-@@ -19,7 +19,7 @@
- conf.traceroute
- 
- # gcc command
--(^|[/\w\.]+/)g?cc\s
-+(^|[/\w\.]+/)(g?cc|[gc]\+\+)\s
- conf.gcc
- 
- # make command
diff --git a/app-misc/grc/files/grc-1.9-bash.patch b/app-misc/grc/files/grc-1.9-bash.patch
deleted file mode 100644
index 5e1dcda299ee..000000000000
--- a/app-misc/grc/files/grc-1.9-bash.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1d4f9e1ca5a27426da4dcbd3caee1e38b5d272aa Mon Sep 17 00:00:00 2001
-From: Justin Lecher <jlec@gentoo.org>
-Date: Tue, 27 Dec 2016 13:17:27 +0000
-Subject: [PATCH] Use bash internal functionalities for grc detection
-
-which is an external tool, where as type is a bash internal funciton
-and always available
-
-Signed-off-by: Justin Lecher <jlec@gentoo.org>
----
- grc.bashrc | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/grc.bashrc b/grc.bashrc
-index e9eba08..54e570d 100644
---- a/grc.bashrc
-+++ b/grc.bashrc
-@@ -1,6 +1,5 @@
--GRC=`which grc`
--if [ "$TERM" != dumb ] && [ -n "$GRC" ]
--then
-+GRC="$(type -p grc)"
-+if [ "$TERM" != dumb ] && [ -n "$GRC" ]; then
-     alias colourify="$GRC -es --colour=auto"
-     alias configure='colourify ./configure'
-     alias diff='colourify diff'
diff --git a/app-misc/grc/files/grc-1.9-configure.patch b/app-misc/grc/files/grc-1.9-configure.patch
deleted file mode 100644
index 66dc4ceda80d..000000000000
--- a/app-misc/grc/files/grc-1.9-configure.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 6d7ab5f6486c6d30a685605aa5b0ecfda0434e86 Mon Sep 17 00:00:00 2001
-From: Justin Lecher <jlec@gentoo.org>
-Date: Tue, 27 Dec 2016 17:32:48 +0000
-Subject: [PATCH] More advanced regex for configure colouring
-
-Signed-off-by: Justin Lecher <jlec@gentoo.org>
----
- conf.configure | 21 +++++++++++++++++----
- 1 file changed, 17 insertions(+), 4 deletions(-)
-
-diff --git a/conf.configure b/conf.configure
-index ac88ec7..e7b5d89 100644
---- a/conf.configure
-+++ b/conf.configure
-@@ -1,14 +1,27 @@
--regexp=^checking
-+# cache functions
-+regexp=\b(loading|updating|creating) cache\b
-+colours=yellow bold
-+.........
-+# checking
-+regexp=\bchecking\s*(for|if|whether|command|how|that)?(\s*to)?\b
- colours=bold blue
- .........
-+# result is complex
- regexp=\.\.\. .*$
- colours=bold yellow
- .........
--regexp=\.\.\. yes$
-+# check succeeded
-+regexp=\.\.\.( \(cached\))? yes$
- colours=bold cyan
- .........
--regexp=\.\.\. no$
-+# check did not succeed
-+regexp=\.\.\.( \(cached\))? no$
- colours=bold red
- .........
--regexp=\.\.\.[ ]
-+# ... should be normal
-+regexp=\.\.\.
- colours=default
-+.........
-+# creating stuff
-+regexp=\bcreating\b
-+colours=green
diff --git a/app-misc/grc/files/grc-1.9-domain-match.patch b/app-misc/grc/files/grc-1.9-domain-match.patch
deleted file mode 100644
index f00fecd7c67a..000000000000
--- a/app-misc/grc/files/grc-1.9-domain-match.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 2e422109af7094d2787660f7841e7c2ab10bbcc8 Mon Sep 17 00:00:00 2001
-From: Pavel Vishnyakov <djhumster@gmail.com>
-Date: Thu, 17 Dec 2015 18:00:37 +0300
-Subject: [PATCH] Update conf.traceroute
-
-More correct way to match domains with any length.
-Can be checked her https://regex101.com/r/dI3jQ3/1
----
- conf.traceroute | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/conf.traceroute b/conf.traceroute
-index b6501a2..983a7cd 100644
---- a/conf.traceroute
-+++ b/conf.traceroute
-@@ -1,5 +1,5 @@
- # hostname
--regexp=\s\w+[\w\-\.]+\w+
-+regexp=\w+[\w\-\.]+\.[a-z]+
- colours=bold yellow
- count=once
- -
diff --git a/app-misc/grc/files/grc-1.9-python3.patch b/app-misc/grc/files/grc-1.9-python3.patch
deleted file mode 100644
index 9f4db14a2eec..000000000000
--- a/app-misc/grc/files/grc-1.9-python3.patch
+++ /dev/null
@@ -1,41 +0,0 @@
- grc   | 2 ++
- grcat | 8 +++-----
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/grc b/grc
-index 56a53b4..19afe7c 100755
---- a/grc
-+++ b/grc
-@@ -1,5 +1,7 @@
- #! /usr/bin/python
- 
-+from __future__ import print_function
-+
- import os, re, string, sys, getopt, signal
- 
- def version():
-diff --git a/grcat b/grcat
-index a4e6dd9..16586e2 100755
---- a/grcat
-+++ b/grcat
-@@ -1,5 +1,7 @@
- #! /usr/bin/python
- 
-+from __future__ import print_function
-+
- import sys, os, string, re, signal, errno
- 
- #some default definitions
-@@ -140,11 +142,7 @@ while not is_last:
-     # do not try to understand the optimized form below :-)
-     if 'colours' in ll:
-         colstrings = list(
--                        map(
--                            lambda colgroup:
--                                ''.join(map(lambda x: get_colour(x), split(colgroup))),
--                                split(ll['colours'], ',')
--                            )
-+                        [''.join([get_colour(x) for x in split(colgroup)]) for colgroup in split(ll['colours'], ',')]
-                         )
-         ll['colours'] = colstrings
-