Include fix for news test failure

Package-Manager: portage-2.1.3.19

3 files changed, 35 insertions, 5 deletions

diff --git a/sys-apps/paludis/ChangeLog b/sys-apps/paludis/ChangeLog
index 382baa5787d9..56956875b674 100644
--- a/sys-apps/paludis/ChangeLog
+++ b/sys-apps/paludis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/paludis
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.83 2008/02/18 09:35:06 rbrown Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/paludis/ChangeLog,v 1.84 2008/02/18 13:58:56 rbrown Exp $
+
+  18 Feb 2008; Richard Brown <rbrown@gentoo.org>
+  files/paludis-0.26.0_alpha9-echo-functions.patch:
+  Include fix for news test failure
 
 *paludis-0.26.0_alpha9-r1 (18 Feb 2008)
 
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index f1ebe5de0c65..0d1adacee3f3 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,7 +1,7 @@
 AUX paludis-0.20.0-dotfiles.patch 438 RMD160 340dac9b5cea826c4b92b5482f86652f063d8ac4 SHA1 e296be80fe7ec14d42aab3e7e405d29973bde4cd SHA256 5163a2966a946dc431d3ad59d6af72cd1f2660fc150afa94c103d2c575fdfc73
 AUX paludis-0.26.0_alpha4-news_test.patch 2093 RMD160 8b9bcfacacf339806320b45146abaf65c0b82d1f SHA1 cb30e486f1066f05c4d6c5e33e81dc3ba6756392 SHA256 817bac01bfd325a113691bbb2d5c146dec4f7373754e951faa06240c2edf4762
 AUX paludis-0.26.0_alpha5-env.patch 563 RMD160 2dc537bc64797a4d1ba255b072d71b145d4dc7d9 SHA1 91f0e895147fc5bc5381ea5ae7c0cc5cb9103599 SHA256 59227c8b36522a0577fee13eeb0f08704d68b6c31304eb59fc2db83de7c6e177
-AUX paludis-0.26.0_alpha9-echo-functions.patch 906 RMD160 25558aec0c1e23c07df6cb1598cb5de3c659bdf1 SHA1 fef7900834af768a326eef7b7fdb7f763b16fa9f SHA256 3c2e09f1d7a0b26e8b84609b646847962a96fba94d8a979df958f5c0fb17f5fc
+AUX paludis-0.26.0_alpha9-echo-functions.patch 2337 RMD160 41e42deafe6191ed3557ba2a2d808bb36a9f8aa6 SHA1 2025331462b836e4823e9a0fd11c546548eab9bd SHA256 202e3cf95fb6a12791867f011d38f269b1647fd0739542aed6f3b9bdd0033415
 DIST paludis-0.24.1.tar.bz2 1400452 RMD160 dd1df850423a71d79ae9c660fbb9eed63aa23ef0 SHA1 0c0549db3d37f53e8b13f10bd50886c63f7231a1 SHA256 d41b179a73671bae09333ee0358f86ce678aa4d200a9ec401a3218d870456070
 DIST paludis-0.24.2.tar.bz2 1400236 RMD160 26128306b40b9318eff7a282ea1505646f4a32d8 SHA1 0e1778b1b33ff08132da1ba99c6145ccce057bf2 SHA256 ac4638b10e3967e593dcddf09e8931946a1b9ff43bd31a95e9e72d0b13d688ed
 DIST paludis-0.24.5.tar.bz2 1399916 RMD160 1134575f749105af9552eab3fe7fbb0ad08e4ee2 SHA1 896732075d96e71458773e6158d2f4326bffa53a SHA256 4b4de1d24858a0a78598a663818867644e54a271603ef8b35d7b2752b8852fdf
@@ -24,5 +24,5 @@ EBUILD paludis-0.26.0_alpha6.ebuild 4483 RMD160 313b8306065cb50b6de80b0d6584f254
 EBUILD paludis-0.26.0_alpha7.ebuild 4565 RMD160 44f80e81d87dffd4f4b5276321f8eb3e4e079ad2 SHA1 40aa5efda2f50c98f2c1b6efb33521f25fb829b0 SHA256 6dd72508e4462e4468d8d23d03a06950068dcaafdf5d2e1729e64c0b025a871d
 EBUILD paludis-0.26.0_alpha9-r1.ebuild 4649 RMD160 2c423fff74824e488bd4a0569d6a37d69dab5524 SHA1 001c521d99de70b88638a26669418380bd12271e SHA256 2a65fb8b9bc00797e22ed9288c3d3ff726c167a797daae0691ec8a456c11e0fd
 EBUILD paludis-0.26.0_alpha9.ebuild 4554 RMD160 163ebe9c7ad0dfed46d593a08dbf3e40ff53a4d8 SHA1 bc2bab40c060c56aff2215f5916e8561f9dcf667 SHA256 aa0ff4209c58bea880b6f05a289bd2f1d4353fc020bc7d3c9650b154fa5d1b6a
-MISC ChangeLog 12502 RMD160 90a7a0a900bb4009f50f9703bf18a7b9a6d6c391 SHA1 eff7db45415b2cd92e1f935a25f068d1dc024031 SHA256 070c0e48fba27458366e618c0e02389e094cb8baf04b1514e5bacd148cd241db
+MISC ChangeLog 12640 RMD160 eaabbf2e65a36d98843905e975285e84ac9c036a SHA1 df0edc3443eab09d5e6b50674f09927b08b4374f SHA256 774329a62d7d1c0ef4602bf10a1e7e5f3fe92b196310089f033df96fef7ac9c1
 MISC metadata.xml 215 RMD160 fb4e0ce6a8613f47d383fb90b2242c0349033c4e SHA1 4cb580ca79a377ee3cbba9c249a7ae4832523543 SHA256 d1571d1c377f5db0837eb017ced01a469f30b6ef9d4ba936d775b101ce7cb7f1
diff --git a/sys-apps/paludis/files/paludis-0.26.0_alpha9-echo-functions.patch b/sys-apps/paludis/files/paludis-0.26.0_alpha9-echo-functions.patch
index 2da9e1351aa1..43ec3177ffc6 100644
--- a/sys-apps/paludis/files/paludis-0.26.0_alpha9-echo-functions.patch
+++ b/sys-apps/paludis/files/paludis-0.26.0_alpha9-echo-functions.patch
@@ -1,7 +1,7 @@
 diff --git a/paludis/util/echo_functions.bash.in b/paludis/util/echo_functions.bash.in
 Source: written by David Leverton
-Upstream: probably by next release
-Reason: http://thread.gmane.org/gmane.linux.gentoo.user/194929
+Upstream: yes
+Reason: http://thread.gmane.org/gmane.linux.gentoo.user/194929 & news test failures
 index 3a15a77..9af0cf0 100644
 --- a/paludis/util/echo_functions.bash.in
 +++ b/paludis/util/echo_functions.bash.in
@@ -25,3 +25,29 @@ index 3a15a77..9af0cf0 100644
  
      return ${retval}
  }
+diff --git a/hooks/news_TEST b/hooks/news_TEST
+index 08d5a07..4b77cf8 100755
+--- a/hooks/news_TEST
++++ b/hooks/news_TEST
+@@ -23,8 +23,8 @@ news_none_TEST()
+     export HOOK=sync_all_post
+     export PALUDIS_HOME=`pwd`/news_TEST_dir/one
+ 
+-    bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post >/dev/null ; test_return_code
+-    bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post \
++    bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post 2>/dev/null ; test_return_code
++    bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post 2>&1 \
+         | grep "No unread news items found" >/dev/null ; test_return_code
+ }
+ 
+@@ -35,8 +35,8 @@ news_one_TEST()
+     export HOOK=sync_all_post
+     export PALUDIS_HOME=`pwd`/news_TEST_dir/two
+ 
+-    bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post >/dev/null ; test_return_code
+-    bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post \
++    bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post 2>/dev/null ; test_return_code
++    bash ${PALUDIS_HOOKER_DIR}/hooker.bash ${TOP_SRCDIR}/hooks/news.hook hook_run_sync_all_post 2>&1 \
+         | grep "You have 1 unread news item" >/dev/null ; test_return_code
+ }
+