[gentoo-commits] repo/gentoo:master commit in: sys-apps/grep/, sys-apps/grep/files/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     e2a11e4705ce1f1c47cb097dbdf1f6da6df67c3f
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 14:01:21 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 14:01:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2a11e47

sys-apps/grep: Removed old.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/grep/Manifest                             |  1 -
 .../files/grep-2.28-multiple_pattern_fix.patch     | 97 ----------------------
 sys-apps/grep/grep-2.28-r1.ebuild                  | 51 ------------
 3 files changed, 149 deletions(-)

diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 9de6005058..64d215a3f0 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,4 +1,3 @@
 DIST grep-2.25.tar.xz 1327856 SHA256 e21e83bac50450e0d0d61a42c154ee0dceaacdbf4f604ef6e79071cb8e596830 SHA512 7a738f938dde350ae71eb87083586e25768ba392113cba973a4e567b476c788ca66e0736d63f5e0e12a7847fa70379dc0b6568ec92431ea4604acd2cbedd66c1 WHIRLPOOL af46fb0fdf2f271dc31a4902271881aab571d9705a18625c247920f82894b0358a2788e6c7625405c968ea717397ea52802073e4b4fa871121f8f77edc62e748
 DIST grep-2.27.tar.xz 1360388 SHA256 ad4cc44d23074a1c3a8baae8fbafff2a8c60f38a9a6108f985eef6fbee6dcaeb SHA512 d67f16cc5f931a455d5287badbaf080967da573d290430f440e578a563cff4f4c0c2668f60dbb8bc71eaed289f075957006c10c6827f0da1a49df49efd3f0781 WHIRLPOOL f1bd591f60998a5515f661ddd576593a3f24f8ea2e7c2ae5a94699da53cf98ba3bc422c3577ea6c05be48544ac6c2382d3da000e52aeb2affa05d75ef0617af9
-DIST grep-2.28.tar.xz 1374532 SHA256 3bad4c23eeb8dfa2fa84cdbe368398f75fdcd54bde411db83b9ef7fba5b60185 SHA512 7c1f054cf6a483fc43df51597b0b54df692169dbb6ff1f34918cc418786a8987e1dbeed00a5c08cc849fb74ae1c65b8e4dd9663ff1425dfb36bc636c312ad189 WHIRLPOOL 1003b1046a56e728e0d3790bbcd08eb1a93c72575cb35bfedfb7286c11a6b79b4dca695a683b32f6dee1c58583e0930c7a54025a6f603532e7e1d8acf2dfbd10
 DIST grep-3.0.tar.xz 1375156 SHA256 e2c81db5056e3e8c5995f0bb5d0d0e1cad1f6f45c3b2fc77b6e81435aed48ab5 SHA512 0e9a00df9d492f399230bae0264942edaf64bb926f93edb7922f27b075a86ba0a78698f54996cc522b6261aa01a8ecbeadeb68523d4470a9941f242c3ae24c58 WHIRLPOOL 656271228bbbc3550560d2f4ec80031a8b0d9c662447afeea6e3c65c859dadde244af8c32ce03681495b3e86913468344fc29a5a52a53aa04eb5963b3a8a9529

diff --git a/sys-apps/grep/files/grep-2.28-multiple_pattern_fix.patch b/sys-apps/grep/files/grep-2.28-multiple_pattern_fix.patch
deleted file mode 100644
index f6cf64d383..0000000000
--- a/sys-apps/grep/files/grep-2.28-multiple_pattern_fix.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 6e4c8728f0e75af57f839625d0bd51b0a02d091e Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Wed, 8 Feb 2017 13:00:11 -0800
-Subject: grep: do not mishandle \. in multiple patterns
-
-Problem reported by Lars Wendler (Bug#25655).
-* NEWS: Document this.
-* src/grep.c (try_fgrep_pattern): Fix typo that prevented
-keys from being properly updated.
-* tests/foad1: Test for the bug.
----
- src/grep.c  | 15 ++++++++-------
- tests/foad1 |  7 +++++++
- 3 files changed, 20 insertions(+), 7 deletions(-)
-
-diff --git a/src/grep.c b/src/grep.c
-index 81654c3..74acb0b 100644
---- a/src/grep.c
-+++ b/src/grep.c
-@@ -2361,11 +2361,12 @@ try_fgrep_pattern (int matcher, char *keys, size_t *len_p)
-   size_t len = *len_p;
-   char *new_keys = xmalloc (len + 1);
-   char *p = new_keys;
-+  char const *q = keys;
-   mbstate_t mb_state = { 0 };
- 
-   while (len != 0)
-     {
--      switch (*keys)
-+      switch (*q)
-         {
-         case '$': case '*': case '.': case '[': case '^':
-           goto fail;
-@@ -2377,7 +2378,7 @@ try_fgrep_pattern (int matcher, char *keys, size_t *len_p)
- 
-         case '\\':
-           if (1 < len)
--            switch (keys[1])
-+            switch (q[1])
-               {
-               case '\n':
-               case 'B': case 'S': case 'W': case'\'': case '<':
-@@ -2391,7 +2392,7 @@ try_fgrep_pattern (int matcher, char *keys, size_t *len_p)
-                   goto fail;
-                 /* Fall through.  */
-               default:
--                keys++, len--;
-+                q++, len--;
-                 break;
-               }
-           break;
-@@ -2401,20 +2402,20 @@ try_fgrep_pattern (int matcher, char *keys, size_t *len_p)
-         size_t n;
-         if (match_icase)
-           {
--            int ni = fgrep_icase_charlen (keys, len, &mb_state);
-+            int ni = fgrep_icase_charlen (q, len, &mb_state);
-             if (ni < 0)
-               goto fail;
-             n = ni;
-           }
-         else
-           {
--            n = mb_clen (keys, len, &mb_state);
-+            n = mb_clen (q, len, &mb_state);
-             if (MB_LEN_MAX < n)
-               goto fail;
-           }
- 
--        p = mempcpy (p, keys, n);
--        keys += n;
-+        p = mempcpy (p, q, n);
-+        q += n;
-         len -= n;
-       }
-     }
-diff --git a/tests/foad1 b/tests/foad1
-index 286c449..0163f1a 100755
---- a/tests/foad1
-+++ b/tests/foad1
-@@ -137,6 +137,13 @@ grep_test "$x2" "$y2" -F -w --color=always bc
- grep_test "$x3" "$y3" -E -w --color=always bc
- grep_test "$x3" "$y3" -F -w --color=always bc
- 
-+# Bug#25655
-+grep_test .tar/ .tar/ -e '\.tar' -e '\.tbz'
-+grep_test .tar/ .tar/ -o -e '\.tar' -e 'tar'
-+grep_test '$*.[^\/' '$*.[^\/' -o -e '\$\*\.\[\^\\' -e abc
-+grep_test '$*.[^\/(+?{|/' '$*.[^\/(+?{|/' -o -E \
-+          -e '\$\*\.\[\^\\' -e '\(\+\?\{\|'
-+
- # Skip the rest of the tests - known to fail. TAA.
- Exit $failures
- 
--- 
-cgit v1.0-41-gc330
-

diff --git a/sys-apps/grep/grep-2.28-r1.ebuild b/sys-apps/grep/grep-2.28-r1.ebuild
deleted file mode 100644
index dc112782f9..0000000000
--- a/sys-apps/grep/grep-2.28-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="GNU regular expression matcher"
-HOMEPAGE="https://www.gnu.org/software/grep/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-	mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls pcre static"
-
-LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	nls? ( virtual/libintl )
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	static? ( ${LIB_DEPEND} )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-multiple_pattern_fix.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	sed -i \
-		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
-		src/egrep.sh || die #523898
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	# Always use pkg-config to get lib info for pcre.
-	export ac_cv_search_pcre_compile=$(
-		usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" ''
-	)
-	econf \
-		--bindir="${EPREFIX}"/bin \
-		$(use_enable nls) \
-		$(use_enable pcre perl-regexp)
-}