gentoo resync : 25.10.2021

5 files changed, 33 insertions, 7 deletions

diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index b24db7cf2667..b89e7b07f0d1 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/canto-curses/Manifest b/net-news/canto-curses/Manifest
index ddeaab27c068..de0035efb4f8 100644
--- a/net-news/canto-curses/Manifest
+++ b/net-news/canto-curses/Manifest
@@ -1,3 +1,3 @@
 DIST canto-curses-0.9.9.tar.gz 79963 BLAKE2B c6154dfa71ec88b405fb89feec66a6bb922dfb93523c865c33fe0664ed7ea796d795027ff65a355fd3767342ffd5fa8cb01f48475c262ded4413924df6339509 SHA512 2a88631506c1fda7278bb3ac376c2b67b4f2e5e1f443e49fe3035f542b66ac4b232fa66e7ae1b40e86b0a5cde3c38d11a0953754e5c5c7ed572a0da74656d798
-EBUILD canto-curses-0.9.9.ebuild 698 BLAKE2B 34870e670fbe007c87225c1c0de5918dab9b09a26f98bc9461ca15dd98b8e53b1334cbc9ca828f03fde6bb2afde0cd0f31967bb149ebabbbdfe6e1b95c2d4ef6 SHA512 d72c24dbb3209aeefd3a5fd9a7513dc2ab3c894c30db630f35aac84ac4ff777d0addb4883b88896273bf65b2c4fc3f14576aca49d58c483dc3d5e9f2b23dc254
+EBUILD canto-curses-0.9.9.ebuild 1006 BLAKE2B 38b582574a3c24b0b6a8510261e060ffd4cf49d101db99bbd1efd1df887117f131023dc6ca522fcf327efb02628e0edcbbacc929dd8cd6ae38962ed8d7c36ec1 SHA512 cbe5645f1e1df069750f630e138d228e20a0692e60adba778e71d9e0d711ce07c1d5a53b24fa9c14d0b66cbca1cc2ae99e45416adc31d32734ef4db845f99790
 MISC metadata.xml 334 BLAKE2B 52df08727877d5d1002fab6d29ffa10b0ee0c8386581eb0254d122529b62cde5287709dc7d4c8dc2732d72a77f34515e2f422bc28b0ca135225ccb01244a4637 SHA512 ec1f3e445e730f91fec5adce1e5d510211e660f89227b1cf7065831672a058b6f130b6a38428644d0009a190af41cd3b9c4984c84d176b4d9d333eb334d0baa7
diff --git a/net-news/canto-curses/canto-curses-0.9.9.ebuild b/net-news/canto-curses/canto-curses-0.9.9.ebuild
index d84861c52fb5..7eebcfacdac4 100644
--- a/net-news/canto-curses/canto-curses-0.9.9.ebuild
+++ b/net-news/canto-curses/canto-curses-0.9.9.ebuild
@@ -4,9 +4,9 @@
 EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="ncurses(+),threads(+)"
-inherit distutils-r1 multilib
+inherit distutils-r1
 
 DESCRIPTION="The ncurses client for canto-daemon"
 HOMEPAGE="https://codezen.org/canto-ng/"
@@ -15,12 +15,27 @@ SRC_URI="https://github.com/themoken/canto-curses/archive/v${PV}.tar.gz -> ${P}.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="test"
+PROPERTIES="test_network"
 
 RDEPEND=">=net-news/canto-daemon-0.9.1[${PYTHON_USEDEP}]"
+BDEPEND="test? ( ${RDEPEND} )"
 
 python_prepare_all() {
 	# Respect libdir during plugins installation
 	sed -i -e "s:lib/canto:$(get_libdir)/canto:" setup.py || die
 
+	# Test fails because of lost site
+	rm tests/test-config-function.py || die
+
 	distutils-r1_python_prepare_all
 }
+
+python_test() {
+	local test_file
+	for test_file in tests/*; do
+		"${EPYTHON}" "${test_file}" || die "Test ${test_file} failed with ${EPYTHON}"
+	done
+}
diff --git a/net-news/canto-daemon/Manifest b/net-news/canto-daemon/Manifest
index 5ad69b6a9071..dca93747acb2 100644
--- a/net-news/canto-daemon/Manifest
+++ b/net-news/canto-daemon/Manifest
@@ -1,3 +1,3 @@
 DIST canto-daemon-0.9.8.tar.gz 53866 BLAKE2B 55b5e9be9980df471e5488b7583be3b06f8f7048ecb3a89a64ecc9aafa806b201272bd16944a25e7a412da914cc83b76d1f19c0813366209c33195442a84586e SHA512 5394a0fea38ecbe28c02bd6f68e1e10e0523cf087bb0f79f17e53bdf8e9df16213beaa1c0a5f5873b3126022faf8d0fd999dbd01aa727c35b3c1a823501787da
-EBUILD canto-daemon-0.9.8.ebuild 716 BLAKE2B cc86e4d258a3450db457f3790e32f0cf96a4b7fe306d27914ded31848fd2bd5e434274ec756b8d58e9b0a66993d68b1a038476ae4eb8e5674fbe7945a5172102 SHA512 eee96989043d78e00c7bf3a06b1d4a6e644b9a8eaebcaa2a6d78c2c892ed8fdacb0645bc60e48095477a6b815252ccd918728e29c105be055ffd79cbadca396c
+EBUILD canto-daemon-0.9.8.ebuild 955 BLAKE2B fbe9440d797ab2c47857d435011bf1032559f415869615adcd54e537e307cf51d31d030f8bc6ef69173fd4ccc9d46ac8ec251690a487afaa653d8e647add05bf SHA512 2ea654961e0cf67925fd6527a4012f2dccab1b223995ad24275fc3cfd0584e9a12e87abee2fd544b97a693d2f280a35ea3f99e4b381b19fcf69b69cde12f6a11
 MISC metadata.xml 332 BLAKE2B 962e477b5ad4d3835483df1eb6ec2e4b8d6996f81076dd06aaf9e5b3927606e9a9f36db835ef51525717e803849335d86b6bdafb854b12f2199bd0b72646ba25 SHA512 6e444fca759d82a8507d4805d0cd3ca170e9e2181bd809e18c51e73822a5eec5b693cce5535bfb2b6ad9d4e5fa9919de685065333e25bbc3c5a80b83f998d8f8
diff --git a/net-news/canto-daemon/canto-daemon-0.9.8.ebuild b/net-news/canto-daemon/canto-daemon-0.9.8.ebuild
index e9126d4bcac8..d0cff11389b5 100644
--- a/net-news/canto-daemon/canto-daemon-0.9.8.ebuild
+++ b/net-news/canto-daemon/canto-daemon-0.9.8.ebuild
@@ -4,21 +4,25 @@
 EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="xml(+),threads(+)"
 inherit distutils-r1 multilib
 
 DESCRIPTION="Daemon part of Canto-NG RSS reader"
 HOMEPAGE="https://codezen.org/canto-ng/"
 SRC_URI="https://github.com/themoken/canto-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/canto-next-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
 
-RDEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
+RESTRICT="test"
+PROPERTIES="test_network"
 
-S="${WORKDIR}/canto-next-${PV}"
+RDEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
+BDEPEND="test? ( ${RDEPEND} )"
 
 python_prepare_all() {
 	# Respect libdir during plugins installation
@@ -26,3 +30,10 @@ python_prepare_all() {
 
 	distutils-r1_python_prepare_all
 }
+
+python_test() {
+	local test_file
+	for test_file in tests/*; do
+		"${EPYTHON}" "${test_file}" || die "Test ${test_file} failed with ${EPYTHON}"
+	done
+}