gentoo auto-resync : 27:06:2023 - 13:35:02

6 files changed, 2 insertions, 165 deletions

diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index e31ff5e060f2..40dd6f96b90d 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,8 +1,3 @@
-AUX pexpect-4.8.0-fix-PS1.patch 662 BLAKE2B 93bf985deee0b14690fe08abbb21be09044e0c7da372a3c0162b5fabbb6a12a9bdb37d67df94c2e3695e8ee4cf1559eaa88b39a3a82d1579fe3044218e9e8ad7 SHA512 91b5897a0dd45bf85854fa89c59cf218d166fa6565384443fdd061819350ea5a6b7fb9c05f686099e2ac3c4dd741a84931e40a81bbf76869a5e55b75443ece5c
-AUX pexpect-4.8.0-py311.patch 2672 BLAKE2B 994d46c09777b972354ce27ce4908f60f02c47c3a173d0b5021d16742e690310036056c5145a96a00561e1f379d08d34d49e4a592c397091a77d94fbcae27642 SHA512 a5b1e07bef7c2aecd82eafe5dd559039b5e5bed3f71fe20b18f0a2a17c47b14ffb2b4e2550ea315df74c12910d5dcda55d78bac812ac45d56bd85523f08921b2
-AUX pexpect-4.8.0-sphinx-3.patch 761 BLAKE2B 609849b3587cd5eeada58ba5065111f3d5d38514d525c49682a9554fe5b21c4b5994ad3cc70725c1a73e19daf03c66644a7fa0ac880d87e912620263396df3d9 SHA512 d6cd0c3554c83c0092f46a2254dbe1752773abd76c220e0eeecd4a416f01ec57ecd51f26011e17d03537746d24f913472467d9ac8b569bdc168b6975292b4cab
-DIST pexpect-4.8.0.tar.gz 157037 BLAKE2B 742642bd6b9ec3f6cdfad054d4fd22db56b4a55b746d675c27a8cdf824ea749ec4589e296dffa08778195f3ccd20feb56bc0fd5212984396ea5aa0555c41ca96 SHA512 7447ae2d1e13be422c894a8fd51c5aaa788e37ea7f0c798c88b77afd401fb3631400a637077ccbb83c2e3876b0d0c5e1dbd5fdc9d3739d785b4d5ad7c0192580
 DIST pexpect-4.8.0_p20230402.gh.tar.gz 169420 BLAKE2B 4780621f5876506c5ad2dbf03656d8c336d5aadef99b1ae99e841b5d0a945ab54177cb04a79b526e422cd4df7393c723000e4a28960bd5f57a5e0173b0a3bc69 SHA512 72cdf226ec5c7d60a10fbcecf81cd1ae422467652e104bb818908bf6d1a4a4bcadab9a06d58475a9609580d973956e18e2ab144ab13a0b700072474ff3087259
-EBUILD pexpect-4.8.0-r3.ebuild 1186 BLAKE2B 4d24df6d44b889ab76ea51bdfc41541a6e229220abc1d98fb723aa61961f7f57784e100ed8e17d48f29646ca9046a638c3de654b049a7c93868d09e6b6d64b26 SHA512 c15328432614ee90f8e80e9fb7467cc6235e7e45c7a04fcdcb7c84ea70c91a05cb55136d80279fec6e0d74950c3b9bd01fdcdafe60ad424eaf344fa80f917912
-EBUILD pexpect-4.8.0_p20230402.ebuild 1290 BLAKE2B 0d739f17544639eb17113263699dd70daecb43ecf759ddd7af963684f0a3e4d047722c1f12fe20d32de9541ef7a42e282cc10e33d631a61c40dfc2af38fc4a80 SHA512 9ccf6f1bccaa7a83fa9121564a81df7e8525b764b603af2979b04cf7424c57c551cefd7d51f55c86f5fa97fd93a102a1be219e6e6b72eba8ad38b2d0dddc8f7a
+EBUILD pexpect-4.8.0_p20230402.ebuild 1282 BLAKE2B 94227c3cb3dfcf791a14d037d6b0c9e33a823a2abcf88c391bac24ff0c39d185f84e9317f49993f8fb2d74005b1bc87b907ae76af0d703e98d5b512fe59a8b5b SHA512 ae8b9734b3d4fe88a7c32c2af5f335ab6fc2544fcccc63f3321d1ff04096f6242ae873fb6553b2ba5c390a0598491182699bee53461bb104f786ec2eda07980c
 MISC metadata.xml 403 BLAKE2B 0e07f64f32ee9f6776e53f5e59b91e0e22675ebb0e8c8b98eadfb9a46d29af3e7daaafbf4e60fd7fa20bf57d42619ebdf26994b087ed0773a943acd6fddc8ab4 SHA512 4c3e18b98b69213899a6af8366ade2ebfaa4eabef76f880cd71c300b03fc7725246200bc00491942b3f7b4b4f87bdfbc9181663fe5c8b7c5325f1e7c6e76356d
diff --git a/dev-python/pexpect/files/pexpect-4.8.0-fix-PS1.patch b/dev-python/pexpect/files/pexpect-4.8.0-fix-PS1.patch
deleted file mode 100644
index 903b742f71d3..000000000000
--- a/dev-python/pexpect/files/pexpect-4.8.0-fix-PS1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: whitley-delamora <62795654+whitley-delamora@users.noreply.github.com>
-Date: Sat, 28 Mar 2020 13:46:47 +0100
-Subject: [PATCH] REPLWrapTestCase.test_bash_env(): export variable PS1
-
-https://github.com/pexpect/pexpect/commit/51c0b09f92f140eda10b62d234710f65ad56dee2
-
---- a/tests/test_replwrap.py
-+++ b/tests/test_replwrap.py
-@@ -45,6 +45,7 @@ def test_bash_env(self):
-         """env, which displays PS1=..., should not mess up finding the prompt.
-         """
-         bash = replwrap.bash()
-+        res = bash.run_command("export PS1")
-         res = bash.run_command("env")
-         self.assertIn('PS1', res)
-         res = bash.run_command("echo $HOME")
diff --git a/dev-python/pexpect/files/pexpect-4.8.0-py311.patch b/dev-python/pexpect/files/pexpect-4.8.0-py311.patch
deleted file mode 100644
index b7de17a68785..000000000000
--- a/dev-python/pexpect/files/pexpect-4.8.0-py311.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 52af5b0ae0627139524448a3f2e83d9f40802bc2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Thu, 24 Mar 2022 15:15:33 +0100
-Subject: [PATCH] Convert @asyncio.coroutine to async def
-
-This is required for Python 3.11+ support.
-
-Fixes https://github.com/pexpect/pexpect/issues/677
----
- pexpect/_async.py | 16 +++++++---------
- 1 file changed, 7 insertions(+), 9 deletions(-)
-
-diff --git a/pexpect/_async.py b/pexpect/_async.py
-index dfbfeef5..bc83261d 100644
---- a/pexpect/_async.py
-+++ b/pexpect/_async.py
-@@ -4,8 +4,7 @@
- 
- from pexpect import EOF
- 
--@asyncio.coroutine
--def expect_async(expecter, timeout=None):
-+async def expect_async(expecter, timeout=None):
-     # First process data that was previously read - if it maches, we don't need
-     # async stuff.
-     idx = expecter.existing_data()
-@@ -14,7 +13,7 @@ def expect_async(expecter, timeout=None):
-     if not expecter.spawn.async_pw_transport:
-         pw = PatternWaiter()
-         pw.set_expecter(expecter)
--        transport, pw = yield from asyncio.get_event_loop()\
-+        transport, pw = await asyncio.get_event_loop()\
-             .connect_read_pipe(lambda: pw, expecter.spawn)
-         expecter.spawn.async_pw_transport = pw, transport
-     else:
-@@ -22,26 +21,25 @@ def expect_async(expecter, timeout=None):
-         pw.set_expecter(expecter)
-         transport.resume_reading()
-     try:
--        return (yield from asyncio.wait_for(pw.fut, timeout))
-+        return (await asyncio.wait_for(pw.fut, timeout))
-     except asyncio.TimeoutError as e:
-         transport.pause_reading()
-         return expecter.timeout(e)
- 
--@asyncio.coroutine
--def repl_run_command_async(repl, cmdlines, timeout=-1):
-+async def repl_run_command_async(repl, cmdlines, timeout=-1):
-     res = []
-     repl.child.sendline(cmdlines[0])
-     for line in cmdlines[1:]:
--        yield from repl._expect_prompt(timeout=timeout, async_=True)
-+        await repl._expect_prompt(timeout=timeout, async_=True)
-         res.append(repl.child.before)
-         repl.child.sendline(line)
- 
-     # Command was fully submitted, now wait for the next prompt
--    prompt_idx = yield from repl._expect_prompt(timeout=timeout, async_=True)
-+    prompt_idx = await repl._expect_prompt(timeout=timeout, async_=True)
-     if prompt_idx == 1:
-         # We got the continuation prompt - command was incomplete
-         repl.child.kill(signal.SIGINT)
--        yield from repl._expect_prompt(timeout=1, async_=True)
-+        await repl._expect_prompt(timeout=1, async_=True)
-         raise ValueError("Continuation prompt found - input was incomplete:")
-     return u''.join(res + [repl.child.before])
- 
diff --git a/dev-python/pexpect/files/pexpect-4.8.0-sphinx-3.patch b/dev-python/pexpect/files/pexpect-4.8.0-sphinx-3.patch
deleted file mode 100644
index d23055fba251..000000000000
--- a/dev-python/pexpect/files/pexpect-4.8.0-sphinx-3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 506bcd97fa1d20d1412d399353c38f0ff3546a1a Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 13 Apr 2020 23:26:09 +0200
-Subject: [PATCH] Fix compilation of docs with Sphinx 3.0.1
-
-https://github.com/pexpect/pexpect/issues/637
----
- doc/sphinxext/github.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/doc/sphinxext/github.py b/doc/sphinxext/github.py
-index 519e146..771dccc 100644
---- a/doc/sphinxext/github.py
-+++ b/doc/sphinxext/github.py
-@@ -146,7 +146,6 @@ def setup(app):
-     
-     :param app: Sphinx application context.
-     """
--    app.info('Initializing GitHub plugin')
-     app.add_role('ghissue', ghissue_role)
-     app.add_role('ghpull', ghissue_role)
-     app.add_role('ghuser', ghuser_role)
--- 
-2.26.0
-
diff --git a/dev-python/pexpect/pexpect-4.8.0-r3.ebuild b/dev-python/pexpect/pexpect-4.8.0-r3.ebuild
deleted file mode 100644
index 38a771d8a8a6..000000000000
--- a/dev-python/pexpect/pexpect-4.8.0-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python module for spawning child apps and responding to expected patterns"
-HOMEPAGE="
-	https://pexpect.readthedocs.io/
-	https://pypi.org/project/pexpect/
-	https://github.com/pexpect/pexpect/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sphinx-3.patch
-	"${FILESDIR}"/${P}-fix-PS1.patch
-	"${FILESDIR}"/${P}-py311.patch
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx doc
-
-src_test() {
-	# workaround new readline defaults
-	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
-	local -x INPUTRC="${T}"/inputrc
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild b/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild
index 8d8caccb6973..93a2479585b1 100644
--- a/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild
+++ b/dev-python/pexpect/pexpect-4.8.0_p20230402.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples"
 
 RDEPEND="