Fix ebuilds to block net-misc/openswan closing bug #60794

5 files changed, 25 insertions, 18 deletions

diff --git a/net-misc/strongswan/ChangeLog b/net-misc/strongswan/ChangeLog
index 43f6b4aa9d42..e638d3c66495 100644
--- a/net-misc/strongswan/ChangeLog
+++ b/net-misc/strongswan/ChangeLog
@@ -1,28 +1,31 @@
 # ChangeLog for net-misc/strongswan
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.14 2004/09/05 08:14:51 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/ChangeLog,v 1.15 2004/09/12 06:23:19 pfeifer Exp $
+
+  12 Sep 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.1.3.ebuild,
+  strongswan-2.1.3-r1.ebuild, strongswan-2.1.5.ebuild, strongswan-2.2.0.ebuild:
+  Fix-up of ebuilds to block openswan. Closing bug #60794.
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
 
 *strongswan-2.2.0 (31 Aug 2004)
 
-  31 Aug 2004; Jay Pfeifer <pfeifer@gentoo.org> : strongswan-2.2.0.ebuild
+  31 Aug 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.2.0.ebuild:
   Version bump with DPD support!
 
   15 Aug 2004; David Holm <dholm@gentoo.org> strongswan-2.1.5.ebuild:
   Added to ~ppc.
 
-  15 Aug 2004; Jay Pfeifer <pfeifer@gentoo.org> : strongswan-2.1.5.ebuild
+  15 Aug 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.1.5.ebuild:
   Mark stable on x86.
 
 *strongswan-2.1.5 (22 Jul 2004)
 
-  22 Jul 2004; Jay Pfeifer <pfeifer@gentoo.org> : strongswan-2.1.5.ebuild
+  22 Jul 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.1.5.ebuild:
   Version bump.
 
-  07 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
-  strongswan-2.1.3-r1.ebuild:
+  07 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> strongswan-2.1.3-r1.ebuild:
   fix use invocation
 
   01 Jul 2004; Jon Hood <squinky86@gentoo.org> strongswan-2.1.3-r1.ebuild,
@@ -31,7 +34,7 @@
 
 *strongswan-2.1.3-r1 (01 Jul 2004)
 
-  01 Jul 2004; Jay Pfeifer <pfeifer@gentoo.org> : strongswan-2.1.3-r1.ebuild
+  01 Jul 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.1.3-r1.ebuild:
   Added use flags for curl, ldap, & smartcard.
 
   19 Jun 2004; Danny van Dyk <kugelfang@gentoo.org>
@@ -40,7 +43,7 @@
 
 *strongswan-2.1.3 (19 Jun 2004)
 
-  19 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> : strongswan-2.1.3.ebuild
+  19 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.1.3.ebuild:
   Version bump. Contains fixes for potential security issues.
   Info here: http://lists.openswan.org/pipermail/dev/2004-June/000370.html
   Removing all prior versions.
@@ -50,12 +53,12 @@
 
 *strongswan-2.1.1 (15 Jun 2004)
 
-  15 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> : strongswan-2.1.1.ebuild
+  15 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.1.1.ebuild:
   Version bump.
 
 *strongswan-2.0.2 (19 May 2004)
 
-  19 May 2004; Jay Pfeifer <pfeifer@gentoo.org> : strongswan-2.0.2.ebuild
+  19 May 2004; Jay Pfeifer <pfeifer@gentoo.org> strongswan-2.0.2.ebuild:
   Initial import.
   Provides userspace IPsec tool/support for FreeS/WAN based 2.4 kernels
   and native 2.6 (KAME) based IPsec. Enjoy :)
diff --git a/net-misc/strongswan/strongswan-2.1.3-r1.ebuild b/net-misc/strongswan/strongswan-2.1.3-r1.ebuild
index c7780bb5ed27..9b7cc434e2bb 100644
--- a/net-misc/strongswan/strongswan-2.1.3-r1.ebuild
+++ b/net-misc/strongswan/strongswan-2.1.3-r1.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/net-misc/strongswan/strongswan-2.1.3-r1.ebuild,v 1.5 2004/07/22 14:09:07 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.1.3-r1.ebuild,v 1.6 2004/09/12 06:23:19 pfeifer Exp $
 
 inherit eutils
 
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="-* x86"
 IUSE="curl ldap smartcard"
 
-DEPEND="virtual/libc
+DEPEND="!net-misc/openswan
+	virtual/libc
 	virtual/linux-sources
 	curl? ( net-misc/curl )
 	ldap? ( =net-nds/openldap-2* )
diff --git a/net-misc/strongswan/strongswan-2.1.3.ebuild b/net-misc/strongswan/strongswan-2.1.3.ebuild
index 0a90b0dfb43a..eff584c5e4e2 100644
--- a/net-misc/strongswan/strongswan-2.1.3.ebuild
+++ b/net-misc/strongswan/strongswan-2.1.3.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/net-misc/strongswan/strongswan-2.1.3.ebuild,v 1.5 2004/07/22 14:09:07 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.1.3.ebuild,v 1.6 2004/09/12 06:23:19 pfeifer Exp $
 
 inherit eutils
 
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="-* x86 ~ppc ~amd64"
 IUSE=""
 
-DEPEND="virtual/libc
+DEPEND="!net-misc/openswan
+	virtual/libc
 	virtual/linux-sources
 	>=dev-libs/gmp-3.1.1
 	net-misc/host
diff --git a/net-misc/strongswan/strongswan-2.1.5.ebuild b/net-misc/strongswan/strongswan-2.1.5.ebuild
index 30aece07743d..762931e64f44 100644
--- a/net-misc/strongswan/strongswan-2.1.5.ebuild
+++ b/net-misc/strongswan/strongswan-2.1.5.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/net-misc/strongswan/strongswan-2.1.5.ebuild,v 1.3 2004/08/15 16:27:15 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.1.5.ebuild,v 1.4 2004/09/12 06:23:19 pfeifer Exp $
 
 inherit eutils
 
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="-* x86 ~ppc"
 IUSE="curl ldap smartcard"
 
-DEPEND="virtual/libc
+DEPEND="!net-misc/openswan
+	virtual/libc
 	virtual/linux-sources
 	curl? ( net-misc/curl )
 	ldap? ( =net-nds/openldap-2* )
diff --git a/net-misc/strongswan/strongswan-2.2.0.ebuild b/net-misc/strongswan/strongswan-2.2.0.ebuild
index 1cebc192aec4..30edf1769083 100644
--- a/net-misc/strongswan/strongswan-2.2.0.ebuild
+++ b/net-misc/strongswan/strongswan-2.2.0.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/net-misc/strongswan/strongswan-2.2.0.ebuild,v 1.1 2004/08/31 18:15:42 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/strongswan/strongswan-2.2.0.ebuild,v 1.2 2004/09/12 06:23:19 pfeifer Exp $
 
 inherit eutils
 
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="-* ~x86 ~ppc"
 IUSE="curl ldap smartcard"
 
-DEPEND="virtual/libc
+DEPEND="!net-misc/openswan
+	virtual/libc
 	virtual/linux-sources
 	curl? ( net-misc/curl )
 	ldap? ( =net-nds/openldap-2* )