Version bump. Clean up patches.

(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

7 files changed, 75 insertions, 17 deletions

diff --git a/app-admin/tenshi/ChangeLog b/app-admin/tenshi/ChangeLog
index b3d3b20024cc..64b28673827e 100644
--- a/app-admin/tenshi/ChangeLog
+++ b/app-admin/tenshi/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-admin/tenshi
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/ChangeLog,v 1.62 2010/10/15 00:28:14 xmw Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/ChangeLog,v 1.63 2011/06/16 17:23:13 jer Exp $
+
+*tenshi-0.12 (16 Jun 2011)
+
+  16 Jun 2011; Jeroen Roovers <jer@gentoo.org>
+  files/tenshi-0.10-solo-queue-escalation.patch,
+  files/tenshi-0.10-warn-logfile.patch, +tenshi-0.12.ebuild,
+  files/tenshi-create-mandir.patch, files/tenshi-openrc-init.patch,
+  files/tenshi-remove-timezone-cache.patch:
+  Version bump. Clean up patches.
 
   15 Oct 2010; Michael Weber <xmw@gentoo.org>
   -files/tenshi-0.9.1-fix-tail_pids-array-length.patch:
diff --git a/app-admin/tenshi/files/tenshi-0.10-solo-queue-escalation.patch b/app-admin/tenshi/files/tenshi-0.10-solo-queue-escalation.patch
index a588ec18f131..c17d9f7e749e 100644
--- a/app-admin/tenshi/files/tenshi-0.10-solo-queue-escalation.patch
+++ b/app-admin/tenshi/files/tenshi-0.10-solo-queue-escalation.patch
@@ -4,9 +4,8 @@ Initial Package Version: 0.10
 Upstream Status: Accepted to be included in next release
 Description: Allows the leftmost queue to have an escalation number if it is the only queue mentioned.
 
-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-06 17:18:07.000000000 -0700
+--- a/tenshi
++++ b/tenshi
 @@ -522,7 +522,7 @@
                  }
              }
@@ -16,9 +15,8 @@ diff -ur tenshi-0.10/tenshi tenshi-0.10.new/tenshi
                  die RED "[ERROR] Left most queue in a multiple queue declaration can not have an escalation number\n";
              }
  
-diff -ur tenshi-0.10/tenshi.8 tenshi-0.10.new/tenshi.8
---- tenshi-0.10/tenshi.8	2008-03-13 04:31:12.000000000 -0700
-+++ tenshi-0.10.new/tenshi.8	2008-10-06 17:09:36.000000000 -0700
+--- a/tenshi.8
++++ b/tenshi.8
 @@ -337,16 +337,16 @@
  regexp. The queue will receive the message that matched the regexp at the time
  of escalation, with a count equal to the escalation number. The count of
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 7a43cbbd9f2e..0c3e7bb91608 100644
--- a/app-admin/tenshi/files/tenshi-0.10-warn-logfile.patch
+++ b/app-admin/tenshi/files/tenshi-0.10-warn-logfile.patch
@@ -4,9 +4,8 @@ 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.
 
-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
+--- a/tenshi
++++ b/tenshi
 @@ -141,10 +141,23 @@
          die RED "[ERROR] $main{'csv'}{'path'}: not executable";
      }
diff --git a/app-admin/tenshi/files/tenshi-create-mandir.patch b/app-admin/tenshi/files/tenshi-create-mandir.patch
index 8eadb46406d9..72ca3f28576d 100644
--- a/app-admin/tenshi/files/tenshi-create-mandir.patch
+++ b/app-admin/tenshi/files/tenshi-create-mandir.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2007-10-04 19:57:24.000000000 +0100
-+++ Makefile	2008-03-21 12:59:04.000000000 +0000
+--- a/Makefile
++++ b/Makefile
 @@ -38,5 +38,7 @@
  		install -g root -m 0644 -D tenshi.conf ${DESTDIR}${sysconfdir}/tenshi/tenshi.conf
  	install -d ${DESTDIR}${docdir}
diff --git a/app-admin/tenshi/files/tenshi-openrc-init.patch b/app-admin/tenshi/files/tenshi-openrc-init.patch
index 7333c10ba0dd..eef9874c553a 100644
--- a/app-admin/tenshi/files/tenshi-openrc-init.patch
+++ b/app-admin/tenshi/files/tenshi-openrc-init.patch
@@ -1,5 +1,5 @@
---- tenshi.gentoo-init.orig	2008-04-17 12:25:05.000000000 +0100
-+++ tenshi.gentoo-init	2008-04-17 12:32:06.000000000 +0100
+--- a/tenshi.gentoo-init
++++ b/tenshi.gentoo-init
 @@ -13,7 +13,7 @@
  
  start() {
diff --git a/app-admin/tenshi/files/tenshi-remove-timezone-cache.patch b/app-admin/tenshi/files/tenshi-remove-timezone-cache.patch
index f3cd8ef49be0..272bcfda47fa 100644
--- a/app-admin/tenshi/files/tenshi-remove-timezone-cache.patch
+++ b/app-admin/tenshi/files/tenshi-remove-timezone-cache.patch
@@ -1,5 +1,5 @@
---- tenshi.orig	2008-06-09 21:33:55.000000000 +0100
-+++ tenshi	2008-06-09 21:35:41.000000000 +0100
+--- a/tenshi
++++ b/tenshi
 @@ -45,7 +45,6 @@
  
  my $our_hostname = hostname();
diff --git a/app-admin/tenshi/tenshi-0.12.ebuild b/app-admin/tenshi/tenshi-0.12.ebuild
new file mode 100644
index 000000000000..6287fc1f14a6
--- /dev/null
+++ b/app-admin/tenshi/tenshi-0.12.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/tenshi-0.12.ebuild,v 1.1 2011/06/16 17:23:13 jer Exp $
+
+EAPI="3"
+
+inherit eutils
+
+DESCRIPTION="Log parsing and notification program"
+HOMEPAGE="http://dev.inversepath.com/trac/tenshi"
+SRC_URI="http://dev.inversepath.com/tenshi/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	dev-perl/IO-BufferedSelect
+	sys-apps/coreutils"
+
+pkg_setup() {
+	enewgroup tenshi
+	enewuser tenshi -1 -1 /var/lib/tenshi tenshi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-create-mandir.patch"
+	# Fix for bug #218042
+	epatch "${FILESDIR}/${PN}-openrc-init.patch"
+
+	# Fix for bug #241254
+	sed -i 's:^docdir =.*:docdir = /usr/share/doc/${PF}:' \
+		Makefile || die "docdir substitution failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	fowners tenshi:root /etc/tenshi/tenshi.conf
+	dodir /var/lib/tenshi
+	fowners tenshi:root /var/lib/tenshi
+	doman tenshi.8
+	newinitd tenshi.gentoo-init tenshi
+	keepdir /var/lib/tenshi
+}
+
+pkg_postinst() {
+	ewarn "The sample config installed to ${ROOT}etc/tenshi/tenshi.conf"
+	ewarn "monitors /var/log/messages which, by default, can not be read"
+	ewarn "by the tenshi user.  Make sure that the tenshi user has read"
+	ewarn "permission on all the files that you want tenshi to monitor."
+}