Remove vulnerable versions of openvpn (bug 531308)

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

6 files changed, 19 insertions, 548 deletions

diff --git a/net-misc/openvpn/ChangeLog b/net-misc/openvpn/ChangeLog
index 14b6445adb6e..eafa79b0a847 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.316 2014/12/26 09:18:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.317 2014/12/28 11:33:39 djc Exp $
+
+  28 Dec 2014; Dirkjan Ochtman <djc@gentoo.org> -openvpn-2.3.2.ebuild,
+  -openvpn-2.3.3.ebuild, -openvpn-2.3.4-r1.ebuild, -openvpn-2.3.5.ebuild:
+  Remove vulnerable versions of openvpn (bug 531308)
 
   26 Dec 2014; Agostino Sarubbo <ago@gentoo.org> openvpn-2.3.6.ebuild:
   Stable for sparc, wrt bug #531308
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
index cefb37fd9715..44082b6760c8 100644
--- a/net-misc/openvpn/Manifest
+++ b/net-misc/openvpn/Manifest
@@ -9,33 +9,25 @@ AUX openvpn.init 1486 SHA256 c4b9e0899fa5ee0b90c5100da7711dc7a6a5658f10042b0feda
 AUX openvpn.service 335 SHA256 a63a6e1505f2b3e20f2c82588dd0c23da9d8c750e1f36fec2ba20a8b5b0c9de1 SHA512 fbd41b80253aaae6750301ac95d8b3bf09e3a70556cc0513792c8e06faa70a716233d134d4928295f381f0f235fcde0eeac9cfa074924b6666a4b46ff7cf91a9 WHIRLPOOL 16f44d10ab03110a21a69716fbac2e64e5376426edd26783d7946d928dd0cc106810126436488843da8e16277d3aa83d208fe50c4aebd9cff86526ce1762b215
 AUX openvpn.tmpfile 39 SHA256 ef3453056a26487d27908d5ced124285403d8e88deb843fccdba9f6724966826 SHA512 659713b35eee340f2b6578796f4335dda391aa635892e802e3f2531f31c9470460b4e4b3be45457f81f3b08b7d60ce15d16f8d70b968fbf24f846ef5f8611a58 WHIRLPOOL 19e4611ffda68a99851921ccaf3a99d04350cd3e0d8833136da151119c267edc383ff96162aa47a2f77171ae908ad011e4119a7a18961ed0bddcbf38d997b976
 AUX up.sh 2865 SHA256 d887ee065261affd849227fa27e092cf66549d824a698f302312d15f787dd840 SHA512 35201b0e60ad20358080007e595eb4f96d186ba8e88f0485c55d164c28e3d78a12f3e09347ba3d76abb9b8b03fb4a53664bd74ab484be1548090022b956925fd WHIRLPOOL 8d25a66d192a6710466d149aec7a1719dfe91558205e8ba7e25b93e58869c8fedc96ba4ce2aedb0595b7e0b63299e6e41be1ba82c6b93ae6bbbb26d409c9bf51
-DIST openvpn-2.3.2.tar.gz 1145108 SHA256 20bda3f9debb9a52db262aecddfa4e814050a9404a9106136b7e3b6f7ef36ffc SHA512 9936a8b3a71073239ca25e0d3cf24862e95c29218b2bba9663369eca80b4c9f83ef12dd41eb9998165d4819f041335606eeb0257b6805e1cdd1ae4761bb9dddf WHIRLPOOL f2ef45c76e968e022483d15ec1e4ff2a4f495d05e3e355d46c6f74af8a96341252b56933391d211f8eec955ee31c0538de81dd300d4ba30353f3785469bd2dbc
-DIST openvpn-2.3.3.tar.gz 1161137 SHA256 f025d14631105a66e501ca897830cd4d26a1438530cd9174dc6169536ae4b113 SHA512 05d6eff0db7137772a90c3d04ebd109eeb5f149b57f05edab211052754032cac3132f0a6f6e689dcab65db89cfed6065f82ac4fcf7f18b230900f6108570263f WHIRLPOOL f4bf6c5e5b8266c9cdc2d89003300a720423fd296d281ebd2a52d70b6aaeaee57b5506042a807771c0a271aaff8772f3794eef9124270d3fc9d0b1cd3fe40657
-DIST openvpn-2.3.4.tar.gz 1191101 SHA256 af506d5f48568fa8d2f2435cb3fad35f9a9a8f263999ea6df3ba296960cec85a SHA512 6837e9ff48181ffd7cb36fe7f6943b580f68df7e840a5bd3c7ab01845592627275c6bfcc929cfa1570aef1af54b49df320ae4d7999968969ac23f1b244a37ec8 WHIRLPOOL 8b7b949f3f61f7b85f400d197bcc92ed4991ef1cc979f8b7f5a9e64740e3260ed23668775fbbd2404c751e4163d255cebfd4c1da176e959d0c80e90eef659a58
-DIST openvpn-2.3.5.tar.gz 1196464 SHA256 d93b447b014a41ec1550c3b760871aa72d7c09f1b5c6fc1e013d3073ac29ca21 SHA512 937a3846a7638e3eb1e452d01c1e78a43c5b29adf4ba5f169508c40488e32e4ee317661dfbd1396c9103a8cf9101c4f02ed586dc3fd91b89b5afb35e4e5291dd WHIRLPOOL 335c737662be7b7179b503b99376c7902fe1141bcac496de4b0a54a82dd0dca3aa5c2c49f66622be2163dbc6fa89bc79940b81ffdd419d27c004f53e6c92b0e7
 DIST openvpn-2.3.6.tar.gz 1213272 SHA256 7baed2ff39c12e1a1a289ec0b46fcc49ff094ca58b8d8d5f29b36ac649ee5b26 SHA512 70e0045ea41f6588769ab8b98d8f550b69148adbf7fedcdc36900e25950df43379950492652e243ec6e7965bf9c7dcc86a56ba5dfdc44523aaa81cfc508b1c6e WHIRLPOOL 737f2d1d69ee1c7700d5cd5a4e7d5d1b2f55d8b2229f7c2565fcb8c731ebb719ec8d6bad3b76f763f36e5c70c6e40a666db3508f3024f8e4637c0659061dba48
-EBUILD openvpn-2.3.2.ebuild 4131 SHA256 c3c95da613ac170ca6db06e721e0d3add9724fb3a2dbc07111aa9f0e36c6cc69 SHA512 d35632f2719f50fd0cb4202d737bd1cdbeeee96e5bc455070316a79b5b4bd61f5f47e76cdf27e136a15ee1883ba7e67db723a28d8597eca6629cf93e430e6715 WHIRLPOOL 689bcc9ffb76dc12987df2b57d9cb7e5c4f28079a1540cd8b32e10b392205798a72e6a9ec35cf016f421c3d9a985af2530d444258ff7deaceb1b19076a1451bf
-EBUILD openvpn-2.3.3.ebuild 4199 SHA256 da464758cfef3297d9dfa80846d4ab830120c1b77cd7fe745eadd3f89f873819 SHA512 6ac487774770bf22a4054bc39a51274949ea63500a12719c6de91afb4a37500a0155897c0866202df85f5998466bf3dc2de0d2f1a52c7208288c9c60ea7ded62 WHIRLPOOL 82a59b5227872e6aacb681c04e157c590dc3c0daeb233d4dde31dd142b022d9115bf0b1fbc179255d4c7d5eb25efc8c6057f95921194020e620495cbde59d962
-EBUILD openvpn-2.3.4-r1.ebuild 4377 SHA256 6c4b83878700be83469baae149f12359ad48dea8d1445b6ea5d3a45956184d07 SHA512 995f73502fb101b946ad1a83852166e949cd53fba8f7b69d7ede7028933b4afdef444b3527fac6fbc6af051b05410bf390daf00a65ea3585f8b9e99d9ed8fce7 WHIRLPOOL 5da8ce5ca94b4711c361a1e1cb8427bc2c4aabe8bb9e086ef03ef08173d9f8fbfe56d6e199d56fb65cd7a5db11aea6d9206a3f4cc10ebf67336eb0b3fc0f330c
-EBUILD openvpn-2.3.5.ebuild 4373 SHA256 b4081ba2ea699be52cfad0514ab14c884504f0190705fa096902d8132a83d2e8 SHA512 145d220fdfd456023a419c9330b261f7302f92644535decc26c7070f851159518e19a83506c6c7e8e428718675fd779edcc752e71351eccc248c22c8550bedd1 WHIRLPOOL b818a4561e26533593a006c40cbf2ef56ec5ef2a1575d17f38e5559c0a824fd49c0846519ad1c1dc27aed115c1af8701ccd2ddd1717c8125d6aef3cf70d148ed
 EBUILD openvpn-2.3.6.ebuild 4365 SHA256 2cbd1acacefe1c511d475127afa1befc986781c77b2fade35e5023008d75d8a9 SHA512 8d97298406bbcd7d013e364f7a58974e28d8d8b69709156b74cbf595a62f3f7dd567204947643febba1c290a23b81db72f8bac377006700875c29b369725da86 WHIRLPOOL 1f7317d8272f815f139ade892e4ada2e5c2bb2555db3399ff5266ed7f39a7701b636de40774f77eb7d394dc47a70420765a2d4fa5bdca3d0dad0d7d1e863241e
 EBUILD openvpn-9999.ebuild 3941 SHA256 ef975ee9157e25b16aa4c59144b1fc0814c67def458a71e5166c70e7c41e5081 SHA512 7030ee666c7372b86a198f3780797a4253baed6e61e4bbb3f1bb166b95268b4ee00992c770c689ab6bb9326eb2d66a6c52cec65739e887ef39e6da1da6ce49b6 WHIRLPOOL 174bee3dc113263b7ebc24048613cc3039cd49f52cee4c9eff55d80d9436cead408d3c09cb6dad1318a4812fb00f7eb22b286f329499346240db2f38a066b2ff
-MISC ChangeLog 43887 SHA256 4925a44974d80f89c11457e779be6a1f4e84d60d2e69540170b0c3dd74d28c2f SHA512 f42c6a8402505aa228cf1bf31ec307c0c79c2d52fb5933394c9bf96c6982a6e27ea1dc4469a95def1a2d18009387a5f9b37ab9bb744ebce7169d10e82a682d2a WHIRLPOOL bd5fd63d71c1b81eb13c6b17e260ac9d6b70313dcbbf331893a93f9a5c6cac962a588bd339f60a97a5175c3691b08c133be5afd7cc83b199be6cb49155c7ac29
+MISC ChangeLog 44086 SHA256 dc0fd9be49a137ea26a585eae0271029599d4f0d916a7a626ed10b6bbfefd18e SHA512 4e6f56523772064b0591c53ce2f6c856edd64d0a02e3d4332c49edb4dd461dac8f8d3e11cf64fc93ac8fcbf7009755358a00623d3742ded3f68e70be997cd0c4 WHIRLPOOL 135713cd804c356d9476f4741fd21a9cf4e74d885dd20e3d9f8dd05cbbf6353b022cb954b1261cbd77afc54d510c84f23a43dc22484e5b431f88d5c99d0bb0f3
 MISC metadata.xml 937 SHA256 3dfcc28012f2c92f044882c39d56b6ef82bb80749ce688b75d526cc6c8836dd3 SHA512 ad3f218ccc64249fda19d87fe79494280eb880841f2d1e69757e7093e62b446f273fecd074ccac02c28894924b02d6a9c9fbbc1bd12ab13493f7f77e50e5b1ce WHIRLPOOL 65bf683e35f44c306c9ed3297cd954eb490f658f97a2d03af2cba0484030b1eccdf401fdc867a5c35a602bd67bf7052d555c2a48b7bebb4469158e26a530a742
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUnSfSAAoJELp701BxlEWffgYQAIY+SNZwFUAacKpdf1mIC0fn
-Xr1zKnEE/LFS/mfSwNjV4aGs3yOZrFVPEmZRV7IRtQU1GMq+nm1wB9SkhjdUsDaR
-QgLL2A/I+Lfkou2zuDaKSDF6+SIUsLWb1B/xScGR4CbEkcxhzBevpvmXPC+B6SY3
-pad52LD3/cztPkkqS4ji2WNzfwp4X4K56LTd208CyPHe46JazJMWo+uGWq5bQzLC
-d7ijwX+aKfGpovOd+ie5hCLpeY6AYUdWCnn+9TYUHZBaHLAqhmQkYAhemM9KgHdb
-CFtd4bqHjuukDWu3sQaK7jgnGBa8Ly4rNnMzQsntyiqfZdp/LMCJwWW8XoTWT4Wc
-NNF0PVmZnOKYUZeBBVG3b+y/w44yxbMIZboCNUO9LHRscboUt8U6mH4G2m9+6XCd
-TX2v2iv3PXF/zDCpZ8hGH3Rrn7/+dEMOTge8AGPMvGUNaEA6dgFhi47QCNVpoZPG
-oYn/A+o+WBpt78qdjdezQmjgZg6/7HlCxktYvh2e/3shrmPz4+XQH8/xq59mPIWC
-kF2tIz8YGGBRZgSDh66+aOmHrthsm3t9YzZblm8zr3aW7QukSmTGWmAv0PdZUG+s
-8hdJwC+KRpjYK5SXkRIIfwAgc6WTs0ShNE5mqCSkYvH+c5GKBZzq9sb4M6w+JeiY
-fNgRVOb2c4OYUElRMJID
-=hSkj
+iQIcBAEBCAAGBQJUn+vNAAoJEJ+WuSkwOAOB81MQAM6UdcHe6XmHFr/NGyDd953g
+OBICwTP82kE7PT9LJquSq4OqbUHncZ0yn51cFtYxjGdO9X61WDDR0UBMT0c+NHie
+e/c4L4TsA8FsXjsUga7o3WYPmtxkKJQ6maZV3djgIokWy1R9DWjR8mMl3PxRlcxU
+gm3Vrev/Tl6OWV9CbzEDdW/UjqamUHaWTny5WMMOPen85BBTKEKMOfBAQGT0QqO0
+c+IcMg2+uIG1/vFqZzLEKWlx9GDp++n4B02a8Hst76aZID5Bv0ZBEHPoR3ct2NU3
+9hJwHrwsv2xjjEgr++lZ/uwuUeLKpR7PMc5h+jEcDhMUjcqBivcvs1f9gyy/0u7Y
+c+UO3t6xiYga3vB/lbgLiW5fZ8w7WMctFCiV8Hf5L593xyWgJAPbOmoYTcmsS4cQ
+dzbPi0OwRuXC+e78/dtV7HAaA0eE5Ed3sN+kZpDSWlJtiXb0gAuuKcCaEmYEic7c
+YDVzRX/mBbnoQbfJ+rw3xsEuEOq+dIMPpkw6Zcto1Tu8WrXpxOV+pMQeayJkG9oT
+RiSnhwU9Vgi5zee4rhOwKGQjz8XS5BoBENTvQCjo1UPUltiWK1/w0VgaOC4ZAYxi
+a3YlF9L8BlWcab24zevPFe47up0YqtEKjcGKolLGc5U5/nOXgZDkq4Eb6B0gPr/C
+ZzTPYzxIJn9h7I6AKcre
+=fzxm
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openvpn/openvpn-2.3.2.ebuild b/net-misc/openvpn/openvpn-2.3.2.ebuild
deleted file mode 100644
index db4bd0bb8dbf..000000000000
--- a/net-misc/openvpn/openvpn-2.3.2.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.3.2.ebuild,v 1.11 2013/09/26 17:32:05 ago Exp $
-
-EAPI=4
-
-inherit multilib autotools flag-o-matic user systemd
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
-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 +lzo static userland_BSD"
-
-REQUIRED_USE="static? ( !plugins !pkcs11 )
-			polarssl? ( ssl )
-			!plugins? ( !pam !down-root )"
-
-DEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
-	)
-	pam? ( virtual/pam )
-	selinux? ( sec-policy/selinux-openvpn )
-	ssl? (
-		!polarssl? ( >=dev-libs/openssl-0.9.7 ) polarssl? ( >=net-libs/polarssl-1.1.0 )
-	)
-	lzo? ( >=dev-libs/lzo-1.07 )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
-	local myconf
-	use polarssl && myconf="--with-crypto-library=polarssl"
-	econf \
-		${myconf} \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
-		$(use_enable passwordsave password-save) \
-		$(use_enable ssl) \
-		$(use_enable ssl crypto) \
-		$(use_enable lzo) \
-		$(use_enable pkcs11) \
-		$(use_enable plugins) \
-		$(use_enable iproute2) \
-		$(use_enable pam plugin-auth-pam) \
-		$(use_enable down-root plugin-down-root)
-}
-
-src_install() {
-	default
-	find "${ED}/usr" -name '*.la' -delete
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README README.IPv6
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sample contrib
-	fi
-
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service 'openvpn@.service'
-}
-
-pkg_postinst() {
-	# Add openvpn user so openvpn servers can drop privs
-	# Clients should run as root so they can change ip addresses,
-	# dns information and other such things.
-	enewgroup openvpn
-	enewuser openvpn "" "" "" openvpn
-
-	if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
-		ewarn "WARNING: The openvpn init script has changed"
-		ewarn ""
-	fi
-
-	elog "The openvpn init script expects to find the configuration file"
-	elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-	elog ""
-	elog "To create more VPNs, simply create a new .conf file for it and"
-	elog "then create a symlink to the openvpn init script from a link called"
-	elog "openvpn.newconfname - like so"
-	elog "   cd /etc/openvpn"
-	elog "   ${EDITOR##*/} foo.conf"
-	elog "   cd /etc/init.d"
-	elog "   ln -s openvpn openvpn.foo"
-	elog ""
-	elog "You can then treat openvpn.foo as any other service, so you can"
-	elog "stop one vpn and start another if you need to."
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if use plugins ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
-	fi
-
-	einfo ""
-	einfo "OpenVPN 2.3.0 no longer includes the easy-rsa suite of utilities."
-	einfo "They can now be emerged via app-crypt/easy-rsa."
-}
diff --git a/net-misc/openvpn/openvpn-2.3.3.ebuild b/net-misc/openvpn/openvpn-2.3.3.ebuild
deleted file mode 100644
index 86ec10f20f59..000000000000
--- a/net-misc/openvpn/openvpn-2.3.3.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# 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.10 2014/08/27 12:40:28 ago Exp $
-
-EAPI=4
-
-inherit multilib autotools flag-o-matic user systemd
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
-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 +lzo static userland_BSD"
-
-REQUIRED_USE="static? ( !plugins !pkcs11 )
-			polarssl? ( ssl )
-			pkcs11? ( ssl )
-			!plugins? ( !pam !down-root )"
-
-DEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
-	)
-	pam? ( virtual/pam )
-	selinux? ( sec-policy/selinux-openvpn )
-	ssl? (
-		!polarssl? ( >=dev-libs/openssl-0.9.7 ) polarssl? ( >=net-libs/polarssl-1.2.10 )
-	)
-	lzo? ( >=dev-libs/lzo-1.07 )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
-	local myconf
-	echo "DROPPY"
-	use polarssl && echo "FLOZZY"
-	use polarssl && myconf="--with-crypto-library=polarssl"
-	econf \
-		${myconf} \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
-		$(use_enable passwordsave password-save) \
-		$(use_enable ssl) \
-		$(use_enable ssl crypto) \
-		$(use_enable lzo) \
-		$(use_enable pkcs11) \
-		$(use_enable plugins) \
-		$(use_enable iproute2) \
-		$(use_enable pam plugin-auth-pam) \
-		$(use_enable down-root plugin-down-root)
-}
-
-src_install() {
-	default
-	find "${ED}/usr" -name '*.la' -delete
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README README.IPv6
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sample contrib
-	fi
-
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service 'openvpn@.service'
-}
-
-pkg_postinst() {
-	# Add openvpn user so openvpn servers can drop privs
-	# Clients should run as root so they can change ip addresses,
-	# dns information and other such things.
-	enewgroup openvpn
-	enewuser openvpn "" "" "" openvpn
-
-	if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
-		ewarn "WARNING: The openvpn init script has changed"
-		ewarn ""
-	fi
-
-	elog "The openvpn init script expects to find the configuration file"
-	elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-	elog ""
-	elog "To create more VPNs, simply create a new .conf file for it and"
-	elog "then create a symlink to the openvpn init script from a link called"
-	elog "openvpn.newconfname - like so"
-	elog "   cd /etc/openvpn"
-	elog "   ${EDITOR##*/} foo.conf"
-	elog "   cd /etc/init.d"
-	elog "   ln -s openvpn openvpn.foo"
-	elog ""
-	elog "You can then treat openvpn.foo as any other service, so you can"
-	elog "stop one vpn and start another if you need to."
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if use plugins ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
-	fi
-
-	einfo ""
-	einfo "OpenVPN 2.3.x no longer includes the easy-rsa suite of utilities."
-	einfo "They can now be emerged via app-crypt/easy-rsa."
-}
diff --git a/net-misc/openvpn/openvpn-2.3.4-r1.ebuild b/net-misc/openvpn/openvpn-2.3.4-r1.ebuild
deleted file mode 100644
index 2dcc70551a1e..000000000000
--- a/net-misc/openvpn/openvpn-2.3.4-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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.7 2014/11/21 12:45:00 klausman Exp $
-
-EAPI=4
-
-inherit multilib autotools flag-o-matic user systemd
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
-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"
-
-REQUIRED_USE="static? ( !plugins !pkcs11 )
-			polarssl? ( ssl )
-			pkcs11? ( ssl )
-			!plugins? ( !pam !down-root )"
-
-DEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
-	)
-	pam? ( virtual/pam )
-	ssl? (
-		!polarssl? ( >=dev-libs/openssl-0.9.7 ) polarssl? ( >=net-libs/polarssl-1.2.10 )
-	)
-	lzo? ( >=dev-libs/lzo-1.07 )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-openvpn )
-"
-
-src_prepare() {
-	# Set correct pass to systemd-ask-password binary
-	sed -i "s:\(/bin/systemd-ask-password\):/usr\1:" ./src/openvpn/console.c || die
-	eautoreconf
-}
-
-src_configure() {
-	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
-	local myconf
-	echo "DROPPY"
-	use polarssl && echo "FLOZZY"
-	use polarssl && myconf="--with-crypto-library=polarssl"
-	econf \
-		${myconf} \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
-		$(use_enable passwordsave password-save) \
-		$(use_enable ssl) \
-		$(use_enable ssl crypto) \
-		$(use_enable lzo) \
-		$(use_enable pkcs11) \
-		$(use_enable plugins) \
-		$(use_enable iproute2) \
-		$(use_enable pam plugin-auth-pam) \
-		$(use_enable down-root plugin-down-root) \
-		$(use_enable systemd)
-}
-
-src_install() {
-	default
-	find "${ED}/usr" -name '*.la' -delete
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README README.IPv6
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sample contrib
-	fi
-
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service 'openvpn@.service'
-}
-
-pkg_postinst() {
-	# Add openvpn user so openvpn servers can drop privs
-	# Clients should run as root so they can change ip addresses,
-	# dns information and other such things.
-	enewgroup openvpn
-	enewuser openvpn "" "" "" openvpn
-
-	if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
-		ewarn "WARNING: The openvpn init script has changed"
-		ewarn ""
-	fi
-
-	elog "The openvpn init script expects to find the configuration file"
-	elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-	elog ""
-	elog "To create more VPNs, simply create a new .conf file for it and"
-	elog "then create a symlink to the openvpn init script from a link called"
-	elog "openvpn.newconfname - like so"
-	elog "   cd /etc/openvpn"
-	elog "   ${EDITOR##*/} foo.conf"
-	elog "   cd /etc/init.d"
-	elog "   ln -s openvpn openvpn.foo"
-	elog ""
-	elog "You can then treat openvpn.foo as any other service, so you can"
-	elog "stop one vpn and start another if you need to."
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if use plugins ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
-	fi
-
-	einfo ""
-	einfo "OpenVPN 2.3.x no longer includes the easy-rsa suite of utilities."
-	einfo "They can now be emerged via app-crypt/easy-rsa."
-}
diff --git a/net-misc/openvpn/openvpn-2.3.5.ebuild b/net-misc/openvpn/openvpn-2.3.5.ebuild
deleted file mode 100644
index fce98493bd45..000000000000
--- a/net-misc/openvpn/openvpn-2.3.5.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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.5.ebuild,v 1.1 2014/11/16 15:32:34 djc Exp $
-
-EAPI=4
-
-inherit multilib autotools flag-o-matic user systemd
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz"
-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"
-
-REQUIRED_USE="static? ( !plugins !pkcs11 )
-			polarssl? ( ssl )
-			pkcs11? ( ssl )
-			!plugins? ( !pam !down-root )"
-
-DEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
-	)
-	pam? ( virtual/pam )
-	ssl? (
-		!polarssl? ( >=dev-libs/openssl-0.9.7 ) polarssl? ( >=net-libs/polarssl-1.2.10 )
-	)
-	lzo? ( >=dev-libs/lzo-1.07 )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-openvpn )
-"
-
-src_prepare() {
-	# Set correct pass to systemd-ask-password binary
-	sed -i "s:\(/bin/systemd-ask-password\):/usr\1:" ./src/openvpn/console.c || die
-	eautoreconf
-}
-
-src_configure() {
-	use static && LDFLAGS="${LDFLAGS} -Xcompiler -static"
-	local myconf
-	echo "DROPPY"
-	use polarssl && echo "FLOZZY"
-	use polarssl && myconf="--with-crypto-library=polarssl"
-	econf \
-		${myconf} \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--with-plugindir="${ROOT}/usr/$(get_libdir)/$PN" \
-		$(use_enable passwordsave password-save) \
-		$(use_enable ssl) \
-		$(use_enable ssl crypto) \
-		$(use_enable lzo) \
-		$(use_enable pkcs11) \
-		$(use_enable plugins) \
-		$(use_enable iproute2) \
-		$(use_enable pam plugin-auth-pam) \
-		$(use_enable down-root plugin-down-root) \
-		$(use_enable systemd)
-}
-
-src_install() {
-	default
-	find "${ED}/usr" -name '*.la' -delete
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README README.IPv6
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh"
-	doexe "${FILESDIR}/down.sh"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
-
-	# install examples, controlled by the respective useflag
-	if use examples ; then
-		# dodoc does not supportly support directory traversal, #15193
-		insinto /usr/share/doc/${PF}/examples
-		doins -r sample contrib
-	fi
-
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service 'openvpn@.service'
-}
-
-pkg_postinst() {
-	# Add openvpn user so openvpn servers can drop privs
-	# Clients should run as root so they can change ip addresses,
-	# dns information and other such things.
-	enewgroup openvpn
-	enewuser openvpn "" "" "" openvpn
-
-	if [ path_exists -o "${ROOT}/etc/openvpn/*/local.conf" ] ; then
-		ewarn "WARNING: The openvpn init script has changed"
-		ewarn ""
-	fi
-
-	elog "The openvpn init script expects to find the configuration file"
-	elog "openvpn.conf in /etc/openvpn along with any extra files it may need."
-	elog ""
-	elog "To create more VPNs, simply create a new .conf file for it and"
-	elog "then create a symlink to the openvpn init script from a link called"
-	elog "openvpn.newconfname - like so"
-	elog "   cd /etc/openvpn"
-	elog "   ${EDITOR##*/} foo.conf"
-	elog "   cd /etc/init.d"
-	elog "   ln -s openvpn openvpn.foo"
-	elog ""
-	elog "You can then treat openvpn.foo as any other service, so you can"
-	elog "stop one vpn and start another if you need to."
-
-	if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
-		ewarn ""
-		ewarn "WARNING: If you use the remote keyword then you are deemed to be"
-		ewarn "a client by our init script and as such we force up,down scripts."
-		ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
-		ewarn "can move your scripts to."
-	fi
-
-	if use plugins ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
-	fi
-
-	einfo ""
-	einfo "OpenVPN 2.3.x no longer includes the easy-rsa suite of utilities."
-	einfo "They can now be emerged via app-crypt/easy-rsa."
-}