gentoo resync : 04.07.2020

7 files changed, 23 insertions, 551 deletions

diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest
index 18b2ab0545ed..c6f0a2a84320 100644
--- a/net-dns/maradns/Manifest
+++ b/net-dns/maradns/Manifest
@@ -1,14 +1,9 @@
 AUX deadwood 475 BLAKE2B 1f5f669b22011bf38e077d21278ebfbff72ba45782b863044d868f3a46256192fa1041db8ee6fe5ff5ac15285caacceb8222d2fb1dce1c617c41baea1da7fe15 SHA512 ea01c5cd9494a9dd5c8146f0de84c6bd4df3ba2221b52b87886892cbc13aad21f273ea1d056c3dd88ae5e15c1f6f820f9fe4b1dd4c9ae7082d7f7f78b3f8813e
-AUX maradns-2.0.06-askmara-tcp.patch 7330 BLAKE2B 57afd93fb8f75ccb91a186641c288e9d6a233b9e5887712ef172dedaf0398a984541c7f0a5656e0498036196bd0963a4c1e17cda1614a165e341031c4d1468c1 SHA512 0a36bbe9fbf8d48e6e1e20cc6045656f3517f650bc055b1abecdac4e2eb2e0f4c0f41ed960913ec38590f76a16762a518ca3f20799b8ee64223530da5b2d0dee
-AUX maradns-2.0.06-duende-man.patch 3393 BLAKE2B 9afb3358d6e660fbde7c03b93c6d5fe2373ec6a216c4b93775e5c9f76f3ce3df55ed1cf84916a0d7c95d65e8209c03e0b73fc3fba171dfb1ad2e00c70eea417c SHA512 ff4996e9b377fe01d90f36bf306085e981e1b00bb6264e69e04f9bc53271d98201ec84ea773630453840b357fdf2d3aa46c48fb3af3812cb97627a66fa77bc58
-AUX maradns-2.0.09-build.patch 1549 BLAKE2B 4b74391d9ddc294a8060bc24f769ace28faa08676d69883bc5e4e7aff5b8e463a78e0b24afc7377b7528a8974065a4fdf88699d21c1c18fcc2bb980a85545d36 SHA512 6d06102cb8d6c5333521f9ffc75d775382c9113372fa1b80516677ef11513718d41a740a79d9f970420dc0fcede3c7bc2c9a41a08fb8c138e4063fbcbfb5c5f3
 AUX maradns.service.in 159 BLAKE2B 2ecd43d92a6c804fd713c0e1e22a18049ab410ccb0b92ec9ffe7621605e1dfea65c880369d0530e59cf061f6fb402cd83175f38be27b43d82b65a7175434e648 SHA512 0de3b9141b8266cb6443b8a7fcb6243782059d2ea45b89421158ded607413eb491542c279f2a9b4455e9396e6ba20e46aed8f46eba3b04e5bd428f335c4b9582
 AUX maradns2 481 BLAKE2B 486711875cc3ad29066cbe52d16fb29c6ba35473ec0ffe63fb8039e208e90009900faf8f93c9c43ae80fe0b618202b2aff5cd2302af253a4d38d7d6486c8bc05 SHA512 e893020a934c5927b772189c034469055cd0d8a8ab3e066fe063e30999be6a6679e7b95c2761dec1326cec37fe5261541fbb27e9be796681764c75252b10e90b
 AUX zoneserver2 483 BLAKE2B fcae510c7d5719df0b018976052fb0b6ccb3af1324b607ccfb93a3e5d822d1ee5460424f2b05e1f2b3f09f7d445242f58f55abbc5ba88adeb25861c3eae29e90 SHA512 dc5dd43b043417002fce4c3d6c2e5417bc68fae7a0ac4db03f7cb382d348ed6b2c7042c38ffc2db3a4c36abf734e9d34124042a4077090bd7947241aab955ab7
-DIST maradns-2.0.09.tar.bz2 1139409 BLAKE2B 8c3709241b85f9069eb4e18098f7753b19bcc87d32bbb36aef42cb8ec123dc73b8e29e79b5efe1083035b2378a484e2c00038700647d5e75f469589b37b351e2 SHA512 42bfcafaf4e465d8d566b4d9ea8383b5d0f553486b86dd807b35a07358987227e5dc8187de0e8192fba5b53098d61f91091cec112ef7cc80c5d5e73d8acff3bf
-DIST maradns-2.0.14.tar.bz2 1156272 BLAKE2B 7e96d0769dd1df70316cc1bd79fb7e902c723f78db035fe721aaab0d6902958a40c2743374824ae024759164ad9cbda9a3c6ecaec7cc6bf3c5fa7b384101c16f SHA512 57527bba2f9801904f59cc7d9e56cbd7124635841ad8c91cbd3d1b8d58e7fe38d509e19f6ea53e2790777e054b68bb8df02bfa820ba7c9dbe65262e1993a2aa4
 DIST maradns-2.0.16.tar.bz2 1127504 BLAKE2B 142166370efed2d52c0a1e659bf0056f8d13cc5eca3c1d30c0278b81047aa58ce6c6f3f8496e982841b9dcd541ffd2c24467b8062aa5a7ffb1f31ef6cf841a15 SHA512 9959a7b6724aff5561fa9303b3d7c967e298fd63d95ef7e34d80514dde8871c19887c184a6466779f2833c295233dd1d54a7c06928ac58dcbb374281deb13f17
-EBUILD maradns-2.0.09-r2.ebuild 2691 BLAKE2B 4cfc46b00741e7263f2e941fbc2028bd1587d0919061dfe07cecacfbdaa6326da404dfbeba99541c9197e089c5709146d9848b4f85f16b069a56b5c8cec6fdc9 SHA512 481512b5a855aa8751ae8d3699c2b3218cf05e5ec2808df30502ed2e20756e1d50ce8714e8acd09eba09f6b3faa8442345bc9187ca5eae53a0bd178421a92f12
-EBUILD maradns-2.0.14.ebuild 2848 BLAKE2B 62f4a9e99a249fe5084ee5d4b57513d151fd4fbb3a39d382c2d4c40d72c143d9051c8b6bbbfcf8cfa06c4f5929c171429e9eb1b42f038b8d4798becbcab353bd SHA512 bac2001e02da3ab7cd7be5009953d2cdeb73062c2ded1e58b35998001ae6d77b0c51a3166202f291733c635b751fd82cadeed6d3171bdfb1bce5032fd59cfc7b
+DIST maradns-3.5.0005.tar.xz 5351412 BLAKE2B c6b1c4fb93cb507045b3c09574d7ce30b0af92301e157216b4a5bbd2ed74ceb829ef4d11cd08048c7a685a09cdd4178cf3fc4e7b2465820d26d3a5c1b96f4a5e SHA512 2e7008ff6217929008292dde60d96eb2ec0499a170e1b5bda5fcfb27300d2ce6cecd8b3e2a2d4b09ff32b803f9f435230378e6b2e41e7b63c42653d8c931151d
 EBUILD maradns-2.0.16.ebuild 2814 BLAKE2B 5c7baba17ac15bcfe55c3e1600f4139e62564443647b53def559468c6c4a75c1dfad0212ccf7ac0ff73d4f8b7c241351629766d5b10f12c29a2c7a118e073ed6 SHA512 155e04103597ec88ad5f4e47ceb2829cc6d64e5971f7fd9f2a5198f0def046612fdfa29f14b7b45a173909585e84c0d3a6fd2f3854faf489de7f5261fa7eba49
-MISC metadata.xml 597 BLAKE2B c20996c53cdf360a0f72998c674ceb22d97fe0f07c08c0712fadd36572ac157c93fa42a7011d45f22a19e7a7f98dc2abf8159973e155b0d78bb0e5277adc26b6 SHA512 b8f775d1f780e3ecb23dc900d0c464a25a5166196b27f103151bc5100a321188b0186e2b3149d543aa139d58bd5c0ce11d80ca1be0cace16b8d392bbd2a1b762
+EBUILD maradns-3.5.0005.ebuild 2360 BLAKE2B 00865af6b60997b605ec87ea4ca19de88007faf30de57eb5dc4a42c301ab89b770b61f54aa42bc7e7112ab761bf2c2ce3e70ef7ec2f27c8f8c0a524c68fb7109 SHA512 dfb591d714004888e7719359364c56e16bc19a759af66ca6edd0f5f68f25000365acc9de115f332481a830b90e7a636521421fd556451da7aea0a77cac10c111
+MISC metadata.xml 728 BLAKE2B 07077c81b008d0ab019995c21873fcf61ff636a346eb582d966f81dabd4a9a7e3ad2a9879c6ca33708828b54b3ae2dcafb8c89716dd571c95a456add01e43863 SHA512 0b0c7db834ae6a1a94069873c72cfe2e87840d89d556ffc7a2887c426321ced9b474dc32292010f4dd8918389906cda16b2f3ae1251c7a9ab6be055763ae8330
diff --git a/net-dns/maradns/files/maradns-2.0.06-askmara-tcp.patch b/net-dns/maradns/files/maradns-2.0.06-askmara-tcp.patch
deleted file mode 100644
index 107097159c83..000000000000
--- a/net-dns/maradns/files/maradns-2.0.06-askmara-tcp.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-Author: Nicholas Bamber <nicholas@periapt.co.uk>
-Subject: askmara-tcp lazily copies askmara usage and man page
-Last-Updated: 2011-09-21
-Forwarded: no
---- a/tools/askmara_labels_en.h
-+++ b/tools/askmara_labels_en.h
-@@ -1,11 +1,12 @@
- /* Placed in the public domain 2001 by Sam Trenholme */
- 
--/* All of the labels for replies used in askmara */
-+/* All of the labels for replies used in askmara(-tcp) */
- 
- #define L_NEWLINE "\n"
- #define L_HARD_ERROR "Hard Error: "
- #define L_QUERYING "Querying the server with the IP "
- #define L_USAGE "Usage: askmara [-n] [-v | -t timeout] Query [server]\n#Example: askmara Ayahoo.com."
-+#define L_USAGE_TCP "Usage: askmara-tcp [-n] [-v | -t timeout] Query [server]\n#Example: askmara-tcp Ayahoo.com."
- #define L_JS_CREATE_INDATA "js_create with indata"
- #define L_JS_CREATE_UINDATA "js_create with uindata"
- #define L_JS_CREATE_OUTDATA "js_create with outdata"
---- a/tools/askmara-tcp.c
-+++ b/tools/askmara-tcp.c
-@@ -190,7 +190,7 @@
-             nrd = 1;
-         else if(argv[0][0] == '-' && argv[0][1] == 'p') {
-             if(argc < 2) {
--                harderror(L_USAGE);
-+                harderror(L_USAGE_TCP);
-                 }
-             argc--;
-             argv++;
-@@ -201,7 +201,7 @@
-             }
-         else if(argv[0][0] == '-' && argv[0][1] == 't') {
-             if(argc < 2) {
--                harderror(L_USAGE);
-+                harderror(L_USAGE_TCP);
-                 }
-             argc--;
-             argv++;
-@@ -213,14 +213,14 @@
-         else if (argv[0][0] != '-')
-             break;
-         else
--            harderror(L_USAGE);
-+            harderror(L_USAGE_TCP);
-         argc--;
-         argv++;
-         }
- 
-     /* we expect now the query string and possibly the server */
-     if(argc<1)
--        harderror(L_USAGE);
-+        harderror(L_USAGE_TCP);
- 
-     /* Determine what IP address to connect to */
-     if(argc>1)
---- /dev/null
-+++ b/doc/en/man/askmara-tcp.1
-@@ -0,0 +1,191 @@
-+.\" Do *not* edit this file; it was automatically generated by ej2man
-+.\" Look for a name.ej file with the same name as this filename
-+.\"
-+.\" Process this file with the following
-+.\" nroff -man -Tutf8 maradns.8 | tr '\020' ' '
-+.\"
-+.\" Last updated Mon Sep 27 15:36:06 2010
-+.\"
-+.TH ASKMARA-TCP 1 "askmara-tcp" "January 2002" "askmara-tcp"
-+.\" We don't want hyphenation (it's too ugly)
-+.\" We also disable justification when using nroff
-+.\" Due to the way the -mandoc macro works, this needs to be placed
-+.\" after the .TH heading
-+.hy 0
-+.if n .na
-+.\"
-+.\" We need the following stuff so that we can have single quotes
-+.\" In both groff and other UNIX *roff processors
-+.if \n(.g .mso www.tmac
-+.ds aq \(aq
-+.if !\n(.g .if '\(aq'' .ds aq \'
-+
-+.SH "NAME"
-+.PP
-+askmara-tcp \- do simple dns queries over TCP
-+.SH "DESCRIPTION"
-+.PP
-+.B "askmara-tcp"
-+queries the user-specified dns server for records, and
-+outputs the reply in a csv2-compatible format (csv2 is the format of
-+zone
-+files that
-+.B "maradns"
-+uses). However unlike
-+.B "askmara"
-+it uses TCP rather than UDP.
-+.SH "USAGE"
-+.PP
-+.B "askmara-tcp"
-+.RB [ -n ]
-+.RB [ -v | -t
-+.IR timeout ]
-+.I query
-+.RI [ server ]
-+.SH "OPTIONS"
-+.PP
-+.TP 4
-+.BI -t
-+If this is present, the following argument is the askmara-tcp
-+.IR timeout ,
-+in seconds. Note that
-+.B "askmara-tcp"
-+can not both have a user-defined
-+timeout and verbose output.
-+.TP 4
-+.BI -v
-+If this is set,
-+.B "askmara-tcp"
-+will verbosely output the complete reply that the server sent. Note
-+that this verbose output is not csv2-compatible.
-+.TP 4
-+.BI -n
-+If this is set,
-+.BR "askmara-tcp" ","
-+when sending out a query, will not
-+request DNS recursion; in other words, askmara-tcp will request that the
-+remote DNS server not contact other DNS servers to answer the query in
-+question.
-+.TP 4
-+.I query
-+dns record to be queried. The query has two sections:
-+The type of record we desire, and the hostname we want this record for.
-+.PP
-+The type of query can have two forms: A one-letter mnemonic, or a
-+numeric rtype followed by a colon. This is immediately concatenated by
-+the full name of the host name we wish to look up.
-+.PP
-+For example, to ask for the IP of \(aqexample.com.\(aq, we can use the
-+one-letter
-+mnemonic, in the form \(aqAexample.com.\(aq, or we can use the numeric
-+RR followed
-+by a colon, giving the query \(aq1:example.com.\(aq (since A has the
-+record type
-+of one). Note that the query name needs the trailing dot at the end.
-+.PP
-+Askmara supports a handful one-letter mnemonics, as follows:
-+.PP
-+.B "A"
-+signifies a request for an A (ipv4 address) RR
-+.PP
-+.B "N"
-+signifies a NS RR
-+.PP
-+.B "C"
-+signifies that we are asking for a CNAME RR
-+.PP
-+.B "S"
-+signifies that we want a SOA RR
-+.PP
-+.B "P"
-+signifies that we want a PTR RR
-+.PP
-+.B "@"
-+signifies that we mant a MX RR
-+.PP
-+.B "T"
-+signifies that we want a TXT RR
-+.PP
-+.B "Z"
-+signifies that we want to ask for all RRs.
-+.TP 4
-+.I server
-+IP address of the dns server to be queried. If no server is given,
-+askmara-tcp will query 127.0.0.1.
-+.PP
-+.SH "EXAMPLES"
-+.PP
-+Asking the server with the ip 127.0.0.1 for the IP address of
-+example.com:
-+
-+.nf
-+askmara-tcp Aexample.com.
-+.fi
-+
-+Asking the server with the ip 198.41.0.4 for the IP address of
-+example.com:
-+
-+.nf
-+askmara-tcp Aexample.com. 198.41.0.4
-+.fi
-+
-+Asking the server with the ip address 127.0.0.1 for the IP address of
-+example.com, using the rr_number:query format:
-+
-+.nf
-+askmara-tcp 1:example.com.
-+.fi
-+
-+Asking the server with the ip address 127.0.0.1 for a SRV record. In
-+particular, we ask for the "http over tcp" service for example.net.
-+Since askmara-tcp doesn\(aqt have a mnemonic for SRV record types, we
-+use the numeric code (33 for SRV):
-+
-+.nf
-+askmara-tcp 33:_http._tcp.example.net.
-+.fi
-+
-+Asking the server with the ip address 127.0.0.1 for the AAAA (ipv6 ip)
-+record for example.net:
-+
-+.nf
-+askmara-tcp 28:example.net.
-+.fi
-+
-+Note that the output will be a raw DNS packet in both the SRV
-+and AAAA examples.
-+.SH "BUGS"
-+.PP
-+When askmara-tcp is asked for an SOA record, the output of
-+.B "askmara-tcp"
-+closely resembles the format of a csv2 file, but can not be parsed as a
-+csv2 file without modification.
-+.PP
-+askmara-tcp outputs multi-chunk ("character-string") TXT
-+records incorrectly (it only outputs the first chunk).
-+.SH "SEE ALSO"
-+.PP
-+.B maradns(8),
-+.B askmara(1)
-+
-+.br
-+http://www.maradns.org
-+.SH "LEGAL DISCLAIMER"
-+.PP
-+THIS SOFTWARE IS PROVIDED BY THE AUTHORS \(aq\(aqAS IS\(aq\(aq AND ANY
-+EXPRESS
-+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
-+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+.SH "AUTHOR"
-+.PP
-+MaraDNS is written by Sam Trenholme. Jaakko Niemi used 5 minutes
-+to roll this manpage together, which Sam has subsequently revised.
-+
diff --git a/net-dns/maradns/files/maradns-2.0.06-duende-man.patch b/net-dns/maradns/files/maradns-2.0.06-duende-man.patch
deleted file mode 100644
index 8e9283bc0802..000000000000
--- a/net-dns/maradns/files/maradns-2.0.06-duende-man.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Author: Nicholas Bamber <nicholas@periapt.co.uk>
-Subject: Duende man page
- We have made various changes to the duende executable and these need to
- be reflected in the Debian man page.
-Forwarded: yes
-Last-Update: 2011-07-18
---- a/doc/en/man/duende.8
-+++ b/doc/en/man/duende.8
-@@ -29,11 +29,12 @@
- makes a given child process a daemon. The standard output
- and standard error
- of the child process is logged via syslog() with a priority of
--LOG_INFO.
-+LOG_ALERT.
- .SH "USAGE"
- .PP
- .B "duende"
--child_process [ all subsequent arguments passed on to child ]
-+.RB [ options ]
-+child_process [ arguments passed onto child ]
- .SH "DETAILS"
- .PP
- When
-@@ -76,48 +77,52 @@
- duende uses a setuid() call to change the user ID of the logging
- process
- to the user with ID 66.
-+.SH "OPTIONS"
-+.PP
-+Most of the above behaviour can be configured by command line arguments.
-+.TP 4
-+.BI -c | --chroot " directory"
-+The log helper process will change its directory and root to this location.
-+This defaults to
-+.B /etc/maradns/logger "."
-+.TP 4
-+.BI -i | --ident " string"
-+The log helper process will use this string to identify the process when
-+sending messages to syslog.
-+This defaults to
-+.B log-help "."
-+.TP 4
-+.BI -p | --pid " filename"
-+If this argument is present, the duende parent process will store its pid in
-+this file.
-+.TP 4
-+.BI -u | --uid " integer"
-+The log helper process will drop its user id to this. This value defaults to
-+66.
-+.TP 4
-+.BI -g | --gid " integer"
-+The log helper process will drop its group id to this. This value defaults to
-+66.
-+.TP 4
-+.BI -r | --restart_on " integer"
-+The log helper process will restart the child process if it exists with this
-+status code. This defaults to 8.
- .SH "LOGGING"
- .PP
- .B "duende"
- uses the syslog() facility to log the standard output of the
- program that it invokes. The name of the program (in other words, the
--"ident" given to openlog()) is the full path of the first argument
--given
--to
--.BR "duende" "."
-+"ident" given to openlog()) defaults to
-+.BR "log-helper"
-+but can be overridden with the
-+.RB "--ident"
-+argument.
- All messages created by the child process are sent
--to syslog() with a priority of LOG_INFO and a "facility"
--of LOG_DAEMON (daemon.info in /etc/syslog.conf); since daemon.info
--messages are not logged by default in FreeBSD, on FreeBSD systems
--messages generated by the child process are logged with a priority of
--LOG_ALERT and a "facility" of LOG_DAEMON (daemon.alert in
--/etc/syslog.conf).
-+to syslog() with a priority of LOG_ALERT and a "facility"
-+of LOG_DAEMON (daemon.info in /etc/syslog.conf).
- Should duende itself encounter an error, it will send
- messages to syslog() with a priority of LOG_ALERT.
- .PP
--For example, suppose one invokes duende thusly:
--
--.nf
--	duende /usr/local/sbin/maradns
--.fi
--
--If invoked thusly, duende will log all messages with the "ident"
--(program
--name) of "/usr/local/sbin/maradns". If this is not desired, invoke
--duende
--with something like:
--
--.nf
--	export PATH=$PATH:/usr/local/sbin
--	duende maradns
--.fi
--
--This will log messages with a (more sensible) "ident" of maradns.
--.PP
--Note: If a non-POSIX Bourne shell (such as csh, es, rc, or fish) is
--used to
--invoke MaraDNS, the above syntax needs to be changed.
--.PP
- Also, the directory /etc/maradns/logger, while used by duende, is not
- used
- to store any log messages. That is unless, for some reason, one
diff --git a/net-dns/maradns/files/maradns-2.0.09-build.patch b/net-dns/maradns/files/maradns-2.0.09-build.patch
deleted file mode 100644
index 33622b9bc876..000000000000
--- a/net-dns/maradns/files/maradns-2.0.09-build.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: maradns-2.0.09/build/Makefile.linux
-===================================================================
---- maradns-2.0.09.orig/build/Makefile.linux
-+++ maradns-2.0.09/build/Makefile.linux
-@@ -10,7 +10,7 @@ POBJECTS=parse/ParseMaraRc.o parse/Parse
- DOBJECTS=dns/Queries.o dns/Compress.o dns/bobbit.o
- # Secure random number generator objects
- ROBJECTS=rng/rng-api-fst.o rng/rng-alg-fst.o
--OBJECTS=$(JOBJS) $(MHOBJS) $(SOBJECTS) $(DOBJECTS) $(POBJECTS) $(DOBJECTS) $(ROBJECTS)
-+OBJECTS=$(JOBJS) $(MHOBJS) $(SOBJECTS) $(DOBJECTS) $(POBJECTS) $(DOBJECTS) $(ROBJECTS) -lrt
- EXECS=server/maradns
- 
- # Uncomment the following three lines to get this to compile on Solaris
-@@ -28,19 +28,21 @@ Q="DEFINES=-DSELECT_PROBLEM"
- 
- # Debug
- 
--FLAGS = -O2 -Wall -DSELECT_PROBLEM
-+FLAGS=$(CFLAGS) $(LDFLAGS) -Wall -DSELECT_PROBLEM
- M="CC=$(CC) $(FLAGS)"
- D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS"
- #FLAGS = -g
- 
- all: 
--	cd libs ; make $(M) ; cd ../dns ; make $(M) ; \
--	cd ../rng ; make $(M) ; cd ../parse ; make $(M) ; \
--	cd ../qual ; make $(M) ; cd ../server ; \
--	make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \
--	cd ../tools ; make $(M) ; \
--	cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \
--	cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST
-+	$(MAKE) -C libs $(M)
-+	$(MAKE) -C dns $(M)
-+	$(MAKE) -C rng $(M)
-+	$(MAKE) -C parse $(M)
-+	$(MAKE_ -C qual $(M)
-+	$(MAKE) -C server $(M) $(V) COMPILED=\"$(COMPILED)\"
-+	$(MAKE) -C tools $(M)
-+	$(MAKE) -C deadwood-*/src $(M)
-+	$(MAKE) -C tcp $(M) $(V)
- 
- debug: 
- 	cd libs ; make $(D) DEBUG="-DDEBUG -DTHREADS" ; \
diff --git a/net-dns/maradns/maradns-2.0.09-r2.ebuild b/net-dns/maradns/maradns-2.0.09-r2.ebuild
deleted file mode 100644
index 2124be1f395b..000000000000
--- a/net-dns/maradns/maradns-2.0.09-r2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs user
-
-DEADWOOD_VER="3.2.05"
-
-DESCRIPTION="A security-aware DNS server"
-HOMEPAGE="http://www.maradns.org/"
-SRC_URI="http://www.maradns.org/download/${PV%.*}/${PV}/${P}.tar.bz2"
-
-# The GPL-2 covers the init script, bug 426018.
-LICENSE="BSD-2 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86"
-IUSE="authonly examples ipv6"
-
-DEPEND=""
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.06-askmara-tcp.patch"
-	"${FILESDIR}/${PN}-2.0.06-duende-man.patch"
-	"${FILESDIR}/${P}-build.patch"
-)
-
-pkg_setup() {
-	ebegin "Creating group and users"
-	enewgroup maradns 99
-	enewuser duende 66 -1 -1 maradns
-	enewuser maradns 99 -1 -1 maradns
-	eend ${?}
-}
-
-src_configure() {
-	# Use duende-ng.c.
-	cp  "${S}/tools/duende-ng.c" "${S}/tools/duende.c" \
-		|| die "failed to rename duende-ng.c"
-
-	tc-export CC
-	./configure $(use ipv6 && echo "--ipv6") || die "Failed to configure ${PN}"
-}
-
-src_install() {
-	# Install the MaraDNS binaries.
-	dosbin server/maradns
-	dosbin tcp/zoneserver
-	dobin tcp/getzone tcp/fetchzone
-	dobin tools/askmara tools/askmara-tcp tools/duende
-	dobin tools/bind2csv2.py tools/csv1tocsv2.pl
-
-	# MaraDNS docs, manpages, misc.
-	dodoc doc/en/{QuickStart,README,*.txt}
-	dodoc doc/en/text/*.txt
-	doman doc/en/man/*.[1-9]
-	dodoc maradns.gpg.key
-	dodoc doc/en/*.html
-	dodoc -r doc/en/webpage
-	dodoc -r doc/en/tutorial
-	if use examples ; then
-		docinto examples
-		dodoc doc/en/examples/example_*
-	fi
-
-	# Deadwood binary, docs, manpages, etc.
-	if ! use authonly; then
-		dosbin deadwood-${DEADWOOD_VER}/src/Deadwood
-		doman deadwood-${DEADWOOD_VER}/doc/{Deadwood,Duende}.1
-		docinto deadwood
-		dodoc deadwood-${DEADWOOD_VER}/doc/{Deadwood,Duende,FAQ}.txt
-		dodoc deadwood-${DEADWOOD_VER}/doc/{Deadwood,FAQ}.html
-		docinto deadwood/internals
-		dodoc deadwood-${DEADWOOD_VER}/doc/internals/*
-		insinto /etc/maradns
-		newins deadwood-${DEADWOOD_VER}/doc/dwood3rc-all dwood3rc_all.dist
-	fi
-
-	# Example configurations.
-	insinto /etc/maradns
-	newins doc/en/examples/example_full_mararc mararc_full.dist
-	newins doc/en/examples/example_csv2 example_csv2.dist
-	keepdir /etc/maradns/logger
-
-	# Init scripts.
-	newinitd "${FILESDIR}"/maradns2 maradns
-	newinitd "${FILESDIR}"/zoneserver2 zoneserver
-	if ! use authonly; then
-		newinitd "${FILESDIR}"/deadwood deadwood
-	fi
-
-	# systemd unit
-	# please keep paths in sync!
-	sed -e "s^@bindir@^${EPREFIX}/usr/sbin^" \
-		-e "s^@sysconfdir@^${EPREFIX}/etc/maradns^" \
-		"${FILESDIR}"/maradns.service.in > "${T}"/maradns.service \
-		|| die "failed to create the maradns.service file (sed)"
-
-	systemd_dounit "${T}"/maradns.service
-}
diff --git a/net-dns/maradns/maradns-2.0.14.ebuild b/net-dns/maradns/maradns-3.5.0005.ebuild
index 8d0ca3ee8416..049cb0ac80e3 100644
--- a/net-dns/maradns/maradns-2.0.14.ebuild
+++ b/net-dns/maradns/maradns-3.5.0005.ebuild
@@ -1,45 +1,32 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit python-single-r1 systemd toolchain-funcs user
-
-DEADWOOD_VER="3.2.10"
+inherit systemd toolchain-funcs python-any-r1
 
 DESCRIPTION="A security-aware DNS server"
 HOMEPAGE="http://www.maradns.org/"
-SRC_URI="http://www.maradns.org/download/${PV%.*}/${PV}/${P}.tar.bz2"
+SRC_URI="https://maradns.samiam.org/download/${PV%.*}/${PV}/${P}.tar.xz"
 
 # The GPL-2 covers the init script, bug 426018.
 LICENSE="BSD-2 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~ppc ~x86"
-IUSE="authonly examples ipv6"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="examples ipv6"
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
+	acct-user/maradns
+	acct-group/maradns
+	acct-user/duende
 	dev-lang/perl"
 
-pkg_setup() {
-	ebegin "Creating group and users"
-	enewgroup maradns 99
-	enewuser duende 66 -1 -1 maradns
-	enewuser maradns 99 -1 -1 maradns
-	eend ${?}
-
-	python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	default
 
-	# Use duende-ng.c.
-	cp  tools/duende{,-ng}.c \
-		|| die "failed to rename duende-ng.c"
 	# replace "make" by "$(MAKE)" to avoid GNU Make warning
 	sed -i 's/\ make\ /\ \$\(MAKE\)\ /g' build/Makefile.linux \
 		|| die "can't patch build/Makefile.linux"
@@ -56,9 +43,7 @@ src_install() {
 	# Install the MaraDNS and Deadwood binaries
 	dosbin server/maradns
 	dosbin tcp/zoneserver
-	if ! use authonly; then
-		dosbin deadwood-${DEADWOOD_VER}/src/Deadwood
-	fi
+	dosbin deadwood-${PV}/src/Deadwood
 	dobin tcp/{getzone,fetchzone}
 	dobin tools/{askmara,askmara-tcp,duende,bind2csv2.py,csv1tocsv2.pl}
 
@@ -66,11 +51,9 @@ src_install() {
 	dodoc doc/en/{QuickStart,README,*.txt,*.html}
 	dodoc -r doc/en/{text,webpage,tutorial}
 	dodoc maradns.gpg.key
-	if ! use authonly; then
-		docinto deadwood
-		dodoc deadwood-${DEADWOOD_VER}/doc/{*.txt,*.html,CHANGELOG,Deadwood-HOWTO}
-		dodoc -r deadwood-${DEADWOOD_VER}/doc/internals
-	fi
+	docinto deadwood
+	dodoc deadwood-${PV}/doc/{*.txt,*.html,CHANGELOG,Deadwood-HOWTO}
+	dodoc -r deadwood-${PV}/doc/internals
 
 	# Install examples (optional)
 	if use examples ; then
@@ -80,25 +63,19 @@ src_install() {
 
 	# Install manpages
 	doman doc/en/man/*.[1-9]
-	if ! use authonly; then
-		doman deadwood-${DEADWOOD_VER}/doc/{Deadwood,Duende}.1
-	fi
+	doman deadwood-${PV}/doc/{Deadwood,Duende}.1
 
 	# Example configurations.
 	insinto /etc/maradns
 	newins doc/en/examples/example_full_mararc mararc_full.dist
 	newins doc/en/examples/example_csv2 example_csv2.dist
-	if ! use authonly; then
-		newins deadwood-${DEADWOOD_VER}/doc/dwood3rc-all dwood3rc_all.dist
-	fi
+	newins deadwood-${PV}/doc/dwood3rc-all dwood3rc_all.dist
 	keepdir /etc/maradns/logger
 
 	# Init scripts.
 	newinitd "${FILESDIR}"/maradns2 maradns
 	newinitd "${FILESDIR}"/zoneserver2 zoneserver
-	if ! use authonly; then
-		newinitd "${FILESDIR}"/deadwood deadwood
-	fi
+	newinitd "${FILESDIR}"/deadwood deadwood
 
 	# systemd unit
 	# please keep paths in sync!
diff --git a/net-dns/maradns/metadata.xml b/net-dns/maradns/metadata.xml
index 08d29c2b89ac..1989b4903ef9 100644
--- a/net-dns/maradns/metadata.xml
+++ b/net-dns/maradns/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
+        <email>slashbeast@gentoo.org</email>
+        <name>Piotr Karbowski</name>
+    </maintainer>
+    <maintainer type="person">
         <email>ktrace@yandex.ru</email>
         <name>Victor Kustov</name>
     </maintainer>