net-dns/dnsdist: new maintainer, bump, remove old, new useflags

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

4 files changed, 56 insertions, 31 deletions

diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index d67dcea2a2d2..52184b556f11 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1 +1 @@
-DIST dnsdist-1.2.0.tar.bz2 876104 BLAKE2B 6e9d0f871c63a0aae539ae074648edcd6b9d626434c343b28c45cf16ffb6b088300d5327e04c45dbb1c9a0b9ad6077d539dc36ae0424d1ec0a240932e8b34223 SHA512 93f8c5f18462d3291c973a690f6ac2b3c5791d9947bee83d9250b503b7526de365bdcb530f3b082e51ae168a9129e77d5558af7cc3b9d2e98a585af53783c237
+DIST dnsdist-1.3.3.tar.bz2 971253 BLAKE2B e9c36969fc1e4b95b71a3f6885503aea2d527b4d9abce9cb137c290a21aee994a441c0e17c0bf985396fda51020b5ef910753554990259abb16641d93d2d1010 SHA512 c0e3435eafc1f7bcdf41346cecf7b089cc142716f94058f9ec262d0c6ad16467e0b8bed5abc648829c597120c94f998602849ded574e75bfc1a1fb70c1b719ad
diff --git a/net-dns/dnsdist/dnsdist-1.2.0.ebuild b/net-dns/dnsdist/dnsdist-1.3.3.ebuild
index 81f8dbfc0f87..b13e2bdae49d 100644
--- a/net-dns/dnsdist/dnsdist-1.2.0.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.3.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGIT_REPO_URI="https://github.com/PowerDNS/pdns.git"
 
@@ -24,18 +24,25 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="dnscrypt luajit regex remote-logging snmp +ssl test"
-REQUIRED_USE="dnscrypt? ( ssl )"
+IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test"
+REQUIRED_USE="dnscrypt? ( ssl )
+		gnutls? ( ssl )"
 
 DEPEND="
 	>=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:= )
+	remote-logging? ( >=dev-libs/protobuf-3:= )
 	regex? ( dev-libs/re2:= )
 	snmp? ( net-analyzer/net-snmp:= )
-	ssl? ( dev-libs/libsodium:= )
+	ssl? (
+		dev-libs/libsodium:=
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+	systemd? ( sys-apps/systemd:0= )
 "
 
 RDEPEND="${DEPEND}"
@@ -53,13 +60,20 @@ src_prepare() {
 src_configure() {
 	econf \
 		--sysconfdir=/etc/dnsdist \
-		$(use_enable ssl libsodium) \
-		$(use_with remote-logging protobuf) \
-		$(use_enable regex re2) \
 		$(use_enable dnscrypt) \
-		$(use_with luajit) \
-		$(use_enable test unit-tests) \
-		$(use_with snmp net-snmp)
+		$(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() {
diff --git a/net-dns/dnsdist/dnsdist-9999.ebuild b/net-dns/dnsdist/dnsdist-9999.ebuild
index 81f8dbfc0f87..b13e2bdae49d 100644
--- a/net-dns/dnsdist/dnsdist-9999.ebuild
+++ b/net-dns/dnsdist/dnsdist-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGIT_REPO_URI="https://github.com/PowerDNS/pdns.git"
 
@@ -24,18 +24,25 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="dnscrypt luajit regex remote-logging snmp +ssl test"
-REQUIRED_USE="dnscrypt? ( ssl )"
+IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test"
+REQUIRED_USE="dnscrypt? ( ssl )
+		gnutls? ( ssl )"
 
 DEPEND="
 	>=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:= )
+	remote-logging? ( >=dev-libs/protobuf-3:= )
 	regex? ( dev-libs/re2:= )
 	snmp? ( net-analyzer/net-snmp:= )
-	ssl? ( dev-libs/libsodium:= )
+	ssl? (
+		dev-libs/libsodium:=
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+	systemd? ( sys-apps/systemd:0= )
 "
 
 RDEPEND="${DEPEND}"
@@ -53,13 +60,20 @@ src_prepare() {
 src_configure() {
 	econf \
 		--sysconfdir=/etc/dnsdist \
-		$(use_enable ssl libsodium) \
-		$(use_with remote-logging protobuf) \
-		$(use_enable regex re2) \
 		$(use_enable dnscrypt) \
-		$(use_with luajit) \
-		$(use_enable test unit-tests) \
-		$(use_with snmp net-snmp)
+		$(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() {
diff --git a/net-dns/dnsdist/metadata.xml b/net-dns/dnsdist/metadata.xml
index 3f6dc8527a32..e4d52294acda 100644
--- a/net-dns/dnsdist/metadata.xml
+++ b/net-dns/dnsdist/metadata.xml
@@ -2,18 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>bgo@9dt.de</email>
-		<name>Vladimir Datsevich</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>nativemad@gentoo.org</email>
+		<name>Andreas Schuerch</name>
 	</maintainer>
 	<longdescription lang="en">
 		dnsdist is a highly DNS-, DoS- and abuse-aware loadbalancer. Its goal in life is to route traffic to the best server, delivering top performance to legitimate users while shunting or blocking abusive traffic.
 	</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>