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

6 files changed, 35 insertions, 27 deletions

diff --git a/net-misc/openswan/ChangeLog b/net-misc/openswan/ChangeLog
index 6d1c013726ff..23a00e257d46 100644
--- a/net-misc/openswan/ChangeLog
+++ b/net-misc/openswan/ChangeLog
@@ -1,47 +1,51 @@
 # ChangeLog for net-misc/openswan
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.16 2004/08/12 23:08:31 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/ChangeLog,v 1.17 2004/09/12 06:22:56 pfeifer Exp $
+
+  12 Sep 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-1.0.6.ebuild,
+  openswan-1.0.7.ebuild, openswan-2.1.4.ebuild, openswan-2.1.5.ebuild:
+  Fix-up of ebuilds to block strongswan. Closing bug #60794.
 
 *openswan-2.1.5 (12 Aug 2004)
 
-  12 Aug 2004; Jay Pfeifer <pfeifer@gentoo.org>; openswan-2.1.5.ebuild:
+  12 Aug 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-2.1.5.ebuild:
   Version bump.
 
 *openswan-1.0.7 (12 Aug 2004)
 
-  12 Aug 2004; Jay Pfeifer <pfeifer@gentoo.org>; openswan-1.0.7.ebuild:
+  12 Aug 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-1.0.7.ebuild:
   Version bump for the 1.x users.
 
-  23 Jul 2004; Jay Pfeifer <pfeifer@gentoo.org> : openswan-1.0.6.ebuild
+  23 Jul 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-1.0.6.ebuild:
   Fix depend on iproute2 closing bug #57263.
 
-01 Jul 2004; Jon Hood <squinky86@gentoo.org> openswan-1.0.6.ebuild,
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> openswan-1.0.6.ebuild,
   openswan-2.1.4.ebuild:
   change virtual/glibc to virtual/libc
 
 *openswan-1.0.6 (01 Jul 2004)
 
-  01 Jul 2004; Jay Pfeifer <pfeifer@gentoo.org> : openswan-1.0.6.ebuild
+  01 Jul 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-1.0.6.ebuild:
   Version bump for the 1.x users.
 
 *openswan-2.1.4 (23 Jun 2004)
 
-  23 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> : openswan-2.1.4.ebuild
+  23 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-2.1.4.ebuild:
   Version bump. Contains a fix for potential security issue in x509.
 
 *openswan-1.0.6rc1 (23 Jun 2004)
 
-  23 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> : openswan-1.0.6_rc1.ebuild
+  23 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-1.0.6_rc1.ebuild:
   Initial import of Openswan 1.0.x series.
   Superfreeswan users will now be migrated to openswan.
   Contains fixes for potential security issues in x509.
 
-19 Jun 2004; David Holm <dholm@gentoo.org> openswan-2.1.3.ebuild:
+  19 Jun 2004; David Holm <dholm@gentoo.org> openswan-2.1.3.ebuild:
   Added to ~ppc.
 
 *openswan-2.1.3 (19 Jun 2004)
 
-  19 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> : openswan-2.1.3.ebuild
+  19 Jun 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-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.
@@ -51,7 +55,7 @@
 
 *openswan-2.1.2 (19 May 2004)
 
-  19 May 2004; Jay Pfeifer <pfeifer@gentoo.org> : openswan-2.1.2.ebuild
+  19 May 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-2.1.2.ebuild:
   Version bump.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> openswan-2.0.0.ebuild,
@@ -63,17 +67,17 @@
 
 *openswan-2.1.1 (29 Mar 2004)
 
-  29 Mar 2004; Jay Pfeifer <pfeifer@gentoo.org> : openswan-2.1.1.ebuild
+  29 Mar 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-2.1.1.ebuild:
   Version bump. Closes Bug #46006.
 
 *openswan-2.1.0 (17 Mar 2004)
 
-  17 Mar 2004; Jay Pfeifer <pfeifer@gentoo.org> : openswan-2.1.0.ebuild
+  17 Mar 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-2.1.0.ebuild:
   Version bump.
 
 *openswan-2.0.0 (22 Feb 2004)
 
-  22 Feb 2004; Jay Pfeifer <pfeifer@gentoo.org> : openswan-2.0.0.ebuild
+  22 Feb 2004; Jay Pfeifer <pfeifer@gentoo.org> openswan-2.0.0.ebuild:
   Initial import.
   Provides userspace IPsec tool/support for FreeS/WAN based 2.4 kernels
   and native 2.6 (KAME) based IPsec. 2.6 support is a work in progress.
diff --git a/net-misc/openswan/Manifest b/net-misc/openswan/Manifest
index 09a1f42fa5a1..9bbb7a16d9d0 100644
--- a/net-misc/openswan/Manifest
+++ b/net-misc/openswan/Manifest
@@ -1,8 +1,8 @@
-MD5 9e30663198bff6f26828b940f146ff0a openswan-1.0.7.ebuild 1866
-MD5 0d3d7cc413aa271cdd6e7752126e217a openswan-2.1.5.ebuild 3102
-MD5 6d1348ef03d345507d04bf5fd3fdcba2 openswan-1.0.6.ebuild 1865
-MD5 c7e5e1dadda09f1a320425e33aec4c8f openswan-2.1.4.ebuild 3102
-MD5 855c33380e39bbbfee9f7cfef43a8507 ChangeLog 2663
+MD5 497626c961b46b1a28e35311caf00c61 openswan-1.0.7.ebuild 1888
+MD5 658fc859f2ad84a56e0f270600e21e27 openswan-2.1.5.ebuild 3124
+MD5 61833c351ca76ad8f40ca6fe34ad73a3 openswan-1.0.6.ebuild 1887
+MD5 99ae180b095beb5434f7886f6ddf8ab5 openswan-2.1.4.ebuild 3124
+MD5 391ec49214f4fed9e916edc080d6fa4c ChangeLog 2860
 MD5 5d96d9e4b6f6b113db0983e211adf85a metadata.xml 639
 MD5 d35f8aea878066e110e6ff3d09a4f50e files/ipsec 1538
 MD5 c455249e331da80c3619b2e474e2af67 files/openswan-2.1.5-gentoo.patch 17438
diff --git a/net-misc/openswan/openswan-1.0.6.ebuild b/net-misc/openswan/openswan-1.0.6.ebuild
index bce981074029..7309287ac620 100644
--- a/net-misc/openswan/openswan-1.0.6.ebuild
+++ b/net-misc/openswan/openswan-1.0.6.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/openswan/openswan-1.0.6.ebuild,v 1.3 2004/07/23 07:33:47 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-1.0.6.ebuild,v 1.4 2004/09/12 06:22:56 pfeifer Exp $
 
 inherit eutils
 
@@ -11,7 +11,8 @@ HOMEPAGE="http://www.openswan.org/"
 SRC_URI="http://www.openswan.org/code/${MY_P}.tar.gz
 	mirror://gentoo/${MY_P}.tar.gz"
 
-DEPEND="virtual/libc
+DEPEND="!net-misc/strongswan
+	virtual/libc
 	virtual/linux-sources
 	net-misc/host
 	>=dev-libs/gmp-3.1.1"
diff --git a/net-misc/openswan/openswan-1.0.7.ebuild b/net-misc/openswan/openswan-1.0.7.ebuild
index 4417aa215056..41bda3ecb358 100644
--- a/net-misc/openswan/openswan-1.0.7.ebuild
+++ b/net-misc/openswan/openswan-1.0.7.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/openswan/openswan-1.0.7.ebuild,v 1.1 2004/08/12 22:40:45 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-1.0.7.ebuild,v 1.2 2004/09/12 06:22:56 pfeifer Exp $
 
 inherit eutils
 
@@ -11,7 +11,8 @@ HOMEPAGE="http://www.openswan.org/"
 SRC_URI="http://www.openswan.org/code/${MY_P}.tar.gz
 	mirror://gentoo/${MY_P}.tar.gz"
 
-DEPEND="virtual/libc
+DEPEND="!net-misc/strongswan
+	virtual/libc
 	virtual/linux-sources
 	net-misc/host
 	>=dev-libs/gmp-3.1.1"
diff --git a/net-misc/openswan/openswan-2.1.4.ebuild b/net-misc/openswan/openswan-2.1.4.ebuild
index 62e7f69de420..67fa9e68fe09 100644
--- a/net-misc/openswan/openswan-2.1.4.ebuild
+++ b/net-misc/openswan/openswan-2.1.4.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/openswan/openswan-2.1.4.ebuild,v 1.3 2004/07/01 21:41:55 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.1.4.ebuild,v 1.4 2004/09/12 06:22:56 pfeifer Exp $
 
 inherit eutils
 
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="-* x86 amd64 ~ppc"
 IUSE=""
 
-DEPEND="virtual/libc
+DEPEND="!net-misc/strongswan
+	virtual/libc
 	virtual/linux-sources
 	>=dev-libs/gmp-3.1.1
 	net-misc/host
diff --git a/net-misc/openswan/openswan-2.1.5.ebuild b/net-misc/openswan/openswan-2.1.5.ebuild
index 392a45c685be..76069c15b4bf 100644
--- a/net-misc/openswan/openswan-2.1.5.ebuild
+++ b/net-misc/openswan/openswan-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/openswan/openswan-2.1.5.ebuild,v 1.1 2004/08/12 23:08:31 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openswan/openswan-2.1.5.ebuild,v 1.2 2004/09/12 06:22:56 pfeifer Exp $
 
 inherit eutils
 
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="-* ~x86 ~amd64 ~ppc"
 IUSE=""
 
-DEPEND="virtual/libc
+DEPEND="!net-misc/strongswan
+	virtual/libc
 	virtual/linux-sources
 	>=dev-libs/gmp-3.1.1
 	net-misc/host