net-dns/dnsdist: version bump and remove old

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Andreas Schuerch <nativemad@gentoo.org>

4 files changed, 4 insertions, 114 deletions

diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 6d2a06fbff8c..773ff1f17b98 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1,3 +1,2 @@
-DIST dnsdist-1.3.3.tar.bz2 971253 BLAKE2B e9c36969fc1e4b95b71a3f6885503aea2d527b4d9abce9cb137c290a21aee994a441c0e17c0bf985396fda51020b5ef910753554990259abb16641d93d2d1010 SHA512 c0e3435eafc1f7bcdf41346cecf7b089cc142716f94058f9ec262d0c6ad16467e0b8bed5abc648829c597120c94f998602849ded574e75bfc1a1fb70c1b719ad
-DIST dnsdist-1.4.0.tar.bz2 1044479 BLAKE2B 79aef57ed2b1036f222e8bcfdf615c3221c9dfdbc8fd3f80d778fb050f74bc200958b4d605dcadd5c23ac6c4b5b1a36048108cd85394920e99d6037177b81342 SHA512 c9450e97325d8ad8c8c3a395412c46ea8053cbe1ebe73329a1618212ba29bdf2f8da908ae2b90c314b5aab613387f42363e3a5322b1a36f60190fb48e1c425c5
 DIST dnsdist-1.5.0.tar.bz2 1067645 BLAKE2B de07de8f862a633d8eb11ccf632e01c2ce779a35ef61ba2fcf932894d692f2f3edfd638ce77f178bbfbfc1115d8e76f5522e10061fcf61650170a5b59d5cc9ca SHA512 df6f8caae001f152f0d264176c570778842979484d16e4199afe0e2591006392444245dd8ce23287cdcf9613e2c40a9e3564f5236e5f5a6fd67b89d6ea0d9ed4
+DIST dnsdist-1.5.1.tar.bz2 1068061 BLAKE2B 1c0fdd181b62b96fcd433581715cea9dc204fcdd2f65efd26a5293cc9c17d904e0937b51ba33d2dc01ecc8044f491ba2c6c8720c0816587fa5082da73108783e SHA512 68fe5f55fd081ed80a620933af9f8310be0e21c86ba449a9c557975b5c83f4b64e3002e6032dc002582d081e70e1ec2ff080c5d8389fd46a9896bdafd5a41f9f
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/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>