[gentoo-commits] repo/gentoo:master commit in: sys-process/systemd-cron/

["Richard Freeman" <rich0@gentoo.org>]

commit:     44152e2ec8c240c3c2e6c1c7c3846225b8cce851
Author:     Richard Freeman <rich0 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 16 14:34:18 2023 +0000
Commit:     Richard Freeman <rich0 <AT> gentoo <DOT> 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 <rich0 <AT> 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() {