| 1 |
commit: 0f03dcb7313744b9a7e7173c3bb19edba320459c |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 15 01:50:49 2023 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 15 01:51:05 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f03dcb7 |
| 7 |
|
| 8 |
sys-apps/coreutils: sync w/ live |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-apps/coreutils/coreutils-9.1_p20230313.ebuild | 2 +- |
| 13 |
sys-apps/coreutils/coreutils-9999.ebuild | 22 +++++++++++++--------- |
| 14 |
2 files changed, 14 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-apps/coreutils/coreutils-9.1_p20230313.ebuild b/sys-apps/coreutils/coreutils-9.1_p20230313.ebuild |
| 17 |
index 2c0011780d87..1acd3418a030 100644 |
| 18 |
--- a/sys-apps/coreutils/coreutils-9.1_p20230313.ebuild |
| 19 |
+++ b/sys-apps/coreutils/coreutils-9.1_p20230313.ebuild |
| 20 |
@@ -66,7 +66,7 @@ BDEPEND=" |
| 21 |
dev-util/strace |
| 22 |
${PYTHON_DEPS} |
| 23 |
) |
| 24 |
- verify-sig? ( >=sec-keys/openpgp-keys-coreutils-20230313 ) |
| 25 |
+ verify-sig? ( sec-keys/openpgp-keys-coreutils ) |
| 26 |
" |
| 27 |
RDEPEND+=" |
| 28 |
hostname? ( !sys-apps/net-tools[hostname] ) |
| 29 |
|
| 30 |
diff --git a/sys-apps/coreutils/coreutils-9999.ebuild b/sys-apps/coreutils/coreutils-9999.ebuild |
| 31 |
index 02afc582c965..1acd3418a030 100644 |
| 32 |
--- a/sys-apps/coreutils/coreutils-9999.ebuild |
| 33 |
+++ b/sys-apps/coreutils/coreutils-9999.ebuild |
| 34 |
@@ -21,7 +21,7 @@ if [[ ${PV} == 9999 ]] ; then |
| 35 |
elif [[ ${PV} == *_p* ]] ; then |
| 36 |
# Note: could put this in devspace, but if it's gone, we don't want |
| 37 |
# it in tree anyway. It's just for testing. |
| 38 |
- MY_SNAPSHOT="$(ver_cut 1-2).193-54bec" |
| 39 |
+ MY_SNAPSHOT="$(ver_cut 1-2).198-e68b1" |
| 40 |
SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz" |
| 41 |
SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )" |
| 42 |
S="${WORKDIR}"/${PN}-${MY_SNAPSHOT} |
| 43 |
@@ -41,14 +41,18 @@ SLOT="0" |
| 44 |
IUSE="acl caps gmp hostname kill multicall nls +openssl selinux +split-usr static test vanilla xattr" |
| 45 |
RESTRICT="!test? ( test )" |
| 46 |
|
| 47 |
-LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) |
| 48 |
+LIB_DEPEND=" |
| 49 |
+ acl? ( sys-apps/acl[static-libs] ) |
| 50 |
caps? ( sys-libs/libcap ) |
| 51 |
gmp? ( dev-libs/gmp:=[static-libs] ) |
| 52 |
openssl? ( dev-libs/openssl:=[static-libs] ) |
| 53 |
- xattr? ( sys-apps/attr[static-libs] )" |
| 54 |
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) |
| 55 |
+ xattr? ( sys-apps/attr[static-libs] ) |
| 56 |
+" |
| 57 |
+RDEPEND=" |
| 58 |
+ !static? ( ${LIB_DEPEND//\[static-libs]} ) |
| 59 |
selinux? ( sys-libs/libselinux ) |
| 60 |
- nls? ( virtual/libintl )" |
| 61 |
+ nls? ( virtual/libintl ) |
| 62 |
+" |
| 63 |
DEPEND=" |
| 64 |
${RDEPEND} |
| 65 |
static? ( ${LIB_DEPEND} ) |
| 66 |
@@ -96,8 +100,9 @@ src_unpack() { |
| 67 |
elif use verify-sig ; then |
| 68 |
# Needed for downloaded patch (which is unsigned, which is fine) |
| 69 |
verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} |
| 70 |
- default |
| 71 |
fi |
| 72 |
+ |
| 73 |
+ default |
| 74 |
} |
| 75 |
|
| 76 |
src_prepare() { |
| 77 |
@@ -211,9 +216,8 @@ src_test() { |
| 78 |
addwrite /dev/full |
| 79 |
#export RUN_EXPENSIVE_TESTS="yes" |
| 80 |
#export FETISH_GROUPS="portage wheel" |
| 81 |
- env PATH="${T}/mount-wrappers:${PATH}" emake -k check \ |
| 82 |
- gl_public_submodule_commit= \ |
| 83 |
- VERBOSE=yes |
| 84 |
+ env PATH="${T}/mount-wrappers:${PATH}" gl_public_submodule_commit= \ |
| 85 |
+ emake -k check VERBOSE=yes |
| 86 |
} |
| 87 |
|
| 88 |
src_install() { |
Archives