(non-maintainer commit) version bump for bug #224807

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.28-rc6-wl-dirty x86_64

6 files changed, 132 insertions, 3 deletions

diff --git a/mail-client/nmh/ChangeLog b/mail-client/nmh/ChangeLog
index 32761a531fdb..892c90b69457 100644
--- a/mail-client/nmh/ChangeLog
+++ b/mail-client/nmh/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/nmh
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/ChangeLog,v 1.20 2007/02/08 13:08:44 flameeyes Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/ChangeLog,v 1.21 2008/12/05 01:51:31 darkside Exp $
+
+*nmh-1.3 (05 Dec 2008)
+
+  05 Dec 2008; Jeremy Olexa <darkside@gentoo.org>
+  +files/nmh-1.3-inc-login.patch, +files/nmh-1.3-install.patch,
+  +files/nmh-1.3-m_getfld.patch, +nmh-1.3.ebuild:
+  (non-maintainer commit) version bump for bug #224807
 
   08 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/mail-client/nmh/Manifest b/mail-client/nmh/Manifest
index 3bdf72e547f8..6f84d3ef3f02 100644
--- a/mail-client/nmh/Manifest
+++ b/mail-client/nmh/Manifest
@@ -5,10 +5,15 @@ AUX nmh-1.1-configure-vitest.patch 332 RMD160 5c378df3457a09bbd9397f7cdeb5a87e2c
 AUX nmh-1.1-inc-login.patch 552 RMD160 170404bd7e9baa74676c72c3e5b0cdd8fa19453f SHA1 79a30eadfd63f2b4fd9aeeac9c2f329769cfb26b SHA256 98abf15246e5afc969e3681f5a3501281cd7705561f3a4cd300c6b4f80c73830
 AUX nmh-1.1-install.patch 1077 RMD160 65ce0ed4cb946f2c30955a90c503ad1cbdc4a567 SHA1 63c0925f8d7249907f060b6a5ecbe92c5fd3bae2 SHA256 c5fa488cf9c46b10de1b8972141e67a5143ef8ec5d0f6340ab71cbddc1b37453
 AUX nmh-1.1-m_getfld.patch 571 RMD160 45813d23f8c9fefe0e5fc3e1789f100d5b2a4648 SHA1 066b553da2d6f4d9d79198f7ed80de1093e6a8d1 SHA256 5f38d9feebbe8ebbf53d9b3fdf1fa6c0b8da914f5721206e4a49a6875fe0d989
+AUX nmh-1.3-inc-login.patch 625 RMD160 e5f6edd8fd49c3baff074aeab949401a9580c48e SHA1 3ddc61705f2bb9f75e5cba9d721ac6d743305367 SHA256 83015653f6b21241285a0c36c496bb42d188005a09caf8363e73683b6d0d543a
+AUX nmh-1.3-install.patch 493 RMD160 265cc0038b1c0e5586c4e1169b4ff8e4b00ed407 SHA1 66083fe3241ad40e17512c1f18e7535838054aa5 SHA256 8477686bdf9675c096e034f7d2a9812b06d30d50e3a59f72df5b01d37853d278
+AUX nmh-1.3-m_getfld.patch 627 RMD160 d47738a9f1c3f99350ff9433201ade5b9713307a SHA1 274495b527598904f307954c7ab42f881fd692d4 SHA256 5ef443b0d0ad3de47d3ee96abdd82479f1efa01fd2820ca77680705cc6e93889
 DIST nmh-1.0.4.tar.gz 683215 RMD160 32f0a0cb7aa76f7d7efc59d99b6e5aeeea519037 SHA1 71441a884d898db2fd9184a92e663682536425f5 SHA256 828de9461f5fc6dd70eab2db20f95761f66351ea91425c0d3fd4e96cbda3a350
 DIST nmh-1.1.tar.gz 808466 RMD160 20127d220b6de6531ff772bd03fec09a284a1b4c SHA1 3f906fcc48aa299c9a78f88679df963fcbeb121e SHA256 a0709e88188623e0ca7ff81a96836578ad617d42a9fa32aeda8ea47f0bac8967
+DIST nmh-1.3.tar.gz 847614 RMD160 a862789cc8edb28c0fc3295bd12787440797da92 SHA1 65b52b7db727c391cae7af60ee0b888cbdc2718a SHA256 9f16848424489b5a9f7c1402c87665dc56dcadecf6e5c44fb608aef0d1b03b47
 EBUILD nmh-1.0.4-r3.ebuild 1391 RMD160 60e152a15777556d21c0ba955ed2147b4473ee49 SHA1 650c12e36fd6a74015d0c3b5cd46bb9f90cf591f SHA256 271d46a4010fe11335fa9643d628454e1e29ad709c6f56131251adacd3378bae
 EBUILD nmh-1.1-r1.ebuild 1664 RMD160 e57fca84a55cfebc3d00c880da84d7871395af97 SHA1 9053d72ddf65b1cf9ce07db21cd4bb93e5aa8ee0 SHA256 a86c27aba6b9f374abb52c367f89ecfa8b78ecd067776c70535326137bab1127
 EBUILD nmh-1.1.ebuild 1525 RMD160 0f3f58eea24db82a82d6fd9cdb6916791d2bd2bd SHA1 5a45dc6a5bf2caa5942aee8312a244ecd9b1b562 SHA256 8f26feffda340ac671f2feda949eec0b104a264d67178354532e31d87b16a790
-MISC ChangeLog 3469 RMD160 b5a03e5cbf3a1705eca2c0d747562642eec9b668 SHA1 4dd246fd5c5df60c74e9e173a930131c70c3a2d8 SHA256 cb29f19f665cff86a86cd7cfadeb089c3a032189018469fc920503435293db73
+EBUILD nmh-1.3.ebuild 1417 RMD160 281cd8b4666dceb892f19325bfde7f03c0b3aa0c SHA1 698ca27b1652ca9f786cbcb8047ad6791234adb6 SHA256 adabfee1f3570b57e7a88648bcaaca50e37258df27fff06ae1d27798ccc6c5ce
+MISC ChangeLog 3712 RMD160 b993501335cd2864e64a66d3945b11f27c1bc77b SHA1 24f0276ac9f5ee120043176ff6d92765364b27d4 SHA256 4edef5d3efb3c9ba51896de9dc4bd1143fc716cfecc5e643799483bfce232929
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
diff --git a/mail-client/nmh/files/nmh-1.3-inc-login.patch b/mail-client/nmh/files/nmh-1.3-inc-login.patch
new file mode 100644
index 000000000000..f1a4f1c513ca
--- /dev/null
+++ b/mail-client/nmh/files/nmh-1.3-inc-login.patch
@@ -0,0 +1,25 @@
+--- nmh-1.3/uip/inc.c.~1~	2007-11-04 03:54:34.000000000 -0800
++++ nmh-1.3/uip/inc.c	2008-11-28 10:24:03.044265843 -0800
+@@ -496,8 +496,7 @@ main (int argc, char **argv)
+      * a POP server?
+      */
+     if (inc_type == INC_POP) {
+-	if (user == NULL)
+-	    user = getusername ();
++
+ 	if ( strcmp( POPSERVICE, "kpop" ) == 0 ) {
+ 	    kpop = 1;
+ 	}
+@@ -506,6 +505,12 @@ main (int argc, char **argv)
+ 	else
+ 	    ruserpass (host, &user, &pass);
+ 
++	/* 
++	 * Do this _after_ ruserpass, otherwise the login field will be unusable
++	 */
++	if (user == NULL)
++	    user = getusername ();
++
+ 	/*
+ 	 * initialize POP connection
+ 	 */
diff --git a/mail-client/nmh/files/nmh-1.3-install.patch b/mail-client/nmh/files/nmh-1.3-install.patch
new file mode 100644
index 000000000000..370455caf71a
--- /dev/null
+++ b/mail-client/nmh/files/nmh-1.3-install.patch
@@ -0,0 +1,10 @@
+--- nmh-1.3/uip/Makefile.in.~1~	2005-12-24 09:17:38.000000000 -0800
++++ nmh-1.3/uip/Makefile.in	2008-11-28 10:50:48.613075060 -0800
+@@ -267,7 +267,6 @@ install-lcmds:
+ 	rm -f $(DESTDIR)$(bindir)/folders
+ 	rm -f $(DESTDIR)$(bindir)/prev
+ 	rm -f $(DESTDIR)$(bindir)/next
+-	rm -f $(DESTDIR)$(libdir)/install-mh
+ 	$(LN) $(DESTDIR)$(bindir)/flist  $(DESTDIR)$(bindir)/flists
+ 	$(LN) $(DESTDIR)$(bindir)/folder $(DESTDIR)$(bindir)/folders
+ 	$(LN) $(DESTDIR)$(bindir)/show   $(DESTDIR)$(bindir)/prev
diff --git a/mail-client/nmh/files/nmh-1.3-m_getfld.patch b/mail-client/nmh/files/nmh-1.3-m_getfld.patch
new file mode 100644
index 000000000000..b99f480db74a
--- /dev/null
+++ b/mail-client/nmh/files/nmh-1.3-m_getfld.patch
@@ -0,0 +1,27 @@
+--- nmh-1.3/sbr/m_getfld.c.~1~	2008-04-05 11:41:37.000000000 -0700
++++ nmh-1.3/sbr/m_getfld.c	2008-11-28 10:25:34.768265994 -0800
+@@ -731,18 +731,18 @@ matchc(int patln, char *pat, int strln, 
+ 	register char *ep = pat + patln;
+ 	register char pc = *pat++;
+ 
+-	for(;;) {
+-		while (pc != *str++)
+-			if (str > es)
+-				return 0;
++	for(;str <= es; str++) {
++		if (pc != *str)
++			continue;
+ 		if (str > es+1)
+ 			return 0;
+-		sp = str; pp = pat;
++		sp = str+1; pp = pat;
+ 		while (pp < ep && *sp++ == *pp)
+ 			pp++;
+ 		if (pp >= ep) 
+-			return ((unsigned char *)--str);
++			return ((unsigned char *)str);
+ 	}
++	return 0;
+ }
+ 
+ 
diff --git a/mail-client/nmh/nmh-1.3.ebuild b/mail-client/nmh/nmh-1.3.ebuild
new file mode 100644
index 000000000000..e113d7454d20
--- /dev/null
+++ b/mail-client/nmh/nmh-1.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/nmh-1.3.ebuild,v 1.1 2008/12/05 01:51:31 darkside Exp $
+
+inherit eutils
+DESCRIPTION="New MH mail reader"
+SRC_URI="http://savannah.nongnu.org/download/nmh/${P}.tar.gz"
+HOMEPAGE="http://www.nongnu.org/nmh/"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc
+	|| ( sys-libs/gdbm =sys-libs/db-1.85* )
+	>=sys-libs/ncurses-5.2"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Patches from bug #22173.
+	epatch "${FILESDIR}"/${P}-inc-login.patch
+	epatch "${FILESDIR}"/${P}-install.patch
+	# bug #57886
+	epatch "${FILESDIR}"/${P}-m_getfld.patch
+}
+
+src_compile() {
+	[ -z "${EDITOR}" ] && export EDITOR="prompter"
+	[ -z "${PAGER}" ] && export PAGER="/usr/bin/more"
+
+	# Redefining libdir to be bindir so the support binaries get installed
+	# correctly.  Since no libraries are installed with nmh, this does not
+	# pose a problem at this time.
+	econf \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--with-editor=${EDITOR} \
+		--with-pager=${PAGER} \
+		--enable-nmh-pop \
+		--sysconfdir=/etc/nmh \
+		--libdir=/usr/bin \
+		|| die
+	emake -j1 || die
+}
+
+src_install() {
+	emake -j1 prefix="${D}"/usr \
+		mandir="${D}"/usr/share/man \
+		libdir="${D}"/usr/bin \
+		etcdir="${D}"/etc/nmh install || die
+	dodoc ChangeLog DATE MACHINES README 
+}