gentoo resync : 29.12.2022

4 files changed, 13 insertions, 73 deletions

diff --git a/net-misc/exabgp/Manifest b/net-misc/exabgp/Manifest
index 413d1d4ac725..9eefd71c7882 100644
--- a/net-misc/exabgp/Manifest
+++ b/net-misc/exabgp/Manifest
@@ -9,11 +9,10 @@ AUX exabgp.initd-r1 1591 BLAKE2B 10b61e1daf5d10a5e3d60c67bc3b67fdee1583d816d2b19
 AUX exabgp.initd-r2 1615 BLAKE2B 2396103f84c871aaf090ab1546abc724c783a4051750fb177431bb39d7af12f615119ea346774d08e50ea11ce289836aeba75803f740add6b43fdcdedb0b17ad SHA512 f46212597f90475559f30a8c8d5ee5c3d2f0f149305e9eb5fecd96d658e21768bff6379d8e51cd5550570681470b4747347b86c08ece3dc0bc34da0dd5d98337
 AUX exabgp.logrotate 61 BLAKE2B 63024bebc07e3eadacf1550674f5fbb7cf22d903a02784d8d5f1aae3b8f6e543e5b4b2f7208af91b4c063cb68d831caf18c2b03fce211c4c447f3828c5c8127f SHA512 27e751f0ff066448fc0121a129a9c48ac645738f65041aa29816cddc80dc73f2458110ccd12fa48b2ccb573908357425070103303d5645987b2a4e74986a2786
 AUX exabgp.tmpfiles 136 BLAKE2B 1255c9e510f9dc53b4e1b678ab8be2c7e88aac461789b15106ebf1e9606eb48ccd732efcc8ebfc8271efa5d0f6972705476a5f8c658480909b35ebf6eb399281 SHA512 3a11a011967f83483c85035ab63376bc92af3c3076ddbaac2e2cb3557aa314cfb188ee8e3208bfec7cb74d86a7b877c50487cbfa5f3097534cdbc7e98fc4b537
-DIST exabgp-4.2.11.tar.gz 2931753 BLAKE2B e5241619db24e2e82dfb42bc613d6b2c28efac205d2bedf732a665a5a9eff1b384833cb1fec3e68a285fc01269c2eaca55b311650e59bcda13d8f024e5294dc3 SHA512 61c143e90fd81323b03682ad46f2861576ab0328e2030259eff15bb9ef965477c514fb355112cbaf3dc138fb9f5582b6e1e1efb8d0d4313a9b9924ced156a155
-DIST exabgp-4.2.16.tar.gz 2933071 BLAKE2B bc66ece537cb175811233d26f3445e1bb3f7d4f8950bf0839ced014430db17a4df614661448f275fb3a890bb2af6b2459f938f830c82f03a586829e7fe31caca SHA512 06731612df6f0f6623e8ad58c3b52fc4b5dee6b4bb3bb29cee272a4061ef087e2f98739a75cd07ae51e66fb633069926899882e6bab801010ad1db3333666471
 DIST exabgp-4.2.17.tar.gz 2933104 BLAKE2B 5751888232479c24aa4f66ef357821178c7a5564c0522adb8abf26057eb222ecfbb33caa6d9b71219b79fa309a0c4051b6098015c2362ad9c02e59326ee2bfac SHA512 2000856f540dcaed12dfaf54b689f6b04670f0ec8f19ec7a811ea8e54663afec68a7ae97ed79a001cc09ed42e6a1c5bd2d94ae0c3e3c8bde2da446cf00d66374
-EBUILD exabgp-4.2.11-r1.ebuild 1299 BLAKE2B b15271c374199edaa379240a18c56e5dc485714874a547f5436855454e4f4e6e8a4020620d7896b2dd19ca05e419ee66eadae0c715729b9d21b1c28445fa4ec6 SHA512 cfef1786caad92e870e52f7ca300b24c63d05049c9a4d3a057c7c5523bd94de3d291422b2346a6a5b8ef17137604577ca60bd00df76688018cb66b618aa1f0aa
-EBUILD exabgp-4.2.11-r2.ebuild 1489 BLAKE2B 3fc3ec8288a013c49f517b862411102035cae79d7d7d25d196a65913e4fd444f5e0890bb8b27b98889db8a73eb7aeb575b0bf38907e5886631f0be7787f0e16c SHA512 4c441e47f710a7582e44237e5447e27241ccebe4d95b580e73f3f020dbdd9ef33b60fd28a19c4409664e213f7f1452e893ddd1171d1760ce196586aad5e9b5fa
-EBUILD exabgp-4.2.16.ebuild 1489 BLAKE2B d24ad3b13c0c2257842bd5da941299ed5842e91ea834e1638035e77d48205a9ebfe79be40db9d173458d6c5b4430202c51f6ed0e19601b682aad72985e691462 SHA512 1a65970beb3fda0632b1a592e3eff764759ac99d70bcade37f96b3c5f2e1631949374fd0697d749617a203b97a5b43e232a88037e9c3e7251fed70eded845207
+DIST exabgp-4.2.19.tar.gz 2932903 BLAKE2B de988dca0d6c32dbe5a5a04a2f3b5065a71ec83aabccecf675ddf09f9bd38ee417b670c5a2940d12bf3618a9a39e8ec6d0184bfa77cfda8c5e853da0fd52bda4 SHA512 35031fbf1b73339926dd08c7edc80497c3a5c4d1a5d626bf2a704ad2e70baeca51a88fe56fe3e43b97187010cf7e89c2b69f0b28276bbf9a945e761c6578818f
+DIST exabgp-4.2.20.tar.gz 2933683 BLAKE2B 8d25442dd3e95ad6db2849adb2ba04563c9c2add50fe94993cc1d72f17c704118732c1a8b88cec48f4a5c3b3f186c66b6643d3d06543475a43f0630801394006 SHA512 39de1baa9a4abee9829b3dea211966ec58e487f26c7f9d0d0cd19f5fcca596c9d3a389073bcb19506924feb7af34f4ffc6cbf13b7471cf5e51857af35271e6a5
 EBUILD exabgp-4.2.17.ebuild 1489 BLAKE2B 69e14edfaaf3be4a1c6fca72b1d95074f3df9390a7f03884cafd14de372e75dc8bd6fd56cb7e2b61fdcd47dc212c537d05a87596bc4afb492e65f35a005e1bc4 SHA512 c340cf30a5d93531b2b31d055a3988b0a0359b49e526f3d9b7be10df04946808619a71da9c7408f5de32496b3a83cbd7e44e0176d589a6872a8a097e0b87b0fe
+EBUILD exabgp-4.2.19-r1.ebuild 1489 BLAKE2B ad0e2bce70750a7574e8d23bc17bcd5297e1bdd0d021bb3f0be80f2b233e01348ab34860fcb5be71fb2b5de3873a7c906625ce24faea4b776aaeafdc3993a090 SHA512 62fc8d9b5b52533b68076bf515f3dbd7fcc44218dd8ae89183a9f511fdd50239090e5e83aa511ed548378bf83c3b2471076c9bdd4d750ff96537a890d674aee7
+EBUILD exabgp-4.2.20.ebuild 1422 BLAKE2B d2544baa4c829fb2b3147e9f21857a61db31a010b2ce64dc03c60a6517298e7aee29b1b016d311af636668f134788b3e4bfd9fb8d530e4afa37ff9cfd505ed1d SHA512 684adff604df69fbdf6a143df6a36708b4ae5407467362afe7934f345c3653b8b50b64e7967f8a3c94644b5364805c946e7f8155665f5ab2cba078fea5ef27a2
 MISC metadata.xml 344 BLAKE2B 20bfa14279184ddbcd77773d12fb120d9182b2eab6f5e99c044229efcad49de8861f50ac3560cf85d79aec6fa67c54fef8b1a3a5fffef7c2ae9c36d1eb134bb4 SHA512 f10156cff443ec23883c09dcf78b83d2ea44c9730214b9197e2efdc56f3df0b934ed6db5eed258c5ca89886ec13049f9ef904972043a602606cc2529e8912d19
diff --git a/net-misc/exabgp/exabgp-4.2.11-r1.ebuild b/net-misc/exabgp/exabgp-4.2.11-r1.ebuild
deleted file mode 100644
index 1ec8278c5641..000000000000
--- a/net-misc/exabgp/exabgp-4.2.11-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit tmpfiles systemd distutils-r1
-
-DESCRIPTION="The BGP swiss army knife of networking"
-HOMEPAGE="https://github.com/Exa-Networks/exabgp"
-SRC_URI="https://github.com/Exa-Networks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-group/exabgp
-	acct-user/exabgp
-"
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/exabgp-4.2.7-paths.patch"
-	"${FILESDIR}/exabgp-4.2.10-ip-path.patch"
-)
-
-python_test() {
-	./qa/bin/parsing || die "tests fail with ${EPYTHON}"
-	nosetests -v ./qa/tests/*_test.py || die "tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	newtmpfiles "${FILESDIR}/exabgp.tmpfiles" ${PN}.conf
-	systemd_dounit etc/systemd/*
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	keepdir /etc/exabgp
-
-	doman doc/man/*.?
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}.conf
-}
diff --git a/net-misc/exabgp/exabgp-4.2.16.ebuild b/net-misc/exabgp/exabgp-4.2.19-r1.ebuild
index b04278316850..618539f9bee6 100644
--- a/net-misc/exabgp/exabgp-4.2.16.ebuild
+++ b/net-misc/exabgp/exabgp-4.2.19-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
diff --git a/net-misc/exabgp/exabgp-4.2.11-r2.ebuild b/net-misc/exabgp/exabgp-4.2.20.ebuild
index 0c9b22c44818..2bd1bad24a9e 100644
--- a/net-misc/exabgp/exabgp-4.2.11-r2.ebuild
+++ b/net-misc/exabgp/exabgp-4.2.20.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit tmpfiles systemd distutils-r1
 
@@ -24,7 +24,6 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 	)
 "
@@ -37,15 +36,17 @@ PATCHES=(
 	"${FILESDIR}/exabgp-4.2.11-less-verbose-logging.patch"
 )
 
+distutils_enable_tests pytest
+
 python_test() {
 	./qa/bin/parsing || die "tests fail with ${EPYTHON}"
-	nosetests -v ./qa/tests/*_test.py || die "tests fail with ${EPYTHON}"
+	epytest
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
 
-	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd" ${PN}
 
 	newtmpfiles "${FILESDIR}/exabgp.tmpfiles" ${PN}.conf