Revbump to install anacrontab as well (bug #502420). Committed straight to stable. Fixed pidfile location in init scripts. Removed old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x981CA6FC)

5 files changed, 21 insertions, 92 deletions

diff --git a/sys-process/cronie/ChangeLog b/sys-process/cronie/ChangeLog
index 0edabf7b2216..2e4c8949419f 100644
--- a/sys-process/cronie/ChangeLog
+++ b/sys-process/cronie/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-process/cronie
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/ChangeLog,v 1.49 2014/01/11 09:53:57 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/ChangeLog,v 1.50 2014/02/25 19:08:17 polynomial-c Exp $
+
+*cronie-1.4.11-r1 (25 Feb 2014)
+
+  25 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> -cronie-1.4.9-r5.ebuild,
+  -cronie-1.4.11.ebuild, +cronie-1.4.11-r1.ebuild, files/anacron-1.0-initd,
+  files/cronie-1.3-initd:
+  Revbump to install anacrontab as well. Thanks to Matthew Schultz for
+  reporting this in bug #502420 and providing an ebuild patch. Committed
+  straight to stable. Fixed pidfile location in init scripts. Removed old.
 
   11 Jan 2014;  <zlogene@gentoo.org> cronie-1.4.11.ebuild:
   Add ~ppc64 keyword wrt bug #497394
diff --git a/sys-process/cronie/cronie-1.4.11.ebuild b/sys-process/cronie/cronie-1.4.11-r1.ebuild
index 0b3c09215bdb..3c473a15bd5b 100644
--- a/sys-process/cronie/cronie-1.4.11.ebuild
+++ b/sys-process/cronie/cronie-1.4.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/cronie-1.4.11.ebuild,v 1.11 2014/01/11 09:53:57 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/cronie-1.4.11-r1.ebuild,v 1.1 2014/02/25 19:08:17 polynomial-c Exp $
 
 EAPI=5
 
@@ -66,6 +66,7 @@ src_install() {
 
 		insinto /etc
 
+		doins contrib/anacrontab
 		newinitd "${FILESDIR}"/anacron-1.0-initd anacron
 
 		# Install this without execute permission.
diff --git a/sys-process/cronie/cronie-1.4.9-r5.ebuild b/sys-process/cronie/cronie-1.4.9-r5.ebuild
deleted file mode 100644
index 223d8b3ef172..000000000000
--- a/sys-process/cronie/cronie-1.4.9-r5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/cronie-1.4.9-r5.ebuild,v 1.6 2013/11/04 12:53:36 polynomial-c Exp $
-
-EAPI="5"
-
-inherit cron eutils pam systemd user
-
-DESCRIPTION="Cronie is a standard UNIX daemon cron based on the original vixie-cron."
-SRC_URI="https://fedorahosted.org/releases/c/r/cronie/${P}.tar.gz"
-HOMEPAGE="https://fedorahosted.org/cronie/wiki"
-
-LICENSE="ISC BSD BSD-2 GPL-2"
-KEYWORDS="amd64 arm sparc x86"
-IUSE="anacron inotify pam selinux"
-
-DEPEND="pam? ( virtual/pam )
-	anacron? ( !sys-process/anacron )"
-RDEPEND="${DEPEND}"
-
-#cronie supports /etc/crontab
-CRON_SYSTEM_CRONTAB="yes"
-
-pkg_setup() {
-	enewgroup crontab
-}
-
-src_configure() {
-	SPOOL_DIR="/var/spool/cron/crontabs" \
-	ANACRON_SPOOL_DIR="/var/spool/anacron" \
-	econf \
-		$(use_with inotify) \
-		$(use_with pam) \
-		$(use_with selinux) \
-		$(use_enable anacron) \
-		--with-syscrontab \
-		--with-daemon_username=cron \
-		--with-daemon_groupname=cron
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	docrondir -m 1730 -o root -g crontab
-	fowners root:crontab /usr/bin/crontab
-	fperms 2751 /usr/bin/crontab
-
-	insinto /etc/conf.d
-	newins "${S}"/crond.sysconfig ${PN}
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}-1.2-crontab" crontab
-	newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny
-
-	keepdir /etc/cron.d
-	newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN}
-	newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
-
-	sed s:sysconfig/crond:conf.d/cronie: contrib/cronie.systemd > "${T}"/cronie.service
-	systemd_dounit "${T}"/cronie.service
-
-	if use anacron ; then
-		keepdir /var/spool/anacron
-		fowners root:cron /var/spool/anacron
-		fperms 0750 /var/spool/anacron
-
-		insinto /etc
-
-		newinitd "${FILESDIR}"/anacron-1.0-initd anacron
-
-		# Install this without execute permission.
-		# User can enable it with chmod +x.
-		insinto /etc/cron.hourly
-		doins contrib/0anacron
-	fi
-
-	dodoc AUTHORS README contrib/*
-}
-
-pkg_postinst() {
-	cron_pkg_postinst
-}
diff --git a/sys-process/cronie/files/anacron-1.0-initd b/sys-process/cronie/files/anacron-1.0-initd
index fa27595cfff3..df55b0c8feb1 100644
--- a/sys-process/cronie/files/anacron-1.0-initd
+++ b/sys-process/cronie/files/anacron-1.0-initd
@@ -1,15 +1,16 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/files/anacron-1.0-initd,v 1.2 2013/01/23 17:25:24 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/files/anacron-1.0-initd,v 1.3 2014/02/25 19:08:17 polynomial-c Exp $
 
 # anacron forks itself when -d gets omitted. So s-s-d fails to create a valid
-# pidfile. DO NOT remove -d from command_args and -b from s-s-d_args!
+# pidfile. DO NOT remove -d from command_args and let s-s-d start anacron
+# in background!
 
 command="/usr/sbin/anacron"
 command_args="-d -s -S /var/spool/anacron"
-pidfile="/var/run/anacron.pid"
-start_stop_daemon_args="--background --make-pidfile --pidfile ${pidfile}"
+pidfile="/run/anacron.pid"
+command_background="true"
 
 depend() {
 	use clock logger
diff --git a/sys-process/cronie/files/cronie-1.3-initd b/sys-process/cronie/files/cronie-1.3-initd
index 5213ab72fae5..1c124c8bdbbf 100644
--- a/sys-process/cronie/files/cronie-1.3-initd
+++ b/sys-process/cronie/files/cronie-1.3-initd
@@ -1,11 +1,11 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/files/cronie-1.3-initd,v 1.1 2012/02/13 17:32:34 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/files/cronie-1.3-initd,v 1.2 2014/02/25 19:08:17 polynomial-c Exp $
 
 command="/usr/sbin/crond"
 command_args="${CRONDARGS}"
-pidfile="/var/run/crond.pid"
+pidfile="/run/crond.pid"
 
 depend() {
 	use clock logger