Make pkcs11 USE depend on ssl flag (fixes bug 517660)

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x30380381

5 files changed, 29 insertions, 14 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 4e76a7b917d1..ebdfd9e3d68a 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.292 2014/07/20 15:27:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.293 2014/07/21 09:29:28 djc Exp $
+
+  21 Jul 2014; Dirkjan Ochtman <djc@gentoo.org> openvpn-2.3.3.ebuild,
+  openvpn-2.3.4-r1.ebuild, openvpn-2.3.4.ebuild:
+  Make pkcs11 USE depend on ssl flag (fixes bug 517660)
 
   20 Jul 2014; Tobias Klausmann <klausman@gentoo.org> openvpn-2.3.3.ebuild:
   Stable on alpha, bug #511668
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 1f8e2bf86b79..1ab1109590d0 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -15,18 +15,26 @@ DIST openvpn-2.3.3.tar.gz 1161137 SHA256 f025d14631105a66e501ca897830cd4d26a1438
 DIST openvpn-2.3.4.tar.gz 1191101 SHA256 af506d5f48568fa8d2f2435cb3fad35f9a9a8f263999ea6df3ba296960cec85a SHA512 6837e9ff48181ffd7cb36fe7f6943b580f68df7e840a5bd3c7ab01845592627275c6bfcc929cfa1570aef1af54b49df320ae4d7999968969ac23f1b244a37ec8 WHIRLPOOL 8b7b949f3f61f7b85f400d197bcc92ed4991ef1cc979f8b7f5a9e64740e3260ed23668775fbbd2404c751e4163d255cebfd4c1da176e959d0c80e90eef659a58
 EBUILD openvpn-2.3.1.ebuild 4143 SHA256 8dad20422d32628c0ee91b6d3ccb103e75c2c901ce9c1240ef95102f4c02dc53 SHA512 6792c68e8a5bbe43a93a3c9a128ae853edd21e0c918cf689d2db088b984aecdc570d5281bff263aca6078b07ddd0ba172c3c9b4ccace0fc690357d5fb13aff00 WHIRLPOOL 33cdd572f00952748a2ab05c39924495173e217df315a56f91036b45a268da1e8c687de381d8cdd5850a26ee6a6d3010053fee671db0901be55c664697900e6b
 EBUILD openvpn-2.3.2.ebuild 4131 SHA256 c3c95da613ac170ca6db06e721e0d3add9724fb3a2dbc07111aa9f0e36c6cc69 SHA512 d35632f2719f50fd0cb4202d737bd1cdbeeee96e5bc455070316a79b5b4bd61f5f47e76cdf27e136a15ee1883ba7e67db723a28d8597eca6629cf93e430e6715 WHIRLPOOL 689bcc9ffb76dc12987df2b57d9cb7e5c4f28079a1540cd8b32e10b392205798a72e6a9ec35cf016f421c3d9a985af2530d444258ff7deaceb1b19076a1451bf
-EBUILD openvpn-2.3.3.ebuild 4189 SHA256 eadb1c4a00b50ca4ec2bb95d271aae7812727ee35675bf3e415e998e0c845fff SHA512 15af4ac739666c0775f71d3eb3e0c6c800c60ea295a103aba7b68d128a899576a3986b9612512cce4e701eca989cef4d1e2ac88baeeb438bcb2709853b3965f7 WHIRLPOOL ca7616c75ddde1c56a2107686f8e594341ea93dc997144a34f67b190ea84fc781bc85d7792d6013ecc039f27c32239c57905e5a53ea7753eb2fd7ced95147dd7
-EBUILD openvpn-2.3.4-r1.ebuild 4356 SHA256 f2635cacc33d4087ed944346279e007b52a68fbba028244ec0ef203db25a8010 SHA512 ec324129b4adea759c08d817973016fa1e92873f9b028a3401f30d99e796b76116a8ec00c58abb904e431aab79d38abcc6eda1378ca82ba00e97f89d5f2aa85e WHIRLPOOL c69e6054f8d28252f83696465b09ec598a9d7131819925c1e3c3edee81b69df4b252b7144e93313955c404191d8115b298adafcd7c941bb6e388fa13e1ab6578
-EBUILD openvpn-2.3.4.ebuild 4187 SHA256 ff86a65a6eaf6cb32e93d8c4f48973755f90accccb74ab26906a293accc98acb SHA512 4963bc40ac192a489b8082dfcf8a2359fb28e668d63b47a092f2460baf90d788cc1877e91e5e48c6c76510f5f45971846ea94a3368febd42b1fea63ee458d0da WHIRLPOOL 9ea750a6f72a098e32b169d4adea289ceb26bd8eb72aab84d00a98b6ad139750136234fd43d2ddbb9ff724f8a20f370d84a351419d78a8bfe88308b1fc22c9d7
+EBUILD openvpn-2.3.3.ebuild 4203 SHA256 52d020f34c650cc5f62a47ba0577fec5796c5f3d6f122d1fb10156558270ae09 SHA512 0466684cb0a091e51495c7e4909347dd9fb784391b056addfb374d65ef8ad9a22e1fc3c15f64d33ee94d3d8a6d332d16b3c63e63f2265d5b1478f14892913991 WHIRLPOOL fb2402e520f68bfd97557cbebbeb5238c4988b854eceb2b09d223c64c4c3fe920c6e66bfa45d7f47df3b2487a46a5705b749b4de2f7c8c2c00a9ab1d480674a1
+EBUILD openvpn-2.3.4-r1.ebuild 4375 SHA256 06de219e637f8731918ec6da5324bbbeb742c27144711d24c7bf2017d53c5768 SHA512 fb0fb8fff8caa0fcb8b8d8afe5013f92b5eb1d83f8245b5b37d0f3f23db52ad3f5063478a6a216315c84f516a41cfb34d88264a819209c543ed1b3264e01df2b WHIRLPOOL 1f5904b0783ec8c6650353f6880753d6b522f7d653059f20c9b360463a54c4937dbb3ada98a5bd4db8e2f6de90642d2cf761dc5a0e94d85a6ebf5911cc81c00a
+EBUILD openvpn-2.3.4.ebuild 4206 SHA256 452c241a0db076bb8437e380bdb34615ec7d8e88bfa3808b49deb6db9a418819 SHA512 ccaa9b84e94aa9777e483b5ff9683e729bd6d81b5c9ab6314e4a35be7d378a12dd251bc660b9adf4d3d608e798cf78119d8f3eece60856b481ebeb9598851d1d WHIRLPOOL d265b81a17cf2bfd6da215c6a609235adb0f63a3edd75ce904c131f4d717a077aa045024ffadf700fe05dcc1a4b89e9e0d90c01e4974b566fa63e1175796068c
 EBUILD openvpn-9999.ebuild 3938 SHA256 afcf2646c697ed990fc21546bdbac75ee9dc70fe125be4036fa294aee71e57db SHA512 ad23685991fd6398e795fb02b074be29d4abe9e008286a742caf0a3f37e51f85d6579a19f634cd2f8e42730e9226c2c0efe993dd85599c5efa19eb9a2c5c820f WHIRLPOOL 1dca3d38e7bbdc72567a253af0c12fdf6ff79eaaf1064bb874259e13507c52bdd4a4704e3da9d72eb6ce2afd8519b4acec3b757de996f21012c8e9df589f6b2e
-MISC ChangeLog 41043 SHA256 e4a9527cfaca363246f8093b152b7a4b88b2d817d378388517bbbe1bce097070 SHA512 e5e0997ebaf4322f51205cfce9da30defe96e94ed5c36c477a7783c8e771e4f94bb0a16fc166f67e48423a6e0de8c5628f50024259eb20ec9b3ae19b5f11f798 WHIRLPOOL 17080bfaa854e9303fca48fcda0b110f0761203749887603988d02922364e52b7250cc3023a888336009a1981644c83326d69f02f2a2d72430dcdb5537821639
+MISC ChangeLog 41214 SHA256 4d5f8ae2615ab07e52c141df863eb5223bace5d44cf1d15a0c3528c48aca4c30 SHA512 de680ac8eb522b50986b124da3659e3e2fda3d38712e123801b9064c18746986aaa88b2ecc94028a2beb632da21d9e5469f42c9cf0fc90be271136128a8c1923 WHIRLPOOL 8170bcd2cc3f2727b47368ecf6c270776f303166c3777c9b7928e759251de5fa7f4c0f00c28002abf266f6da194b1f42fbd2995e914bfc5b8c256ec998b1eaa1
 MISC metadata.xml 937 SHA256 3dfcc28012f2c92f044882c39d56b6ef82bb80749ce688b75d526cc6c8836dd3 SHA512 ad3f218ccc64249fda19d87fe79494280eb880841f2d1e69757e7093e62b446f273fecd074ccac02c28894924b02d6a9c9fbbc1bd12ab13493f7f77e50e5b1ce WHIRLPOOL 65bf683e35f44c306c9ed3297cd954eb490f658f97a2d03af2cba0484030b1eccdf401fdc867a5c35a602bd67bf7052d555c2a48b7bebb4469158e26a530a742
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iKYEAREIAGYFAlPL3/FfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
-RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOiQPgCdGjQT69b0iF4Ge0Mh60yRsR1P
-kGwAoIUQOsbtLTIkPOgOu+etRI1xmMDM
-=EqX5
+iQIcBAEBCAAGBQJTzN2XAAoJEJ+WuSkwOAOB9rkP/1PSt3aCqOLla0PyzFHyLhCM
+e1yaTv1jb3d1TMm4ZnnVZh0HNZgwIwGHWUQe3C8klfDLY7C/qRF8lMw2lVVIt7nt
+rVF3GAYEgp9XbOUGSp9mEPvMKnoaHKWj7nMKlRM6arp2crozIQB1AWge5ASJmRgK
+lErouPEzL6XXLDNATrkKh6+IxhLP4/CVN++vWibp6tmEl+iESu+71uKbRb7MIPFl
+8gjvTZgwkPsTSnLalJRqpnglZaQruxyxFVWDIV++EzBzrNCzaszXaZ1uvD3Z8SK3
+0UKxURAWNqkQhnLKh5C7BNEbkuFxIYHOa1vqWo2e9g392yFb7ZJPMCqwB7ejYqCm
+eu0OgCnurFifkRW18EBPBbFYtE/2Drm3KhigweP7kpF1ZEZvbs0bnhVzewm3nSF9
+A5XoxLZFdE55C/629OF8YCROT8X2AxvXCElt+tZADV7NG0M0q7u6ySN/9U26HNcg
+YDeyBENlrHqSZxrsrWIfns0bl2oDV/sC48fYXb2I5NDLSKxBiCAfMDayabM9OFXQ
+C31zbLBlnIcGmxyzanKtKT3FnDREmT6QH+cuBBXR09bUfnFZ4wI7/0Wd52vh5RQB
+eSAASKQ4L3TlcyzVPw+ZhvzIs/1qrXADYa7u+NHiH3gmWHVKLhlk8cMJA8YqZvBb
+K7FUTt9JrO5U2dlstq5l
+=Sxqx
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/openvpn-2.3.3.ebuild b/net-misc/openvpn/openvpn-2.3.3.ebuild
index f05e375a1a49..f7b9611efe81 100644
--- a/net-misc/openvpn/openvpn-2.3.3.ebuild
+++ b/net-misc/openvpn/openvpn-2.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.3.ebuild,v 1.5 2014/07/20 15:27:44 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.3.ebuild,v 1.6 2014/07/21 09:29:28 djc Exp $
 
 EAPI=4
 
@@ -17,6 +17,7 @@ IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins +polarssl sel
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
 			polarssl? ( ssl )
+			pkcs11? ( ssl )
 			!plugins? ( !pam !down-root )"
 
 DEPEND="
diff --git a/net-misc/openvpn/openvpn-2.3.4-r1.ebuild b/net-misc/openvpn/openvpn-2.3.4-r1.ebuild
index 415af783d0f7..3dc0834d685b 100644
--- a/net-misc/openvpn/openvpn-2.3.4-r1.ebuild
+++ b/net-misc/openvpn/openvpn-2.3.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.4-r1.ebuild,v 1.1 2014/07/03 07:34:48 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.4-r1.ebuild,v 1.2 2014/07/21 09:29:28 djc Exp $
 
 EAPI=4
 
@@ -17,6 +17,7 @@ IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins +polarssl sel
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
 			polarssl? ( ssl )
+			pkcs11? ( ssl )
 			!plugins? ( !pam !down-root )"
 
 DEPEND="
diff --git a/net-misc/openvpn/openvpn-2.3.4.ebuild b/net-misc/openvpn/openvpn-2.3.4.ebuild
index f7a8315b4e44..29dc4c0fa5f4 100644
--- a/net-misc/openvpn/openvpn-2.3.4.ebuild
+++ b/net-misc/openvpn/openvpn-2.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.4.ebuild,v 1.1 2014/05/15 07:12:52 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.4.ebuild,v 1.2 2014/07/21 09:29:28 djc Exp $
 
 EAPI=4
 
@@ -17,6 +17,7 @@ IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins +polarssl sel
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
 			polarssl? ( ssl )
+			pkcs11? ( ssl )
 			!plugins? ( !pam !down-root )"
 
 DEPEND="