[gentoo-commits] repo/gentoo:master commit in: net-misc/kea/

[Lars Wendler]

commit:     c7d3e9c71823164d3eb6f0ffe3470043be4be7ba
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 12:09:59 2022 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed May 18 12:27:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7d3e9c7

net-misc/kea: Bump to version 2.0.2

Removed old

- Bump to EAPI-8
- Install message-compiler (#845327)
- Add missing caps (831115)

Closes: https://bugs.gentoo.org/830059
Closes: https://bugs.gentoo.org/831115
Closes: https://bugs.gentoo.org/845327
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-misc/kea/Manifest                              |  2 +-
 .../kea/{kea-1.9.11.ebuild => kea-2.0.2.ebuild}    | 32 ++++++++++++++++------
 net-misc/kea/metadata.xml                          |  1 +
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index 88efc3d478ab..bff98126c828 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -1,2 +1,2 @@
 DIST kea-1.8.2.tar.gz 9005645 BLAKE2B fec1118ca34adc4bdafea13dd6c1c3abcd42df80043b621d1ed994e7ec6906a5d13e86a1bbb6dcbdfee32a4d70281c751b46c57d4866bd92557448ab7c602c30 SHA512 7bea9eb30ee819bd350ba3f64da7dc46d1176363e7243e934ff0f0498fcd47ef4eccb7fe8d8dd4f883ab9e376174aaba4fae06b20405181d46b6b12cfbdf7dd0
-DIST kea-1.9.11.tar.gz 9739770 BLAKE2B 0215ac48036506018dc869c313d59244e4bf03634be279039fd0dbf7de73a2d87654b11153ec9014b89c815068961633987d44a26b820e4692937c85d29d352c SHA512 5d7739d74b6fbed9733719af1aa068498fcc1eaa1ed423b93b9b4dd92de970e3cd036ad60377534a58e7d22e909404673358fa72307b6c32492f952684c180c0
+DIST kea-2.0.2.tar.gz 9796557 BLAKE2B a859c4cc3f6686db2dcf640738b421499a816700d134ee9322290051c3a192bab482be4a4bdb2630113594a3af1cafe2b95abce4a463815a6404fe87fac227ad SHA512 edb7de227898fb7bd76dd8b503d02e07b4ba512b907b53399a5c45bd216820b342f00c1834858848ce8ff94aa3c228ceead0e2946cbcb1f75a03ca579630be83

diff --git a/net-misc/kea/kea-1.9.11.ebuild b/net-misc/kea/kea-2.0.2.ebuild
similarity index 76%
rename from net-misc/kea/kea-1.9.11.ebuild
rename to net-misc/kea/kea-2.0.2.ebuild
index cec8274fa82c..aca4fe99e606 100644
--- a/net-misc/kea/kea-1.9.11.ebuild
+++ b/net-misc/kea/kea-2.0.2.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,13 +20,16 @@ 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 test"
+IUSE="mysql +openssl postgres +samples shell test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -33,7 +38,9 @@ COMMON_DEPEND="
 	mysql? ( dev-db/mysql-connector-c )
 	!openssl? ( dev-libs/botan:2= )
 	openssl? ( dev-libs/openssl:0= )
-	postgres? ( dev-db/postgresql:* )"
+	postgres? ( dev-db/postgresql:* )
+	shell? ( ${PYTHON_DEPS} )
+"
 DEPEND="${COMMON_DEPEND}
 	test? ( dev-cpp/gtest )
 "
@@ -42,6 +49,8 @@ RDEPEND="${COMMON_DEPEND}
 	acct-user/dhcp"
 BDEPEND="virtual/pkgconfig"
 
+REQUIRED_USE="shell? ( ${PYTHON_REQUIRED_USE} )"
+
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
@@ -49,11 +58,15 @@ PATCHES=(
 	"${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@×××××××××.org)/AC_INIT(kea,${PVR}-gentoo, kea-dev@×××××××××.org)/g" \
+		-e "s/AC_INIT(kea,${PV}.*, kea-dev@×××××××××.org)/AC_INIT([kea], [${PVR}-gentoo], [kea-dev@×××××××××.org])/g" \
 		configure.ac || die
 
 	sed -i \
@@ -67,14 +80,16 @@ 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)
-		$(use_enable test gtest)
 	)
 	econf "${myeconfargs[@]}"
 }
@@ -108,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}
 }

diff --git a/net-misc/kea/metadata.xml b/net-misc/kea/metadata.xml
index c1a041003281..086afe372b41 100644
--- a/net-misc/kea/metadata.xml
+++ b/net-misc/kea/metadata.xml
@@ -12,6 +12,7 @@
 	<use>
 		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> instead of <pkg>dev-libs/botan</pkg></flag>
 		<flag name="samples">Install sample configuration files</flag>
+		<flag name="shell">Install kea-shell text management client for Control Agent</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://gitlab.isc.org/isc-projects/kea/-/issues</bugs-to>