use dohtml instead of dodoc for html (bug 23048) ; use sed -i

3 files changed, 48 insertions, 42 deletions

diff --git a/net-mail/pine/ChangeLog b/net-mail/pine/ChangeLog
index 0b67e4391e96..1b9da7da5dac 100644
--- a/net-mail/pine/ChangeLog
+++ b/net-mail/pine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/pine
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/pine/ChangeLog,v 1.31 2003/06/09 15:58:50 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/pine/ChangeLog,v 1.32 2003/06/20 05:49:56 msterret Exp $
+
+  19 Jun 2003; <msterret@gentoo.org> pine-4.56.ebuild:
+  use dohtml instead of dodoc for html (bug 23048)
+  use sed -i
 
 *pine-4.56 (09 Jun 2003)
 
diff --git a/net-mail/pine/Manifest b/net-mail/pine/Manifest
index 6d240a8cf375..496d45e26236 100644
--- a/net-mail/pine/Manifest
+++ b/net-mail/pine/Manifest
@@ -1,22 +1,22 @@
+MD5 cd42ef6c5061990191e1b99481b2b624 ChangeLog 6436
 MD5 48a7892ba081a1a408fd557bb42610c6 pine-4.50-r4.ebuild 3664
-MD5 37003d87e8c831b47aa8d49b6d31475b pine-4.53-r4.ebuild 3394
-MD5 1c4d008a28cd63b6c397dafa0984d2ba pine-4.52.ebuild 4962
-MD5 6db5551d9dd64249a8ceab611e139e07 ChangeLog 6089
-MD5 666aa36fc874825701a0b2841555b387 pine-4.56.ebuild 3394
 MD5 37994e5c4bd29aa962d7aabd71b867a3 pine-4.51.ebuild 3288
+MD5 1c4d008a28cd63b6c397dafa0984d2ba pine-4.52.ebuild 4962
+MD5 37003d87e8c831b47aa8d49b6d31475b pine-4.53-r4.ebuild 3394
+MD5 07026f9ddbf0a2f8df02bfd0ca7ee388 pine-4.56.ebuild 3319
 MD5 c47b08cab6132957eef9c0d61862f951 files/digest-pine-4.50-r4 131
+MD5 f25b20265d7415e876da759aef7feb4b files/digest-pine-4.51 118
+MD5 66b753d10185904c7df571e7a6a3d562 files/digest-pine-4.52 655
 MD5 f8bcd68c09b6f41aa63dd617c8d8a62a files/digest-pine-4.53-r4 141
-MD5 921f1e2837b3d3aaaff0ff9b78432e92 files/pine-4.30-ldap.patch 420
-MD5 36fbad9153bc6b61adb00767d199d284 files/imap-4.7c2-flock+maildir.patch 551
-MD5 3803bda87f35ee20456ab2b363460db9 files/pine-4.31-segfix.patch 460
+MD5 e2791bad5a20d4429dcd4a928714558f files/flock.c 1182
 MD5 c0d53400c157de12da7e429dd0f21185 files/imap-2000-time.patch 1646
+MD5 36fbad9153bc6b61adb00767d199d284 files/imap-4.7c2-flock+maildir.patch 551
 MD5 4239f06fa5f26e5cf181bb4cd5d96035 files/imap-4.7c2-flock.patch 531
-MD5 aed38f617192b6de2ada1847c48cabe7 files/pine-4.33-whitespace.patch 337
 MD5 5eb69ed43326ebdca20e77b988d0b19b files/pine-4.21-fixhome.patch 830
+MD5 b0aee0d39a268c8f0c85e774f7408509 files/pine-4.21-passwd.patch 448
+MD5 921f1e2837b3d3aaaff0ff9b78432e92 files/pine-4.30-ldap.patch 420
+MD5 3803bda87f35ee20456ab2b363460db9 files/pine-4.31-segfix.patch 460
+MD5 aed38f617192b6de2ada1847c48cabe7 files/pine-4.33-whitespace.patch 337
 MD5 e11e8fb4fba9fc54b7c0f302d79458bf files/pine-4.40-boguswarning.patch 512
-MD5 e2791bad5a20d4429dcd4a928714558f files/flock.c 1182
 MD5 6fca405df4fd22a5708ddf83e8081716 files/pine-4.40-lockfile-perm.patch 932
-MD5 b0aee0d39a268c8f0c85e774f7408509 files/pine-4.21-passwd.patch 448
-MD5 f25b20265d7415e876da759aef7feb4b files/digest-pine-4.51 118
-MD5 66b753d10185904c7df571e7a6a3d562 files/digest-pine-4.52 655
 MD5 3c070e29a68656d59a9aa98d748f1b2a files/digest-pine-4.56 141
diff --git a/net-mail/pine/pine-4.56.ebuild b/net-mail/pine/pine-4.56.ebuild
index 4dda00fc5fd3..ce78c93735ac 100644
--- a/net-mail/pine/pine-4.56.ebuild
+++ b/net-mail/pine/pine-4.56.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/pine/pine-4.56.ebuild,v 1.1 2003/06/09 15:58:50 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/pine/pine-4.56.ebuild,v 1.2 2003/06/20 05:49:56 msterret Exp $
 
 inherit eutils
 
@@ -16,6 +16,7 @@ KEYWORDS="~x86 ~ppc sparc ~alpha"
 IUSE="ssl ldap"
 
 DEPEND="virtual/glibc
+	>=sys-apps/sed-4
 	>=sys-libs/ncurses-5.1
 	>=sys-libs/pam-0.72
 	ssl? ( dev-libs/openssl )
@@ -35,13 +36,13 @@ src_unpack() {
 	epatch ${FILESDIR}/imap-4.7c2-flock.patch
 	cp ${FILESDIR}/flock.c ${S}/imap/src/osdep/unix
 
-        if [ "`use ldap`" ] ; then
-                # link to shared ldap libs instead of static
-                epatch ${FILESDIR}/pine-4.30-ldap.patch
-                mkdir ${S}/ldap
-                ln -s /usr/lib ${S}/ldap/libraries
-                ln -s /usr/include ${S}/ldap/include
-        fi
+	if [ "`use ldap`" ] ; then
+		# link to shared ldap libs instead of static
+		epatch ${FILESDIR}/pine-4.30-ldap.patch
+		mkdir ${S}/ldap
+		ln -s /usr/lib ${S}/ldap/libraries
+		ln -s /usr/include ${S}/ldap/include
+	fi
 
 	# Don't appear to need this anymore; as of pine-4.56
 	#epatch ${FILESDIR}/pine-4.40-boguswarning.patch
@@ -56,40 +57,41 @@ src_unpack() {
 
 	if [ -n "$DEBUGBUILD" ]; then
  		cd ${S}/pine
-		cp makefile.lnx makefile.orig
-		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \
-			< makefile.orig > makefile.lnx
+		sed -i \
+			-e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \
+			makefile.lnx || die "sed pine/makefile.lnx failed"
 		cd ${S}/pico
-		cp makefile.lnx makefile.orig
-		sed -e "s:-g -DDEBUG:${CFLAGS} -g -DDEBUG:" \
-			< makefile.orig > makefile.lnx
+		sed -i \
+			-e "s:-g -DDEBUG:${CFLAGS} -g -DDEBUG:" \
+			makefile.lnx || die "sed pico/makefile.lnx failed"
 	else
 		cd ${S}/pine
 		cp makefile.lnx makefile.orig
-		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS}:" \
-			< makefile.orig > makefile.lnx
+		sed -i \
+			-e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS}:" \
+			makefile.lnx || die "sed pine/makefile.lnx failed"
 		cd ${S}/pico
-		cp makefile.lnx makefile.orig
-		sed -e "s:-g -DDEBUG:${CFLAGS}:" makefile.orig > makefile.lnx
+		sed -i \
+			-e "s:-g -DDEBUG:${CFLAGS}:" \
+			makefile.lnx || die "sed pico/makefile.lnx failed"
 	fi
 	cd ${S}/pine/osdep
-	cp os-lnx.h os-lnx.h.orig
-	sed -e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \
-		< os-lnx.h.orig > os-lnx.h
+	sed -i \
+		-e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \
+		os-lnx.h || die "sed os-lnx.h failed"
 }
 
-src_compile() {                           
+src_compile() {
 	BUILDOPTS=""
-	if [ "`use ssl`" ] 
+	if [ "`use ssl`" ]
 	then
 		BUILDOPTS="${BUILDOPTS} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs"
 		cd ${S}/imap/src/osdep/unix
-		cp Makefile Makefile.orig
-		sed \
+		sed -i \
 			-e "s:\$(SSLDIR)/certs:/etc/ssl/certs:" \
 			-e "s:\$(SSLCERTS):/etc/ssl/certs:" \
 			-e "s:-I\$(SSLINCLUDE) ::" \
-			< Makefile.orig > Makefile
+			Makefile || die "sed Makefile failed"
 		cd ${S}
 	else
 		BUILDOPTS="${BUILDOPTS} NOSSL"
@@ -101,11 +103,11 @@ src_compile() {
 	else
 		BUILDOPTS="${BUILDOPTS} NOLDAP"
 	fi
-		
+
 	./build ${BUILDOPTS} lnp || die
 }
 
-src_install() {                               
+src_install() {
 	into /usr
 	dobin bin/pine bin/pico bin/pilot bin/mtest bin/rpdump bin/rpload
 
@@ -124,5 +126,5 @@ src_install() {
 	dodoc imap/docs/rfc/*.txt
 
 	docinto html/tech-notes
-	dodoc doc/tech-notes/*.html
+	dohtml -r doc/tech-notes/
 }