gentoo auto-resync : 19:10:2022 - 07:57:56

7 files changed, 141 insertions, 226 deletions

diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index 55fd5b41f710..3d3c95901c74 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,7 +1,7 @@
+AUX ax_gtest.m4 2121 BLAKE2B f5cfb225474817b60fe98f495f68e4b5485ded190accb1087e87341c1192ed61bf6aa471d86990db322137fc329d42c79c515e577e93bd6cace66a74edbb565c SHA512 6dae428115135a4a9fdc17feabf91b2325a88361e042aa43bf830912299549432788d263242a3cc60a5900b27fbaa8e9570c8541d422fd547eb8815003c2c487
 AUX kea-1.8.2-boost-1.77.0.patch 279 BLAKE2B fbdcabb2d950f917252b435d0ceab9bae26c8659bca7d106e4ac2e837962e3ce28677911fba13dfa85def739f2e004981eadb14950cfd4fd5a710348f850c16d SHA512 40aae1862a0c6552380511e7a01d35ac1535f7c6ad378df11860cfe173eb04b7c0f14f0fbd4d38dc932a3ec281870a2c8cf92caa05ee2208c631c52bfd779e26
-AUX kea-1.8.2-fix-cxx11-detection.patch 1388 BLAKE2B 96adf841b29936442b81aed5cd5d4bf9433db039026ca8e7235499d6a52692b37915d9ee5df3247b9b5d08fb0a9ef3a448c202ef9081816acac253eb96f37c13 SHA512 5a71bbe97051577207d22791c284db27c7558c98fa886744cb8ec7208c0c2e5d2aeccb21c0eb461309019784b69ac6a82c4cf2456b6250df36b59f55c5d54bc2
-AUX kea-1.8.2-gtest.patch 5692 BLAKE2B 45a21b9fb903ce50b0b5aebc0476b0a244a08a23de471c0afd87604bbf4eae641413ab303b140f739fad07d0bea2c643dc64971c0bde00952c1f2fdf4aad77f2 SHA512 ad9d1c77c358e8b7a9d118e40c741ff516fa68487f485228ecb0f1005c24d155beff70ca314f3dcbe7e478fb1b1810eef7dac69aa4322f498d59f5917c7b1189
 AUX kea-1.9.10-gtest.patch 5496 BLAKE2B 2c931603f483f95b97f199f321e8a7c00a781fe8a77ec8b641b5deed8e39ef8a6068ddac96f75c4d098020d830058b0f0826ea431eda3c1c6bd1f7f3f9b6fa99 SHA512 295eb2403b909b5051344cf74f8eed683bbe11d10c40f7bebec16e6e89e58778cee1b226a595ae9b120de2ea9ee2264802f9aa83752dc8acca91f67137bfd4b8
+AUX kea-2.2.0-openssl-version.patch 388 BLAKE2B cdfc630658e365a1f3824ac3dcefdd98de5ad382f1a549f74b4703b86ef04c7e856888766bb83883b1cc6048a19381ff24e69dc00549acb813ac47e1f4ea374c SHA512 bda2ddab4f456a6df575090973e5f39174402367acbf1c6554c335175fe6f27ff2d50a086af516ab5c8aec1fafa7126a74408c82b7ad38b3f3e48411cadbd82b
 AUX kea-confd-r1 289 BLAKE2B da62fc34c87d791f765a7077020f7ca1c224c2b2bc86880e4bacdbc12e60840675750e2c5c71dc90e99a1d11d1e5e725f59d1045d4b973d6155d22876314aeb5 SHA512 9f74344bc39fd2d85d2e305060e35e96a43ec9775793f29d4140a2a6ebf40cc0e8c6b2766fd6ad1fef531fc4be66b004ce0631ac76ac7646df4e655d9a2805e6
 AUX kea-ctrl-agent.conf 3872 BLAKE2B 7f6ceb93556cc5628a23db12a5538e7af48f0fb6e30749567d5856950452d112533212e2d2b53f576c98d408bc0b5c479d2de7fe4f9d6d91d5d8ea0968814c1f SHA512 46ce645c5afbf10113f77e5d44496973aef482d5a0e8bb7b6123ed26863fdf3dad1b5b619922280f2573620628032429e0a32a709831bfa8f77f940a784e0fe1
 AUX kea-ctrl-agent.service 473 BLAKE2B 471322d7e870dd0736940fa24122bc70320a0af92ddf89cef4b925430ed40d91d696cd53e79671dab067251b219b4ed94d75e94e4520a6414bf420ac0338c284 SHA512 074315ff71ad42d292b3e4d3be40e7d39b019fb9a6a53a1b44ae391c55023e470a7432106a52721ab9f2f3a4a18e13b8881df317da00fac4e9dfea78cd7da7fe
@@ -13,9 +13,9 @@ AUX kea-dhcp6-server.service 446 BLAKE2B 3507204ce0d5ed2c1aa14d74fcff993c16d69a7
 AUX kea-dhcp6.conf 19710 BLAKE2B 3ce2b18b7b8402cdb98e247db3942314083c8b18c508fbe2160f43fdf8aaf37200676ae187de8a6f02c16af90faf0ea38cab64772a7f3ed280d97223fed5801f SHA512 a4504b4dc8e82981f1236ee70acf290c5704016c472a1f35a72911da76c5bd67280f7c39b2d5f3be394a0e375fdaf137cdaefa536fcd065c496c4c629422dff4
 AUX kea-initd-r1 2210 BLAKE2B 052fbbf03c6c1e8c66beb3161dbc8d46c6c704b7d931438039321177e792e1d7f08ccf17acb87d7c36af1878413c2f17cd00b951d4076c3be049cbe31de3e32a SHA512 051f4b86f083931c3934e2c63aeb45409bae5d50e6a91b29e642bf4cb609a539e2c23029b8dc70b48517a4646fa3db06961c823d804c514f05213be0b172cf9d
 AUX kea.tmpfiles.conf 61 BLAKE2B a0c31118e028dfbbdb372866b85f99e7b2b73a88bb1c2f27ebe5bb0ff19a77c96b13bb5ddc581af366c8bd104322eef196d849f8a333ca0c9eaffbce980c9443 SHA512 8a155fef71c89dda45b2920bdc62c6ec79946b5f7ba126a9627e35b62b8b283356a8be4a378aa33ff1f103ac608d6460fcd170baa3f097914d398e763a3a6d9e
-DIST kea-1.8.2.tar.gz 9005645 BLAKE2B fec1118ca34adc4bdafea13dd6c1c3abcd42df80043b621d1ed994e7ec6906a5d13e86a1bbb6dcbdfee32a4d70281c751b46c57d4866bd92557448ab7c602c30 SHA512 7bea9eb30ee819bd350ba3f64da7dc46d1176363e7243e934ff0f0498fcd47ef4eccb7fe8d8dd4f883ab9e376174aaba4fae06b20405181d46b6b12cfbdf7dd0
 DIST kea-2.0.2.tar.gz 9796557 BLAKE2B a859c4cc3f6686db2dcf640738b421499a816700d134ee9322290051c3a192bab482be4a4bdb2630113594a3af1cafe2b95abce4a463815a6404fe87fac227ad SHA512 edb7de227898fb7bd76dd8b503d02e07b4ba512b907b53399a5c45bd216820b342f00c1834858848ce8ff94aa3c228ceead0e2946cbcb1f75a03ca579630be83
-EBUILD kea-1.8.2-r1.ebuild 2785 BLAKE2B 3726d139e9c04da6c3a345a8665dfa1530a525e6ec7b468c9601f5ab11bb26fa5cee845576b5ca617bc19473b6d4d3f403f23395c3b0662c97080a5bb3593f57 SHA512 b9b921c004baad4a8936ee9e97da876b32b8909b1dd81d886c7a7a28528e9aab84d6e30b46631dc7ae58ed18f243d04f4fba62e8313a1932b18ad1b3aaff339a
+DIST kea-2.2.0.tar.gz 9999074 BLAKE2B 10b4bca1a135c6d146490f8c4c7bd4d56c1c03e2b4cc88a6888fcad5d1a5c2ee2d2c0215cb345b53a2a4262dbd02516d75d5778835d45384a7d69a062b8696b9 SHA512 82cd44efea8c968ef097de242e1ca59e0183c80df25050017fd45538d35da64a9a0d2f4a5249ad3bd3d30b1f8895c360d301518bc22e60dfddd966fe020dc773
 EBUILD kea-2.0.2.ebuild 3155 BLAKE2B 65ca61043927991f9c42eafad6b4ba0bfb0ba2ca594421575562561fbdf538992cd687835315924c985ca6a81f014966c9db70e0ec6896f59a3e4f1d947b3f5d SHA512 dfce7fb66bb48e45f515e077af635bad3544297bde2b0863e1a1b282638fd4f2e07f7b9663016c6b150b827e453aaa447b6f046e324200ad74295a65bbdbb477
-EBUILD kea-9999.ebuild 3155 BLAKE2B 65ca61043927991f9c42eafad6b4ba0bfb0ba2ca594421575562561fbdf538992cd687835315924c985ca6a81f014966c9db70e0ec6896f59a3e4f1d947b3f5d SHA512 dfce7fb66bb48e45f515e077af635bad3544297bde2b0863e1a1b282638fd4f2e07f7b9663016c6b150b827e453aaa447b6f046e324200ad74295a65bbdbb477
+EBUILD kea-2.2.0.ebuild 3462 BLAKE2B 7184f099ca20af15fe873e1ae786a92b20d31c098d5927ca675865c3248234f2a1b69197e4142a0eb05993c77fd4aa5b2524ebe1627f23495c7e5e1abaf5bd8d SHA512 ecfa8a07d677300441fe1c65f3a0ca0f8aefc08939960696730b3e8f93726b1cfcfeb0a8c1a2ce32d642d29a5de0232aa71b15d91e6f04fd1fde63f97f8e4910
+EBUILD kea-9999.ebuild 3462 BLAKE2B 7184f099ca20af15fe873e1ae786a92b20d31c098d5927ca675865c3248234f2a1b69197e4142a0eb05993c77fd4aa5b2524ebe1627f23495c7e5e1abaf5bd8d SHA512 ecfa8a07d677300441fe1c65f3a0ca0f8aefc08939960696730b3e8f93726b1cfcfeb0a8c1a2ce32d642d29a5de0232aa71b15d91e6f04fd1fde63f97f8e4910
 MISC metadata.xml 760 BLAKE2B def46b553ea484e8c8ebb887fbaa45f30b65b4607b6dbc269540e19e7edac2dd152b6b724f666a2e920b7c7e7269b0e60a08ad46f5e8131b5135950c678d2144 SHA512 308b7461e94919cc2b5ec0627bd63292b874eae91e7520465264fa5c2187085afdfe9c95fddf68265eea49ad38b5cd0e3426982234d191ccbbb4c0161c36a7c9
diff --git a/net-misc/kea/files/ax_gtest.m4 b/net-misc/kea/files/ax_gtest.m4
new file mode 100644
index 000000000000..acd887c2d3ab
--- /dev/null
+++ b/net-misc/kea/files/ax_gtest.m4
@@ -0,0 +1,62 @@
+AC_DEFUN([AX_ISC_GTEST], [
+
+AC_ARG_WITH([lcov],
+            [AS_HELP_STRING([--with-lcov[[=PROGRAM]]],
+                            [enable gtest and coverage target using the specified lcov])],
+                            [lcov="$withval"],
+                            [lcov="no"])
+
+USE_LCOV="no"
+if test "$lcov" != "no"; then
+        # force gtest if not set
+        if test "$enable_gtest" = "no"; then
+#               AC_MSG_ERROR("lcov needs gtest for test coverage report")
+                AC_MSG_NOTICE([gtest support is now enabled, because used by coverage tests])
+                enable_gtest="yes"
+        fi
+        if test "$lcov" != "yes"; then
+                LCOV=$lcov
+        else
+                AC_PATH_PROG([LCOV], [lcov])
+        fi
+        if test -x "${LCOV}"; then
+                USE_LCOV="yes"
+        else
+                AC_MSG_ERROR([Cannot find lcov.])
+        fi
+        # is genhtml always in the same directory?
+        GENHTML=`echo "$LCOV" | ${SED} s/lcov$/genhtml/`
+        if test ! -x $GENHTML; then
+                AC_MSG_ERROR([genhtml not found, needed for lcov])
+        fi
+        # GCC specific?
+        CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage"
+        LIBS=" $LIBS -lgcov"
+        AC_SUBST(CPPFLAGS)
+        AC_SUBST(LIBS)
+        AC_SUBST(LCOV)
+        AC_SUBST(GENHTML)
+fi
+AC_SUBST(USE_LCOV)
+
+#
+# Check availability of gtest, which will be used for unit tests.
+#
+DISTCHECK_GTEST_CONFIGURE_FLAG=
+
+AS_IF([test "x$enable_gtest" = "xyes"], [
+    DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest"
+    PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_ERROR([gtest requested but not found])])
+    GTEST_INCLUDES=`${PKG_CONFIG} --keep-system-cflags --cflags-only-I gtest`
+    GTEST_LDFLAGS=`${PKG_CONFIG} --keep-system-libs --libs-only-L gtest`
+    GTEST_VERSION=`${PKG_CONFIG} --modversion gtest`
+])
+
+AM_CONDITIONAL(HAVE_GTEST, test $enable_gtest != "no")
+AM_CONDITIONAL(HAVE_GTEST_SOURCE, test "X$have_gtest_source" = "Xyes")
+AC_SUBST(DISTCHECK_GTEST_CONFIGURE_FLAG)
+AC_SUBST(GTEST_INCLUDES)
+AC_SUBST([GTEST_LDADD], [$GTEST_LIBS])
+AC_SUBST(GTEST_SOURCE)
+
+])dnl AX_ISC_GTEST
diff --git a/net-misc/kea/files/kea-1.8.2-fix-cxx11-detection.patch b/net-misc/kea/files/kea-1.8.2-fix-cxx11-detection.patch
deleted file mode 100644
index 867561f2e7e5..000000000000
--- a/net-misc/kea/files/kea-1.8.2-fix-cxx11-detection.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/m4macros/ax_cpp11.m4
-+++ b/m4macros/ax_cpp11.m4
-@@ -182,6 +182,7 @@
- 	AC_COMPILE_IFELSE(
- 		[AC_LANG_PROGRAM(
- 			[#include <thread>
-+			 #include <memory>
- 			 std::shared_ptr<std::thread> th;],
- 			[th.reset(new std::thread([[]]() { return; }));
- 			 th->join();])],
---- a/src/bin/perfdhcp/Makefile.am
-+++ b/src/bin/perfdhcp/Makefile.am
-@@ -3,7 +3,6 @@
- AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
- AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
- AM_CPPFLAGS += $(BOOST_INCLUDES)
--AM_CPPFLAGS += -Werror
- 
- AM_CXXFLAGS = $(KEA_CXXFLAGS)
- 
---- a/src/bin/perfdhcp/tests/Makefile.am
-+++ b/src/bin/perfdhcp/tests/Makefile.am
-@@ -4,7 +4,6 @@
- AM_CPPFLAGS += -I$(srcdir)/.. -I$(builddir)/..
- AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_srcdir)/testdata\"
- AM_CPPFLAGS += $(BOOST_INCLUDES)
--AM_CPPFLAGS += -Werror
- AM_CXXFLAGS = $(KEA_CXXFLAGS)
- 
- if USE_STATIC_LINK
---- a/src/lib/database/backend_selector.cc
-+++ b/src/lib/database/backend_selector.cc
-@@ -7,6 +7,7 @@
- #include <database/backend_selector.h>
- #include <exceptions/exceptions.h>
- #include <climits>
-+#include <limits>
- #include <sstream>
- 
- using namespace isc::data;
---- a/src/lib/dhcpsrv/subnet_id.h
-+++ b/src/lib/dhcpsrv/subnet_id.h
-@@ -10,6 +10,7 @@
- #include <exceptions/exceptions.h>
- #include <stdint.h>
- #include <typeinfo>
-+#include <limits>
- 
- namespace isc {
- namespace dhcp {
diff --git a/net-misc/kea/files/kea-1.8.2-gtest.patch b/net-misc/kea/files/kea-1.8.2-gtest.patch
deleted file mode 100644
index 5fa4488b926c..000000000000
--- a/net-misc/kea/files/kea-1.8.2-gtest.patch
+++ /dev/null
@@ -1,149 +0,0 @@
---- a/m4macros/ax_gtest.m4
-+++ b/m4macros/ax_gtest.m4
-@@ -1,24 +1,14 @@
- AC_DEFUN([AX_ISC_GTEST], [
-
--enable_gtest="no"
--GTEST_INCLUDES=
--
--AC_ARG_WITH([gtest-source],
--            [AS_HELP_STRING([--with-gtest-source=PATH],
--                            [location of the Googletest source])],
--            [enable_gtest="yes" ; GTEST_SOURCE="$withval"])
--
--AC_ARG_WITH([gtest],
--            [AS_HELP_STRING([--with-gtest=PATH],
--                            [specify a path to gtest header files (PATH/include) and library (PATH/lib)])],
--        [gtest_path="$withval"; enable_gtest="yes"], [gtest_path="no"])
-+AC_ARG_ENABLE([gtest],
-+              [AS_HELP_STRING([--enable-gtest],
-+                              [Enable testing via Googletest [default=no]])])
-
- AC_ARG_WITH([lcov],
-             [AS_HELP_STRING([--with-lcov=PROGRAM],
-                             [enable gtest and coverage target using the specified lcov])],
-                             [lcov="$withval"],
-                             [lcov="no"])
--
- USE_LCOV="no"
- if test "$lcov" != "no"; then
-         # force gtest if not set
-@@ -55,110 +45,22 @@
- #
- # Check availability of gtest, which will be used for unit tests.
- #
--GTEST_LDFLAGS=
--GTEST_LDADD=
- DISTCHECK_GTEST_CONFIGURE_FLAG=
--GTEST_VERSION="unknown"
--
--if test "x$enable_gtest" = "xyes" ; then
--
--    DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest=$gtest_path"
--
--    if test -n "$with_gtest_source" ; then
-
--        if test "x$GTEST_SOURCE" = "xyes" ; then
-+AS_IF([test "x$enable_gtest" = "xyes"], [
-+    DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest"
-+    PKG_CHECK_MODULES([GTEST], [gtest], [], [AC_MSG_ERROR([gtest requested but not found])])
-+    GTEST_INCLUDES=`${PKG_CONFIG} --keep-system-cflags --cflags-only-I gtest`
-+    GTEST_LDFLAGS=`${PKG_CONFIG} --keep-system-libs --libs-only-L gtest`
-+    GTEST_VERSION=`${PKG_CONFIG} --modversion gtest`
-+])
-
--            AC_MSG_CHECKING([for gtest source])
--            # If not specified, try some common paths.
--            GTEST_SOURCE=
--            for d in /usr/src/gtest /usr/local /usr/pkg /opt /opt/local ; do
--                if test -f $d/src/gtest-all.cc -a $d/src/gtest_main.cc; then
--                    GTEST_SOURCE=$d
--                    AC_MSG_RESULT([$GTEST_SOURCE])
--                    break
--                fi
--            done
--            if test -z $GTEST_SOURCE ; then
--                AC_MSG_ERROR([no gtest source but it was selected])
--            fi
--        else
--            if test ! -d $GTEST_SOURCE/src -a -d $GTEST_SOURCE/googletest; then
--                GTEST_SOURCE=$GTEST_SOURCE/googletest
--            fi
--            if test -f $GTEST_SOURCE/src/gtest-all.cc -a $GTEST_SOURCE/src/gtest_main.cc; then
--                have_gtest_source=yes
--            else
--                AC_MSG_ERROR([no gtest source at $GTEST_SOURCE])
--            fi
--        fi
--        have_gtest_source=yes
--
--        GTEST_LDADD="\$(top_builddir)/ext/gtest/libgtest.a"
--        DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest-source=$GTEST_SOURCE"
--        GTEST_INCLUDES="-I$GTEST_SOURCE -I$GTEST_SOURCE/include"
--        GTEST_VERSION="`basename $GTEST_SOURCE`"
--
--# Versions starting from 1.8.0 are put in the googletest directory. If the basename
--# returns googletest string, we need to cut it off and try baseline again.
--        if test "$GTEST_VERSION" == "googletest"; then
--            GTEST_VERSION=${GTEST_SOURCE%"/googletest"}
--            GTEST_VERSION=`basename $GTEST_VERSION`
--        fi
--        GTEST_VERSION="${GTEST_VERSION#googletest-release-}"
--        GTEST_VERSION="${GTEST_VERSION#gtest-}"
--    fi
--
--    if test "$gtest_path" != "no" ; then
--        if test "$gtest_path" != "yes"; then
--            GTEST_PATHS=$gtest_path
--            if test -x "${gtest_path}/bin/gtest-config" ; then
--                GTEST_CONFIG="${gtest_path}/bin/gtest-config"
--            fi
--        else
--            AC_PATH_PROG([GTEST_CONFIG], [gtest-config])
--        fi
--        if test -x "${GTEST_CONFIG}" ; then :
--            # using cppflags instead of cxxflags
--            GTEST_INCLUDES=`${GTEST_CONFIG} --cppflags`
--            GTEST_LDFLAGS=`${GTEST_CONFIG} --ldflags`
--            GTEST_LDADD=`${GTEST_CONFIG} --libs`
--            GTEST_VERSION=`${GTEST_CONFIG} --version`
--            GTEST_FOUND="true"
--        else
--            AC_MSG_WARN([Unable to locate Google Test gtest-config.])
--            if test -z "${GTEST_PATHS}" ; then
--                GTEST_PATHS="/usr /usr/local"
--            fi
--            GTEST_FOUND="false"
--        fi
--        if test "${GTEST_FOUND}" != "true"; then
--            GTEST_FOUND="false"
--            for dir in $GTEST_PATHS; do
--                if test -f "$dir/include/gtest/gtest.h"; then
--                    if ! test -f "$dir/lib/libgtest.a"; then
--                        AC_MSG_WARN([Found Google Test include but not the library in $dir.])
--                        continue
--                    fi
--                    GTEST_INCLUDES="-I$dir/include"
--                    GTEST_LDFLAGS="-L$dir/lib"
--                    GTEST_LDADD="-lgtest"
--                    GTEST_FOUND="true"
--                    break
--                fi
--            done
--        fi
--        if test "${GTEST_FOUND}" != "true"; then
--            AC_MSG_ERROR([Cannot find gtest in: $GTEST_PATHS])
--        fi
--
--    fi
--fi
- AM_CONDITIONAL(HAVE_GTEST, test $enable_gtest != "no")
- AM_CONDITIONAL(HAVE_GTEST_SOURCE, test "X$have_gtest_source" = "Xyes")
- AC_SUBST(DISTCHECK_GTEST_CONFIGURE_FLAG)
- AC_SUBST(GTEST_INCLUDES)
- AC_SUBST(GTEST_LDFLAGS)
--AC_SUBST(GTEST_LDADD)
-+AC_SUBST([GTEST_LDADD], [$GTEST_LIBS])
- AC_SUBST(GTEST_SOURCE)
-
- ])dnl AX_ISC_GTEST
diff --git a/net-misc/kea/files/kea-2.2.0-openssl-version.patch b/net-misc/kea/files/kea-2.2.0-openssl-version.patch
new file mode 100644
index 000000000000..5e323357d7c5
--- /dev/null
+++ b/net-misc/kea/files/kea-2.2.0-openssl-version.patch
@@ -0,0 +1,11 @@
+--- a/m4macros/ax_crypto.m4
++++ b/m4macros/ax_crypto.m4
+@@ -258,7 +258,7 @@ then
+ else
+    CRYPTO_NAME="OpenSSL"
+    DISABLED_CRYPTO="Botan"
+-   CRYPTO_PACKAGE="openssl-1.1.0"
++   CRYPTO_PACKAGE="openssl"
+    DISTCHECK_CRYPTO_CONFIGURE_FLAG="--with-openssl=${use_openssl}"
+    AC_DEFINE_UNQUOTED([WITH_OPENSSL], [], [Compile with OpenSSL crypto])
+    AC_MSG_CHECKING(for OpenSSL library)
diff --git a/net-misc/kea/kea-1.8.2-r1.ebuild b/net-misc/kea/kea-2.2.0.ebuild
index 1a33c637752a..56fe907cd840 100644
--- a/net-misc/kea/kea-1.8.2-r1.ebuild
+++ b/net-misc/kea/kea-2.2.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PV="${PV//_p/-P}"
 MY_PV="${MY_PV/_/-}"
@@ -10,51 +10,72 @@ MY_P="${PN}-${MY_PV}"
 DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
 HOMEPAGE="https://www.isc.org/kea/"
 
-inherit autotools systemd tmpfiles
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit autotools fcaps python-single-r1 systemd tmpfiles
 
 if [[ ${PV} = 9999* ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
+	EGIT_REPO_URI="https://gitlab.isc.org/isc-projects/kea.git"
 else
 	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
 		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
-	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	# odd minor version = development release
+	if [[ $(( $(ver_cut 2) % 2 )) -ne 1 ]] ; then
+		if ! [[ "${PV}" == *_beta* || "${PV}" == *_rc* ]] ; then
+			 KEYWORDS="~amd64 ~arm64 ~x86"
+		fi
+	fi
 fi
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-IUSE="mysql +openssl postgres +samples test"
+IUSE="debug doc mysql +openssl postgres +samples shell test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-libs/boost:=
 	dev-libs/log4cplus
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
+	)
 	mysql? ( dev-db/mysql-connector-c )
 	!openssl? ( dev-libs/botan:2= )
 	openssl? ( dev-libs/openssl:0= )
 	postgres? ( dev-db/postgresql:* )
+	shell? ( ${PYTHON_DEPS} )
 "
 DEPEND="${COMMON_DEPEND}
-	test? ( dev-cpp/gtest )"
+	test? ( dev-cpp/gtest )
+"
 RDEPEND="${COMMON_DEPEND}
 	acct-group/dhcp
 	acct-user/dhcp"
 BDEPEND="virtual/pkgconfig"
 
+REQUIRED_USE="shell? ( ${PYTHON_REQUIRED_USE} )"
+
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.2-fix-cxx11-detection.patch
-	"${FILESDIR}"/${PN}-1.8.2-boost-1.77.0.patch
-	"${FILESDIR}"/${PN}-1.8.2-gtest.patch
+	"${FILESDIR}"/${PN}-2.2.0-openssl-version.patch
 )
 
+pkg_setup() {
+	use shell && python-single-r1_pkg_setup
+}
+
 src_prepare() {
 	default
-	# Brand the version with Gentoo
+
+	cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 'Replace gtest m4 macro failed'
+
+	# brand the version with Gentoo
 	sed -i \
-		-e "s/AC_INIT(kea,${PV}.*, kea-dev@lists.isc.org)/AC_INIT(kea,${PVR}-gentoo, kea-dev@lists.isc.org)/g" \
+		-e "s/AC_INIT(kea,${PV}.*, kea-dev@lists.isc.org)/AC_INIT([kea], [${PVR}-gentoo], [kea-dev@lists.isc.org])/g" \
 		configure.ac || die
 
 	sed -i \
@@ -67,15 +88,21 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--disable-install-configurations
+		--disable-rpath
 		--disable-static
+		--enable-generate-messages
 		--enable-perfdhcp
 		--localstatedir="${EPREFIX}/var"
 		--runstatedir="${EPREFIX}/run"
 		--without-werror
+		--with-log4cplus
+		$(use_enable debug)
+		$(use_enable doc generate-docs)
+		$(use_enable test gtest)
+		$(use_enable shell)
 		$(use_with mysql)
 		$(use_with openssl)
 		$(use_with postgres pgsql)
-		$(use_enable test gtest)
 	)
 	econf "${myeconfargs[@]}"
 }
@@ -109,4 +136,5 @@ src_install() {
 
 pkg_postinst() {
 	tmpfiles_process ${PN}.conf
+	fcaps cap_net_bind_service,cap_net_raw=+ep /usr/sbin/kea-dhcp{4,6}
 }
diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild
index aca4fe99e606..56fe907cd840 100644
--- a/net-misc/kea/kea-9999.ebuild
+++ b/net-misc/kea/kea-9999.ebuild
@@ -10,31 +10,38 @@ MY_P="${PN}-${MY_PV}"
 DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
 HOMEPAGE="https://www.isc.org/kea/"
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit autotools fcaps python-single-r1 systemd tmpfiles
 
 if [[ ${PV} = 9999* ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
+	EGIT_REPO_URI="https://gitlab.isc.org/isc-projects/kea.git"
 else
 	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
 		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
-	# Odd minor version = development release
+	# odd minor version = development release
 	if [[ $(( $(ver_cut 2) % 2 )) -ne 1 ]] ; then
-		[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-		KEYWORDS="~amd64 ~arm64 ~x86"
+		if ! [[ "${PV}" == *_beta* || "${PV}" == *_rc* ]] ; then
+			 KEYWORDS="~amd64 ~arm64 ~x86"
+		fi
 	fi
 fi
 
 LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
 SLOT="0"
-IUSE="mysql +openssl postgres +samples shell test"
+IUSE="debug doc mysql +openssl postgres +samples shell test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	dev-libs/boost:=
 	dev-libs/log4cplus
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
+	)
 	mysql? ( dev-db/mysql-connector-c )
 	!openssl? ( dev-libs/botan:2= )
 	openssl? ( dev-libs/openssl:0= )
@@ -54,8 +61,7 @@ REQUIRED_USE="shell? ( ${PYTHON_REQUIRED_USE} )"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.2-boost-1.77.0.patch
-	"${FILESDIR}"/${PN}-1.9.10-gtest.patch
+	"${FILESDIR}"/${PN}-2.2.0-openssl-version.patch
 )
 
 pkg_setup() {
@@ -64,7 +70,10 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	# Brand the version with Gentoo
+
+	cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 'Replace gtest m4 macro failed'
+
+	# brand the version with Gentoo
 	sed -i \
 		-e "s/AC_INIT(kea,${PV}.*, kea-dev@lists.isc.org)/AC_INIT([kea], [${PVR}-gentoo], [kea-dev@lists.isc.org])/g" \
 		configure.ac || die
@@ -79,12 +88,16 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--disable-install-configurations
+		--disable-rpath
 		--disable-static
 		--enable-generate-messages
 		--enable-perfdhcp
 		--localstatedir="${EPREFIX}/var"
 		--runstatedir="${EPREFIX}/run"
 		--without-werror
+		--with-log4cplus
+		$(use_enable debug)
+		$(use_enable doc generate-docs)
 		$(use_enable test gtest)
 		$(use_enable shell)
 		$(use_with mysql)