gentoo resync : 25.04.2020

2 files changed, 0 insertions, 50 deletions

diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 6c4d50144e6f..444a1110a915 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,7 +1,5 @@
-DIST grep-3.1.tar.xz 1370880 BLAKE2B d71a09d8bfd2c15b6d393d3ca4e22a2b2724632034a6d35d6e269a3c639d76ecaa5ae989a3d8466ee4bcf45e5d08862b0ef19194d6ec7ac6c250e6f60fc61031 SHA512 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26
 DIST grep-3.3.tar.xz 1473056 BLAKE2B e1592b623d1f32d1b21d127b0d28f8f6501d4b854ff2de810d12d43292c00e6af887b038f22d0c4c45c314b6e9d73a82dec6d737519c674bb139c2ef70511aa0 SHA512 e4805dbddf7cd0f0faf412557d408509650c1ccf703bc450f10a3f727c690dbfaa1235aa81939a0e4b7ac6190f88c15ea1fcc562b343d4b4c7550f967aeb15db
 DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206
-EBUILD grep-3.1-r1.ebuild 1459 BLAKE2B 17f8c65efc0eb18e533bbe4ff1794f9fdb2133dbd19ce92245b26717a1cd7286e5cfb379c7720fa01b985143f46c0bfd0d97d87dd616789dbc04b24142cf33af SHA512 c26daacdcad5e8c1fdba3f8e3d2c75bc173bb648ec2908c96fd9145402cc990a709802fb620fb1f89f9bd9fc65b8ad3c5bfee690ec6a1c1a41bde7364efdb3d8
 EBUILD grep-3.3-r1.ebuild 1463 BLAKE2B 2592d406868784921685aa21b321caf12126627c935d729a8827048532779e7deeee21598f699ea6f9d238d945dfbca59b72555064a5ac32d5ab7fb93720bc47 SHA512 86392996c511087c09c2822dd861d6c223482ebe97b7c77a53673f003447b393cfee09647a302a939ca98cf5e7b123012323ff0dad00e9df0563d86f575f9693
 EBUILD grep-3.4.ebuild 1522 BLAKE2B bcfd24d3219eb4daa64894084e592d277dae2cbebda55ed2c7cc71688cf4630766e5529ef9c04cd2ca4a57af7ad9cf49c88a0e04c7ec72a5ea76ab4e5da1cb40 SHA512 e2654150a88cb90c194e9cc20828ababa8290fbfabe98ab93c95c41fc80c0b29800b93bb415c0b5a9194705f1a7b518ff77b33cc16489057311435742cb9db69
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.1-r1.ebuild b/sys-apps/grep/grep-3.1-r1.ebuild
deleted file mode 100644
index 772a9e2d2822..000000000000
--- a/sys-apps/grep/grep-3.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~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 )
-
-src_prepare() {
-	sed -i \
-		-e "s:@SHELL@:${EPREFIX}/bin/sh:g" \
-		-e "s:@grep@:${EPREFIX}/bin/grep:" \
-		src/egrep.sh || die #523898
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	# don't link against libsigsegv even when available
-	export ac_cv_libsigsegv=no
-	# 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)
-}