Add blocker on net-firewall/conntrack-tools as both provide /usr/sbin/conntrack and...

Package-Manager: portage-2.1.4.4

diff --git a/net-firewall/conntrack/ChangeLog b/net-firewall/conntrack/ChangeLog
index 3c7e57bc5684854903de14c92cb7591c6d232795..333104ec05763334242dec6d3f436383f8a56ec6 100644 (file)
--- a/net-firewall/conntrack/ChangeLog
+++ b/net-firewall/conntrack/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/conntrack
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack/ChangeLog,v 1.6 2007/08/08 14:12:24 gustavoz Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack/ChangeLog,v 1.7 2008/03/09 22:47:10 swegener Exp $
+
+  09 Mar 2008; Sven Wegener <swegener@gentoo.org>
+  conntrack-1.00_beta2.ebuild:
+  Add blocker on net-firewall/conntrack-tools as both provide
+  /usr/sbin/conntrack and conntrack-tools already blocks this package.
 
   08 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org>
   conntrack-1.00_beta2.ebuild:

diff --git a/net-firewall/conntrack/conntrack-1.00_beta2.ebuild b/net-firewall/conntrack/conntrack-1.00_beta2.ebuild
index bd315fb121290f2c9068a6fd8393a71dc86fdc37..26ac0585a070ccf16de58c6765a24db9858fa2f7 100644 (file)
--- a/net-firewall/conntrack/conntrack-1.00_beta2.ebuild
+++ b/net-firewall/conntrack/conntrack-1.00_beta2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack/conntrack-1.00_beta2.ebuild,v 1.6 2007/08/08 14:12:24 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack/conntrack-1.00_beta2.ebuild,v 1.7 2008/03/09 22:47:10 swegener Exp $
 
 inherit linux-info
 
@@ -17,7 +17,8 @@ IUSE=""
 
 DEPEND="net-libs/libnfnetlink
        net-libs/libnetfilter_conntrack"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !net-firewall/conntrack-tools"
 
 S="${WORKDIR}/${MY_P}"