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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8C64C158018 for ; Sat, 2 Oct 2021 04:27:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 523B2E08C3; Sat, 2 Oct 2021 04:27:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3D82BE08C3 for ; Sat, 2 Oct 2021 04:27:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0ABF3342DC4 for ; Sat, 2 Oct 2021 04:27:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 63F11106 for ; Sat, 2 Oct 2021 04:27:13 +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: <1633148804.bea8f9b0a3f1045bbb88b96ecd843bb7807e4f86.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/busybox/busybox-9999.ebuild X-VCS-Directories: sys-apps/busybox/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bea8f9b0a3f1045bbb88b96ecd843bb7807e4f86 X-VCS-Branch: master Date: Sat, 2 Oct 2021 04:27:13 +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: 99a1b393-66df-4c64-a26f-1d6bff2d06f6 X-Archives-Hash: 4288a1e4f0c47fda7366af45a2aff80b commit: bea8f9b0a3f1045bbb88b96ecd843bb7807e4f86 Author: Jakov Smolić gentoo org> AuthorDate: Fri Oct 1 18:16:51 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Oct 2 04:26:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bea8f9b0 sys-apps/busybox: Sync live ebuild Signed-off-by: Jakov Smolić gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/22462 Signed-off-by: Sam James gentoo.org> sys-apps/busybox/busybox-9999.ebuild | 38 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index 46cfa671124..987a0f8cbf2 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -10,11 +10,11 @@ inherit flag-o-matic savedconfig toolchain-funcs DESCRIPTION="Utilities for rescue and embedded systems" HOMEPAGE="https://www.busybox.net/" if [[ ${PV} == "9999" ]] ; then - MY_P=${P} + MY_P="${P}" EGIT_REPO_URI="https://git.busybox.net/busybox" inherit git-r3 else - MY_P=${PN}-${PV/_/-} + MY_P="${PN}-${PV/_/-}" SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" fi @@ -26,18 +26,18 @@ REQUIRED_USE="pam? ( !static )" RESTRICT="test" # TODO: Could make pkgconfig conditional on selinux? bug #782829 -COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) ) +RDEPEND=" + virtual/libcrypt:= + !static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) - virtual/libcrypt:=" -DEPEND="${COMMON_DEPEND} +" +DEPEND="${RDEPEND} static? ( virtual/libcrypt[static-libs] selinux? ( sys-libs/libselinux[static-libs(+)] ) ) - >=sys-kernel/linux-headers-2.6.39" + sys-kernel/linux-headers" BDEPEND="virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - mdev? ( !