gentoo resync : 05.04.2019

5 files changed, 74 insertions, 43 deletions

diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 2c942a59331d..eddd91efe8e5 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -1,7 +1,7 @@
 AUX dnsdist.conf.example 524 BLAKE2B e9d140129dfbd276d1fb927d73bee4e4c29920ae70d587765ea5d432f02694b1a8583340c2e14e191bbdf5ddd5b921274cb2336c3520839d7cfe6f399a4d6c26 SHA512 385bee5725d927feb50fc0f40cd48cd365a495e39c0d947aa53dc454d84b7fe3806cd1d206056c96d111e7251db2cda27570ff8154c70bed145d37bc7d1db01d
 AUX dnsdist.confd 266 BLAKE2B c201b0aa3599ea7606e998348d777796ff391f3d4b0e46744160298456c86a9d9bbf65d1a339c0c13db4c796efb7c3adba01110882542fe501c735c9dd190f92 SHA512 935afc768ae56d017f6dee8bed7a3e92615055a0d4d2ae9980afef1b8f353da0e8bd6e20b914602e50b116ad33ef17ba05535b225af8b8da9ad005694edc071f
-AUX dnsdist.initd 1340 BLAKE2B 390aa44bdfdaee12a92297a8a6b7d90503446a91eafb631b570c3cb72d5f175028f9eec7d7cfd72d3d9994bca0f0594bbce95a81ad96280663e57bda860ba0fd SHA512 79b7c06adc469fed15b659aec4d674a50b64c80679c3474c87c03ae9b5b8ea63a493397822b8f4cb9e360745f38cc9f742aaa09c856618dd9f6c0f8978fa9616
-DIST dnsdist-1.2.0.tar.bz2 876104 BLAKE2B 6e9d0f871c63a0aae539ae074648edcd6b9d626434c343b28c45cf16ffb6b088300d5327e04c45dbb1c9a0b9ad6077d539dc36ae0424d1ec0a240932e8b34223 SHA512 93f8c5f18462d3291c973a690f6ac2b3c5791d9947bee83d9250b503b7526de365bdcb530f3b082e51ae168a9129e77d5558af7cc3b9d2e98a585af53783c237
-EBUILD dnsdist-1.2.0.ebuild 1964 BLAKE2B 05cfd39ef997cf5c1c2ea2edfea5d7d1bfabd0b50f5c51c5c22c809dd2880a22d7fdf228c032fee0d87533a65d186c3f26a2b60ed7300a60b4b2475deda4eef3 SHA512 5359b698228a584620b0e7f54618a21d4cbc097fd466482028c8045fb64034e9080242fe53fb590ce4e0d1901fa5b19c322cd06a7f591faa5e9f666d91e37ca2
-EBUILD dnsdist-9999.ebuild 1964 BLAKE2B 05cfd39ef997cf5c1c2ea2edfea5d7d1bfabd0b50f5c51c5c22c809dd2880a22d7fdf228c032fee0d87533a65d186c3f26a2b60ed7300a60b4b2475deda4eef3 SHA512 5359b698228a584620b0e7f54618a21d4cbc097fd466482028c8045fb64034e9080242fe53fb590ce4e0d1901fa5b19c322cd06a7f591faa5e9f666d91e37ca2
-MISC metadata.xml 1043 BLAKE2B 0db07c220caf8ed8523414bfd354f0551cbab7004924239809dca1bfe20dfdeb199cccb5e11531c684ae0bd6ee6940b75f83c3b95693485fa44c59c2a61f542a SHA512 7055c0c05bb6b179bd0095b9c6c9d9392bfda343aa2a380db680e134b60ef074680c1aadcae7d4a3cae95ca21566c9c2f60482e0ca41425c372a575c2f7d3a9d
+AUX dnsdist.initd 1321 BLAKE2B 44fd27bb150dc2ff77acb7f91cf4c73398a483ef22d5920abfc0e3e061c78274d07223837fa5b1a45699a23be6b92ad0d09d21acf2d86ec1b4d6476a028d08e6 SHA512 5c535df831a7d513f65ada4b433366e00088ce82b5b17880ebb19a6c048b40b808f10ceb7baa6c4976da69420f81643c09c1b980a3bfaf7fd3ad344f95689a20
+DIST dnsdist-1.3.3.tar.bz2 971253 BLAKE2B e9c36969fc1e4b95b71a3f6885503aea2d527b4d9abce9cb137c290a21aee994a441c0e17c0bf985396fda51020b5ef910753554990259abb16641d93d2d1010 SHA512 c0e3435eafc1f7bcdf41346cecf7b089cc142716f94058f9ec262d0c6ad16467e0b8bed5abc648829c597120c94f998602849ded574e75bfc1a1fb70c1b719ad
+EBUILD dnsdist-1.3.3-r1.ebuild 2619 BLAKE2B ea4d0160d868605d48f5ff7b89974ed01dd4fe3308a8fde5c6f0998b274ef9f967b8216910ab67220547ee471758b127b8f4bd6257133c660ad53318a9edc45d SHA512 3d6ad071ee27455d0dbdd1db5459cbcb092e4949b0b88c2ab13d89a0aaf25dedeb09b4f924856b61dbbf09b0dc4b6473680ef38a5f946bcfb6911eb70357ca2b
+EBUILD dnsdist-9999.ebuild 2619 BLAKE2B ea4d0160d868605d48f5ff7b89974ed01dd4fe3308a8fde5c6f0998b274ef9f967b8216910ab67220547ee471758b127b8f4bd6257133c660ad53318a9edc45d SHA512 3d6ad071ee27455d0dbdd1db5459cbcb092e4949b0b88c2ab13d89a0aaf25dedeb09b4f924856b61dbbf09b0dc4b6473680ef38a5f946bcfb6911eb70357ca2b
+MISC metadata.xml 1017 BLAKE2B cf131f8ad5b5c9a55ea0400a54c79e458e0934ea1a7b53422baf6bd791285323b3f7024229f382922d427bf3498e32d0cc395917ac53a474d429c582d1df7bb1 SHA512 abc9c348a491f29826d26a430015b2f561bdfb071522be423c518f7c0c68ce7306bb7f41410c8a515980d0a1aa32d095076cab38aade271c3a59d48063b4d703
diff --git a/net-dns/dnsdist/dnsdist-1.2.0.ebuild b/net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild
index 81f8dbfc0f87..ed3b96e1ed6a 100644
--- a/net-dns/dnsdist/dnsdist-1.2.0.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.3.3-r1.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,25 +24,35 @@ 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="
+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:= )
+	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}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
 
 [[ ${PV} == 9999 ]] && DEPEND+="
 	app-text/pandoc
 	dev-util/ragel
+	dev-python/virtualenv
 "
 
 src_prepare() {
@@ -53,13 +63,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..ed3b96e1ed6a 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,25 +24,35 @@ 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="
+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:= )
+	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}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
 
 [[ ${PV} == 9999 ]] && DEPEND+="
 	app-text/pandoc
 	dev-util/ragel
+	dev-python/virtualenv
 "
 
 src_prepare() {
@@ -53,13 +63,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/files/dnsdist.initd b/net-dns/dnsdist/files/dnsdist.initd
index bfeef82d46f1..17c86ca431d4 100644
--- a/net-dns/dnsdist/files/dnsdist.initd
+++ b/net-dns/dnsdist/files/dnsdist.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="configcheck"
@@ -25,14 +25,14 @@ depend() {
 }
 
 start() {
-	checkpath -q -d ${PIDDIR} -o ${DNSDIST_USER}:${DNSDIST_GROUP} 
+	checkpath -q -d ${PIDDIR} -o ${DNSDIST_USER}:${DNSDIST_GROUP}
 
 	configcheck || return 1
 
 	ebegin "Starting dnsdist (${DNSDIST_INSTANCE})"
 	start-stop-daemon --start --exec $DNSDIST --pidfile ${PIDFILE} \
-		-- -d -p ${PIDFILE} -u ${DNSDIST_USER} -g ${DNSDIST_GROUP} \
-		-C $DNSDIST_CONFFILE ${DNSDIST_OPTIONS} 
+		-b -- -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 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>