Version bump; remove old version. This closes bug #375287, incidentally.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

6 files changed, 217 insertions, 349 deletions

diff --git a/sys-process/fcron/ChangeLog b/sys-process/fcron/ChangeLog
index da52400ee397..1d0a901a5490 100644
--- a/sys-process/fcron/ChangeLog
+++ b/sys-process/fcron/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-process/fcron
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.98 2012/11/22 13:20:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.99 2012/12/23 12:49:38 flameeyes Exp $
+
+*fcron-3.1.0 (23 Dec 2012)
+
+  23 Dec 2012; Diego E. Pettenò <flameeyes@gentoo.org> +fcron-3.1.0.ebuild,
+  -fcron-3.0.6-r2.ebuild, -files/check_system_crontabs.fcron-config-file.patch,
+  -files/fcron-3.0.5-gentoo.patch:
+  Version bump; remove old version. This closes bug #375287, incidentally.
 
 *fcron-3.0.6-r5 (16 Sep 2012)
 
diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest
index ade4b62186a5..dbf52ead381b 100644
--- a/sys-process/fcron/Manifest
+++ b/sys-process/fcron/Manifest
@@ -1,24 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX check_system_crontabs.fcron-config-file.patch 1740 SHA256 40ed92d5f2ea1468b705d624e6ff756eddda212cb8216d26fbf63ec7d50a2b86 SHA512 a4b36bc4e70018c6ddc7484692b11b0fc629be7c159d17f15d25e92e98450d007b0b5494f07797183f16629eaaa8513fad1184275189b726e4cca266a52c4571 WHIRLPOOL 7628fb092fa9dd8b8250a32a7e976899b88468921c8da1e82a93c31d62b1237632b01526ce7c9e66d141a1924d6ee3eb4f11e9a5e149f2440883bfefb496fff5
 AUX crontab 864 SHA256 ccb4bf3d5732f7f26fb9a7ae75e13e5e20603e8f1db8859cfa6ee4d4dcb9df45 SHA512 1446e401fd4578ff9c3cee1b2f923543915f24d301749e3e77a3847d9e34659d1ed39155abd9677bbbddb5ad9c33744e3d3a98042d996c7fde2c5dfa083cdeb5 WHIRLPOOL 9f01309184ccf51d72e9e99670b518844afc8af638b02cd228197398878800e9d370ab8ea7a8c4267a41d9cc1ce88bff26390070213bfb95e0d09c77b75f0a9f
-AUX fcron-3.0.5-gentoo.patch 1025 SHA256 9de8ebb711f371c5bf0a14063be5405d39658965c7b643ecdba7a63c482bbd60 SHA512 4aaa340de33cc935bb08282340e27ec1f72c48a4bc01563ddc19a763eb081161440b1ff31016a6f63a5391371398070d6be08252f02338e6a8b78b5503e166d1 WHIRLPOOL ace509071f25f567191c4c460c387064b7ac9e90b6655782b7ce46fb59416d5d44dea506b64407847437aaf71dfee3a169280adb12e263545364cbc2a0ec5c3a
 AUX fcron-3.0.6-buffer-overflow.patch 457 SHA256 8452d52d4447ecaeca37315dcfe7966f734a89ff9a106ff9ae870ea7158d0263 SHA512 d124f370419a622964702df5c3de0990ed0c88c8ff04c7143659ec32b34cfe981c8d7f8f062dc1787b9e0bbfd0052c8aa590887eb0dfcd6bcbd0fcb425251361 WHIRLPOOL 7b17fddc8ccc5a5ec55befd49fd1a49c1063e9fa34812a29079a698233b0bed1de4b3b1e74191ddc81540e6982caae12208e0c4dd417f87e98c32a27f39c0970
 AUX fcron.init.2 1562 SHA256 b8bd49ce367ed30e1f5d7f6eabfb8cbff14f1a7bc486f0816c53a64c2dc0ac6c SHA512 011ff7c3dc74b3df5729405f78ec5d948db0acfc809ab561bf176475a01de2ed229727da1962a6bab49d7ec8e95821bf3010ae0cd2891460beb1f5daa24d45f4 WHIRLPOOL 1757f7312463431e9837ea3ec2e7d9e40c058ab338d9d2c3524cba0650541b5de1686104dc6e5dbfc116dc2dd5975d81111351cb68d0077e407272671bb496a4
 AUX fcron.init.3 1371 SHA256 ceada7a1c9e8b62cff506bc94a1813706c7de1ed23daf9c3450ad549df4fafb7 SHA512 3ae8caea11c7e05d74e601d3f1a37d21d3f5fb8958c517a0e780db2cc0333601f8911892b5a700e2ea156960bcd6ee6afbe023553c72066fd908e06a33a89470 WHIRLPOOL 0a69a211edabc10859566208f37a2a8261d6f232ceab171081cbeeb8aab6d63fd78de6f21c9cfcd49819c410d98ac4fc7dbbd28157796ebfd5975f32c60186e8
 AUX fcrontab 332 SHA256 ab5c104248c51471d61e3312f52bf738d74ab3319b8c01cd0cc5c74458fb8fcc SHA512 1c6a8f0554dd4ffbdccc3ff75451e70508bc6fe5d5269f5d022301811457b76402b2bbffbdb1e39b847a48ea0537595858893357e0a46b7e0ba05351dcb9a27a WHIRLPOOL ede39398061d983adb3c4a01790132096e306561cd918f34d83ac35cd4e78eb31bf659d2cb58eda618d9e98146ae04a342178fda4e91cc9422dcdabdc869bcbf
 AUX fcrontab.2 338 SHA256 542d735935b46561a92ea36ebf33a91dd11ddc01a8576202e2474161d87e6671 SHA512 365d950f4baabd748478d1f5bf4343b6a95f0d8193d405f37ed62d70ded41daf7127c9e5b2a9d09750c7c6900b2f6109b80ecbf2902e98429de2991a3fb95464 WHIRLPOOL e7506faacf1ffa569ebaddf5dfddc4f78de5d4cada825601bb5f8dc2d61537d123d75c42d5f237c448ecd131760300d2b058a967c35cd51005bee0552382e2be
 DIST fcron-3.0.6.src.tar.gz 552805 SHA256 9c36b1bc6c931ec8b4ef55fef569ba17004b32f3ae0a72e3cc4ec4d15bee30a1 SHA512 53dfc2f57820392e4d32230d9abeaa3ec8a2c4aac6fc4888a266553806e7c31cecc655ff8cd5dbd635e40903cf649962e752e5ba6a5bd7728c79bc42771dfb99 WHIRLPOOL 49ba19f87f3190b0a04f75c48f6aaeea8572fc75ec9bc643a07817743c51ed3c23e2c606ee731d9b2994f04b9af4c8cce5ec0efdb20b5b0345b9acff519994b5
+DIST fcron-3.1.0.src.tar.gz 589052 SHA256 3b6747c02a4b9b2e12c8633742415c3d12cb0b51a7ce1c01a49e991b782907a9 SHA512 16373fe1558f1feabdfb2f7dad8d1ee3c59cd9320dddbe8510d901e81d93fb30cf5a8dca359d8c6968709548c4ae7a30b6fbb19f15df5146c2a0807950619053 WHIRLPOOL 2db3149cda667633ed582882743443ff8b28b4be5e275404d4b2bafeedbcd9cc1215cea2ffe766b9a698da5f061f2b1eca6d46d0a12153425e51ba496eb6c889
 EBUILD fcron-3.0.6-r1.ebuild 9343 SHA256 73535e9a331823d2dd57ab8e616e97adb62c65b9fdc162c88f51503f06bb53bc SHA512 7566c13b2599fb3a9d695334fa719b0222cf4733fcdb715bf85443f3762501399419556f3ac22db5e4a9a10cd0f41019e455286f2eda4cf09e71d3f93fc66836 WHIRLPOOL c278ffb973c35c1f0327e773f0edbf7f69093c25daecb8e97b87817f9f0a908082bfd2966db229c57e1173ebb786b299c5d9937aaee500cabcdb39d4cd5bbaab
-EBUILD fcron-3.0.6-r2.ebuild 9514 SHA256 75ee65e6671f624e5c5e08bd3f8c81484814db9ae409287704e6a956eb74d92c SHA512 8fe4c61f4837bd5d835b40adfb90a84c47ecaa07e652cb44cb0e8004cd532e66c88347018d04a35599f028ab85e467144e8502197abea19c1feb069b1c3a9eff WHIRLPOOL 8f0416db1156f17a9b709175bc8210e1e6c44678a291812e6e11c81b911f6458cfcfc6999ff944e8412220d39cd350058312aa9201c0a9103a4d9e9303ab993a
 EBUILD fcron-3.0.6-r5.ebuild 5624 SHA256 fcd569522cda177e474590e5303107e34e58510b21a16b84c80ead11aec3e1d8 SHA512 bc59e05955543294d3f205029c1b9f662e29f5beaf16cd89b050d7681026977e564c5def995fdc1fae3a5eca97c183b3f58429c0a87f803b0b87ab014d8aeabe WHIRLPOOL df097587e4925d39fa95d2f76c351a26ce6f14b4fc29120160b27fc3abded5062e1fcb805160e181ac52f2c880437c3d788200b923ad4fccf2ae17058bcec6b8
-MISC ChangeLog 22689 SHA256 98ecf9c179472b771c639f3e10c6fb60c607f8a557177365302d3aafe0e25244 SHA512 765b5813a5540662caf66ad03b746b860b129510ede6fbb1b8e396c15f8816a8d1b0db0c87360f51f61acb3c2470e0dbb1db3685228cad0cb26b61f6ac430610 WHIRLPOOL c5160ee69829efdf7c88c746dea03f839424aca96c230c7d86d4c56d325ca6efcd91ae785cca5f0b24385acb6f9be772abf3db18e3628efddfc9b72354e36891
+EBUILD fcron-3.1.0.ebuild 5571 SHA256 d9b14f302caa70cf94548ffbf585c8e75a20beeb7ef53bc8572c2873cb486c69 SHA512 c7b547aa655f837277372fd1d1fb8661c478d9a277bb59b6a354a067aedbe2eb2db47af33295b684ce4477a161699ce51c2813c2fe75f6c235763d46a97198b5 WHIRLPOOL 2c8bc68fadfc41b0e00a9d02d20d45938783f4888797ebf6adfb6943cf06dd1426a2d11daddc084e902bb429410e52f93c67e4fc60dcd0336e4eaafebf826726
+MISC ChangeLog 22991 SHA256 73e5de610a9a995143db3c829c5f11f4c86be36d4248ebe5d076cfec769a4a56 SHA512 0c4ae077bccdc12950bab787e25b1dc357d7a3de126ebd80f1f713ac5b869b9a5b5f29dad9bf202aa16c7c8e8d7f39f6a6b4520709d0ae836d9e0720298d77f6 WHIRLPOOL fa2e690dae72e509a7db862f695d4df2f28a8d7310e3fd14f2c09e8b0f18df578eb78e0b3cac1754ef2abb227188cd2073be6e4c21c7457154f5fd6adec6485f
 MISC metadata.xml 1122 SHA256 87b044588d8d558ab7fa3390e9b096a8ed0c40bc4dcf0e9b76f3db404fe5cec7 SHA512 6937186a3fac4b18aef260c1c5363c569647e00a1eb0c40e267221206b38d6e047428fa60f895a87c5f988313462934de8855b93f8d86176209e135a34e868bb WHIRLPOOL 0a6db2fe057a1a734da7325ab56c2df2abca0ab0748957bc061cd7b2ee5eb39ef41993b71e0fc44b1887267df57fbaac51bf48052ff0cbe7563a1d2495e5a988
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCuJrgACgkQVWmRsqeSphM0NQCfVV7w473JSHOY21ucysu/H3M/
-49wAnRhSS3GepcPEuER7msr+MUVOhFhY
-=bW+0
+iQEcBAEBCAAGBQJQ1v46AAoJEBzRPIrUMBNCSSEH/RZ11SqzCYlMNdP2YEoFezf2
+P+usg0CWOt5TqiY1NMSndgqLgc/yxWa7x8FQ1+cEL5SK4Tft6PCi8KFKCiyfn9Dq
+DcDBVWRvNYfNH956Hon1wGVr4ULtfH08U2FCZX2ou6tKbWqX9XBdLn6u2hZfmDQd
+fR3zd7Dc9209XqoDWY4WUX6KbZr9KU/N9dXiqQgac7qSXBNl4hOsn3oOPgdTVtGG
+Y7ur79+N+3knC7J41x/HKp4IuhsmMHWl2RwfqKy6ur15X3qAaespefJe8hzENUHW
+Eq4NdWN2+SruZyfobb9HZa9qxAhFFDgiVPTdt5q2qq6rCOqDnvTFU5a/CRLDbA0=
+=uhMh
 -----END PGP SIGNATURE-----
diff --git a/sys-process/fcron/fcron-3.0.6-r2.ebuild b/sys-process/fcron/fcron-3.0.6-r2.ebuild
deleted file mode 100644
index 4ecbef402de6..000000000000
--- a/sys-process/fcron/fcron-3.0.6-r2.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.6-r2.ebuild,v 1.3 2012/05/24 05:51:09 vapier Exp $
-
-inherit cron pam eutils flag-o-matic user
-
-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 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="debug pam selinux linguas_fr"
-
-DEPEND="selinux? ( sys-libs/libselinux )
-	pam? ( virtual/pam )"
-
-# see bug 282214 for the reason to depend on bash
-RDEPEND="${DEPEND}
-	app-shells/bash
-	>=app-misc/editor-wrapper-3
-	pam? ( >=sys-auth/pambase-20100310 )"
-
-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)
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# respect LDFLAGS
-	sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed"
-
-	sed -i -e 's:/etc/fcrontab:/etc/fcron/fcrontab:' script/check_system_crontabs.sh || die
-}
-
-src_compile() {
-	local myconf
-
-	# 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 \
-		--with-cflags="${CFLAGS}" \
-		$(use_with pam) \
-		$(use_with selinux) \
-		--sysconfdir=/etc/fcron \
-		--with-username=fcron \
-		--with-groupname=fcron \
-		--with-piddir=/var/run \
-		--with-spooldir=/var/spool/fcron \
-		--with-fifodir=/var/run \
-		--with-fcrondyn=yes \
-		--disable-checks \
-		--with-editor=/usr/libexec/editor \
-		--with-sendmail=/usr/sbin/sendmail \
-		--with-shell=/bin/sh \
-		--without-db2man --without-dsssl-dir \
-		${myconf} \
-		|| die "configure failed"
-
-	emake || die "make 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() {
-	# 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 || die
-	insopts -m6755 -o fcron -g fcron
-	doins fcrondyn fcrontab || die
-	dosym /usr/bin/fcrontab /usr/bin/crontab || 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} || die
-
-	diropts -m0755
-	insopts -m0644
-
-	# install /etc/fcrontab
-	insopts -m0640 -o ${rootuser:-root} -g ${rootgroup:-root}
-	doins "${FILESDIR}"/fcrontab || die
-
-	# install /etc/crontab
-	insinto /etc
-	insopts -m0640 -o ${rootuser:-root} -g ${rootgroup:-root}
-	doins "${FILESDIR}"/crontab || 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.2 fcron || die
-
-	# install the very handy check_system_crontabs script, POSIX sh variant
-	newsbin script/check_system_crontabs.sh check_system_crontabs || die
-
-	# doc stuff
-	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
-	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
-}
-
-pkg_postinst() {
-	elog
-	elog "fcron has some important differences compared to vixie-cron:"
-	elog
-	elog "1. fcron stores the crontabs in ${ROOT}var/spool/fcron"
-	elog "   instead of ${ROOT}var/spool/cron/crontabs"
-	elog
-	elog "2. fcron uses a special binary file format for storing the"
-	elog "   crontabs in ${ROOT}var/spool/fcron/USERNAME,"
-	elog "   but the original plain text version is saved as"
-	elog "   ${ROOT}var/spool/fcron/USERNAME.orig for your"
-	elog "   reference (and for being edited with fcrontab)."
-	elog
-	elog "3. fcron does not feature a system crontab in exactly the"
-	elog "   same way as vixie-cron does. This version of fcron"
-	elog "   features a crontab for a pseudo-user 'systab' for use"
-	elog "   as the system crontab. Running a command like"
-	elog
-	elog "      fcrontab -u systab ${ROOT}etc/crontab"
-	elog
-	elog "   will write ${ROOT}etc/crontab to the fcron crontabs directory as"
-	elog
-	elog "      ${ROOT}var/spool/fcron/systab"
-	elog
-	elog "   Please note that changes to ${ROOT}etc/crontab will not become"
-	elog "   active automatically! fcron also does not use the directory"
-	elog "   ${ROOT}etc/cron.d by default like vixie-cron does."
-	elog "   Fortunately, it's possible to emulate vixie-cron's behavior"
-	elog "   with regards to ${ROOT}etc/crontab and ${ROOT}etc/cron.d by using a"
-	elog "   little helper script called 'check_system_crontabs'."
-	elog "   The file ${ROOT}etc/fcron/fcrontab (not ${ROOT}etc/crontab!) has been set up"
-	elog "   to run the script once a while to check whether"
-	elog "   ${ROOT}etc/fcron/fcrontab, ${ROOT}etc/crontab or files in ${ROOT}etc/cron.d/ have"
-	elog "   changed since the last generation of the systab and"
-	elog "   regenerate it from those three locations as necessary."
-	elog "   You should now run 'check_system_crontabs' once to properly"
-	elog "   generate an initial systab:"
-	elog
-	elog "      check_system_crontabs -v -i -f"
-	elog
-	elog "   The file ${ROOT}etc/fcron/fcrontab should only be used to run that"
-	elog "   script in order to ensure independence from the standard"
-	elog "   system crontab file ${ROOT}etc/crontab."
-	elog "   You may of course adjust the schedule for the script"
-	elog "   'check_system_crontabs' or any other setting in"
-	elog "   ${ROOT}etc/fcron/fcrontab as you desire."
-	elog
-	elog "If you do NOT want to use 'check_system_crontabs', you"
-	elog "might still want to activate the use of the well known"
-	elog "directories ${ROOT}etc/cron.{hourly|daily|weekly|monthly} by"
-	elog "just generating a systab once from ${ROOT}etc/crontab:"
-	elog
-	elog "   fcrontab -u systab ${ROOT}etc/crontab"
-	elog
-	elog "Happy fcron'ing!"
-	elog
-
-	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,crontab}"
-	chown -R ${rootuser:-root}:fcron "${ROOT}"etc/{fcron,crontab} >&/dev/null
-	chmod -R g+rX,o= "${ROOT}"etc/fcron "${ROOT}"etc/{fcron,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
-
-	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!"
-	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/fcron-3.1.0.ebuild b/sys-process/fcron/fcron-3.1.0.ebuild
new file mode 100644
index 000000000000..6454f58dfdbf
--- /dev/null
+++ b/sys-process/fcron/fcron-3.1.0.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.1.0.ebuild,v 1.1 2012/12/23 12:49:38 flameeyes Exp $
+
+EAPI=5
+
+inherit cron pam eutils flag-o-matic user
+
+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 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="debug pam selinux linguas_fr +system-crontab"
+
+DEPEND="selinux? ( sys-libs/libselinux )
+	pam? ( virtual/pam )"
+
+# see bug 282214 for the reason to depend on bash
+RDEPEND="${DEPEND}
+	app-shells/bash
+	>=app-misc/editor-wrapper-3
+	pam? ( >=sys-auth/pambase-20100310 )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup fcron
+	enewuser fcron -1 -1 -1 fcron
+	rootuser=$(egetent passwd 0 | cut -d ':' -f 1)
+	[[ ${rootuser} ]] || rootuser=root
+	rootgroup=$(egetent group 0 | cut -d ':' -f 1)
+	[[ ${rootgroup} ]] || rootgroup=root
+}
+
+src_prepare() {
+	# respect LDFLAGS
+	sed -i "s:\(@LIBS@\):\$(LDFLAGS) \1:" Makefile.in || die "sed failed"
+
+	sed -i -e 's:/etc/fcrontab:/etc/fcron/fcrontab:' script/check_system_crontabs.sh || die
+}
+
+src_configure() {
+	local myconf
+
+	# 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
+
+	# bindir is used just for calling fcronsighup
+	econf \
+		--with-cflags="${CFLAGS}" \
+		--bindir=/usr/libexec \
+		$(use_with pam) \
+		$(use_with selinux) \
+		--sysconfdir=/etc/fcron \
+		--with-username=fcron \
+		--with-groupname=fcron \
+		--with-piddir=/var/run \
+		--with-spooldir=/var/spool/fcron \
+		--with-fifodir=/var/run \
+		--with-fcrondyn=yes \
+		--disable-checks \
+		--with-editor=/usr/libexec/editor \
+		--with-sendmail=/usr/sbin/sendmail \
+		--with-shell=/bin/sh \
+		--without-db2man --without-dsssl-dir \
+		--with-rootname=${rootuser} \
+		--with-rootgroup=${rootgroup}
+}
+
+src_compile() {
+	default
+
+	# 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() {
+	keepdir /var/spool/fcron
+
+	exeinto /usr/libexec
+	doexe fcron fcronsighup
+
+	dobin fcrondyn fcrontab
+
+	insinto /etc/fcron
+	doins files/fcron.{allow,deny,conf}
+
+	if use system-crontab; then
+		dosym fcrontab /usr/bin/crontab
+
+		exeinto /usr/libexec
+		newexe script/check_system_crontabs.sh check_system_crontabs
+
+		insinto /etc/fcron
+		newins "${FILESDIR}"/fcrontab.2 fcrontab
+
+		fowners ${rootuser}:fcron /etc/fcron/fcrontab
+		fperms 0640 /etc/fcron/fcrontab
+
+		insinto /etc
+		doins "${FILESDIR}"/crontab
+	fi
+
+	fowners fcron:fcron \
+		/var/spool/fcron \
+		/usr/bin/fcron{dyn,tab}
+
+	# fcronsighup needs to be suid root, because it sends a HUP to the
+	# running fcron daemon, but only has to be called by the fcron group
+	# anyway
+	fowners ${rootuser}:fcron \
+		/usr/libexec/fcronsighup \
+		/etc/fcron/fcron.{allow,deny,conf} \
+		/etc/fcron
+
+	fperms 6770 /var/spool/fcron
+	fperms 6775 /usr/bin/fcron{dyn,tab}
+
+	fperms 4710 /usr/libexec/fcronsighup
+
+	fperms 0750 /etc/fcron
+	fperms 0640 /etc/fcron/fcron.{allow,deny,conf}
+
+	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
+
+	newinitd "${FILESDIR}"/fcron.init.3 fcron
+
+	dodoc MANIFEST VERSION "${FILESDIR}"/crontab \
+		doc/en/txt/{readme,thanks,faq,todo,relnotes,changes}.txt
+	newdoc files/fcron.conf fcron.conf.sample
+	dohtml doc/en/HTML/*.html
+	doman doc/en/man/*.{1,5,8}
+
+	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
+}
+
+pkg_postinst() {
+	elog "If it's the first time you install fcron make sure to execute"
+	elog "  emerge --config ${CATEGORY}/${PN}"
+	elog "to configure the proper settings."
+	if ! use system-crontab; then
+		echo ""
+		ewarn "Remember that fcron will *not* use /etc/cron.d in this configuration"
+		echo ""
+	fi
+}
+
+pkg_config() {
+	if [[ $(fcrontab -l -u systab 2>/dev/null) ]]; then
+		eerror "We're not going to make any change to your systab as long as"
+		eerror "it contains data; please clear it before proceeding."
+		return 1
+	fi
+
+	if use system-crontab; then
+		elog "This is going to set up fcron to execute check_system_crontabs."
+		elog "In this configuration, you're no longer free to edit the systab"
+		elog "at your leisure, at it'll be rewritten the moment the crontabs"
+		elog "are modified."
+		/usr/libexec/check_system_crontabs -v -i -f
+	else
+		elog "This is going to set up fcron to set up a default systab that"
+		elog "executes /etc/cron.{hourly,daily,weekly,monthly}."
+		fcrontab -u systab - <<- EOF
+		0  *  * * *      rm -f /var/spool/cron/lastrun/cron.hourly
+		1  3  * * *      rm -f /var/spool/cron/lastrun/cron.daily
+		15 4  * * 6      rm -f /var/spool/cron/lastrun/cron.weekly
+		30 5  1 * *      rm -f /var/spool/cron/lastrun/cron.monthly
+		EOF
+	fi
+}
diff --git a/sys-process/fcron/files/check_system_crontabs.fcron-config-file.patch b/sys-process/fcron/files/check_system_crontabs.fcron-config-file.patch
deleted file mode 100644
index 5a757e3fe2bd..000000000000
--- a/sys-process/fcron/files/check_system_crontabs.fcron-config-file.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- script/check_system_crontabs.orig	2008-07-18 15:56:49.110205300 +0200
-+++ script/check_system_crontabs	2008-07-18 16:00:46.303783312 +0200
-@@ -74,7 +74,7 @@
- DEFAULT_CROND_DIR=/etc/cron.d
- DEFAULT_CRONTAB_FILE=/etc/crontab
- DEFAULT_FCRONTAB_FILE=/etc/fcrontab
--
-+DEFAULT_FCRON_CONFIG_FILE=/etc/fcron/fcron.conf
- FCRONTAB_PROG=/usr/bin/fcrontab
- FCRONTABS_DIR=/var/spool/fcron
- 
-@@ -117,6 +117,7 @@
-     -i          Interactive use with no delay; same as -s 0.
-     -p PATHNAME Full path to or filename of the fcrontab binary; use this
-                 only if it cannot be found automatically.
-+    -c FILE     Full path to fcron config file (default $DEFAULT_FCRON_CONFIG_FILE).
-     -F FILE     System fcrontab file (default $DEFAULT_FCRONTAB_FILE).
-     -C FILE     System crontab file (default $DEFAULT_CRONTAB_FILE).
-     -D DIR      System crontab directory (default $DEFAULT_CROND_DIR).
-@@ -127,6 +128,7 @@
- 
- SLEEP_TIME_BEFORE_REBUILD="$DEFAULT_SLEEP_TIME_BEFORE_REBUILD"
- CROND_DIR="$DEFAULT_CROND_DIR"
-+FCRON_CONFIG_FILE="$DEFAULT_FCRON_CONFIG_FILE"
- CRONTAB_FILE="$DEFAULT_CRONTAB_FILE"
- FCRONTAB_FILE="$DEFAULT_FCRONTAB_FILE"
- FCRONTAB_PROG=
-@@ -153,6 +155,10 @@
-     FCRONTAB_PROG="$2"
-     shift
-     ;;
-+  -c)
-+    FCRON_CONFIG_FILE="$2"
-+    shift
-+    ;;
-   -F)
-     FCRONTAB_FILE="$2"
-     shift
-@@ -247,7 +253,7 @@
-   sed -i -e "s/@yearly/0 0 1 1 */g" -e "s/@annually/0 0 1 1 */g" -e "s/@monthly/0 0 1 * */g" -e "s/@weekly/0 0 * * 0/g" -e "s/@daily/0 0 * * */g" -e "s/@midnight/0 0 * * */g" -e "s/@hourly/0 * * * */g" $FCRONTAB_FILE_TMP
- 
-   # notify fcron about the updated file
--  $FCRONTAB_PROG $FCRONTAB_FILE_TMP -u systab
-+  $FCRONTAB_PROG -c $FCRON_CONFIG_FILE $FCRONTAB_FILE_TMP -u systab
- }
- 
- NEED_REBUILD=0
diff --git a/sys-process/fcron/files/fcron-3.0.5-gentoo.patch b/sys-process/fcron/files/fcron-3.0.5-gentoo.patch
deleted file mode 100644
index bb9fbf01958c..000000000000
--- a/sys-process/fcron/files/fcron-3.0.5-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: fcron-3.0.5/fcrontab.c
-===================================================================
---- fcron-3.0.5.orig/fcrontab.c
-+++ fcron-3.0.5/fcrontab.c
-@@ -391,7 +391,7 @@ list_file(char *file)
- 
-     explain("listing %s's fcrontab", user);
- 
--    fd = open_as_user(file, useruid, fcrontab_uid, O_RDONLY);
-+    fd = open_as_user(file, useruid, fcrontab_gid, O_RDONLY);
-     if ( fd < 0 ) {
-         if ( errno == ENOENT ) {
- 	    explain("user %s has no fcrontab.", user);
-@@ -1038,8 +1038,8 @@ main(int argc, char **argv)
-     /* Open PAM session for the user and obtain any security
-        credentials we might need */
- 
--    debug("username: %s", user);
--    retcode = pam_start("fcrontab", user, &apamconv, &pamh);
-+    debug("username: %s runas: %s", user, runas);
-+    retcode = pam_start("fcrontab", runas, &apamconv, &pamh);
-     if (retcode != PAM_SUCCESS) die_pame(pamh, retcode, "Could not start PAM");
-     retcode = pam_authenticate(pamh, 0);    /* is user really user? */
-     if (retcode != PAM_SUCCESS)