public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Dennis Lamm" <expeditioneer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/kea/
Date: Sun,  8 Aug 2021 13:15:43 +0000 (UTC)	[thread overview]
Message-ID: <1628428539.2462c197579aad6281e210bca0067fb0d8354edc.expeditioneer@gentoo> (raw)

commit:     2462c197579aad6281e210bca0067fb0d8354edc
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  8 10:35:02 2021 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> 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 <expeditioneer <AT> 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 <expeditioneer <AT> 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
 }


             reply	other threads:[~2021-08-08 13:15 UTC|newest]

Thread overview: 76+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-08 13:15 Dennis Lamm [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-05-08 23:31 [gentoo-commits] repo/gentoo:master commit in: net-misc/kea/ Sam James
2024-02-29  5:44 Sam James
2024-01-25 20:31 Dennis Lamm
2023-09-30 11:14 Dennis Lamm
2023-09-30 11:14 Dennis Lamm
2022-10-19  4:48 Dennis Lamm
2022-10-19  4:48 Dennis Lamm
2022-05-18 12:27 Lars Wendler
2022-05-18 12:27 Lars Wendler
2022-05-18 12:27 Lars Wendler
2022-03-14  6:39 Dennis Lamm
2021-10-04 20:40 Sam James
2021-09-08  4:53 Dennis Lamm
2021-08-15  7:56 Lars Wendler
2021-08-15  7:28 Lars Wendler
2021-08-15  7:28 Lars Wendler
2021-08-08 13:15 Dennis Lamm
2021-07-08 17:09 Dennis Lamm
2021-07-03  9:43 Lars Wendler
2021-06-16 18:11 Lars Wendler
2021-05-14 10:04 David Seifert
2021-05-13 13:55 David Seifert
2021-02-15 15:14 Thomas Deutschmann
2020-12-19 16:06 Lars Wendler
2020-11-25  9:26 Lars Wendler
2020-07-30  8:05 Lars Wendler
2020-07-30  8:05 Lars Wendler
2020-06-29 14:27 Lars Wendler
2020-06-29 14:27 Lars Wendler
2020-05-27 12:01 Lars Wendler
2020-05-27 12:01 Lars Wendler
2020-04-30  8:21 Lars Wendler
2020-04-30  8:21 Lars Wendler
2020-03-27  8:58 Lars Wendler
2020-03-27  8:58 Lars Wendler
2020-02-27  8:59 Lars Wendler
2020-02-27  8:59 Lars Wendler
2020-02-27  8:59 Lars Wendler
2020-01-31 14:00 Lars Wendler
2020-01-31 14:00 Lars Wendler
2019-12-19 15:37 Lars Wendler
2019-12-19 15:37 Lars Wendler
2019-11-28 12:23 Lars Wendler
2019-11-28 12:23 Lars Wendler
2019-10-31 12:05 Lars Wendler
2019-10-07 15:25 Lars Wendler
2019-10-07 15:25 Lars Wendler
2019-10-07 15:25 Lars Wendler
2019-09-12  6:09 Lars Wendler
2019-08-29 12:50 Lars Wendler
2019-08-29 12:50 Lars Wendler
2019-08-29 12:50 Lars Wendler
2018-12-18  0:51 Thomas Deutschmann
2018-12-10 11:45 Lars Wendler
2018-12-10  9:36 Lars Wendler
2018-12-03 15:07 Lars Wendler
2018-11-27  8:57 Lars Wendler
2018-11-27  8:57 Lars Wendler
2018-11-27  8:57 Lars Wendler
2018-07-12  9:33 Lars Wendler
2018-07-12  9:26 Lars Wendler
2018-07-12  8:06 Lars Wendler
2018-07-12  8:06 Lars Wendler
2018-06-16 21:10 Lars Wendler
2018-06-16 21:10 Lars Wendler
2018-02-14 13:55 Lars Wendler
2018-02-14 10:45 Lars Wendler
2018-02-05 13:46 Lars Wendler
2017-11-06  9:40 Lars Wendler
2017-11-06  9:40 Lars Wendler
2017-10-04  7:42 Alon Bar-Lev
2017-05-08 11:30 Tony Vroon
2016-10-21 12:46 Tony Vroon
2016-01-07 15:56 Tony Vroon
2016-01-07 15:53 Tony Vroon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1628428539.2462c197579aad6281e210bca0067fb0d8354edc.expeditioneer@gentoo \
    --to=expeditioneer@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox