1 |
commit: 7a182b78abf97a3b936aff9fb4facf13b7ed8b4e |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 28 14:26:11 2018 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 28 14:26:11 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a182b78 |
7 |
|
8 |
sys-apps/grep: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
11 |
|
12 |
sys-apps/grep/Manifest | 1 - |
13 |
sys-apps/grep/files/grep-2.27-splice.patch | 60 ------------------------------ |
14 |
sys-apps/grep/grep-2.27-r1.ebuild | 46 ----------------------- |
15 |
3 files changed, 107 deletions(-) |
16 |
|
17 |
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest |
18 |
index a90650adb75..d9491ea9585 100644 |
19 |
--- a/sys-apps/grep/Manifest |
20 |
+++ b/sys-apps/grep/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
-DIST grep-2.27.tar.xz 1360388 BLAKE2B ed750fa7a6aea389c8f096acc9ac9cdebc9561c4b0cedfd5415ef033dd90076d5b9a42fa97c97207474b250ac0c4e4ed3c2ff216fe4462ac80baa6e47a2b90eb SHA512 d67f16cc5f931a455d5287badbaf080967da573d290430f440e578a563cff4f4c0c2668f60dbb8bc71eaed289f075957006c10c6827f0da1a49df49efd3f0781 |
23 |
DIST grep-3.0.tar.xz 1375156 BLAKE2B 19f5441ed3fe5bb16d9d8327e76f0beb7eb837b727f6da99844dc9c74eb4def9eab857059c527e651758fa224a6f4079ec5939806645806f2db341ed0cb727e4 SHA512 0e9a00df9d492f399230bae0264942edaf64bb926f93edb7922f27b075a86ba0a78698f54996cc522b6261aa01a8ecbeadeb68523d4470a9941f242c3ae24c58 |
24 |
DIST grep-3.1.tar.xz 1370880 BLAKE2B d71a09d8bfd2c15b6d393d3ca4e22a2b2724632034a6d35d6e269a3c639d76ecaa5ae989a3d8466ee4bcf45e5d08862b0ef19194d6ec7ac6c250e6f60fc61031 SHA512 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26 |
25 |
|
26 |
diff --git a/sys-apps/grep/files/grep-2.27-splice.patch b/sys-apps/grep/files/grep-2.27-splice.patch |
27 |
deleted file mode 100644 |
28 |
index 6c36fe07fd2..00000000000 |
29 |
--- a/sys-apps/grep/files/grep-2.27-splice.patch |
30 |
+++ /dev/null |
31 |
@@ -1,60 +0,0 @@ |
32 |
-http://lists.gnu.org/archive/html/bug-grep/2016-12/msg00036.html |
33 |
- |
34 |
-From 7ad47abbcb070946000771a829b51224720b8cef Mon Sep 17 00:00:00 2001 |
35 |
-From: Paul Eggert <eggert@×××××××.edu> |
36 |
-Date: Tue, 27 Dec 2016 11:16:32 -0800 |
37 |
-Subject: [PATCH] grep: fix bug with '... | grep pat >> /dev/null' |
38 |
-MIME-Version: 1.0 |
39 |
-Content-Type: text/plain; charset=UTF-8 |
40 |
-Content-Transfer-Encoding: 8bit |
41 |
- |
42 |
-Problem reported by Benno Fünfstück (Bug#25283). |
43 |
-* NEWS: Document this. |
44 |
-* src/grep.c (drain_input) [SPLICE_F_MOVE]: |
45 |
-Don't assume /dev/null is always acceptable output to splice. |
46 |
-* tests/grep-dev-null-out: Test for the bug. |
47 |
---- |
48 |
- NEWS | 7 ++++--- |
49 |
- src/grep.c | 14 +++++++++----- |
50 |
- tests/grep-dev-null-out | 2 ++ |
51 |
- 3 files changed, 15 insertions(+), 8 deletions(-) |
52 |
- |
53 |
-diff --git a/src/grep.c b/src/grep.c |
54 |
-index f28f3c287609..aebab2060308 100644 |
55 |
---- a/src/grep.c |
56 |
-+++ b/src/grep.c |
57 |
-@@ -1728,11 +1728,15 @@ drain_input (int fd, struct stat const *st) |
58 |
- { |
59 |
- #ifdef SPLICE_F_MOVE |
60 |
- /* Should be faster, since it need not copy data to user space. */ |
61 |
-- while ((nbytes = splice (fd, NULL, STDOUT_FILENO, NULL, |
62 |
-- INITIAL_BUFSIZE, SPLICE_F_MOVE))) |
63 |
-- if (nbytes < 0) |
64 |
-- return false; |
65 |
-- return true; |
66 |
-+ nbytes = splice (fd, NULL, STDOUT_FILENO, NULL, |
67 |
-+ INITIAL_BUFSIZE, SPLICE_F_MOVE); |
68 |
-+ if (0 <= nbytes || errno != EINVAL) |
69 |
-+ { |
70 |
-+ while (0 < nbytes) |
71 |
-+ nbytes = splice (fd, NULL, STDOUT_FILENO, NULL, |
72 |
-+ INITIAL_BUFSIZE, SPLICE_F_MOVE); |
73 |
-+ return nbytes == 0; |
74 |
-+ } |
75 |
- #endif |
76 |
- } |
77 |
- while ((nbytes = safe_read (fd, buffer, bufalloc))) |
78 |
-diff --git a/tests/grep-dev-null-out b/tests/grep-dev-null-out |
79 |
-index 13a4843957a6..c8128d5cc6a4 100755 |
80 |
---- a/tests/grep-dev-null-out |
81 |
-+++ b/tests/grep-dev-null-out |
82 |
-@@ -8,4 +8,6 @@ require_timeout_ |
83 |
- ${AWK-awk} 'BEGIN {while (1) print "x"}' </dev/null | |
84 |
- returns_ 124 timeout 1 grep x >/dev/null || fail=1 |
85 |
- |
86 |
-+echo abc | grep b >>/dev/null || fail=1 |
87 |
-+ |
88 |
- Exit $fail |
89 |
--- |
90 |
-2.11.0 |
91 |
- |
92 |
|
93 |
diff --git a/sys-apps/grep/grep-2.27-r1.ebuild b/sys-apps/grep/grep-2.27-r1.ebuild |
94 |
deleted file mode 100644 |
95 |
index b2e9b385835..00000000000 |
96 |
--- a/sys-apps/grep/grep-2.27-r1.ebuild |
97 |
+++ /dev/null |
98 |
@@ -1,46 +0,0 @@ |
99 |
-# Copyright 1999-2018 Gentoo Foundation |
100 |
-# Distributed under the terms of the GNU General Public License v2 |
101 |
- |
102 |
-EAPI=5 |
103 |
- |
104 |
-inherit eutils flag-o-matic toolchain-funcs |
105 |
- |
106 |
-DESCRIPTION="GNU regular expression matcher" |
107 |
-HOMEPAGE="https://www.gnu.org/software/grep/" |
108 |
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz |
109 |
- mirror://gentoo/${P}.tar.xz" |
110 |
- |
111 |
-LICENSE="GPL-3" |
112 |
-SLOT="0" |
113 |
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
114 |
-IUSE="nls pcre static" |
115 |
- |
116 |
-LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )" |
117 |
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) |
118 |
- nls? ( virtual/libintl ) |
119 |
- virtual/libiconv" |
120 |
-DEPEND="${RDEPEND} |
121 |
- virtual/pkgconfig |
122 |
- nls? ( sys-devel/gettext ) |
123 |
- static? ( ${LIB_DEPEND} )" |
124 |
- |
125 |
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) |
126 |
- |
127 |
-src_prepare() { |
128 |
- epatch "${FILESDIR}"/${P}-splice.patch |
129 |
- sed -i \ |
130 |
- -e "s:@SHELL@:${EPREFIX}/bin/sh:g" \ |
131 |
- src/egrep.sh || die #523898 |
132 |
-} |
133 |
- |
134 |
-src_configure() { |
135 |
- use static && append-ldflags -static |
136 |
- # Always use pkg-config to get lib info for pcre. |
137 |
- export ac_cv_search_pcre_compile=$( |
138 |
- usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" '' |
139 |
- ) |
140 |
- econf \ |
141 |
- --bindir="${EPREFIX}"/bin \ |
142 |
- $(use_enable nls) \ |
143 |
- $(use_enable pcre perl-regexp) |
144 |
-} |