net-misc/openvpn: Drop since win32 patches are not needed anymore

15 files changed, 0 insertions, 716 deletions

diff --git a/metadata/md5-cache/net-misc/openvpn-2.2.0-r1 b/metadata/md5-cache/net-misc/openvpn-2.2.0-r1
deleted file mode 100644
index 7d484227..00000000
--- a/metadata/md5-cache/net-misc/openvpn-2.2.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=>=dev-libs/lzo-1.07 !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=OpenVPN is a robust and highly flexible tunneling application compatible with many OSes
-EAPI=4
-HOMEPAGE=http://openvpn.net/
-IUSE=examples iproute2 ipv6 minimal pam passwordsave selinux ssl static pkcs11 userland_BSD
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/lzo-1.07 !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 ) kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) )
-SLOT=0
-SRC_URI=http://swupdate.openvpn.net/community/releases/openvpn-2.2.0.tar.gz ipv6? ( http://www.greenie.net/ipv6/openvpn-2.2RC2-ipv6-20110424-2.patch.gz )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=4c829a028a67de12f5fa596280dae2d1
diff --git a/net-misc/openvpn/Manifest b/net-misc/openvpn/Manifest
deleted file mode 100644
index 4ff9e4c2..00000000
--- a/net-misc/openvpn/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX 65openvpn 45 SHA256 d5758e39fdc75dcbb5a788b1afa743c3c1f08c63c535aa32c300b965474d765c WHIRLPOOL 534e7dcf2ac953e9ec5de05810022471cb26a16806cd036f25d02550e20f8aaa91410bd005bc7a5e4a549d8a40d01ae317be1d1e1e25d91ed989bbbea7ede9d2
-AUX down.sh 943 SHA256 39debebcd8c899f20e6d355cbc8eaab46e28b83a9f6c33a94c065688a4f3d2c7 WHIRLPOOL c66fd1e016656fe83d7f55b77bf232058397f9cd3054abe13ec006c227afe6746ee4ada310ff43761ec95510f736b8e542f136711d648642eecafe055975c57e
-AUX openvpn-2.1.conf 892 SHA256 330149a83684ddabe413d134d4c8efad4c88b18c2ab67165014deff5f7fffad2 WHIRLPOOL 6ef644826e1e9e2a100e0fa20b5c9190e92c9e08a366dee28dccf3f70fa0593f3c4d271e42db3920630f03704aa2aef8e84d9efbb2b4b6a0d08e74bb340fb0a5
-AUX openvpn-2.1.init 4186 SHA256 d1b1f8a00935d77521bceb62535350444df3470fa45f4d33c3934051a1bb595b WHIRLPOOL 9d34c438b7d9e45678e2aa48ab42a68b9e2801423688c6280cbb4934a8ef04cbf8a7953a061659f57fb02adf535596ac9313268c29e2dc18cffbf7315681da82
-AUX openvpn-2.1_rc20-pkcs11.patch 622 SHA256 f972c473645f880c27b3c72379c49183f1e27d352f401d5ea7e734fad99f2d6c WHIRLPOOL 27b419cb24b44fee8164bc25f6bba10a8212e4f407cb8635168cae39e5c1620b8443eece66f0bea04ee1456caa4f72bb72fb73c797fb68066e5f552c89e2e41f
-AUX openvpn-2.2.0-BJA-win-ipv6.diff 462 SHA256 560ea9753c05a1472b98ebee945b983d9040a92229318396645fef6a68d26df1 WHIRLPOOL 269c2622c9b3526925093fc7146485632e76f8138d111b1d8cb5afd4b070fcf78e078588b860fef9aad89535450a24f7f7491bf61858f73ae50de29b7b4e3902
-AUX openvpn-2.2.0-BJA-win.diff 226 SHA256 946449ae548c7a4b05214b063db5a6c3ee7e004f76a95c472e805a18106b9daa WHIRLPOOL a761e1af07cffaf3276db48d07375fb6127e797f36965eaa2e39a594479818222de40f831787d153f62ff59e4e2b30d7b6eb65a24200776e1bfdd38a8ba7ee6a
-AUX openvpn-windres.diff 2524 SHA256 cd5df5ffa4c2477b7e1f544af09dc69e0cecebbfd5df7b804927e5fb00c31782 WHIRLPOOL efa75d85c81fa04ac4865be84ea6130b67c8283161553c2a259de3e74b2c2a1308d0f6ad5bb1c56fe3474e0ee27c95733ff0664e8c6b78e529a7e33555b98f71
-AUX openvpn.init 1486 SHA256 c4b9e0899fa5ee0b90c5100da7711dc7a6a5658f10042b0feda9e7efb90a11cf WHIRLPOOL e549221283b4b92c9ada312a746c4ad4c645493c1c844ddaddefecee4c31e17bd4bd8555618408e065c83143e157aaf7e75b44f01abe43f507835df2aa1149d3
-AUX up.sh 2594 SHA256 848da0929c37b2112769232fbbdf61961b6107c6726d4b74d1ceb034b39ad5dd WHIRLPOOL 6ca78403ac7019d4e85d05465e5188d4ca2891bc947e1021f2b8497e83ffd9126544dbf82a5e368b9583c69bf6c42a682f1a7912503f862ae2c3dd5e46f0fdcc
-DIST openvpn-2.2.0.tar.gz 898381 SHA256 71ebeaaba1641e6d1454ae0f10f986002e5c6afdcd09da659122e3e5c74a2567 WHIRLPOOL d76d6a78250d282c96fa8314fa5458a1f059211fbee9031e4ea60fe895160fc3cb649a0d5a1df959302da8710ebd26d1cdaa43b48bb2f9180ba1fa49cf6bdd3c
-DIST openvpn-2.2RC2-ipv6-20110424-2.patch.gz 35519 SHA256 e2bf528771412f2aaf96cf87f07bf0d6cba5e3bf0565f8bc082be1cbeae64d21 WHIRLPOOL b8f08187f8052fc0bedea4747fb3273e9624b60cc6ed8f669b42b29a141ce153a126dea6927d2b055dee54716e1400cf202620bb898f02c94620ae408864a87d
-EBUILD openvpn-2.2.0-r1.ebuild 5637 SHA256 6777af7981132bb347d284f0869ad75cf0066396d19ec09a45c59fcdaa86a3cb WHIRLPOOL 6e7e145a497972405236d92768971f245310a5bd3a25348b18ab0fee833fec8e74b97cd54644a7d55e80c29e0101ba410118f5fb41a1629d2b73bc7cdfe76ac3
-MISC metadata.xml 804 SHA256 0bb193e8d9337aa3d4ee8979dcae4aa4bf54ad100ad14f37d7ca11461b74ad2b WHIRLPOOL b27cb04485720881e4d9500430004cafcc57899fe51e99c45c241dc8b1b350161b0fa721ff7ad72d3a281b79c36db9ca0b5e8d82bf7999d9cfd05cc80acde67f
diff --git a/net-misc/openvpn/files/65openvpn b/net-misc/openvpn/files/65openvpn
deleted file mode 100644
index 4ddb0343..00000000
--- a/net-misc/openvpn/files/65openvpn
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PROTECT="/usr/share/openvpn/easy-rsa"
diff --git a/net-misc/openvpn/files/down.sh b/net-misc/openvpn/files/down.sh
deleted file mode 100755
index 1c70db0e..00000000
--- a/net-misc/openvpn/files/down.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2006-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# If we have a service specific script, run this now
-if [ -x /etc/openvpn/"${SVCNAME}"-down.sh ] ; then
-	/etc/openvpn/"${SVCNAME}"-down.sh "$@"
-fi
-
-# Restore resolv.conf to how it was
-if [ "${PEER_DNS}" != "no" ]; then
-	if [ -x /sbin/resolvconf ] ; then
-		/sbin/resolvconf -d "${dev}"
-	elif [ -e /etc/resolv.conf-"${dev}".sv ] ; then
-		# Important that we copy instead of move incase resolv.conf is
-		# a symlink and not an actual file
-		cp /etc/resolv.conf-"${dev}".sv /etc/resolv.conf
-		rm -f /etc/resolv.conf-"${dev}".sv
-	fi
-fi
-
-if [ -n "${SVCNAME}" ]; then
-	# Re-enter the init script to start any dependant services
-	if /etc/init.d/"${SVCNAME}" --quiet status ; then
-		export IN_BACKGROUND=true
-		/etc/init.d/"${SVCNAME}" --quiet stop
-	fi
-fi
-
-exit 0
-
-# vim: ts=4 :
diff --git a/net-misc/openvpn/files/openvpn-2.1.conf b/net-misc/openvpn/files/openvpn-2.1.conf
deleted file mode 100644
index 72510c34..00000000
--- a/net-misc/openvpn/files/openvpn-2.1.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# OpenVPN automatically creates an /etc/resolv.conf (or sends it to
-# resolvconf) if given DNS information by the OpenVPN server.
-# Set PEER_DNS="no" to stop this.
-PEER_DNS="yes"
-
-# OpenVPN can run in many modes. Most people will want the init script
-# to automatically detect the mode and try and apply a good default
-# configuration and setup scripts. However, there are cases where the
-# OpenVPN configuration looks like a client, but it's really a peer or
-# something else. DETECT_CLIENT controls this behaviour.
-DETECT_CLIENT="yes"
-
-# If DETECT_CLIENT is no and you have your own scripts to re-enter the openvpn
-# init script (ie, it first becomes "inactive" and the script then starts the
-# script again to make it "started") then you can state this below.
-# In other words, unless you understand service dependencies and are a
-# competent shell scripter, don't set this.
-RE_ENTER="no"
diff --git a/net-misc/openvpn/files/openvpn-2.1.init b/net-misc/openvpn/files/openvpn-2.1.init
deleted file mode 100755
index d65e6f8b..00000000
--- a/net-misc/openvpn/files/openvpn-2.1.init
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VPNDIR=${VPNDIR:-/etc/openvpn}
-VPN=${SVCNAME#*.}
-if [ -n "${VPN}" ] && [ ${SVCNAME} != "openvpn" ]; then
-	VPNPID="/var/run/openvpn.${VPN}.pid"
-else
-	VPNPID="/var/run/openvpn.pid"
-fi
-VPNCONF="${VPNDIR}/${VPN}.conf"
-
-depend() {
-	need localmount net
-	use dns
-	after bootmisc
-}
-
-checkconfig() {
-	# Linux has good dynamic tun/tap creation
-	if [ $(uname -s) = "Linux" ] ; then
-		if [ ! -e /dev/net/tun ]; then
-			if ! modprobe tun ; then
-				eerror "TUN/TAP support is not available" \
-					"in this kernel"
-				return 1
-			fi
-		fi
-		if [ -h /dev/net/tun ] && [ -c /dev/misc/net/tun ]; then
-			ebegin "Detected broken /dev/net/tun symlink, fixing..."
-			rm -f /dev/net/tun
-			ln -s /dev/misc/net/tun /dev/net/tun
-			eend $?
-		fi
-		return 0
-	fi
-
-	# Other OS's don't, so we rely on a pre-configured interface
-	# per vpn instance
-	local ifname=$(sed -n -e 's/[[:space:]]*dev[[:space:]][[:space:]]*\([^[:space:]]*\).*/\1/p' "${VPNCONF}")
-	if [ -z ${ifname} ] ; then
-		eerror "You need to specify the interface that this openvpn" \
-			"instance should use" \
-			"by using the dev option in ${VPNCONF}"
-		return 1
-	fi
-
-	if ! ifconfig "${ifname}" >/dev/null 2>/dev/null ; then
-		# Try and create it
-		echo > /dev/"${ifname}" >/dev/null
-	fi
-	if ! ifconfig "${ifname}" >/dev/null 2>/dev/null ; then
-		eerror "${VPNCONF} requires interface ${ifname}" \
-			"but that does not exist"
-		return 1
-	fi
-}
-
-start() {
-	# If we are re-called by the openvpn gentoo-up.sh script
-	# then we don't actually want to start openvpn
-	[ "${IN_BACKGROUND}" = "true" ] && return 0
-	
-	ebegin "Starting ${SVCNAME}"
-
-	checkconfig || return 1
-
-	local args="" reenter=${RE_ENTER:-no}
-	# If the config file does not specify the cd option, we do
-	# But if we specify it, we override the config option which we do not want
-	if ! grep -q "^[ 	]*cd[ 	].*" "${VPNCONF}" ; then
-		args="${args} --cd ${VPNDIR}"
-	fi
-	
-	# We mark the service as inactive and then start it.
-	# When we get an authenticated packet from the peer then we run our script
-	# which configures our DNS if any and marks us as up.
-	if [ "${DETECT_CLIENT:-yes}" = "yes" ] && \
-	grep -q "^[ 	]*remote[ 	].*" "${VPNCONF}" ; then
-		reenter="yes"
-		args="${args} --up-delay --up-restart"
-		args="${args} --script-security 2"
-		args="${args} --up /etc/openvpn/up.sh"
-		args="${args} --down-pre --down /etc/openvpn/down.sh"
-
-		# Warn about setting scripts as we override them
-		if grep -Eq "^[ 	]*(up|down)[ 	].*" "${VPNCONF}" ; then
-			ewarn "WARNING: You have defined your own up/down scripts"
-			ewarn "As you're running as a client, we now force Gentoo specific"
-			ewarn "scripts to be run for up and down events."
-			ewarn "These scripts will call /etc/openvpn/${SVCNAME}-{up,down}.sh"
-			ewarn "where you can put your own code."
-		fi
-
-		# Warn about the inability to change ip/route/dns information when
-		# dropping privs
-		if grep -q "^[ 	]*user[ 	].*" "${VPNCONF}" ; then
-			ewarn "WARNING: You are dropping root privileges!"
-			ewarn "As such openvpn may not be able to change ip, routing"
-			ewarn "or DNS configuration."
-		fi
-	else
-		# So we're a server. Run as openvpn unless otherwise specified
-		grep -q "^[ 	]*user[ 	].*" "${VPNCONF}" || args="${args} --user openvpn"
-		grep -q "^[ 	]*group[ 	].*" "${VPNCONF}" || args="${args} --group openvpn"
-	fi
-
-	# Ensure that our scripts get the PEER_DNS variable
-	[ -n "${PEER_DNS}" ] && args="${args} --setenv PEER_DNS ${PEER_DNS}"
-
-	[ "${reenter}" = "yes" ] && mark_service_inactive "${SVCNAME}"
-	start-stop-daemon --start --exec /usr/sbin/openvpn --pidfile "${VPNPID}" \
-		-- --config "${VPNCONF}" --writepid "${VPNPID}" --daemon \
-		--setenv SVCNAME "${SVCNAME}" ${args}
-	eend $? "Check your logs to see why startup failed"
-}
-
-stop() {
-	# If we are re-called by the openvpn gentoo-down.sh script
-	# then we don't actually want to stop openvpn
-	if [ "${IN_BACKGROUND}" = "true" ] ; then
-		mark_service_inactive "${SVCNAME}"
-		return 0
-	fi
-
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet \
-		--exec /usr/sbin/openvpn --pidfile "${VPNPID}"
-	eend $?
-}
-
-# vim: set ts=4 :
diff --git a/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch b/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch
deleted file mode 100644
index cebb5927..00000000
--- a/net-misc/openvpn/files/openvpn-2.1_rc20-pkcs11.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ru openvpn-2.1_rc20~/easy-rsa/2.0/openssl.cnf openvpn-2.1_rc20/easy-rsa/2.0/openssl.cnf
---- openvpn-2.1_rc20~/easy-rsa/2.0/openssl.cnf	2009-10-11 01:04:36.000000000 +0200
-+++ openvpn-2.1_rc20/easy-rsa/2.0/openssl.cnf	2009-10-11 01:05:53.000000000 +0200
-@@ -283,9 +283,9 @@
- #pkcs11 = pkcs11_section
- 
- [ pkcs11_section ]
--engine_id = pkcs11
--dynamic_path = /usr/lib/engines/engine_pkcs11.so
--MODULE_PATH = $ENV::PKCS11_MODULE_PATH
--PIN = $ENV::PKCS11_PIN
--init = 0
-+#engine_id = pkcs11
-+#dynamic_path = /usr/lib/engines/engine_pkcs11.so
-+#MODULE_PATH = $ENV::PKCS11_MODULE_PATH
-+#PIN = $ENV::PKCS11_PIN
-+#init = 0
- 
diff --git a/net-misc/openvpn/files/openvpn-2.2.0-BJA-win-ipv6.diff b/net-misc/openvpn/files/openvpn-2.2.0-BJA-win-ipv6.diff
deleted file mode 100644
index 7d35754e..00000000
--- a/net-misc/openvpn/files/openvpn-2.2.0-BJA-win-ipv6.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- socket.c.ori	2011-07-04 19:51:34.000000000 +0200
-+++ socket.c	2011-07-04 19:51:26.000000000 +0200
-@@ -2075,9 +2075,13 @@
- #ifndef s6_addr32
- # ifdef TARGET_SOLARIS
- #  define s6_addr32 _S6_un._S6_u32
--# else
--#  define s6_addr32 __u6_addr.__u6_addr32
- # endif
-+# ifdef TARGET_WIN32
-+#  define s6_addr32 _S6_un._S6_u8
-+# endif
-+#endif
-+#ifndef s6_addr32
-+# define s6_addr32 __u6_addr.__u6_addr32
- #endif
- #ifndef UINT32_MAX
- # define UINT32_MAX (4294967295U)
diff --git a/net-misc/openvpn/files/openvpn-2.2.0-BJA-win.diff b/net-misc/openvpn/files/openvpn-2.2.0-BJA-win.diff
deleted file mode 100644
index cec62218..00000000
--- a/net-misc/openvpn/files/openvpn-2.2.0-BJA-win.diff
+++ /dev/null
@@ -1,8 +0,0 @@
---- configure.ac.ori	2011-07-04 01:24:57.000000000 +0200
-+++ configure.ac	2011-07-04 01:21:07.000000000 +0200
-@@ -913,4 +913,5 @@
- 	service-win32/Makefile
- 	install-win32/Makefile
- 	install-win32/settings
-+	win/autodefs.h
- ])
diff --git a/net-misc/openvpn/files/openvpn-windres.diff b/net-misc/openvpn/files/openvpn-windres.diff
deleted file mode 100644
index 0c6dd9eb..00000000
--- a/net-misc/openvpn/files/openvpn-windres.diff
+++ /dev/null
@@ -1,100 +0,0 @@
---- /dev/null	2011-07-22 23:07:28.371976637 +0200
-+++ openvpn-res.rc	2011-08-07 11:41:48.182392600 +0200
-@@ -0,0 +1,36 @@
-+/*
-+ * (c) 2011 Bertrand Jacquin <bertrand@jacquin.bzh>
-+ */
-+
-+#include <windows.h>
-+#include "config.h"
-+
-+1 VERSIONINFO
-+  FILEVERSION    _VERSION_
-+  PRODUCTVERSION _VERSION_
-+  FILEOS         VOS__WINDOWS32
-+  FILETYPE       VFT_APP
-+
-+BEGIN
-+  BLOCK "StringFileInfo"
-+  BEGIN
-+    BLOCK "040904b0"  /* en_US, Unicode */
-+    BEGIN
-+      // required
-+      VALUE "CompanyName",      PACKAGE_NAME "\0"
-+      VALUE "FileDescription",  PACKAGE_NAME "\0"
-+      VALUE "FileVersion",      PACKAGE_VERSION "\0"
-+      VALUE "InternalName",     PACKAGE_TARNAME "\0"
-+      VALUE "OriginalFilename", PACKAGE_TARNAME ".exe\0"
-+      VALUE "ProductName",      PACKAGE_NAME "\0"
-+      VALUE "ProductVersion",   PACKAGE_VERSION "\0"
-+      // optional
-+      VALUE "LegalCopyright",   "(C) 2002-2010 " PACKAGE_NAME " Technologies, Inc.\0"
-+    END
-+  END
-+  BLOCK "VarFileInfo"
-+  BEGIN
-+    VALUE "Translation", 0x409, 0x4b0
-+  END
-+END
-+
-diff --git a/Makefile.am b/Makefile.am
-index 32b40bb..d5d620d 100644
---- Makefile.am
-+++ Makefile.am
-@@ -146,6 +146,13 @@ openvpn_SOURCES = \
- 	win32.h win32.c \
- 	cryptoapi.h cryptoapi.c
- 
-+if WIN32
-+openvpn_SOURCES += openvpn-res.rc
-+
-+openvpn_LDADD = openvpn-res.o
-+endif
-+
-+
- nodist_openvpn_SOURCES = configure.h
- options.$(OBJEXT): configure.h
- 
-@@ -161,6 +168,11 @@ dist_noinst_DATA += openvpn.8
- nodist_html_DATA = openvpn.8.html
- openvpn.8.html: $(srcdir)/openvpn.8
- 	$(MAN2HTML) < $(srcdir)/openvpn.8 > openvpn.8.html
-+
-+comma = ,
-+
-+%.o: %.rc
-+	$(WINDRES) -D _VERSION_=$(subst .,$(comma),$(VERSION)),0 -i $< -o $@
- else
- dist_man_MANS = openvpn.8
- endif
-diff --git a/configure.ac b/configure.ac
-index a3789d9..2edb05e 100644
---- configure.ac
-+++ configure.ac
-@@ -356,6 +356,7 @@ if test "${WIN32}" = "yes"; then
- 	AC_ARG_VAR([MAN2HTML], [man2html utility])
- 	AC_CHECK_PROGS([MAN2HTML], [man2html])
- 	test -z "${MAN2HTML}" && AC_MSG_ERROR([man2html is required for win32])
-+	AC_CHECK_TOOL(WINDRES, windres)
- fi
- 
- dnl Checks for header files.
-diff --git a/service-win32/Makefile.am b/service-win32/Makefile.am
-index 4e4f55e..bb7b993 100644
---- service-win32/Makefile.am
-+++ service-win32/Makefile.am
-@@ -32,6 +32,14 @@ openvpnserv_SOURCES = \
- 	openvpnserv.c \
- 	service.h service.c
- 
-+openvpnserv_LDADD = \
-+	../openvpn-res.o
-+
-+comma = ,
-+
-+%.o: %.rc
-+	$(WINDRES) -D _VERSION_=$(subst .,$(comma),$(VERSION)),0 -i $< -o $@
-+
- else
- 
- dist_noinst_DATA = \
diff --git a/net-misc/openvpn/files/openvpn.init b/net-misc/openvpn/files/openvpn.init
deleted file mode 100644
index 489ab497..00000000
--- a/net-misc/openvpn/files/openvpn.init
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-VPNDIR="/etc/openvpn"
-VPN="${SVCNAME#*.}"
-if [ -n "${VPN}" ] && [ "${SVCNAME}" != "openvpn" ]; then
-	VPNPID="/var/run/openvpn.${VPN}.pid"
-else
-	VPNPID="/var/run/openvpn.pid"
-fi
-VPNCONF="${VPNDIR}/${VPN}.conf"
-
-depend() {
-	need localmount net
-	before netmount
-	after bootmisc
-}
-
-checktundevice() {
-	if [ ! -e /dev/net/tun ]; then
-		if ! modprobe tun ; then
-			eerror "TUN/TAP support is not available in this kernel"
-			return 1
-		fi
-	fi
-	if [ -h /dev/net/tun ] && [ -c /dev/misc/net/tun ]; then
-		ebegin "Detected broken /dev/net/tun symlink, fixing..."
-		rm -f /dev/net/tun
-		ln -s /dev/misc/net/tun /dev/net/tun
-		eend $?
-	fi
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-
-	checktundevice || return 1
-
-	if [ ! -e "${VPNCONF}" ]; then
-		eend 1 "${VPNCONF} does not exist"
-		return 1
-	fi
-
-	local args=""
-	# If the config file does not specify the cd option, we do
-	# But if we specify it, we override the config option which we do not want
-	if ! grep -q "^[ 	]*cd[ 	].*" "${VPNCONF}" ; then
-		args="${args} --cd ${VPNDIR}"
-	fi
-
-	start-stop-daemon --start --exec /usr/sbin/openvpn --pidfile "${VPNPID}" \
-		-- --config "${VPNCONF}" --writepid "${VPNPID}" --daemon ${args}
-	eend $? "Check your logs to see why startup failed"
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/sbin/openvpn --pidfile "${VPNPID}"
-	eend $?
-}
-
-# vim: ts=4
diff --git a/net-misc/openvpn/files/up.sh b/net-misc/openvpn/files/up.sh
deleted file mode 100755
index 4a886870..00000000
--- a/net-misc/openvpn/files/up.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2006-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Contributed by Roy Marples (uberlord@gentoo.org)
-
-# Setup our resolv.conf
-# Vitally important that we use the domain entry in resolv.conf so we
-# can setup the nameservers are for the domain ONLY in resolvconf if
-# we're using a decent dns cache/forwarder like dnsmasq and NOT nscd/libc.
-# nscd/libc users will get the VPN nameservers before their other ones
-# and will use the first one that responds - maybe the LAN ones?
-# non resolvconf users just the the VPN resolv.conf
-
-# FIXME:- if we have >1 domain, then we have to use search :/
-# We need to add a flag to resolvconf to say
-# "these nameservers should only be used for the listed search domains
-#  if other global nameservers are present on other interfaces"
-# This however, will break compatibility with Debians resolvconf
-# A possible workaround would be to just list multiple domain lines
-# and try and let resolvconf handle it
-
-if [ "${PEER_DNS}" != "no" ]; then
-	NS=
-	DOMAIN=
-	SEARCH=
-	i=1
-	while true ; do
-		eval opt=\$foreign_option_${i}
-		[ -z "${opt}" ] && break
-		if [ "${opt}" != "${opt#dhcp-option DOMAIN *}" ] ; then
-			if [ -z "${DOMAIN}" ] ; then
-				DOMAIN="${opt#dhcp-option DOMAIN *}"
-			else
-				SEARCH="${SEARCH}${SEARCH:+ }${opt#dhcp-option DOMAIN *}"
-			fi
-		elif [ "${opt}" != "${opt#dhcp-option DNS *}" ] ; then
-			NS="${NS}nameserver ${opt#dhcp-option DNS *}\n"
-		fi
-		i=$((${i} + 1))
-	done
-
-	if [ -n "${NS}" ] ; then
-		DNS="# Generated by openvpn for interface ${dev}\n"
-		if [ -n "${SEARCH}" ] ; then
-			DNS="${DNS}search ${DOMAIN} ${SEARCH}\n"
-		elif [ -n "${DOMAIN}" ]; then
-			DNS="${DNS}domain ${DOMAIN}\n"
-		fi
-		DNS="${DNS}${NS}"
-		if [ -x /sbin/resolvconf ] ; then
-			printf "${DNS}" | /sbin/resolvconf -a "${dev}"
-		else
-			# Preserve the existing resolv.conf
-			if [ -e /etc/resolv.conf ] ; then
-				cp /etc/resolv.conf /etc/resolv.conf-"${dev}".sv
-			fi
-			printf "${DNS}" > /etc/resolv.conf
-			chmod 644 /etc/resolv.conf
-		fi
-	fi
-fi
-
-# Below section is Gentoo specific
-# Quick summary - our init scripts are re-entrant and set the SVCNAME env var
-# as we could have >1 openvpn service
-
-if [ -n "${SVCNAME}" ]; then
-	# If we have a service specific script, run this now
-	if [ -x /etc/openvpn/"${SVCNAME}"-up.sh ] ; then
-		/etc/openvpn/"${SVCNAME}"-up.sh "$@"
-	fi
-
-	# Re-enter the init script to start any dependant services
-	if ! /etc/init.d/"${SVCNAME}" --quiet status ; then
-		export IN_BACKGROUND=true
-		/etc/init.d/${SVCNAME} --quiet start
-	fi
-fi
-
-exit 0
-
-# vim: ts=4 :
diff --git a/net-misc/openvpn/metadata.xml b/net-misc/openvpn/metadata.xml
deleted file mode 100644
index 2c30d5ac..00000000
--- a/net-misc/openvpn/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer>
-        <email>djc@gentoo.org</email>
-        <name>Dirkjan Ochtman</name>
-    </maintainer>
-    <longdescription>OpenVPN is an easy-to-use, robust and highly
-        configurable VPN daemon which can be used to securely link two or more
-        networks using an encrypted tunnel.
-    </longdescription>
-    <use>
-        <flag name="iproute2">Enabled iproute2 support instead of net-tools</flag>
-        <flag name="passwordsave">Enables openvpn to save passwords</flag>
-        <flag name="pkcs11">Enable PKCS#11 smartcard support</flag>
-    </use>
-    <upstream>
-        <remote-id type="cpe">cpe:/a:openvpn:openvpn</remote-id>
-    </upstream>
-</pkgmetadata>
diff --git a/net-misc/openvpn/openvpn-2.2.0-r1.ebuild b/net-misc/openvpn/openvpn-2.2.0-r1.ebuild
deleted file mode 100644
index da9f8c26..00000000
--- a/net-misc/openvpn/openvpn-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils multilib toolchain-funcs autotools flag-o-matic
-
-IPV6_VERSION="2.2RC2-ipv6-20110424-2"
-GUI_VERSION="1.0.3"
-
-DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="http://swupdate.openvpn.net/community/releases/${P}.tar.gz
-		ipv6? (
-			http://www.greenie.net/ipv6/openvpn-${IPV6_VERSION}.patch.gz
-		)"
-HOMEPAGE="http://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="examples iproute2 ipv6 minimal pam passwordsave selinux ssl static pkcs11 userland_BSD"
-
-CDEPEND=">=dev-libs/lzo-1.07
-	!minimal? ( pam? ( virtual/pam ) )
-	selinux? ( sec-policy/selinux-openvpn )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}
-	kernel_linux? (
-		iproute2?  ( sys-apps/iproute2[-minimal] )
-		!iproute2? ( sys-apps/net-tools )
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.1_rc20-pkcs11.patch"
-	epatch "${FILESDIR}/${PN}-windres.diff"
-	use ipv6 && {
-	  epatch "${WORKDIR}/${PN}-${IPV6_VERSION}.patch" ;
-	  epatch  "${FILESDIR}/openvpn-2.2.0-BJA-win-ipv6.diff" ;
-	}
-	sed -i \
-		-e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \
-		-e "s/-shared/-shared \${LDFLAGS}/" \
-		plugin/*/Makefile || die "sed failed"
-	eautoreconf
-}
-
-src_configure() {
-	# basic.h defines a type 'bool' that conflicts with the altivec
-	# keyword bool which has to be fixed upstream, see bugs #293840
-	# and #297854.
-	# For now, filter out -maltivec on ppc and append -mno-altivec, as
-	# -maltivec is enabled implicitly by -mcpu and similar flags.
-	(use ppc || use ppc64) && filter-flags -maltivec && append-flags -mno-altivec
-
-	local myconf=""
-
-	if use minimal ; then
-		myconf="${myconf} --disable-plugins"
-		myconf="${myconf} --disable-pkcs11"
-	else
-		myconf="$(use_enable pkcs11)"
-	fi
-
-	[[ ${CHOST} = *mingw* ]] && export MAN2HTML=/bin/true #"/etc/cron.daily/man2html" ;;
-
-	econf ${myconf} \
-		$(use_enable passwordsave password-save) \
-		$(use_enable ssl) \
-		$(use_enable ssl crypto) \
-		$(use_enable iproute2) \
-		--docdir="${DESTDIR}/usr/share/doc/${PF}"
-}
-
-src_compile() {
-
-	if use static ; then
-		sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile || die "sed failed"
-	fi
-
-	emake || die "make failed"
-
-	if ! use minimal ; then
-		cd plugin
-		for i in *; do
-			[[ ${i} == "README" || ${i} == "examples" || ${i} == "defer" ]] && continue
-			[[ ${i} == "auth-pam" ]] && ! use pam && continue
-			[[ ${CHOST} = *mingw* ]] && [[ ${i} == "down-root" ]] && continue
-
-			einfo "Building ${i} plugin"
-			emake -C "${i}" CC=$(tc-getCC) || die "make failed"
-		done
-		cd ..
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# install documentation
-	dodoc AUTHORS ChangeLog PORTS README
-
-	# Install some helper scripts
-	keepdir /etc/openvpn
-	exeinto /etc/openvpn
-	doexe "${FILESDIR}/up.sh" || die "doexe failed"
-	doexe "${FILESDIR}/down.sh" || die "doexe failed"
-
-	# Install the init script and config file
-	newinitd "${FILESDIR}/${PN}-2.1.init" openvpn || die "newinitd failed"
-	newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn || die "newconfd failed"
-
-	# 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-{config-files,keys,scripts} contrib
-	fi
-
-	# Install plugins and easy-rsa
-	doenvd "${FILESDIR}/65openvpn" # config-protect easy-rsa
-
-	case "${CHOST}" in
-		*mingw*)	ext="dll"	;;
-		*)			ext="so"	;;
-	esac
-
-	if ! use minimal ; then
-		case "${CHOST}" in
-			*mingw*) ;;
-			*)
-				cd easy-rsa/2.0
-				make install "DESTDIR=${D}/usr/share/${PN}/easy-rsa"
-				cd ../..
-				;;
-		esac
-
-		if [ -e "plugin/*/*.${ext}" ] ; then
-			exeinto "/usr/$(get_libdir)/${PN}"
-			doexe plugin/*/*.${ext}
-		fi
-	fi
-}
-
-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 minimal ; then
-		einfo ""
-		einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
-	fi
-
-	if use ipv6 ; then
-		einfo ""
-		einfo "This build contains a community-maintained IPv6 patch."
-		einfo "For more information please visit:"
-		einfo "http://www.greenie.net/ipv6/openvpn.html"
-	fi
-}
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3ceff12a..5f4ecc01 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -55,9 +55,6 @@ media-video/rtmpdump:gnutls - Use GnuTLS library instead of the default OpenSSL
 media-video/rtmpdump:polarssl - Use PolarSSL library instead of the default OpenSSL
 net-misc/icmptx:client - Enable client support
 net-misc/icmptx:server - Enable server support
-net-misc/openvpn:iproute2 - Enabled iproute2 support instead of net-tools
-net-misc/openvpn:passwordsave - Enables openvpn to save passwords
-net-misc/openvpn:pkcs11 - Enable PKCS#11 smartcard support
 net-misc/openvpn-gui:empty-password - Permit user to remove password on private key
 net-wireless/hostapd:crda - Add CRDA support
 net-wireless/hostapd:logwatch - Install support files for sys-app/logwatch