commit: 221d3200d58b8de81598911ff438a29f690e19eb Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Fri Jun 6 13:58:11 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jun 12 08:06:38 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=221d3200
net-misc/kea: drop 9999 Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/42481 Closes: https://github.com/gentoo/gentoo/pull/42481 Signed-off-by: Sam James <sam <AT> gentoo.org> net-misc/kea/files/kea-initd-r2 | 8 +-- net-misc/kea/kea-9999.ebuild | 149 ---------------------------------------- 2 files changed, 4 insertions(+), 153 deletions(-) diff --git a/net-misc/kea/files/kea-initd-r2 b/net-misc/kea/files/kea-initd-r2 index 31626f25bfed..851e21acb3bf 100644 --- a/net-misc/kea/files/kea-initd-r2 +++ b/net-misc/kea/files/kea-initd-r2 @@ -12,10 +12,10 @@ dhcp4_config="${DHCP4_CONFIG:-/etc/kea/kea-dhcp4.conf}" dhcp6_config="${DHCP6_CONFIG:-/etc/kea/kea-dhcp6.conf}" ddns_config="${DDNS_CONFIG:-/etc/kea/kea-dhcp-ddns.conf}" ctrl_agent_config="${CTRL_AGENT_CONFIG:-/etc/kea/kea-ctrl-agent.conf}" -dhcp4_pidfile="/run/kea/kea-dhcp4.kea-dhcp4.pid" -dhcp6_pidfile="/run/kea/kea-dhcp6.kea-dhcp6.pid" -ddns_pidfile="/run/kea/kea-dhcp-ddns.kea-dhcp-ddns.pid" -ctrl_agent_pidfile="/run/kea/kea-ctrl-agent.kea-ctrl-agent.pid" +dhcp4_pidfile="/run/kea/$(basename ${dhcp4_config%.conf}).kea-dhcp4.pid" +dhcp6_pidfile="/run/kea/$(basename ${dhcp6_config%.conf}).kea-dhcp6.pid" +ddns_pidfile="/run/kea/$(basename ${ddns_config%.conf}).kea-dhcp-ddns.pid" +ctrl_agent_pidfile="/run/kea/$(basename ${ctrl_agent_config%.conf}).kea-ctrl-agent.pid" kea_user="${KEA_USER:-dhcp}" kea_group="${KEA_GROUP:-dhcp}" diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild deleted file mode 100644 index 996a51cf3b18..000000000000 --- a/net-misc/kea/kea-9999.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2025 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}" - -PYTHON_COMPAT=( python3_{11..12} ) -inherit autotools fcaps flag-o-matic python-single-r1 systemd tmpfiles - -DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" -HOMEPAGE="https://www.isc.org/kea/"; - -if [[ ${PV} == *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://gitlab.isc.org/isc-projects/kea.git"; -else - SRC_URI="https://downloads.isc.org/isc/kea/${MY_P}.tar.gz - https://downloads.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"; - # odd minor version = development release - if [[ $(( $(ver_cut 2) % 2 )) -ne 1 ]] ; then - if ! [[ "${PV}" == *_beta* || "${PV}" == *_rc* ]] ; then - KEYWORDS="~amd64 ~arm64 ~x86" - fi - fi -fi -S="${WORKDIR}/${MY_P}" - -LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script -SLOT="0" -IUSE="debug doc mysql +openssl postgres +samples shell test" - -REQUIRED_USE="shell? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-libs/boost:= - dev-libs/log4cplus - doc? ( - $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}] - ') - ) - 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" - -PATCHES=( - "${FILESDIR}"/${PN}-2.2.0-openssl-version.patch -) - -pkg_setup() { - use shell && python-single-r1_pkg_setup -} - -src_prepare() { - default - - 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/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 \ - -e '/mkdir -p $(DESTDIR)${runstatedir}\/${PACKAGE_NAME}/d' \ - Makefile.am || die "Fixing Makefile.am failed" - - eautoreconf -} - -src_configure() { - # -Werror=odr - # https://bugs.gentoo.org/861617 - # - # I would truly love to submit an upstream bug but their self-hosted gitlab - # won't let me sign up. -- Eli - filter-lto - - local myeconfargs=( - --disable-install-configurations - --disable-rpath - --disable-static - --enable-generate-messages - --enable-perfdhcp - --localstatedir="${EPREFIX}/var" - --runstatedir="${EPREFIX}/run" - --without-werror - --with-log4cplus - $(use_enable debug) - $(use_enable doc generate-docs) - $(use_enable shell) - $(use_with mysql) - $(use_with openssl) - $(use_with postgres pgsql) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - emake -j1 install DESTDIR="${D}" - - 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} -}
