From 76617568771869151cb2a3f71939719c15dd47a2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Jul 2023 08:55:05 +0100 Subject: gentoo auto-resync : 24:07:2023 - 08:55:05 --- dev-python/virtualenvwrapper/Manifest | 3 +- ...230121-override-default-python-executable.patch | 21 ++++++ .../virtualenvwrapper-4.8.4_p20230121-r1.ebuild | 74 ---------------------- .../virtualenvwrapper-4.8.4_p20230121-r2.ebuild | 73 +++++++++++++++++++++ 4 files changed, 96 insertions(+), 75 deletions(-) create mode 100644 dev-python/virtualenvwrapper/files/virtualenvwrapper-4.8.4_p20230121-override-default-python-executable.patch delete mode 100644 dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4_p20230121-r1.ebuild create mode 100644 dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4_p20230121-r2.ebuild (limited to 'dev-python/virtualenvwrapper') diff --git a/dev-python/virtualenvwrapper/Manifest b/dev-python/virtualenvwrapper/Manifest index ed78d034f018..b2872f8026ad 100644 --- a/dev-python/virtualenvwrapper/Manifest +++ b/dev-python/virtualenvwrapper/Manifest @@ -1,6 +1,7 @@ +AUX virtualenvwrapper-4.8.4_p20230121-override-default-python-executable.patch 905 BLAKE2B e3dc59287d4fa4efe5427c77690853136a3d52abf58ae3f8931755c846f6f81beb5d04338d9a587a1281ef7ef9b99616c95d2c355df3481141a13d843dc4cb79 SHA512 b5827d93420d33767e6931ebb7ab6337baa186848e270eff4bfe2f31d98e550647754c7b466290a8fee666acd8a0f5b4d4a962af8834c43349b448f569ba15d9 AUX virtualenvwrapper-4.8.4_p20230121-remove-use-of-which.patch 4608 BLAKE2B 06a808faa7c3fbb96206c59d6c40429800496be41e8b03bf760a199bbb50b1735469094e6cb35504c23a7339d5564329e335b7a563b1df96143e9cf48b9cde43 SHA512 52ed979503f50d53dc849f99f219200e3ec837693612a8723dd7f0cb8bd325573c9bbbefbd162da1390eae9e4e0031079ac9d151cff2232c43fa4aa892bf81f6 DIST virtualenvwrapper-4.8.4.tar.gz 334920 BLAKE2B cd790b1e98cca7d09ea9c80df5d52380335d4a0ea4e6d95f7bd48d78583e0d842e1145ea08d8d8c73516adbe8d6c75bd53c17943723f859860a0cad105a2b058 SHA512 461938100061e11af0ee9b17405d991ae34e5ec9c79cc12614962d3178b588a2da710baa15ac626960b09177c1b5b10c7bc590cb4c126ebd2f719d0f1527c9c4 DIST virtualenvwrapper-4.8.4_p20230121.gh.tar.gz 72852 BLAKE2B 2996b88f93790587ffbeed936334bb1f12a9d6d952eb7c9b728a6644c9b7c7e0953bc7c71201fbd590f6258eb163af1aa6494f476decfa54f095ca215e4e13e1 SHA512 9df8b20dd8d50fe7891b845c8112edc165b08cc231ebb4010aed8ec50a22005207a9a3c9c9941daa2b958022f0edf993425bf95692f7032d1e5c5719a552d3b4 EBUILD virtualenvwrapper-4.8.4-r2.ebuild 1119 BLAKE2B d39f18ee010076da6c38b0a90be3607be1fec03282d9e9d2c56a47f27ff147364e97cd37229ef6cfe5fff85971c5bb6cc086317ef1dee3bba76872c63785a70a SHA512 169729c101a2cae2770eb5b17391f6a37ae3069494693579b9a660cfddbe8c944357a37876746894d563444671f3367810da24a76d0c45a9f77abdef1809feaa -EBUILD virtualenvwrapper-4.8.4_p20230121-r1.ebuild 1862 BLAKE2B 3c66a1de950e9158bbcac408ab1836cf73e73582f3be65d3ae1a151881e358b8e8745def08cbfef7d32eee48988df6229747a1b705373def624e4536f992d0c4 SHA512 fc2c0fba1b37203711617766070590cb377290271409c548b5e59a5fcd5b3af3d5f82273c6505e93e1b99e9231e6dbebf6103ad3625aca97f5329aa9c404d5d4 +EBUILD virtualenvwrapper-4.8.4_p20230121-r2.ebuild 1890 BLAKE2B 0db053e53dc22380a6494097feb7618c679715eceeb1d0ecfaf6da698e06ba9204062f5b66b79242535c1dbb6d9c287c58dbf6bc0c28645664cdab848ba168ea SHA512 8b3f5aa8384ff3c933516cd959e62f1992dd5e970947db0e66a8c747c06717fc711203701deb6d748d61f72a44da509f73998ac19cae9528571237b64e67e09d MISC metadata.xml 732 BLAKE2B fa857378ea2001e084a9d00d5ccc65644cc4e3ade62c04ff7dfeec4cf7df245bd700833aec1f5f430d780be5adb8fb594300e43a113b232fa83a3cfd2fa0cb15 SHA512 935796e3055e0104328dab877ca92e579770d6748053e464f6ce3563ea49022eaeae322c5c9cb026e9c3f42089c89ae06c0a2e755d124c71e05768cbbefdda44 diff --git a/dev-python/virtualenvwrapper/files/virtualenvwrapper-4.8.4_p20230121-override-default-python-executable.patch b/dev-python/virtualenvwrapper/files/virtualenvwrapper-4.8.4_p20230121-override-default-python-executable.patch new file mode 100644 index 000000000000..0c7268422efe --- /dev/null +++ b/dev-python/virtualenvwrapper/files/virtualenvwrapper-4.8.4_p20230121-override-default-python-executable.patch @@ -0,0 +1,21 @@ +https://github.com/parona-source/virtualenvwrapper/commit/9cb7bcab244c3e49d7b25b73e82566d0adce3282 + +From 9cb7bcab244c3e49d7b25b73e82566d0adce3282 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate +Date: Sun, 23 Jul 2023 05:05:59 +0300 +Subject: [PATCH] virtualenvwrapper.sh: Override default python executable + +--- a/virtualenvwrapper.sh ++++ b/virtualenvwrapper.sh +@@ -47,7 +47,7 @@ + # Locate the global Python where virtualenvwrapper is installed. + if [ "${VIRTUALENVWRAPPER_PYTHON:-}" = "" ] + then +- _virtualenvwrapper_python_executable="$(command -v python3)" ++ _virtualenvwrapper_python_executable="@@GENTOO_PYTHON_EXECUTABLE@@" + if [ -n "$_virtualenvwrapper_python_executable" ] && $_virtualenvwrapper_python_executable -m 'virtualenvwrapper.hook_loader' --help >/dev/null 2>&1 + then + VIRTUALENVWRAPPER_PYTHON=$_virtualenvwrapper_python_executable +-- +2.41.0 + diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4_p20230121-r1.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4_p20230121-r1.ebuild deleted file mode 100644 index 080fc0b55799..000000000000 --- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4_p20230121-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..11} ) - -inherit distutils-r1 - -DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool" -HOMEPAGE=" - https://github.com/python-virtualenvwrapper/virtualenvwrapper - https://pypi.org/project/virtualenvwrapper/ -" - -COMMIT="e63d2c389ed276aa161bb50a27c77af94d96a50c" -SRC_URI=" - https://github.com/python-virtualenvwrapper/virtualenvwrapper/archive/${COMMIT}.tar.gz - -> ${P}.gh.tar.gz -" -S="${WORKDIR}/${PN}-${COMMIT}" - -export PBR_VERSION="${PV/_p/.post}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/virtualenv[${PYTHON_USEDEP}] - dev-python/stevedore[${PYTHON_USEDEP}] - dev-python/virtualenv-clone[${PYTHON_USEDEP}] - ') -" -BDEPEND=" - ${RDEPEND} - $(python_gen_cond_dep ' - dev-python/pbr[${PYTHON_USEDEP}] - ') -" - -PATCHES=( - "${FILESDIR}/virtualenvwrapper-${PV}-remove-use-of-which.patch" -) - -src_prepare() { - default - - # specify default python interpeter to align with PYTHON_SINGLE_TARGET - sed -i -e \ - "s|\(_virtualenvwrapper_python_executable=\"\$(\).\w\((\"\)|\1command -v ${EPYTHON}\2|" \ - virtualenvwrapper.sh || die - - # remove tests which require an internet connection - rm tests/test_mkvirtualenv_install.sh || die - rm tests/test_mkvirtualenv_requirements.sh || die - - # remove tests which require functional git repos with remotes - sed -i -e '/test_wipeenv_\(pip_e\|develop\) () {/,/}/ d' tests/test_wipeenv.sh || die -} - -python_test() { - # tests have unusual expectations - local -x HOME="${HOME%/}" - local -x USER="${USER}" - - cp -a "${BUILD_DIR}"/{install/usr,test} || die - local -x VIRTUAL_ENV="${BUILD_DIR}/test" - - bash ./tests/run_tests "${VIRTUAL_ENV}" || die "Tests failed under ${EPYTHON}" -} diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4_p20230121-r2.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4_p20230121-r2.ebuild new file mode 100644 index 000000000000..be2e15f03d8b --- /dev/null +++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4_p20230121-r2.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..11} ) + +inherit distutils-r1 + +DESCRIPTION="Set of extensions to Ian Bicking's virtualenv tool" +HOMEPAGE=" + https://github.com/python-virtualenvwrapper/virtualenvwrapper + https://pypi.org/project/virtualenvwrapper/ +" + +COMMIT="e63d2c389ed276aa161bb50a27c77af94d96a50c" +SRC_URI=" + https://github.com/python-virtualenvwrapper/virtualenvwrapper/archive/${COMMIT}.tar.gz + -> ${P}.gh.tar.gz +" +S="${WORKDIR}/${PN}-${COMMIT}" + +export PBR_VERSION="${PV/_p/.post}" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/virtualenv[${PYTHON_USEDEP}] + dev-python/stevedore[${PYTHON_USEDEP}] + dev-python/virtualenv-clone[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + ${RDEPEND} + $(python_gen_cond_dep ' + dev-python/pbr[${PYTHON_USEDEP}] + ') +" + +PATCHES=( + "${FILESDIR}/virtualenvwrapper-${PV}-remove-use-of-which.patch" + "${FILESDIR}/virtualenvwrapper-${PV}-override-default-python-executable.patch" +) + +src_prepare() { + default + + # specify default python interpeter to align with PYTHON_SINGLE_TARGET + sed -i -e "s:@@GENTOO_PYTHON_EXECUTABLE@@:${PYTHON}:" virtualenvwrapper.sh || die + + # remove tests which require an internet connection + rm tests/test_mkvirtualenv_install.sh || die + rm tests/test_mkvirtualenv_requirements.sh || die + + # remove tests which require functional git repos with remotes + sed -i -e '/test_wipeenv_\(pip_e\|develop\) () {/,/}/ d' tests/test_wipeenv.sh || die +} + +python_test() { + # tests have unusual expectations + local -x HOME="${HOME%/}" + local -x USER="${USER}" + + cp -a "${BUILD_DIR}"/{install/usr,test} || die + local -x VIRTUAL_ENV="${BUILD_DIR}/test" + + bash ./tests/run_tests "${VIRTUAL_ENV}" || die "Tests failed under ${EPYTHON}" +} -- cgit v1.2.3