commit: 8d623d1be87560ec579ca2a478b1491ed85224dd Author: Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com> AuthorDate: Wed Aug 6 18:49:26 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Sep 6 15:04:19 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d623d1b
net-dns/dnsdist: fix conditional rust setup & test phase, add USE=doc Closes: https://bugs.gentoo.org/961155 Closes: https://bugs.gentoo.org/962342 Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com> Part-of: https://github.com/gentoo/gentoo/pull/43659 Signed-off-by: Sam James <sam <AT> gentoo.org> net-dns/dnsdist/Manifest | 1 + net-dns/dnsdist/dnsdist-2.0.0.ebuild | 22 ++++++++++++++++------ net-dns/dnsdist/metadata.xml | 1 + 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/net-dns/dnsdist/Manifest b/net-dns/dnsdist/Manifest index 15e56df7915a..e3b3d9492bc8 100644 --- a/net-dns/dnsdist/Manifest +++ b/net-dns/dnsdist/Manifest @@ -1,4 +1,5 @@ DIST dnsdist-1.9.10.tar.bz2 1598472 BLAKE2B ea66ca17ef66ecc64fd3a7379b22c2b0448c2a41f325e574a4edb20dfe408315be84a407b78f30a441479fbbcba31a28da2e310c275877739918ad3f9870acd1 SHA512 d7249861bb5454dce3d179701e1c686c5c5ed177ca39b07ca6b1f27d2ab7a014d0d255ee6b70153962dc5d9a84545ae4a4a55c53c8e75f308cda5406eed57e9b DIST dnsdist-1.9.9.tar.bz2 1609983 BLAKE2B 54517c396d8b5b546e9bcc5890f6df0cfa8470b65d9c7dcece0c7d503fff3fc0d4e2898a7bda8e16f9935279849128293967b38865345fa4c963705b9c9b8cad SHA512 addd72f5324d75811601d9efe7af8846a448694172a14066b3ae53c7e53195f6955a038f97411703f66ce6bafd02846bf3c679839c473de6f7fc9ebecb8e6ca9 DIST dnsdist-2.0.0.tar.xz 2275260 BLAKE2B 890bd555ec539ef5d3e9906e15410006471f1dc4848c768a3c631fe399f35e8b42ffc01a53aa9ff3b2f1248d635b9f9b90c1527f7e391848795b28c065398290 SHA512 dee84019ae317bc4e0b4d2f94e38a221bfa94460d3bb8d82ad152eed99bef1e2bd2631f5c1e6930fb9957a928ed9cf891ef8165137cd8ec1902fb734d5aab8fb +DIST dnsdist-docs-2.0.0.tar.xz 1384988 BLAKE2B faaf319de9ae2d85870cf62df791769fe2600a0af4c76b4b075337be32acfcf735d8193abff5deb45726fe8005f9909d9b7fd760c8c91db1b875f5647e453a5c SHA512 df652d67c55f8478331652dd8f31bc90c8a6fb4eb139706e4ac0a4721c3aa84f6f7b2da0c0de76c801f7a1d56bb01415384b27ee6b2ade6965d14d7a25958f91 DIST dnsdist-rust-2.0.0-crates.tar.xz 5268364 BLAKE2B 36b370eacb7332d04de0fa1be2a49983c030c94df00abcc6681180b1ad5fa8bfe3e19744543b3707e305d57649837a632c1400fd4ae1b4626f084310db8f9bad SHA512 a9f1e10a71a9fb2e6879077224823dd278f1a27c5698076e69bc4bcdf89cff5e54ffd0fce90113131358398289400da263b90c895d167cb3c007fcc96654e116 diff --git a/net-dns/dnsdist/dnsdist-2.0.0.ebuild b/net-dns/dnsdist/dnsdist-2.0.0.ebuild index 839d96f619e2..3efa0746c516 100644 --- a/net-dns/dnsdist/dnsdist-2.0.0.ebuild +++ b/net-dns/dnsdist/dnsdist-2.0.0.ebuild @@ -13,12 +13,13 @@ inherit cargo flag-o-matic lua-single python-any-r1 DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer" HOMEPAGE="https://www.dnsdist.org/index.html"; SRC_URI="https://downloads.powerdns.com/releases/${P}.tar.xz + doc? ( https://www.applied-asynchrony.com/distfiles/${PN}-docs-${PV}.tar.xz ) yaml? ( https://www.applied-asynchrony.com/distfiles/${PN}-rust-${PV}-crates.tar.xz )" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="bpf cdb dnscrypt dnstap doh doh3 ipcipher lmdb quic regex snmp +ssl systemd test web xdp yaml" +IUSE="bpf cdb dnscrypt dnstap doc doh doh3 ipcipher lmdb quic regex snmp +ssl systemd test web xdp yaml" RESTRICT="!test? ( test )" REQUIRED_USE="${LUA_REQUIRED_USE} @@ -58,7 +59,7 @@ BDEPEND="$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') pkg_setup() { lua-single_pkg_setup python-any-r1_pkg_setup - rust_pkg_setup + use yaml && rust_pkg_setup } python_check_deps() { @@ -72,10 +73,6 @@ src_prepare() { rm -f README.md } -src_compile() { - emake -} - src_configure() { # bug #822855 append-lfs-flags @@ -111,9 +108,22 @@ src_configure() { econf "${myeconfargs[@]}" } +# explicitly implement src_compile/test to override the +# otherwise automagic cargo_src_compile/test phases + +src_compile() { + emake +} + +src_test() { + emake check +} + src_install() { default + use doc && dodoc -r "${WORKDIR}"/html + insinto /etc/dnsdist doins "${FILESDIR}"/dnsdist.conf.example diff --git a/net-dns/dnsdist/metadata.xml b/net-dns/dnsdist/metadata.xml index 6365a7704929..af8cd2e1de0a 100644 --- a/net-dns/dnsdist/metadata.xml +++ b/net-dns/dnsdist/metadata.xml @@ -16,6 +16,7 @@ <flag name="bpf">Enable support for eBPF socket filtering</flag> <flag name="dnscrypt">Enable the ability to act as a DNSCrypt server</flag> <flag name="dnstap">Enable support for dnstap</flag> + <flag name="doc">Install the HTML documentation</flag> <flag name="doh">Enable support for dns over http via <pkg>net-libs/nghttp2</pkg></flag> <flag name="doh3">Enable support for dns over http3 via <pkg>net-libs/quiche</pkg></flag> <flag name="ipcipher">Enable support for ipcipher via <pkg>dev-libs/openssl</pkg></flag>
