From 0378d22f4d17884590d035ed4328965ee879adbc Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sun, 21 Nov 2004 10:53:49 +0000 Subject: added conficts with app-misc/glimpse and dev-libs/tre as per bug #71795 --- app-text/agrep/ChangeLog | 5 ++++- app-text/agrep/agrep-2.04.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'app-text/agrep') 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 agrep-2.04.ebuild: + added conficts with app-misc/glimpse and dev-libs/tre as per bug #71795 21 Oct 2004; Aaron Walker +metadata.xml: Add metadata (shell-tools) 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 -- cgit v1.2.3-65-gdbad