gentoo resync : 07.05.2021

6 files changed, 46 insertions, 12 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index a3b33695198b..f017a94d9ff3 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest
index dcd59138bea3..70e69bb9b58e 100644
--- a/net-dns/maradns/Manifest
+++ b/net-dns/maradns/Manifest
@@ -1,7 +1,8 @@
 AUX deadwood 475 BLAKE2B 1f5f669b22011bf38e077d21278ebfbff72ba45782b863044d868f3a46256192fa1041db8ee6fe5ff5ac15285caacceb8222d2fb1dce1c617c41baea1da7fe15 SHA512 ea01c5cd9494a9dd5c8146f0de84c6bd4df3ba2221b52b87886892cbc13aad21f273ea1d056c3dd88ae5e15c1f6f820f9fe4b1dd4c9ae7082d7f7f78b3f8813e
+AUX maradns-3.5.0005-flags.patch 793 BLAKE2B 65a6cf4e0b77e19431e9c243bbb9a790ffbe064a66bf20747779c5401ba6e47b4b6cf21a73843ca8e259f296e5d2fca70dcd801fd45b3d3e2b7e784e9557cf24 SHA512 940b18ebfbcd7b8b83e505dd9e597599febd0ffb9c1b8d1e6bdc5749031c53e514467a9d62fd7d6e02d99d4226e09c87cc8124e5fb19a5c735dac25f99d4bfb5
 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-3.5.0005.tar.xz 5351412 BLAKE2B c6b1c4fb93cb507045b3c09574d7ce30b0af92301e157216b4a5bbd2ed74ceb829ef4d11cd08048c7a685a09cdd4178cf3fc4e7b2465820d26d3a5c1b96f4a5e SHA512 2e7008ff6217929008292dde60d96eb2ec0499a170e1b5bda5fcfb27300d2ce6cecd8b3e2a2d4b09ff32b803f9f435230378e6b2e41e7b63c42653d8c931151d
-EBUILD maradns-3.5.0005.ebuild 2356 BLAKE2B 76a5b86f780babd85b5afce1a46b60f302aa912edf4e081dc9b43e49a878dc53c57f22609404c0ba4fa3b919b50affbd6c7920033952cbdd12dba68b1deb30b5 SHA512 d18b707014c2e6725496cbb7831490d124751f5e733ab051ce71cf897564a91112062c80badda0639b62e60cdb9991e0e6c14efa94d81ebe48f5f0c74ce8624f
+EBUILD maradns-3.5.0005.ebuild 2410 BLAKE2B a6703a7856b9344dfa5c17df257f8cdcf46013498c2acfb46a02bf2d2923692e9d9b9288b7ba3d15fe77a8fdd67ba444fc3283e3e43f01c97fff82a971fd928e SHA512 d09cddab2a6e4af7cdfbd48ce99b16a1759baf34c85376fd3ed16629c545abfa353eb95a074ce73f8af44ef8ed631daa128b3bc23bcb9b4ed39afec9bc0f86d6
 MISC metadata.xml 650 BLAKE2B de0597fe89738d9455f42c28ccb868f222170d4c554d46d8f266923f832ebc8e2eeb10b14481c361a0c03ec31e448684d61fbf4bf8f960935d6f7abe550b21b1 SHA512 119586844787fd28975f10a6546f3f28e9d99ef09f08293b24502fd5d5898724f35c6f2f31c68862eb5ec8fe6a3bee2f4f4d61581369430231f720777f20b153
diff --git a/net-dns/maradns/files/maradns-3.5.0005-flags.patch b/net-dns/maradns/files/maradns-3.5.0005-flags.patch
new file mode 100644
index 000000000000..66493632df0a
--- /dev/null
+++ b/net-dns/maradns/files/maradns-3.5.0005-flags.patch
@@ -0,0 +1,28 @@
+--- a/build/Makefile.linux
++++ b/build/Makefile.linux
+@@ -24,13 +24,13 @@ EXECS=server/maradns
+ # end the Solaris section
+ # Non-Solaris version of "M"
+ V="VERSION=$(VERSION)"
+-Q="DEFINES=-DSELECT_PROBLEM"
++Q="$(LDFLAGS) DEFINES=-DSELECT_PROBLEM"
+ 
+ # Debug
+ 
+ FLAGS = -O2 -Wall -DSELECT_PROBLEM
+-M="CC=$(CC) $(FLAGS)"
+-D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS"
++M="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)"
++D="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DDEBUG -DTHREADS"
+ #FLAGS = -g
+ 
+ all: 
+@@ -39,7 +39,7 @@ all:
+ 	cd ../qual ; make $(M) ; cd ../server ; \
+ 	make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \
+ 	cd ../tools ; make $(M) ; \
+-	cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \
++	cd ../deadwood-*/src/ ; $(MAKE)  $(M) ; \
+ 	cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST
+ 
+ debug: 
diff --git a/net-dns/maradns/maradns-3.5.0005.ebuild b/net-dns/maradns/maradns-3.5.0005.ebuild
index dc945dfceb0f..0b520db460fc 100644
--- a/net-dns/maradns/maradns-3.5.0005.ebuild
+++ b/net-dns/maradns/maradns-3.5.0005.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit systemd toolchain-funcs python-any-r1
+PYTHON_COMPAT=( python3_{7..9} )
+inherit python-any-r1 systemd toolchain-funcs
 
 DESCRIPTION="A security-aware DNS server"
 HOMEPAGE="http://www.maradns.org/"
@@ -17,12 +16,17 @@ SLOT="0"
 KEYWORDS="amd64 ~mips ~ppc x86"
 IUSE="examples ipv6"
 
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	acct-user/maradns
+BDEPEND="${PYTHON_DEPS}
+	dev-lang/perl"
+DEPEND="
 	acct-group/maradns
 	acct-user/duende
-	dev-lang/perl"
+	acct-user/maradns"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flags.patch
+)
 
 src_prepare() {
 	default
@@ -36,7 +40,8 @@ src_prepare() {
 
 src_configure() {
 	tc-export CC
-	./configure $(use ipv6 && echo "--ipv6") || die "Failed to configure ${PN}"
+	./configure \
+		$(usex ipv6 --ipv6 "") || die "Failed to configure ${PN}"
 }
 
 src_install() {
diff --git a/net-dns/resolv_wrapper/Manifest b/net-dns/resolv_wrapper/Manifest
index ee48bceb261d..794ce90abba9 100644
--- a/net-dns/resolv_wrapper/Manifest
+++ b/net-dns/resolv_wrapper/Manifest
@@ -3,5 +3,5 @@ DIST resolv_wrapper-1.1.6.tar.gz 38276 BLAKE2B 4b1c79a342b74f33063ba480b1706a107
 DIST resolv_wrapper-1.1.7.tar.gz 45148 BLAKE2B d1b860187bfa3be6eadd848abc458d5c9e3c4c4048a70b37d7548caf2604bda51f8a3606487fb95d682ab39e06f63f29b85de981ae32527997799fa5d72befab SHA512 531a7734f40d8a7cb3da4618eebbb4530657ad2cdcf3c1cd48f3ae1dcf55fc003205e44745fc3f70704060ae0c6a2516919c61fd10223ff56d90a47a3c59b3c0
 EBUILD resolv_wrapper-1.1.5.ebuild 658 BLAKE2B d08b85542d7f12ac823968a30608f70a8d288f6967e5180e3e47345bde26caf5f9e97436793752dc82eadeb1566c78852a6a78cd5284f4b9ad962312ebab0969 SHA512 836c969b74b0f5aa9d37500f655d00fa1307c7a21d88b0a2ba90eebe2dd7c89a5b3927ef41d1aa5dba0b9031f7264dee1e488f44919350bef11129a59ed48656
 EBUILD resolv_wrapper-1.1.6.ebuild 664 BLAKE2B decc50a1b1a35010953fb0cfe98c3a35c1968c285f3b20f7a446456b6a834a6ffd02224ff4721eba7a3cc2e95ac8f58ed720cdb5ba35fe974dc2d7ae7d01c615 SHA512 056ff258de0cb3671316834fec593c5ecdf3ec47d72c9141df8dfbb12a0331a850fa5d252cf4f1dde836e895f0f5b6bb2ab10a64dab4d98303a7345a89e914e1
-EBUILD resolv_wrapper-1.1.7.ebuild 800 BLAKE2B afb0f400f6bad5c0c8e69b8fac3b2b1dc94fbc1b4c3c31c2644861164fa7861d52c5a118748cb9d4ad8b3cd2c40de9e552b315ce724c0a162b354c89f3f2077f SHA512 3528cf715e84a548eb5b55130055e8b4de4514a9511085335d1eaf35931ece15e871bbaa18a261240db6576e919530c47217a5a49782791ee639546cde2dbe1a
+EBUILD resolv_wrapper-1.1.7.ebuild 799 BLAKE2B 1b81f1a88bc2f6f7d77025b72696c731f773c2fff01fa89c6c78b3d8478c7359a56a6d850d6e9f03817a2b744d77eabb9791597338955af44b42f5d6fba6fadf SHA512 1bc43112c93ffd8bbe5b0898cab06fd828879d4656ea289fe44c2a5b03d1df8c08faba3137e743cba6657cb8bbdbd7afbd168f2841b67b5f908e274a7d1a606f
 MISC metadata.xml 249 BLAKE2B 274f77317bba157c3ad4c3e9827ce5ce934c855b8bd41e603df69f1343c296abf7faec755a56f5f8d0e76f43058156e95480a386494265385604401e70484acf SHA512 940515e5f54189b5ba3c1118ea45f679182c9075091ade1959b197a6dc5fba894cd52cd0289e00a4a139b1cd3c6563771a1e21d2baa460a25892b0fa20e819a8
diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild b/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild
index c7480d982a78..b6c1be25ec62 100644
--- a/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild
+++ b/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"