Bump systemd-cron

6 files changed, 21 insertions, 88 deletions

diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 7112bfa5..0b70908c 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -117,6 +117,7 @@ sys-fs/squashfs-tools:xz - Enable support for XZ ("LZMA2") compression using app
 sys-process/systemd-cron:cron-boot - Enable systemd boot cron target
 sys-process/systemd-cron:etc-crontab - Use /etc/crontab; disable this when you have the sys-process/dcron default file here
 sys-process/systemd-cron:minutely - Enable systemd minutely cron target
+sys-process/systemd-cron:setgid - Install a cron setgid helper to allow users editing crontabs
 sys-process/systemd-cron:yearly - Enable systemd yearly/semi-annually/quarterly cron target
 x11-drivers/nvidia-drivers:X - Install the X.org driver, OpenGL libraries, XvMC libraries, and VDPAU libraries
 x11-drivers/nvidia-drivers:kernel3-13 - Install unofficial patches for linux-3.13 and newer
diff --git a/sys-process/systemd-cron/ChangeLog b/sys-process/systemd-cron/ChangeLog
index 34abf892..4f075f04 100644
--- a/sys-process/systemd-cron/ChangeLog
+++ b/sys-process/systemd-cron/ChangeLog
@@ -2,10 +2,10 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-*systemd-cron-1.5.0 (12 Dec 2014)
+*systemd-cron-1.5.1 (14 Dec 2014)
 
   12 Dec 2014; Martin Väth <martin@mvath.de>:
-  Version bump. Mask since Makefile is too buggy to fix
+  Version bump, remove old ebuild. Support USE=setgid
 
 *systemd-cron-1.4.2 (29 Nov 2014)
 
diff --git a/sys-process/systemd-cron/Manifest b/sys-process/systemd-cron/Manifest
index 81302510..236a055a 100644
--- a/sys-process/systemd-cron/Manifest
+++ b/sys-process/systemd-cron/Manifest
@@ -1,2 +1 @@
-DIST systemd-cron-1.4.2.tar.gz 22962 SHA256 2d40655e090e0080a368a2c64f5084bee5f3ed7f1e99bb5fb87c0f3560798314 SHA512 64242f85571e4ca12c8056adf2f0543239a778302371fdc2730906b41fb8f95fb52abbade18fe2438fd08e22033ca0286ca0863bf2dcf6d6daaa3a4f59e04208 WHIRLPOOL 0244845c04f5907167ae43aa84e63a2f554c9a527fd83e76be5956a2a18fb1dfca1013d2049dd751a75a5cfd0da9a78e301ca0600480cf18ed6d974448132da4
-DIST systemd-cron-1.5.0.tar.gz 24169 SHA256 a459e399dcf551f2590d39c660987132b1a28fd4737aba844290161f0d8d9ed4 SHA512 bf28550301e879fd6eed54b23916cebd939c8473848cabc171be16d0f85b036c5ed7fc76f9f3021084eb98b8f36da1882b6d298de7c503d4d6d1042cc6aefb49 WHIRLPOOL 2b5f562abbd712dc47b376edc449632d9a59f97473be3260b30214f6f7040b6f3e4d3ee80427148daa49fc22c3425b0b6c9dca1c9d1a2a410d2811b5f51a3833
+DIST systemd-cron-1.5.1.tar.gz 25085 SHA256 f3280353df4cb550f9eef9518b60d2c3f7b18bef4c93a797fdf2047c8defafb7 SHA512 5bae12d0104ef577fe2010efb05ade3d752c1aaf3d40ec62862343f529970ef92fb5e7a1494b3a6e6748c1b276ab43d256f5ecde03a031c987fbe8579dc8f5d9 WHIRLPOOL 6f778e2fe1f971f8dacad27c09c07a7db8d12f12b5ab3f127d49545233cb7b2ebc20dcffe30710a82e3bd4dceb7bc49ba10ac2772c076d858fffc9075c8fb992
diff --git a/sys-process/systemd-cron/metadata.xml b/sys-process/systemd-cron/metadata.xml
index 1faab171..fcc68f9e 100644
--- a/sys-process/systemd-cron/metadata.xml
+++ b/sys-process/systemd-cron/metadata.xml
@@ -16,6 +16,7 @@
 	<use>
 		<flag name="cron-boot">Enable systemd boot cron target</flag>
 		<flag name="etc-crontab">Use /etc/crontab; disable this when you have the sys-process/dcron default file here</flag>
+		<flag name="setgid">Install a cron setgid helper to allow users editing crontabs</flag>
 		<flag name="minutely">Enable systemd minutely cron target</flag>
 		<flag name="yearly">Enable systemd yearly/semi-annually/quarterly cron target</flag>
 	</use>
diff --git a/sys-process/systemd-cron/systemd-cron-1.4.2.ebuild b/sys-process/systemd-cron/systemd-cron-1.4.2.ebuild
deleted file mode 100644
index b54f8641..00000000
--- a/sys-process/systemd-cron/systemd-cron-1.4.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-RESTRICT="mirror"
-PYTHON_COMPAT=( pypy3 python{3_3,3_4} )
-inherit eutils python-single-r1 systemd
-
-DESCRIPTION="systemd units to provide minimal cron daemon functionality by running scripts in cron directories"
-HOMEPAGE="https://github.com/systemd-cron/systemd-cron/"
-SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cron-boot +etc-crontab minutely yearly"
-
-RDEPEND=">=sys-apps/systemd-217
-	sys-apps/debianutils"
-DEPEND=""
-
-src_prepare() {
-	python_setup
-	python_fix_shebang --force "${S}/src/bin"
-	sed -i \
-		-e 's/^crontab/crontab-systemd/' \
-		"${S}/src/man/crontab.1.in" || die
-	use etc-crontab || sed -i \
-		-e "s!/etc/crontab!/dev/null!" \
-		"${S}/src/bin/systemd-crontab-generator" || die
-	epatch_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" \
-		--runparts="${EPREFIX}/bin/run-parts" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--unitdir="$(systemd_get_unitdir)" \
-		$(my_use_enable cron-boot boot) \
-		$(my_use_enable minutely) \
-		$(my_use_enable yearly) \
-		$(my_use_enable yearly quarterly) \
-		$(my_use_enable yearly semi_annually) \
-		--enable-persistent=yes
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	mv "${ED}"/usr/bin/crontab{,-systemd} || die
-	mv "${ED}"/usr/share/man/man1/crontab{,-systemd}.1 || die
-	mv "${ED}"/usr/share/man/man5/crontab{,-systemd}.5 || die
-}
-
-pkg_postinst() {
-	if use etc-crontab && {
-		has_version sys-process/dcron || ! has_version virtual/cron
-	}
-	then	ewarn "sys-process/systemd-cron[etc-crontab] does not work with the /etc/crontab"
-		ewarn "installed by sys-process/dcron"
-	fi
-}
diff --git a/sys-process/systemd-cron/systemd-cron-1.5.0.ebuild b/sys-process/systemd-cron/systemd-cron-1.5.1.ebuild
index 8c62f308..4122cc65 100644
--- a/sys-process/systemd-cron/systemd-cron-1.5.0.ebuild
+++ b/sys-process/systemd-cron/systemd-cron-1.5.1.ebuild
@@ -13,25 +13,29 @@ SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
-IUSE="cron-boot +etc-crontab minutely yearly"
+KEYWORDS="~amd64 ~x86"
+IUSE="cron-boot +etc-crontab minutely setgid yearly"
 
+COMMON_DEPEND="sys-process/cronbase"
 RDEPEND=">=sys-apps/systemd-217
-	sys-apps/debianutils"
-DEPEND=""
+	sys-apps/debianutils
+	${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}"
 
 src_prepare() {
 	python_setup
 	python_fix_shebang --force "${S}/src/bin"
+	mv "${S}/src/man/crontab"{,-systemd}".1.in" || die
+	mv "${S}/src/man/crontab"{,-systemd}".5.in" || die
 	sed -i \
 		-e 's/^crontab/crontab-systemd/' \
-		"${S}/src/man/crontab.1.in" || die
+		-e 's/^CRONTAB/CRONTAB-SYSTEMD/' \
+		"${S}/src/man/crontab-systemd."{1,5}".in" || die
 	sed -i \
-		-e '/install.*bin\/crontab_setuid/d' \
-		-e 's/crontab\.1/crontab-systemd\.1/' \
+		-e 's!/crontab$!/crontab-systemd!' \
+		-e 's!/crontab\(\.[15]\)!/crontab-systemd\1!' \
+		-e 's/\([: ]\)crontab/\1cron/' \
 		"${S}/Makefile.in" || die
-	mkdir -p "${S}/out/build/man"
-	cp "${S}/src/man/crontab.1.in" "${S}/out/build/man/crontab-systemd.1" || die
 	use etc-crontab || sed -i \
 		-e "s!/etc/crontab!/dev/null!" \
 		"${S}/src/bin/systemd-crontab-generator.py" || die
@@ -57,14 +61,13 @@ src_configure() {
 		$(my_use_enable yearly) \
 		$(my_use_enable yearly quarterly) \
 		$(my_use_enable yearly semi_annually) \
+		$(my_use_enable setgid) \
 		--enable-persistent=yes
 }
 
 src_install() {
-	make DESTDIR="${ED}" install
-	mv "${ED}"/usr/bin/crontab{,-systemd} || die
-	mv "${ED}"/usr/share/man/man1/crontab{,-systemd}.1 || die
-	mv "${ED}"/usr/share/man/man5/crontab{,-systemd}.5 || die
+	dodir "$(systemd_get_unitdir)" /usr/share/man/man{1,5,7,8}
+	default
 }
 
 pkg_postinst() {