Added docs and config file to fix bug #30959, tidied up ebuilds

7 files changed, 152 insertions, 8 deletions

diff --git a/mail-client/exmh/ChangeLog b/mail-client/exmh/ChangeLog
index 2fa68da54c64..d47b6945d207 100644
--- a/mail-client/exmh/ChangeLog
+++ b/mail-client/exmh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/exmh
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/ChangeLog,v 1.4 2004/07/17 22:08:37 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/ChangeLog,v 1.5 2004/08/08 11:24:42 tomk Exp $
+
+*exmh-2.6.3-r1 (08 Aug 2004)
+
+  08 Aug 2004; Tom Knight <tomk@gentoo.org> +exmh-2.5-r1.ebuild,
+  exmh-2.5.ebuild, +exmh-2.6.3-r1.ebuild:
+  Added docs and config file to fix bug #30959, tidied up ebuilds
 
   03 Jun 2004; David Holm <dholm@gentoo.org> exmh-2.6.3.ebuild:
   Added to ~ppc.
diff --git a/mail-client/exmh/Manifest b/mail-client/exmh/Manifest
index 6ed66b575465..0a2670aad31d 100644
--- a/mail-client/exmh/Manifest
+++ b/mail-client/exmh/Manifest
@@ -1,8 +1,12 @@
-MD5 32c83ba8d5740758240e1208255ab4f9 exmh-2.5.ebuild 1280
+MD5 ebfdc457ae3ce5d864d0e2a5d2e0d73d exmh-2.5-r1.ebuild 1346
+MD5 a25528a36f120f98c9c4ed2746fa092e exmh-2.5.ebuild 1269
+MD5 b5363592f466b959c7e78bf35c11dff2 exmh-2.6.3-r1.ebuild 1394
 MD5 fb6d4bd81fe16e8527b9f96d14174b0d exmh-2.6.3.ebuild 1291
-MD5 cf4877fc9e369e93fc93b203d57ecbcc ChangeLog 1444
+MD5 4d79a30ab35a7718abf149ef0db32cf9 ChangeLog 1648
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 37e66dfd152725e587a2ac03b0cc505e files/exmh-2.6.3-conf.patch 2876
+MD5 3a53f493fcbb3584e5425aeeaac9d983 files/digest-exmh-2.5-r1 60
 MD5 3a53f493fcbb3584e5425aeeaac9d983 files/digest-exmh-2.5 60
+MD5 fa868a8e004f8b256d8891a396de40bd files/digest-exmh-2.6.3-r1 62
 MD5 8106e98e35ec1d7d72054893d4a2a543 files/exmh-2.5-conf.patch 3161
 MD5 fa868a8e004f8b256d8891a396de40bd files/digest-exmh-2.6.3 62
diff --git a/mail-client/exmh/exmh-2.5-r1.ebuild b/mail-client/exmh/exmh-2.5-r1.ebuild
new file mode 100644
index 000000000000..47ac4e91cd84
--- /dev/null
+++ b/mail-client/exmh/exmh-2.5-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/exmh-2.5-r1.ebuild,v 1.1 2004/08/08 11:24:42 tomk Exp $
+
+inherit eutils
+DESCRIPTION="An X user interface for MH mail"
+SRC_URI="ftp://ftp.scriptics.com/pub/tcl/${PN}/${P}.tar.gz"
+HOMEPAGE="http://beedub.com/exmh/"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~sparc"
+IUSE="crypt"
+
+DEPEND="mail-client/nmh
+	dev-tcltk/expect
+	net-mail/mailbase
+	net-mail/metamail
+	crypt? ( app-crypt/gnupg )
+	>=dev-lang/tcl-8.2
+	>=dev-lang/tk-8.2"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	for i in *.MASTER; do cp $i ${i%%.MASTER}; done
+	mv exmh.l exmh.1
+	epatch ${FILESDIR}/exmh-2.5-conf.patch
+	cd misc
+	rm -rf RPM *tar* *gbuffy*
+	for i in *
+	do
+		mv $i $i.orig
+		sed -e "s:/usr/local/bin:/usr/bin:" $i.orig > $i
+		mv $i $i.orig
+		sed -e "s:/usr/local/nmh/bin:/usr/bin:" $i.orig > $i
+		mv $i $i.orig
+		sed -e "s:/usr/local/nmh/lib:/usr/bin:" $i.orig > $i
+		rm $i.orig
+	done
+}
+
+src_compile() {
+	echo 'auto_mkindex ./lib *.tcl' | tclsh
+}
+
+src_install() {
+	into /usr
+	dobin exmh exmh-bg exmh-async ftp.expect
+
+	doman exmh.1
+
+	dodoc COPYRIGHT exmh.CHANGES exmh.README misc/*
+
+	insinto /usr/lib/${P}
+	doins lib/*
+
+	insinto /usr/lib/${P}/bitmaps
+	doins lib/bitmaps/*
+
+	insinto /usr/lib/${P}/html
+	doins lib/html/*
+}
diff --git a/mail-client/exmh/exmh-2.5.ebuild b/mail-client/exmh/exmh-2.5.ebuild
index 7ced864ec621..0723baf76e89 100644
--- a/mail-client/exmh/exmh-2.5.ebuild
+++ b/mail-client/exmh/exmh-2.5.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/exmh-2.5.ebuild,v 1.3 2004/06/24 22:15:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/exmh-2.5.ebuild,v 1.4 2004/08/08 11:24:42 tomk Exp $
 
+inherit eutils
 DESCRIPTION="An X user interface for MH mail"
-SRC_URI="ftp://ftp.scriptics.com/pub/tcl/${PN}/${PN}-${PV}.tar.gz"
+SRC_URI="ftp://ftp.scriptics.com/pub/tcl/${PN}/${P}.tar.gz"
 HOMEPAGE="http://beedub.com/exmh/"
 
 SLOT="0"
@@ -25,7 +26,7 @@ src_unpack() {
 	cd ${S}
 	for i in *.MASTER; do cp $i ${i%%.MASTER}; done
 	mv exmh.l exmh.1
-	patch -p1 < ${FILESDIR}/exmh-2.5-conf.patch
+	epatch ${FILESDIR}/exmh-2.5-conf.patch
 	cd misc
 	rm -rf RPM *tar* *gbuffy*
 	for i in *
@@ -52,6 +53,6 @@ src_install() {
 
 	dodoc COPYRIGHT exmh.CHANGES exmh.README misc/*
 
-	dodir /usr/lib/${PN}-${PV}
-	install -m 644 lib/* ${D}/usr/lib/${PN}-${PV}
+	dodir /usr/lib/${P}
+	install -m 644 lib/* ${D}/usr/lib/${P}
 }
diff --git a/mail-client/exmh/exmh-2.6.3-r1.ebuild b/mail-client/exmh/exmh-2.6.3-r1.ebuild
new file mode 100644
index 000000000000..4ddd27f73eb2
--- /dev/null
+++ b/mail-client/exmh/exmh-2.6.3-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/exmh-2.6.3-r1.ebuild,v 1.1 2004/08/08 11:24:42 tomk Exp $
+
+inherit eutils
+DESCRIPTION="An X user interface for MH mail"
+SRC_URI="ftp://ftp.scriptics.com/pub/tcl/${PN}/${P}.tar.gz"
+HOMEPAGE="http://beedub.com/exmh/"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~sparc ~ppc"
+IUSE="crypt"
+
+DEPEND="mail-client/nmh
+	dev-tcltk/expect
+	net-mail/mailbase
+	net-mail/metamail
+	crypt? ( app-crypt/gnupg )
+	>=dev-lang/tcl-8.2
+	>=dev-lang/tk-8.2"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	for i in *.MASTER; do cp $i ${i%%.MASTER}; done
+	mv exmh.l exmh.1
+	epatch ${FILESDIR}/exmh-2.6.3-conf.patch
+	cd misc
+	rm -rf RPM *tar* *gbuffy*
+	for i in *
+	do
+		mv $i $i.orig
+		sed -e "s:/usr/local/bin:/usr/bin:" $i.orig > $i
+		mv $i $i.orig
+		sed -e "s:/usr/local/nmh/bin:/usr/bin:" $i.orig > $i
+		mv $i $i.orig
+		sed -e "s:/usr/local/nmh/lib:/usr/bin:" $i.orig > $i
+		rm $i.orig
+	done
+}
+
+src_compile() {
+	echo 'auto_mkindex ./lib *.tcl' | tclsh
+}
+
+src_install() {
+	into /usr
+	dobin exmh exmh-bg exmh-async ftp.expect
+
+	doman exmh.1
+
+	dodoc COPYRIGHT exmh.CHANGES exmh.README misc/*
+
+	insinto /usr/lib/${P}
+	doins lib/*
+
+	insinto /usr/lib/${P}/bitmaps
+	doins lib/bitmaps/*
+
+	insinto /usr/lib/${P}/html
+	doins lib/html/*
+
+	insinto /etc
+	doins gentoo/exmh.conf
+}
diff --git a/mail-client/exmh/files/digest-exmh-2.5-r1 b/mail-client/exmh/files/digest-exmh-2.5-r1
new file mode 100644
index 000000000000..e446e10639f8
--- /dev/null
+++ b/mail-client/exmh/files/digest-exmh-2.5-r1
@@ -0,0 +1 @@
+MD5 f40c3cebfe9102d66ec27a9098b4717e exmh-2.5.tar.gz 867121
diff --git a/mail-client/exmh/files/digest-exmh-2.6.3-r1 b/mail-client/exmh/files/digest-exmh-2.6.3-r1
new file mode 100644
index 000000000000..c8f61e2a8714
--- /dev/null
+++ b/mail-client/exmh/files/digest-exmh-2.6.3-r1
@@ -0,0 +1 @@
+MD5 5b04d70b7f827f4e520d8b68b28b3efe exmh-2.6.3.tar.gz 910556