gentoo resync : 29.12.2022

5 files changed, 62 insertions, 103 deletions

diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index 58acb905ae6b..55fd5b41f710 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -14,9 +14,8 @@ AUX kea-dhcp6.conf 19710 BLAKE2B 3ce2b18b7b8402cdb98e247db3942314083c8b18c508fbe
 AUX kea-initd-r1 2210 BLAKE2B 052fbbf03c6c1e8c66beb3161dbc8d46c6c704b7d931438039321177e792e1d7f08ccf17acb87d7c36af1878413c2f17cd00b951d4076c3be049cbe31de3e32a SHA512 051f4b86f083931c3934e2c63aeb45409bae5d50e6a91b29e642bf4cb609a539e2c23029b8dc70b48517a4646fa3db06961c823d804c514f05213be0b172cf9d
 AUX kea.tmpfiles.conf 61 BLAKE2B a0c31118e028dfbbdb372866b85f99e7b2b73a88bb1c2f27ebe5bb0ff19a77c96b13bb5ddc581af366c8bd104322eef196d849f8a333ca0c9eaffbce980c9443 SHA512 8a155fef71c89dda45b2920bdc62c6ec79946b5f7ba126a9627e35b62b8b283356a8be4a378aa33ff1f103ac608d6460fcd170baa3f097914d398e763a3a6d9e
 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
 EBUILD kea-1.8.2-r1.ebuild 2785 BLAKE2B 3726d139e9c04da6c3a345a8665dfa1530a525e6ec7b468c9601f5ab11bb26fa5cee845576b5ca617bc19473b6d4d3f403f23395c3b0662c97080a5bb3593f57 SHA512 b9b921c004baad4a8936ee9e97da876b32b8909b1dd81d886c7a7a28528e9aab84d6e30b46631dc7ae58ed18f243d04f4fba62e8313a1932b18ad1b3aaff339a
-EBUILD kea-1.8.2.ebuild 1805 BLAKE2B e3d5971e48a4d1bfc4bb4525dd29a3e9fe773e2e9276966b377f5ed8bdfb5892e5d1a334c16ce9c79735610d802d346ec1da69543eb0daace3dabbec40ddfd0d SHA512 1d6fd14954a0c88f5050f4764a592ec6dd17cb6970413b183e29896842cf2970178766ec29d05e05a8913264984db0da88d4685b709576f8988e97fdd3d4390b
-EBUILD kea-1.9.11.ebuild 2733 BLAKE2B d727f315595048996d91c29648d84469f60fd2f0bf4fbbc157b8f64aa307ac794cca76c9a79c1acb1b49f77b289b859ead86c412e344ad812230f1e083ba890e SHA512 f9f1e15b21fe9ae8b8223fa91d45f18fd66e986daafbac62d5305b3b19534752cded898cb5a017daeda772ac77657cf723b68a85f9728e6e1c600995e47838da
-EBUILD kea-9999.ebuild 2510 BLAKE2B 642706b5298a0936fd21cf3d8a05d097d90955f87552d6f46f0193044d4f800cd608c91720a5649e108c71b692b4f648eec4a8392fc6d93da0126134443e06f7 SHA512 1cf24522f19a398eff9537fe362621a18693fcfcfdd14d99e76d9717fb028cffc94c4a07e75c17d9a47852432f8d0643983c788a03bc8289e14c1743f508e72d
-MISC metadata.xml 785 BLAKE2B effb1866745b2c4d1db59f41586c240455aabb707a606fe083503d847a90846ef304c96cd69d3153c133946a1b90978e97db9fead9776b2cf8a6a735a60eba9a SHA512 e026c4948bf1c5f05cc3ffb475f4336e80e179ea7e71af11bdb37e9951514497a9b9a516bf24736b43f8462cd5abd8a59cd6c03a7ba0583c25df89557c24e8f4
+EBUILD kea-2.0.2.ebuild 3155 BLAKE2B 65ca61043927991f9c42eafad6b4ba0bfb0ba2ca594421575562561fbdf538992cd687835315924c985ca6a81f014966c9db70e0ec6896f59a3e4f1d947b3f5d SHA512 dfce7fb66bb48e45f515e077af635bad3544297bde2b0863e1a1b282638fd4f2e07f7b9663016c6b150b827e453aaa447b6f046e324200ad74295a65bbdbb477
+EBUILD kea-9999.ebuild 3155 BLAKE2B 65ca61043927991f9c42eafad6b4ba0bfb0ba2ca594421575562561fbdf538992cd687835315924c985ca6a81f014966c9db70e0ec6896f59a3e4f1d947b3f5d SHA512 dfce7fb66bb48e45f515e077af635bad3544297bde2b0863e1a1b282638fd4f2e07f7b9663016c6b150b827e453aaa447b6f046e324200ad74295a65bbdbb477
+MISC metadata.xml 760 BLAKE2B def46b553ea484e8c8ebb887fbaa45f30b65b4607b6dbc269540e19e7edac2dd152b6b724f666a2e920b7c7e7269b0e60a08ad46f5e8131b5135950c678d2144 SHA512 308b7461e94919cc2b5ec0627bd63292b874eae91e7520465264fa5c2187085afdfe9c95fddf68265eea49ad38b5cd0e3426982234d191ccbbb4c0161c36a7c9
diff --git a/net-misc/kea/kea-1.8.2.ebuild b/net-misc/kea/kea-1.8.2.ebuild
deleted file mode 100644
index 7bf6f71daf2a..000000000000
--- a/net-misc/kea/kea-1.8.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="${PV//_p/-P}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
-HOMEPAGE="https://www.isc.org/kea/"
-if [[ ${PV} = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
-else
-	inherit autotools
-	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"
-fi
-
-LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
-SLOT="0"
-IUSE="mysql +openssl postgres samples"
-
-DEPEND="
-	dev-libs/boost:=
-	dev-cpp/gtest
-	dev-libs/log4cplus
-	mysql? ( dev-db/mysql-connector-c )
-	!openssl? ( dev-libs/botan:2= )
-	openssl? ( dev-libs/openssl:0= )
-	postgres? ( dev-db/postgresql:* )
-"
-RDEPEND="${DEPEND}
-	acct-group/dhcp
-	acct-user/dhcp"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.2-fix-cxx11-detection.patch
-	"${FILESDIR}"/${PN}-1.8.2-boost-1.77.0.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	# Brand the version with Gentoo
-	sed -i \
-		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
-		configure || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--enable-perfdhcp
-		--localstatedir="${EPREFIX}/var"
-		--without-werror
-		$(use_with mysql)
-		$(use_with openssl)
-		$(use_with postgres pgsql)
-		$(use_enable samples install-configurations)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newconfd "${FILESDIR}"/${PN}-confd-r1 ${PN}
-	newinitd "${FILESDIR}"/${PN}-initd-r1 ${PN}
-	keepdir /var/lib/${PN} /var/log
-	rm -rf "${ED}"/var/run || die
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/net-misc/kea/kea-1.9.11.ebuild b/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@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 \
@@ -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/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}
 }
diff --git a/net-misc/kea/metadata.xml b/net-misc/kea/metadata.xml
index c1a041003281..4ca6f0a579ca 100644
--- a/net-misc/kea/metadata.xml
+++ b/net-misc/kea/metadata.xml
@@ -2,16 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>expeditioneer@gentoo.org</email>
 		<name>Dennis Lamm</name>
 	</maintainer>
 	<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>