gentoo auto-resync : 11:09:2023 - 16:38:38

3 files changed, 8 insertions, 91 deletions

diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index bbd53f0531e5..81a4811a9f10 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -2,12 +2,10 @@ AUX dnsdist-1.7.3-gcc13.patch 1970 BLAKE2B ac671f45112bb0b9d79c7385a0936382ea64d
 AUX dnsdist.conf.example 524 BLAKE2B e9d140129dfbd276d1fb927d73bee4e4c29920ae70d587765ea5d432f02694b1a8583340c2e14e191bbdf5ddd5b921274cb2336c3520839d7cfe6f399a4d6c26 SHA512 385bee5725d927feb50fc0f40cd48cd365a495e39c0d947aa53dc454d84b7fe3806cd1d206056c96d111e7251db2cda27570ff8154c70bed145d37bc7d1db01d
 AUX dnsdist.confd 266 BLAKE2B c201b0aa3599ea7606e998348d777796ff391f3d4b0e46744160298456c86a9d9bbf65d1a339c0c13db4c796efb7c3adba01110882542fe501c735c9dd190f92 SHA512 935afc768ae56d017f6dee8bed7a3e92615055a0d4d2ae9980afef1b8f353da0e8bd6e20b914602e50b116ad33ef17ba05535b225af8b8da9ad005694edc071f
 AUX dnsdist.initd 1337 BLAKE2B e2619182674439be6942a0a936208326c12cfc2839bba4fd6a2ca3653ac6083458ebf2b644d2db63c187ed33ba2bef3437680714bb76dfc7632e1b62149a6f6a SHA512 99e38a58c97dd206ea82ffc783102feaa28f74bec5e03c1790e2db0f428f8228eec43617b2c951f22320e10dbd42ddfbf40650fed28608428f9c48eec3640a8d
-DIST dnsdist-1.5.1.tar.bz2 1068061 BLAKE2B 1c0fdd181b62b96fcd433581715cea9dc204fcdd2f65efd26a5293cc9c17d904e0937b51ba33d2dc01ecc8044f491ba2c6c8720c0816587fa5082da73108783e SHA512 68fe5f55fd081ed80a620933af9f8310be0e21c86ba449a9c557975b5c83f4b64e3002e6032dc002582d081e70e1ec2ff080c5d8389fd46a9896bdafd5a41f9f
-DIST dnsdist-1.6.1.tar.bz2 1328069 BLAKE2B a9e9c0cb35ebc2ecd93d7fa0d6d3961b02d711da2df56240335786a5d2e529d4a7e8716f578b6e935edd3bc79dfed767d358b9feaff32dd9cd65993ef0b97b71 SHA512 68e114eeb1a7ae8a4ce52a7de31095c46d0ba8f572676a8ef1e858b97da199c04ec88656c7642160ba07b7db325cc2a49cd91794da8dd2e81a5301d089c34f90
 DIST dnsdist-1.7.3.tar.bz2 1379011 BLAKE2B e7d1cb9dba3d3ad1dd696d324697ffac60863112eae83307237639bea339f7ed1c3f320002d3467a44ab38a9ea60ade95fff43645c889d29465760f7f467b996 SHA512 2a39096709db5b41cf3bd21170689bc85ad2cd550896d02ddd85eff7410780ea59d6cf8e08b0a08962ee93b49b7f3228dfa649275453215e23c25098aca40e1a
 DIST dnsdist-1.8.0.tar.bz2 1480500 BLAKE2B 47cfcfe3756cdc4520c1ba1e11b7d60191125ef900ba829ff7437ac2041352b845ab5f7183f53fea9b3aa6f44c5745de3878c2b72f2be048fa57d2c2e9325c0c SHA512 426db3e83729bd2f8a8c8b1c02d719c6618acc0aec09d1f2670c159d441c1cad2fdc85c5ffe919e76d1b1e8e24198bf29133802cb857dfacde2dfed2532001f1
-EBUILD dnsdist-1.5.1-r101.ebuild 2260 BLAKE2B 6684dd21b7ffa954bce051a28d657aee28e230ac44193bb0b158a4739723ab430636b9d399e2de887a84a15eaee9ea9806272b547f1c15ff6ce3f7630060c81f SHA512 60eddcd719cadb629dc20737b33fc0cd4b0dbc1bb25203120ec2924618049d5b650eade36837db550fa82a6b5e78999f16c472b811e0943c6c2c8b20e9c4a03f
-EBUILD dnsdist-1.6.1-r1.ebuild 2167 BLAKE2B a61d12aef81bd6bb5f31b6d1cba4cec51befea7dbd07e163266595d48049e5aacb7cc57aef5f4518baab737f7535b25ea19c7d7cb5e0cb88d39c27a3919c5a95 SHA512 73a1d09809e21cd47779c7e8ca60fcabab48d4b26562ce08fd4a305365e421a2f27e9cc0c13123d9a036d3b9aa129d473e9958c776c1a0e8904237ff18424230
+DIST dnsdist-1.8.1.tar.bz2 1492793 BLAKE2B 84fdf2f360c41ea235f3989d2bc14ad05e98d7b51dd20d983e7ad53ce5a6c00c7075b673e8a15fe3fd710a4e15c80db4d7431256bfb4291bd5785482d3f7f7e5 SHA512 db50c56587084ebdea3eb7f8e5b79178aea67b608cf6afce1453932b5225b3474a459cdc3dc8e4618a36a9edb405403dfefaed7fadd5848b5612de6bfb356f3a
 EBUILD dnsdist-1.7.3-r1.ebuild 2291 BLAKE2B 22557b7a46d9ebbdd7175a9ec45fa3dab45efdb6a492822f0d2d9b690a837920606c5c43ee1a5878f88b7673bac29e15360dad0d988efc3d61d93e9aaf4c3bd6 SHA512 88546d5480182f24d07b8159787091152814ce2c17d57eb6c46c77d879ba221a2d8f9974ee5aea2fcb2d3e2082333ceaac4a86bbc9d438c26558572fab8a5546
 EBUILD dnsdist-1.8.0.ebuild 2237 BLAKE2B 0ceb0e09c542ebd775c93d1adbcd4630ee82f64f90318a6764e54a80eaac0ccc28702bd9bf581064ac64c7cf1debfe25e4565e6357d33aa42d543e49045b557f SHA512 6d531a84be771b5e1913bba6daa2acba9dc8af28196d70b2446efee85d9fcf10e5da43b38d867af2c93eb7fd12dbd3573a774b46529f76b970b622a4964fc486
+EBUILD dnsdist-1.8.1.ebuild 2237 BLAKE2B 0ceb0e09c542ebd775c93d1adbcd4630ee82f64f90318a6764e54a80eaac0ccc28702bd9bf581064ac64c7cf1debfe25e4565e6357d33aa42d543e49045b557f SHA512 6d531a84be771b5e1913bba6daa2acba9dc8af28196d70b2446efee85d9fcf10e5da43b38d867af2c93eb7fd12dbd3573a774b46529f76b970b622a4964fc486
 MISC metadata.xml 1209 BLAKE2B 3a83a0be1b4d466d2436778b6212fda71ecf99aa00a6ad28bdeaec99ba86374585715ff477cc403247cdebeb7a99c8d91d064830e971ddd085fc3fd632393e21 SHA512 cc2a1468b6ea1e2a79b7655505b9a1c6d15354048df94ce3a406c84bc376664a46567d1c272e916e1692764495bf30ca4b26e1ad6d8801d03a57e9d4c2a95342
diff --git a/net-dns/dnsdist/dnsdist-1.5.1-r101.ebuild b/net-dns/dnsdist/dnsdist-1.5.1-r101.ebuild
deleted file mode 100644
index ce95d87da335..000000000000
--- a/net-dns/dnsdist/dnsdist-1.5.1-r101.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit lua-single
-
-DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="https://dnsdist.org"
-
-SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="dnscrypt dnstap doh gnutls +lmdb regex remote-logging snmp +ssl systemd test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${LUA_REQUIRED_USE}
-		dnscrypt? ( ssl )
-		gnutls? ( ssl )
-		doh? ( ssl !gnutls )"
-
-RDEPEND="acct-group/dnsdist
-	acct-user/dnsdist
-	dev-libs/boost:=
-	dev-libs/libedit:=
-	dev-libs/libsodium:=
-	dnstap? ( dev-libs/fstrm:= )
-	doh? ( www-servers/h2o:=[libh2o] )
-	lmdb? ( dev-db/lmdb:= )
-	regex? ( dev-libs/re2:= )
-	remote-logging? ( >=dev-libs/protobuf-3:= )
-	snmp? ( net-analyzer/net-snmp:= )
-	ssl? (
-		gnutls? ( net-libs/gnutls:= )
-		!gnutls? ( dev-libs/openssl:= )
-	)
-	systemd? ( sys-apps/systemd:0= )
-	${LUA_DEPS}
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/dnsdist \
-		--with-lua="${ELUA}" \
-		$(use_enable doh dns-over-https) \
-		$(use_enable dnscrypt) \
-		$(use_enable dnstap) \
-		$(use_with lmdb ) \
-		$(use_with regex re2) \
-		$(use_with remote-logging protobuf) \
-		$(use_with snmp net-snmp) \
-		$(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)
-		sed 's/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl$libdir'\''/hardcode_libdir_flag_spec_CXX='\''$wl-rpath $wl\/$libdir'\''/g' \
-			-i "${S}/configure"
-}
-
-src_install() {
-	default
-
-	insinto /etc/dnsdist
-	doins "${FILESDIR}"/dnsdist.conf.example
-
-	newconfd "${FILESDIR}"/dnsdist.confd ${PN}
-	newinitd "${FILESDIR}"/dnsdist.initd ${PN}
-}
-
-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.6.1-r1.ebuild b/net-dns/dnsdist/dnsdist-1.8.1.ebuild
index cf37eb114b6d..c0ec5088ac0e 100644
--- a/net-dns/dnsdist/dnsdist-1.6.1-r1.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.8.1.ebuild
@@ -5,13 +5,13 @@ EAPI=7
 
 LUA_COMPAT=( lua5-{1..4} luajit )
 
-inherit lua-single
+inherit flag-o-matic lua-single
 
 DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
 HOMEPAGE="https://dnsdist.org"
 
 SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.bz2"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -39,12 +39,16 @@ RDEPEND="acct-group/dnsdist
 	)
 	systemd? ( sys-apps/systemd:0= )
 	${LUA_DEPS}
+	net-libs/nghttp2
 "
 
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_configure() {
+	# bug #822855
+	append-lfs-flags
+
 	econf \
 		--sysconfdir=/etc/dnsdist \
 		--with-lua="${ELUA}" \