gentoo resync : 29.12.2022

3 files changed, 9 insertions, 23 deletions

diff --git a/net-irc/limnoria/Manifest b/net-irc/limnoria/Manifest
index d846c027da51..18dc385df713 100644
--- a/net-irc/limnoria/Manifest
+++ b/net-irc/limnoria/Manifest
@@ -1,9 +1,8 @@
-AUX limnoria-20210617-rss-testRemoveAliasedFeed-mock_data.patch 457 BLAKE2B bda2855d4d735e7a65bdbd2b42a73519f12f100020206c7f1e3371db16c929ef91a99d503090bfb46fd14a215cdc002335f3f190e7960c2d19ab56f09943be3c SHA512 35c78678b9c114802676f3850721c6641c9a970d002b184e097cfba65fc9f7c2f0968ac9cc77e03e332c706f7bf591cbc31838e4c68fd294e35465291e266aa8
-DIST limnoria-20210617.tar.gz 1094438 BLAKE2B 3253af8ad764acfaadf90ce49d0f40a47f32554d75c3860079284f98373eb3bc8f60f1f308b501265973c0e6c2a552211415f4f9c3044ce78f818d305b598cbe SHA512 25dddf843e22967a95c769c62f9398129830f63e23d506f0a9abaf7044fa9ffbeca95138c494caf3b36813919c7b1f0880b0715a06bc519de1a87837a948a039
 DIST limnoria-20211118.tar.gz 1094394 BLAKE2B cf3f10b0e489b16afba96b6f9dcc64e0f86007cb601f7cdaca66ec80f5ce01f31795d513ee5d55687902b3a65e114e841c07d5ef34e016140f93d5d8f420f73f SHA512 f0f7d632f4de837663e69df8892191f3ee20a586e073fa9f382852f2e2146b6d82556827ef68d27831938a43fa32185d11a53e1810f7e1834d08b5aeff903b70
 DIST limnoria-20220203.tar.gz 1099544 BLAKE2B fc68fb41b094978ddff159241bb4029ba8b3df2995b69f3eecf44599431cf2074a318469892c5b9c2c6660976fd7df52c76d5790b6db0ce94e390b57aa2a3e79 SHA512 50cc56885799d28ee559fffa7a3dc92189d0f41950c3e2b6062490d46c360fd18c188b64ca395963aeca62ff65f81f3536524f154e81ab9c703033e0c3ef0487
-EBUILD limnoria-20210617-r1.ebuild 2471 BLAKE2B db4104f3518836e6062dd6d9289252ec68654feb9e256e1b9c6bbf04841f4058dc3f48ff1a52edc8a7420ef16ac4f38e83419971cbac83bf25edb803c8e0eb72 SHA512 ce984d553919ee0d6a3a7021ab8710a2a5553b50ac507cc56736a423ca4282063a77c88a294a82bd41552e98738f83031cd1b43b40a5f9a638f4080abcbc744c
+DIST limnoria-20220427.tar.gz 1119981 BLAKE2B 3346d0576c1928cf074198afa2b2b613bc9672ea68d5f395e691f97b7aaac989a5ee8f388d41d9e767eea0c495974b066b8fc2a9a0bf3a7aa9db8c52bcabcec1 SHA512 d4f617cec32ebfc67c738b542a55d2a1cd92a287a107dc84d516a1431abe0e4f440fa7b4f2a4b7fce18f24582cfdcb2ad2ed66ff2779e6a64ba7788840c1adf3
 EBUILD limnoria-20211118.ebuild 2363 BLAKE2B 816fc8499a47b2b34b8028185aaad9bea467d930726976de306aa3c582f0329d043df5a8cd9df8b1a6496288a52eed9533f08b4297c7ce7f514c798b2036815c SHA512 430659904ca25221f7d3bf4128ec7f739ec3764c2bc1c2e037455a573f00cd1f7774bed0c1fb5da86358a9b859aa29b1e19e49dd9ef8f23cf1a5b97dcdd401ad
 EBUILD limnoria-20220203.ebuild 2363 BLAKE2B b5d92d084e9ff507828ed73b26f8ae5f6471da24fa56bb168a0b3d7b72845cf696f4c01c3b4a901ab1c214ca183708079aee46b290809450604cf0c40fe40551 SHA512 8806f5653f042f38837cf3d845c9e412b91bb050bcc9e522594deaa65aa8fd3668c8354aba4e8a95d638e572d41c3ab201d66996e7d542968a9e94b778f302b1
+EBUILD limnoria-20220427.ebuild 2433 BLAKE2B 2eef2bdd543796cd12faad25cd43875bd0d3a6c7c1153c9d11795b6a5d8d51c0b136d0347d53ea5b2380d09508a0d18155dd64306417ee002731d356df4dc9ca SHA512 83fc85d52c89521ab53c02706ab53db214148b7d1da197d2b87b81eea35539ca749a2bd333dcf21b480121aff54a061d0368c866a1c38cd4780fa7f8d5a781f9
 EBUILD limnoria-99999999.ebuild 2411 BLAKE2B b46e0b57921b11eb31f746c7c88cf28f67dc96527a001271179d662900e8d4790f14438bd051997ad57dbb27b55013e09207082251eb0569fd383701251a46fa SHA512 7fbe0ae0db60c2b42bdf5ba4de49a0e689352b189600fa5c44c3faec8a898a283ffc11fdaaf49bfe86cc891beb5927b3012dd6e413fed96e6e24c326c45ea599
 MISC metadata.xml 538 BLAKE2B 0595de4ad1055d77f9879ec2a4ba98fb45363a6117a363347054fb7697cdc601602bfa5010f0994dded6c143c7c28d84c08ab9fe45955a2375abfec8888e6e3a SHA512 476b61cb8fc2231ed0d6347729cfcedbccf5ebf47fd71e5b6326e5fa63e92a48b936e7f659bb342cba0256efbd79283cc631927074ad9f5d671315cb72bb232b
diff --git a/net-irc/limnoria/files/limnoria-20210617-rss-testRemoveAliasedFeed-mock_data.patch b/net-irc/limnoria/files/limnoria-20210617-rss-testRemoveAliasedFeed-mock_data.patch
deleted file mode 100644
index f3a579112848..000000000000
--- a/net-irc/limnoria/files/limnoria-20210617-rss-testRemoveAliasedFeed-mock_data.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/plugins/RSS/test.py b/plugins/RSS/test.py
-index eab10c61b..a9e3c07c6 100644
---- a/plugins/RSS/test.py
-+++ b/plugins/RSS/test.py
-@@ -102,6 +102,7 @@ def testCantAddDuplicatedFeed(self):
- 
-     @mock_urllib
-     def testRemoveAliasedFeed(self, mock):
-+        mock._data = xkcd_new
-         try:
-             self.assertNotError('rss announce add http://xkcd.com/rss.xml')
-             self.assertNotError('rss add xkcd http://xkcd.com/rss.xml')
diff --git a/net-irc/limnoria/limnoria-20210617-r1.ebuild b/net-irc/limnoria/limnoria-20220427.ebuild
index 93383eb215e7..22a8760bc6c4 100644
--- a/net-irc/limnoria/limnoria-20210617-r1.ebuild
+++ b/net-irc/limnoria/limnoria-20220427.ebuild
@@ -1,10 +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
 
 PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=no
 DISTUTILS_IN_SOURCE_BUILD=yes # needed for tests
 inherit distutils-r1
 
@@ -44,13 +43,9 @@ RDEPEND="
 	!net-irc/supybot-plugins"
 BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
-PATCHES=(
-	"${FILESDIR}/${P}-rss-testRemoveAliasedFeed-mock_data.patch" # GH#1479
-)
-
 python_prepare_all() {
 	# replace "installed on ${timestamp}" with real version
-	echo "version='${MY_PV}'" > "${S}"/src/version.py || die
+	echo "version='${MY_PV//-/.}'" > "${S}"/src/version.py || die
 	distutils-r1_python_prepare_all
 }
 
@@ -60,7 +55,11 @@ python_test() {
 	EXCLUDE_PLUGINS=()
 	# intermittent failure due to issues loading libsandbox.so from LD_PRELOAD
 	# runs successfully when running the tests on the installed system
-	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Unix" )
+	EXCLUDE_PLUGINS+=(
+		--exclude="${PLUGINS_DIR}/Unix"
+		--exclude="${PLUGINS_DIR}/Aka"
+		--exclude="${PLUGINS_DIR}/Misc"
+	)
 	"${EPYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \
 		--plugins-dir="${PLUGINS_DIR}" --no-network \
 		--disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \