gentoo resync : 20.03.2021

17 files changed, 19 insertions, 225 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index ff5c98a31fce..bd345985e350 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/cutecom/Manifest b/net-dialup/cutecom/Manifest
index cd5ef1f378da..71b21358be8a 100644
--- a/net-dialup/cutecom/Manifest
+++ b/net-dialup/cutecom/Manifest
@@ -1,4 +1,4 @@
 AUX cutecom-0.51.0-fix-for-qt-5.15.0.patch 615 BLAKE2B a39889b204d87c0812673098985b2d3bad919b10a7d923d589c0b88fa818bce77f5b08d8cf7c221a23f5f61ade8dac36f436c5be99c9b96322a1e4c2ebc4873f SHA512 5cbbb75beb4082be6e1d515b4d37a874d8a507a854e6844b6f0479af02db7575d54020c21e72fc5c2b6670de32b7edad18f7abe4ee69793782acca0ef09e4e05
 DIST cutecom-v0.51.0.tar.bz2 1296457 BLAKE2B 407bbe12fb4303e98589720c3fe9bf96a4112c816e64a3a32227d07a64c1efbb5b33c364d1f3f06ff67c9bc935c0bf62de14849b554508eaffacda1f65e7fad9 SHA512 67857977ab6444509662be4d27059e3c4cb766a69b78d806f4cd3d6cb7306d53094337fb384133a616ae397ac4d4d7c86347285a2d68f88fbf105d73ebd97731
 EBUILD cutecom-0.51.0-r1.ebuild 872 BLAKE2B 159a3406cab8fc0d9a64aa0212a17ffddda142867810c33cc21f186eeedc4363fef62ba0555551d0952c1833404c1bfdfde1df996c0deb97705b1d0db01e7ec5 SHA512 3d423abf0842d5f92689bca836a64972ddf00f20cb4cec5176f1dcda1c587f1b60a5ec89551bd0ff761affdae00b6c226d770fd8162955fd7da4851c69d93775
-MISC metadata.xml 518 BLAKE2B e409cc5cd2b57e810e408991786f22b93464167b4efe51374e6f4a5be8d5bf80f351ea37b3cd26080f731c53428d3046053ddb1e7192c8129d291a77c718fe76 SHA512 3641e21c8f46af695d3e11a27d3f67a6ef8670fc1d1621d253f2f0555ffc8a30762bf91513e5539177e640253c8f7ec2b574b8c2332a933150664bf2d3ad8880
+MISC metadata.xml 518 BLAKE2B 41d8dded660c8fc5503025d379940c23c95d7e5277901c5d1965169b461fd018c4658bed5bd71e336d2306572a986b51026a3ae3db310c7252052a34c66f9ddf SHA512 789aad77ee2c618e2d46b28d2e8523635b438cf1ebfba070ca785bea70b188eec2ff9b258b671be7d567223d1b02399c78928919bb260be60e2e36e0702074e8
diff --git a/net-dialup/cutecom/metadata.xml b/net-dialup/cutecom/metadata.xml
index 107ba45773b3..131c2451a225 100644
--- a/net-dialup/cutecom/metadata.xml
+++ b/net-dialup/cutecom/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/net-dialup/freeradius-client/Manifest b/net-dialup/freeradius-client/Manifest
index 99dea714b7c5..47e23f6e4558 100644
--- a/net-dialup/freeradius-client/Manifest
+++ b/net-dialup/freeradius-client/Manifest
@@ -1,4 +1,4 @@
 AUX freeradius-client-1.1.7-ar-configure.in.patch 241 BLAKE2B fc58d9477275ddbe7724adba4cbd7d1f4a5a134ca355aa41375376e056c321e22fe4f355602c0cffa70cb532cfee32f2c0728cea93c9e0d579cceea6425c8147 SHA512 654f142be0ff695ab4b9c8c9fa52e3a448c3d0027b5e7d8e776323e49be0cf268cb7cab82a5dd2ccf067a7089a8ff618296755973af1155ab40034cd93a6bea8
 DIST freeradius-client-1.1.7.tar.gz 433141 BLAKE2B 3a1ba65eb8b66d28362fd66a905af0a4e12b67e664da2c64dab87616e3787cded58d0c3bf56705bdb879d41f1a9a984cf5256b06eeb382209caebf748f679e12 SHA512 20e79ec97da79f46b334e1c2880803a692885a4038196a4d016094d349f675e2d0521d921140c5ab06703008619417f7a20d3e90cdfc7b3578faccbd232be0ce
 EBUILD freeradius-client-1.1.7-r1.ebuild 1031 BLAKE2B 4fb53a60f558ea7b60043e254d65f47ab9f7f2b753e339df3576a9e7f51be61c4ac2ebd70f1c0388f793e997c0bf3b012b46aa0fb7270defb9b2fa01ae2e3c96 SHA512 0eedcdffe1d5c74c2dbc4568ebb84c687e6a45eb3346fb728524342c018ec186ef2df81550cb23ee908d0c5c6d77bae488b0ad69a045c0f8fca2fd838d5e73bd
-MISC metadata.xml 937 BLAKE2B dd3e76a7a6a71b1d0ad75eb4190154124c8c15c8026ee35947067fc403369a348117dbb72f3986b81234777896aeef6ebc32f6ad32e6d41ae24dc772e9f57a28 SHA512 49a0f971e1bac986e6f6dfb02370011afeda182eb733b1c11cc1307d43881fadf924af84c42d8ed44937a01faa9b5793a8ec112e87d6648ba0d1737ee4c5495d
+MISC metadata.xml 967 BLAKE2B 58843c33e950349e9d1ff3ba2b7978c0856c2b177c7ae65fd7c917c4a43cdfadbc93a6273b22b8308e33f3cac3dd2ca8819e1ea919fed014b2c99fac2ad91006 SHA512 83296b63df8cf2102c8e8df49277cbc3edbcc411255f845816c698dc721de9c9b84f8578646dd580ad58469961ba936d98d1a6c37a6efc255a072ffea905651b
diff --git a/net-dialup/freeradius-client/metadata.xml b/net-dialup/freeradius-client/metadata.xml
index 597f77ab7b7f..4412f59fbc14 100644
--- a/net-dialup/freeradius-client/metadata.xml
+++ b/net-dialup/freeradius-client/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alarig@swordarmor.fr</email>
 		<name>Alarig Le Lay</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 82ca8c6a757c..4a3f280edc2f 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -9,4 +9,4 @@ DIST freeradius-server-3.0.20.tar.gz 5002727 BLAKE2B f481ad22105694a4af3f0f0c1b4
 DIST freeradius-server-3.0.21.tar.gz 5028506 BLAKE2B 3ccf9704a1f8b1ec5f6f066a475083fe7cefa793e8f53ecd287866fc505a832bf8031a4d07c2e07f79da6c6fb82e6a3435b0154d1f135167ebddfc9b8d401544 SHA512 85af1c305e99a56400b04be5c966900e7df8beb7b54626d6aa0cb300dc124817e43b424f9b27d86966bb76cca87dce741812ed8d681a568c7d7b63b3b53a9dfa
 EBUILD freeradius-3.0.20-r1.ebuild 7626 BLAKE2B 4e2a9cb5d8039b9f5e541b8fc4d5de56b154c95506fdb29fb7c01ef8439426ebfc19f517e098026c9571bf7ebe055f7c667150cfe4f9d489708c0591218e45e5 SHA512 f0ab313d62eec7facacdef399a73c3ace318a4207dbd8fe75323ab51664b31f0e77e0fc7adce637d24252165edb0ea886d3bebb8f288f7850c92caa572356938
 EBUILD freeradius-3.0.21-r1.ebuild 7478 BLAKE2B fc6116ecb6644e0e47ab86fa372db61d331e6d5ef27ba5f01d8f64e3bb220ff7bd755ac3b15ae7a4b75767ba384f170ffc623354489acabfe07a6fc4a14b61f5 SHA512 2ada19e2d51b44f6d784a78d1a6414695b6b63d4a99139c90e0b7e2a584000932f0c8b3094d42f7e597c8f78239d1b8d1ea511cbb089597e9e3ee1a94d72efe8
-MISC metadata.xml 864 BLAKE2B 5df7dfc698cebaaf850dfffedd8bfc9b7f30a947fdc7072b86b6e557bcf0f2548564260fb2ae073ea5adb5d1a37a5363e122691f748588561e26f5e452176934 SHA512 e36f1c6447cc565efb1523b931f670e944a5cd5eac9176bf42be13db907c7afea6d8ab860f77e739beec25f1b74012fe53987da5c48e6a7b928e335614e679cc
+MISC metadata.xml 894 BLAKE2B 462f2bc696550e919723d5a6435c11a8b217b183aef0f623737bbf446f43153da33840478bc10c45277d253d82e4186a4a85661565edcc37d03b924f60220fc9 SHA512 0cadbf858cab18860ad4934c0d1163bc149f3616395420568357c1cd959b635d5c5835216fde2cd799718010e16e13fc3acc746108a49b9c5d19cc5b64581347
diff --git a/net-dialup/freeradius/metadata.xml b/net-dialup/freeradius/metadata.xml
index 6d8b1cc66234..cdf1b4d83a2d 100644
--- a/net-dialup/freeradius/metadata.xml
+++ b/net-dialup/freeradius/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>geaaru@gmail.com</email>
     <name>Daniele Rondina</name>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/net-dialup/metadata.xml b/net-dialup/metadata.xml
index 313bfd552fa4..93a6517c03e4 100644
--- a/net-dialup/metadata.xml
+++ b/net-dialup/metadata.xml
@@ -32,4 +32,3 @@
 		telefonicznymi (dialup).
 	</longdescription>
 </catmetadata>
-
diff --git a/net-dialup/openl2tp/Manifest b/net-dialup/openl2tp/Manifest
index 98f020a25678..96279dfe1f3a 100644
--- a/net-dialup/openl2tp/Manifest
+++ b/net-dialup/openl2tp/Manifest
@@ -22,4 +22,4 @@ AUX openl2tpd.confd 717 BLAKE2B 7c92d47880c57c39deee6eebe458f0a1367fff616af33771
 AUX openl2tpd.initd 1788 BLAKE2B cccc7e9f907ccf5abe5dc84d0e3228b8e5a542e6f864325cf5eb7fd2d84e50e0d5cf86ec276a59bef7bf576d52b4b9c00bb34c1ec706dd6ee719030f64ba55e0 SHA512 8f84e847eb9b3f7d6c07bef1d6e8a051a0ded8ec6c4d21be26c55eacdb3d12fce60dce7b4c94d4e9358c4d724c868bf84c2a6262772f8fdfb3e54931cee0ce10
 DIST openl2tp-1.8.tar.gz 491160 BLAKE2B 70c78cd4d7daba600f9a9115025acb38b82adc0a04bbf6e9d46daebf2c7c37cc8fe9df6fa7157a05525e998063f5200a85893bb5b33dbe3e66ca7b6a4d2c7972 SHA512 360f9032b2bb104cfaa41a18fc37005510ab604b31a34a3412563e0de3e8dad946ca61840cd41a19f0202d92d758d812f45479659c9fa4d4e9e13dd226f03fda
 EBUILD openl2tp-1.8-r2.ebuild 3486 BLAKE2B becd16fc76b639d6fb62b3103951c1bd21d366e03f8074a552ed00c820d5843f9a5750265c773cce018b80a68f7601ca9d5a129f3ddccd76a5c2a78e74d06c0c SHA512 9bc441671c71a407b55551680018f48b7b8d4b5aeb5e94b1657df591ebc2a84d31e653638ceccc17b4f40b3577fe4610b2c61664504e0ed41998f6f7ffde7eaf
-MISC metadata.xml 669 BLAKE2B 98bd7762042c36ccfc4219807014ec3c6a9c65827820d174ae87eeb16a5ae64212a68fea18ebd46c2ff7ea3b4996aa63b383ab14dbd4009e491b76437b234e67 SHA512 1d4880fea1badcdbbdf6e7259e968907c4d74ece0c309e8bbd556763e377b6bda56d1d2e1de67177c9867de1fcb36e294723d02b2c6ee22c7cdcb99973b6b8e4
+MISC metadata.xml 669 BLAKE2B 8029c024d08ffe24a703fb6ad442de62159d7d817408cef5773dc6fe620a5fe07b4143f3c4229f614e7e31e6a39fa717de2596b3e9511fe4a6c165c2c9107f21 SHA512 6e831edd0e82b02a126c774f522a58d779a366cf9760808986b662c9b3aaea42be09cd0ba91e61a0d229f3cffaf6ec2a1273b964e99b48304ac31cc08157ef8d
diff --git a/net-dialup/openl2tp/metadata.xml b/net-dialup/openl2tp/metadata.xml
index 5f1b920a55a8..9e294f8afdd3 100644
--- a/net-dialup/openl2tp/metadata.xml
+++ b/net-dialup/openl2tp/metadata.xml
@@ -6,12 +6,12 @@
 	<name>Andrew Savchenko</name>
 </maintainer>
 <use>
-	<flag name='client'>Enable l2tp client.</flag>
-	<flag name='dmalloc'>Enable debugging using <pkg>dev-libs/dmalloc</pkg>.</flag>
-	<flag name='rpc'>Enable RPC control management. This flag is required for
+	<flag name="client">Enable l2tp client.</flag>
+	<flag name="dmalloc">Enable debugging using <pkg>dev-libs/dmalloc</pkg>.</flag>
+	<flag name="rpc">Enable RPC control management. This flag is required for
 		l2tpconfig to be built and used.</flag>
-	<flag name='server'>Enable l2tp server.</flag>
-	<flag name='stats'>Enable status files. Note: when they are used, this
+	<flag name="server">Enable l2tp server.</flag>
+	<flag name="stats">Enable status files. Note: when they are used, this
 		hampers performance of the daemon.</flag>
 </use>
 </pkgmetadata>
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index 55ff61620f2a..1501d1b23972 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -1,15 +1,8 @@
-AUX xl2tpd-dnsretry.patch 1509 BLAKE2B 54e0a77a765670b47742eb525a99a239de06d1ae2d4c638dbc57224c4fe5a729312ba14fc0f6f4eeb070303ca4771758b94b178c0c2790f79bea668d074fcfc0 SHA512 7999c8e990f7bcd620042295e5fc6e12cf4b1e4faf7cd560bdd4ade4103b171e76a06cb11caea0046b8141a4fa9592bd8851f933072c5e7f71d8b1f4b6fb2bbd
 AUX xl2tpd-init-r1 272 BLAKE2B 0a0f350d5ce3ce297b120750bed742eece7ee6f6b5c5ea24c09b2015a3b5dd2621eff76aa05cee56e5ed795df3204b2d81f8394de492ea655011a8efed3b8982 SHA512 80235d4084963f9285fc11f30ca648ebe4a23e3f74e41fddb81d6fdc08808b1772163192f61f56c677c3003f10809f7d014ddeaa427eabfad490106ac7e14f67
 AUX xl2tpd.conf 18 BLAKE2B 1486c7555965c14429cbbc7ab5dcebac02aa0639204d3eb203b58f6f46a042de4daa9a278d4e6f32ba6dca563c2de9757cf0e5af59563c5e0250b048a4f1f30f SHA512 0b3c6d4784b997d12734fe1e5165dc066269db24608638566c0fc317c1927331ed806fdb7a4f816bd16d1f22046b52badd99c2f0977c157b2b3f3ed42071ae42
 AUX xl2tpd.service 232 BLAKE2B 16578777774cd7d378efb37f917e368d39f84267c45184d9b72a9d501f75e59cf2f14e1326c347cc4d62c541696a2cf4e5af51f13c0c909c26f908a374944e39 SHA512 184b4f63492c5a09fa61ebf0913a4a47e1cd3b321b80b122f2177ff8f5c9eccdc4a73831dfffc3c2e39325f5cb0b30c4e3f99c1f0fed1f21935be5da38a83579
-DIST xl2tpd-1.3.10.tar.gz 510777 BLAKE2B 15ec09a6186d20facd4eceeca87a33a4676644a6976c2b69a61b288a2534c354bcc9b64eca4305aa7774d3b5fc29c97078478bebec7e81f8071865b29a97809e SHA512 304b8cd098608a866d32c65c55ba98a01e10abb473d8bff488c723fd1f6d4a66cf98c6d3044f7986a334739693767608c48999f873e95a51f0fa6c23cb61ecd4
-DIST xl2tpd-1.3.11.tar.gz 510652 BLAKE2B c120ba0a2bb96a87334743319808e4a1dfb1b95140fc37df51c33e176bdefdac547ad27d38731bab9d94a939b9a3ca93404ef17c8076e16567a3ecc5b568fb47 SHA512 9fd478aa6b7e22867aa977aa0c22ba9d856e3b659aa0ffdcdb17aa0d8358cceab37da565eeb799590d65fc2914720715423e006f6bbe7ca742f09d7cced52cb7
-DIST xl2tpd-1.3.12.tar.gz 513173 BLAKE2B a1f2e4d0e1af4402679eeec6589ca17b0422c664d37beae628511f988f6508ca22160d4657f8ff84bc5e5aac4d3e837c501b4d307964530044a792f2ecc599ab SHA512 e18f15ba038cd358fbad9dd7284c5f3c34273d9291bf8c66494c46d78150acfc1666cbf935fb5a66bd1f0220014f0b49fa0f7f55cb42de125e4123112c6eb00b
-DIST xl2tpd-1.3.13.tar.gz 513958 BLAKE2B 66c2bcbb54191445f1a519d507b2ec67b48d9e994db09b8c6fc9980b03bf5aab09a2f6187170f0e8639bd8a323b8417bf6e5d0a80fd9e45f8adc310902b256ae SHA512 02e3502a75f41745c001fe1a34dd9900c3a77eea274e08f9361f7145ac24e9a663975efe85ef6aef7c6da1aa9f3369eeb5542ac26e90b9d59753158a17b69ee4
 DIST xl2tpd-1.3.15.tar.gz 524960 BLAKE2B 5349b4bce7e4b8ea26ec3c739847456b6c8fdac667c8ad9d5241d3c83bc450a47c88c99c37cea2b0461fd4abb3e32da67de7c8ab95d288c8c423bea9af4abf1d SHA512 f65c7f2f1c03728d825b8857baa0c2297e9d5dbd97a2375484a32851326db5951deb9bf3598cbec860f0787d1bb577b4f0a47372e3244fd92c8bad7ce684889b
-EBUILD xl2tpd-1.3.10.ebuild 1421 BLAKE2B e01f0741bd4033d9d458a5cc88cc3ea9558649315c843a9624c25deaabb285f4cfae2f65fe5349db107629f496c767c820dc9fa3780e660cdca605554f52c6d7 SHA512 ef78b9b7389be4c19084be285bf66258fa3a545a9f22ce112b8b8205dba59033f3f78d533fb034d9dbb81392922ea9194c430d696f3989377b0396b46cf52fe8
-EBUILD xl2tpd-1.3.11.ebuild 1425 BLAKE2B 4d8761c143e9957591121c6b0d1f4ea4957e8fb250071f50544219919799cba8438f27696807cff8930a00797635ced0bd9c26a1a0f78adbd37e974569ab8d91 SHA512 c498dbb8ae9edead2149bc7a80e1aa355d7499e07b02abbc85bd2a61f3257c34ee9b906c6d57810642d5b5499138d4be45cb682d180f46b470aa98c259e06a44
-EBUILD xl2tpd-1.3.12.ebuild 1001 BLAKE2B b3e107a62fd46852ca2a78c421d707953be37c961e0df13dd7847a862c9c1ea897d3e87970a65404e625c4387cd0875a006a03489d592794b68ad40d188465c9 SHA512 4b3076c293249a76259713a1ed2be673f21ffa5d4ed0900638d68973b177eb906c93ecb439c2aca368d79b83b2c814ad4462eb04578371978f73a65f3db5eaed
-EBUILD xl2tpd-1.3.13.ebuild 1082 BLAKE2B 2052ff441fbc288b7e95c3e6492aabe74d7e9f1bbf01783e135a8962a86f207599a9bde2f46bd91733ce607148a23cc584a5e50639521bc3ca0ae7899ba1aef1 SHA512 360440ac755e0425618b8b509933eddafd745ae3e101138117e3bb9bfd550db293f7f18020f8ca24e1c717cb279c7037b95460c7de641fb3f536bd399200b203
+DIST xl2tpd-1.3.16.tar.gz 531861 BLAKE2B 2f809c8623c1a77ee538014d4ff3389e32e142f8cd6acad1657198323835574dd3d062e5ed6ee81ded5c4a1a65d8e200759ed6013884bb655ca6f5eef5333931 SHA512 d92bd9070c0e78ba1f4f7ee38be9e87d1f869fe240433f2fd7d1c974f1bce1573ab7aeb5922f316e53bd0fd4580b6152d585b1e0e0cd6fb01ef8fa85d9509b16
 EBUILD xl2tpd-1.3.15.ebuild 1074 BLAKE2B 1f6fad5624a8c3376a9d40dfcdd89510473dfef6634b27233cd6cee363be7a366aadfdccc12d7e74db4efaf290577feba9eb4235e1623d151b223047a563917c SHA512 0b13197b0842a9dbd1c126e7b14cb08f1c249a2d0b89d2c65ab0e84bbcdc76c0da3b4e4fe51309ccf52812b9b68ff5704b33879c24acc5d879d9540b51b8ea30
-MISC metadata.xml 748 BLAKE2B 54984b3f195d776bab05dea5407a0efbc1e98075ef43260013359f78268cfbc3500ffc1ad816d0790c0bef77a44ad2326c28f43ce52254cdd301ee6e0709e1dc SHA512 a7a28c1454d6cafff7d70abed1b57fbddf3929f85e947f7f87654aecdfaf7bad89daf11f40002b9115dd284449b30d172d5762bca0c8c053dd538139c7e8431f
+EBUILD xl2tpd-1.3.16.ebuild 1078 BLAKE2B 2fde8bf80db10114656e361546c0b92588002ac207b7be819bdda2ec28171a1efcabb499789f41bc1b00d9a6962e20d10d3aedfc39048959a7c936597463b17a SHA512 147419d02f47afc597a128e86890a30102ec601af107d6864cb5b78e37a54e0b5dd4427fbc3926a4b7fa9129fab7385b88d7cd72b94a1383bbe59741fb87be26
+MISC metadata.xml 658 BLAKE2B 0234424bd64d54ff71bce404044a874c90c32f7af4857941f9fb1014619da53e97ae925f9f91f4b0d53576a2af2d84d624c4462b104882a6ca3b716a1915e9ff SHA512 38c8247a784afe819a63194373dd04600ac73d38d5a53e6a40ae1cabfb3070f0b8c72669f9aaef2702cbe98b6ecb47aa88a5f63772302e55a2177f17e191e296
diff --git a/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch b/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch
deleted file mode 100644
index b27703fe435e..000000000000
--- a/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=307489
-http://homenet.beeline.ru/index.php?showtopic=192551&st=0&p=1063626345&#entry1063626345
-
---- xl2tpd.c	2010-05-10 22:35:43.000000000 +0200
-+++ xl2tpd.c	2010-08-15 22:02:14.000000000 +0200
-@@ -587,9 +587,33 @@
-     hp = gethostbyname (host);
-     if (!hp)
-     {
--        l2tp_log (LOG_WARNING, "Host name lookup failed for %s.\n",
--             host);
--        return NULL;
-+        if ( lac->redial ) 
-+        {
-+            int imax=lac->rmax;
-+            if ( lac->rmax == 0 )
-+                imax = 1;
-+            while ( imax > 0 ) 
-+            {
-+                hp = gethostbyname ( host );
-+                if ( hp )
-+                    break;
-+                l2tp_log ( LOG_WARNING, "Y: Host name lookup failed for %s. Trying to look again in %d seconds.\n", host, lac->rtimeout );
-+                if ( lac->rtimeout > 0 )
-+                    sleep ( lac->rtimeout );
-+                if ( lac->rmax > 0 )
-+                    imax--;
-+            }
-+            if ( ( imax == 0 ) && ( lac->rmax > 0 ) ) 
-+            {
-+                l2tp_log ( LOG_WARNING, "Y: Host name lookup failed for %s after %d tries. Lookup stops now.\n", host, lac->rmax );
-+                return NULL;
-+            }
-+        }
-+        else 
-+        {
-+            l2tp_log (LOG_WARNING, "Host name lookup failed for %s.\n", host);
-+            return NULL;
-+        }
-     }
-     bcopy (hp->h_addr, &addr, hp->h_length);
-     /* Force creation of a new tunnel
diff --git a/net-dialup/xl2tpd/metadata.xml b/net-dialup/xl2tpd/metadata.xml
index 42549f5d851d..bab6c0296178 100644
--- a/net-dialup/xl2tpd/metadata.xml
+++ b/net-dialup/xl2tpd/metadata.xml
@@ -4,7 +4,6 @@
 	<!-- maintainer-needed -->
 	<longdescription>xl2tpd is a fork of l2tpd Layer 2 Tunneling Protocol (L2TP) daemon that can be used to transfer frames of OSI layer 2 protocols through an IP tunnel. While it provides authentication via CHAP or PAP it does not provide encryption itself and should therefore be externally secured (via IPSEC).</longdescription>
 	<use>
-		<flag name="dnsretry">Patch for host lookup retries, activated by redial feature</flag>
 		<flag name="kernel">Enable kernel interface for PPPoL2TP</flag>
 	</use>
 	<upstream>
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.10.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.10.ebuild
deleted file mode 100644
index 4f97f86be8e9..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.3.10.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="http://www.xelerance.com/services/software/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="dnsretry"
-
-DEPEND="
-	net-libs/libpcap
-	>sys-kernel/linux-headers-2.6"
-
-RDEPEND="
-	${DEPEND}
-	net-dialup/ppp"
-
-DOCS=(CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents)
-
-src_prepare() {
-	default
-	# The below patch is questionable. Why wasn't it submitted upstream? If it
-	# ever breaks, it will just be removed. -darkside 20120914
-	# Patch has been discussed with upstream and is marked as feature by now:
-	# https://github.com/xelerance/xl2tpd/issues/134 // -- tenX 2017-08-06
-	use dnsretry && eapply -p0 "${FILESDIR}/${PN}-dnsretry.patch"
-}
-
-src_compile() {
-	tc-export CC
-	emake OSFLAGS="-DLINUX"
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-
-	insinto /etc/xl2tpd
-	newins doc/l2tpd.conf.sample xl2tpd.conf
-	newins doc/l2tp-secrets.sample l2tp-secrets
-	fperms 0600 /etc/xl2tpd/l2tp-secrets
-
-	newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
-
-	systemd_dounit "${FILESDIR}"/xl2tpd.service
-	dotmpfiles "${FILESDIR}"/xl2tpd.conf
-
-	einstalldocs
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.11.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.11.ebuild
deleted file mode 100644
index ff66464ce648..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.3.11.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="http://www.xelerance.com/services/software/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="dnsretry"
-
-DEPEND="
-	net-libs/libpcap
-	>sys-kernel/linux-headers-2.6"
-
-RDEPEND="
-	${DEPEND}
-	net-dialup/ppp"
-
-DOCS=(CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents)
-
-src_prepare() {
-	default
-	# The below patch is questionable. Why wasn't it submitted upstream? If it
-	# ever breaks, it will just be removed. -darkside 20120914
-	# Patch has been discussed with upstream and is marked as feature by now:
-	# https://github.com/xelerance/xl2tpd/issues/134 // -- tenX 2017-08-06
-	use dnsretry && eapply -p0 "${FILESDIR}/${PN}-dnsretry.patch"
-}
-
-src_compile() {
-	tc-export CC
-	emake OSFLAGS="-DLINUX"
-}
-
-src_install() {
-	emake PREFIX=/usr DESTDIR="${D}" install
-
-	insinto /etc/xl2tpd
-	newins doc/l2tpd.conf.sample xl2tpd.conf
-	newins doc/l2tp-secrets.sample l2tp-secrets
-	fperms 0600 /etc/xl2tpd/l2tp-secrets
-
-	newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
-
-	systemd_dounit "${FILESDIR}"/xl2tpd.service
-	dotmpfiles "${FILESDIR}"/xl2tpd.conf
-
-	einstalldocs
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.12.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.12.ebuild
deleted file mode 100644
index 3e7e2ce70f46..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.3.12.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-DEPEND="
-	net-libs/libpcap
-	>=sys-kernel/linux-headers-2.6"
-
-RDEPEND="
-	${DEPEND}
-	net-dialup/ppp"
-
-DOCS=(CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents)
-
-src_compile() {
-	tc-export CC
-	emake OSFLAGS="-DLINUX"
-}
-
-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
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild
index a383fd15cbf8..e20c5ce6dfa5 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit systemd toolchain-funcs tmpfiles
 
@@ -22,7 +22,7 @@ RDEPEND="
 	${DEPEND}
 	net-dialup/ppp"
 
-DOCS=(CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents)
+DOCS=(CREDITS README.md BUGS CHANGES TODO doc/README.patents)
 
 src_compile() {
 	tc-export CC