Don't default to polarssl, this was introduced accidentally

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

7 files changed, 35 insertions, 30 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index d44ee3747664..5d99849153a2 100644
--- a/net-misc/openvpn/ChangeLog
+++ b/net-misc/openvpn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/openvpn
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.323 2015/07/12 19:30:58 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.324 2015/07/12 19:33:49 djc Exp $
+
+  12 Jul 2015; Dirkjan Ochtman <djc@gentoo.org> openvpn-2.3.6-r1.ebuild,
+  openvpn-2.3.6-r2.ebuild, openvpn-2.3.6.ebuild, openvpn-2.3.7.ebuild,
+  openvpn-9999.ebuild:
+  Don't default to polarssl, this was introduced accidentally
 
   12 Jul 2015; Dirkjan Ochtman <djc@gentoo.org> openvpn-9999.ebuild:
   Bring openvpn-9999 in line with 2.3.7 (fix bug 554638)
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index 0ac4e46a237b..ea72374594ac 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -13,27 +13,27 @@ AUX openvpn.tmpfile 39 SHA256 ef3453056a26487d27908d5ced124285403d8e88deb843fccd
 AUX up.sh 2865 SHA256 d887ee065261affd849227fa27e092cf66549d824a698f302312d15f787dd840 SHA512 35201b0e60ad20358080007e595eb4f96d186ba8e88f0485c55d164c28e3d78a12f3e09347ba3d76abb9b8b03fb4a53664bd74ab484be1548090022b956925fd WHIRLPOOL 8d25a66d192a6710466d149aec7a1719dfe91558205e8ba7e25b93e58869c8fedc96ba4ce2aedb0595b7e0b63299e6e41be1ba82c6b93ae6bbbb26d409c9bf51
 DIST openvpn-2.3.6.tar.gz 1213272 SHA256 7baed2ff39c12e1a1a289ec0b46fcc49ff094ca58b8d8d5f29b36ac649ee5b26 SHA512 70e0045ea41f6588769ab8b98d8f550b69148adbf7fedcdc36900e25950df43379950492652e243ec6e7965bf9c7dcc86a56ba5dfdc44523aaa81cfc508b1c6e WHIRLPOOL 737f2d1d69ee1c7700d5cd5a4e7d5d1b2f55d8b2229f7c2565fcb8c731ebb719ec8d6bad3b76f763f36e5c70c6e40a666db3508f3024f8e4637c0659061dba48
 DIST openvpn-2.3.7.tar.gz 1199706 SHA256 1f02a4cd6aeb6250ca9311560875b10ce8957a3c9101a8005bd1e17e5b03146e SHA512 35030eb432568e954d7d9543565c3c7d1268ff323e1a2da81047c497f3eeb6f4061d9cfc360aa98fe7c413282ee6d0eb70957d6d4a38d928348c706f20cb66df WHIRLPOOL 31b1cbdde3db8060f81b4b3fdc604dd357ad413ad18fcb7dae07c6bb4939f92d02271e6ecb677b5f3d80e305676c769232e9d114c667b85fab45125be10f49a4
-EBUILD openvpn-2.3.6-r1.ebuild 4383 SHA256 f6027c4baafcb215c36298f136e0b37454a57726136cf3681630b8455686792c SHA512 a08c51f7010064ca26df65fca7a3d7a1666a2312bec9d98247beb7e38e0928ecad2c9294233e200daacf93239b30c111f0d8f529294e22baae716f1b4d8a438b WHIRLPOOL ad01041339f6e7358dea5a6d126496724c6b6f50cbf9067c86550ba64392f294c1625fe37748a5c463a7691b7890e471ad937f102b32480bb694c0d7245b2dbf
-EBUILD openvpn-2.3.6-r2.ebuild 4444 SHA256 b8c2d4836e480176ed761ac56798be4c78a05de68b6855e8f66a0835dd942a87 SHA512 5f75bc5bb9116ef01a1815344a11d47f8953792c6d1db31d9687068812a66ac5d979eed4c035bccad4de1385ad434ab10dae1b6cbd33bb6760ecaeda04a0998a WHIRLPOOL 0395ffa2692bf979c4515b85fd0615c2612726a4d6799a4885f1e8c8eb1ad213ae57315e997a4216350fc2fb13ae814e918ce00ed10884116c045a51466bb4c7
-EBUILD openvpn-2.3.6.ebuild 4319 SHA256 cf290bb44eefbfa5399be29a71b19a90cf98d1b702ccf9b7418ff21f8706e837 SHA512 c8651f49048a9097b971287bf6e61bffa2087d025d8070a44df06783c2381b7f95bcc88935adffb661e6efe5a5b5f2286606fa4718c8a0f3b3fcae0c9ec2c038 WHIRLPOOL 052dfe2bd3a130f6ddf4e0258ce16f55a45fa026bad36f8242406b549425c6536606a7ee1bddb8ab6059029d21501a48e0a9f848db6f419d74773f763533edc1
-EBUILD openvpn-2.3.7.ebuild 4310 SHA256 62c9171fd968f4996e2cfd93604583915bd9fc5e4eb1043de908d93ff3516070 SHA512 e7ad5c719ecbd13fe921289c39a677a39028ab2737bd894df92c8de64d6c681effe30d0948ee44bc086e6f628e442728e6c615c0094c71e8df8d9ee58131a101 WHIRLPOOL f7f30759329df68edc3b55e299860e3ffc4749c77eea4c30729e2d7bf000d80d8abaac607785e8595b8bb0a21615ff4719263c5fededb94170e986d4cddee964
-EBUILD openvpn-9999.ebuild 4258 SHA256 c4bf688239341a277535b930c20d4b30240101905b052fc6e0d067d9e27f2975 SHA512 518560e571c7edcb246f360a523f432d8669f96b75c78aa2c0a42f614220813247476b133127337a4655c75147a26d12094c84d556c3c63bb740db849b3dff15 WHIRLPOOL 12056b7f733b6fd78461eaf44a0ddfa245aa7080847b3b300ddf4bb5d98f2c8d7d53c06e79edde5d9e80c19197ff87d93716bc845f15f87d3b6027eb16126dc1
-MISC ChangeLog 45181 SHA256 020ab220a08abe999010254b4237db457d79b8a553b3e69d010934d587948a3c SHA512 b9b0d2e498fb8d4aea4c2f1709b6f7f3da454fed9be942002f37517fd053ad0d8ec1129238e7382faa7305c00fc5568ce34fab8f06a48c5864f16fb06c280c15 WHIRLPOOL cf00a8b80f2d3bf2991ae9c9230cb1691ffc58c12011246c537be47919d40048ee6f88de1357bc9c9c28c87f8bf0079f731c9a737baa266b6f93076d87949a14
+EBUILD openvpn-2.3.6-r1.ebuild 4382 SHA256 9126cdf47630017ecfc4db06a85e0814d9b96c28d36306f7122171e6f1507402 SHA512 702931edf06a6f7aea5b1f84da30524c321506a9b52322297ce7858a886dcdd2118361df2a120c6c4a8508990faba3589ec7f23ebfbf95470762c3f0c42378e8 WHIRLPOOL 3a81d7e81b9181c812ab6b8532b2389f09d48826ff3c528baf46c23c7d7a474e32fb098dcb999b53eaaaad58af70e968a8ca881c4823556f680ee72708075b5c
+EBUILD openvpn-2.3.6-r2.ebuild 4443 SHA256 62df34a6f39af9106692b653ca37d04b8119b44335d218af5eebcdaf38bea8dd SHA512 6b35f80fc70c5b1ef5fca20e76d5f6209e40aa0a5fbadf54288237718a03a9853fa4442c8c1deb98b34b88cb6072c35fdf9c06c080fd1216df96bb566efb4e08 WHIRLPOOL 7f86cb8900e1a7ce1b2384d5445d807daf4ba1ab411ff3a1e74ec3bb4a7dad26062e3ad200305c6bed101c9c3e8f708cfc6b3052b8a617b09902775c581ffd23
+EBUILD openvpn-2.3.6.ebuild 4318 SHA256 1d9e25b29f9bd58df530ee9efb7bc23de17cda083eaf97547536c7871ff7eb5e SHA512 72ef385a427de32a38fb0e3f143e4da9111fe9c1e6e096f30be7a09f6e454efa28defd1af98f85a9136c376a3af5cc80b9aba023eb4ff5022186cd1a17330d68 WHIRLPOOL 43f41ae69e16c45528c805fd025c62a594cd980046ae4d11ae23d6c16f7bb2621ab0d719bcd6e638f636f1884b5173fcaca75d509d3eabec4d37e6de19819d4f
+EBUILD openvpn-2.3.7.ebuild 4309 SHA256 aff93bcdc514abba8e1a623bcdf0e149bf672a6ad76d03fa127178d42da6ce25 SHA512 e7d27377fe5b7d0517276ca3b1f35a15d1760d94cd37338b821f5edadd154d3c27f4023a0ac15f424b4015064523f712886272da172fa939fc5a28a5b6ee02af WHIRLPOOL 3a317cbd3a9fb3299463e2fb712d6ac5bba5ad11657cf5f81af7a448900511e37dd8222d74c0a4beb425f8e6a790dce7cad62a239006281ea561aebb24b3fa89
+EBUILD openvpn-9999.ebuild 4258 SHA256 f1309ed565c572b2d247cce3a3b2a87aa535f68c2028fe4ed46f36ef547f30c3 SHA512 63c21bcbc3ab465db4831589e108158fc0e6114f1f0bf11200b47b5be7904cef492b3b2ba7c9618b25bed38be68bb84b86befeadf8505ba7a3c767282eb8883e WHIRLPOOL 6ba04c644ea0ddacff339eca7a2e8f2076b3fd8730e902e6331b22fdbe6fa99e106aa25580da0113c0754aea34a194d63f7471ccc2822ddaff5e9bf4452a8c6b
+MISC ChangeLog 45411 SHA256 a45412ffe4cc79ace411e3e0ad041180575b2d8da3ca476d4f3ad8842ab6b799 SHA512 2e72449c210ed3f21ec5fb664c9cd798023982b7b09adf67fc4c05b3b86c548aa0be66577361899cc28612cff4ab1dd8da6fd378034c05aa30b2b402c87eb4ea WHIRLPOOL ecf93a17d2736755d0afbb875c5ae29051ca6ed13f5107e01958014771e69a3a265dbe1d1c79439172ca1f5853a5bba1900745408d9fef313f37066f53d4eb81
 MISC metadata.xml 988 SHA256 f8d77075b01a7250cfe43ecc06a635ffabe022b9c59eff660a236aff040d84dc SHA512 986f7a5de176f45aeed2e03770cc6b8ac0f1a55f410127c6c7b666255e742a483393db5c85e32f78c2f5e683e8124c3d907acb151245c2a982e587a59e1a4f2c WHIRLPOOL 10e57141519cfeefb7bfa89f0c3a1f4fea64067f8245c123545c85a48934294f694e5d3e888959f215aeccfa97fb54e500b31d4163e76942d80c5d3a6aebdc5f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVosHRAAoJEJ+WuSkwOAOBsxIQAMdCWnCLiRCtc1gGnjRy1xjv
-CDnu8Hddd5cceCVeYZuqfua7iD+XyiUBQYFJewq5dKL1uqbDh8VrVjHlXhuj0Wdn
-rtKSI9XVjAoLC6+wUpqN34vTa/yXZXAsIg8IWN3XwF6xNEHvQp/w6acyG4Z3MVSJ
-7JKU/+BEYNpl6VGfTcN7qm1D1OytCeEKm5vVbnM/97jJh4zQE37JTAE6OThlaOpp
-7KkmPoHhc/tcX1hAszjC07vOI0PPg2TX/fUlV53YvWzneIHBFBukvUWb5gJmK37B
-/7x3WsJyaVmmUkDsriJEiWMqimj3OLBZpasmZWlrso1Vv/p8UA+nlXS8SuGQIB2u
-rphUTLhyIXoOfcsjUKPudLP0hPOoLoaJkj4Iq4/vUS83dzh81RrY3kQAXKposAIp
-iUX7Ko8jkyvkFkvSOjft8syVUYAeSlW/RVByV5/lHrWSEsWmEqBiqq9LBU81J4sl
-uy9oJvXvVwLvGeiviMMTN2UrSwP17yIJFwzCEmrlpA9SiBAlM9b3X7Vdxd3+w92l
-5GBM9bPFCgGChxlNJxw0bo0E6pf8DoadKtwRAMmjfq1t5b/9DSBrfmBpzF8e++Fa
-HIgwxzVzHUmALCD/fLgkgoPkBHxH9Z90dIrHB5PdrCDOfenNz6N+RTATGvs2Bvi8
-Zl2lFCa88CCNYrj/kK5O
-=LB1J
+iQIcBAEBCAAGBQJVosLZAAoJEJ+WuSkwOAOBQowP/RjHnv5U0+fFOKTuMOfeqZrR
+cCrEFKeAxzgcFZcNnIZ9vKrgl/yatBcDkqlQRF7ztK6tiFCOQ61eqsS6lWZVdxv7
+N8BIX/g2p48TKaPwNWX0UMo3ycNBbxKRKglcfs35WE03/MbkJi25LxmO0WYP/4q3
+Q02fznFuzP+j29cymXw1FLEhnTaVTpq5uUoaeVWCQeYJyMAEDvUYVNjA3abDcCH9
+NXnTbSHZ6FcJVfILQ5ESy4CAECaIJ7oMESMB+hwREuD+pns3P/JYfE6iSl3g8/23
+t9FADf8poLyhTS0kY1zKWqTAAmtiQ+k+P4G2iilmVESb1U8+a+kCxI1hD6336BH+
+x6nOOcs/QDvtJZWq2QEN3aPEwzBD/PuyABltDgpO1dkdyOThs0ZcZ4ldxpWnr5Wy
+w/8ggG/Rc6+W+F+FpMo7602lnpeWDXUBpBO1TCZfjNR3cDXuUvnWPugTQDWAXWMs
+89DEBOLc+xz7kId6k/iVm9L64u5oISInaG6MSyVwqaFSCA4XgQvoLf3K1nX86142
+Nt5+1An6vwS1DqIOq0PifCpEtEOQcvVskUzXlWweoHq5NJ5CJI9LPgCKA6uV2Piy
+Yr0YYQbyPVYqTMcvx79PK0kLwdYPmEi1ndl6NA67ot3zfz8Aya9VZ3T/L9GQFIl1
+neCnUL1dnb32+HjgmUv6
+=Lhn2
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/openvpn-2.3.6-r1.ebuild b/net-misc/openvpn/openvpn-2.3.6-r1.ebuild
index bc0ad12b2349..a77ea88c1b15 100644
--- a/net-misc/openvpn/openvpn-2.3.6-r1.ebuild
+++ b/net-misc/openvpn/openvpn-2.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.6-r1.ebuild,v 1.2 2015/07/12 19:17:58 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.6-r1.ebuild,v 1.3 2015/07/12 19:33:49 djc Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://openvpn.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins +polarssl selinux +ssl systemd +lzo static userland_BSD"
+IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins polarssl selinux +ssl systemd +lzo static userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
 			polarssl? ( ssl )
diff --git a/net-misc/openvpn/openvpn-2.3.6-r2.ebuild b/net-misc/openvpn/openvpn-2.3.6-r2.ebuild
index e70d60b934c3..f8dab697126c 100644
--- a/net-misc/openvpn/openvpn-2.3.6-r2.ebuild
+++ b/net-misc/openvpn/openvpn-2.3.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.6-r2.ebuild,v 1.2 2015/07/12 19:17:58 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.6-r2.ebuild,v 1.3 2015/07/12 19:33:49 djc Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://openvpn.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins +polarssl selinux +ssl systemd +lzo static userland_BSD"
+IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins polarssl selinux +ssl systemd +lzo static userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
 			polarssl? ( ssl )
diff --git a/net-misc/openvpn/openvpn-2.3.6.ebuild b/net-misc/openvpn/openvpn-2.3.6.ebuild
index 405727a11e87..006d26152c0c 100644
--- a/net-misc/openvpn/openvpn-2.3.6.ebuild
+++ b/net-misc/openvpn/openvpn-2.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.6.ebuild,v 1.12 2015/07/12 19:17:58 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.6.ebuild,v 1.13 2015/07/12 19:33:49 djc Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://openvpn.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins +polarssl selinux +ssl systemd +lzo static userland_BSD"
+IUSE="examples down-root iproute2 pam passwordsave pkcs11 +plugins polarssl selinux +ssl systemd +lzo static userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
 			polarssl? ( ssl )
diff --git a/net-misc/openvpn/openvpn-2.3.7.ebuild b/net-misc/openvpn/openvpn-2.3.7.ebuild
index 6ce00601f33a..2b2fb124a7a6 100644
--- a/net-misc/openvpn/openvpn-2.3.7.ebuild
+++ b/net-misc/openvpn/openvpn-2.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.7.ebuild,v 1.2 2015/07/12 19:17:58 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.7.ebuild,v 1.3 2015/07/12 19:33:49 djc Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://openvpn.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="examples down-root iproute2 +lzo pam passwordsave pkcs11 +plugins +polarssl selinux socks +ssl static systemd userland_BSD"
+IUSE="examples down-root iproute2 +lzo pam passwordsave pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
 			polarssl? ( ssl )
diff --git a/net-misc/openvpn/openvpn-9999.ebuild b/net-misc/openvpn/openvpn-9999.ebuild
index a60c6841c55f..19f21d953f81 100644
--- a/net-misc/openvpn/openvpn-9999.ebuild
+++ b/net-misc/openvpn/openvpn-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.9 2015/07/12 19:30:58 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.10 2015/07/12 19:33:49 djc Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://openvpn.net/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="examples down-root iproute2 +lzo pam passwordsave pkcs11 +plugins +polarssl selinux socks +ssl static systemd userland_BSD"
+IUSE="examples down-root iproute2 +lzo pam passwordsave pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD"
 
 REQUIRED_USE="static? ( !plugins !pkcs11 )
 			polarssl? ( ssl )