diff options
author | Mike Gilbert <floppym@gentoo.org> | 2014-01-05 00:59:30 +0000 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2014-01-05 00:59:30 +0000 |
commit | 1480f7b81b2c748218c3b8d0adb2dbeccf3b7e81 (patch) | |
tree | 82045b318089c45ea56db45274e65c2163ad7360 /net-misc | |
parent | Don't rename ipsec.conf if libreswan is installed. (diff) | |
download | gentoo-2-1480f7b81b2c748218c3b8d0adb2dbeccf3b7e81.tar.gz gentoo-2-1480f7b81b2c748218c3b8d0adb2dbeccf3b7e81.tar.bz2 gentoo-2-1480f7b81b2c748218c3b8d0adb2dbeccf3b7e81.zip |
Add blocker on net-misc/libreswan.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/openswan/ChangeLog | 6 | ||||
-rw-r--r-- | net-misc/openswan/openswan-2.6.38.ebuild | 5 | ||||
-rw-r--r-- | net-misc/openswan/openswan-2.6.39-r1.ebuild | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog index aa48111e373b..b6f8c3637dd8 100644 --- a/net-misc/openswan/ChangeLog +++ b/net-misc/openswan/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/openswan # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.94 2014/01/04 18:19:01 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.95 2014/01/05 00:59:30 floppym Exp $ + + 05 Jan 2014; Mike Gilbert <floppym@gentoo.org> openswan-2.6.38.ebuild, + openswan-2.6.39-r1.ebuild: + Add blocker on net-misc/libreswan. 04 Jan 2014; Mike Gilbert <floppym@gentoo.org> openswan-2.6.38.ebuild, openswan-2.6.39-r1.ebuild: diff --git a/net-misc/openswan/openswan-2.6.38.ebuild b/net-misc/openswan/openswan-2.6.38.ebuild index 026fdad7362e..d21f5abd36b9 100644 --- a/net-misc/openswan/openswan-2.6.38.ebuild +++ b/net-misc/openswan/openswan-2.6.38.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.38.ebuild,v 1.7 2014/01/04 18:19:01 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.38.ebuild,v 1.8 2014/01/05 00:59:30 floppym Exp $ EAPI="4" @@ -31,7 +31,8 @@ DEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.1.2" # see bug 237132 RDEPEND="${COMMON_DEPEND} virtual/logger - sys-apps/iproute2" + sys-apps/iproute2 + !net-misc/libreswan" pkg_setup() { if use nocrypto-algorithms && ! use weak-algorithms; then diff --git a/net-misc/openswan/openswan-2.6.39-r1.ebuild b/net-misc/openswan/openswan-2.6.39-r1.ebuild index 07f5b0911c0e..e55564468d25 100644 --- a/net-misc/openswan/openswan-2.6.39-r1.ebuild +++ b/net-misc/openswan/openswan-2.6.39-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.39-r1.ebuild,v 1.2 2014/01/04 18:19:01 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.6.39-r1.ebuild,v 1.3 2014/01/05 00:59:30 floppym Exp $ EAPI="4" @@ -31,7 +31,8 @@ DEPEND="${COMMON_DEPEND} app-text/docbook-xml-dtd:4.1.2" # see bug 237132 RDEPEND="${COMMON_DEPEND} virtual/logger - sys-apps/iproute2" + sys-apps/iproute2 + !net-misc/libreswan" pkg_setup() { if use nocrypto-algorithms && ! use weak-algorithms; then |