5 files changed, 20 insertions, 62 deletions
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index 1286f5602dcc..bfa0f49b117e 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -1,8 +1,6 @@
-AUX xl2tpd-init-r1 272 BLAKE2B 0a0f350d5ce3ce297b120750bed742eece7ee6f6b5c5ea24c09b2015a3b5dd2621eff76aa05cee56e5ed795df3204b2d81f8394de492ea655011a8efed3b8982 SHA512 80235d4084963f9285fc11f30ca648ebe4a23e3f74e41fddb81d6fdc08808b1772163192f61f56c677c3003f10809f7d014ddeaa427eabfad490106ac7e14f67
-AUX xl2tpd.conf 18 BLAKE2B 1486c7555965c14429cbbc7ab5dcebac02aa0639204d3eb203b58f6f46a042de4daa9a278d4e6f32ba6dca563c2de9757cf0e5af59563c5e0250b048a4f1f30f SHA512 0b3c6d4784b997d12734fe1e5165dc066269db24608638566c0fc317c1927331ed806fdb7a4f816bd16d1f22046b52badd99c2f0977c157b2b3f3ed42071ae42
+AUX xl2tpd-init-r1 261 BLAKE2B f4aba90e73feeaea22401448681d60baf09854efaebe6d0a5722c96d2bb860653273351d1ce8a516b52491626db0e14ee1e8727b1b994b1ed1e1722ab9463214 SHA512 6d5aab46ee9dcdf3d15acc08d6d0dbbf868d27c4755526f3ae7c19dc9ba528d028a369a7779324687effa2458a60a06ee00984df99bcafce6a8aaa1113fc1788
+AUX xl2tpd.conf 14 BLAKE2B ab6ecadf65d4cabd37779ea2de61860f1bced5b59e66cc6e4e960204ba04a4ecf2cef9fdacb79faec2f2e0966e299682d0cf99f97dd07c9873b3c6914a6668af SHA512 b209f3b365de37eb4a6b8c55fd06d79a09ac674e6bfcd40d08a7296f4ab64eb3b6d6b7338461192d19068868258ff70ea02261a56eaffb1bd15672921382ef72
 AUX xl2tpd.service 232 BLAKE2B 16578777774cd7d378efb37f917e368d39f84267c45184d9b72a9d501f75e59cf2f14e1326c347cc4d62c541696a2cf4e5af51f13c0c909c26f908a374944e39 SHA512 184b4f63492c5a09fa61ebf0913a4a47e1cd3b321b80b122f2177ff8f5c9eccdc4a73831dfffc3c2e39325f5cb0b30c4e3f99c1f0fed1f21935be5da38a83579
-DIST xl2tpd-1.3.15.tar.gz 524960 BLAKE2B 5349b4bce7e4b8ea26ec3c739847456b6c8fdac667c8ad9d5241d3c83bc450a47c88c99c37cea2b0461fd4abb3e32da67de7c8ab95d288c8c423bea9af4abf1d SHA512 f65c7f2f1c03728d825b8857baa0c2297e9d5dbd97a2375484a32851326db5951deb9bf3598cbec860f0787d1bb577b4f0a47372e3244fd92c8bad7ce684889b
 DIST xl2tpd-1.3.16.tar.gz 531861 BLAKE2B 2f809c8623c1a77ee538014d4ff3389e32e142f8cd6acad1657198323835574dd3d062e5ed6ee81ded5c4a1a65d8e200759ed6013884bb655ca6f5eef5333931 SHA512 d92bd9070c0e78ba1f4f7ee38be9e87d1f869fe240433f2fd7d1c974f1bce1573ab7aeb5922f316e53bd0fd4580b6152d585b1e0e0cd6fb01ef8fa85d9509b16
-EBUILD xl2tpd-1.3.15.ebuild 1128 BLAKE2B feb8f443afd9f98a97385b3a70a8282d4fc8e6cecf3e5942fb11b7f6a531c7cb522ac620976f4ac7efe4fd9d282ab9fe809c73d49c78a1315360d3229363100d SHA512 4471177f05f6f8be137ca8c51662c8096710062bd66c22d87419c626dd5921aa9154ad25564afdee25fb01df1380f26a2ab0187f238114ad52054f6a8fb8ed9f
-EBUILD xl2tpd-1.3.16.ebuild 1135 BLAKE2B bf851f7b21d6774b4ae9d6d49ec5be76d5ce18f0c3d338cdd900f2144b9ed53971722bffd9660cd72317d35ecda04d84c7967470e3ea27c1664815a021e4e03d SHA512 09736b23fed138cee839e60ff57b83cb8b29e79d6d8c466856710b9c81a579a3854071bfd89c09cc9d1d55b668bb52335c4c2f6732dc360a2eba7138d7a70353
+EBUILD xl2tpd-1.3.16-r1.ebuild 1345 BLAKE2B f8221da8b0f5ff6a28b76f8fb33872b2e9f9dd0f16ab44ca303b109ab9bb8b60dac29dd8428f32682e1db9f975391a60e880c05465ea6afdc552fda5632df8ad SHA512 d421fcc1387bc0bfa6895232b97847c46e9a501dddb22b00f908146eef272dd54d3978be5c7b6a344bfa01a969db7f70549910d2c0ddcf0ee191a341e943ccf3
 MISC metadata.xml 879 BLAKE2B 45303811850f78008ae08da56724fd3e9ee5048db230735230504468a2ba03c8c4f19ebbc8b648f0f490504c9df35eb9c667c6dc320802105eaddad1f2098f8c SHA512 287af9f09cf7066768307b7dbb6b570291e4e15592c178e9dad215b1c3229cbfe9bee06994050184525d2636d3c3e87172caab49b084a27fd583461fed334df3
diff --git a/net-dialup/xl2tpd/files/xl2tpd-init-r1 b/net-dialup/xl2tpd/files/xl2tpd-init-r1
index 4e9956a4d13d..82366c69f57c 100644
--- a/net-dialup/xl2tpd/files/xl2tpd-init-r1
+++ b/net-dialup/xl2tpd/files/xl2tpd-init-r1
@@ -1,11 +1,11 @@
 #!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/sbin/xl2tpd"
-pidfile="/var/run/xl2tpd.pid"
+pidfile="/run/xl2tpd.pid"
 required_files="/etc/xl2tpd/xl2tpd.conf"
 
 start_pre() {
-	checkpath -d /var/run/xl2tpd
+	checkpath -d /run/xl2tpd
 }
diff --git a/net-dialup/xl2tpd/files/xl2tpd.conf b/net-dialup/xl2tpd/files/xl2tpd.conf
index 67162b26df06..32119f564439 100644
--- a/net-dialup/xl2tpd/files/xl2tpd.conf
+++ b/net-dialup/xl2tpd/files/xl2tpd.conf
@@ -1 +1 @@
-d /var/run/xl2tpd
+d /run/xl2tpd
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.15.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.15.ebuild
deleted file mode 100644
index 1bfcb77b0089..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.3.15.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="https://github.com/xelerance/xl2tpd"
-SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ppc64 x86"
-IUSE="+kernel"
-
-DEPEND="
-	net-libs/libpcap
-	>=sys-kernel/linux-headers-2.6"
-
-RDEPEND="
-	${DEPEND}
-	net-dialup/ppp"
-
-DOCS=( CREDITS README.md BUGS CHANGES TODO doc/README.patents )
-
-src_compile() {
-	tc-export CC
-	local OSFLAGS="-DLINUX"
-	use kernel && OSFLAGS+=" -DUSE_KERNEL"
-	emake OSFLAGS="${OSFLAGS}"
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
-
-	systemd_dounit "${FILESDIR}"/xl2tpd.service
-	dotmpfiles "${FILESDIR}"/xl2tpd.conf
-
-	einstalldocs
-
-	insinto /etc/xl2tpd
-	newins doc/l2tpd.conf.sample xl2tpd.conf
-	insopts -m 0600
-	newins doc/l2tp-secrets.sample l2tp-secrets
-}
-
-pkg_postinst() {
-	tmpfiles_process xl2tpd.conf
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.16-r1.ebuild
index 5821a9c07fe3..59d581b60f81 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,18 @@ RDEPEND="
 
 DOCS=( CREDITS README.md BUGS CHANGES TODO doc/README.patents )
 
+src_prepare() {
+	default
+	sed -e 's:/var/run/:/run/:' -i \
+		file.h \
+		l2tp.h \
+		xl2tpd-control.c \
+		doc/l2tp-secrets.5 \
+		doc/xl2tpd.8 \
+		doc/xl2tpd.conf.5 \
+		|| die "Error updating /var/run to /run"
+}
+
 src_compile() {
 	tc-export CC
 	local OSFLAGS="-DLINUX"