Version bump and cleanup old versions. The 3.0.6 merges most of our custom changes so it's mostly vanilla.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 89 insertions, 417 deletions

diff --git a/sys-process/fcron/ChangeLog b/sys-process/fcron/ChangeLog
index 1791f7c41593..901e922a2da5 100644
--- a/sys-process/fcron/ChangeLog
+++ b/sys-process/fcron/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-process/fcron
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.78 2010/04/24 19:54:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.79 2010/05/04 11:40:38 flameeyes Exp $
+
+*fcron-3.0.6 (04 May 2010)
+
+  04 May 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -fcron-3.0.4-r1.ebuild, -fcron-3.0.4-r2.ebuild,
+  -files/fcron-3.0.4-docfix.patch, +fcron-3.0.6.ebuild, -files/fcron.init:
+  Version bump and cleanup old versions. The 3.0.6 merges most of our custom
+  changes so it's mostly vanilla.
 
   24 Apr 2010; Raúl Porcel <armin76@gentoo.org> fcron-3.0.5-r2.ebuild:
   Add ~arm wrt #314629
diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest
index edefadcf400f..bf912d3aca41 100644
--- a/sys-process/fcron/Manifest
+++ b/sys-process/fcron/Manifest
@@ -1,14 +1,11 @@
 AUX check_system_crontabs.fcron-config-file.patch 1740 RMD160 05a8b1f3ae6a2217482765806dce1b24a4a51c29 SHA1 32125fbe6752fa839e2dc00e21e8ddaee5b26801 SHA256 40ed92d5f2ea1468b705d624e6ff756eddda212cb8216d26fbf63ec7d50a2b86
 AUX crontab 864 RMD160 f181a337c032df8711384bd54c58e594fd516313 SHA1 db6ce92b9109134d8c8dfb3e6f248dafea217c69 SHA256 ccb4bf3d5732f7f26fb9a7ae75e13e5e20603e8f1db8859cfa6ee4d4dcb9df45
-AUX fcron-3.0.4-docfix.patch 1446 RMD160 1c57256ccd7cb2cd6c6723050e347577123a1afb SHA1 8e96a9b00eeecfe7add5848618c0f21f20cce30f SHA256 24737725423a109860ac77bf34a59211914434225e2e1f7ed1db922595730a47
 AUX fcron-3.0.5-gentoo.patch 1025 RMD160 e3c634e5833d50450fcccba7833f668212352c70 SHA1 95354a2e033abbaf46948ffe0bb6db7a75a39680 SHA256 9de8ebb711f371c5bf0a14063be5405d39658965c7b643ecdba7a63c482bbd60
-AUX fcron.init 1582 RMD160 e0fd0cadddac8b344ea84f70c3c6e645d9badce2 SHA1 fd5fddb75378af57c37fa57432f3c068521e4a68 SHA256 f5bc89e7204906790b0046bd30a865b7b04c4d21e7ef4154cbad3ae1213d6526
 AUX fcron.init.2 1562 RMD160 6434ae17c2636454a16c8fba1f2bae0933598692 SHA1 52baed45ddebe6b343fb28f187e667a055e40d44 SHA256 b8bd49ce367ed30e1f5d7f6eabfb8cbff14f1a7bc486f0816c53a64c2dc0ac6c
 AUX fcrontab 332 RMD160 062faddf0551bebbf9834b796f9957cf49dbc967 SHA1 063f77dd90a76170a793352530a35c60922283e4 SHA256 ab5c104248c51471d61e3312f52bf738d74ab3319b8c01cd0cc5c74458fb8fcc
-DIST fcron-3.0.4.src.tar.gz 553609 RMD160 2bb8eb489251eaa1380b4e37b6526d2040291313 SHA1 daaa5287be026a425ea5bb56959ad38b1b6d030a SHA256 c8766c7f347f2146f84449401f8994d477d10f49df778f9a7cd802e534bc6f96
 DIST fcron-3.0.5.src.tar.gz 551516 RMD160 7523bd7de39bb2aa96e61714ee98f389b1fb68b1 SHA1 73a1fe43305c6afaafd82086a17c03fa1ebcfac3 SHA256 f3360475a2d09598f24254e41d626b11be89aa8680933e6e35b7708edce90671
-EBUILD fcron-3.0.4-r1.ebuild 8833 RMD160 4e0d5b162d05c031fe7a33fe90be94b9d8938bd8 SHA1 255dbcdbc715d84b4196f557dc8211f27b48c934 SHA256 c02d90a080f53a30e3a14002406514e9f83d94201d7c770cdcce4447963663bc
-EBUILD fcron-3.0.4-r2.ebuild 8988 RMD160 33be5526cb595f9311007dc312709338a9431a6c SHA1 47b22e75ba0b08071ede0cec9a8c946896292269 SHA256 d013ac7e4c3174aace5070bec0b1f2dd38b67540785ec40331c64d198d3d915a
+DIST fcron-3.0.6.src.tar.gz 552805 RMD160 fadcb39ce106dcd61f31e1d4d6ab7c2d1149b36b SHA1 6b0a886931d9a89c65df33228384b07d672238bf SHA256 9c36b1bc6c931ec8b4ef55fef569ba17004b32f3ae0a72e3cc4ec4d15bee30a1
 EBUILD fcron-3.0.5-r2.ebuild 9682 RMD160 1523b79ba7c8076e818545e9f6b52d9e671cdc63 SHA1 4578b12aa9543afb12c0a39b68c10a00f54ff138 SHA256 c21718a4c23890336db02c7ce93385261f0eaf84f59691fc412f9eb4d914aa8c
-MISC ChangeLog 19145 RMD160 ddcb7c4e8bb74742be7f5d0063cc7164388739bb SHA1 2bdb2bc9303e94d506b1ff9c8618d45f42481631 SHA256 d460f43f5496c438b31803835b1677bfc2793a1896983fe4a055e72f55507183
+EBUILD fcron-3.0.6.ebuild 9247 RMD160 599bf0e58e260c41ef507b2b6839d7812684104f SHA1 5c1dedf32a4a98ed214d964460a2e816de54be35 SHA256 06d7d4aa8fd8c9450b0bd2404ec563f8d4eae34bd51433e5cd61a94e2bb4ace3
+MISC ChangeLog 19468 RMD160 bb17e76090cb9b8b83ded30cabd1688e42e8351e SHA1 9878023ca7f695542081fb952f0fbc8e1b9325df SHA256 3e65172f3476e38e50f29aa2ea242c3c7f7eb789ef09d257994e6b9b3afc44a4
 MISC metadata.xml 1339 RMD160 52ce6f7f857513f37c32a193082b3ab5c416decc SHA1 ae84fe903dfb1ef235e088ecf59e26bd0d3fc42e SHA256 3b6ed143cd47d298191633e6c0ec05ff761c5f03b0b92537b67b75f9172bcaaf
diff --git a/sys-process/fcron/fcron-3.0.4-r1.ebuild b/sys-process/fcron/fcron-3.0.4-r1.ebuild
deleted file mode 100644
index 2bbccf7ad328..000000000000
--- a/sys-process/fcron/fcron-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.4-r1.ebuild,v 1.6 2009/10/02 16:31:05 armin76 Exp $
-
-inherit autotools cron pam eutils
-
-MY_P=${P/_/-}
-DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
-HOMEPAGE="http://fcron.free.fr/"
-SRC_URI="http://fcron.free.fr/archives/${MY_P}.src.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ~ia64 ~mips ppc sparc x86 ~x86-fbsd"
-IUSE="debug doc pam selinux"
-
-DEPEND="doc? ( >=app-text/docbook-dsssl-stylesheets-1.77 )
-	selinux? ( sys-libs/libselinux )
-	pam? ( virtual/pam )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup fcron
-	enewuser fcron -1 -1 -1 fcron
-	rootuser=$(egetent passwd 0 | cut -d ':' -f 1)
-	rootgroup=$(egetent group 0 | cut -d ':' -f 1)
-	if useq debug; then
-		ewarn
-		ewarn "WARNING: debug USE flag active!"
-		ewarn "The debug USE flag makes fcron start in debug mode"
-		ewarn "by default, thus not detaching into background."
-		ewarn "This will make your system HANG on bootup if"
-		ewarn "fcron is to be started automatically by the"
-		ewarn "init system!"
-		ewarn
-		ebeep 10
-		epause 60
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# respect LDFLAGS
-	sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed"
-
-	## patch check_system_crontabs to support "-c /path/to/fcron.conf"
-	pushd script &>/dev/null \
-		&& epatch "${FILESDIR}"/check_system_crontabs.fcron-config-file.patch \
-		&& popd &>/dev/null
-
-	eautoreconf || die "autoreconf failed"
-}
-
-src_compile() {
-	local myconf
-
-	use doc \
-		&& myconf="${myconf} --with-dsssl-dir=/usr/share/sgml/stylesheets/dsssl/docbook"
-
-	[[ -n "${rootuser}" ]] && myconf="${myconf} --with-rootname=${rootuser}"
-	[[ -n "${rootgroup}" ]] && myconf="${myconf} --with-rootgroup=${rootgroup}"
-
-	econf \
-		"$(useq debug || echo --with-cflags=${CFLAGS})" \
-		$(use_with debug '' yes) \
-		$(use_with pam) \
-		$(use_with selinux) \
-		--sysconfdir=/etc/fcron \
-		--with-username=fcron \
-		--with-groupname=fcron \
-		--with-piddir=/var/run \
-		--with-etcdir=/etc/fcron \
-		--with-spooldir=/var/spool/fcron \
-		--with-fifodir=/var/run \
-		--with-fcrondyn=yes \
-		--disable-checks \
-		--with-editor=/usr/bin/vi \
-		--with-sendmail=/usr/sbin/sendmail \
-		--with-shell=/bin/sh \
-		${myconf} \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	# cron eclass stuff
-	docron fcron -m0755 -o ${rootuser:-root} -g ${rootgroup:-root}
-	docrondir /var/spool/fcron -m6770 -o fcron -g fcron
-	docrontab fcrontab -m6755 -o fcron -g fcron
-
-	# install fcron tools
-	insinto /usr/bin
-	# fcronsighup needs to be suid root, because it sends a HUP
-	# to the running fcron daemon
-	insopts -m6755 -o ${rootuser:-root} -g fcron
-	doins fcronsighup
-	insopts -m6755 -o fcron -g fcron
-	doins fcrondyn
-
-	# /etc stuff
-	diropts -m0750 -o ${rootuser:-root} -g fcron
-	dodir /etc/fcron
-	insinto /etc/fcron
-	insopts -m0640 -o ${rootuser:-root} -g fcron
-	doins files/fcron.{allow,deny,conf}
-
-	# install PAM files
-	newpamd files/fcron.pam fcron
-	newpamd files/fcrontab.pam fcrontab
-
-	# install /etc/crontab and /etc/fcrontab
-	insopts -m0640 -o ${rootuser:-root} -g ${rootgroup:-root}
-	insinto /etc
-	doins "${FILESDIR}"/crontab "${FILESDIR}"/fcrontab
-
-	# install init script
-	newinitd "${FILESDIR}"/fcron.init fcron
-
-	# install the very handy check_system_crontabs script
-	dosbin script/check_system_crontabs
-
-	# doc stuff
-	dodoc MANIFEST VERSION
-	newdoc files/fcron.conf fcron.conf.sample
-	dodoc "${FILESDIR}"/crontab
-	dodoc doc/en/txt/{readme,thanks,faq,todo,relnotes,changes}.txt
-	rm -f doc/en/man/*.3 # ugly hack for bitstring.3 manpage
-	doman doc/en/man/*.[0-9]
-	use doc && dohtml doc/en/HTML/*.html
-
-	# localized docs
-	local LANGUAGES=$(sed -n 's:LANGUAGES =::p' doc/Makefile)
-	LANGUAGES="${LANGUAGES/en/}"
-	local lang
-	for lang in ${LANGUAGES}; do
-		hasq ${lang} ${LINGUAS} || continue
-		rm -f doc/${lang}/man/*.3 # ugly hack for bitstring.3 manpage
-		doman -i18n=${lang} doc/${lang}/man/*.[0-9]
-		use doc && docinto html/${lang} && dohtml doc/${lang}/HTML/*.html
-	done
-}
-
-pkg_postinst() {
-	einfo
-	einfo "fcron has some important differences compared to vixie-cron:"
-	einfo
-	einfo "1. fcron stores the crontabs in ${ROOT}var/spool/fcron"
-	einfo "   instead of ${ROOT}var/spool/cron/crontabs"
-	einfo
-	einfo "2. fcron uses a special binary file format for storing the"
-	einfo "   crontabs in ${ROOT}var/spool/fcron/USERNAME,"
-	einfo "   but the original plain text version is saved as"
-	einfo "   ${ROOT}var/spool/fcron/USERNAME.orig for your"
-	einfo "   reference (and for being edited with fcrontab)."
-	einfo
-	einfo "3. fcron does not feature a system crontab in exactly the"
-	einfo "   same way as vixie-cron does. This version of fcron"
-	einfo "   features a crontab for a pseudo-user 'systab' for use"
-	einfo "   as the system crontab. Running a command like"
-	einfo
-	einfo "      fcrontab -u systab ${ROOT}etc/crontab"
-	einfo
-	einfo "   will write ${ROOT}etc/crontab to the fcron crontabs directory as"
-	einfo
-	einfo "      ${ROOT}var/spool/fcron/systab"
-	einfo
-	einfo "   Please note that changes to ${ROOT}etc/crontab will not become"
-	einfo "   active automatically! fcron also does not use the directory"
-	einfo "   ${ROOT}etc/cron.d by default like vixie-cron does."
-	einfo "   Fortunately, it's possible to emulate vixie-cron's behavior"
-	einfo "   with regards to ${ROOT}etc/crontab and ${ROOT}etc/cron.d by using a"
-	einfo "   little helper script called 'check_system_crontabs'."
-	einfo "   The file ${ROOT}etc/fcrontab (not ${ROOT}etc/crontab!) has been set up"
-	einfo "   to run the script once a while to check whether"
-	einfo "   ${ROOT}etc/fcrontab, ${ROOT}etc/crontab or files in ${ROOT}etc/cron.d/ have"
-	einfo "   changed since the last generation of the systab and"
-	einfo "   regenerate it from those three locations as necessary."
-	einfo "   You should now run 'check_system_crontabs' once to properly"
-	einfo "   generate an initial systab:"
-	einfo
-	einfo "      check_system_crontabs -v -i -f"
-	einfo
-	einfo "   The file ${ROOT}etc/fcrontab should only be used to run that"
-	einfo "   script in order to ensure independence from the standard"
-	einfo "   system crontab file ${ROOT}etc/crontab."
-	einfo "   You may of course adjust the schedule for the script"
-	einfo "   'check_system_crontabs' or any other setting in"
-	einfo "   ${ROOT}etc/fcrontab as you desire."
-	einfo
-	einfo "If you do NOT want to use 'check_system_crontabs', you"
-	einfo "might still want to activate the use of the well known"
-	einfo "directories ${ROOT}etc/cron.{hourly|daily|weekly|monthly} by"
-	einfo "just generating a systab once from ${ROOT}etc/crontab:"
-	einfo
-	einfo "   fcrontab -u systab ${ROOT}etc/crontab"
-	einfo
-	einfo "Happy fcron'ing!"
-	einfo
-
-	ewarn
-	ewarn "Fixing permissions and ownership of ${ROOT}usr/bin/fcron{tab,dyn,sighup}"
-	chown fcron:fcron "${ROOT}"usr/bin/fcron{tab,dyn} >&/dev/null
-	chown ${rootuser:-root}:fcron "${ROOT}"usr/bin/fcronsighup >&/dev/null
-	chmod 6755 "${ROOT}"usr/bin/fcron{tab,dyn,sighup} >&/dev/null
-	ewarn "Fixing permissions and ownership of ${ROOT}etc/{fcron,fcrontab,crontab}"
-	chown -R ${rootuser:-root}:fcron "${ROOT}"etc/{fcron,fcrontab,crontab} >&/dev/null
-	chmod -R g+rX,o= "${ROOT}"etc/fcron "${ROOT}"etc/{fcron,fcrontab,crontab} >&/dev/null
-	ewarn
-
-	ewarn
-	ewarn "WARNING: fcron now uses a dedicated user and group"
-	ewarn "'fcron' for the suid/sgid programs/files instead of"
-	ewarn "the user and group 'cron' that were previously used."
-	ewarn
-	ewarn "fcron usage can now only be restricted by adding users"
-	ewarn "to the following files instead of to the group 'cron':"
-	ewarn
-	ewarn "   ${ROOT}etc/fcron/fcron.allow"
-	ewarn "   ${ROOT}etc/fcron/fcron.deny"
-	ewarn
-	ebeep 10
-	epause 10
-
-	if ls -1 "${ROOT}"var/spool/cron/fcrontabs/* >&/dev/null; then
-		ewarn
-		ewarn "WARNING: fcron now uses a dedicated fcron-specific"
-		ewarn "spooldir ${ROOT}var/spool/fcron instead of the commonly"
-		ewarn "used ${ROOT}var/spool/cron for several reasons."
-		ewarn
-		ewarn "Copying over existing crontabs from ${ROOT}var/spool/cron/fcrontabs"
-		cp "${ROOT}"var/spool/cron/fcrontabs/* "${ROOT}"var/spool/fcron/ >&/dev/null \
-			|| die "failed to migrate existing crontabs"
-		ewarn "You should now remove ${ROOT}var/spool/cron/fcrontabs!"
-		ewarn
-		ewarn "Fixing permissions and ownership of ${ROOT}var/spool/fcron"
-		chown root:root "${ROOT}"var/spool/fcron/* >&/dev/null
-		chmod 0600 "${ROOT}"var/spool/fcron/* >&/dev/null
-		chown fcron:fcron "${ROOT}"var/spool/fcron/*.orig >&/dev/null
-		chmod 0640 "${ROOT}"var/spool/fcron/*.orig >&/dev/null
-		ewarn
-		ewarn "*** YOU SHOULD IMMEDIATELY UPDATE THE"
-		ewarn "*** fcrontabs ENTRY IN ${ROOT}etc/fcron/fcron.conf"
-		ewarn "*** AND RESTART YOUR FCRON DAEMON!"
-		ebeep 20
-		epause 10
-	fi
-}
diff --git a/sys-process/fcron/fcron-3.0.4-r2.ebuild b/sys-process/fcron/fcron-3.0.6.ebuild
index 0cee5b10900e..cc6b054840f7 100644
--- a/sys-process/fcron/fcron-3.0.4-r2.ebuild
+++ b/sys-process/fcron/fcron-3.0.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.4-r2.ebuild,v 1.2 2009/10/02 16:31:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.6.ebuild,v 1.1 2010/05/04 11:40:38 flameeyes Exp $
 
-inherit autotools cron pam eutils
+inherit cron pam eutils
 
 MY_P=${P/_/-}
 DESCRIPTION="A command scheduler with extended capabilities over cron and anacron"
@@ -10,15 +10,18 @@ HOMEPAGE="http://fcron.free.fr/"
 SRC_URI="http://fcron.free.fr/archives/${MY_P}.src.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc pam selinux"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="debug pam selinux linguas_fr"
 
-DEPEND="doc? ( app-text/openjade
-		app-text/docbook-sgml
-		>=app-text/docbook-dsssl-stylesheets-1.77 )
-	selinux? ( sys-libs/libselinux )
+DEPEND="selinux? ( sys-libs/libselinux )
 	pam? ( virtual/pam )"
 
+# see bug 282214 for the reason to depend on bash
+RDEPEND="${DEPEND}
+	app-shells/bash
+	app-editors/gentoo-editor
+	pam? ( >=sys-auth/pambase-20100310 )"
+
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
@@ -26,18 +29,6 @@ pkg_setup() {
 	enewuser fcron -1 -1 -1 fcron
 	rootuser=$(egetent passwd 0 | cut -d ':' -f 1)
 	rootgroup=$(egetent group 0 | cut -d ':' -f 1)
-	if useq debug; then
-		ewarn
-		ewarn "WARNING: debug USE flag active!"
-		ewarn "The debug USE flag makes fcron start in debug mode"
-		ewarn "by default, thus not detaching into background."
-		ewarn "This will make your system HANG on bootup if"
-		ewarn "fcron is to be started automatically by the"
-		ewarn "init system!"
-		ewarn
-		ebeep 10
-		epause 60
-	fi
 }
 
 src_unpack() {
@@ -46,109 +37,118 @@ src_unpack() {
 
 	# respect LDFLAGS
 	sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed"
-
-	## patch check_system_crontabs to support "-c /path/to/fcron.conf"
-	pushd script &>/dev/null \
-		&& epatch "${FILESDIR}"/check_system_crontabs.fcron-config-file.patch \
-		&& popd &>/dev/null
-
-	## fix SGML files
-	epatch "${FILESDIR}"/${P}-docfix.patch
-
-	eautoreconf || die "autoreconf failed"
 }
 
 src_compile() {
 	local myconf
 
-	use doc \
-		&& myconf="${myconf} --with-dsssl-dir=/usr/share/sgml/stylesheets/dsssl/docbook --with-db2man=/usr/bin/docbook2man"
+	# Don't try to pass --with-debug as it'll play with cflags as
+	# well, and run foreground which is a _very_ nasty idea for
+	# Gentoo.
+	use debug && append-flags -DDEBUG
 
 	[[ -n "${rootuser}" ]] && myconf="${myconf} --with-rootname=${rootuser}"
 	[[ -n "${rootgroup}" ]] && myconf="${myconf} --with-rootgroup=${rootgroup}"
 
 	econf \
-		"$(useq debug || echo --with-cflags=${CFLAGS})" \
-		$(use_with debug '' yes) \
+		--with-cflags="${CFLAGS}" \
 		$(use_with pam) \
 		$(use_with selinux) \
 		--sysconfdir=/etc/fcron \
 		--with-username=fcron \
 		--with-groupname=fcron \
 		--with-piddir=/var/run \
-		--with-etcdir=/etc/fcron \
 		--with-spooldir=/var/spool/fcron \
 		--with-fifodir=/var/run \
 		--with-fcrondyn=yes \
 		--disable-checks \
-		--with-editor=/usr/bin/vi \
+		--with-editor=/usr/libexec/gentoo-editor \
 		--with-sendmail=/usr/sbin/sendmail \
 		--with-shell=/bin/sh \
+		--without-db2man --without-dsssl-dir \
 		${myconf} \
 		|| die "configure failed"
 
 	emake || die "make failed"
 
-	use doc && {
-		make updatedoc || die "make updatedoc failed"
-	}
+	# bug #216460
+	sed -i \
+		-e 's:/usr/local/etc/fcron:/etc/fcron/fcron:g' \
+		-e 's:/usr/local/etc:/etc:g' \
+		-e 's:/usr/local/:/usr/:g' \
+		doc/*/*/*.{txt,1,5,8,html} \
+		|| die "unable to fix documentation references"
 }
 
 src_install() {
-	# cron eclass stuff
-	docron fcron -m0755 -o ${rootuser:-root} -g ${rootgroup:-root}
-	docrondir /var/spool/fcron -m6770 -o fcron -g fcron
-	docrontab fcrontab -m6755 -o fcron -g fcron
+	# create directories that don't have special permissions first so
+	# that we can play with the permissions later
+	dodir /usr/bin /etc /var/spool
+
+	diropts -m6770 -o fcron -g fcron
+	keepdir /var/spool/fcron
 
 	# install fcron tools
 	insinto /usr/bin
+	dosbin fcron || die
+
 	# fcronsighup needs to be suid root, because it sends a HUP
 	# to the running fcron daemon
 	insopts -m6755 -o ${rootuser:-root} -g fcron
-	doins fcronsighup
+	doins fcronsighup || die
 	insopts -m6755 -o fcron -g fcron
-	doins fcrondyn
+	doins fcrondyn fcrontab || die
 
 	# /etc stuff
 	diropts -m0750 -o ${rootuser:-root} -g fcron
 	dodir /etc/fcron
 	insinto /etc/fcron
 	insopts -m0640 -o ${rootuser:-root} -g fcron
-	doins files/fcron.{allow,deny,conf}
+	doins files/fcron.{allow,deny,conf} || die
 
-	# install PAM files
-	newpamd files/fcron.pam fcron
-	newpamd files/fcrontab.pam fcrontab
+	diropts -m0755
+	insopts -m0644
 
 	# install /etc/crontab and /etc/fcrontab
 	insopts -m0640 -o ${rootuser:-root} -g ${rootgroup:-root}
-	insinto /etc
-	doins "${FILESDIR}"/crontab "${FILESDIR}"/fcrontab
+	doins "${FILESDIR}"/crontab "${FILESDIR}"/fcrontab || die
+
+	# install PAM files
+	pamd_mimic system-services fcron auth account session
+	cat - > "${T}"/fcrontab.pam <<EOF
+# Don't ask for the user's password; fcrontab will only allow to
+# change user if running as root.
+auth		sufficient		pam_permit.so
+
+# Still use the system-auth stack for account and session as the
+# sysadmin might have set up stuff properly, and also avoids
+# sidestepping limits (since fcrontab will run $EDITOR).
+account		include			system-auth
+session		include			system-auth
+EOF
+	newpamd "${T}"/fcrontab.pam fcrontab
 
 	# install init script
-	newinitd "${FILESDIR}"/fcron.init fcron
+	newinitd "${FILESDIR}"/fcron.init.2 fcron || die
 
-	# install the very handy check_system_crontabs script
-	dosbin script/check_system_crontabs
+	# install the very handy check_system_crontabs script, POSIX sh variant
+	dosbin script/check_system_crontabs.sh || die
 
 	# doc stuff
-	dodoc MANIFEST VERSION
-	newdoc files/fcron.conf fcron.conf.sample
-	dodoc "${FILESDIR}"/crontab
-	dodoc doc/en/txt/{readme,thanks,faq,todo,relnotes,changes}.txt
-	rm -f doc/en/man/*.3 # ugly hack for bitstring.3 manpage
-	doman doc/en/man/*.[0-9]
-	use doc && dohtml doc/en/HTML/*.html
+	dodoc MANIFEST VERSION "${FILESDIR}"/crontab \
+		doc/en/txt/{readme,thanks,faq,todo,relnotes,changes}.txt \
+		|| die
+	newdoc files/fcron.conf fcron.conf.sample || die
+	dohtml doc/en/HTML/*.html || die
+	doman doc/en/man/*.{1,5,8} || die
 
 	# localized docs
-	local LANGUAGES=$(sed -n 's:LANGUAGES =::p' doc/Makefile)
-	LANGUAGES="${LANGUAGES/en/}"
-	local lang
-	for lang in ${LANGUAGES}; do
-		hasq ${lang} ${LINGUAS} || continue
-		rm -f doc/${lang}/man/*.3 # ugly hack for bitstring.3 manpage
-		doman -i18n=${lang} doc/${lang}/man/*.[0-9]
-		use doc && docinto html/${lang} && dohtml doc/${lang}/HTML/*.html
+	for lang in fr; do
+		use linguas_${lang} || continue
+
+		doman -i18n=${lang} doc/${lang}/man/*.{1,5,8} || die
+		docinto html/${lang}
+		dohtml doc/${lang}/HTML/*.html || die
 	done
 }
 
@@ -230,8 +230,6 @@ pkg_postinst() {
 	ewarn "   ${ROOT}etc/fcron/fcron.allow"
 	ewarn "   ${ROOT}etc/fcron/fcron.deny"
 	ewarn
-	ebeep 10
-	epause 10
 
 	if ls -1 "${ROOT}"var/spool/cron/fcrontabs/* >&/dev/null; then
 		ewarn
@@ -253,7 +251,12 @@ pkg_postinst() {
 		ewarn "*** YOU SHOULD IMMEDIATELY UPDATE THE"
 		ewarn "*** fcrontabs ENTRY IN ${ROOT}etc/fcron/fcron.conf"
 		ewarn "*** AND RESTART YOUR FCRON DAEMON!"
-		ebeep 20
-		epause 10
 	fi
+
+	elog ""
+	elog "Since version 3.0.5 the fcron init script will no longer wait for LDAP, MySQL"
+	elog "or PostgreSQL before starting. If you need any of these for authentication or"
+	elog "for jobs that are executed by fcron, please create a /etc/conf.d/fcron file to"
+	elog "set the rc_need variable to the list of services you should be waiting for."
+	elog ""
 }
diff --git a/sys-process/fcron/files/fcron-3.0.4-docfix.patch b/sys-process/fcron/files/fcron-3.0.4-docfix.patch
deleted file mode 100644
index 3af27b22f028..000000000000
--- a/sys-process/fcron/files/fcron-3.0.4-docfix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urN fcron-3.0.4.orig/doc/en/changes.sgml fcron-3.0.4/doc/en/changes.sgml
---- fcron-3.0.4.orig/doc/en/changes.sgml	2007-11-08 10:02:42.000000000 +0100
-+++ fcron-3.0.4/doc/en/changes.sgml	2008-07-24 11:47:27.861704216 +0200
-@@ -178,6 +178,7 @@
- 	    <para>made fcrontab behave better when there is no space left in the
- 	       spool directory (used to truncate the fcrontab source file).
- 	    </para>
-+	 </listitem>
- 	 <listitem>
- 	    <para>Added a script, check_system_crontabs, to emulate Vixie cron's
- 	       behavior about /etc/crontab and /etc/cron.d. Please have a look
-@@ -1135,4 +1136,4 @@
- sgml-parent-document:("fcron-doc.sgml" "book" "chapter" "sect1" "")
- End:
- -->
--   
-\ No newline at end of file
-+   
-diff -urN fcron-3.0.4.orig/doc/fr/changes.sgml fcron-3.0.4/doc/fr/changes.sgml
---- fcron-3.0.4.orig/doc/fr/changes.sgml	2007-11-08 10:02:42.000000000 +0100
-+++ fcron-3.0.4/doc/fr/changes.sgml	2008-07-24 11:48:12.422376403 +0200
-@@ -86,6 +86,7 @@
- 	    <para>made fcrontab behave better when there is no space left in the
- 	       spool directory (used to truncate the fcrontab source file).
- 	    </para>
-+	 </listitem>
- 	 <listitem>
- 	    <para>Added a script, check_system_crontabs, to emulate Vixie cron's
- 	       behavior about /etc/crontab and /etc/cron.d. Please have a look
-@@ -1043,4 +1044,4 @@
- sgml-parent-document:("fcron-doc.sgml" "book" "chapter" "sect1" "")
- End:
- -->
--   
-\ No newline at end of file
-+   
diff --git a/sys-process/fcron/files/fcron.init b/sys-process/fcron/files/fcron.init
deleted file mode 100755
index e57421a97b8f..000000000000
--- a/sys-process/fcron/files/fcron.init
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/files/fcron.init,v 1.3 2007/04/14 15:57:05 wschlich Exp $
-
-depend() {
-	use logger slapd mysql postgresql
-	need clock hostname
-	# provide the cron service if we are the main instance
-	if [ "${SVCNAME}" = "fcron" ]; then
-		provide cron
-	fi
-}
-
-checkconfig() {
-	FCRON_INSTANCE=${SVCNAME##*.}
-	if [ -n "${FCRON_INSTANCE}" -a "${SVCNAME}" != "fcron" ]; then
-		FCRON_CONF=/etc/fcron/fcron.${FCRON_INSTANCE}.conf
-	else
-		FCRON_CONF=/etc/fcron/fcron.conf
-	fi
-	if [ ! -e ${FCRON_CONF} ]; then
-		eerror "You will need an ${FCRON_CONF} first"
-		eerror "There is a sample in /etc/fcron"
-		return 1
-	fi
-	FCRON_PIDFILE=$(grep '^pidfile' ${FCRON_CONF} 2>/dev/null | sed -e 's:^pidfile[[:space:]]*=[[:space:]]*\(.*\)$:\1:')
-	FCRON_PIDFILE=${FCRON_PIDFILE:-/var/run/fcron.pid}
-	FCRON_SPOOLDIR=$(grep '^fcrontabs' ${FCRON_CONF} 2>/dev/null | sed -e 's:^fcrontabs[[:space:]]*=[[:space:]]*\(.*\)$:\1:')
-	FCRON_SPOOLDIR=${FCRON_SPOOLDIR:-/var/spool/cron/fcrontabs}
-	if [ ! -d ${FCRON_SPOOLDIR} ]; then
-		ebegin "Creating missing spooldir ${FCRON_SPOOLDIR}"
-		/usr/sbin/fcron --newspooldir ${FCRON_SPOOLDIR}
-		eend $?
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --pidfile ${FCRON_PIDFILE} --exec /usr/sbin/fcron -- -c ${FCRON_CONF}
-	eend $?
-}
-
-stop() {
-	checkconfig || return 1
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile ${FCRON_PIDFILE}
-	eend $?
-}