diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-07-08 15:03:58 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-07-08 15:03:58 +0100 |
| commit | 814f4cf860e299a046b649eaee5463427984c09c (patch) | |
| tree | 74c45f097899310e599dad6b8df5b63e0f085bc0 /net-irc/limnoria | |
| parent | 7f0ccc917c7abe6223784c703d86cd14755691fb (diff) | |
gentoo resync : 08.07.2021
Diffstat (limited to 'net-irc/limnoria')
| -rw-r--r-- | net-irc/limnoria/Manifest | 3 | ||||
| -rw-r--r-- | net-irc/limnoria/files/limnoria-20210617-rss-testRemoveAliasedFeed-mock_data.patch | 12 | ||||
| -rw-r--r-- | net-irc/limnoria/limnoria-20210617-r1.ebuild (renamed from net-irc/limnoria/limnoria-20210617.ebuild) | 15 |
3 files changed, 23 insertions, 7 deletions
diff --git a/net-irc/limnoria/Manifest b/net-irc/limnoria/Manifest index 3e9f0a0ec217..db8ba7ba4c0f 100644 --- a/net-irc/limnoria/Manifest +++ b/net-irc/limnoria/Manifest @@ -1,6 +1,7 @@ +AUX limnoria-20210617-rss-testRemoveAliasedFeed-mock_data.patch 457 BLAKE2B bda2855d4d735e7a65bdbd2b42a73519f12f100020206c7f1e3371db16c929ef91a99d503090bfb46fd14a215cdc002335f3f190e7960c2d19ab56f09943be3c SHA512 35c78678b9c114802676f3850721c6641c9a970d002b184e097cfba65fc9f7c2f0968ac9cc77e03e332c706f7bf591cbc31838e4c68fd294e35465291e266aa8 DIST limnoria-20210527.tar.gz 1092017 BLAKE2B 1c01ecbb47927d62e30e1768bb8e4574bad7422fea379ddd3d6700351a2f8dd006370a24aeeb7a5b10003e53f1010c8fb3998ecf1ef4f11a2ce48f9145605d30 SHA512 2e09415931cb3bdc358d4a243be3f1abccd569f2371d5d2b2c67e856492475affa473c8c32c77cb2c973b64202f9c6657397fa35b5b16086fbaf4e5b44706184 DIST limnoria-20210617.tar.gz 1094438 BLAKE2B 3253af8ad764acfaadf90ce49d0f40a47f32554d75c3860079284f98373eb3bc8f60f1f308b501265973c0e6c2a552211415f4f9c3044ce78f818d305b598cbe SHA512 25dddf843e22967a95c769c62f9398129830f63e23d506f0a9abaf7044fa9ffbeca95138c494caf3b36813919c7b1f0880b0715a06bc519de1a87837a948a039 EBUILD limnoria-20210527.ebuild 2410 BLAKE2B 0063b7338075380d0707970ea907e2a02b1148e98a352e2931ea0012a7de69a3960d1d055c154d28bcb0c6c78e067e03e90dc8c89a2331f2e0f7af2579df1a20 SHA512 36fbd82577f27757a7c1ddaf699d1b50c1fc910ad4a8ab443ca193c30f7a675d39223cbd28b8cfe3975f8eb5c18f87c1075c7c7b271a2855c06698917dbf8767 -EBUILD limnoria-20210617.ebuild 2410 BLAKE2B 0063b7338075380d0707970ea907e2a02b1148e98a352e2931ea0012a7de69a3960d1d055c154d28bcb0c6c78e067e03e90dc8c89a2331f2e0f7af2579df1a20 SHA512 36fbd82577f27757a7c1ddaf699d1b50c1fc910ad4a8ab443ca193c30f7a675d39223cbd28b8cfe3975f8eb5c18f87c1075c7c7b271a2855c06698917dbf8767 +EBUILD limnoria-20210617-r1.ebuild 2463 BLAKE2B ee3c85c8fe60ef730cddbfc4ef66d8189d70e504f3570cf1a9fad9ae2c2cd6a94c05a9d52ac02b36bc5a1bccbd3ee1d7a58644e8c806c8beae86c422ecbea651 SHA512 c04126c7b043babcc12ac6c86d0f3aa9574e3a24baa3960d9bc0165df3304367b231ba1253b7547f600d8b2170de92a6e9c2fec1a2bc0b1aedf99e788d8e985f EBUILD limnoria-9999.ebuild 2410 BLAKE2B 0063b7338075380d0707970ea907e2a02b1148e98a352e2931ea0012a7de69a3960d1d055c154d28bcb0c6c78e067e03e90dc8c89a2331f2e0f7af2579df1a20 SHA512 36fbd82577f27757a7c1ddaf699d1b50c1fc910ad4a8ab443ca193c30f7a675d39223cbd28b8cfe3975f8eb5c18f87c1075c7c7b271a2855c06698917dbf8767 MISC metadata.xml 537 BLAKE2B b5b3c724a256cfeb8c99426ebe011fab7aa09f099c92f5ab4684989a4553a6820816bebeb12e8fbe1801c54d9b279e47e9ca4f46f654f3575d5bc5f7badb1b53 SHA512 7583b486dbc023fc3dadd694ca8bc123296685b613e2eebd4f4f8de0105c68a58f0dc7c3997c3b1a5a93bb689758199e59f8e25fc136a310bea7568ce90cf5dd 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 new file mode 100644 index 000000000000..f3a579112848 --- /dev/null +++ b/net-irc/limnoria/files/limnoria-20210617-rss-testRemoveAliasedFeed-mock_data.patch @@ -0,0 +1,12 @@ +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.ebuild b/net-irc/limnoria/limnoria-20210617-r1.ebuild index 03b9171f694b..cdecec64aaaf 100644 --- a/net-irc/limnoria/limnoria-20210617.ebuild +++ b/net-irc/limnoria/limnoria-20210617-r1.ebuild @@ -5,6 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7..9} ) DISTUTILS_USE_SETUPTOOLS=no +DISTUTILS_IN_SOURCE_BUILD=yes # needed for tests inherit distutils-r1 MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}" @@ -43,10 +44,14 @@ RDEPEND=" !net-irc/supybot-plugins" BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )" -python_prepare() { - einfo "Removing the RSS plugin because of clashes between libxml2's Python3" - einfo "bindings and feedparser." - rm -r "plugins/RSS" || die +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 + distutils-r1_python_prepare_all } python_test() { @@ -56,8 +61,6 @@ python_test() { # 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" ) - # Runs despite --no-network (GH #1392) - EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Aka" ) "${EPYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \ --plugins-dir="${PLUGINS_DIR}" --no-network \ --disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \ |