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 F40C0158090 for ; Wed, 18 May 2022 12:28:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0BD04E0830; Wed, 18 May 2022 12:28:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E490FE0830 for ; Wed, 18 May 2022 12:27:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 C3B16341D6B for ; Wed, 18 May 2022 12:27:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3900D474 for ; Wed, 18 May 2022 12:27:56 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1652876869.3af5208d3dcb070081dca7a01ae415d52b5c04b1.polynomial-c@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: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 3af5208d3dcb070081dca7a01ae415d52b5c04b1 X-VCS-Branch: master Date: Wed, 18 May 2022 12:27:56 +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: 2e60fbaa-6d43-4e75-8db9-b19d1b835642 X-Archives-Hash: 74fff5827f5ffa6eccaac076f7584776 commit: 3af5208d3dcb070081dca7a01ae415d52b5c04b1 Author: Lars Wendler gentoo org> AuthorDate: Wed May 18 12:27:38 2022 +0000 Commit: Lars Wendler gentoo org> CommitDate: Wed May 18 12:27:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3af5208d net-misc/kea: Synced live ebuild Signed-off-by: Lars Wendler gentoo.org> net-misc/kea/kea-9999.ebuild | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/net-misc/kea/kea-9999.ebuild b/net-misc/kea/kea-9999.ebuild index 9f241b088227..aca4fe99e606 100644 --- a/net-misc/kea/kea-9999.ebuild +++ b/net-misc/kea/kea-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PV="${PV//_p/-P}" MY_PV="${MY_PV/_/-}" @@ -10,7 +10,9 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server" HOMEPAGE="https://www.isc.org/kea/" -inherit autotools systemd tmpfiles +PYTHON_COMPAT=( python3_{8..10} ) + +inherit autotools fcaps python-single-r1 systemd tmpfiles if [[ ${PV} = 9999* ]] ; then inherit git-r3 @@ -18,34 +20,53 @@ if [[ ${PV} = 9999* ]] ; then else 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" + # Odd minor version = development release + if [[ $(( $(ver_cut 2) % 2 )) -ne 1 ]] ; then + [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ + KEYWORDS="~amd64 ~arm64 ~x86" + fi 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 shell test" +RESTRICT="!test? ( test )" -DEPEND=" +COMMON_DEPEND=" dev-libs/boost:= dev-libs/log4cplus mysql? ( dev-db/mysql-connector-c ) !openssl? ( dev-libs/botan:2= ) openssl? ( dev-libs/openssl:0= ) postgres? ( dev-db/postgresql:* ) + shell? ( ${PYTHON_DEPS} ) " -RDEPEND="${DEPEND} +DEPEND="${COMMON_DEPEND} + test? ( dev-cpp/gtest ) +" +RDEPEND="${COMMON_DEPEND} acct-group/dhcp acct-user/dhcp" BDEPEND="virtual/pkgconfig" +REQUIRED_USE="shell? ( ${PYTHON_REQUIRED_USE} )" + S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}"/${PN}-1.8.2-boost-1.77.0.patch + "${FILESDIR}"/${PN}-1.9.10-gtest.patch +) + +pkg_setup() { + use shell && python-single-r1_pkg_setup +} + src_prepare() { default # 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/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 \ @@ -59,10 +80,13 @@ src_configure() { local myeconfargs=( --disable-install-configurations --disable-static + --enable-generate-messages --enable-perfdhcp --localstatedir="${EPREFIX}/var" --runstatedir="${EPREFIX}/run" --without-werror + $(use_enable test gtest) + $(use_enable shell) $(use_with mysql) $(use_with openssl) $(use_with postgres pgsql) @@ -99,4 +123,5 @@ src_install() { pkg_postinst() { tmpfiles_process ${PN}.conf + fcaps cap_net_bind_service,cap_net_raw=+ep /usr/sbin/kea-dhcp{4,6} }