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 6C53A15800A for ; Wed, 16 Aug 2023 14:46:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 878E02BC017; Wed, 16 Aug 2023 14:46:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 66B1D2BC017 for ; Wed, 16 Aug 2023 14:46:42 +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 7955F335C34 for ; Wed, 16 Aug 2023 14:46:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 18124BE6 for ; Wed, 16 Aug 2023 14:46:40 +0000 (UTC) From: "Richard Freeman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Freeman" Message-ID: <1692197115.e35d715ebd098067176566bd065ee65340b5ed6a.rich0@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/systemd-cron/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/systemd-cron/systemd-cron-1.16.7-r1.ebuild X-VCS-Directories: sys-process/systemd-cron/ X-VCS-Committer: rich0 X-VCS-Committer-Name: Richard Freeman X-VCS-Revision: e35d715ebd098067176566bd065ee65340b5ed6a X-VCS-Branch: master Date: Wed, 16 Aug 2023 14:46:40 +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: 5b24a7d2-178b-4a30-bd11-1653075444e2 X-Archives-Hash: 498f8d4a7027c5142767614e854e407a commit: e35d715ebd098067176566bd065ee65340b5ed6a Author: Richard Freeman gentoo org> AuthorDate: Wed Aug 16 14:45:15 2023 +0000 Commit: Richard Freeman gentoo org> CommitDate: Wed Aug 16 14:45:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e35d715e sys-process/systemd-cron: use split-usr USE flag to detect split usr This approach is the same as used by sys-apps/systemd-9999. Signed-off-by: Richard Freeman gentoo.org> sys-process/systemd-cron/systemd-cron-1.16.7-r1.ebuild | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys-process/systemd-cron/systemd-cron-1.16.7-r1.ebuild b/sys-process/systemd-cron/systemd-cron-1.16.7-r1.ebuild index e44362e5d6bf..c94d705a9f69 100644 --- a/sys-process/systemd-cron/systemd-cron-1.16.7-r1.ebuild +++ b/sys-process/systemd-cron/systemd-cron-1.16.7-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd- LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="cron-boot etc-crontab-systemd minutely +runparts setgid test yearly" +IUSE="cron-boot etc-crontab-systemd minutely +runparts setgid split-usr test yearly" RESTRICT="!test? ( test )" RDEPEND=">=sys-apps/systemd-217 @@ -29,9 +29,15 @@ DEPEND="sys-process/cronbase REQUIRED_USE="${PYTHON_REQUIRED_USE}" -src_prepare() { - [[ -L /bin ]] || die "systemd-cron requires a merged /usr" +pkg_pretend() { + if use split-usr; then + eerror "Please complete the migration to merged-usr." + eerror "https://wiki.gentoo.org/wiki/Merge-usr" + die "systemd no longer supports split-usr" + fi +} +src_prepare() { python_fix_shebang --force "${S}/src/bin" sed -i \