From 7236d0a40beeff3f6f0fcede52d54dfb81880faa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 11 Nov 2022 21:30:43 +0000 Subject: gentoo auto-resync : 11:11:2022 - 21:30:43 --- sys-apps/pkgcore/Manifest | 3 +- .../files/pkgcore-0.12.17-fix-extra-files.patch | 29 ++++++++++++ sys-apps/pkgcore/pkgcore-0.12.17-r1.ebuild | 51 --------------------- sys-apps/pkgcore/pkgcore-0.12.17-r2.ebuild | 52 ++++++++++++++++++++++ 4 files changed, 83 insertions(+), 52 deletions(-) create mode 100644 sys-apps/pkgcore/files/pkgcore-0.12.17-fix-extra-files.patch delete mode 100644 sys-apps/pkgcore/pkgcore-0.12.17-r1.ebuild create mode 100644 sys-apps/pkgcore/pkgcore-0.12.17-r2.ebuild (limited to 'sys-apps/pkgcore') diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest index efe4b0de49f9..1e498b527e05 100644 --- a/sys-apps/pkgcore/Manifest +++ b/sys-apps/pkgcore/Manifest @@ -1,7 +1,8 @@ +AUX pkgcore-0.12.17-fix-extra-files.patch 1006 BLAKE2B 72de925e135d33f3cdf52382c4a9cf172f195301de467e01d4218f88b4037d6e7fc824f06401e1838c4a22d25e3132f0b0aace9047bc6b557e413ed65e6e6053 SHA512 1f09f215b544cdbc07935af405f94a5c69f4840a1c1570e9cea23a2a48cf8a4e71a9ac74f8b65cf7f3d391060fc2f8012761f4187e9a4446e4e9de42d6c316c9 AUX pkgcore-0.12.17-fix-prefix.patch 731 BLAKE2B 4487c145393747415717f5bf4845a49741641eb509175d4bcf766ae56625513243f7f0a951ad749a1e5efcf5327e16b8b9d684a5e235a23b18a0af5256e4506c SHA512 edcaa570a6c7606437b3b35f684f9fcd9c1fc2bf493c5199ad209007dec0ae546b31fff3b6adcc9477cda3a7ad35764357107519d8429a254af52d56b3f0c3ee DIST pkgcore-0.12.16.tar.gz 623795 BLAKE2B b591aeaa5d780f0b273d446d1bdbdf33a44d085aa4975d3c5f394820a6f479c15da7850a699c92a56cb280ee028d922551c7226801dea6f4c34620bde3859c31 SHA512 acd7c478b342349e66dfda5ed1284663037b221e39b557215d1441e8a908c845fe26e274bcfd97b1879f5792fc017437cd0fbde1cdffc5ebc595a34fa56d2589 DIST pkgcore-0.12.17.tar.gz 615375 BLAKE2B 9aabdeead2997e53ee3c966c908a231ff5e3b85422844538f47ff7bed03611459224ad7e931a9e94f0e376f221bd5c54f0f77f7883543cbd5b03c4dba6ba591b SHA512 9bad9b6e6177873b9187cff66b6b51c644a59a2d9f01b8ca110bc49006d6f0221c2c3b145d7cf5cec6f3c7526b6751100d56df13350b674a68ab5bbf19f10131 EBUILD pkgcore-0.12.16-r1.ebuild 1449 BLAKE2B a4620deadd0c3e5c59a72b0eea28d15dab8d73449051d59f347a4d37b4a83c69ff8c84cae743b7d8f3344dbac5055c08e6a85282d3680900b9e873131ba9f842 SHA512 cd9676de9f17249a2c0aeb1b266b357c6a700f829a6fe8ba0b9cab5423312ef8874e2f407c29156f894a2c9b64e3a7e98d733f6abff082ec2a199870e629c1e2 -EBUILD pkgcore-0.12.17-r1.ebuild 1198 BLAKE2B e1d14fa3a8558a511dcb94715444b873fb4765ce79c55e61c0e322737fd5ce75bfd93e1be2b96f72352b7bac034f3f9d546b5cf8e7cc805467589132d7f9653b SHA512 70141dae9a3dc50d1f9dedfc6cf8e40e5b40f696f3956af97dda2bf078ca4b6b76455f2051e81e80d15fe94cfcc60ad3f7eaf198ccad62889bb7baf8b9f5e77a +EBUILD pkgcore-0.12.17-r2.ebuild 1249 BLAKE2B 60b698ed2f0d15eb9e51626385417f37453b471937ebb7a5496e5242e74cbf1cd7320171b494a0977ab2c7987567f43ea1257f82533fcf5220729f06ba2b2968 SHA512 dc6f6eeec816c70cea571b1aaad91a82380e2393db4b462d1b7f0e3457e5210df2e646a033e07e9cf37ba38bfc7d29f918fff2cc4cdbfee0257bcdf397e45faf EBUILD pkgcore-9999.ebuild 1139 BLAKE2B 1030392abec3f120c6e588b7750cdf03b01cce418ed79c85d4b2de5d62e5474d2e0c690294c80f4f0e66d8b38208de409a41e7f0e4bc805424399935670c828c SHA512 cac9cdada2dc91a8e720d40af32dd61d0f4884766d581cf793c39757a43457c0e680abac4b44fe71975cc017e047b8bc79b1bd5586d45f203679814eb427af32 MISC metadata.xml 392 BLAKE2B 98797b18321d3133dceaf79389bd35b26344a342c55c477b178359d731c46fa209adbdcf1d14eb009d57c8c20db8b898651dd45d5bcfc6bb3009ceffa1436650 SHA512 097710cc6c1df7455328a1d3feb223e324162ff20ef03964de4682eec7acf4e2d08fa64d3ac4946783f4c2587455d90ee5aa628f637f3a48386d9c9e6b7362e1 diff --git a/sys-apps/pkgcore/files/pkgcore-0.12.17-fix-extra-files.patch b/sys-apps/pkgcore/files/pkgcore-0.12.17-fix-extra-files.patch new file mode 100644 index 000000000000..bc6b16ffc69f --- /dev/null +++ b/sys-apps/pkgcore/files/pkgcore-0.12.17-fix-extra-files.patch @@ -0,0 +1,29 @@ +--- a/tests/ebuild/test_eapi.py ++++ b/tests/ebuild/test_eapi.py +@@ -1,6 +1,8 @@ ++import shutil + from unittest import mock + + import pytest ++from pkgcore.const import EBD_PATH + from pkgcore.ebuild import eapi + from pkgcore.ebuild.eapi import EAPI, eapi6, get_eapi + +@@ -19,13 +21,15 @@ def test_get_eapi(): + + class TestEAPI: + +- def test_register(self): ++ def test_register(self, tmp_path): + # re-register known EAPI + with pytest.raises(ValueError): + EAPI.register(magic="0") + ++ mock_ebd_temp = str(shutil.copytree(EBD_PATH, tmp_path / 'ebd')) + with mock.patch('pkgcore.ebuild.eapi.bash_version') as bash_version, \ +- mock.patch.dict(eapi.EAPI.known_eapis): ++ mock.patch.dict(eapi.EAPI.known_eapis), \ ++ mock.patch('pkgcore.ebuild.eapi.const.EBD_PATH', mock_ebd_temp): + # inadequate bash version + bash_version.return_value = '3.1' + with pytest.raises(SystemExit) as excinfo: diff --git a/sys-apps/pkgcore/pkgcore-0.12.17-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.12.17-r1.ebuild deleted file mode 100644 index 9f732afa4d66..000000000000 --- a/sys-apps/pkgcore/pkgcore-0.12.17-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=standalone -PYTHON_COMPAT=( python3_{9..11} ) -inherit distutils-r1 - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcore.git - https://github.com/pkgcore/pkgcore.git" - inherit git-r3 -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" -fi - -DESCRIPTION="a framework for package management" -HOMEPAGE="https://github.com/pkgcore/pkgcore" - -LICENSE="BSD MIT" -SLOT="0" - -RDEPEND=" - >=app-shells/bash-5.0 - dev-python/lxml[${PYTHON_USEDEP}] -" -if [[ ${PV} == *9999 ]]; then - RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]" -else - RDEPEND+=" >=dev-python/snakeoil-0.10.1[${PYTHON_USEDEP}]" -fi -BDEPEND=" - >=dev-python/flit_core-3.8[${PYTHON_USEDEP}] - test? ( - dev-vcs/git - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-0.12.17-fix-prefix.patch" -) - -distutils_enable_tests pytest - -python_install_all() { - local DOCS=( NEWS.rst ) - [[ ${PV} == *9999 ]] || doman build/sphinx/man/* - distutils-r1_python_install_all -} diff --git a/sys-apps/pkgcore/pkgcore-0.12.17-r2.ebuild b/sys-apps/pkgcore/pkgcore-0.12.17-r2.ebuild new file mode 100644 index 000000000000..4c804c52bcce --- /dev/null +++ b/sys-apps/pkgcore/pkgcore-0.12.17-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=standalone +PYTHON_COMPAT=( python3_{9..11} ) +inherit distutils-r1 + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcore.git + https://github.com/pkgcore/pkgcore.git" + inherit git-r3 +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos" + SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +fi + +DESCRIPTION="a framework for package management" +HOMEPAGE="https://github.com/pkgcore/pkgcore" + +LICENSE="BSD MIT" +SLOT="0" + +RDEPEND=" + >=app-shells/bash-5.0 + dev-python/lxml[${PYTHON_USEDEP}] +" +if [[ ${PV} == *9999 ]]; then + RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]" +else + RDEPEND+=" >=dev-python/snakeoil-0.10.1[${PYTHON_USEDEP}]" +fi +BDEPEND=" + >=dev-python/flit_core-3.8[${PYTHON_USEDEP}] + test? ( + dev-vcs/git + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-0.12.17-fix-prefix.patch" + "${FILESDIR}/${PN}-0.12.17-fix-extra-files.patch" +) + +distutils_enable_tests pytest + +python_install_all() { + local DOCS=( NEWS.rst ) + [[ ${PV} == *9999 ]] || doman build/sphinx/man/* + distutils-r1_python_install_all +} -- cgit v1.2.3