gentoo auto-resync : 25:11:2022 - 01:11:36

3 files changed, 0 insertions, 73 deletions

diff --git a/net-irc/znc-palaver/Manifest b/net-irc/znc-palaver/Manifest
index a65c32b6d2c3..130464a4d712 100644
--- a/net-irc/znc-palaver/Manifest
+++ b/net-irc/znc-palaver/Manifest
@@ -1,5 +1,3 @@
-AUX znc-palaver-1.2.1-python310.patch 2084 BLAKE2B c764435ddcbe2ae6a00b4c937e030b5bb9f8c5f612d97dab6c655c4658523b66dcd8b0bf99a00dbcaffca704e61e191b2bcce43abbd79952b1f156e47bff2564 SHA512 171307c0cc374fe88bb59f5c344d14fc85088edc34b8ff2d85efb731efdeff8159a6ac640e36aec308b1bb3a39d8991323f956937482636aec46ffd6ee379f56
-AUX znc-palaver-1.2.1-xunit2.patch 803 BLAKE2B c56e25f2961257f2a02e6f50d22542c484285460c51cba2b7e7ae9b115a182d79a2f1f2785f5bbc64381bf33062c0d2ffcad2569670e139f8360c769470fe136 SHA512 d37c7ef8e50852096ac152a984a67802ff65002ce94ae0d3e8fed76ebed8aa3b79f04cbc6587b316522cbb1d12f69e82693892e5f273600c5ce72553d03dc032
 DIST znc-palaver-1.2.2.tar.gz 14649 BLAKE2B ad67bbbfc9ad293ce71669d84b7ccb3bd69f52e534662ac35c4a3ecd41fe91af2fe519f109dd2e9b9b824e5970883706a6dc7ebc89b806e74e5ad121466947f8 SHA512 b91ba7200cac393557252874293f131c83a4cea83203457e8f6f91a129d8207c16951b983e52848ce4f54750752f69765ca26b8e3f50e74da2a11138eaf2bdce
 EBUILD znc-palaver-1.2.2.ebuild 1050 BLAKE2B 3ddc0f99bb5a59a5a78460d145d660c70aeb06e68820d25654f891424b2bedc262c6e831c14d9c3783ba9e1b93af4ec3ee82d062801d4b5e009370950b4665c1 SHA512 008245a2871339c8d9ee89e5756ebd78a54ce506e034871a4e4fe075d3934f3259f472ccc903b18eaca41f145e04df3b933ab73017f3b03ed2780d5a24e44317
 MISC metadata.xml 573 BLAKE2B 69a013a18c6c19b2211f70a09e80201d98c4909723f843043855751ddf6aa8545e2dc2b47ba5bfc0e932e25b9de609e5afebc1e9b2a4d81da0bee48cedea6397 SHA512 916557c4e13fe0f1044d427bb9041dcf5829bfc77fdbeb6874d0b75702f27a5a358d821e0db6154b1f3326ed393f7a1b72781acca5110856b0fffbb5b29736f3
diff --git a/net-irc/znc-palaver/files/znc-palaver-1.2.1-python310.patch b/net-irc/znc-palaver/files/znc-palaver-1.2.1-python310.patch
deleted file mode 100644
index 79e06f30a5ef..000000000000
--- a/net-irc/znc-palaver/files/znc-palaver-1.2.1-python310.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 3d5a1a3c2a7cb3de82c618b1e70618195ec4a1e7 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Fri, 28 Aug 2020 23:48:23 +0200
-Subject: [PATCH] test/test_palaver.py: loop argument is deprecated
-
-DeprecationWarning: The loop argument is deprecated since Python 3.8,
-and scheduled for removal in Python 3.10.
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- test/test_palaver.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/test/test_palaver.py b/test/test_palaver.py
-index 1b27878..d22366a 100644
---- a/test/test_palaver.py
-+++ b/test/test_palaver.py
-@@ -50,10 +50,10 @@ async def setUp(event_loop):
-     running_as_root = os.getuid() == 0
-     allow_root = ' --allow-root' if running_as_root else ''
- 
--    proc = await asyncio.create_subprocess_shell(f'znc -d test/fixtures --foreground --debug{allow_root}', loop=event_loop)
-+    proc = await asyncio.create_subprocess_shell(f'znc -d test/fixtures --foreground --debug{allow_root}')
-     time.sleep(31 if running_as_root else 1)
- 
--    (reader, writer) = await asyncio.open_connection('localhost', 6698, loop=event_loop)
-+    (reader, writer) = await asyncio.open_connection('localhost', 6698)
-     writer.write(b'CAP LS 302\r\n')
- 
-     line = await reader.readline()
-@@ -184,7 +184,7 @@ async def connected(reader, writer):
- 
-         connected.called = True
- 
--    server = await asyncio.start_server(connected, host='127.0.0.1', port=0, loop=event_loop)
-+    server = await asyncio.start_server(connected, host='127.0.0.1', port=0)
-     await asyncio.sleep(0.2)
-     addr = server.sockets[0].getsockname()
-     url = f'Serving on http://{addr[0]}:{addr[1]}/push'
-@@ -248,7 +248,7 @@ async def connected(reader, writer):
- 
-         connected.called = True
- 
--    server = await asyncio.start_server(connected, host='127.0.0.1', port=0, loop=event_loop)
-+    server = await asyncio.start_server(connected, host='127.0.0.1', port=0)
-     await asyncio.sleep(0.2)
-     addr = server.sockets[0].getsockname()
-     url = f'Serving on http://{addr[0]}:{addr[1]}/push'
diff --git a/net-irc/znc-palaver/files/znc-palaver-1.2.1-xunit2.patch b/net-irc/znc-palaver/files/znc-palaver-1.2.1-xunit2.patch
deleted file mode 100644
index ffbb2ad4543b..000000000000
--- a/net-irc/znc-palaver/files/znc-palaver-1.2.1-xunit2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 3be5f33d76d4e34b1bc2671f7dbbc6c5fc3ccadd Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Sat, 29 Aug 2020 00:06:53 +0200
-Subject: [PATCH] Makefile: use xunit2 as default for pytest
-
-PytestDeprecationWarning: The 'junit_family' default
-value will change to 'xunit2' in pytest 6.0.
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index d5d4866..e88277e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -30,4 +30,4 @@ test/fixtures/modules/palaver.so: palaver.so
- .PHONY: test-integration
- test-integration: test/fixtures/modules/palaver.so
- 	@mkdir -p test-reports
--	pytest --junitxml=test-reports/junit.xml
-+	pytest -o junit_family=xunit2 --junitxml=test-reports/junit.xml