- q/a fix. os-headers are not needed in RDEPEND

(Portage version: 2.0.51-r15)

10 files changed, 37 insertions, 43 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 1d33d50a9d20..2c75e76fdf36 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.23 2005/01/22 22:59:23 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.24 2005/02/05 16:59:59 solar Exp $
+
+  05 Feb 2005; <solar@gentoo.org> openvpn-1.5.0-r1.ebuild,
+  openvpn-1.6.0.ebuild:
+  - q/a fix. os-headers are not needed in RDEPEND
 
   23 Jan 2005; Daniel Black <dragonheart@gentoo.org> openvpn-1.5.0-r1.ebuild,
   openvpn-1.6.0.ebuild:
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index a32f490f5d98..ad13bf2e6e2a 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,29 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a1effff1b20f53a61b1d546dee053d40 ChangeLog 3296
+MD5 1d44212ec7203b8961d13c74dc4df22f openvpn-1.6.0.ebuild 1277
+MD5 ce52981c9c518cf4f271620c92efa497 openvpn-1.3.2.ebuild 778
+MD5 3c717b5634371e2d6fee514a93ee8c23 openvpn-1.4.2.ebuild 830
+MD5 cddf8c2131b65b7c585d6a7e9dfb5f7c openvpn-1.5.0.ebuild 1135
+MD5 6864b1b451fc610d22a0b87296cf2be8 openvpn-1.1.0.ebuild 779
+MD5 5fcd7a1aa730e444b5dee398ac9d1911 ChangeLog 3430
+MD5 8d3ba7f1a760c4bf7be46edfd527395e openvpn-1.3.1.ebuild 779
 MD5 423c6cab5ca8c828963eea965c8b6486 metadata.xml 461
-MD5 b1cadc6077518e0349901e1af611b326 openvpn-1.1.0.ebuild 779
-MD5 72a2cec0b77073b9fb89ea8a3691b724 openvpn-1.3.1.ebuild 779
-MD5 06f6577c4321d566e22ec504429ec6d9 openvpn-1.3.2-r1.ebuild 865
-MD5 d9f4c1927a54516c83afb0d7212335a4 openvpn-1.3.2.ebuild 778
-MD5 d2d04f33d42fdec3605b6a7d69345415 openvpn-1.4.2.ebuild 830
-MD5 759e4ae720c63463d1f6524340f46a81 openvpn-1.5.0.ebuild 1135
-MD5 69f6b8d4b53f6acb58389e155804886e openvpn-1.5.0-r1.ebuild 1242
-MD5 295fe0c424cd00692cfa63afde01b1e6 openvpn-1.6.0.ebuild 1257
+MD5 1b38b8ec465c1cbc30cb36de57b71e92 openvpn-1.3.2-r1.ebuild 865
+MD5 4a477c2b8c46f74d5d71e81d16a3bb94 openvpn-1.5.0-r1.ebuild 1262
 MD5 7a773fcca001e35d171b15d68d435d97 files/digest-openvpn-1.1.0 65
 MD5 45d5378d808bbb444fe4435d781b4329 files/digest-openvpn-1.3.1 65
 MD5 c496ea99e1e80b1d0ea01f1591351f60 files/digest-openvpn-1.3.2 65
-MD5 c496ea99e1e80b1d0ea01f1591351f60 files/digest-openvpn-1.3.2-r1 65
 MD5 e21b10320b90f5cb54d5e90d2d9ad8eb files/digest-openvpn-1.4.2 65
 MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0 65
-MD5 62150e7ee165ac0f0db05fbbfefe17bd files/openvpn 1019
-MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0-r1 65
 MD5 64180e225493c8fc2e085071ff65897b files/digest-openvpn-1.6.0 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB8trRmdTrptrqvGERAr5IAJ99IIxbECVHzEMwsoUA4Is3n/VLXQCdGVsz
-PtHBgWIHmr9drbwsRqSzlm0=
-=koaj
------END PGP SIGNATURE-----
+MD5 c496ea99e1e80b1d0ea01f1591351f60 files/digest-openvpn-1.3.2-r1 65
+MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0-r1 65
+MD5 62150e7ee165ac0f0db05fbbfefe17bd files/openvpn 1019
diff --git a/net-misc/openvpn/openvpn-1.1.0.ebuild b/net-misc/openvpn/openvpn-1.1.0.ebuild
index bdeb66d2ea90..ac49a026bb45 100644
--- a/net-misc/openvpn/openvpn-1.1.0.ebuild
+++ b/net-misc/openvpn/openvpn-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.1.0.ebuild,v 1.13 2004/08/25 02:52:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.1.0.ebuild,v 1.14 2005/02/05 16:59:59 solar Exp $
 
 IUSE="ssl"
 
diff --git a/net-misc/openvpn/openvpn-1.3.1.ebuild b/net-misc/openvpn/openvpn-1.3.1.ebuild
index 5fb25715cb0d..93ffac11425e 100644
--- a/net-misc/openvpn/openvpn-1.3.1.ebuild
+++ b/net-misc/openvpn/openvpn-1.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.3.1.ebuild,v 1.11 2004/08/25 02:52:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.3.1.ebuild,v 1.12 2005/02/05 16:59:59 solar Exp $
 
 IUSE="ssl"
 
diff --git a/net-misc/openvpn/openvpn-1.3.2-r1.ebuild b/net-misc/openvpn/openvpn-1.3.2-r1.ebuild
index 536b5f9e7771..46703f378778 100644
--- a/net-misc/openvpn/openvpn-1.3.2-r1.ebuild
+++ b/net-misc/openvpn/openvpn-1.3.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.3.2-r1.ebuild,v 1.7 2004/08/25 02:52:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.3.2-r1.ebuild,v 1.8 2005/02/05 16:59:59 solar Exp $
 
 IUSE="ssl"
 
diff --git a/net-misc/openvpn/openvpn-1.3.2.ebuild b/net-misc/openvpn/openvpn-1.3.2.ebuild
index 8aa50023080a..60bbc5d42b3b 100644
--- a/net-misc/openvpn/openvpn-1.3.2.ebuild
+++ b/net-misc/openvpn/openvpn-1.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.3.2.ebuild,v 1.7 2004/08/25 02:52:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.3.2.ebuild,v 1.8 2005/02/05 16:59:59 solar Exp $
 
 IUSE="ssl"
 
diff --git a/net-misc/openvpn/openvpn-1.4.2.ebuild b/net-misc/openvpn/openvpn-1.4.2.ebuild
index fafe8d9da074..545dab34c032 100644
--- a/net-misc/openvpn/openvpn-1.4.2.ebuild
+++ b/net-misc/openvpn/openvpn-1.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.4.2.ebuild,v 1.5 2004/08/25 02:52:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.4.2.ebuild,v 1.6 2005/02/05 16:59:59 solar Exp $
 
 IUSE="ssl"
 
diff --git a/net-misc/openvpn/openvpn-1.5.0-r1.ebuild b/net-misc/openvpn/openvpn-1.5.0-r1.ebuild
index 95e24c20dde2..524e2ed95791 100644
--- a/net-misc/openvpn/openvpn-1.5.0-r1.ebuild
+++ b/net-misc/openvpn/openvpn-1.5.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.5.0-r1.ebuild,v 1.10 2005/01/22 22:59:23 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.5.0-r1.ebuild,v 1.11 2005/02/05 16:59:59 solar Exp $
 
 inherit gnuconfig
 
@@ -13,9 +13,9 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc ~alpha"
 
-DEPEND=">=dev-libs/lzo-1.07
-	virtual/os-headers
+RDEPEND=">=dev-libs/lzo-1.07
 	ssl? ( >=dev-libs/openssl-0.9.6 )"
+DEPEND="${RDEPEND} virtual/os-headers"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-misc/openvpn/openvpn-1.5.0.ebuild b/net-misc/openvpn/openvpn-1.5.0.ebuild
index 856176be6d06..35b6333dc7af 100644
--- a/net-misc/openvpn/openvpn-1.5.0.ebuild
+++ b/net-misc/openvpn/openvpn-1.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.5.0.ebuild,v 1.6 2004/08/25 02:52:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.5.0.ebuild,v 1.7 2005/02/05 16:59:59 solar Exp $
 
 IUSE="ssl"
 
diff --git a/net-misc/openvpn/openvpn-1.6.0.ebuild b/net-misc/openvpn/openvpn-1.6.0.ebuild
index c4e3327c321a..788f2ef94684 100644
--- a/net-misc/openvpn/openvpn-1.6.0.ebuild
+++ b/net-misc/openvpn/openvpn-1.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.6.0.ebuild,v 1.6 2005/01/22 22:59:23 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-1.6.0.ebuild,v 1.7 2005/02/05 16:59:59 solar Exp $
 
 inherit gnuconfig
 
@@ -13,9 +13,9 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ppc-macos ~amd64"
 
-DEPEND=">=dev-libs/lzo-1.07
-	virtual/os-headers
+RDEPEND=">=dev-libs/lzo-1.07
 	ssl? ( >=dev-libs/openssl-0.9.6 )"
+DEPEND="${RDEPEND} virtual/os-headers"
 
 src_unpack() {
 	unpack ${A}