Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/grep/
Date: Mon, 03 Jul 2017 09:08:38
Message-Id: 1499072904.d662c75966b907df655671c0c82ce3eb8ac91847.polynomial-c@gentoo
1 commit: d662c75966b907df655671c0c82ce3eb8ac91847
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 3 09:04:13 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 3 09:08:24 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d662c759
7
8 sys-apps/grep: Removed old.
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 sys-apps/grep/Manifest | 1 -
13 sys-apps/grep/grep-2.25.ebuild | 45 ------------------------------------------
14 2 files changed, 46 deletions(-)
15
16 diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
17 index 3dcb1204cc4..ced11f901ae 100644
18 --- a/sys-apps/grep/Manifest
19 +++ b/sys-apps/grep/Manifest
20 @@ -1,4 +1,3 @@
21 -DIST grep-2.25.tar.xz 1327856 SHA256 e21e83bac50450e0d0d61a42c154ee0dceaacdbf4f604ef6e79071cb8e596830 SHA512 7a738f938dde350ae71eb87083586e25768ba392113cba973a4e567b476c788ca66e0736d63f5e0e12a7847fa70379dc0b6568ec92431ea4604acd2cbedd66c1 WHIRLPOOL af46fb0fdf2f271dc31a4902271881aab571d9705a18625c247920f82894b0358a2788e6c7625405c968ea717397ea52802073e4b4fa871121f8f77edc62e748
22 DIST grep-2.27.tar.xz 1360388 SHA256 ad4cc44d23074a1c3a8baae8fbafff2a8c60f38a9a6108f985eef6fbee6dcaeb SHA512 d67f16cc5f931a455d5287badbaf080967da573d290430f440e578a563cff4f4c0c2668f60dbb8bc71eaed289f075957006c10c6827f0da1a49df49efd3f0781 WHIRLPOOL f1bd591f60998a5515f661ddd576593a3f24f8ea2e7c2ae5a94699da53cf98ba3bc422c3577ea6c05be48544ac6c2382d3da000e52aeb2affa05d75ef0617af9
23 DIST grep-3.0.tar.xz 1375156 SHA256 e2c81db5056e3e8c5995f0bb5d0d0e1cad1f6f45c3b2fc77b6e81435aed48ab5 SHA512 0e9a00df9d492f399230bae0264942edaf64bb926f93edb7922f27b075a86ba0a78698f54996cc522b6261aa01a8ecbeadeb68523d4470a9941f242c3ae24c58 WHIRLPOOL 656271228bbbc3550560d2f4ec80031a8b0d9c662447afeea6e3c65c859dadde244af8c32ce03681495b3e86913468344fc29a5a52a53aa04eb5963b3a8a9529
24 DIST grep-3.1.tar.xz 1370880 SHA256 db625c7ab3bb3ee757b3926a5cfa8d9e1c3991ad24707a83dde8a5ef2bf7a07e SHA512 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26 WHIRLPOOL 2c321b4936f4f0268f1b3c522cd86f828cee395a5712a4a3024c6f5359389734f1b6fa2ca1fb5d17c968af0b3c00fcc5c475e05798578d15442677bb82ec9e39
25
26 diff --git a/sys-apps/grep/grep-2.25.ebuild b/sys-apps/grep/grep-2.25.ebuild
27 deleted file mode 100644
28 index 125eac9a8fc..00000000000
29 --- a/sys-apps/grep/grep-2.25.ebuild
30 +++ /dev/null
31 @@ -1,45 +0,0 @@
32 -# Copyright 1999-2017 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=5
36 -
37 -inherit eutils flag-o-matic toolchain-funcs
38 -
39 -DESCRIPTION="GNU regular expression matcher"
40 -HOMEPAGE="https://www.gnu.org/software/grep/"
41 -SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
42 - mirror://gentoo/${P}.tar.xz"
43 -
44 -LICENSE="GPL-3"
45 -SLOT="0"
46 -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"
47 -IUSE="nls pcre static"
48 -
49 -LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
50 -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
51 - nls? ( virtual/libintl )
52 - virtual/libiconv"
53 -DEPEND="${RDEPEND}
54 - virtual/pkgconfig
55 - nls? ( sys-devel/gettext )
56 - static? ( ${LIB_DEPEND} )"
57 -
58 -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
59 -
60 -src_prepare() {
61 - sed -i \
62 - -e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
63 - src/egrep.sh || die #523898
64 -}
65 -
66 -src_configure() {
67 - use static && append-ldflags -static
68 - # Always use pkg-config to get lib info for pcre.
69 - export ac_cv_search_pcre_compile=$(
70 - usex pcre "$($(tc-getPKG_CONFIG) --libs $(usex static --static '') libpcre)" ''
71 - )
72 - econf \
73 - --bindir="${EPREFIX}"/bin \
74 - $(use_enable nls) \
75 - $(use_enable pcre perl-regexp)
76 -}