From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 16FAD158064 for ; Wed, 8 May 2024 23:31:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 332B0E2A7D; Wed, 8 May 2024 23:31:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0FAEAE2A7D for ; Wed, 8 May 2024 23:31:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE9E5343119 for ; Wed, 8 May 2024 23:31:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F183193E for ; Wed, 8 May 2024 23:31:48 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1715211041.e51f69fe7a800711bffa43b5e85a4e6ef16192bd.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/kea/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/kea/kea-9999.ebuild X-VCS-Directories: net-misc/kea/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e51f69fe7a800711bffa43b5e85a4e6ef16192bd X-VCS-Branch: master Date: Wed, 8 May 2024 23:31:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 735b812f-866e-48a0-989b-41aec00d86df X-Archives-Hash: cb3beb540957e0a9c210a40710a12863 commit: e51f69fe7a800711bffa43b5e85a4e6ef16192bd Author: Sam James gentoo org> AuthorDate: Wed May 8 23:30:41 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed May 8 23:30:41 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e51f69fe net-misc/kea: sync live Signed-off-by: Sam James gentoo.org> net-misc/kea/kea-9999.ebuild | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild index 2c411fe395c2..72c97487d6f6 100644 --- a/net-misc/kea/kea-9999.ebuild +++ b/net-misc/kea/kea-9999.ebuild @@ -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 \ @@ -105,7 +109,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) @@ -115,7 +118,8 @@ src_configure() { } src_install() { - default + emake -j1 install DESTDIR="${D}" + newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN} newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN}