diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-03-24 23:59:54 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-24 23:59:54 +0000 |
| commit | 401101f9c8077911929d3f2b60a37098460a5d89 (patch) | |
| tree | c2bef4719f6787550f0916aeaa8f4f403a9296af /sys-apps/portage | |
| parent | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (diff) | |
gentoo resync : 25.03.2022
Diffstat (limited to 'sys-apps/portage')
| -rw-r--r-- | sys-apps/portage/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/portage/portage-3.0.30-r1.ebuild | 8 | ||||
| -rw-r--r-- | sys-apps/portage/portage-9999.ebuild | 8 |
3 files changed, 14 insertions, 6 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index bc1136c1cf87..2415f17b48bf 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -16,6 +16,6 @@ EBUILD portage-3.0.18.ebuild 8718 BLAKE2B 31ae0f52479b5c4704eaea954e09fd2e105bbb EBUILD portage-3.0.20-r6.ebuild 9837 BLAKE2B a4176c20b1e43ef301bbf595a335406130be6d157180a3cb867a71813280dccdbb5f03ec0068c0f4803b123d56da951898e49f30a60e6e5a3ed8bee56092d3d1 SHA512 e3cbfc10e9891e51c382ef1d854f3eafe3c147a8e1248316a6f78b6dd25715bab84bfa32241bc54624e5db610359d27c9162bc3753531b753fc0b9a7aba97c68 EBUILD portage-3.0.28-r1.ebuild 8727 BLAKE2B e174e7fb7f51f1ec04d4076f6b04e9d7facc33319c3c743c0e87b503d8f00ca459fec5546f322c6b84291e5e0178b0d76b20806908bfd542983f547e900e0a0a SHA512 86c2b9b9dcdcaa6be5247db802ec230327981d4f3c4e31980e19064621a9287dc9ac9c8e81a94dbc1611857fe847c8989a7f3b7a09db3227092a9297d7f440a7 EBUILD portage-3.0.29.ebuild 8548 BLAKE2B 32eba52517af7bde9fbafddb15203a7c9c6b72cd549b6a81f79b35b0ba96cedc7a121f3dd9496a3d4c66377ef591fe63a6eb0b57da3a1b72d0e2656aa4b11da9 SHA512 11f9394cfd8ed261d0b83a724366d9e43b2fb76fd71d1f6e1424ebf07d55a4dde78ea25157266f5eb6bd85d414f07d4499888907697d41248ceabf74ced03282 -EBUILD portage-3.0.30-r1.ebuild 8653 BLAKE2B e54f227d33b9fff047a30fca6c33083aff750b4dc5150a32c9242afd9f5e26821d55ececa169f8bd9a578bf77e84828c8a4cb99f3f9d34449ab485375a2e0d1a SHA512 8bb2dd10d4fb2a918efff386b2c55704d4f3729d44f15cfb0a938b909e96b7d875e806c418bcd332055b99006bd3b77a8e80b09cb126b8e3328f8893c406cff5 -EBUILD portage-9999.ebuild 7837 BLAKE2B e2b62b5356d8ad26a5538b26b7222a99a08f50e7a6ea3e01873a30bffb9b46681d27ccecef801dbc95c5c1c52d579f917309e5e69116dc173a68f61dc7b3fa9f SHA512 ec2ff4c107b3a48ec1c5746a99f52c9175bc26a9b48e0210faf40deff42b9ce462befd4bb2f677a482e1285858d5c857e7c691a55793e8aacc3ff1a641249c2e +EBUILD portage-3.0.30-r1.ebuild 8834 BLAKE2B 8346cef2c47e8d29484674b2df37f4f38b15f9615f5578321adc6aaf98cae4649f475989e3c30cc479364903fc7bb2ca65ab1fe1fb897c828db4430dc12706b5 SHA512 0cf01ec82ca48f225309ff118ea9741e8bb9cc7f127bd753b0d6da5b12297ce71ebf7f2cb022dc0d08f957a111723fa750152bf55e406c57a74819432a036e43 +EBUILD portage-9999.ebuild 8018 BLAKE2B 9df65587b54a652aa2c404bbb6cc97a96740c5467753858d3a498ddf5990db62ca8ae590a67e21d793297bc02ff61c0eef86ccef0f7a7e135866914acad8e780 SHA512 51307bb4ec176494f4fd4c9d24bf876bc0dc69077ae0fd814e69844a6ef640974ca8b4897358a3f3082baaa8d66287e1910890d381d0b8da5fe888c1ceb4627e MISC metadata.xml 1483 BLAKE2B 5f164044c11b8fc7a103c459be58268403dab87fbbfeedd0f5fa4d1a4edf9ec7d4983cc7d5a3e6d298b268859fc1eb91723f0c98313e9b3b5dfb0368aedb1a20 SHA512 284a46b4708fc88734ca87f041fb6a88bc4a7e6a50ce03533a1eef9602694adcb09679b665a3793e4609ea85fd41b84438b27479ffa00ac53cbf9d4bb89a3402 diff --git a/sys-apps/portage/portage-3.0.30-r1.ebuild b/sys-apps/portage/portage-3.0.30-r1.ebuild index 590e0036a88a..142f3b42ff89 100644 --- a/sys-apps/portage/portage-3.0.30-r1.ebuild +++ b/sys-apps/portage/portage-3.0.30-r1.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( pypy3 python3_{8..10} ) PYTHON_REQ_USE='bzip2(+),threads(+)' TMPFILES_OPTIONAL=1 -inherit distutils-r1 linux-info tmpfiles prefix +inherit distutils-r1 linux-info toolchain-funcs tmpfiles prefix DESCRIPTION="The package management and distribution system for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" @@ -76,6 +76,10 @@ PDEPEND=" pkg_pretend() { local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" + if use native-extensions && tc-is-cross-compiler; then + einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)" + fi + check_extra_config } @@ -99,7 +103,7 @@ python_prepare_all() { >> cnf/make.globals || die fi - if use native-extensions; then + if use native-extensions && ! tc-is-cross-compiler; then printf "[build_ext]\nportage_ext_modules=true\n" >> \ setup.cfg || die fi diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index c741638d18e9..03fbe40d7065 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( pypy3 python3_{8..10} ) PYTHON_REQ_USE='bzip2(+),threads(+)' TMPFILES_OPTIONAL=1 -inherit distutils-r1 git-r3 linux-info tmpfiles prefix +inherit distutils-r1 git-r3 linux-info toolchain-funcs tmpfiles prefix DESCRIPTION="The package management and distribution system for Gentoo" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" @@ -76,6 +76,10 @@ PDEPEND=" pkg_pretend() { local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS" + if use native-extensions && tc-is-cross-compiler; then + einfo "Disabling USE=native-extensions for cross-compilation (bug #612158)" + fi + check_extra_config } @@ -93,7 +97,7 @@ python_prepare_all() { >> cnf/make.globals || die fi - if use native-extensions; then + if use native-extensions && ! tc-is-cross-compiler; then printf "[build_ext]\nportage_ext_modules=true\n" >> \ setup.cfg || die fi |