gentoo resync : 25.11.2020

5 files changed, 9 insertions, 121 deletions

diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index f73361c802c8..88ed59623006 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1,10 +1,8 @@
 AUX dnsdist.conf.example 524 BLAKE2B e9d140129dfbd276d1fb927d73bee4e4c29920ae70d587765ea5d432f02694b1a8583340c2e14e191bbdf5ddd5b921274cb2336c3520839d7cfe6f399a4d6c26 SHA512 385bee5725d927feb50fc0f40cd48cd365a495e39c0d947aa53dc454d84b7fe3806cd1d206056c96d111e7251db2cda27570ff8154c70bed145d37bc7d1db01d
 AUX dnsdist.confd 266 BLAKE2B c201b0aa3599ea7606e998348d777796ff391f3d4b0e46744160298456c86a9d9bbf65d1a339c0c13db4c796efb7c3adba01110882542fe501c735c9dd190f92 SHA512 935afc768ae56d017f6dee8bed7a3e92615055a0d4d2ae9980afef1b8f353da0e8bd6e20b914602e50b116ad33ef17ba05535b225af8b8da9ad005694edc071f
-AUX dnsdist.initd 1338 BLAKE2B 47ccfdabcff27bd58ef1afffd19cdbe72e88d5a597f7026188aef7f8183daedf84c3f774a98de40868558be16e974d3cd6761341f8da74f046c243a8fd827b34 SHA512 681dbd4366437878eaeea7c8003bf6aaf4b88d160c54e3f102b5a8e6f23f2e7d1f815ab25c75330a553aba159d83bca70d87b51a93ea5c4a84262519c589ea3d
-DIST dnsdist-1.3.3.tar.bz2 971253 BLAKE2B e9c36969fc1e4b95b71a3f6885503aea2d527b4d9abce9cb137c290a21aee994a441c0e17c0bf985396fda51020b5ef910753554990259abb16641d93d2d1010 SHA512 c0e3435eafc1f7bcdf41346cecf7b089cc142716f94058f9ec262d0c6ad16467e0b8bed5abc648829c597120c94f998602849ded574e75bfc1a1fb70c1b719ad
-DIST dnsdist-1.4.0.tar.bz2 1044479 BLAKE2B 79aef57ed2b1036f222e8bcfdf615c3221c9dfdbc8fd3f80d778fb050f74bc200958b4d605dcadd5c23ac6c4b5b1a36048108cd85394920e99d6037177b81342 SHA512 c9450e97325d8ad8c8c3a395412c46ea8053cbe1ebe73329a1618212ba29bdf2f8da908ae2b90c314b5aab613387f42363e3a5322b1a36f60190fb48e1c425c5
+AUX dnsdist.initd 1337 BLAKE2B e2619182674439be6942a0a936208326c12cfc2839bba4fd6a2ca3653ac6083458ebf2b644d2db63c187ed33ba2bef3437680714bb76dfc7632e1b62149a6f6a SHA512 99e38a58c97dd206ea82ffc783102feaa28f74bec5e03c1790e2db0f428f8228eec43617b2c951f22320e10dbd42ddfbf40650fed28608428f9c48eec3640a8d
 DIST dnsdist-1.5.0.tar.bz2 1067645 BLAKE2B de07de8f862a633d8eb11ccf632e01c2ce779a35ef61ba2fcf932894d692f2f3edfd638ce77f178bbfbfc1115d8e76f5522e10061fcf61650170a5b59d5cc9ca SHA512 df6f8caae001f152f0d264176c570778842979484d16e4199afe0e2591006392444245dd8ce23287cdcf9613e2c40a9e3564f5236e5f5a6fd67b89d6ea0d9ed4
-EBUILD dnsdist-1.3.3-r1.ebuild 2646 BLAKE2B fdeae74f8a6f4aecd7fdd2ef0d25d2f1df238c98fe566f44455c7b951ca970d64cb3de43baa4dffa02e8c85db055916fe5c69bb5ee74bcffbfd6bb7d08a9465c SHA512 ba4a486dafd0cb5fc19a0263317646478d090ca4b872c75cc8bdc4ddca7da12956ed68cc8fc2c46d657785b00f1d85f885046781bc2f1621626540562d5a7ac6
-EBUILD dnsdist-1.4.0.ebuild 2373 BLAKE2B b61a275f984088a7ddd621c3441141af2cca5b0e640dbd0a8cd21d185b4e8be42dcfa8d777d4c34ace06cdf746778264cccb28e70434de214e0d5307ce0fbe6b SHA512 1baf3fba9a7f89c67f57d70199493d91d807669a07b323dd76481cd65eb42fb86c5224ca01e12d67e0ca528a41094702ff0f76933aa480158e8c98f7a2f22e75
+DIST dnsdist-1.5.1.tar.bz2 1068061 BLAKE2B 1c0fdd181b62b96fcd433581715cea9dc204fcdd2f65efd26a5293cc9c17d904e0937b51ba33d2dc01ecc8044f491ba2c6c8720c0816587fa5082da73108783e SHA512 68fe5f55fd081ed80a620933af9f8310be0e21c86ba449a9c557975b5c83f4b64e3002e6032dc002582d081e70e1ec2ff080c5d8389fd46a9896bdafd5a41f9f
 EBUILD dnsdist-1.5.0.ebuild 2332 BLAKE2B ba846827f5ef97652808b37c57c014a9a70c8acce6bbbf9609c4655b50d46b0535260bf3edd264b79f4876908833aa98083a02621d3427274c709b7ca20dd81d SHA512 68a5d7b6ab7d9a96fd973afe6346fd172d1f4794d747d040081e22468a3c40cee45d1837e68263aec3a4f46b7ef363c9ab71a048cc5e1acee8295f0900f2119c
-MISC metadata.xml 1213 BLAKE2B c4fe0c3ae740de6b996c8f54f48234a84a4f54cdef743a88fe9730c86ade3d7ccad0118ba0b8f17422fd57a91d2fa13999e7bcb855ffc70394ab3591e01f33d5 SHA512 eb88f1f798d82348e4f633382d3f422d4adf592dfdba878ccab9bdec9228805b5c41f9c5122904cd9d6374b5583a1de0ef3316585c88abada86c0ccb2fbb242a
+EBUILD dnsdist-1.5.1.ebuild 2332 BLAKE2B ba846827f5ef97652808b37c57c014a9a70c8acce6bbbf9609c4655b50d46b0535260bf3edd264b79f4876908833aa98083a02621d3427274c709b7ca20dd81d SHA512 68a5d7b6ab7d9a96fd973afe6346fd172d1f4794d747d040081e22468a3c40cee45d1837e68263aec3a4f46b7ef363c9ab71a048cc5e1acee8295f0900f2119c
+MISC metadata.xml 1130 BLAKE2B fead1e2f8167ad41c84c3b03ab49d1ebfed6725adf55e4db2b23d099b12e01023742e8fd6e60799946f5a3ba7fb97fe29106efd3eca7dafbb1405e6ff30b97c0 SHA512 b987d96fd24ed1092f1f419c35cedd53502b4013efbfb6bf729dc5c721b96de0b2a701435593d679d452ba390e9f8e136f8658d6758f2b92c3fd02dfd40ec056
diff --git a/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild b/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild
deleted file mode 100644
index 493fd0f5e4c1..000000000000
--- a/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://github.com/PowerDNS/pdns.git"
-
-if [[ ${PV} = 9999 ]]; then
-	ADDITIONAL_ECLASSES="autotools git-r3"
-fi
-
-inherit eutils flag-o-matic user ${ADDITIONAL_ECLASSES}
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-if [[ ${PV} == 9999 ]]; then
-	SRC_URI=""
-	S="${WORKDIR}/${P}/pdns/dnsdistdist"
-else
-	SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="dnscrypt? ( ssl )
-		gnutls? ( ssl )"
-
-RDEPEND="
-	>=dev-libs/boost-1.35:=
-	dev-libs/libedit:=
-	fstrm? ( dev-libs/fstrm:= )
-	luajit? ( dev-lang/luajit:= )
-	!luajit? ( >=dev-lang/lua-5.1:= )
-	remote-logging? ( >=dev-libs/protobuf-3:= )
-	regex? ( dev-libs/re2:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? (
-		dev-libs/libsodium:=
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-	systemd? ( sys-apps/systemd:0= )
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-[[ ${PV} == 9999 ]] && DEPEND+="
-	app-text/pandoc
-	dev-util/ragel
-	dev-python/virtualenv
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/dnsdist \
-		$(use_enable dnscrypt) \
-		$(use_enable fstrm) \
-		$(use luajit && echo "--with-lua=luajit" || echo "--with-lua=lua" ) \
-		$(use_enable regex re2) \
-		$(use_with remote-logging protobuf) \
-		$(use_with snmp net-snmp) \
-		$(use_enable ssl libsodium) \
-		$(use ssl && { echo "--enable-dns-over-tls" && use_enable gnutls && use_enable !gnutls libssl;} || echo "--disable-gnutls --disable-libssl") \
-		$(use_enable systemd) \
-		$(use_enable test unit-tests)
-		if [ ${PV} == "1.3.3" ]; then
-			sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-			-i "${S}/configure"
-		fi
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-pkg_preinst() {
-	enewgroup dnsdist
-	enewuser dnsdist -1 -1 -1 dnsdist
-}
-
-pkg_postinst() {
-	elog "dnsdist provides multiple instances support. You can create more instances"
-	elog "by symlinking the dnsdist init script to another name."
-	elog
-	elog "The name must be in the format dnsdist.<suffix> and dnsdist will use the"
-	elog "/etc/dnsdist/dnsdist-<suffix>.conf configuration file instead of the default."
-}
diff --git a/net-dns/dnsdist/dnsdist-1.4.0.ebuild b/net-dns/dnsdist/dnsdist-1.5.1.ebuild
index dae9b523e363..b36be988dc3b 100644
--- a/net-dns/dnsdist/dnsdist-1.4.0.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils flag-o-matic user
+inherit eutils flag-o-matic
 
 DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
 HOMEPAGE="https://dnsdist.org"
@@ -19,7 +19,8 @@ REQUIRED_USE="dnscrypt? ( ssl )
 		gnutls? ( ssl )
 		doh? ( ssl !gnutls )"
 
-RDEPEND="
+RDEPEND="acct-group/dnsdist
+	acct-user/dnsdist
 	>=dev-libs/boost-1.35:=
 	dev-libs/libedit:=
 	dnscrypt? ( dev-libs/libsodium:= )
@@ -74,11 +75,6 @@ src_install() {
 	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
 }
 
-pkg_preinst() {
-	enewgroup dnsdist
-	enewuser dnsdist -1 -1 -1 dnsdist
-}
-
 pkg_postinst() {
 	elog "dnsdist provides multiple instances support. You can create more instances"
 	elog "by symlinking the dnsdist init script to another name."
diff --git a/net-dns/dnsdist/files/dnsdist.initd b/net-dns/dnsdist/files/dnsdist.initd
index 554c43b0150a..f1670c613388 100644
--- a/net-dns/dnsdist/files/dnsdist.initd
+++ b/net-dns/dnsdist/files/dnsdist.initd
@@ -31,9 +31,8 @@ start() {
 
 	ebegin "Starting dnsdist (${DNSDIST_INSTANCE})"
 	start-stop-daemon --start --exec $DNSDIST --pidfile ${PIDFILE} \
-		-b -m -- --supervised -u ${DNSDIST_USER} -g 
-${DNSDIST_GROUP} \
-		-C $DNSDIST_CONFFILE ${DNSDIST_OPTIONS}
+		-b -m -- --supervised -u ${DNSDIST_USER} \
+		-g ${DNSDIST_GROUP} -C $DNSDIST_CONFFILE ${DNSDIST_OPTIONS}
 	eend $?
 }
 
diff --git a/net-dns/dnsdist/metadata.xml b/net-dns/dnsdist/metadata.xml
index d42d77d511da..52ecd48eab08 100644
--- a/net-dns/dnsdist/metadata.xml
+++ b/net-dns/dnsdist/metadata.xml
@@ -10,7 +10,6 @@
 	</longdescription>
 	<use>
 		<flag name="dnscrypt">Enable the ability to act as a DNSCrypt server</flag>
-		<flag name="fstrm">Enable support for fstrm via <pkg>dev-libs/fstrm</pkg></flag>
 		<flag name="regex">Enable support for regular expression matching via <pkg>dev-libs/re2</pkg></flag>
 		<flag name="remote-logging">Enable support for remote logging via <pkg>dev-libs/protobuf</pkg></flag>
 		<flag name="ssl">Enable support for and encrypted client-server communication via <pkg>dev-libs/libsodium</pkg></flag>