From e23a08d0c97a0cc415aaa165da840b056f93c997 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Oct 2021 23:06:07 +0100 Subject: gentoo resync : 08.10.2021 --- dev-python/pexpect/Manifest | 3 +- .../pexpect/files/pexpect-4.8.0-fix-PS1.patch | 16 ++++++ dev-python/pexpect/pexpect-4.8.0-r1.ebuild | 57 ---------------------- dev-python/pexpect/pexpect-4.8.0-r2.ebuild | 44 +++++++++++++++++ 4 files changed, 62 insertions(+), 58 deletions(-) create mode 100644 dev-python/pexpect/files/pexpect-4.8.0-fix-PS1.patch delete mode 100644 dev-python/pexpect/pexpect-4.8.0-r1.ebuild create mode 100644 dev-python/pexpect/pexpect-4.8.0-r2.ebuild (limited to 'dev-python/pexpect') diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest index 1eae6e754800..f9320aed42c3 100644 --- a/dev-python/pexpect/Manifest +++ b/dev-python/pexpect/Manifest @@ -1,4 +1,5 @@ +AUX pexpect-4.8.0-fix-PS1.patch 662 BLAKE2B 93bf985deee0b14690fe08abbb21be09044e0c7da372a3c0162b5fabbb6a12a9bdb37d67df94c2e3695e8ee4cf1559eaa88b39a3a82d1579fe3044218e9e8ad7 SHA512 91b5897a0dd45bf85854fa89c59cf218d166fa6565384443fdd061819350ea5a6b7fb9c05f686099e2ac3c4dd741a84931e40a81bbf76869a5e55b75443ece5c 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 -EBUILD pexpect-4.8.0-r1.ebuild 1446 BLAKE2B 5ea6ec7103f50f4ee6ffefa942fa9cb50901cc479cc41289f2f6a3e7f5db0bcfb39746b4018df9061734f8502f9f8413db047e9ea3563c971fc6ae93bd182e09 SHA512 38aeb4d355fe871123c425061c3426437f54069620adef43a5a820b4c60944ea18a436a634660ad76bf5f56f16bebceb1ca2f0d7781f14541cc724d214b46349 +EBUILD pexpect-4.8.0-r2.ebuild 1182 BLAKE2B fdc67f66d369333f3f8b356c2e16d800311ccc4b38e2a53d5ee850cfee53a78d67cee56a217820e6f5befec113ba7d36c21a49be914325d76a19914c4a1a9854 SHA512 a215279bd237b49cdc12af2c4a7957649fddff7247ab351b302a674288bbfd913a439d953ed2f66efcc51c499d654f816058822d040a2c13cd11f3f0ebb03ae1 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 new file mode 100644 index 000000000000..903b742f71d3 --- /dev/null +++ b/dev-python/pexpect/files/pexpect-4.8.0-fix-PS1.patch @@ -0,0 +1,16 @@ +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/pexpect-4.8.0-r1.ebuild b/dev-python/pexpect/pexpect-4.8.0-r1.ebuild deleted file mode 100644 index 7baa9ab2af81..000000000000 --- a/dev-python/pexpect/pexpect-4.8.0-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} pypy3 ) -PYTHON_REQ_USE="threads(+)" -DISTUTILS_USE_SETUPTOOLS=no - -inherit distutils-r1 - -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/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="doc examples" - -RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]" -DEPEND=" - doc? ( dev-python/sphinx )" - -PATCHES=( - "${FILESDIR}"/${P}-sphinx-3.patch -) - -distutils_enable_tests pytest - -python_compile_all() { - use doc && emake -C doc html -} - -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() { - distutils-r1_python_install - if ! python_is_python3; then - # https://bugs.gentoo.org/703100 - rm "${D}$(python_get_sitedir)/pexpect/_async.py" || die - fi -} - -python_install_all() { - use doc && local HTML_DOCS=( doc/_build/html/. ) - 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-r2.ebuild b/dev-python/pexpect/pexpect-4.8.0-r2.ebuild new file mode 100644 index 000000000000..9e985d413abf --- /dev/null +++ b/dev-python/pexpect/pexpect-4.8.0-r2.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +PYTHON_REQ_USE="threads(+)" +DISTUTILS_USE_SETUPTOOLS=no + +inherit distutils-r1 + +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/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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 +) + +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 +} -- cgit v1.2.3