summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-apps/grep/ChangeLog5
-rw-r--r--sys-apps/grep/Manifest3
-rw-r--r--sys-apps/grep/grep-2.5.3.ebuild52
3 files changed, 5 insertions, 55 deletions
diff --git a/sys-apps/grep/ChangeLog b/sys-apps/grep/ChangeLog
index dd5bd8d4e53d..128aa88d64aa 100644
--- a/sys-apps/grep/ChangeLog
+++ b/sys-apps/grep/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/grep
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.76 2008/10/07 09:01:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/ChangeLog,v 1.77 2008/10/07 09:02:28 robbat2 Exp $
+
+ 07 Oct 2008; Robin H. Johnson <robbat2@gentoo.org> -grep-2.5.3.ebuild:
+ Remove badly broken baseline 2.5.3.
*grep-2.5.3-r1 (07 Oct 2008)
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 4cbaefdbbeb3..3d7247cf8ac3 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -15,6 +15,5 @@ DIST grep-2.5.3.tar.bz2 618184 RMD160 dafa692fd67dfcd1c94115e9831d291b29fa7729 S
DIST grep_2.5.3~dfsg-6.diff.gz 17449 RMD160 88e13b03b661924b5a85bb783f9e936a3a5cfeab SHA1 d700ecdc27d45ba195e2c2d05c25365920788f71 SHA256 cd1253d672bcda0b530a0ac0ece8c4953353018a8a9d4dd0395333fc30a12cd9
EBUILD grep-2.5.1a-r1.ebuild 1987 RMD160 1cfee753db688fb73ec637c3130cc0ee95e786d1 SHA1 f9f924b92d8f5e6fa9a654320d19626e0c7f2a43 SHA256 189e58f579c4bb4a689b650c352eb022cdc9df1d66355d9590ba5b570658cc11
EBUILD grep-2.5.3-r1.ebuild 1426 RMD160 be2fb9d99b5c30f6b5fd574cc9600cc31f1e29f9 SHA1 f4f3057ab8533c5c63431c96a8ea1faae9df5761 SHA256 0fa57e46385bda0bd2fabc5bbdfa52dc2eb71338cf5d72e6e95d790b5bc00699
-EBUILD grep-2.5.3.ebuild 1393 RMD160 1b2b6d2db6a41dae657575779b71c7e6d565254a SHA1 4a5e577a3b90a1df204f6f393b4bd082f560647f SHA256 c40a71e16d9d5d6894cb68284d0e221d13156b624a8cfba39a76b11358929cb5
-MISC ChangeLog 10961 RMD160 8754ab4216f48fc126780fc30eb5bfa7c58211af SHA1 90f5a986fa11bf259a48422d03d5db10fde9af51 SHA256 9a904f23003bcf29ab20f24d9c4b6a74dba8a773d395ed8e9ced5e7481b794e3
+MISC ChangeLog 11073 RMD160 159d5af9a559e63177f1b28f93698c57b93887d5 SHA1 5dd7b65aabae7b0c3621ccacc53740713d6010e6 SHA256 929fe1dabade221d5e63a15b34cfc6d8d31ba0fc4be391b84747a6bacc441c1f
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-apps/grep/grep-2.5.3.ebuild b/sys-apps/grep/grep-2.5.3.ebuild
deleted file mode 100644
index 6196c69c6920..000000000000
--- a/sys-apps/grep/grep-2.5.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grep/grep-2.5.3.ebuild,v 1.2 2008/09/19 21:28:39 vapier Exp $
-
-inherit flag-o-matic eutils
-
-DEB_VER="${PV}~dfsg-6"
-DESCRIPTION="GNU regular expression matcher"
-HOMEPAGE="http://www.gnu.org/software/grep/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2
- mirror://gentoo/${P}.tar.bz2
- mirror://debian/pool/main/g/grep/grep_${DEB_VER}.diff.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="nls pcre static"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
- pcre? ( dev-libs/libpcre )
- nls? ( sys-devel/gettext )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${WORKDIR}"/grep_${DEB_VER}.diff
- EPATCH_FORCE="yes" \
- EPATCH_SUFFIX="patch" \
- EPATCH_MULTI_MSG="Applying Debian patchset (${DEB_VER}) ..." \
- epatch ${P}~dfsg/debian/patches/
-
- use static && append-ldflags -static
-}
-
-src_compile() {
- econf \
- --bindir=/bin \
- $(use_enable nls) \
- $(use_enable pcre perl-regexp) \
- || die "econf failed"
-
- use static || sed -i 's:-lpcre:-Wl,-Bstatic -lpcre -Wl,-Bdynamic:g' src/Makefile
-
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}