Add patch to fix issue reported in #161855.

Package-Manager: portage-2.1.4

5 files changed, 76 insertions, 25 deletions

diff --git a/net-mail/mhonarc/ChangeLog b/net-mail/mhonarc/ChangeLog
index 0570582cf309..524ac80583b4 100644
--- a/net-mail/mhonarc/ChangeLog
+++ b/net-mail/mhonarc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/mhonarc
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/ChangeLog,v 1.12 2007/07/02 14:56:07 peper Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/ChangeLog,v 1.13 2008/01/27 06:05:16 kumba Exp $
+
+*mhonarc-2.6.16-r1 (27 Jan 2008)
+
+  27 Jan 2008; Joshua Kinard <kumba@gentoo.org>
+  +files/mhonarc-2.6.16-list-output-order.patch, -mhonarc-2.6.16.ebuild,
+  +mhonarc-2.6.16-r1.ebuild:
+  Add patch to fix issue reported in #161855.
 
   02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> mhonarc-2.6.10.ebuild,
   mhonarc-2.6.11.ebuild, mhonarc-2.6.15.ebuild, mhonarc-2.6.16.ebuild:
diff --git a/net-mail/mhonarc/Manifest b/net-mail/mhonarc/Manifest
index bda7507d1833..351295f4cb41 100644
--- a/net-mail/mhonarc/Manifest
+++ b/net-mail/mhonarc/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX mhonarc-2.6.16-list-output-order.patch 1430 RMD160 b8c28140e30fc78e69942d0a49d9bc1cd19e6eef SHA1 866a17bfde975a905cda2787417f6f8db651cf80 SHA256 91b1661bc495fef894832c739dec533231e0fe0376fc20e94d4d9aade7cd486f
+MD5 de30a18d80193c48fe4ba55a3042195c files/mhonarc-2.6.16-list-output-order.patch 1430
+RMD160 b8c28140e30fc78e69942d0a49d9bc1cd19e6eef files/mhonarc-2.6.16-list-output-order.patch 1430
+SHA256 91b1661bc495fef894832c739dec533231e0fe0376fc20e94d4d9aade7cd486f files/mhonarc-2.6.16-list-output-order.patch 1430
 DIST MHonArc-2.6.10.tar.bz2 1549518 RMD160 333f70793bb0a88bf42ee3e414a6950754a3f652 SHA1 1b60a95d801927646a4b5fb68413388da87bb179 SHA256 29da209926d0f5583b1d73873d5eae8dbb03b0fae636602f85df25bfaf233b6f
 DIST MHonArc-2.6.11.tar.bz2 1552360 RMD160 abd5d3c70a1a7e617e9dd66b2d0b6d7531405125 SHA1 b01a1466dd3126b365dbe8a3e0869cdc4e3e4059 SHA256 cda2035a19501c08b7dba044053aa02433fa9d2b23f36143f933c319c076089c
 DIST MHonArc-2.6.15.tar.bz2 1564765 RMD160 f17355213254ca9ff0ab71b961e74ec88892906c SHA1 655abad903411586ddd7275c816f8ce1f9c18a5e SHA256 dc9ff2bb7dcb6e0d81853cb252738bc6e711b7702a23fd3d65658396fdd9ff38
@@ -17,14 +18,14 @@ EBUILD mhonarc-2.6.15.ebuild 621 RMD160 f394441e4109b8e4751b26409e025e5d1ad8d740
 MD5 70b6bcf26283ec07a8632ddca164a43c mhonarc-2.6.15.ebuild 621
 RMD160 f394441e4109b8e4751b26409e025e5d1ad8d740 mhonarc-2.6.15.ebuild 621
 SHA256 2701e7c260ea4371bf441d245d25078703308f90dcb6fed824fc4ccf92f5fee4 mhonarc-2.6.15.ebuild 621
-EBUILD mhonarc-2.6.16.ebuild 621 RMD160 2b4bc0af70e7f3d75f3c62f6265b7076be9b7111 SHA1 a1b745c2faf59f4e254bec336542e9808110b891 SHA256 d52fad089bce97c9c51cc6a140b9f299c5d19f9f3e2c5a0c3c8c486b1ab9d4b5
-MD5 d10e6ce69d57e18b2ab42b52aa8df0ad mhonarc-2.6.16.ebuild 621
-RMD160 2b4bc0af70e7f3d75f3c62f6265b7076be9b7111 mhonarc-2.6.16.ebuild 621
-SHA256 d52fad089bce97c9c51cc6a140b9f299c5d19f9f3e2c5a0c3c8c486b1ab9d4b5 mhonarc-2.6.16.ebuild 621
-MISC ChangeLog 2065 RMD160 7aa37dd13710897dfff706dd7e15cf5cc03db9f8 SHA1 9b6b7e2e21bdd7fac5f3dfa88e9bbd9a71f91dc3 SHA256 fb16614b6b9219eebf82210aa6cb69e1bae18354f80d2dadb7e3a40b02144336
-MD5 d1a0eb11a7a219cc11ad98ee053ecab7 ChangeLog 2065
-RMD160 7aa37dd13710897dfff706dd7e15cf5cc03db9f8 ChangeLog 2065
-SHA256 fb16614b6b9219eebf82210aa6cb69e1bae18354f80d2dadb7e3a40b02144336 ChangeLog 2065
+EBUILD mhonarc-2.6.16-r1.ebuild 708 RMD160 621934b60d4fbc0102ff3fadbf78e16df3174ee8 SHA1 8989e3530af9daac305867ec907dbf9cbfcf722a SHA256 bf409d06249e15431a461e8401ced237805f56754f268bcbebb399b2d7ee75a2
+MD5 c8d07a019891b856351614be4a327299 mhonarc-2.6.16-r1.ebuild 708
+RMD160 621934b60d4fbc0102ff3fadbf78e16df3174ee8 mhonarc-2.6.16-r1.ebuild 708
+SHA256 bf409d06249e15431a461e8401ced237805f56754f268bcbebb399b2d7ee75a2 mhonarc-2.6.16-r1.ebuild 708
+MISC ChangeLog 2296 RMD160 acaafd7c18b7e09896838fbe5c8bab96fffd119a SHA1 b0b0f6883d4f21a501fae970dd1e437150c80d36 SHA256 962150482ff9ccf213af80ab5fdac1a81a7749c976bd3afc72b9509273064db5
+MD5 09b88979ef8f7224ba8299cc4634f6d7 ChangeLog 2296
+RMD160 acaafd7c18b7e09896838fbe5c8bab96fffd119a ChangeLog 2296
+SHA256 962150482ff9ccf213af80ab5fdac1a81a7749c976bd3afc72b9509273064db5 ChangeLog 2296
 MISC metadata.xml 462 RMD160 d7d662c6e746971d65dd32c47e50dfe15024fe2f SHA1 b02f8bb767c7d91cbf393a0f2d589f7e26437e4a SHA256 2254dc26bf4d79171851fda9135b8c767a934b88a85f1d5afe7f43e73185c6b2
 MD5 fa2c809eee927aea1a6d0607c3a9551c metadata.xml 462
 RMD160 d7d662c6e746971d65dd32c47e50dfe15024fe2f metadata.xml 462
@@ -38,13 +39,6 @@ SHA256 448cdbfc6e3c5316a3d3cbde5697d92842d7c065d1e067421af14d6aa0cae223 files/di
 MD5 45b0e8d3fe82b79705777dc017a2f7cc files/digest-mhonarc-2.6.15 250
 RMD160 d88dc7b17908cbc1647d4566180a10d38181ce6a files/digest-mhonarc-2.6.15 250
 SHA256 6d87d7cb1f35e52bc5fe92f792d9f6dff5b04e6cc7a2a8c16e4390c180b37d16 files/digest-mhonarc-2.6.15 250
-MD5 acead148520a348426774bbdd9dc1a70 files/digest-mhonarc-2.6.16 250
-RMD160 6499e11c09a581dc48ef1e96a0741946806eaccb files/digest-mhonarc-2.6.16 250
-SHA256 5233d873add393b2e143833d8bb6e6d2060eb8204a950b867e28dbb637dd79a9 files/digest-mhonarc-2.6.16 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGiRIJppoStNGKGywRArjKAKDEn8udyDiXjkYQEpe/vpNx3vksCwCggx2j
-38psbJjRBvvYHa8WnGXXM8w=
-=Miyh
------END PGP SIGNATURE-----
+MD5 acead148520a348426774bbdd9dc1a70 files/digest-mhonarc-2.6.16-r1 250
+RMD160 6499e11c09a581dc48ef1e96a0741946806eaccb files/digest-mhonarc-2.6.16-r1 250
+SHA256 5233d873add393b2e143833d8bb6e6d2060eb8204a950b867e28dbb637dd79a9 files/digest-mhonarc-2.6.16-r1 250
diff --git a/net-mail/mhonarc/files/digest-mhonarc-2.6.16 b/net-mail/mhonarc/files/digest-mhonarc-2.6.16-r1
index 1a9dae965806..1a9dae965806 100644
--- a/net-mail/mhonarc/files/digest-mhonarc-2.6.16
+++ b/net-mail/mhonarc/files/digest-mhonarc-2.6.16-r1
diff --git a/net-mail/mhonarc/files/mhonarc-2.6.16-list-output-order.patch b/net-mail/mhonarc/files/mhonarc-2.6.16-list-output-order.patch
new file mode 100644
index 000000000000..de4b7a56a274
--- /dev/null
+++ b/net-mail/mhonarc/files/mhonarc-2.6.16-list-output-order.patch
@@ -0,0 +1,45 @@
+--- MHonArc-2.6.16/lib/mhthread.pl.orig	2006-09-08 20:46:48.000000000 -0700
++++ MHonArc-2.6.16/lib/mhthread.pl	2006-09-08 20:47:14.000000000 -0700
+@@ -406,22 +406,22 @@
+     ## Decrement level count if their were replies
+     --$level  if ($haverepls);
+ 
++    ## Close entry text
++    if ($attop) {
++	&print_thread_var($handle, $idx, \$TTOPEND);
++    } elsif (!$single && !$didtliend) {
++	&print_thread_var($handle, $idx, \$TLIEND);
++    }
++    
+     ## Check for missing messages
+     if ($DoMissingMsgs && !($attop || $single)) {
+ 	for ($i=$depth; $i > 0; --$i) {
+-	    &print_thread_var($handle, $idx, \$TLINONEEND);
+ 	    &print_thread_var($handle, $idx, \$TSUBLISTEND)
+ 		if $level <= $TLEVELS;
++	    &print_thread_var($handle, $idx, \$TLINONEEND);
+ 	    --$level;
+ 	}
+     }
+-
+-    ## Close entry text
+-    if ($attop) {
+-	&print_thread_var($handle, $idx, \$TTOPEND);
+-    } elsif (!$single && !$didtliend) {
+-	&print_thread_var($handle, $idx, \$TLIEND);
+-    }
+ }
+ 
+ ##---------------------------------------------------------------------------
+@@ -636,9 +636,9 @@
+     ## Check for missing messages
+     if ($DoMissingMsgs && !($attop || $single)) {
+ 	for ($i = $depth; $i > 0; $i--) {
+-	    $ret .= &expand_thread_var($idx, \$TSLICELINONEEND);
+ 	    $ret .= &expand_thread_var($idx, \$TSLICESUBLISTEND)
+ 		if $level <= $TSLICELEVELS;
++	    $ret .= &expand_thread_var($idx, \$TSLICELINONEEND);
+ 	    $level--;
+ 	}
+     }
+
diff --git a/net-mail/mhonarc/mhonarc-2.6.16.ebuild b/net-mail/mhonarc/mhonarc-2.6.16-r1.ebuild
index 8b79c8beb752..5482972a1139 100644
--- a/net-mail/mhonarc/mhonarc-2.6.16.ebuild
+++ b/net-mail/mhonarc/mhonarc-2.6.16-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/mhonarc-2.6.16.ebuild,v 1.2 2007/07/02 14:56:07 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/mhonarc-2.6.16-r1.ebuild,v 1.1 2008/01/27 06:05:16 kumba Exp $
 
 inherit perl-app
 
@@ -18,6 +18,11 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~amd64"
 
 S="${WORKDIR}/${P/mhonarc/MHonArc}"
 
+src_unpack() {
+	unpack "${A}"
+	epatch "${FILESDIR}"/${P}-list-output-order.patch
+}
+
 src_install() {
 	sed -e "s|-prefix |-prefix ${D}|g" -i Makefile
 	perl-module_src_install