From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C71AA15A7D9 for ; Wed, 15 Mar 2023 01:51:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03F1CE086A; Wed, 15 Mar 2023 01:51:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E03F4E086A for ; Wed, 15 Mar 2023 01:51:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3070340D50 for ; Wed, 15 Mar 2023 01:51:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D2D268D4 for ; Wed, 15 Mar 2023 01:51:14 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1678845065.0f03dcb7313744b9a7e7173c3bb19edba320459c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/coreutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/coreutils/coreutils-9.1_p20230313.ebuild sys-apps/coreutils/coreutils-9999.ebuild X-VCS-Directories: sys-apps/coreutils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0f03dcb7313744b9a7e7173c3bb19edba320459c X-VCS-Branch: master Date: Wed, 15 Mar 2023 01:51:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 448ede24-7926-4afc-90ca-1563fa1f66c8 X-Archives-Hash: 8796bab3049ef26c8a0876b38ca65893 commit: 0f03dcb7313744b9a7e7173c3bb19edba320459c Author: Sam James gentoo org> AuthorDate: Wed Mar 15 01:50:49 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Mar 15 01:51:05 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f03dcb7 sys-apps/coreutils: sync w/ live Signed-off-by: Sam James gentoo.org> sys-apps/coreutils/coreutils-9.1_p20230313.ebuild | 2 +- sys-apps/coreutils/coreutils-9999.ebuild | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/sys-apps/coreutils/coreutils-9.1_p20230313.ebuild b/sys-apps/coreutils/coreutils-9.1_p20230313.ebuild index 2c0011780d87..1acd3418a030 100644 --- a/sys-apps/coreutils/coreutils-9.1_p20230313.ebuild +++ b/sys-apps/coreutils/coreutils-9.1_p20230313.ebuild @@ -66,7 +66,7 @@ BDEPEND=" dev-util/strace ${PYTHON_DEPS} ) - verify-sig? ( >=sec-keys/openpgp-keys-coreutils-20230313 ) + verify-sig? ( sec-keys/openpgp-keys-coreutils ) " RDEPEND+=" hostname? ( !sys-apps/net-tools[hostname] ) diff --git a/sys-apps/coreutils/coreutils-9999.ebuild b/sys-apps/coreutils/coreutils-9999.ebuild index 02afc582c965..1acd3418a030 100644 --- a/sys-apps/coreutils/coreutils-9999.ebuild +++ b/sys-apps/coreutils/coreutils-9999.ebuild @@ -21,7 +21,7 @@ if [[ ${PV} == 9999 ]] ; then elif [[ ${PV} == *_p* ]] ; then # Note: could put this in devspace, but if it's gone, we don't want # it in tree anyway. It's just for testing. - MY_SNAPSHOT="$(ver_cut 1-2).193-54bec" + MY_SNAPSHOT="$(ver_cut 1-2).198-e68b1" SRC_URI="https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz -> ${P}.tar.xz" SRC_URI+=" verify-sig? ( https://www.pixelbeat.org/cu/coreutils-${MY_SNAPSHOT}.tar.xz.sig -> ${P}.tar.xz.sig )" S="${WORKDIR}"/${PN}-${MY_SNAPSHOT} @@ -41,14 +41,18 @@ SLOT="0" IUSE="acl caps gmp hostname kill multicall nls +openssl selinux +split-usr static test vanilla xattr" RESTRICT="!test? ( test )" -LIB_DEPEND="acl? ( sys-apps/acl[static-libs] ) +LIB_DEPEND=" + acl? ( sys-apps/acl[static-libs] ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:=[static-libs] ) openssl? ( dev-libs/openssl:=[static-libs] ) - xattr? ( sys-apps/attr[static-libs] )" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} ) + xattr? ( sys-apps/attr[static-libs] ) +" +RDEPEND=" + !static? ( ${LIB_DEPEND//\[static-libs]} ) selinux? ( sys-libs/libselinux ) - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) +" DEPEND=" ${RDEPEND} static? ( ${LIB_DEPEND} ) @@ -96,8 +100,9 @@ src_unpack() { elif use verify-sig ; then # Needed for downloaded patch (which is unsigned, which is fine) verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} - default fi + + default } src_prepare() { @@ -211,9 +216,8 @@ src_test() { addwrite /dev/full #export RUN_EXPENSIVE_TESTS="yes" #export FETISH_GROUPS="portage wheel" - env PATH="${T}/mount-wrappers:${PATH}" emake -k check \ - gl_public_submodule_commit= \ - VERBOSE=yes + env PATH="${T}/mount-wrappers:${PATH}" gl_public_submodule_commit= \ + emake -k check VERBOSE=yes } src_install() {