gentoo resync : 14.07.2018

12 files changed, 411 insertions, 0 deletions

diff --git a/app-misc/grc/Manifest b/app-misc/grc/Manifest
new file mode 100644
index 000000000000..48519013ed77
--- /dev/null
+++ b/app-misc/grc/Manifest
@@ -0,0 +1,14 @@
+AUX conf.configure 530 BLAKE2B 37d8b045c0938355f3c9d0f2150cb61c908fef06980252fdb32ee6ce1db9daf586631bff2578fb9f87aba8597c6238ec51a8f5821ed26b00a0f66d7cadc940dd SHA512 3db952ed800a959f5a69c52c0b1b2c36e3374547469fc437f82cc30271f813cf0ddec8719b4a20b4fedb3df411f9e526cef5cfec5823b663cce1ef8a2270955b
+AUX grc-1.4-ipv6.patch 408 BLAKE2B cf4abbae1b67b5390428e82d0e0053d2c3f828fbc22aeabed52fe2449cc6f11cf62d3aaf03846ed0d5255081ecb869992d5bf9fe0e879d75ff1947fbb2df1e39 SHA512 e84fe2b3de351ab24a86e97004b83e5494cde1147c447f3ed2cb354bdb7173180738c8b760efea780d71d536473904f97d9c04ff86c19e947b47ca1f963c0dc0
+AUX grc-1.4-support-more-files.patch 901 BLAKE2B a625da501d47451d5bda0e12f170af7df9f20d3d8848128cf9afa8013cffb9330aa2634c4243dc1a2e6d117d6ad4b2eea9cc9a3c4bc25b5983e53262b98e9e3b SHA512 0483c4d7adea1d813f62f7485845b470415f032726aae456fabab27486e26707931b70a12671b3e291528688e1546cb89d2cca7839b40cc2f365a6760d39edd7
+AUX grc-1.9-bash.patch 805 BLAKE2B f585f33bc8d04e8beecc54b36dab4db0bb4270ba388da93561e904696d9142749f2cc7dc48611f34919fddc4daaaf61e8603c8e4d8785b48d718c98c01858adc SHA512 75163dd8e5fc696a534291b09be0c18529ee3a7656886970ff60d65cd5fe6f3fd3bb3cd4f34237648b4fbd780482ec1b6bf496d806b8e0cd31334f33f59248f4
+AUX grc-1.9-configure.patch 1132 BLAKE2B ba7453be971fc34f5ed950415327a8192b539fad53e73012659feb4f10ddfa1b7562e76ad6c736bc9bb23ce78dc29e1080c90735529d08fbdaa050653c03673e SHA512 ddbda30c650418a6900f072aa45dc45b2162d9c20c94dcef212b44e0a7f70d169f8eccd2200ca60b4be711b2e367ad5e8e2fa7f9ed4d041b34387370ac872d17
+AUX grc-1.9-domain-match.patch 613 BLAKE2B b61bdcab166d180051e18e7ce26553faf809e7cbcbfe3a5241e322f0ba5b1f5e0743a9341d678bc5c6b418acf845f55c54da58d57bb2f42e96d20db975cc97f1 SHA512 1427c000d0401abc7dff052759c07cdc460c11ee10acb2994c414f269a94ef209ce1aa20a1717f2be7e95af9f2d1bd16ed0303906a135cb1c8fcbaa54c0558c0
+AUX grc-1.9-python3.patch 1124 BLAKE2B 2f7f6348aa9199124ee01763b1bfde93bbe69a5a441161df468230c4c09a869ea2c0725b560bdcf57d83fc7b47941e3bff6fcda72eadd327bac563a09b396d14 SHA512 275f45634f7d15eea8c359cf5850421ac0b057da987f053717da5ef15b82e4613051ab12f84e78ee809e71bd55382532b73d3731cdf4a10421c2e7622a236a3a
+DIST grc-1.11.tar.gz 43224 BLAKE2B 40fe050f1198dadd039ad91fedf279ad5e913e803a669335ee21158f7f9702f3fd65ee5876595b9a4ce46da2f7f3c2cc589bf7ea3e10d84c37b5f20677ed626b SHA512 abaa18aeebf9858369b639975ae6c9a33f3111beb783b4e86463ace70de1d660efc6c17b05020862c3b2f467310f0974443f96d4f91cd322a90731c4be49206c
+DIST grc-1.9.tar.gz 29252 BLAKE2B f74c44e7166ba9dae7ccd90ef241c01d56cf860001dca81873c0078c1702c780dd49ce7ed03774a36aa1e4564d39f2a90932aadb8b20d8ed2f0741aae831d154 SHA512 947f4b61a8d4061e99d64e25a7b5ca2bcd042580b537ea07ea6ca609d7b81b1976b301de6036be2c199c7fa25c3f32d41a887f811ad72a1a18dd63d284e61050
+DIST grc_1.5.tar.gz 26363 BLAKE2B a4345b509581141b4fa8aeeaaf3a851b021c9314e2173e3a5485105f20182a2ecff8d0829537b24d1c972520cc78837d8050f7e9e0a6e615789b227ec964ccc3 SHA512 6b95a8db5df0d99b49052deb086ac02b180810ce754c744e145e3e0508562fb632e7fdb38ec4ad039f6e998c4122b065ba53925d73268c589475e36c16aa68d7
+EBUILD grc-1.11-r1.ebuild 1380 BLAKE2B f917b77202d0f9062fa92401cdbef4fbcf212784c16c9544ac1c60e363999afe903fbb43ddec44cd0a6a330d1d7b07543fe2b3423924b2c157d8ebea559ce8a4 SHA512 84c284607ff821ca46f058df24a9eda3f0d0fc10984aae05f05d5918f6d5f1b6918c5df616bbcc9b04bd898349496fdd73fb1f1c79590bcc021b23666d6532e0
+EBUILD grc-1.5.ebuild 902 BLAKE2B 9e822a2eb28b034ed4e4cb4497de4991446e69042f3879c416d803b1131120b05f6caa8c7cd3a4c6350ab20705df60d90d73e045ac944e26425b62a708f3b035 SHA512 e144282e3bfe98e19c203144308da05f3478dfd1e55027d5479d76a889dd1d7bda0dbb77640b45431b6cf5e466a8ce72ae9823bf6c35cb524851dc90aeab2f6b
+EBUILD grc-1.9.ebuild 1300 BLAKE2B 7f6a448b961f887cdf0231968b28e569f9fefafd2544efc10aa538d3758c2ef2bc333bfed6c5cb70dbd02f97a22046af6835dab9814114eba56d57e354cf970c SHA512 598ea4d295763dcb49e9b22528a372e9874a21c6fa4dc4ab69754326942773e83c53fd8d4314d60068b4c7102a4e15eeb75dbfb1abe3d32d54a06f5e51159080
+MISC metadata.xml 351 BLAKE2B b542ab1f09e03d0fcd473a1d364c557732f0ebd865398da2bf6b322987c0bf22d916d642dcb73c0c7c72d57f7eb41caa0aff1456b49dedb0895a5f5c31f3721a SHA512 39fabd038b08bc0fb057be0d211272b65d94cd9f1afedfd576138be1ddc1748fd673684b1c407649409f2834024cad324f78564348e9da570cde26be3282bc8b
diff --git a/app-misc/grc/files/conf.configure b/app-misc/grc/files/conf.configure
new file mode 100644
index 000000000000..8f26c601eba8
--- /dev/null
+++ b/app-misc/grc/files/conf.configure
@@ -0,0 +1,27 @@
+# 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
new file mode 100644
index 000000000000..81945ea42618
--- /dev/null
+++ b/app-misc/grc/files/grc-1.4-ipv6.patch
@@ -0,0 +1,16 @@
+ 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
new file mode 100644
index 000000000000..d90fe86bb16f
--- /dev/null
+++ b/app-misc/grc/files/grc-1.4-support-more-files.patch
@@ -0,0 +1,53 @@
+--- 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
new file mode 100644
index 000000000000..5e1dcda299ee
--- /dev/null
+++ b/app-misc/grc/files/grc-1.9-bash.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000000..66dc4ceda80d
--- /dev/null
+++ b/app-misc/grc/files/grc-1.9-configure.patch
@@ -0,0 +1,46 @@
+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
new file mode 100644
index 000000000000..f00fecd7c67a
--- /dev/null
+++ b/app-misc/grc/files/grc-1.9-domain-match.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000000..9f4db14a2eec
--- /dev/null
+++ b/app-misc/grc/files/grc-1.9-python3.patch
@@ -0,0 +1,41 @@
+ 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
+ 
diff --git a/app-misc/grc/grc-1.11-r1.ebuild b/app-misc/grc/grc-1.11-r1.ebuild
new file mode 100644
index 000000000000..516d79b6b948
--- /dev/null
+++ b/app-misc/grc/grc-1.11-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy )
+
+inherit eutils python-r1
+
+DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
+HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"
+SRC_URI="https://github.com/garabik/grc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed \
+		-e 's:#! :#!:g' \
+		-e 's:3$::g' \
+		-i grc grcat || die
+	default
+}
+
+src_install() {
+	python_foreach_impl python_doscript grc grcat
+
+	insinto /usr/share/grc
+	doins \
+		contrib/mrsmith/conf.* \
+		colourfiles/conf.* \
+		grc.bashrc \
+		grc.fish \
+		grc.zsh
+
+	insinto /etc
+	doins grc.conf
+
+	dodoc README.markdown INSTALL TODO debian/changelog CREDITS Regexp.txt
+	doman *.1
+}
+
+pkg_postinst() {
+	elog
+	elog "Shell specific configurations can be found in ${ROOT}usr/share/grc"
+	elog "Be sure to symlink one to use grc globally:"
+	elog
+	elog "    ln -s ${ROOT}usr/share/grc.SHELL ${ROOT}etc/profile.d/grc.sh"
+	elog
+	elog "Replace 'SHELL' in the above command with one of: bashrc, fish, zsh."
+	elog "Afterwards, use '. ${ROOT}etc/profile' to activate grc in existing"
+	elog "shell sessions."
+	elog
+}
diff --git a/app-misc/grc/grc-1.5.ebuild b/app-misc/grc/grc-1.5.ebuild
new file mode 100644
index 000000000000..b20233047ba5
--- /dev/null
+++ b/app-misc/grc/grc-1.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit eutils python-r1
+
+DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
+HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"
+SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.4-support-more-files.patch \
+		"${FILESDIR}"/${PN}-1.4-ipv6.patch
+}
+
+src_install() {
+	python_foreach_impl python_doscript grc grcat
+
+	insinto /usr/share/grc
+	doins conf.* "${FILESDIR}"/conf.*
+
+	insinto /etc
+	doins grc.conf
+
+	dodoc README INSTALL TODO debian/changelog CREDITS
+	doman grc.1 grcat.1
+}
diff --git a/app-misc/grc/grc-1.9.ebuild b/app-misc/grc/grc-1.9.ebuild
new file mode 100644
index 000000000000..8a0b5413f882
--- /dev/null
+++ b/app-misc/grc/grc-1.9.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy )
+
+inherit eutils python-r1
+
+DESCRIPTION="Generic Colouriser beautifies your logfiles or output of commands"
+HOMEPAGE="http://kassiopeia.juls.savba.sk/~garabik/software/grc.html"
+SRC_URI="https://github.com/garabik/grc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# https://github.com/garabik/grc/pull/44
+	"${FILESDIR}"/${PN}-1.4-support-more-files.patch
+	# https://github.com/garabik/grc/pull/43
+	"${FILESDIR}"/${PN}-1.4-ipv6.patch
+	# https://github.com/garabik/grc/pull/9
+	"${FILESDIR}"/${P}-domain-match.patch
+	# https://github.com/garabik/grc/pull/45
+	"${FILESDIR}"/${P}-python3.patch
+	# https://github.com/garabik/grc/pull/46
+	"${FILESDIR}"/${P}-bash.patch
+	# https://github.com/garabik/grc/pull/47
+	"${FILESDIR}"/${P}-configure.patch
+)
+
+src_install() {
+	python_foreach_impl python_doscript grc grcat
+
+	insinto /usr/share/grc
+	doins \
+		mrsmith/conf.* \
+		conf.* \
+		grc.bashrc
+
+	insinto /etc
+	doins grc.conf
+
+	dodoc README INSTALL TODO debian/changelog CREDITS Regexp.txt
+	doman *.1
+}
diff --git a/app-misc/grc/metadata.xml b/app-misc/grc/metadata.xml
new file mode 100644
index 000000000000..d65cd2e407ea
--- /dev/null
+++ b/app-misc/grc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">garabik/grc</remote-id>
+  </upstream>
+</pkgmetadata>