diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/coreutils/Manifest | 1 | ||||
| -rw-r--r-- | sys-apps/coreutils/coreutils-9.0_p20220409-r1.ebuild (renamed from sys-apps/coreutils/coreutils-9.0_p20220409.ebuild) | 15 |
2 files changed, 6 insertions, 10 deletions
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest index fd48060a5f87..90c9d7047758 100644 --- a/sys-apps/coreutils/Manifest +++ b/sys-apps/coreutils/Manifest @@ -2,5 +2,6 @@ DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125e DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145 DIST coreutils-9.0.tar.xz 5612752 BLAKE2B 59617cd25fd4c70f51bfbef851bd83e73f9c9ba5c11eb539f7f75c0184d55832e004b28e9268fb8064db145cb071ead2b9c0c3346bc35a11934ffe1b15bf17ac SHA512 9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03 DIST coreutils-9.0.tar.xz.sig 833 BLAKE2B 1393f60361524e0a6eab5631aada50ee4124bd0e9ff3020b7593914a888f0edaec78339caee28847e85e1a1af6ea519ab9fad208db605f0c6b8a4e7ab19853a8 SHA512 1a368c92ddb57f386c188ef72f1edad7e217c983c296f9be0d27ffbaa673bf2f004c321fbaff8ae6cdebf6ffef402e3e8c69e6c8e30aca988e0ea38f2296cf30 +DIST coreutils-9.0_p20220409-patches-01.tar.xz 6244 BLAKE2B 8ca9855680719660782931467ec70095c826e66b9850890b8cf456963f8114f63940707386b97c766172d01e55e17b7db2aa1c329208a873a76e2293b29f565f SHA512 4b43c25832122d241f33e6b4eff24bc1fa045b9ca5af45a49d22ecb1fa282986c4e4a045ef24c34b3d94fd9a2247247c42c344261e3f464d881969e6f3351d3f DIST coreutils-9.0_p20220409.tar.xz 5689096 BLAKE2B d9b037947362f6823339fc234051886370eb9d2cbb19b15006e6a5e44db80d259159ffe6255c42565f02a2dcb79499af9f57c3ed5c21fd1ece1589da8109cd74 SHA512 7f8fda5d3e65768f9b0aa5da7bbc84ac1e24a8e87a840bb9a013dd8875346b5e9ccc3613de95478c87b859dd2a454651768852cbd67e1466ec3f6d7fef4fe938 DIST coreutils-9.0_p20220409.tar.xz.sig 833 BLAKE2B 8de0a283394dfc80b5cde5a051190af3c9fe5344881db3d2eacb2b3ae7a0cd037513a610dc564d37a055af8a2d823cdc7d6a0999bcc3a0c688d53570d792fe46 SHA512 72c491ec43d3deed3d291bdae13fb54a6b1ec2d37233f4a115075a60a19ec5b522a414b2e1768e3f21e66152a031777c8bd435624fd0171eb9257de20b3d11dc diff --git a/sys-apps/coreutils/coreutils-9.0_p20220409.ebuild b/sys-apps/coreutils/coreutils-9.0_p20220409-r1.ebuild index 8460bd016468..776a67104587 100644 --- a/sys-apps/coreutils/coreutils-9.0_p20220409.ebuild +++ b/sys-apps/coreutils/coreutils-9.0_p20220409-r1.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} ) VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/coreutils.asc inherit flag-o-matic python-any-r1 toolchain-funcs verify-sig -PATCH="${PN}-8.30-patches-01" +MY_PATCH="${PN}-9.0_p20220409-patches-01" DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)" HOMEPAGE="https://www.gnu.org/software/coreutils/" @@ -20,15 +20,13 @@ if [[ ${PV} == *_p* ]] ; then S="${WORKDIR}"/${PN}-${MY_SNAPSHOT} else SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - !vanilla? ( - mirror://gentoo/${PATCH}.tar.xz - https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz - ) verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux" fi +SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH}.tar.xz )" + LICENSE="GPL-3" SLOT="0" IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr" @@ -91,10 +89,8 @@ src_prepare() { # Upstream patches ) - if [[ ${PV} != *_p* ]] && ! use vanilla ; then + if ! use vanilla ; then PATCHES+=( "${WORKDIR}"/patch ) - PATCHES+=( "${FILESDIR}"/${PN}-8.32-sandbox-env-test.patch ) - PATCHES+=( "${FILESDIR}"/${PN}-9.0-r1-0001-dircolors-consider-COLORTERM-sufficient-for-color.patch ) fi default @@ -198,8 +194,7 @@ src_test() { addwrite /dev/full #export RUN_EXPENSIVE_TESTS="yes" #export FETISH_GROUPS="portage wheel" - env PATH="${T}/mount-wrappers:${PATH}" \ - emake -j1 -k check + env PATH="${T}/mount-wrappers:${PATH}" emake -k check VERBOSE=yes } src_install() { |