diff options
| author |   Sven Wegener <swegener@gentoo.org> | 2008-03-09 22:47:10 +0000 |
|---|---|---|
| committer | Sven Wegener <swegener@gentoo.org> | 2008-03-09 22:47:10 +0000 |
| commit | 0c4b58a3e2cf438db2511bade7a75e6bf730ca41 (patch) | |
| tree | 6ab4ca62d764a686c48f58333a9ec3655525409a /net-firewall | |
| parent | The blocker on net-firewall/conntrack is just a run-time blocker. (diff) | |
| download | gentoo-2-0c4b58a3e2cf438db2511bade7a75e6bf730ca41.tar.gz gentoo-2-0c4b58a3e2cf438db2511bade7a75e6bf730ca41.tar.bz2 gentoo-2-0c4b58a3e2cf438db2511bade7a75e6bf730ca41.zip | |
Add blocker on net-firewall/conntrack-tools as both provide /usr/sbin/conntrack and conntrack-tools already blocks this package.
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-firewall')
| -rw-r--r-- | net-firewall/conntrack/ChangeLog | 9 | ||||
| -rw-r--r-- | net-firewall/conntrack/conntrack-1.00_beta2.ebuild | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/net-firewall/conntrack/ChangeLog b/net-firewall/conntrack/ChangeLog index 3c7e57bc5684..333104ec0576 100644 --- 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 bd315fb12129..26ac0585a070 100644 --- 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}" |