Fixed tenshi-0.10-warn-logfile.patch to not error if there are fifos set (Fixes

bug #250403).  Now installing documentation in the correct place (Fixes bug
Package-Manager: portage-2.1.6.1/cvs/Linux 2.6.25-gentoo-r6-grey01 x86_64

4 files changed, 18 insertions, 8 deletions

diff --git a/app-admin/tenshi/ChangeLog b/app-admin/tenshi/ChangeLog
index e9c2d12280fe..407689c31f6a 100644
--- a/app-admin/tenshi/ChangeLog
+++ b/app-admin/tenshi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/tenshi
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/ChangeLog,v 1.54 2008/12/02 20:46:54 hncaldwell Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/ChangeLog,v 1.55 2008/12/17 20:34:56 hncaldwell Exp $
+
+  17 Dec 2008; Heath Caldwell <hncaldwell@gentoo.org>
+  files/tenshi-0.10-warn-logfile.patch, tenshi-0.10-r3.ebuild:
+  Fixed tenshi-0.10-warn-logfile.patch to not error if there are fifos set
+  (Fixes bug #250403). Documentation location fix (Fixes bug #241254).
 
 *tenshi-0.10-r3 (02 Dec 2008)
 
diff --git a/app-admin/tenshi/Manifest b/app-admin/tenshi/Manifest
index acca64904b43..c5b9fd1103c4 100644
--- a/app-admin/tenshi/Manifest
+++ b/app-admin/tenshi/Manifest
@@ -1,5 +1,5 @@
 AUX tenshi-0.10-solo-queue-escalation.patch 2718 RMD160 09596060e363b7768e697189de48ac8709978b3f SHA1 8bced32ab5b0b8721db86e337fda5729e7a8f437 SHA256 2300e136a72592d7f5cf808100fa6330b1de72731820cb88de3dac563d734d2d
-AUX tenshi-0.10-warn-logfile.patch 1130 RMD160 8399954ec96bc5c6f094cf5c22f0f1a9de07d468 SHA1 d57607195de93defc93604117efb3c5e9c9a60de SHA256 48d111974badd120fd49a5007200fd20c190ad5c18b894bdb46903ff8917e626
+AUX tenshi-0.10-warn-logfile.patch 1158 RMD160 1c990e88a52351089021b992c9ede058297a3fbf SHA1 caedb2caa29722b7d75af655cda24bf6a9810975 SHA256 8701a96c3a9550d35dd1240fda2a00152dea2f8c8408b6c6da3233c5020433d7
 AUX tenshi-0.9.1-fix-tail_pids-array-length.patch 347 RMD160 93f1fa02d9ba83fc3f8b1731f75c31e97f47cc25 SHA1 1c25737f2e90d1de6a5e610186cae6239f3efb99 SHA256 305af10bb0ae54501e6ee993b83b8deda8ce5833cd7ff07eb7187872a688ad77
 AUX tenshi-create-mandir.patch 473 RMD160 69e20a5eb6765b550bd8a5a0b713ee616796c71a SHA1 82a3e8f765e1a30271cd77425f13a81e807745e8 SHA256 03116f30486a2e03bab10897d87a0bc60e868b12c3a5d0f861bbdfe6bff73318
 AUX tenshi-openrc-init.patch 473 RMD160 538c340dfbf7280166fe99c5dfa3995d7fa38ea6 SHA1 979f1557301e38499932b7147853a9a8a58915b3 SHA256 f657ba4dfcfd80f5acce1d77caf88006ba5e60e9fa5762085caf91326185a47a
@@ -8,8 +8,8 @@ DIST tenshi-0.10.tar.gz 26131 RMD160 27a3dc2e0fc7e6790497ddfa0dc6bd85cafd7316 SH
 DIST tenshi-0.9.1.tar.gz 25845 RMD160 c4ab3df0b74c02f5beaef821771f9aeb385b9d7e SHA1 a3acc4bbbd813fadbcb59698c95710fe87cb7b6a SHA256 64e1f51e6dacc0a2d6a8e34bcdc18ef271f69110a1da8921e98c557f4c071dba
 EBUILD tenshi-0.10-r1.ebuild 1005 RMD160 4e1bf81e698fcfe6494be41ad99f07cdcf9537a6 SHA1 e142b4b22246176fe30811f1934df7f49bae3b6b SHA256 318b4b0ada7814f9f040d737263fe4ba662453b34f942128a46200b94faeceaf
 EBUILD tenshi-0.10-r2.ebuild 1084 RMD160 1486ea4063cb517c9d97e3eee19e557b098c30cf SHA1 02b685750fcdc978bd05e17cda4ae27516412b3d SHA256 b3e9e2b67471b440892c87369127d81a926b54655db23d8298a2faa96c0e1fb1
-EBUILD tenshi-0.10-r3.ebuild 1228 RMD160 ab265a7f47e283f0625cc75863a738bf3fe5b2dc SHA1 1b2f1805077d1e97b7c56b90cff17f7d15b5c33d SHA256 94b8ac652b1218338a63a394577568d477f83208dc88a28b9cfd83f4ec08832b
+EBUILD tenshi-0.10-r3.ebuild 1356 RMD160 5e27e646200f03a8285cba95d7ddd66df8306f15 SHA1 ac4e50cb58e633afff981d0eed48bca5c4aa8ed2 SHA256 b52447d986552ae469b264b6d7353b7e7199e8290cfc2b74a23da1a5f53a63d9
 EBUILD tenshi-0.10.ebuild 938 RMD160 f343b7ce811caaf9bec0ada2b988b41771d64f2a SHA1 3402d8c5d6fcd471ac494f501969298c55bd1571 SHA256 2bc881328a35809281380d74b8bcf938239b4c93f3597098540469a05f76db39
 EBUILD tenshi-0.9.1-r1.ebuild 1017 RMD160 3bd35d37874269dd12f1f80bf66125a88c9f0eef SHA1 b806c8d8a1a0312305fcbea56be04163ef5f64b6 SHA256 b7e16e066f61c1d957efaca7858be9b43242ca90452a07a8b7e691dd3812588e
-MISC ChangeLog 6954 RMD160 5d451d030a6bb4d23532a221536b4e7ccc9577dc SHA1 0e048e68afde1e465b5242e4d32b424b9fbcb2c8 SHA256 7c4f085ae4e93fecdd5d2d55f9def71f4d8c41d98058e97212300387fc1dafdb
+MISC ChangeLog 7218 RMD160 3cfa726b9ec160a571cdb8aa0434c636eda5f1c8 SHA1 f00d1ce04476de3e0cf9cd9891b183779983a190 SHA256 4a36ec50ad0aaac3ced3f84ecd82c6f0f123360925f0ee31ce9411284183d540
 MISC metadata.xml 348 RMD160 a7be1467b846066d2bd9afa7e9d33262fbc896eb SHA1 67009101e7f845d3cd7f90c9076ab49150e5d7b5 SHA256 5bdb394c612149d896a296eeac060b10e8da5d971fb9f08dff7e7956c6b03b8b
diff --git a/app-admin/tenshi/files/tenshi-0.10-warn-logfile.patch b/app-admin/tenshi/files/tenshi-0.10-warn-logfile.patch
index 4a0f33be7aed..7a43cbbd9f2e 100644
--- a/app-admin/tenshi/files/tenshi-0.10-warn-logfile.patch
+++ b/app-admin/tenshi/files/tenshi-0.10-warn-logfile.patch
@@ -1,5 +1,5 @@
 Submitted by: Heath Caldwell <hncaldwell@gentoo.org>
-Date: 2008-10-21
+Date: 2008-12-17
 Initial Package Version: 0.10
 Upstream Status: No response
 Description: Warns on log files that tenshi can't open and continues monitoring the ones that it can, instead of just exiting.
@@ -7,7 +7,7 @@ Description: Warns on log files that tenshi can't open and continues monitoring
 diff -ur tenshi-0.10/tenshi tenshi-0.10.new/tenshi
 --- tenshi-0.10/tenshi	2008-10-06 16:55:37.000000000 -0700
 +++ tenshi-0.10.new/tenshi	2008-10-07 11:46:06.000000000 -0700
-@@ -141,10 +141,22 @@
+@@ -141,10 +141,23 @@
          die RED "[ERROR] $main{'csv'}{'path'}: not executable";
      }
  
@@ -27,7 +27,8 @@ diff -ur tenshi-0.10/tenshi tenshi-0.10.new/tenshi
 +
 +        push @good_log_files, $log;
      }
-+    @good_log_files > 0 or die RED "[ERROR] no readable log files";
++    @good_log_files > 0 || @fifo_files > 0
++        or die RED "[ERROR] no readable log files";
 +    @log_files = @good_log_files;
  }
  
diff --git a/app-admin/tenshi/tenshi-0.10-r3.ebuild b/app-admin/tenshi/tenshi-0.10-r3.ebuild
index a73588d72ec4..e805ac566ff8 100644
--- a/app-admin/tenshi/tenshi-0.10-r3.ebuild
+++ b/app-admin/tenshi/tenshi-0.10-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/tenshi-0.10-r3.ebuild,v 1.1 2008/12/02 20:46:54 hncaldwell Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/tenshi-0.10-r3.ebuild,v 1.2 2008/12/17 20:34:56 hncaldwell Exp $
 
 inherit eutils
 
@@ -35,6 +35,10 @@ src_unpack() {
 	# Fixes for bug #243082
 	epatch "${FILESDIR}/${PN}-0.10-solo-queue-escalation.patch"
 	epatch "${FILESDIR}/${PN}-0.10-warn-logfile.patch"
+
+	# Fix for bug #241254
+	sed -i 's:^docdir =.*:docdir = /usr/share/doc/${PF}:' \
+		Makefile || die "docdir substitution failed"
 }
 
 src_install() {