diff options
author | Daniel Black <dragonheart@gentoo.org> | 2004-11-21 10:53:49 +0000 |
---|---|---|
committer | Daniel Black <dragonheart@gentoo.org> | 2004-11-21 10:53:49 +0000 |
commit | c5dd99a426a59b27a4e2e17ffa080020d474d1a6 (patch) | |
tree | 5454a323863c33d5dd60f31553479bc9475dcaf9 /app-text | |
parent | confict with app-text/agrep noted. Bug #71795 (diff) | |
download | historical-c5dd99a426a59b27a4e2e17ffa080020d474d1a6.tar.gz historical-c5dd99a426a59b27a4e2e17ffa080020d474d1a6.tar.bz2 historical-c5dd99a426a59b27a4e2e17ffa080020d474d1a6.zip |
added conficts with app-misc/glimpse and dev-libs/tre as per bug #71795
Diffstat (limited to 'app-text')
-rw-r--r-- | app-text/agrep/ChangeLog | 5 | ||||
-rw-r--r-- | app-text/agrep/Manifest | 10 | ||||
-rw-r--r-- | app-text/agrep/agrep-2.04.ebuild | 5 |
3 files changed, 13 insertions, 7 deletions
diff --git a/app-text/agrep/ChangeLog b/app-text/agrep/ChangeLog index 4e39b35f8b51..285e8ebf16f9 100644 --- a/app-text/agrep/ChangeLog +++ b/app-text/agrep/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/agrep # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/agrep/ChangeLog,v 1.12 2004/10/21 14:58:43 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/agrep/ChangeLog,v 1.13 2004/11/21 10:53:49 dragonheart Exp $ + + 21 Nov 2004; Daniel Black <dragonheart@gentoo.org> agrep-2.04.ebuild: + added conficts with app-misc/glimpse and dev-libs/tre as per bug #71795 21 Oct 2004; Aaron Walker <ka0ttic@gentoo.org> +metadata.xml: Add metadata (shell-tools) diff --git a/app-text/agrep/Manifest b/app-text/agrep/Manifest index ee6eef5182d4..730fa4949cd0 100644 --- a/app-text/agrep/Manifest +++ b/app-text/agrep/Manifest @@ -1,14 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 c3b09f2eca257cfa7deebfd5ac2b3d65 agrep-2.04.ebuild 773 -MD5 9fe2baca0ea66d966d3669e15e514d09 ChangeLog 1127 +MD5 f86aed29757057e56ce808da67c24725 ChangeLog 1278 +MD5 6a689663c86ea61023cb1175cccc3978 agrep-2.04.ebuild 823 MD5 0c131a7201c4670302767f93643876fa metadata.xml 165 MD5 73c72200212928fc59ff8891028ae7a9 files/digest-agrep-2.04 60 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBd86rEZCkKN40op4RAvgiAJ0c3fzUanVz+ARJT8UVmQdbVPjsvgCgv8xo -geg4baG1/THGEoVPtZs45I8= -=04Vw +iD8DBQFBoHPDmdTrptrqvGERAgEnAKCabYPFenRPD+VomKEu17dHYX/P1ACghqip +AA8UH2oNIPXcrjl4uq3ONNA= +=XBpU -----END PGP SIGNATURE----- diff --git a/app-text/agrep/agrep-2.04.ebuild b/app-text/agrep/agrep-2.04.ebuild index 13a167ebc371..0881a76bd81f 100644 --- a/app-text/agrep/agrep-2.04.ebuild +++ b/app-text/agrep/agrep-2.04.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/agrep/agrep-2.04.ebuild,v 1.10 2004/09/08 02:13:08 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/agrep/agrep-2.04.ebuild,v 1.11 2004/11/21 10:53:49 dragonheart Exp $ DESCRIPTION="agrep is a tool for the fast searching of text allowing for errors in the search pattern." HOMEPAGE="ftp://ftp.cs.arizona.edu/agrep/README" @@ -13,6 +13,9 @@ IUSE="" DEPEND="virtual/libc" +RDEPEND="!dev-libs/tre + !app-misc/glimpse" + src_compile() { # Remove first occurace of CFLAGS so we grab the user CFLAGS sed -i -e 's/^CFLAGS.*//' Makefile |