commit: 799d809054c385e665f35704e4cb196704f3ecdd Author: Peter Leese <inbox <AT> peterleese <DOT> org> AuthorDate: Fri Jan 23 06:54:18 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Jan 30 15:33:52 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=799d8090
net-misc/kea: Fix build with boost 1.90 Add boost patch file for 1.90 * asturm 2026-01-30: Fix upstream boost-1.89 patch to require >=boost-1.69 Split boost-1.90 patch to reflect upstream origin from 2 commits Source boost-1.90-1 from final version committed upstream (c54dfd47) Put all patches into patchset tarball pulled from devspace Bug: https://bugs.gentoo.org/969070 Signed-off-by: Peter Leese <inbox <AT> peterleese.org> Part-of: https://github.com/gentoo/gentoo/pull/45545 Closes: https://github.com/gentoo/gentoo/pull/45545 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-misc/kea/Manifest | 1 + net-misc/kea/files/kea-3.0.1-boost-1.89.patch | 53 ---------------------- net-misc/kea/kea-3.0.2-r1.ebuild | 6 +-- .../{kea-3.0.2-r1.ebuild => kea-3.0.2-r2.ebuild} | 10 ++-- 4 files changed, 9 insertions(+), 61 deletions(-) diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest index 53b780480c3c..c112e84a6d5e 100644 --- a/net-misc/kea/Manifest +++ b/net-misc/kea/Manifest @@ -1,3 +1,4 @@ +DIST kea-3.0.2-patchset.tar.xz 6216 BLAKE2B e004eff1c89d6ba749018e80b0023d179f6c84dc271f9c187cc642355eda83d2c06cda2f8518377b14268038a2092b62637ca2eaa7e058f0bf5c27f68f5d935a SHA512 e9313f72c661749809696d857cd4d4bc56f96c61b9a9eed6f2bf3dd3639a167372077a3de37760009e32c724cf02a94c6c871d78888d3852096f91de3bfd6b79 DIST kea-3.0.2.tar.xz 6634300 BLAKE2B 8c7dccbb118f09e0c4dbd0fbb1889fba03bda633bedd6b05f91445d0979bbbedd8c7150ceaad73a280e58401eba4671398c65717f747b661fa0891e310dac1ea SHA512 454081be248d6021aa99bfe027111f093795b123c827c6062e29a215856d29ec827f5757a1a6fc3351e74276563f101b52f26db2098cdd0b4e6f86e1b3449ba3 DIST kea-3.0.2.tar.xz.asc 833 BLAKE2B 7345cfc7fb6bec6a9ec06f7d9861cc43b0b11bdc6e80acdd6016dc7677cbe0af659fb4cb0d62b6acfcf1c53e47e936400e75096abcd8d66b7dd5e6ef8b520b58 SHA512 0735968604d1ac0821f00a01e3f61134e118ec0fb26846eb6413867c855923a148316ef20022e9a51af8507711eeadaf68b2da85504332cf8c882e75fffa8793 DIST kea-manpages-3.0.2.tar.gz 6743 BLAKE2B 30d254a0db2b635493a0f9fe5480cf731978532f860d9acf74f8d6114539f0f9e594aa68aeb1181ee05da51707fd35a900be72c79bc7abf31124c1c5ea439ef4 SHA512 cfcf91abfd34e44319d4ea58de15bc068e5c7be7c94f211e85890009ef285ab84ca310dbe4ba8879a4797574715086861755cd528ea90a65e88980adeabc43a1 diff --git a/net-misc/kea/files/kea-3.0.1-boost-1.89.patch b/net-misc/kea/files/kea-3.0.1-boost-1.89.patch deleted file mode 100644 index 76b427430e8f..000000000000 --- a/net-misc/kea/files/kea-3.0.1-boost-1.89.patch +++ /dev/null @@ -1,53 +0,0 @@ -https://bugs.gentoo.org/963749 -https://gitlab.isc.org/isc-projects/kea/-/issues/4085 -https://gitlab.isc.org/isc-projects/kea/-/merge_requests/2771 -Fixes the build with Boost 1.89 -diff --git a/meson.build b/meson.build -index ab2fa78212..8592196856 100644 ---- a/meson.build -+++ b/meson.build -@@ -189,7 +189,7 @@ message(f'Detected system "@SYSTEM@".') - - #### Dependencies - --boost_dep = dependency('boost', version: '>=1.66', modules: ['system']) -+boost_dep = dependency('boost', version: '>=1.66') - dl_dep = dependency('dl') - threads_dep = dependency('threads') - add_project_dependencies(boost_dep, dl_dep, threads_dep, language: ['cpp']) -diff --git a/src/lib/asiodns/io_fetch.cc b/src/lib/asiodns/io_fetch.cc -index c140676f66..ee2575a884 100644 ---- a/src/lib/asiodns/io_fetch.cc -+++ b/src/lib/asiodns/io_fetch.cc -@@ -24,6 +24,7 @@ - - #include <boost/scoped_ptr.hpp> - #include <boost/date_time/posix_time/posix_time_types.hpp> -+#include <boost/asio/deadline_timer.hpp> - - #include <functional> - #include <unistd.h> // for some IPC/network system calls -diff --git a/src/lib/asiodns/tests/io_fetch_unittest.cc b/src/lib/asiodns/tests/io_fetch_unittest.cc -index 7b4cd0568e..3d04230f02 100644 ---- a/src/lib/asiodns/tests/io_fetch_unittest.cc -+++ b/src/lib/asiodns/tests/io_fetch_unittest.cc -@@ -21,6 +21,7 @@ - - #include <gtest/gtest.h> - #include <boost/date_time/posix_time/posix_time_types.hpp> -+#include <boost/asio/deadline_timer.hpp> - - #include <algorithm> - #include <cstdlib> -diff --git a/src/lib/asiolink/interval_timer.cc b/src/lib/asiolink/interval_timer.cc -index fa0d9e1b67..4ac0b20c7d 100644 ---- a/src/lib/asiolink/interval_timer.cc -+++ b/src/lib/asiolink/interval_timer.cc -@@ -12,6 +12,7 @@ - #include <boost/enable_shared_from_this.hpp> - #include <boost/noncopyable.hpp> - #include <boost/shared_ptr.hpp> -+#include <boost/asio/deadline_timer.hpp> - - #include <exceptions/exceptions.h> - diff --git a/net-misc/kea/kea-3.0.2-r1.ebuild b/net-misc/kea/kea-3.0.2-r1.ebuild index 223e63ef4170..52280c23a646 100644 --- a/net-misc/kea/kea-3.0.2-r1.ebuild +++ b/net-misc/kea/kea-3.0.2-r1.ebuild @@ -3,6 +3,7 @@ EAPI=8 +PATCHSET=${P}-patchset PYTHON_COMPAT=( python3_{11..14} ) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/isc.asc inherit eapi9-ver flag-o-matic meson python-r1 systemd tmpfiles @@ -19,6 +20,7 @@ else https://downloads.isc.org/isc/kea/${PV}/${P}.tar.xz !doc? ( https://codeberg.org/peter1010/kea-manpages/archive/kea-manpages-${PV}.tar.gz ) verify-sig? ( https://downloads.isc.org/isc/kea/${PV}/${P}.tar.xz.asc ) + https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz " KEYWORDS="amd64 arm arm64 ~x86" fi @@ -65,9 +67,7 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-isc ) " -PATCHES=( - "${FILESDIR}"/kea-3.0.1-boost-1.89.patch -) +PATCHES=( "${WORKDIR}"/${PATCHSET}/kea-3.0.1-boost-1.89.patch ) python_check_deps() { use doc || return 0; diff --git a/net-misc/kea/kea-3.0.2-r1.ebuild b/net-misc/kea/kea-3.0.2-r2.ebuild similarity index 98% copy from net-misc/kea/kea-3.0.2-r1.ebuild copy to net-misc/kea/kea-3.0.2-r2.ebuild index 223e63ef4170..cdf10835e33d 100644 --- a/net-misc/kea/kea-3.0.2-r1.ebuild +++ b/net-misc/kea/kea-3.0.2-r2.ebuild @@ -3,6 +3,7 @@ EAPI=8 +PATCHSET=${P}-patchset PYTHON_COMPAT=( python3_{11..14} ) VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/isc.asc inherit eapi9-ver flag-o-matic meson python-r1 systemd tmpfiles @@ -19,8 +20,9 @@ else https://downloads.isc.org/isc/kea/${PV}/${P}.tar.xz !doc? ( https://codeberg.org/peter1010/kea-manpages/archive/kea-manpages-${PV}.tar.gz ) verify-sig? ( https://downloads.isc.org/isc/kea/${PV}/${P}.tar.xz.asc ) + https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz " - KEYWORDS="amd64 arm arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi LICENSE="MPL-2.0" @@ -31,7 +33,7 @@ REQUIRED_USE="shell? ( ${PYTHON_REQUIRED_USE} )" RESTRICT="!test? ( test )" COMMON_DEPEND=" - >=dev-libs/boost-1.66:= + >=dev-libs/boost-1.69:= dev-libs/log4cplus:= kerberos? ( virtual/krb5 ) mysql? ( @@ -65,9 +67,7 @@ BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-isc ) " -PATCHES=( - "${FILESDIR}"/kea-3.0.1-boost-1.89.patch -) +PATCHES=( "${WORKDIR}"/${PATCHSET} ) python_check_deps() { use doc || return 0;
