commit: 46d48ef3f778d1ec33a8115b17f8cd0a53b60b51 Author: Richard Freeman <rich0 <AT> gentoo <DOT> org> AuthorDate: Tue Apr 16 15:08:08 2024 +0000 Commit: Richard Freeman <rich0 <AT> gentoo <DOT> org> CommitDate: Tue Apr 16 15:16:01 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46d48ef3
sys-process/systemd-cron: drop 1.16.7-r1, 2.3.0-r1, 2.3.0-r2 Signed-off-by: Richard Freeman <rich0 <AT> gentoo.org> sys-process/systemd-cron/Manifest | 2 - .../files/systemd-cron-2.3.0-pch.patch | 46 --------- .../systemd-cron/systemd-cron-1.16.7-r1.ebuild | 95 ------------------ .../systemd-cron/systemd-cron-2.3.0-r1.ebuild | 92 ------------------ .../systemd-cron/systemd-cron-2.3.0-r2.ebuild | 106 --------------------- 5 files changed, 341 deletions(-) diff --git a/sys-process/systemd-cron/Manifest b/sys-process/systemd-cron/Manifest index 06aa4d41d515..06b7f8013a30 100644 --- a/sys-process/systemd-cron/Manifest +++ b/sys-process/systemd-cron/Manifest @@ -1,4 +1,2 @@ -DIST systemd-cron-1.16.7.tar.gz 37887 BLAKE2B a900058cef1cd02ac464d3ecdd43ce2f264bdba386f349ef82f0a915104302b1e88d94331d5fbaabe2c54f526900f3e1ac65ea6bdc2f27a6464e6d7514561a19 SHA512 d65d641fd449cdc0e91db3ae6ebe464bc4e24027c501b30a8ab17e7cc40de290cc6141bfb7880a724d97248861587e6f5fea113a6aa6e468d971aff3a13b056f DIST systemd-cron-2.2.0.tar.gz 55825 BLAKE2B ca4b02fdea5084439aa56b3f04603000d811f21922c11cd26a22ea6387e4b54575587ff4e1eb7fc7a3260d2f656ea0eb91365942c135982f4bd26aead1a080f1 SHA512 f26c7d7e2da7eb5cd5558f352aff852585bfefd961de6ecc2409a4a53b63f82662a89bdbf71f739ea8e44ef9e3e1fdec15cdc63ce1e90c289fb0e636ff679ca0 -DIST systemd-cron-2.3.0.tar.gz 56873 BLAKE2B 3efe8adc1b735ed5eb91c64d0936edceec50ff476d42ba5c1e9941c196a7bc8c777b0c293c8ed71894dae31c5b721a45a2876cab0143298e1b1ab3e82fcb7ceb SHA512 abb7c34d6901160395d64cfc4e5124887909b963bcfee027f64642b25bb138b3f085eb45595197a380faf39b7f5980e32c50d083be6307d7c985a55057962565 DIST systemd-cron-2.3.4.tar.gz 58458 BLAKE2B 594fff8f7cc126aa33b1dcbf74293a39b5939576203c11f8f0fc300285462f266c35503a6cfe46ee797e5e617e54e09b92dd6ba8a4044f962d1efd2822f0a87c SHA512 2a9743df6d0e1a83b65d15609e47b901fde1d77d1207c4cc0617395be8d9e94daece91aec9a3398c3d09f86383e01cfff301614df727ca598efe873453f5a3c9 diff --git a/sys-process/systemd-cron/files/systemd-cron-2.3.0-pch.patch b/sys-process/systemd-cron/files/systemd-cron-2.3.0-pch.patch deleted file mode 100644 index e27f253a62ca..000000000000 --- a/sys-process/systemd-cron/files/systemd-cron-2.3.0-pch.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://bugs.gentoo.org/917646 -https://github.com/systemd-cron/systemd-cron/issues/141 -https://github.com/systemd-cron/systemd-cron/commit/1662b899b206f00face30b9d4671551427262b07 - -From 1662b899b206f00face30b9d4671551427262b07 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczlew...@nabijaczleweli.xyz> -Date: Tue, 21 Nov 2023 19:40:05 +0100 -Subject: [PATCH] Add PCH= for broken compilers like #141 - ---- a/Makefile.in -+++ b/Makefile.in -@@ -1,6 +1,7 @@ - CFLAGS ?= -O2 - SHELLCHECK ?= shellcheck - CRONTAB ?= crontab -+PCH ?= y - - version := @version@ - schedules := @schedules@ -@@ -208,12 +209,12 @@ $(builddir)/include/%.hpp: $(srcdir)/include/%.hpp - CXXVER := $(shell $(CXX) --version | { read -r l; echo "$$l"; }) - ifneq "$(findstring clang,$(CXXVER))" "" - # clang doesn't use PCHs automatically -- PCH_ARG := -include-pch $(builddir)/include/libvoreutils.hpp.gch -Wno-gcc-compat -+ PCH_ARG := $(if $(PCH),-include-pch $(builddir)/include/libvoreutils.hpp.gch) -Wno-gcc-compat - else - PCH_ARG := - endif - --common_headers := $(builddir)/include/configuration.hpp $(builddir)/include/libvoreutils.hpp.gch $(builddir)/include/util.hpp -+common_headers := $(builddir)/include/configuration.hpp $(builddir)/include/libvoreutils.hpp$(if $(PCH),.gch) $(builddir)/include/util.hpp - CFLAGS += -Wall -Wextra -fno-exceptions -Wno-psabi - $(builddir)/include/libvoreutils.hpp.gch : $(builddir)/include/libvoreutils.hpp - $(CXX) $(CFLAGS) $(CPPFLAGS) -std=c++20 -I $(builddir)/include $< -o $@ ---- a/README.md -+++ b/README.md -@@ -146,6 +146,8 @@ without the override, the jobs would run twice since native-timer detection woul - If there is already a perfect 1:1 mapping between `/etc/cron.<freq>/<job>` and `/usr/lib/systemd/system/<job>.timer`, - then it is not needed to add an entry to these tables. - -+If your compiler's [PCH compilation is broken](https://github.com/systemd-cron/systemd-cron/issues/141), build with `make PCH=`. -+ - ### Caveat - - Your package should also run these extra commands before starting cron.target - 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 deleted file mode 100644 index b779832b971b..000000000000 --- a/sys-process/systemd-cron/systemd-cron-1.16.7-r1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( pypy3 python3_{9..11} ) -inherit python-single-r1 systemd - -DESCRIPTION="systemd units to create timers for cron directories and crontab" -HOMEPAGE="https://github.com/systemd-cron/systemd-cron/"; -SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd-cron-${PV}.tar.gz" - -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" -RESTRICT="!test? ( test )" - -RDEPEND=">=sys-apps/systemd-217 - sys-apps/debianutils - !sys-process/cronie[anacron] - !etc-crontab-systemd? ( !sys-process/dcron ) - ${PYTHON_DEPS} - sys-process/cronbase - acct-user/_cron-failure - acct-group/_cron-failure" - -DEPEND="sys-process/cronbase - test? ( sys-apps/man-db dev-python/pyflakes )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -pkg_pretend() { - if use runparts && ! [ -x /usr/bin/run-parts ] ; then - eerror "Please complete the migration to merged-usr." - eerror "https://wiki.gentoo.org/wiki/Merge-usr"; - die "systemd-cron no longer supports split-usr" - fi -} - -src_prepare() { - python_fix_shebang --force "${S}/src/bin" - - sed -i \ - -e 's/^crontab/crontab-systemd/' \ - -e 's/^CRONTAB/CRONTAB-SYSTEMD/' \ - -- "${S}/src/man/crontab."{1,5}".in" || die - - if use etc-crontab-systemd - then sed -i \ - -e "s!/etc/crontab!/etc/crontab-systemd!" \ - -- "${S}/src/man/crontab."{1,5}".in" \ - "${S}/src/bin/systemd-crontab-generator.py" || die - fi - - eapply_user -} - -my_use_enable() { - if use ${1}; then - echo --enable-${2:-${1}}=yes - else - echo --enable-${2:-${1}}=no - fi -} - -src_configure() { - ./configure \ - --prefix="${EPREFIX}/usr" \ - --confdir="${EPREFIX}/etc" \ - --mandir="${EPREFIX}/usr/share/man" \ - --unitdir="$(systemd_get_systemunitdir)" \ - --generatordir="$(systemd_get_systemgeneratordir)" \ - $(my_use_enable cron-boot boot) \ - $(my_use_enable minutely) \ - $(my_use_enable runparts) \ - $(my_use_enable yearly) \ - $(my_use_enable yearly quarterly) \ - $(my_use_enable yearly semi_annually) \ - $(my_use_enable setgid) || die - - export CRONTAB=crontab-systemd -} - -src_install() { - default - rm -f "${ED}"/usr/lib/sysusers.d/systemd-cron.conf -} - -pkg_postinst() { - elog "This package now supports USE=runparts which is enabled by default." - elog "This enables the traditional run-parts behavior." - elog "If you disable this flag you will get the new behavior of having" - elog "multiple jobs for each cron.* entry run in parallel with" - elog "separate services/logs/etc." -} diff --git a/sys-process/systemd-cron/systemd-cron-2.3.0-r1.ebuild b/sys-process/systemd-cron/systemd-cron-2.3.0-r1.ebuild deleted file mode 100644 index cfc4ae02d6f4..000000000000 --- a/sys-process/systemd-cron/systemd-cron-2.3.0-r1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit systemd toolchain-funcs - -DESCRIPTION="systemd units to create timers for cron directories and crontab" -HOMEPAGE="https://github.com/systemd-cron/systemd-cron/"; -SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd-cron-${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="cron-boot etc-crontab-systemd minutely +runparts setgid yearly" -RESTRICT="test" - -BDEPEND="virtual/pkgconfig" - -RDEPEND=">=sys-apps/systemd-253 - dev-libs/openssl - runparts? ( sys-apps/debianutils ) - !sys-process/cronie[anacron] - !etc-crontab-systemd? ( !sys-process/dcron ) - sys-process/cronbase - acct-user/_cron-failure - acct-group/_cron-failure" - -DEPEND="sys-process/cronbase" - -pkg_pretend() { - if use runparts && ! [ -x /usr/bin/run-parts ] ; then - eerror "Please complete the migration to merged-usr." - eerror "https://wiki.gentoo.org/wiki/Merge-usr"; - die "systemd-cron no longer supports split-usr" - fi -} - -src_prepare() { - sed -i \ - -e 's/^crontab/crontab-systemd/' \ - -e 's/^CRONTAB/CRONTAB-SYSTEMD/' \ - -- "${S}/src/man/crontab."{1,5}".in" || die - - if use etc-crontab-systemd - then sed -i \ - -e "s!/etc/crontab!/etc/crontab-systemd!" \ - -- "${S}/src/man/crontab."{1,5}".in" \ - "${S}/src/bin/systemd-crontab-generator.cpp" \ - "${S}/test/test-generator" || die - fi - - eapply_user -} - -my_use_enable() { - if use ${1}; then - echo --enable-${2:-${1}}=yes - else - echo --enable-${2:-${1}}=no - fi -} - -src_configure() { - tc-export PKG_CONFIG CXX CC - - ./configure \ - --prefix="${EPREFIX}/usr" \ - --mandir="${EPREFIX}/usr/share/man" \ - --unitdir="$(systemd_get_systemunitdir)" \ - --generatordir="$(systemd_get_systemgeneratordir)" \ - $(my_use_enable cron-boot boot) \ - $(my_use_enable minutely) \ - $(my_use_enable runparts) \ - $(my_use_enable yearly) \ - $(my_use_enable yearly quarterly) \ - $(my_use_enable yearly semi_annually) || die - - export CRONTAB=crontab-systemd -} - -src_install() { - default - rm -f "${ED}"/usr/lib/sysusers.d/systemd-cron.conf -} - -pkg_postinst() { - elog "This package now supports USE=runparts which is enabled by default." - elog "This enables the traditional run-parts behavior." - elog "If you disable this flag you will get the new behavior of having" - elog "multiple jobs for each cron.* entry run in parallel with" - elog "separate services/logs/etc." -} diff --git a/sys-process/systemd-cron/systemd-cron-2.3.0-r2.ebuild b/sys-process/systemd-cron/systemd-cron-2.3.0-r2.ebuild deleted file mode 100644 index d72fd39dce0c..000000000000 --- a/sys-process/systemd-cron/systemd-cron-2.3.0-r2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -inherit systemd toolchain-funcs - -DESCRIPTION="systemd units to create timers for cron directories and crontab" -HOMEPAGE="https://github.com/systemd-cron/systemd-cron/"; -SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd-cron-${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="cron-boot etc-crontab-systemd minutely +runparts setgid yearly" -# We can't run the unshare tests within sandbox/with low privs, and the -# 'test-nounshare' target just does static analysis (shellcheck etc). -RESTRICT="test" - -BDEPEND="virtual/pkgconfig" -# Next release will switch openssl->libmd (https://github.com/systemd-cron/systemd-cron/commit/fe0b10b1ed55122a3cd07a382a951aeb87a3fee2) -RDEPEND=" - !sys-process/cronie[anacron] - acct-user/_cron-failure - acct-group/_cron-failure - dev-libs/openssl:= - sys-process/cronbase - >=sys-apps/systemd-253 - !etc-crontab-systemd? ( !sys-process/dcron ) - runparts? ( sys-apps/debianutils ) -" -DEPEND=" - dev-libs/openssl:= - sys-process/cronbase -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.3.0-pch.patch -) - -pkg_pretend() { - if use runparts && ! [ -x /usr/bin/run-parts ] ; then - eerror "Please complete the migration to merged-usr." - eerror "https://wiki.gentoo.org/wiki/Merge-usr"; - die "systemd-cron no longer supports split-usr" - fi -} - -src_prepare() { - sed -i \ - -e 's/^crontab/crontab-systemd/' \ - -e 's/^CRONTAB/CRONTAB-SYSTEMD/' \ - -- "${S}/src/man/crontab."{1,5}".in" || die - - if use etc-crontab-systemd - then sed -i \ - -e "s!/etc/crontab!/etc/crontab-systemd!" \ - -- "${S}/src/man/crontab."{1,5}".in" \ - "${S}/src/bin/systemd-crontab-generator.cpp" \ - "${S}/test/test-generator" || die - fi - - default -} - -my_use_enable() { - if use ${1}; then - echo --enable-${2:-${1}}=yes - else - echo --enable-${2:-${1}}=no - fi -} - -src_configure() { - tc-export PKG_CONFIG CXX CC - - ./configure \ - --prefix="${EPREFIX}/usr" \ - --mandir="${EPREFIX}/usr/share/man" \ - --unitdir="$(systemd_get_systemunitdir)" \ - --generatordir="$(systemd_get_systemgeneratordir)" \ - $(my_use_enable cron-boot boot) \ - $(my_use_enable minutely) \ - $(my_use_enable runparts) \ - $(my_use_enable yearly) \ - $(my_use_enable yearly quarterly) \ - $(my_use_enable yearly semi_annually) || die - - export CRONTAB=crontab-systemd -} - -src_compile() { - emake PCH= -} - -src_install() { - emake DESTDIR="${D}" PCH= install - rm -f "${ED}"/usr/lib/sysusers.d/systemd-cron.conf -} - -pkg_postinst() { - elog "This package now supports USE=runparts which is enabled by default." - elog "This enables the traditional run-parts behavior." - elog "If you disable this flag you will get the new behavior of having" - elog "multiple jobs for each cron.* entry run in parallel with" - elog "separate services/logs/etc." -}
