diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-01-25 22:43:50 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-01-25 22:43:50 +0000 |
commit | 6566922a3f59282ca6faed226f6e5665f04bcd58 (patch) | |
tree | 13936a1c84db440066163e22fb82efb2880fdcc1 /net-misc/kea | |
parent | fe641adc6a5e3f54d9c6b8b3521afb17d49f7185 (diff) |
gentoo auto-resync : 25:01:2024 - 22:43:50
Diffstat (limited to 'net-misc/kea')
-rw-r--r-- | net-misc/kea/Manifest | 12 | ||||
-rw-r--r-- | net-misc/kea/files/ax_gtest.m4 | 53 | ||||
-rw-r--r-- | net-misc/kea/files/kea-1.8.2-boost-1.77.0.patch | 10 | ||||
-rw-r--r-- | net-misc/kea/files/kea-1.9.10-gtest.patch | 143 | ||||
-rw-r--r-- | net-misc/kea/kea-2.0.2.ebuild | 127 | ||||
-rw-r--r-- | net-misc/kea/kea-2.4.0-r1.ebuild (renamed from net-misc/kea/kea-2.4.0.ebuild) | 14 | ||||
-rw-r--r-- | net-misc/kea/kea-2.4.1.ebuild (renamed from net-misc/kea/kea-2.2.0.ebuild) | 16 |
7 files changed, 28 insertions, 347 deletions
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest index e0d62ac4d8a9..f3ca216701bc 100644 --- a/net-misc/kea/Manifest +++ b/net-misc/kea/Manifest @@ -1,6 +1,4 @@ -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.9.10-gtest.patch 5496 BLAKE2B 2c931603f483f95b97f199f321e8a7c00a781fe8a77ec8b641b5deed8e39ef8a6068ddac96f75c4d098020d830058b0f0826ea431eda3c1c6bd1f7f3f9b6fa99 SHA512 295eb2403b909b5051344cf74f8eed683bbe11d10c40f7bebec16e6e89e58778cee1b226a595ae9b120de2ea9ee2264802f9aa83752dc8acca91f67137bfd4b8 +AUX ax_gtest.m4 664 BLAKE2B 1af65729e5968caea8e6e0c36dc7d127ce5301ba46075cacc9faadeddd1b0e8ae93569f5d0fb1bccd06d2a934f9af5eaa337e10b3cfb0a7cf19b95bbc7699e30 SHA512 ef64e246af2dd51f54149275de2fd35af84ffb151b1a02e4f032c3a22e1380f35305b3bada8d895f25be176710120686ccfd80deaef82e7dc0e7307f81d5247d 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 @@ -13,11 +11,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-2.0.2.tar.gz 9796557 BLAKE2B a859c4cc3f6686db2dcf640738b421499a816700d134ee9322290051c3a192bab482be4a4bdb2630113594a3af1cafe2b95abce4a463815a6404fe87fac227ad SHA512 edb7de227898fb7bd76dd8b503d02e07b4ba512b907b53399a5c45bd216820b342f00c1834858848ce8ff94aa3c228ceead0e2946cbcb1f75a03ca579630be83 -DIST kea-2.2.0.tar.gz 9999074 BLAKE2B 10b4bca1a135c6d146490f8c4c7bd4d56c1c03e2b4cc88a6888fcad5d1a5c2ee2d2c0215cb345b53a2a4262dbd02516d75d5778835d45384a7d69a062b8696b9 SHA512 82cd44efea8c968ef097de242e1ca59e0183c80df25050017fd45538d35da64a9a0d2f4a5249ad3bd3d30b1f8895c360d301518bc22e60dfddd966fe020dc773 DIST kea-2.4.0.tar.gz 10462721 BLAKE2B 07a4424c01872142b85446ee881afbdc9d8b3a0bc7879226463dd0ba20eba6d3d6db3dfd5fff88cd54af05c4f58183032c7df90d24a969a7ae63200822b6f35f SHA512 b0bdb6b6af88e322145ffeb742a818d6e225846ff981ecc4925d311870db94e0c5a4eb0e1140f146624f64b636c9b24148b5efbc32e62a19b99bba0810b54654 -EBUILD kea-2.0.2.ebuild 3155 BLAKE2B 65ca61043927991f9c42eafad6b4ba0bfb0ba2ca594421575562561fbdf538992cd687835315924c985ca6a81f014966c9db70e0ec6896f59a3e4f1d947b3f5d SHA512 dfce7fb66bb48e45f515e077af635bad3544297bde2b0863e1a1b282638fd4f2e07f7b9663016c6b150b827e453aaa447b6f046e324200ad74295a65bbdbb477 -EBUILD kea-2.2.0.ebuild 3462 BLAKE2B 3b85144a2218107f549588b570868981213a096340e366a6bd23c6e2f6eb59027aaa291ccbceaaa69a640e3083f24b4fc5c477b423dffbbf32b21997eb709ab9 SHA512 205b013e8fa73dcbab86fff6a00eb2b6d021547cae98fbd41b341411fa736ca7a484a8ade1fcfd60731aa46c59653df28880f3fa292c6a8040710f70b8182994 -EBUILD kea-2.4.0.ebuild 3462 BLAKE2B 1d443006ea1c9dfebfaa0a454c8b64df25226773301c1bb493e3d3da5e7d7452cb6581f3af83aea3b585b4de62470095699640b1b6bb55f1214cf5c653580cdf SHA512 385175e54f00bc05c08753b27a0ab05ada3e2ce7de2b969c69b2860fbaade473bb3081167101555f4105373436d88f488b821f131147f9a5d7cceb2ebe0159fe +DIST kea-2.4.1.tar.gz 10487415 BLAKE2B 21037d28f812ebbc65ae34f5151a209e9c74f6aa005e96ed7cbbf6e4250e6c40eecf5d257b852bf01663a0982b5401008dd6a51a16d861b30a83549f827538b6 SHA512 b8a3b6f2cae213fd9826c37568c71d3458f52eed973dbe437a1d0974dafa026635a730d828c6ff03b32e030be57d75a7914a8ca313833e91d9996b6a05b2b224 +EBUILD kea-2.4.0-r1.ebuild 3596 BLAKE2B 99d6927aa1a06b7a2dc016dacb970a2ca382f78c8c7fdced758cf41a0a48933afab17090aa0c63d3957034748d48a89b2d95ff68c45e88e2d2683f87761b2380 SHA512 af072d13cfe527017e70db4525b5616e648c943710141aae57aab7a8c458058855b6d4889cbc82828b92ac1ee1bc6b276ffc3b8b2c3259bfcf87a2e61531937c +EBUILD kea-2.4.1.ebuild 3596 BLAKE2B 99d6927aa1a06b7a2dc016dacb970a2ca382f78c8c7fdced758cf41a0a48933afab17090aa0c63d3957034748d48a89b2d95ff68c45e88e2d2683f87761b2380 SHA512 af072d13cfe527017e70db4525b5616e648c943710141aae57aab7a8c458058855b6d4889cbc82828b92ac1ee1bc6b276ffc3b8b2c3259bfcf87a2e61531937c EBUILD kea-9999.ebuild 3462 BLAKE2B 1d443006ea1c9dfebfaa0a454c8b64df25226773301c1bb493e3d3da5e7d7452cb6581f3af83aea3b585b4de62470095699640b1b6bb55f1214cf5c653580cdf SHA512 385175e54f00bc05c08753b27a0ab05ada3e2ce7de2b969c69b2860fbaade473bb3081167101555f4105373436d88f488b821f131147f9a5d7cceb2ebe0159fe 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 index acd887c2d3ab..7f7d0bb7aa65 100644 --- a/net-misc/kea/files/ax_gtest.m4 +++ b/net-misc/kea/files/ax_gtest.m4 @@ -1,56 +1,13 @@ 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` -]) +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") diff --git a/net-misc/kea/files/kea-1.8.2-boost-1.77.0.patch b/net-misc/kea/files/kea-1.8.2-boost-1.77.0.patch deleted file mode 100644 index fec0fcc30f4b..000000000000 --- a/net-misc/kea/files/kea-1.8.2-boost-1.77.0.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- kea-1.8.2/src/lib/dhcpsrv/timer_mgr.cc -+++ kea-1.8.2/src/lib/dhcpsrv/timer_mgr.cc -@@ -9,6 +9,7 @@ - #include <asiolink/io_service.h> - #include <dhcpsrv/dhcpsrv_log.h> - #include <dhcpsrv/timer_mgr.h> -+#include <map> - #include <exceptions/exceptions.h> - - #include <functional> diff --git a/net-misc/kea/files/kea-1.9.10-gtest.patch b/net-misc/kea/files/kea-1.9.10-gtest.patch deleted file mode 100644 index f3e8cd7af4cc..000000000000 --- a/net-misc/kea/files/kea-1.9.10-gtest.patch +++ /dev/null @@ -1,143 +0,0 @@ ---- a/m4macros/ax_gtest.m4 -+++ b/m4macros/ax_gtest.m4 -@@ -1,17 +1,8 @@ - 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], -@@ -55,111 +46,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" || \ -- test -f "$dir/lib/libgtest.so"; then -- GTEST_INCLUDES="-I$dir/include" -- GTEST_LDFLAGS="-L$dir/lib" -- GTEST_LDADD="-lgtest" -- GTEST_FOUND="true" -- break -- else -- AC_MSG_WARN([Found Google Test include but not the library in $dir.]) -- fi -- 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/kea-2.0.2.ebuild b/net-misc/kea/kea-2.0.2.ebuild deleted file mode 100644 index aca4fe99e606..000000000000 --- a/net-misc/kea/kea-2.0.2.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PV="${PV//_p/-P}" -MY_PV="${MY_PV/_/-}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" -HOMEPAGE="https://www.isc.org/kea/" - -PYTHON_COMPAT=( python3_{8..10} ) - -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" -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 - if [[ $(( $(ver_cut 2) % 2 )) -ne 1 ]] ; then - [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ - KEYWORDS="~amd64 ~arm64 ~x86" - fi -fi - -LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script -SLOT="0" -IUSE="mysql +openssl postgres +samples shell test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-libs/boost:= - dev-libs/log4cplus - 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 ) -" -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-boost-1.77.0.patch - "${FILESDIR}"/${PN}-1.9.10-gtest.patch -) - -pkg_setup() { - use shell && python-single-r1_pkg_setup -} - -src_prepare() { - default - # 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 - - sed -i \ - -e '/mkdir -p $(DESTDIR)${runstatedir}\/${PACKAGE_NAME}/d' \ - Makefile.am || die "Fixing Makefile.am failed" - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-install-configurations - --disable-static - --enable-generate-messages - --enable-perfdhcp - --localstatedir="${EPREFIX}/var" - --runstatedir="${EPREFIX}/run" - --without-werror - $(use_enable test gtest) - $(use_enable shell) - $(use_with mysql) - $(use_with openssl) - $(use_with postgres pgsql) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN} - newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN} - - if use samples; then - diropts -m 0750 -o root -g dhcp - dodir /etc/kea - insopts -m 0640 -o root -g dhcp - insinto /etc/kea - doins "${FILESDIR}"/${PN}-ctrl-agent.conf - doins "${FILESDIR}"/${PN}-ddns-server.conf - doins "${FILESDIR}"/${PN}-dhcp4.conf - doins "${FILESDIR}"/${PN}-dhcp6.conf - fi - - systemd_dounit "${FILESDIR}"/${PN}-ctrl-agent.service - systemd_dounit "${FILESDIR}"/${PN}-ddns-server.service - systemd_dounit "${FILESDIR}"/${PN}-dhcp4-server.service - systemd_dounit "${FILESDIR}"/${PN}-dhcp6-server.service - - newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf - - keepdir /var/lib/${PN} /var/log/${PN} - find "${ED}" -type f -name "*.la" -delete || die -} - -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-2.4.0.ebuild b/net-misc/kea/kea-2.4.0-r1.ebuild index bf1c596ab6ba..7227b2d84c1d 100644 --- a/net-misc/kea/kea-2.4.0.ebuild +++ b/net-misc/kea/kea-2.4.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -71,11 +71,15 @@ pkg_setup() { src_prepare() { default - cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 'Replace gtest m4 macro failed' + if use test; then + cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 'Replace gtest m4 macro failed' + fi # 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/KEA_SRCID="tarball"/KEA_SRCID="gentoo"/g' \ + -e 's/AC_MSG_RESULT("tarball")/AC_MSG_RESULT("gentoo")/g' \ + -e "s/EXTENDED_VERSION=\"\${EXTENDED_VERSION} (\$KEA_SRCID)\"/EXTENDED_VERSION=\"${PVR} (\$KEA_SRCID)\"/g" \ configure.ac || die sed -i \ @@ -98,7 +102,6 @@ src_configure() { --with-log4cplus $(use_enable debug) $(use_enable doc generate-docs) - $(use_enable test gtest) $(use_enable shell) $(use_with mysql) $(use_with openssl) @@ -108,7 +111,8 @@ src_configure() { } src_install() { - default + emake -j1 install DESTDIR="${D}" + newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN} newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN} diff --git a/net-misc/kea/kea-2.2.0.ebuild b/net-misc/kea/kea-2.4.1.ebuild index 65ef75d7f344..7227b2d84c1d 100644 --- a/net-misc/kea/kea-2.2.0.ebuild +++ b/net-misc/kea/kea-2.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" HOMEPAGE="https://www.isc.org/kea/" -PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_COMPAT=( python3_{8..12} ) inherit autotools fcaps python-single-r1 systemd tmpfiles @@ -71,11 +71,15 @@ pkg_setup() { src_prepare() { default - cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 'Replace gtest m4 macro failed' + if use test; then + cp "${FILESDIR}"/ax_gtest.m4 "${S}"/m4macros/ax_gtest.m4 || die 'Replace gtest m4 macro failed' + fi # 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/KEA_SRCID="tarball"/KEA_SRCID="gentoo"/g' \ + -e 's/AC_MSG_RESULT("tarball")/AC_MSG_RESULT("gentoo")/g' \ + -e "s/EXTENDED_VERSION=\"\${EXTENDED_VERSION} (\$KEA_SRCID)\"/EXTENDED_VERSION=\"${PVR} (\$KEA_SRCID)\"/g" \ configure.ac || die sed -i \ @@ -98,7 +102,6 @@ src_configure() { --with-log4cplus $(use_enable debug) $(use_enable doc generate-docs) - $(use_enable test gtest) $(use_enable shell) $(use_with mysql) $(use_with openssl) @@ -108,7 +111,8 @@ src_configure() { } src_install() { - default + emake -j1 install DESTDIR="${D}" + newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN} newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN} |