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
+++ /dev/null
-# 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
+++ /dev/null
- 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
+++ /dev/null
---- 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
+++ /dev/null
-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'
+++ /dev/null
-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
+++ /dev/null
-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
- -
+++ /dev/null
- 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
-
+++ /dev/null
-# 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
-}
+++ /dev/null
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_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
-}
projects / gentoo.git / commitdiff