summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-06-10 15:21:08 +0000
committerJustin Lecher <jlec@gentoo.org>2011-06-10 15:21:08 +0000
commit2ab2bcf481ff025cd686645259f3289b5a3397f7 (patch)
tree60207a491a7087f8fb1ee3aa869feef82e49a658
parentVersion bump. (diff)
downloadgentoo-2-2ab2bcf481ff025cd686645259f3289b5a3397f7.tar.gz
gentoo-2-2ab2bcf481ff025cd686645259f3289b5a3397f7.tar.bz2
gentoo-2-2ab2bcf481ff025cd686645259f3289b5a3397f7.zip
Block www-client/surf due to collision on /usr/bin/surf, #371037
(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)
-rw-r--r--sci-chemistry/surf/ChangeLog5
-rw-r--r--sci-chemistry/surf/surf-1.0.ebuild3
2 files changed, 6 insertions, 2 deletions
diff --git a/sci-chemistry/surf/ChangeLog b/sci-chemistry/surf/ChangeLog
index e3ef747be052..7c4adf27da59 100644
--- a/sci-chemistry/surf/ChangeLog
+++ b/sci-chemistry/surf/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-chemistry/surf
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/surf/ChangeLog,v 1.4 2011/03/24 20:07:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/surf/ChangeLog,v 1.5 2011/06/10 15:21:08 jlec Exp $
+
+ 10 Jun 2011; Justin Lecher <jlec@gentoo.org> surf-1.0.ebuild:
+ Block www-client/surf due to collision on /usr/bin/surf, #371037
24 Mar 2011; Justin Lecher <jlec@gentoo.org> surf-1.0.ebuild:
Added missing DEPEND on sys-apps/ed, #360187
diff --git a/sci-chemistry/surf/surf-1.0.ebuild b/sci-chemistry/surf/surf-1.0.ebuild
index be9ebe97b848..c51d02cc1dfb 100644
--- a/sci-chemistry/surf/surf-1.0.ebuild
+++ b/sci-chemistry/surf/surf-1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/surf/surf-1.0.ebuild,v 1.4 2011/03/24 20:07:09 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/surf/surf-1.0.ebuild,v 1.5 2011/06/10 15:21:08 jlec Exp $
EAPI="4"
@@ -16,6 +16,7 @@ LICENSE="as-is"
IUSE=""
DEPEND="
+ !www-client/surf
sys-apps/ed
x11-misc/makedepend"
RDEPEND=""