Dropped the smartcard USE flag and opensc dependency as requested by the

openvpn pcks11 patch author Alon Bar-Lev, #118435.
Package-Manager: portage-2.1_pre10-r5

3 files changed, 20 insertions, 14 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 6737bf2d1192..39df4dd34ab2 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.84 2006/05/09 09:21:40 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.85 2006/05/10 06:45:36 uberlord Exp $
+
+  10 May 2006; Roy Marples <uberlord@gentoo.org> openvpn-2.1_beta14.ebuild:
+  Dropped the smartcard USE flag and opensc dependency as requested by the
+  openvpn pcks11 patch author Alon Bar-Lev, #118435.
 
 *openvpn-2.1_beta14 (09 May 2006)
 
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 97fd692f1334..1608eca68989 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -24,14 +24,14 @@ EBUILD openvpn-2.0.6.ebuild 3855 RMD160 8ea7fc436052eaedc29cab3d23a4786c64907214
 MD5 418f9c55fcaad0fbc9441a1afa298b37 openvpn-2.0.6.ebuild 3855
 RMD160 8ea7fc436052eaedc29cab3d23a4786c64907214 openvpn-2.0.6.ebuild 3855
 SHA256 643a375dee682284d428aa84c25c8e2610e6e8b6c5e1f9a775dd8cf9cfadff89 openvpn-2.0.6.ebuild 3855
-EBUILD openvpn-2.1_beta14.ebuild 4224 RMD160 1fb5d3f1052d54639367ba5142a02a62ef3e5074 SHA1 ef2ed19ca8262de398cf5032b921af89cd1a0a72 SHA256 15a0cf630e2e4ee768a7263ca50362829d17227055f2fc2d50e387a5cfd98576 size 4224
-MD5 f11d0a54965ea04499a63774c8bca12f openvpn-2.1_beta14.ebuild 4224
-RMD160 1fb5d3f1052d54639367ba5142a02a62ef3e5074 openvpn-2.1_beta14.ebuild 4224
-SHA256 15a0cf630e2e4ee768a7263ca50362829d17227055f2fc2d50e387a5cfd98576 openvpn-2.1_beta14.ebuild 4224
-MISC ChangeLog 12994 RMD160 a48f28d4671f37c011d9824efe28416ab4f90c17 SHA1 21d1562032bac65f91b06d7ab9153b6335be10c8 SHA256 68beac6dcceef6ff18bbe7c1a1b668c49e7689a93fa1561d921d24d723e1dd9f size 12994
-MD5 b364c074d52f83f0b4a24ed054ec6123 ChangeLog 12994
-RMD160 a48f28d4671f37c011d9824efe28416ab4f90c17 ChangeLog 12994
-SHA256 68beac6dcceef6ff18bbe7c1a1b668c49e7689a93fa1561d921d24d723e1dd9f ChangeLog 12994
+EBUILD openvpn-2.1_beta14.ebuild 4203 RMD160 71f0ea6a5cc66938cf72d65c1544542295b61b1d SHA1 9390a15ef954ca962598ec7b63bd498d7bef99c4 SHA256 a84eb436e8b737f28e7769d65d68d759104922c745c34ee3350f6fb598c6f552 size 4203
+MD5 e1f9cb5649cd09cdcee728ef502878a9 openvpn-2.1_beta14.ebuild 4203
+RMD160 71f0ea6a5cc66938cf72d65c1544542295b61b1d openvpn-2.1_beta14.ebuild 4203
+SHA256 a84eb436e8b737f28e7769d65d68d759104922c745c34ee3350f6fb598c6f552 openvpn-2.1_beta14.ebuild 4203
+MISC ChangeLog 13199 RMD160 7d4a62c1578902fcc31915994580754aae016738 SHA1 d173f8376c932284505cdd3175f881e004afa793 SHA256 cb91cb7415c312c1eca004c3bb73a05ea8522cd825c723cd7a847f14f9a27b2e size 13199
+MD5 30f81cf5cd3f94bb998e7e3843c6cb61 ChangeLog 13199
+RMD160 7d4a62c1578902fcc31915994580754aae016738 ChangeLog 13199
+SHA256 cb91cb7415c312c1eca004c3bb73a05ea8522cd825c723cd7a847f14f9a27b2e ChangeLog 13199
 MISC metadata.xml 440 RMD160 120089ec9c799161dfeeacd9a3adfc40b4317f06 SHA1 23d2975ef0f709dc2e754a5867942e679ee60740 SHA256 408ca4fc4f58fa21e629582d0a44a759f9695a018479d70efbd3338b6bdbcfd6 size 440
 MD5 62aa0438042b29eba4a6afd971037761 metadata.xml 440
 RMD160 120089ec9c799161dfeeacd9a3adfc40b4317f06 metadata.xml 440
diff --git a/net-misc/openvpn/openvpn-2.1_beta14.ebuild b/net-misc/openvpn/openvpn-2.1_beta14.ebuild
index c007a61ae09b..d7fbb89885a7 100644
--- a/net-misc/openvpn/openvpn-2.1_beta14.ebuild
+++ b/net-misc/openvpn/openvpn-2.1_beta14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_beta14.ebuild,v 1.1 2006/05/09 09:21:41 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1_beta14.ebuild,v 1.2 2006/05/10 06:45:36 uberlord Exp $
 
 inherit eutils gnuconfig multilib
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://openvpn.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc-macos ~sparc ~x86"
-IUSE="examples iproute2 minimal pam passwordsave selinux smartcard ssl static threads"
+IUSE="examples iproute2 minimal pam passwordsave selinux ssl static threads"
 
 DEPEND=">=dev-libs/lzo-1.07
 	kernel_linux? (
@@ -19,7 +19,6 @@ DEPEND=">=dev-libs/lzo-1.07
 	)
 	!minimal? ( pam? ( virtual/pam ) )
 	selinux? ( sec-policy/selinux-openvpn )
-	smartcard? ( dev-libs/opensc )
 	ssl? ( >=dev-libs/openssl-0.9.6 )"
 
 src_unpack() {
@@ -34,11 +33,14 @@ src_compile() {
 	# We cannot use use_enable with iproute2 as the Makefile stupidly
 	# enables it with --disable-iproute2
 	use iproute2 && myconf="${myconf} --enable-iproute2"
-	use minimal && myconf="${myconf} --disable-plugins"
+	if use minimal ; then
+		myconf="${myconf} --disable-plugins"
+	else
+		myconf="${myconf} --enable-pkcs11"
+	fi
 
 	econf ${myconf} \
 		$(use_enable passwordsave password-save) \
-		$(use_enable smartcard pkcs11) \
 		$(use_enable ssl) \
 		$(use_enable ssl crypto) \
 		$(use_enable threads pthread) \