Add various use statements to the init for bug #25250; add a better explanation for when the pkg_setup EDITOR check fails, bug #108699.

Package-Manager: portage-2.0.53_rc6

4 files changed, 24 insertions, 12 deletions

diff --git a/sys-process/fcron/ChangeLog b/sys-process/fcron/ChangeLog
index 9656ceedb233..2b5d3f6e57a7 100644
--- a/sys-process/fcron/ChangeLog
+++ b/sys-process/fcron/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-process/fcron
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.9 2005/09/27 14:17:21 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.10 2005/10/27 23:53:50 ka0ttic Exp $
+
+  27 Oct 2005; Aaron Walker <ka0ttic@gentoo.org> files/fcron.rc6,
+  fcron-3.0.0.ebuild:
+  Add various use statements to the init for bug #25250; add a better
+  explanation for when the pkg_setup EDITOR check fails, bug #108699.
 
   27 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> fcron-3.0.0.ebuild:
   Use egetent to set --with-root{name,group} configure options, bug #107374.
diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest
index b567aa01918d..adc6b3dad24a 100644
--- a/sys-process/fcron/Manifest
+++ b/sys-process/fcron/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3ae92a45aa047bc2b918dbf7e03320d0 fcron-3.0.0.ebuild 3552
+MD5 ff357a594d803c954a6bdc5b5d1145fd ChangeLog 9681
 MD5 c1d0a2ed938718f4afbebd7581e4dbf4 fcron-2.0.2.ebuild 3132
 MD5 013d69a3c71c5685c3c5cb79262dea8d fcron-2.9.5.1.ebuild 3402
-MD5 73274fcaae180550890b5502fab5e725 ChangeLog 9451
-MD5 bd1deeb53b2b8e05397238a5479c74cc metadata.xml 251
 MD5 c5be641f3ac32d16043211c7f2d39af3 fcron-2.9.7.ebuild 2924
+MD5 0cc41b3cd14c692eaf04f5788f5deb9a fcron-3.0.0.ebuild 3830
 MD5 92d3b4a42f3e88041e50bb552b9104fd files/crontab 832
 MD5 d18b499ccc7338a352ccc5111a23e224 files/digest-fcron-2.0.2 67
+MD5 42d8a93754df65def4a3746bbc68e494 files/digest-fcron-2.9.5.1 69
 MD5 64d9fabcf4bbba9191877ea7031fe575 files/digest-fcron-2.9.7 67
 MD5 107084996cdd2f6e1f328317c09681c2 files/digest-fcron-3.0.0 67
-MD5 b54804c4d3b4f7f16163fb5ce4496ae8 files/fcron.rc6 709
 MD5 cb4f2a8ba719a085eaa3b67918fbd0f5 files/fcron-2.0.0-configure.diff 716
-MD5 42d8a93754df65def4a3746bbc68e494 files/digest-fcron-2.9.5.1 69
 MD5 e87691832e6f48a5aed1c6cf3b681bce files/fcron-2.9.5.1-fix-mail-output.diff 415
+MD5 69137c81685b56b4e3195203a14bbb8b files/fcron.rc6 732
+MD5 bd1deeb53b2b8e05397238a5479c74cc metadata.xml 251
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDOVSMEZCkKN40op4RAnlXAJ0fZiK4lCo573ZyQ+iBEWAf/GFHyACffLil
-+xVEEqZd2/aYQ89PSNsXTaM=
-=rNJl
+iD8DBQFDYWjCEZCkKN40op4RAhAFAKCR+4kF9YKiEASIykAaYG7XK+qImgCeN1D+
+R59W1jTQRkSWpDZUxykuz0c=
+=gzZG
 -----END PGP SIGNATURE-----
diff --git a/sys-process/fcron/fcron-3.0.0.ebuild b/sys-process/fcron/fcron-3.0.0.ebuild
index 1ee81ddfc8ca..b99720e29a16 100644
--- a/sys-process/fcron/fcron-3.0.0.ebuild
+++ b/sys-process/fcron/fcron-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.0.ebuild,v 1.3 2005/09/27 14:17:21 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.0.ebuild,v 1.4 2005/10/27 23:53:50 ka0ttic Exp $
 
 inherit cron pam eutils
 
@@ -18,6 +18,13 @@ DEPEND="virtual/editor
 	pam? ( >=sys-libs/pam-0.77 )"
 
 pkg_setup() {
+	# sudo unsets EDITOR
+	if [[ -z "${EDITOR}" ]] ; then
+		eerror "EDITOR seems to be unset. If you use sudo, it may be the cause."
+		eerror "Try using 'sudo env EDITOR=\${EDITOR} emerge' instead."
+		die "Please set the EDITOR env variable to the path of a valid executable."
+	fi
+
 	# bug #65263
 	# fcron's ./configure complains if EDITOR is not set to an absolute path,
 	# so try to set it to the abs path if it isn't
diff --git a/sys-process/fcron/files/fcron.rc6 b/sys-process/fcron/files/fcron.rc6
index b5be7be38dd1..5836eb33e768 100755
--- a/sys-process/fcron/files/fcron.rc6
+++ b/sys-process/fcron/files/fcron.rc6
@@ -1,10 +1,10 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/files/fcron.rc6,v 1.1 2005/03/04 23:50:36 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/files/fcron.rc6,v 1.2 2005/10/27 23:53:50 ka0ttic Exp $
 
 depend() {
-	use logger
+	use logger slapd mysql postgresql
 	need clock hostname
 	provide cron
 }