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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5593F139368 for ; Sun, 8 Aug 2021 13:15:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F8D3E087C; Sun, 8 Aug 2021 13:15:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 25E12E087C for ; Sun, 8 Aug 2021 13:15:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D12BC342C19 for ; Sun, 8 Aug 2021 13:15:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A296865 for ; Sun, 8 Aug 2021 13:15:43 +0000 (UTC) From: "Dennis Lamm" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Dennis Lamm" Message-ID: <1628428539.2462c197579aad6281e210bca0067fb0d8354edc.expeditioneer@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: expeditioneer X-VCS-Committer-Name: Dennis Lamm X-VCS-Revision: 2462c197579aad6281e210bca0067fb0d8354edc X-VCS-Branch: master Date: Sun, 8 Aug 2021 13:15:43 +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: b6b660e2-e5bf-4d7b-8c2e-ee1743c1aae4 X-Archives-Hash: c99c5012e840b778c6ecea6999d8db83 commit: 2462c197579aad6281e210bca0067fb0d8354edc Author: Dennis Lamm gentoo org> AuthorDate: Sun Aug 8 10:35:02 2021 +0000 Commit: Dennis Lamm gentoo org> CommitDate: Sun Aug 8 13:15:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2462c197 net-misc/kea: adapted live ebuild Signed-off-by: Dennis Lamm gentoo.org> Package-Manager: Portage-3.0.20, Repoman-3.0.2 Closes: https://github.com/gentoo/gentoo/pull/21907 Signed-off-by: Dennis Lamm gentoo.org> net-misc/kea/kea-9999.ebuild | 49 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild index 444f89b948d..7875a3f8860 100644 --- a/net-misc/kea/kea-9999.ebuild +++ b/net-misc/kea/kea-9999.ebuild @@ -9,18 +9,22 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" HOMEPAGE="http://www.isc.org/kea/" + +inherit autotools systemd tmpfiles + if [[ ${PV} = 9999* ]] ; then - inherit autotools git-r3 + inherit git-r3 EGIT_REPO_URI="https://github.com/isc-projects/kea.git" else - SRC_URI="https://downloads.isc.org/isc/kea/${MY_PV}/${PN}-${MY_PV}.tar.gz" + 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" + KEYWORDS="~amd64 ~arm64 ~x86" fi LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script SLOT="0" -IUSE="mysql +openssl postgres samples" +IUSE="mysql +openssl postgres +samples" DEPEND=" dev-libs/boost:= @@ -40,23 +44,36 @@ S="${WORKDIR}/${MY_P}" src_prepare() { default - [[ ${PV} = *9999 ]] && eautoreconf # Brand the version with Gentoo sed -i \ - -e "/VERSION=/s:'$: Gentoo-${PR}':" \ - configure || die + -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" + + sed -i \ + -e 's#test -f "$dir/lib/libgtest.a"#test -f "$dir/lib64/libgtest.a"#g' \ + -e 's#test -f "$dir/lib/libgtest.so"#test -f "$dir/lib64/libgtest.so"#g' \ + -e 's GTEST_LDFLAGS="-L$dir/lib GTEST_LDFLAGS="-L$dir/lib64 g' \ + m4macros/ax_gtest.m4 || die "fixing gtest detection macro failed" + + eautoreconf } src_configure() { local myeconfargs=( + --disable-install-configurations --disable-static --enable-perfdhcp --localstatedir="${EPREFIX}/var" + --runstatedir="${EPREFIX}/run" + --with-gtest=/usr --without-werror $(use_with mysql) $(use_with openssl) $(use_with postgres pgsql) - $(use_enable samples install-configurations) ) econf "${myeconfargs[@]}" } @@ -65,7 +82,21 @@ src_install() { default newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN} newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN} + + if use samples; then + cp "${FILESDIR}"/kea-ctrl-agent.conf "${ED}"/etc/kea/kea-ctrl-agent.conf || die "Could not create kea-ctrl-agent.conf" + cp "${FILESDIR}"/kea-ddns-server.conf "${ED}"/etc/kea/kea-ddns-server.conf || die "Could not create kea-ddns-server.conf" + cp "${FILESDIR}"/kea-dhcp4.conf "${ED}"/etc/kea/kea-dhcp4.conf || die "Could not create kea kea-dhcp4.conf" + cp "${FILESDIR}"/kea-dhcp6.conf "${ED}"/etc/kea/kea-dhcp6.conf || die "Could not create kea-dhcp6.conf" + fi + + systemd_dounit "${FILESDIR}/${PN}-ctrl-agent.service" + systemd_dounit "${FILESDIR}/${PN}-dhcp4-server.service" + systemd_dounit "${FILESDIR}/${PN}-dhcp6-server.service" + systemd_dounit "${FILESDIR}/${PN}-dhcp-ddns-server.service" + + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf ${PN}.conf + keepdir /var/lib/${PN} /var/log - rm -rf "${ED}"/var/run || die find "${ED}" -type f -name "*.la" -delete || die }