From: Wolfram Schlich Date: Wed, 17 Jan 2007 23:22:40 +0000 (+0000) Subject: fix EDITOR stuff, now depends on nano. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2ebcbeb245a2b33d2817ed9ade13a6c577ce220e;p=gentoo.git fix EDITOR stuff, now depends on nano. Package-Manager: portage-2.1.2_rc3-r7 --- diff --git a/sys-process/fcron/ChangeLog b/sys-process/fcron/ChangeLog index 692259522dc9..c4bef7b4950a 100644 --- a/sys-process/fcron/ChangeLog +++ b/sys-process/fcron/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-process/fcron -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.19 2006/10/07 09:15:38 flameeyes Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/ChangeLog,v 1.20 2007/01/17 23:22:40 wschlich Exp $ + + 17 Jan 2007; Wolfram Schlich fcron-3.0.1-r2.ebuild: + fix EDITOR stuff, now depends on nano. 07 Oct 2006; Diego Pettenò fcron-3.0.1-r2.ebuild: Change pam dependency on virtual/pam and add ~x86-fbsd keyword as per bug diff --git a/sys-process/fcron/Manifest b/sys-process/fcron/Manifest index 9b33bdb6a23c..90846355532d 100644 --- a/sys-process/fcron/Manifest +++ b/sys-process/fcron/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX crontab 832 RMD160 ac7e347d5cedccec74ad7301fb20857ac30a4df0 SHA1 bc8c0f0ea498a97c0533c815511a13bb933d5cc9 SHA256 052c8cfefc9d801cc7a1619e6932264d35c4f076b4fa3225791a91809ce49a59 MD5 92d3b4a42f3e88041e50bb552b9104fd files/crontab 832 RMD160 ac7e347d5cedccec74ad7301fb20857ac30a4df0 files/crontab 832 @@ -50,18 +47,18 @@ EBUILD fcron-3.0.1-r1.ebuild 4210 RMD160 965193d9314ec3443410b5eeb6b0fb733e71101 MD5 be7febef630eb8edf843e939450d171a fcron-3.0.1-r1.ebuild 4210 RMD160 965193d9314ec3443410b5eeb6b0fb733e711014 fcron-3.0.1-r1.ebuild 4210 SHA256 27a18a411f2be8137d0aeaddf0990d3778c4b1c98257cdfd5ae94c5b353aadce fcron-3.0.1-r1.ebuild 4210 -EBUILD fcron-3.0.1-r2.ebuild 6869 RMD160 6d0392c0849df18f7b930f0b7fd38b69351f1a50 SHA1 ab11a502b13dd0cf506f4f7198298a84b4005fd9 SHA256 e2d93663f7b81dc68cab036601f537eb0ab47f4741cd392ec4214a653d0b9beb -MD5 785afefcaf264c2352f02d250565dabd fcron-3.0.1-r2.ebuild 6869 -RMD160 6d0392c0849df18f7b930f0b7fd38b69351f1a50 fcron-3.0.1-r2.ebuild 6869 -SHA256 e2d93663f7b81dc68cab036601f537eb0ab47f4741cd392ec4214a653d0b9beb fcron-3.0.1-r2.ebuild 6869 +EBUILD fcron-3.0.1-r2.ebuild 6213 RMD160 cba938585ce0a2fb946b9828c1019f4b5bcc42ef SHA1 b8f5d2b96613f20dcc97df4ebf50985f95ede0ab SHA256 9ef3423088f69cbf4da22332baa643b915a2d73b9a9610934a8a836a6243c81c +MD5 8d1e192d3daa94a175895839a6a1fd0c fcron-3.0.1-r2.ebuild 6213 +RMD160 cba938585ce0a2fb946b9828c1019f4b5bcc42ef fcron-3.0.1-r2.ebuild 6213 +SHA256 9ef3423088f69cbf4da22332baa643b915a2d73b9a9610934a8a836a6243c81c fcron-3.0.1-r2.ebuild 6213 EBUILD fcron-3.0.1.ebuild 3836 RMD160 7812dd0dc74ffad8efd62716984f8f7d73b4dd71 SHA1 72a4e4c95ea320f31409ed73ad598bd5b2fe7ddd SHA256 a02be0a730acb5e8d240796477baf322275cf3b02a9584fb5a1f950fbb2f652e MD5 2c1ec7c8a32cf36107b12ba97d732b4d fcron-3.0.1.ebuild 3836 RMD160 7812dd0dc74ffad8efd62716984f8f7d73b4dd71 fcron-3.0.1.ebuild 3836 SHA256 a02be0a730acb5e8d240796477baf322275cf3b02a9584fb5a1f950fbb2f652e fcron-3.0.1.ebuild 3836 -MISC ChangeLog 11053 RMD160 62f60c5b5f456091641fa1cfbb4cb47585dcd706 SHA1 c7df63f7d996b1a85cfd749fbbdbf78ea2bd3816 SHA256 803af4785c534a09bc8c2087e4c85ab856ad70584b276a693d3c396b79b9b5d7 -MD5 f76295f8083f5699af33930d9ce7cf23 ChangeLog 11053 -RMD160 62f60c5b5f456091641fa1cfbb4cb47585dcd706 ChangeLog 11053 -SHA256 803af4785c534a09bc8c2087e4c85ab856ad70584b276a693d3c396b79b9b5d7 ChangeLog 11053 +MISC ChangeLog 11170 RMD160 5386b583b184583c04b625eaf5edfaec44b01995 SHA1 5d9e29655df157bb3d943686db850abca5382999 SHA256 960618acf59a8f4d7b0cf9545825700f6ee289235b4f4eefa23e2ce22dc348af +MD5 657f113a2edc0953dea54c4d3f712f9d ChangeLog 11170 +RMD160 5386b583b184583c04b625eaf5edfaec44b01995 ChangeLog 11170 +SHA256 960618acf59a8f4d7b0cf9545825700f6ee289235b4f4eefa23e2ce22dc348af ChangeLog 11170 MISC metadata.xml 303 RMD160 d24dcc8f24ba7a6a6881727d4f6bea37b319fee4 SHA1 6071b772615027860d246ae497df4866c991562a SHA256 550e002d2ddfc3e38a4fd062713956e335e068f6cf15828e139f01ce325937c6 MD5 4ecc6e1f7881550e02353b1511d8b89e metadata.xml 303 RMD160 d24dcc8f24ba7a6a6881727d4f6bea37b319fee4 metadata.xml 303 @@ -87,10 +84,3 @@ SHA256 14534509d40edfeb8fc3cb150d56dbbef3f2082bbeb2f71530a8de266cba1f75 files/di MD5 14a48609fdf147cc10aef17c336cc6aa files/digest-fcron-3.0.1-r2 247 RMD160 e979c7a5d8fe531293193369fc4914addec3e1a0 files/digest-fcron-3.0.1-r2 247 SHA256 14534509d40edfeb8fc3cb150d56dbbef3f2082bbeb2f71530a8de266cba1f75 files/digest-fcron-3.0.1-r2 247 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFJ3BAAiZjviIA2XgRAjuAAJ923UDpD2aOoFN4O0sfIa0UEQEtuACgrEYd -xZ/Y2RTAjGt1WsYD0y0/gv4= -=0fzz ------END PGP SIGNATURE----- diff --git a/sys-process/fcron/fcron-3.0.1-r2.ebuild b/sys-process/fcron/fcron-3.0.1-r2.ebuild index 5e13c5f8eeda..773c9a7dbff9 100644 --- a/sys-process/fcron/fcron-3.0.1-r2.ebuild +++ b/sys-process/fcron/fcron-3.0.1-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.1-r2.ebuild,v 1.4 2006/10/07 09:15:38 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-process/fcron/fcron-3.0.1-r2.ebuild,v 1.5 2007/01/17 23:22:40 wschlich Exp $ inherit cron pam eutils @@ -12,31 +12,14 @@ LICENSE="GPL-2" KEYWORDS="~amd64 ~hppa ~mips ppc sparc ~x86 ~x86-fbsd" IUSE="debug doc pam selinux" -DEPEND="virtual/editor +DEPEND="app-editors/nano doc? ( >=app-text/docbook-dsssl-stylesheets-1.77 ) selinux? ( sys-libs/libselinux ) pam? ( virtual/pam )" 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 - if [[ "${EDITOR}" != */* ]] ; then - einfo "Attempting to deduce absolute path of ${EDITOR}" - EDITOR=$(which ${EDITOR} 2>/dev/null) - [[ -x "${EDITOR}" ]] || \ - die "Please set the EDITOR env variable to the path of a valid executable." - fi - - ROOTUSER=$(egetent passwd 0 | cut -d':' -f1) - ROOTGROUP=$(egetent group 0 | cut -d':' -f1) + ROOTUSER=$(egetent passwd 0 | cut -d ':' -f 1) + ROOTGROUP=$(egetent group 0 | cut -d ':' -f 1) } src_unpack() { @@ -74,7 +57,7 @@ src_compile() { --with-fifodir=/var/run \ --with-sendmail=/usr/sbin/sendmail \ --with-fcrondyn=yes \ - --with-editor=${EDITOR} \ + --with-editor=/bin/nano \ --with-shell=/bin/sh \ ${myconf} \ || die "Configure problem"