gentoo resync : 31.05.2021

5 files changed, 4 insertions, 520 deletions

diff --git a/net-vpn/openvpn/Manifest b/net-vpn/openvpn/Manifest
index eb2407798d95..219b32dae2c7 100644
--- a/net-vpn/openvpn/Manifest
+++ b/net-vpn/openvpn/Manifest
@@ -4,13 +4,7 @@ AUX openvpn-2.1.init 4176 BLAKE2B bcce4f9683c485acde0c909a2be77511b7f0576dcd2452
 AUX openvpn-2.5.0-auth-pam-missing-header.patch 339 BLAKE2B 8aa56f7d475c4d7a1f0d8b14b7563744981f9fef15c5b217aba00d91469eda99cfa04b4a1e8ffbc92dccfc981290ec5aaf209041ed7790f05f2bcf51a06981bb SHA512 373e63417f829c3309cc3ec1e676559deaa7f19be438228d05ac4f47cd5d18f36be270cff1e6dad5b610afd77ff128c170a319263b903d6f221344e3b6be32bc
 AUX openvpn-2.5.2-detect-python-rst2man.patch 554 BLAKE2B e379af57dcc25766803043c40ac2128e2649acb4594ba6c4f55967e5d38dc6fd3190d519b6e9ea81656eb9e5344043e6cb84e155059337282913b60a58d09eca SHA512 e09307c2841a8836d12e1973baaa5e61fd9371e6628dcc858cfa9111b8907f8e6ad73073552655292f0f9d23b8850aa821d3a1520b4b11c312a8beb2225c6ae9
 AUX up.sh 2865 BLAKE2B f359c0078148a8ec59b68227844f39d784df2271e9640b54f50a9c0b6b67450cf8b397dba8fd735931790648c1d485c149a55ffcbf095623b491b8a827eccab9 SHA512 35201b0e60ad20358080007e595eb4f96d186ba8e88f0485c55d164c28e3d78a12f3e09347ba3d76abb9b8b03fb4a53664bd74ab484be1548090022b956925fd
-DIST openvpn-2.4.9.tar.gz 1000602 BLAKE2B 4a10ec76d1a816f9184dd33e4384623e011a1af40ea38ad56cc06f70ab2c911b6fd92cf8ffcd2ec3ab4179fef87feb187fc9df61c5bea92b1c69ee4113093866 SHA512 7683dfb93592968459f080a07ea750992b7444708cdb1a5aafc0118ab8528fc488f2b9fbd7d042e57ad1811303208875237ae9decf0bb4977c45cd30da53751b
-DIST openvpn-2.5.0-r1.tar.gz 1815964 BLAKE2B cca1c1ec4fbfe0c337c14525cf706280c9d961c4bba992dfa0b13c9f96e00092864301138037485095716c746ef6ff3473a2085780b3ef77183bf4a6f1c602ae SHA512 3deb55973b87cc95c0437ab9ce6c43fdc246aa7e42e3e68bd6a5651deffa798b6750f625917cb2aaa2c82f0b3a0805bcf206a2aa8e2c735fd24e6bd38f736562
-DIST openvpn-2.5.1.tar.gz 1827517 BLAKE2B 068af9313c9b2b93dcaa06f82ad66489154ce04973e323af07f38f209b4be77b7b785046aa31559a9f744b4b8c6976acd3e644d5a573f3c5511dc11f5bab3dce SHA512 eb85d14eeb383bed09670941451328db38feacc0b8b7b960840a3f465de83a7527de7d183e66344011da3a3655d558483c569d096b36964209a23418f89052e2
 DIST openvpn-2.5.2.tar.gz 1830763 BLAKE2B d1c5fa97b3a9168e8715a7cf926b581e054d1d8ac905dcb78e91b9e7f2ea2abf2f03a02e6b4ee10184e810ebb871f4fc638834848eb3b4a9122b177705382fe8 SHA512 5811d26b32e7f258dc1f7ed704d28f9eb03200b54a128e4cb5dfa37ace5113d7841830fc04e1c5f69a138141d0f6f0ca6cb7fc3c39d67456e476eb4c45102be1
-EBUILD openvpn-2.4.9.ebuild 4673 BLAKE2B 5c59d4d0745d7ea2efc85145acb06a101aac417f8a2f5a23e21b0939b9180d009b380db2064d7babf9335fddc866bd48fcf1c0a87f4094f1718315ad22e6f5cd SHA512 4c4880507b407549b42b9f58443f6031e0ac6aaa41c14426dcc792930c1fa45ad84e7e3934fa85c91599adfdd2dc019eefbfa3afefad518a30058c6a6489f0da
-EBUILD openvpn-2.5.0-r1.ebuild 4695 BLAKE2B dd947f38a6484cc69e8cccac511fb60ffc04ab3ab7e69d11192b274234f93c175d2f15f8567b5312281efe76ba568bdf168a9d6cf51f1c19d778c914921d228a SHA512 7d8d46b49fe36c2850c031c74a47a459b28bbc5e94bc9ba5862999b196f3ad8ba425cd30031d7e592a53c89e6926a9110baee8b3b4300ba44e629ba33ac5ee8c
-EBUILD openvpn-2.5.1-r1.ebuild 4679 BLAKE2B a823847503c964ff792b78ba44116dd9f257814d73e24965560cbcbc85235368be160892274579a60d26c77e31bda389a6b4122a0e1e344a4ee4fe2e0f29552d SHA512 1894deec5ca459b8de6cf58c5aed77b9987671a7bf7c052e15dd3ffa48a6e1b2a7ad14797ee9886ba6545f4a8f14d64de8b1715787880b5bc8880f4e23d8174e
 EBUILD openvpn-2.5.2.ebuild 5000 BLAKE2B 87806f8baa1589c14ec92972199068a774e4d30406466ce3611b0ec818e6dc99eabacd619ae72ca94988df5ff6047ca95e630838b14a9fca81828e4790449d8c SHA512 e414ef1ad5496dcb220aab5785a5343f2d1d40bad1e184d52c0aa2bea4772a9594b201fd91fd786a8c984c15e3b8da8b06c2a02f8a9cd39db95232a4d48d2c23
-EBUILD openvpn-9999.ebuild 5006 BLAKE2B 580199387ed1a7a35ada0566f030f4597bb78106fcc49a19473f15cd63581db3a0ddf3493bbe3935914ed9df687c4d26aaf84cba8f1a693e581a1fdaa8bf9881 SHA512 149e1cb8868a6133a061c9434fc13f12cf7b1ea90130f106adbf4d9e7fa25aa560d449f153cc3dbcbe067fc28f08ad287a9fe2465a377dc0b95a8e4a639d35ac
+EBUILD openvpn-9999.ebuild 4986 BLAKE2B 5eebd395ec22387351e2dea239b61ca22cbcc0c7cff64f2de4c7bd4bac9cb8c99af4546aa986a67cd11efe524e3db8e57a7bac95da7b22ebfe3f1e0bfdf8beb4 SHA512 279bc764dfda1887a9259c84a226764784ac31d7d8dc85ad45ab1dde5ad05a26f9c0c1556299cd2d3687299a8c89d00d19c18113c94145d59c914885fbde19e7
 MISC metadata.xml 1083 BLAKE2B 5642cd5be7d4d53f5cc3b1e501f3a22c875ceee114cc2c4d5fa45f96983593d8f2c5b60a30c396187ad7bb2adb36d6d5c03aef8530d450ab86df589a591ae95b SHA512 91a8c6eda7d21dbf7619b49b757d9016ac94ff6c9e87ef5684a01d5138d8f84cfcc525fd62729ceac85394e82cec3931716f6dfaae59cfc3eda804bd968ee428
diff --git a/net-vpn/openvpn/openvpn-2.4.9.ebuild b/net-vpn/openvpn/openvpn-2.4.9.ebuild
deleted file mode 100644
index fa2a4e2f0261..000000000000
--- a/net-vpn/openvpn/openvpn-2.4.9.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd linux-info
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="https://github.com/OpenVPN/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls pam"
-IUSE+=" pkcs11 +plugins selinux +ssl systemd test userland_BSD"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="pkcs11? ( ssl )
-	!plugins? ( !pam !down-root )
-	inotify? ( plugins )
-"
-
-CDEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] )
-		!iproute2? ( >=sys-apps/net-tools-1.60_p20160215155418 )
-	)
-	pam? ( sys-libs/pam )
-	ssl? (
-		!mbedtls? ( >=dev-libs/openssl-0.9.8:0= )
-		mbedtls? ( net-libs/mbedtls:= )
-	)
-	lz4? ( app-arch/lz4 )
-	lzo? ( >=dev-libs/lzo-1.07 )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${CDEPEND}
-	test? ( dev-util/cmocka )
-"
-RDEPEND="${CDEPEND}
-	acct-group/openvpn
-	acct-user/openvpn
-	selinux? ( sec-policy/selinux-openvpn )
-"
-
-CONFIG_CHECK="~TUN"
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable inotify async-push)
-		$(use_enable ssl crypto)
-	)
-	if use ssl; then
-		myeconfargs+=(
-			$(use_with ssl crypto-library $(usex mbedtls mbedtls openssl))
-		)
-		if ! use mbedtls; then
-			myeconfargs+=(
-				$(use_enable pkcs11)
-			)
-		fi
-	fi
-	myeconfargs+=(
-		$(use_enable lz4)
-		$(use_enable lzo)
-		$(use_enable plugins)
-		$(use_enable iproute2)
-		$(use_enable pam plugin-auth-pam)
-		$(use_enable down-root plugin-down-root)
-		$(use_enable systemd)
-	)
-	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
-	TMPFILES_DIR="/usr/lib/tmpfiles.d" \
-	IFCONFIG=/bin/ifconfig \
-	ROUTE=/bin/route \
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	make check || die "top-level tests failed"
-	pushd tests/unit_tests > /dev/null || die
-	make check || die "unit tests failed"
-	popd > /dev/null || die
-}
-
-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
-		docinto /usr/share/doc/${PF}/examples
-		dodoc -r sample contrib
-	fi
-}
-
-pkg_postinst() {
-	if use x64-macos; then
-		elog "You might want to install tuntaposx for TAP interface support:"
-		elog "http://tuntaposx.sourceforge.net"
-	fi
-
-	if systemd_is_booted ||  has_version sys-apps/systemd; then
-		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
-		elog  ""
-		elog "server:"
-		elog ""
-		elog "- Place your server configuration file in /etc/openvpn/server"
-		elog "- Use the openvpn-server@.service like so"
-		elog "systemctl start openvpn-server@{Server-config}"
-		elog ""
-		elog "client:"
-		elog ""
-		elog "- Place your client configuration file in /etc/openvpn/client"
-		elog "- Use the openvpn-client@.service like so:"
-		elog "systemctl start openvpn-client@{Client-config}"
-	else
-		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."
-	fi
-
-	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}/plugins"
-	fi
-}
diff --git a/net-vpn/openvpn/openvpn-2.5.0-r1.ebuild b/net-vpn/openvpn/openvpn-2.5.0-r1.ebuild
deleted file mode 100644
index 8ee40bcb156d..000000000000
--- a/net-vpn/openvpn/openvpn-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd linux-info
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz -> ${P}-r1.tar.gz"
-HOMEPAGE="https://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
-IUSE+=" pam pkcs11 +plugins selinux systemd test userland_BSD"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	^^ ( openssl mbedtls )
-	pkcs11? ( !mbedtls )
-	!plugins? ( !pam !down-root )
-	inotify? ( plugins )
-"
-
-CDEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] )
-	)
-	lz4? ( app-arch/lz4 )
-	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
-	openssl? ( >=dev-libs/openssl-0.9.8:0= )
-	pam? ( sys-libs/pam )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${CDEPEND}
-	test? ( dev-util/cmocka )
-"
-RDEPEND="${CDEPEND}
-	acct-group/openvpn
-	acct-user/openvpn
-	selinux? ( sec-policy/selinux-openvpn )
-"
-
-PATCHES=(
-	"${FILESDIR}/openvpn-2.5.0-auth-pam-missing-header.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~TUN"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local -a myeconfargs
-
-	if ! use mbedtls; then
-		myeconfargs+=(
-			$(use_enable pkcs11)
-		)
-	fi
-	myeconfargs+=(
-		$(use_enable inotify async-push)
-		--with-crypto-library=$(usex mbedtls mbedtls openssl)
-		$(use_enable lz4)
-		$(use_enable lzo)
-		$(use_enable plugins)
-		$(use_enable iproute2)
-		$(use_enable pam plugin-auth-pam)
-		$(use_enable down-root plugin-down-root)
-		$(use_enable systemd)
-	)
-	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
-		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
-		IPROUTE=$(usex iproute2 '/bin/ip' '') \
-		econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	make check || die "top-level tests failed"
-	pushd tests/unit_tests > /dev/null || die
-	make check || die "unit tests failed"
-	popd > /dev/null || die
-}
-
-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
-		docinto /usr/share/doc/${PF}/examples
-		dodoc -r sample contrib
-	fi
-
-	# https://bugs.gentoo.org/755680#c3
-	doman doc/openvpn.8
-}
-
-pkg_postinst() {
-	if use x64-macos; then
-		elog "You might want to install tuntaposx for TAP interface support:"
-		elog "http://tuntaposx.sourceforge.net"
-	fi
-
-	if systemd_is_booted ||  has_version sys-apps/systemd; then
-		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
-		elog  ""
-		elog "server:"
-		elog ""
-		elog "- Place your server configuration file in /etc/openvpn/server"
-		elog "- Use the openvpn-server@.service like so"
-		elog "systemctl start openvpn-server@{Server-config}"
-		elog ""
-		elog "client:"
-		elog ""
-		elog "- Place your client configuration file in /etc/openvpn/client"
-		elog "- Use the openvpn-client@.service like so:"
-		elog "systemctl start openvpn-client@{Client-config}"
-	else
-		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."
-	fi
-
-	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}/plugins"
-	fi
-}
diff --git a/net-vpn/openvpn/openvpn-2.5.1-r1.ebuild b/net-vpn/openvpn/openvpn-2.5.1-r1.ebuild
deleted file mode 100644
index f6859b6c7e04..000000000000
--- a/net-vpn/openvpn/openvpn-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd linux-info
-
-DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes"
-SRC_URI="https://build.openvpn.net/downloads/releases/${P}.tar.gz"
-HOMEPAGE="https://openvpn.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="down-root examples inotify iproute2 +lz4 +lzo mbedtls +openssl"
-IUSE+=" pam pkcs11 +plugins selinux systemd test userland_BSD"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	^^ ( openssl mbedtls )
-	pkcs11? ( !mbedtls )
-	!plugins? ( !pam !down-root )
-	inotify? ( plugins )
-"
-
-CDEPEND="
-	kernel_linux? (
-		iproute2? ( sys-apps/iproute2[-minimal] )
-	)
-	lz4? ( app-arch/lz4 )
-	lzo? ( >=dev-libs/lzo-1.07 )
-	mbedtls? ( net-libs/mbedtls:= )
-	openssl? ( >=dev-libs/openssl-0.9.8:0= )
-	pam? ( sys-libs/pam )
-	pkcs11? ( >=dev-libs/pkcs11-helper-1.11 )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${CDEPEND}
-	test? ( dev-util/cmocka )
-"
-RDEPEND="${CDEPEND}
-	acct-group/openvpn
-	acct-user/openvpn
-	selinux? ( sec-policy/selinux-openvpn )
-"
-
-PATCHES=(
-	"${FILESDIR}/openvpn-2.5.0-auth-pam-missing-header.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~TUN"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local -a myeconfargs
-
-	if ! use mbedtls; then
-		myeconfargs+=(
-			$(use_enable pkcs11)
-		)
-	fi
-	myeconfargs+=(
-		$(use_enable inotify async-push)
-		--with-crypto-library=$(usex mbedtls mbedtls openssl)
-		$(use_enable lz4)
-		$(use_enable lzo)
-		$(use_enable plugins)
-		$(use_enable iproute2)
-		$(use_enable pam plugin-auth-pam)
-		$(use_enable down-root plugin-down-root)
-		$(use_enable systemd)
-	)
-	SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \
-		TMPFILES_DIR="/usr/lib/tmpfiles.d" \
-		IPROUTE=$(usex iproute2 '/bin/ip' '') \
-		econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	make check || die "top-level tests failed"
-	pushd tests/unit_tests > /dev/null || die
-	make check || die "unit tests failed"
-	popd > /dev/null || die
-}
-
-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
-		docinto /usr/share/doc/${PF}/examples
-		dodoc -r sample contrib
-	fi
-
-	# https://bugs.gentoo.org/755680#c3
-	doman doc/openvpn.8
-}
-
-pkg_postinst() {
-	if use x64-macos; then
-		elog "You might want to install tuntaposx for TAP interface support:"
-		elog "http://tuntaposx.sourceforge.net"
-	fi
-
-	if systemd_is_booted ||  has_version sys-apps/systemd; then
-		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
-		elog  ""
-		elog "server:"
-		elog ""
-		elog "- Place your server configuration file in /etc/openvpn/server"
-		elog "- Use the openvpn-server@.service like so"
-		elog "systemctl start openvpn-server@{Server-config}"
-		elog ""
-		elog "client:"
-		elog ""
-		elog "- Place your client configuration file in /etc/openvpn/client"
-		elog "- Use the openvpn-client@.service like so:"
-		elog "systemctl start openvpn-client@{Client-config}"
-
-	else
-
-		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."
-	fi
-
-	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}/plugins"
-	fi
-}
diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild
index 20cd58c60ee4..ac64c3e3d3c7 100644
--- a/net-vpn/openvpn/openvpn-9999.ebuild
+++ b/net-vpn/openvpn/openvpn-9999.ebuild
@@ -130,7 +130,7 @@ src_install() {
 	# install examples, controlled by the respective useflag
 	if use examples ; then
 		# dodoc does not supportly support directory traversal, #15193
-		docinto /usr/share/doc/${PF}/examples
+		docinto examples
 		dodoc -r sample contrib
 	fi
 
@@ -139,12 +139,12 @@ src_install() {
 }
 
 pkg_postinst() {
-	if use x64-macos; then
+	if use x64-macos ; then
 		elog "You might want to install tuntaposx for TAP interface support:"
 		elog "http://tuntaposx.sourceforge.net"
 	fi
 
-	if systemd_is_booted ||  has_version sys-apps/systemd; then
+	if systemd_is_booted || has_version sys-apps/systemd ; then
 		elog "In order to use OpenVPN with systemd please use the correct systemd service file."
 		elog  ""
 		elog "server:"