Look for CLOCK setting in /etc/conf.d/net, where it's been moved. Bug #169338, reported by Gerben Vos <gpvos+gnt at xs4all.nl>. Removed ebuild for 2.3.4.

Package-Manager: portage-2.1.2-r11

6 files changed, 32 insertions, 85 deletions

diff --git a/net-mail/email/ChangeLog b/net-mail/email/ChangeLog
index 45278b4dc0b3..d917daaf470e 100644
--- a/net-mail/email/ChangeLog
+++ b/net-mail/email/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/email
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/email/ChangeLog,v 1.19 2006/12/19 19:51:10 ticho Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/email/ChangeLog,v 1.20 2007/03/04 18:36:00 ticho Exp $
+
+  04 Mar 2007; Andrej Kacian <ticho@gentoo.org> -email-2.3.4.ebuild,
+  email-2.5.0.ebuild, email-2.5.1.ebuild:
+  Look for CLOCK setting in /etc/conf.d/net, where it's been moved. Bug
+  #169338, reported by Gerben Vos <gpvos+gnt at xs4all.nl>. Removed ebuild for
+  2.3.4.
 
 *email-2.5.1 (19 Dec 2006)
 
diff --git a/net-mail/email/Manifest b/net-mail/email/Manifest
index 80781124fd02..6916f8b0eb3a 100644
--- a/net-mail/email/Manifest
+++ b/net-mail/email/Manifest
@@ -1,32 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST email-2.3.4.tar.bz2 133767 RMD160 90c70d7c31d4cd3dab56d01a4e33d58f446a65e3 SHA1 75f0a532348d0121606c899b01b8a0d87138c266 SHA256 926e185d8f15b95e4474369447b85fe16a204f194c121b6e1d420d6146818a6c
 DIST email-2.5.0.tar.bz2 133167 RMD160 c17a540494b0680e16755357b129ae3da91bd10e SHA1 b810a6183dc47bd54a5f404c6f17333d81cc5432 SHA256 617d6d9cca146cdf3985c3432408ce8e855c8394d54824736fab549ec351935b
 DIST email-2.5.1.tar.bz2 133143 RMD160 08e159864b370bb3f35bd15e296884e7e3f05763 SHA1 11b90bea114ff144f8042cfaebb085920cc616d3 SHA256 9b78d629df622cb01d90589a827357a7a518bdc4742b34a7c31f012620dcc51a
-EBUILD email-2.3.4.ebuild 1144 RMD160 0205505964afb77bdb4ac3889120414dca3f208b SHA1 05c628270dcce0fc1e893442b5424c240161bbfa SHA256 ac4331ee93320df5c3fbe0b45bfea06b7594c858fefe80703d23a9c72ad41672
-MD5 f4e4ebf1da7f5b575f9e543e1d5c2049 email-2.3.4.ebuild 1144
-RMD160 0205505964afb77bdb4ac3889120414dca3f208b email-2.3.4.ebuild 1144
-SHA256 ac4331ee93320df5c3fbe0b45bfea06b7594c858fefe80703d23a9c72ad41672 email-2.3.4.ebuild 1144
-EBUILD email-2.5.0.ebuild 1144 RMD160 ef07c87791704eb29f817de87a7202654c568b5a SHA1 eabb4416b29145243884dd959a0919aad9c2cea8 SHA256 35c3fe5d2200aebeda436b201a69e57728daeda8126a832b9cd7e78ba7229b03
-MD5 ee3636a75bfce87f7b24fdaf643ae95a email-2.5.0.ebuild 1144
-RMD160 ef07c87791704eb29f817de87a7202654c568b5a email-2.5.0.ebuild 1144
-SHA256 35c3fe5d2200aebeda436b201a69e57728daeda8126a832b9cd7e78ba7229b03 email-2.5.0.ebuild 1144
-EBUILD email-2.5.1.ebuild 1147 RMD160 2a1b60312fcb288e2c4763305171c70613b4081d SHA1 4e86d91fb900a3a48e09cf63af0f9166cdc4e19a SHA256 5c4bdcefd9a3e51caf6b393822967fb4e3d907db3b199a5499f693f1a66708c0
-MD5 729bc737e4df7afd7387bfad1e3d17a1 email-2.5.1.ebuild 1147
-RMD160 2a1b60312fcb288e2c4763305171c70613b4081d email-2.5.1.ebuild 1147
-SHA256 5c4bdcefd9a3e51caf6b393822967fb4e3d907db3b199a5499f693f1a66708c0 email-2.5.1.ebuild 1147
-MISC ChangeLog 2611 RMD160 58621d5d8077c3ff09bdebac80d5e90699b05bf0 SHA1 aaec1eb0c8d8e4e87f8bf356fffc35d9ce7462be SHA256 c2db4ef508d66c7d9cf533e61264841353ae6618c7e0f7cb4d1b9e4aaa5354bc
-MD5 6319ae84ef2ff425d462f25e2cac61e8 ChangeLog 2611
-RMD160 58621d5d8077c3ff09bdebac80d5e90699b05bf0 ChangeLog 2611
-SHA256 c2db4ef508d66c7d9cf533e61264841353ae6618c7e0f7cb4d1b9e4aaa5354bc ChangeLog 2611
+EBUILD email-2.5.0.ebuild 1154 RMD160 930597cb1e3aacdf80bd6bb2d491a63501dd8193 SHA1 546444617725107c95795388ee6e3ac283d4790e SHA256 abbc0cf45a50da59fadef0e6fae99f7468c9c0bfb71ad1c5bd6a18fdeb406be6
+MD5 d2c16d56d0fcbad005d7fa6653eadf38 email-2.5.0.ebuild 1154
+RMD160 930597cb1e3aacdf80bd6bb2d491a63501dd8193 email-2.5.0.ebuild 1154
+SHA256 abbc0cf45a50da59fadef0e6fae99f7468c9c0bfb71ad1c5bd6a18fdeb406be6 email-2.5.0.ebuild 1154
+EBUILD email-2.5.1.ebuild 1157 RMD160 e8dad50f8100c7c470c16db2ac18f874d0409d56 SHA1 f5a5b5ab7d2a26ea8acce71fb4fa5ab62c86809c SHA256 b916e6e6cfa8aae7a5bb9f25b4d40e9b9e1ab488b0c37398545099411a71116b
+MD5 f8788816895ddb3bc23880bbdff82cd0 email-2.5.1.ebuild 1157
+RMD160 e8dad50f8100c7c470c16db2ac18f874d0409d56 email-2.5.1.ebuild 1157
+SHA256 b916e6e6cfa8aae7a5bb9f25b4d40e9b9e1ab488b0c37398545099411a71116b email-2.5.1.ebuild 1157
+MISC ChangeLog 2883 RMD160 8c3bfd6e623c65728c3bbcdd92fc99880f0a23ae SHA1 e974d96d820ef8eaea37d26929b633326fdc3f49 SHA256 fe3d1494d8a436dc4673d2493693b8972632081a490adde88b6a666a57a42de1
+MD5 227dd3e48c8de4b5d752bebe9cafd286 ChangeLog 2883
+RMD160 8c3bfd6e623c65728c3bbcdd92fc99880f0a23ae ChangeLog 2883
+SHA256 fe3d1494d8a436dc4673d2493693b8972632081a490adde88b6a666a57a42de1 ChangeLog 2883
 MISC metadata.xml 326 RMD160 66b18234944bd732f6a1ea7f346cdef9383bc0b1 SHA1 c8649d046b6fd1fe4e5668517a6580f126505fc9 SHA256 d9332957a0167f41ce1a46b55d80bf28ae215f28a9c41d76836136d73db5ef77
 MD5 850ad3e7c3a77515ca7545c20870b45f metadata.xml 326
 RMD160 66b18234944bd732f6a1ea7f346cdef9383bc0b1 metadata.xml 326
 SHA256 d9332957a0167f41ce1a46b55d80bf28ae215f28a9c41d76836136d73db5ef77 metadata.xml 326
-MD5 029675fb77bb470f836ea2d7b42d7c4a files/digest-email-2.3.4 238
-RMD160 72b44f457de024414db1bfd0b99656549eba2a8d files/digest-email-2.3.4 238
-SHA256 d2098d873acc05be9287c3a7bd4dd0166f96d0668efe99546869eae9b58d06ef files/digest-email-2.3.4 238
 MD5 cb6536444a89c0a7aed234af091ec41d files/digest-email-2.5.0 238
 RMD160 d26c8c330a131797499641c35a5803289f3ad540 files/digest-email-2.5.0 238
 SHA256 20f22f7e2246544cb103d6496cb924fe6bb54a15153cc0364a630640abb1b89b files/digest-email-2.5.0 238
@@ -34,9 +26,9 @@ MD5 31cde21efff6639863c986ad6c6dc8f9 files/digest-email-2.5.1 238
 RMD160 4a42d290327952bdcebe288ea715af7fb6fb7159 files/digest-email-2.5.1 238
 SHA256 68533a50ad13d6914168bc22906027bbdfe5203cdf0ed52382285e8815f47276 files/digest-email-2.5.1 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFiEK6QlM6RnzZP+IRAmUyAJ4gBNYOVCcS8uPx6ozczDGkhxpDhQCfecKk
-K/tMTS8SZYrngemzQE/r1L0=
-=tHUO
+iD8DBQFF6xGaQlM6RnzZP+IRAlBsAJ4n/EmGqIhdF5uOwT8NeubxPZDjTgCgisJF
+ePe27wrMbvsmXsY0udXKylg=
+=Dpxv
 -----END PGP SIGNATURE-----
diff --git a/net-mail/email/email-2.3.4.ebuild b/net-mail/email/email-2.3.4.ebuild
deleted file mode 100644
index dc07de79b8f0..000000000000
--- a/net-mail/email/email-2.3.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/email/email-2.3.4.ebuild,v 1.5 2005/05/30 17:25:10 ferdy Exp $
-
-DESCRIPTION="Advanced CLI tool for sending email."
-HOMEPAGE="http://email.cleancode.org"
-SRC_URI="http://email.cleancode.org/download/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="alpha amd64 x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	local myconf=""
-
-	if [ -f /etc/rc.conf ]; then
-		. /etc/rc.conf
-		if [ x$CLOCK = "xUTC" ]; then
-			einfo "Using UTC timestamps (from /etc/rc.conf)"
-			myconf="${myconf} --with-utc"
-		fi
-	fi
-
-	sed -i -e "s:/doc/email-\${version}:/share/doc:" configure
-	sed -i -e "s:DIVIDER = '---':DIVIDER = '-- ':" email.conf
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	doman email.1
-	dodoc INSTALL quoted-printable.rfc RFC821 TODO
-	make DESTDIR=${D} install || die "install failed"
-}
-
-pkg_preinst() {
-	rm ${D}/usr/share/doc/${P}/email.1
-}
-
-pkg_postinst() {
-	echo
-	einfo "Do not forget to edit /etc/email/email.conf file before using email."
-	echo
-}
diff --git a/net-mail/email/email-2.5.0.ebuild b/net-mail/email/email-2.5.0.ebuild
index bd2ed4478f60..836befedb31c 100644
--- a/net-mail/email/email-2.5.0.ebuild
+++ b/net-mail/email/email-2.5.0.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/net-mail/email/email-2.5.0.ebuild,v 1.4 2006/10/12 01:28:45 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/email/email-2.5.0.ebuild,v 1.5 2007/03/04 18:36:00 ticho Exp $
 
 DESCRIPTION="Advanced CLI tool for sending email."
 HOMEPAGE="http://email.cleancode.org"
@@ -16,8 +16,8 @@ DEPEND="virtual/libc"
 src_compile() {
 	local myconf=""
 
-	if [ -f /etc/rc.conf ]; then
-		. /etc/rc.conf
+	if [ -f /etc/conf.d/clock ]; then
+		. /etc/conf.d/clock
 		if [ x$CLOCK = "xUTC" ]; then
 			einfo "Using UTC timestamps (from /etc/rc.conf)"
 			myconf="${myconf} --with-utc"
diff --git a/net-mail/email/email-2.5.1.ebuild b/net-mail/email/email-2.5.1.ebuild
index 4d9569b31c2e..78faa9d5010f 100644
--- a/net-mail/email/email-2.5.1.ebuild
+++ b/net-mail/email/email-2.5.1.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/net-mail/email/email-2.5.1.ebuild,v 1.1 2006/12/19 19:51:10 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/email/email-2.5.1.ebuild,v 1.2 2007/03/04 18:36:00 ticho Exp $
 
 DESCRIPTION="Advanced CLI tool for sending email."
 HOMEPAGE="http://email.cleancode.org"
@@ -16,8 +16,8 @@ DEPEND="virtual/libc"
 src_compile() {
 	local myconf=""
 
-	if [ -f /etc/rc.conf ]; then
-		. /etc/rc.conf
+	if [ -f /etc/conf.d/clock ]; then
+		. /etc/conf.d/clock
 		if [ x$CLOCK = "xUTC" ]; then
 			einfo "Using UTC timestamps (from /etc/rc.conf)"
 			myconf="${myconf} --with-utc"
diff --git a/net-mail/email/files/digest-email-2.3.4 b/net-mail/email/files/digest-email-2.3.4
deleted file mode 100644
index 82fb20809ba0..000000000000
--- a/net-mail/email/files/digest-email-2.3.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6ced0bebeb6897e9bb975bb02b66b5ae email-2.3.4.tar.bz2 133767
-RMD160 90c70d7c31d4cd3dab56d01a4e33d58f446a65e3 email-2.3.4.tar.bz2 133767
-SHA256 926e185d8f15b95e4474369447b85fe16a204f194c121b6e1d420d6146818a6c email-2.3.4.tar.bz2 133767