[gentoo-commits] repo/gentoo:master commit in: net-misc/kea/

[Dennis Lamm]

commit:     5808f0887d0c70e70a103904d781e34808071d96
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 25 19:39:43 2024 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 20:31:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5808f088

net-misc/kea: 2.4.0 ebuild improvements

Closes: https://bugs.gentoo.org/877625
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/35020
Signed-off-by: Dennis Lamm <expeditioneer <AT> gentoo.org>

 net-misc/kea/{kea-2.4.0.ebuild => kea-2.4.0-r1.ebuild} | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/net-misc/kea/kea-2.4.0.ebuild b/net-misc/kea/kea-2.4.0-r1.ebuild
similarity index 88%
rename from net-misc/kea/kea-2.4.0.ebuild
rename to 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-...@lists.isc.org)/AC_INIT([kea], [${PVR}-gentoo], 
[kea-...@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}