gentoo resync : 15.01.2020

3 files changed, 24 insertions, 36 deletions

diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 517c4c1b5c6f..0fffa208b3a9 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -2,6 +2,7 @@ AUX dnsdist.conf.example 524 BLAKE2B e9d140129dfbd276d1fb927d73bee4e4c29920ae70d
 AUX dnsdist.confd 266 BLAKE2B c201b0aa3599ea7606e998348d777796ff391f3d4b0e46744160298456c86a9d9bbf65d1a339c0c13db4c796efb7c3adba01110882542fe501c735c9dd190f92 SHA512 935afc768ae56d017f6dee8bed7a3e92615055a0d4d2ae9980afef1b8f353da0e8bd6e20b914602e50b116ad33ef17ba05535b225af8b8da9ad005694edc071f
 AUX dnsdist.initd 1334 BLAKE2B db80ebec89cfc9050d0e43402d8cc9af56bd764ba52a6db948747585d23896d3e6daed4eaa5fabc2b500dc96c1f86e9e8624b8da755b87fdd3c730104c9082fd SHA512 0d17c476ba3d775bc6e2bda0133516bf5cf48183fdeaaf913337c393080eaff4770267842e81d7b6e66a7ae087ce3d73ba4daea3cbf9982719e0f205b0d096ba
 DIST dnsdist-1.3.3.tar.bz2 971253 BLAKE2B e9c36969fc1e4b95b71a3f6885503aea2d527b4d9abce9cb137c290a21aee994a441c0e17c0bf985396fda51020b5ef910753554990259abb16641d93d2d1010 SHA512 c0e3435eafc1f7bcdf41346cecf7b089cc142716f94058f9ec262d0c6ad16467e0b8bed5abc648829c597120c94f998602849ded574e75bfc1a1fb70c1b719ad
+DIST dnsdist-1.4.0.tar.bz2 1044479 BLAKE2B 79aef57ed2b1036f222e8bcfdf615c3221c9dfdbc8fd3f80d778fb050f74bc200958b4d605dcadd5c23ac6c4b5b1a36048108cd85394920e99d6037177b81342 SHA512 c9450e97325d8ad8c8c3a395412c46ea8053cbe1ebe73329a1618212ba29bdf2f8da908ae2b90c314b5aab613387f42363e3a5322b1a36f60190fb48e1c425c5
 EBUILD dnsdist-1.3.3-r1.ebuild 2646 BLAKE2B fdeae74f8a6f4aecd7fdd2ef0d25d2f1df238c98fe566f44455c7b951ca970d64cb3de43baa4dffa02e8c85db055916fe5c69bb5ee74bcffbfd6bb7d08a9465c SHA512 ba4a486dafd0cb5fc19a0263317646478d090ca4b872c75cc8bdc4ddca7da12956ed68cc8fc2c46d657785b00f1d85f885046781bc2f1621626540562d5a7ac6
-EBUILD dnsdist-9999.ebuild 2646 BLAKE2B fdeae74f8a6f4aecd7fdd2ef0d25d2f1df238c98fe566f44455c7b951ca970d64cb3de43baa4dffa02e8c85db055916fe5c69bb5ee74bcffbfd6bb7d08a9465c SHA512 ba4a486dafd0cb5fc19a0263317646478d090ca4b872c75cc8bdc4ddca7da12956ed68cc8fc2c46d657785b00f1d85f885046781bc2f1621626540562d5a7ac6
-MISC metadata.xml 1017 BLAKE2B cf131f8ad5b5c9a55ea0400a54c79e458e0934ea1a7b53422baf6bd791285323b3f7024229f382922d427bf3498e32d0cc395917ac53a474d429c582d1df7bb1 SHA512 abc9c348a491f29826d26a430015b2f561bdfb071522be423c518f7c0c68ce7306bb7f41410c8a515980d0a1aa32d095076cab38aade271c3a59d48063b4d703
+EBUILD dnsdist-1.4.0.ebuild 2373 BLAKE2B b61a275f984088a7ddd621c3441141af2cca5b0e640dbd0a8cd21d185b4e8be42dcfa8d777d4c34ace06cdf746778264cccb28e70434de214e0d5307ce0fbe6b SHA512 1baf3fba9a7f89c67f57d70199493d91d807669a07b323dd76481cd65eb42fb86c5224ca01e12d67e0ca528a41094702ff0f76933aa480158e8c98f7a2f22e75
+MISC metadata.xml 1213 BLAKE2B c4fe0c3ae740de6b996c8f54f48234a84a4f54cdef743a88fe9730c86ade3d7ccad0118ba0b8f17422fd57a91d2fa13999e7bcb855ffc70394ab3591e01f33d5 SHA512 eb88f1f798d82348e4f633382d3f422d4adf592dfdba878ccab9bdec9228805b5c41f9c5122904cd9d6374b5583a1de0ef3316585c88abada86c0ccb2fbb242a
diff --git a/net-dns/dnsdist/dnsdist-9999.ebuild b/net-dns/dnsdist/dnsdist-1.4.0.ebuild
index 493fd0f5e4c1..dae9b523e363 100644
--- a/net-dns/dnsdist/dnsdist-9999.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.4.0.ebuild
@@ -1,45 +1,37 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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}
+inherit eutils flag-o-matic user
 
 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
+SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="dnscrypt gnutls fstrm luajit regex remote-logging snmp +ssl systemd test"
+IUSE="dnscrypt dnstap doh gnutls +lmdb luajit regex remote-logging snmp +ssl systemd test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="dnscrypt? ( ssl )
-		gnutls? ( ssl )"
+		gnutls? ( ssl )
+		doh? ( ssl !gnutls )"
 
 RDEPEND="
 	>=dev-libs/boost-1.35:=
 	dev-libs/libedit:=
-	fstrm? ( dev-libs/fstrm:= )
+	dnscrypt? ( dev-libs/libsodium:= )
+	dnstap? ( dev-libs/fstrm:= )
+	doh? ( www-servers/h2o:=[libh2o] )
+	lmdb? ( dev-db/lmdb:= )
 	luajit? ( dev-lang/luajit:= )
 	!luajit? ( >=dev-lang/lua-5.1:= )
-	remote-logging? ( >=dev-libs/protobuf-3:= )
 	regex? ( dev-libs/re2:= )
+	remote-logging? ( >=dev-libs/protobuf-3:= )
 	snmp? ( net-analyzer/net-snmp:= )
 	ssl? (
-		dev-libs/libsodium:=
 		gnutls? ( net-libs/gnutls:= )
 		!gnutls? ( dev-libs/openssl:= )
 	)
@@ -50,34 +42,26 @@ 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 doh dns-over-https) \
 		$(use_enable dnscrypt) \
-		$(use_enable fstrm) \
+		$(use_enable dnstap) \
+		$(use_with lmdb ) \
 		$(use luajit && echo "--with-lua=luajit" || echo "--with-lua=lua" ) \
-		$(use_enable regex re2) \
+		$(use_with 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 ssl && { echo "--enable-dns-over-tls" && use_with gnutls && use_with !gnutls libssl;} || echo "--without-gnutls --without-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' \
+		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 e4d52294acda..d42d77d511da 100644
--- a/net-dns/dnsdist/metadata.xml
+++ b/net-dns/dnsdist/metadata.xml
@@ -14,5 +14,8 @@
 		<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>
+		<flag name="doh">Enable support for dns over http via <pkg>www-servers/h2o</pkg></flag>
+		<flag name="dnstap">Enable support for dnstap</flag>
+		<flag name="lmdb">Enable support for lmdb</flag>
 	</use>	
 </pkgmetadata>