Added anacron functionality (bug #403295). Reworked init script

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

6 files changed, 64 insertions, 66 deletions

diff --git a/sys-process/cronie/ChangeLog b/sys-process/cronie/ChangeLog
index d0b088663637..72d75458c29c 100644
--- a/sys-process/cronie/ChangeLog
+++ b/sys-process/cronie/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-process/cronie
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/ChangeLog,v 1.20 2011/10/27 22:42:32 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/ChangeLog,v 1.21 2012/02/13 17:32:34 polynomial-c Exp $
+
+*cronie-1.4.8-r1 (13 Feb 2012)
+
+  13 Feb 2012; Lars Wendler <polynomial-c@gentoo.org> +files/anacron-1.0-initd,
+  +files/cronie-1.3-initd, -cronie-1.4.4-r1.ebuild, -cronie-1.4.6.ebuild,
+  +cronie-1.4.8-r1.ebuild:
+  Added anacron functionality and conf.d file. Thanks to Florian Steinel for
+  providing an ebuild patch in bug #403295. Reworked init script.
 
   27 Oct 2011; Mike Frysinger <vapier@gentoo.org> cronie-1.4.8.ebuild:
   Arm love #388713 by Norman Shulman.
diff --git a/sys-process/cronie/cronie-1.4.4-r1.ebuild b/sys-process/cronie/cronie-1.4.4-r1.ebuild
deleted file mode 100644
index c287f6b8c265..000000000000
--- a/sys-process/cronie/cronie-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/cronie-1.4.4-r1.ebuild,v 1.1 2011/07/10 19:41:09 polynomial-c Exp $
-
-EAPI="2"
-
-inherit cron eutils pam
-
-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"
-KEYWORDS="amd64 x86"
-IUSE="inotify pam"
-
-DEPEND="pam? ( virtual/pam )"
-RDEPEND="${DEPEND}"
-
-#cronie supports /etc/crontab
-CRON_SYSTEM_CRONTAB="yes"
-
-pkg_setup() {
-	enewgroup crontab
-}
-
-src_configure() {
-	SPOOL_DIR="/var/spool/cron/crontabs" econf \
-		$(use_with inotify ) \
-		$(use_with pam ) \
-		--with-daemon_username=cron \
-		--with-daemon_groupname=cron \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-
-	docrondir -m 1730 -o root -g crontab
-	fowners root:crontab /usr/bin/crontab
-	fperms 2751 /usr/bin/crontab
-
-	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.2-initd" cronie
-	newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
-
-	dodoc NEWS AUTHORS README
-}
-
-pkg_postinst() {
-	cron_pkg_postinst
-}
diff --git a/sys-process/cronie/cronie-1.4.6.ebuild b/sys-process/cronie/cronie-1.4.8-r1.ebuild
index df0498fcc552..db6d24ae607b 100644
--- a/sys-process/cronie/cronie-1.4.6.ebuild
+++ b/sys-process/cronie/cronie-1.4.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/cronie-1.4.6.ebuild,v 1.3 2011/07/10 19:53:23 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/cronie/cronie-1.4.8-r1.ebuild,v 1.1 2012/02/13 17:32:34 polynomial-c Exp $
 
 EAPI="3"
 
@@ -11,10 +11,11 @@ SRC_URI="https://fedorahosted.org/releases/c/r/cronie/${P}.tar.gz"
 HOMEPAGE="https://fedorahosted.org/cronie/wiki"
 
 LICENSE="ISC BSD BSD-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="inotify pam"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
+IUSE="anacron inotify pam"
 
-DEPEND="pam? ( virtual/pam )"
+DEPEND="pam? ( virtual/pam )
+	anacron? ( !sys-process/anacron )"
 RDEPEND="${DEPEND}"
 
 #cronie supports /etc/crontab
@@ -28,6 +29,7 @@ src_configure() {
 	SPOOL_DIR="/var/spool/cron/crontabs" econf \
 		$(use_with inotify ) \
 		$(use_with pam ) \
+		$(use_enable anacron ) \
 		--with-daemon_username=cron \
 		--with-daemon_groupname=cron \
 		|| die "econf failed"
@@ -40,15 +42,27 @@ src_install() {
 	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.2-initd" cronie
+	newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN}
 	newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
 
-	dodoc NEWS AUTHORS README
+	if use anacron ; then
+		keepdir /var/spool/anacron
+
+		insinto /etc
+		doins "${S}"/contrib/anacrontab
+
+		newinitd "${FILESDIR}"/anacron-1.0-initd anacron
+	fi
+
+	dodoc AUTHORS README contrib/*
 }
 
 pkg_postinst() {
diff --git a/sys-process/cronie/files/anacron-1.0-initd b/sys-process/cronie/files/anacron-1.0-initd
new file mode 100644
index 000000000000..f4f0e5eb2133
--- /dev/null
+++ b/sys-process/cronie/files/anacron-1.0-initd
@@ -0,0 +1,17 @@
+#!/sbin/runscript
+# Copyright 1999-2012 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.1 2012/02/13 17:32:34 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!
+
+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}"
+
+depend() {
+	use clock logger
+	need localmount
+}
diff --git a/sys-process/cronie/files/cronie-1.3-initd b/sys-process/cronie/files/cronie-1.3-initd
new file mode 100644
index 000000000000..5213ab72fae5
--- /dev/null
+++ b/sys-process/cronie/files/cronie-1.3-initd
@@ -0,0 +1,14 @@
+#!/sbin/runscript
+# Copyright 1999-2012 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 $
+
+command="/usr/sbin/crond"
+command_args="${CRONDARGS}"
+pidfile="/var/run/crond.pid"
+
+depend() {
+	use clock logger
+	need localmount
+	provide cron	
+}
diff --git a/sys-process/cronie/metadata.xml b/sys-process/cronie/metadata.xml
index 4cf857201623..79ee2465bc19 100644
--- a/sys-process/cronie/metadata.xml
+++ b/sys-process/cronie/metadata.xml
@@ -13,7 +13,8 @@
   SELinux.
   And why cronie? See http://www.urbandictionary.com/define.php?term=cronie
   </longdescription>
-  <use>                                                                                                                                                    
+  <use>
+    <flag name='anacron'>Install the periodic anacron command scheduler.</flag>
     <flag name='inotify'>Enable inotify filesystem monitoring support.</flag>
   </use>
 </pkgmetadata>