Fixed pam issue when building plugins, #111267

Package-Manager: portage-2.0.51.22-r3

3 files changed, 18 insertions, 13 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index cbe6f1e0ae2b..47178e2d78ee 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,9 @@
 # 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.50 2005/11/02 18:04:29 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.51 2005/11/02 18:08:47 uberlord Exp $
+
+  02 Nov 2005; Roy Marples <uberlord@gentoo.org> openvpn-2.0.4.ebuild:
+  Fixed pam issue when building plugins, #111267
 
   02 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> openvpn-2.0.4.ebuild:
   Stable on ppc.
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index e94e73cab4a5..8a126d5e726c 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -1,16 +1,16 @@
-MD5 9f39a6c6d267838f947178497540a76b openvpn-2.0.2-r3.ebuild 3531
-MD5 2f124a623dcae6dd808fb1035d53bad8 openvpn-2.0.4.ebuild 3711
-MD5 eb2aeb437e7815de4810170acb79480c openvpn-2.0.1.ebuild 2159
-MD5 79a13b7ae60dfbf2b7527ad98655c599 metadata.xml 543
-MD5 8f234007199f94facde7b54b6171de5c ChangeLog 8026
-MD5 c0bb9d10424cda8d9361368015b324ca openvpn-1.6.0.ebuild 1338
 MD5 57db3db67cafcb3a5bb7a07eb4a3b884 openvpn-1.5.0-r1.ebuild 1334
+MD5 23e12c0f6ab97dc12bc7727dacdee65e openvpn-2.0.4.ebuild 3806
 MD5 39940f47a19b6f46fd8bef9cc133d15b openvpn-2.0.2.ebuild 2164
-MD5 e173c8d27fc623ce79d2c5e83854b28a files/openvpn 1318
-MD5 7668c8296962628c96186d860d6a878d files/digest-openvpn-2.0.1 65
+MD5 79a13b7ae60dfbf2b7527ad98655c599 metadata.xml 543
+MD5 81b28d0cb4821303291c7c16ac7c6070 ChangeLog 8149
+MD5 9f39a6c6d267838f947178497540a76b openvpn-2.0.2-r3.ebuild 3531
+MD5 c0bb9d10424cda8d9361368015b324ca openvpn-1.6.0.ebuild 1338
+MD5 eb2aeb437e7815de4810170acb79480c openvpn-2.0.1.ebuild 2159
 MD5 64180e225493c8fc2e085071ff65897b files/digest-openvpn-1.6.0 65
+MD5 e173c8d27fc623ce79d2c5e83854b28a files/openvpn 1318
 MD5 e3c739fa378e74cf7a83a17f4a2e30cc files/openvpn.init 1449
-MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0-r1 65
-MD5 a6e045607848d597905830e082d7c703 files/digest-openvpn-2.0.4 65
+MD5 7668c8296962628c96186d860d6a878d files/digest-openvpn-2.0.1 65
 MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2-r3 65
+MD5 a6e045607848d597905830e082d7c703 files/digest-openvpn-2.0.4 65
+MD5 51eea8a2c9a5189571de49ad32b88ac1 files/digest-openvpn-1.5.0-r1 65
 MD5 378f09becb8ef03cad8e76a44c7210f9 files/digest-openvpn-2.0.2 65
diff --git a/net-misc/openvpn/openvpn-2.0.4.ebuild b/net-misc/openvpn/openvpn-2.0.4.ebuild
index 4ef12a5bc602..8aec03f6a33b 100644
--- a/net-misc/openvpn/openvpn-2.0.4.ebuild
+++ b/net-misc/openvpn/openvpn-2.0.4.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-misc/openvpn/openvpn-2.0.4.ebuild,v 1.3 2005/11/02 18:04:29 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.0.4.ebuild,v 1.4 2005/11/02 18:08:47 uberlord Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -11,12 +11,13 @@ HOMEPAGE="http://openvpn.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ppc ~ppc-macos ~sparc x86"
-IUSE="examples iproute2 minimal passwordsave selinux ssl static threads"
+IUSE="examples iproute2 minimal pam passwordsave selinux ssl static threads"
 
 RDEPEND=">=dev-libs/lzo-1.07
 	kernel_linux? (
 		iproute2? ( sys-apps/iproute2 ) !iproute2? ( sys-apps/net-tools )
 	)
+	!minimal? ( pam? ( virtual/pam ) )
 	selinux? ( sec-policy/selinux-openvpn )
 	ssl? ( >=dev-libs/openssl-0.9.6 )"
 DEPEND="${RDEPEND}
@@ -49,6 +50,7 @@ src_compile() {
 		cd plugin
 		for i in $( ls 2>/dev/null ); do
 			[[ ${i} == "README" || ${i} == "examples" ]] && continue
+			[[ ${i} == "auth-pam" ]] && ! use pam && continue
 			einfo "Building ${i} plugin"
 			cd "${i}"
 			emake || die "make failed"