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 E3F8B15800A for ; Wed, 16 Aug 2023 14:37:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 264832BC017; Wed, 16 Aug 2023 14:37:40 +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 0691E2BC017 for ; Wed, 16 Aug 2023 14:37:40 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 00ED1340DBF for ; Wed, 16 Aug 2023 14:37:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ED53DBE6 for ; Wed, 16 Aug 2023 14:37:36 +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: <1692196522.44152e2ec8c240c3c2e6c1c7c3846225b8cce851.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.ebuild X-VCS-Directories: sys-process/systemd-cron/ X-VCS-Committer: rich0 X-VCS-Committer-Name: Richard Freeman X-VCS-Revision: 44152e2ec8c240c3c2e6c1c7c3846225b8cce851 X-VCS-Branch: master Date: Wed, 16 Aug 2023 14:37:36 +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: 3699cc01-15a1-4c70-9ab6-761418854f2d X-Archives-Hash: dbcc2bbc07841bab72cc0187159dc8d1 commit: 44152e2ec8c240c3c2e6c1c7c3846225b8cce851 Author: Richard Freeman gentoo org> AuthorDate: Wed Aug 16 14:34:18 2023 +0000 Commit: Richard Freeman gentoo org> CommitDate: Wed Aug 16 14:35:22 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44152e2e sys-process/systemd-cron: Fix configure due to upstream refactor. Bug: https://bugs.gentoo.org/912334 Signed-off-by: Richard Freeman gentoo.org> sys-process/systemd-cron/systemd-cron-1.16.7.ebuild | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/sys-process/systemd-cron/systemd-cron-1.16.7.ebuild b/sys-process/systemd-cron/systemd-cron-1.16.7.ebuild index 2498aab65d88..e44362e5d6bf 100644 --- a/sys-process/systemd-cron/systemd-cron-1.16.7.ebuild +++ b/sys-process/systemd-cron/systemd-cron-1.16.7.ebuild @@ -30,6 +30,8 @@ DEPEND="sys-process/cronbase REQUIRED_USE="${PYTHON_REQUIRED_USE}" src_prepare() { + [[ -L /bin ]] || die "systemd-cron requires a merged /usr" + python_fix_shebang --force "${S}/src/bin" sed -i \ @@ -37,12 +39,6 @@ src_prepare() { -e 's/^CRONTAB/CRONTAB-SYSTEMD/' \ -- "${S}/src/man/crontab."{1,5}".in" || die - sed -i \ - -e 's!/crontab$!/crontab-systemd!' \ - -e 's!/crontab\(\.[15]\)$!/crontab-systemd\1!' \ - -e 's/pyflakes3/pyflakes/' \ - -- "${S}/Makefile.in" || die - if use etc-crontab-systemd then sed -i \ -e "s!/etc/crontab!/etc/crontab-systemd!" \ @@ -65,7 +61,6 @@ src_configure() { ./configure \ --prefix="${EPREFIX}/usr" \ --confdir="${EPREFIX}/etc" \ - --runparts="${EPREFIX}/bin/run-parts" \ --mandir="${EPREFIX}/usr/share/man" \ --unitdir="$(systemd_get_systemunitdir)" \ --generatordir="$(systemd_get_systemgeneratordir)" \ @@ -75,8 +70,9 @@ src_configure() { $(my_use_enable yearly) \ $(my_use_enable yearly quarterly) \ $(my_use_enable yearly semi_annually) \ - $(my_use_enable setgid) \ - --enable-persistent=yes + $(my_use_enable setgid) + + export CRONTAB=crontab-systemd } src_install() {