gentoo resync : 23.09.2020

3 files changed, 1 insertions, 117 deletions

diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest
index ad1717394568..aca1b3ceb38a 100644
--- a/net-dns/maradns/Manifest
+++ b/net-dns/maradns/Manifest
@@ -2,8 +2,6 @@ AUX deadwood 475 BLAKE2B 1f5f669b22011bf38e077d21278ebfbff72ba45782b863044d868f3
 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.16.tar.bz2 1127504 BLAKE2B 142166370efed2d52c0a1e659bf0056f8d13cc5eca3c1d30c0278b81047aa58ce6c6f3f8496e982841b9dcd541ffd2c24467b8062aa5a7ffb1f31ef6cf841a15 SHA512 9959a7b6724aff5561fa9303b3d7c967e298fd63d95ef7e34d80514dde8871c19887c184a6466779f2833c295233dd1d54a7c06928ac58dcbb374281deb13f17
 DIST maradns-3.5.0005.tar.xz 5351412 BLAKE2B c6b1c4fb93cb507045b3c09574d7ce30b0af92301e157216b4a5bbd2ed74ceb829ef4d11cd08048c7a685a09cdd4178cf3fc4e7b2465820d26d3a5c1b96f4a5e SHA512 2e7008ff6217929008292dde60d96eb2ec0499a170e1b5bda5fcfb27300d2ce6cecd8b3e2a2d4b09ff32b803f9f435230378e6b2e41e7b63c42653d8c931151d
-EBUILD maradns-2.0.16.ebuild 2814 BLAKE2B 5c7baba17ac15bcfe55c3e1600f4139e62564443647b53def559468c6c4a75c1dfad0212ccf7ac0ff73d4f8b7c241351629766d5b10f12c29a2c7a118e073ed6 SHA512 155e04103597ec88ad5f4e47ceb2829cc6d64e5971f7fd9f2a5198f0def046612fdfa29f14b7b45a173909585e84c0d3a6fd2f3854faf489de7f5261fa7eba49
 EBUILD maradns-3.5.0005.ebuild 2358 BLAKE2B 7c373874d41e64d27631edf7c2933684a28f1acf2fd3f51aef942f744afecb5d0a6391322c7dc9944afe20dd0caa4650443993b5540410246eaa1879daaac269 SHA512 a4ae540ebfc23a0675445ccbb00a3c26c91efd90034241e2a9f27173c286747432c13430141c1056a844502cbe2cf596fc323aa865268e7d290b50697e167780
-MISC metadata.xml 728 BLAKE2B 07077c81b008d0ab019995c21873fcf61ff636a346eb582d966f81dabd4a9a7e3ad2a9879c6ca33708828b54b3ae2dcafb8c89716dd571c95a456add01e43863 SHA512 0b0c7db834ae6a1a94069873c72cfe2e87840d89d556ffc7a2887c426321ced9b474dc32292010f4dd8918389906cda16b2f3ae1251c7a9ab6be055763ae8330
+MISC metadata.xml 620 BLAKE2B fabe3ba11ebb5211d8ed8b51912a22515e9a299195abf2c6a7a14f552837ffa4a080e681c01a058afac19187cc3ae41f677d13598fe9b01738457c360dd1e0bb SHA512 0394942fe14d585a9ecbbff325cc34dafa16a4d438334620a25ed009454724e9ed6e8b5f8f5f89f359a2141eb1031b0180eeba7ed99d6995f21e549f753f3fa2
diff --git a/net-dns/maradns/maradns-2.0.16.ebuild b/net-dns/maradns/maradns-2.0.16.ebuild
deleted file mode 100644
index 17e475eff849..000000000000
--- a/net-dns/maradns/maradns-2.0.16.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 systemd toolchain-funcs user
-
-DEADWOOD_VER="3.2.12"
-
-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"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-pkg_setup() {
-	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"
-
-	python_fix_shebang tools/bind2csv2.py
-}
-
-src_configure() {
-	tc-export CC
-	./configure $(use ipv6 && echo "--ipv6") || die "Failed to configure ${PN}"
-}
-
-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
-	dobin tcp/{getzone,fetchzone}
-	dobin tools/{askmara,askmara-tcp,duende,bind2csv2.py,csv1tocsv2.pl}
-
-	# MaraDNS docs, manpages, misc
-	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
-
-	# Install examples (optional)
-	if use examples ; then
-		docinto examples
-		dodoc doc/en/examples/example_*
-	fi
-
-	# Install manpages
-	doman doc/en/man/*.[1-9]
-	if ! use authonly; then
-		doman deadwood-${DEADWOOD_VER}/doc/{Deadwood,Duende}.1
-	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
-	if ! use authonly; then
-		newins deadwood-${DEADWOOD_VER}/doc/dwood3rc-all dwood3rc_all.dist
-	fi
-	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
-}
-
-pkg_preinst() {
-	enewgroup maradns 99
-	enewuser duende 66 -1 -1 maradns
-	enewuser maradns 99 -1 -1 maradns
-}
diff --git a/net-dns/maradns/metadata.xml b/net-dns/maradns/metadata.xml
index 1989b4903ef9..aa20f8fb6d0d 100644
--- a/net-dns/maradns/metadata.xml
+++ b/net-dns/maradns/metadata.xml
@@ -13,9 +13,6 @@
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
-    <use>
-        <flag name="authonly">Allows one to build only authoritative DNS server</flag>
-    </use>
     <upstream>
         <remote-id type="github">samboy/MaraDNS</remote-id>
     </upstream>