Removed useless || dependency.

Package-Manager: portage-2.0.51.22-r1

6 files changed, 45 insertions, 30 deletions

diff --git a/net-firewall/ipsec-tools/ChangeLog b/net-firewall/ipsec-tools/ChangeLog
index e23b63102444..8230bdc9fd23 100644
--- a/net-firewall/ipsec-tools/ChangeLog
+++ b/net-firewall/ipsec-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/ipsec-tools
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.27 2005/06/21 03:05:58 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.28 2005/06/25 13:35:49 swegener Exp $
+
+  25 Jun 2005; Sven Wegener <swegener@gentoo.org> ipsec-tools-0.5.ebuild,
+  ipsec-tools-0.5-r1.ebuild, ipsec-tools-0.5-r2.ebuild,
+  ipsec-tools-0.5.2.ebuild:
+  Removed useless || dependency.
 
 *ipsec-tools-0.5.2 (21 Jun 2005)
 *ipsec-tools-0.5-r2 (21 Jun 2005)
diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index 49fa2f4529b6..ff5452e4cefa 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -1,26 +1,36 @@
-MD5 3bea640757c6791162949ac65fec1ef6 ipsec-tools-0.5.ebuild 1507
-MD5 8ab0f354384bf0af0ac5f036bf870678 ipsec-tools-0.3.1.ebuild 1601
-MD5 1e8b9993c9d4f8bc53955cf690469564 ipsec-tools-0.4.ebuild 1692
-MD5 a428291d8a22a606eda6e16845741e9a ipsec-tools-0.2.5.ebuild 1549
-MD5 6b45b8511b248bc6975241ad77aa11b2 ipsec-tools-0.5-r1.ebuild 1584
-MD5 20913a445c3eac38edca0ae43e36b1de ipsec-tools-0.3.3.ebuild 1599
-MD5 503b0a5c553d765eefcb5f8e27f3bcf4 ChangeLog 4730
-MD5 32ef126c26f7354eee96eb430068db74 metadata.xml 222
-MD5 d99501b6fa9700e3b7e8904150d8799f ipsec-tools-0.4-r1.ebuild 1743
-MD5 8b27a4c09e2f87bfe30ceadad163d7f3 ipsec-tools-0.5-r2.ebuild 1716
-MD5 132342923ff9de774856093e9b245471 ipsec-tools-0.5.2.ebuild 1585
-MD5 84cffb83a2579976f872a29d42767714 files/ipsec.conf.sample 260
-MD5 2060a9a972f7975e1fdc755eec1d7791 files/digest-ipsec-tools-0.4 67
-MD5 da6f1a46fe846d9a36c49865af536935 files/digest-ipsec-tools-0.5 68
-MD5 2060a9a972f7975e1fdc755eec1d7791 files/digest-ipsec-tools-0.4-r1 67
-MD5 da6f1a46fe846d9a36c49865af536935 files/digest-ipsec-tools-0.5-r1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0deb39da59abc2e9b7f309b98083bcd5 ChangeLog 4923
 MD5 6ed9fbfd1bce8915be1e87a159802c46 files/digest-ipsec-tools-0.2.5 69
 MD5 25ac1660a8d1d054bb9c848a21ad907a files/digest-ipsec-tools-0.3.1 69
 MD5 c35a69d989ddc45b7a7e30909479d91e files/digest-ipsec-tools-0.3.3 69
-MD5 788e3de82c1c6532dab0dc0c19c1bf40 files/racoon.conf.d 621
-MD5 0e62b8655b5b72cb0b312b710b28e471 files/ipsec-tools-0.4-gcc34.diff 1008
-MD5 fa8e82259951e612a6d684983daefc3d files/racoon.init.d 1274
-MD5 b847486c75c3d9d4a1bef744e05ae006 files/ipsec-tools-0.5-isakmp-underrun.diff 714
-MD5 bb97988702b7573a0ffdaa46d1494e77 files/ipsec-tools-0.5-ipv6.diff 307
+MD5 2060a9a972f7975e1fdc755eec1d7791 files/digest-ipsec-tools-0.4 67
+MD5 2060a9a972f7975e1fdc755eec1d7791 files/digest-ipsec-tools-0.4-r1 67
+MD5 da6f1a46fe846d9a36c49865af536935 files/digest-ipsec-tools-0.5 68
+MD5 da6f1a46fe846d9a36c49865af536935 files/digest-ipsec-tools-0.5-r1 68
 MD5 da6f1a46fe846d9a36c49865af536935 files/digest-ipsec-tools-0.5-r2 68
 MD5 3101edbfff1f3a77e0711002dcd675ac files/digest-ipsec-tools-0.5.2 70
+MD5 0e62b8655b5b72cb0b312b710b28e471 files/ipsec-tools-0.4-gcc34.diff 1008
+MD5 bb97988702b7573a0ffdaa46d1494e77 files/ipsec-tools-0.5-ipv6.diff 307
+MD5 b847486c75c3d9d4a1bef744e05ae006 files/ipsec-tools-0.5-isakmp-underrun.diff 714
+MD5 84cffb83a2579976f872a29d42767714 files/ipsec.conf.sample 260
+MD5 788e3de82c1c6532dab0dc0c19c1bf40 files/racoon.conf.d 621
+MD5 fa8e82259951e612a6d684983daefc3d files/racoon.init.d 1274
+MD5 a428291d8a22a606eda6e16845741e9a ipsec-tools-0.2.5.ebuild 1549
+MD5 8ab0f354384bf0af0ac5f036bf870678 ipsec-tools-0.3.1.ebuild 1601
+MD5 20913a445c3eac38edca0ae43e36b1de ipsec-tools-0.3.3.ebuild 1599
+MD5 d99501b6fa9700e3b7e8904150d8799f ipsec-tools-0.4-r1.ebuild 1743
+MD5 1e8b9993c9d4f8bc53955cf690469564 ipsec-tools-0.4.ebuild 1692
+MD5 ef740a7e16a969008e0ed2bdf22019a8 ipsec-tools-0.5-r1.ebuild 1552
+MD5 47cb6792bf1c84666919e3f22600b7ca ipsec-tools-0.5-r2.ebuild 1683
+MD5 228ff7a8380ec6efeedd68194846e678 ipsec-tools-0.5.2.ebuild 1552
+MD5 3dc8c88c5bdd1d41e9ed803f1f549f87 ipsec-tools-0.5.ebuild 1474
+MD5 32ef126c26f7354eee96eb430068db74 metadata.xml 222
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCvV3MI1lqEGTUzyQRAilcAJ901qkyuBNJEBu/CYZWXOeWSEF0QwCeMv+L
+AAl5W3oOPtQ+9vjOO2oPqpk=
+=RXoi
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.5-r1.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.5-r1.ebuild
index 3ed15944e12e..83a71a49db0b 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.5-r1.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.5-r1.ebuild,v 1.2 2005/04/15 13:52:42 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.5-r1.ebuild,v 1.3 2005/06/25 13:35:49 swegener Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="ipv6 selinux"
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
-	|| ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )
+	>=sys-kernel/linux-headers-2.6
 	>=dev-libs/openssl-0.9.6"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-ipsec-tools )"
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.5-r2.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.5-r2.ebuild
index 9b9c51fc08d1..dadf23a2b38b 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.5-r2.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.5-r2.ebuild,v 1.1 2005/06/21 03:05:58 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.5-r2.ebuild,v 1.2 2005/06/25 13:35:49 swegener Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="ipv6 selinux"
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
-	|| ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )
+	>=sys-kernel/linux-headers-2.6
 	>=dev-libs/openssl-0.9.6"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-ipsec-tools )"
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.5.2.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.5.2.ebuild
index 7f9ddcc075d1..44f94472d8c0 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.5.2.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.5.2.ebuild,v 1.1 2005/06/21 03:05:58 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.5.2.ebuild,v 1.2 2005/06/25 13:35:49 swegener Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="ipv6 selinux"
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
-	|| ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )
+	>=sys-kernel/linux-headers-2.6
 	>=dev-libs/openssl-0.9.6"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-ipsec-tools )"
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.5.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.5.ebuild
index 4a6bf3c7e2b2..6d5e50d10a36 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.5.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.5.ebuild,v 1.2 2005/03/10 23:31:46 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.5.ebuild,v 1.3 2005/06/25 13:35:49 swegener Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="ipv6 selinux"
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
-	|| ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )
+	>=sys-kernel/linux-headers-2.6
 	>=dev-libs/openssl-0.9.6"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-ipsec-tools )"