commit: a0e273e96c1bd0ccf03461639fe4f969388705dd Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Wed Feb 26 14:47:38 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Mar 10 02:49:50 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0e273e9
net-dns/knot-resolver: drop 6.0.9 also removed prometheus useflag, optfeature now Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Closes: https://github.com/gentoo/gentoo/pull/40773 Signed-off-by: Sam James <sam <AT> gentoo.org> net-dns/knot-resolver/Manifest | 2 - net-dns/knot-resolver/knot-resolver-6.0.9.ebuild | 175 ----------------------- net-dns/knot-resolver/metadata.xml | 3 - 3 files changed, 180 deletions(-) diff --git a/net-dns/knot-resolver/Manifest b/net-dns/knot-resolver/Manifest index ce87c6ff3a79..5254f4b0dbd8 100644 --- a/net-dns/knot-resolver/Manifest +++ b/net-dns/knot-resolver/Manifest @@ -4,5 +4,3 @@ DIST knot-resolver-6.0.10.tar.xz 2138660 BLAKE2B 9a80e76272b4cb7a30b75b832627529 DIST knot-resolver-6.0.10.tar.xz.asc 833 BLAKE2B 5bd7baba40d6577764b3f0d985a2ee7edaff99ce7fc1cd89f42488504c657f1be2a5bf7267eaed225281be6f8154fb21c92ab7ee1d34b844b3001b7ad391d5b6 SHA512 26b8faffe10529559ec9081a567d6c740a9c61f81edf766ea1c32b01129edf9a4049a2844df0c27cb0fd5008e299d6431b099b0a09ac5624f24155d8b1a3b53f DIST knot-resolver-6.0.11.tar.xz 2139448 BLAKE2B 0d96790ce3ecb85d9466d90683de77d46f75d360f032ae94d18a7b493eedb58c86f6274a5de2eaed4eca792b3ef6ff673120c3a7526e9167d404b8dd0ccd20f3 SHA512 7a3dd8e925a8ba44c66d00175fd689b4daddacde8ffb96712c3770dbaf1c54a2cb90dda340fe674dc11e1222fdd3e4112aa3df72270f422b4c8d2c60f9af9cea DIST knot-resolver-6.0.11.tar.xz.asc 833 BLAKE2B 3e959798699c1dc0698cdb6e0c8509ba8a3287eab485511b18e01cc80e906149095ca9a537b3b4c45969c338022b61afd6377f106506b59f969fdf44d5e729be SHA512 cf6b034a9ad0daf118c18179dea1c32c9de604581735d89127c9c0fe80122a6159b49ec6176bee0955114d12f8ad20e29958a841c9b6464551e3def69d2e3932 -DIST knot-resolver-6.0.9.tar.xz 2127432 BLAKE2B 185a78737f6830b4ff036a537f2ceb032388e50ef050c239f0ce21d84a1fa2d1632aa95802a73d4ff80bcb18cef23f444a10b594121cd449cee3c12182dcab2e SHA512 98b3074927d9cb484738592a6cad84b818130aafd91473ee6e17458884c3ff5cb528e22d020d8b8b92b429feb2e3432e9cb77574f505bdf2e5f6f286009ecd59 -DIST knot-resolver-6.0.9.tar.xz.asc 833 BLAKE2B 10c9c895bd3a728b8a9d3769cb72ccc5dbf5c17164df388d1519c5e4734e21ee568c079191ada6ff76f1a150be911d79c5d1ebb02597c32d1aa5003a5ceaf02d SHA512 b46a9346deda328fbe6638657e2d87903052ac36b11ff5d4f68bd145487687c1c2f43a7b62e40585f5853816b7ed66b1af3b98642e882f72e36cf521f5eb1bce diff --git a/net-dns/knot-resolver/knot-resolver-6.0.9.ebuild b/net-dns/knot-resolver/knot-resolver-6.0.9.ebuild deleted file mode 100644 index 1475584ef940..000000000000 --- a/net-dns/knot-resolver/knot-resolver-6.0.9.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 2024-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( luajit ) -DISTUTILS_EXT=1 -DISTUTILS_OPTIONAL=1 -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_PEP517=poetry -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 lua-single meson tmpfiles verify-sig - -DESCRIPTION="A scaleable caching DNS resolver" -HOMEPAGE="https://www.knot-resolver.cz https://gitlab.nic.cz/knot/knot-resolver"; -SRC_URI=" - https://knot-resolver.nic.cz/release/${P}.tar.xz - verify-sig? ( https://knot-resolver.nic.cz/release/${P}.tar.xz.asc ) -" - -LICENSE="Apache-2.0 BSD CC0-1.0 GPL-3+ LGPL-2.1+ MIT" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="caps dnstap jemalloc +manager nghttp2 prometheus systemd test xdp" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - ${LUA_REQUIRED_USE} - manager? ( ${PYTHON_REQUIRED_USE} ) -" - -RDEPEND=" - ${LUA_DEPS} - acct-group/knot-resolver - acct-user/knot-resolver - dev-db/lmdb:= - dev-libs/libuv:= - >=net-dns/knot-3.3:=[xdp?] - net-libs/gnutls:= - caps? ( sys-libs/libcap-ng ) - dnstap? ( - dev-libs/fstrm - dev-libs/protobuf-c:= - ) - jemalloc? ( dev-libs/jemalloc:= ) - manager? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - app-admin/supervisor[${PYTHON_USEDEP}] - dev-python/aiohttp[${PYTHON_USEDEP}] - dev-python/jinja2[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/typing-extensions[${PYTHON_USEDEP}] - prometheus? ( dev-python/prometheus-client[${PYTHON_USEDEP}] ) - ') - ) - nghttp2? ( net-libs/nghttp2:= ) - systemd? ( sys-apps/systemd:= ) -" -DEPEND=" - ${RDEPEND} - test? ( - dev-util/cmocka - manager? ( - $(python_gen_cond_dep ' - dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/tomli[${PYTHON_USEDEP}] - ') - ) - ) -" -BDEPEND=" - virtual/pkgconfig - manager? ( - ${DISTUTILS_DEPS} - ${PYTHON_DEPS} - ) - verify-sig? ( >=sec-keys/openpgp-keys-knot-resolver-20240304 ) -" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/${PN}.gpg - -PATCHES=( - "${FILESDIR}"/${PN}-5.5.3-docdir.patch - "${FILESDIR}"/${PN}-5.5.3-nghttp-openssl.patch - "${FILESDIR}"/${PN}-6.0.9-libsystemd.patch - "${FILESDIR}"/${PN}-6.0.9-config-example.patch - "${FILESDIR}"/${PN}-6.0.9-sd_notify_alt.patch - "${FILESDIR}"/${PN}-6.0.9-pytest_tomli.patch -) - -pkg_setup() { - lua-single_pkg_setup - use manager && python-single-r1_pkg_setup -} - -src_prepare() { - default - use manager && distutils-r1_src_prepare -} - -src_configure() { - local emesonargs=( - --localstatedir "${EPREFIX}"/var # double lib - # https://bugs.gentoo.org/870019 - -Dauto_features=disabled - # requires non-gentoo lua modules (basexx, cqueues) - -Dconfig_tests=disabled - -Ddoc=disabled - -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} - -Dinstall_kresd_conf=enabled - -Dopenssl=disabled - -Dmalloc=$(usex jemalloc jemalloc disabled) - -Dsystemd_files=enabled - $(meson_feature caps capng) - $(meson_feature dnstap) - $(meson_feature nghttp2) - $(meson_feature systemd) - $(meson_feature systemd systemd_legacy_units) - $(meson_feature test unit_tests) - ) - meson_src_configure -} - -src_compile() { - meson_src_compile - use manager && distutils-r1_src_compile -} - -src_test() { - meson_src_test - use manager && distutils-r1_src_test -} - -python_test() { - epytest tests/manager -} - -src_install() { - meson_src_install - if use manager; then - distutils-r1_src_install - newinitd "${FILESDIR}"/knot-resolver.initd knot-resolver - newconfd "${FILESDIR}"/knot-resolver.confd knot-resolver - else - rm "${ED}"/usr/lib/systemd/system/knot-resolver.service || die - fi - fowners -R ${PN}: /etc/${PN} - newinitd "${FILESDIR}"/kresd.initd-r2 kresd - newconfd "${FILESDIR}"/kresd.confd-r1 kresd - newinitd "${FILESDIR}"/kres-cache-gc.initd kres-cache-gc -} - -pkg_postinst() { - tmpfiles_process knot-resolver.conf - if use manager; then - elog "You choose the new way, called the manager, to start Knot Resolver :" - use systemd && elog " systemctl start knot-resolver.service" - use !systemd && elog " /etc/init.d/knot-resolver start" - elog "Configuration file : /etc/knot-resolver/config.yaml" - elog "" - elog "The older way, without the manager, is still available :" - else - elog "You choose the older way, without the manager, to start Knot Resolver :" - fi - use systemd && elog " systemctl start [email protected]" - use !systemd && elog " /etc/init.d/kresd start" - elog "Configuration file : /etc/knot-resolver/kresd.conf" - elog "" - elog "Optional garbage collector : /etc/init.d/kres-cache-gc" - elog "" - use !manager && elog "The new way is available with the useflag manager." -} diff --git a/net-dns/knot-resolver/metadata.xml b/net-dns/knot-resolver/metadata.xml index 426f3c4d16c2..02d7316545d4 100644 --- a/net-dns/knot-resolver/metadata.xml +++ b/net-dns/knot-resolver/metadata.xml @@ -22,9 +22,6 @@ <flag name="nghttp2"> DNS-over-HTTPS support </flag> - <flag name="prometheus"> - Metrics exported in Prometheus - </flag> <flag name="xdp"> Enable eXpress Data Path </flag>
