Version bump. Clean up patches.

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64

8 files changed, 93 insertions, 23 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/Manifest b/app-admin/tenshi/Manifest
index d5e69f1da1dd..5303ca296bb8 100644
--- a/app-admin/tenshi/Manifest
+++ b/app-admin/tenshi/Manifest
@@ -1,9 +1,21 @@
-AUX tenshi-0.10-solo-queue-escalation.patch 2718 RMD160 09596060e363b7768e697189de48ac8709978b3f SHA1 8bced32ab5b0b8721db86e337fda5729e7a8f437 SHA256 2300e136a72592d7f5cf808100fa6330b1de72731820cb88de3dac563d734d2d
-AUX tenshi-0.10-warn-logfile.patch 1158 RMD160 1c990e88a52351089021b992c9ede058297a3fbf SHA1 caedb2caa29722b7d75af655cda24bf6a9810975 SHA256 8701a96c3a9550d35dd1240fda2a00152dea2f8c8408b6c6da3233c5020433d7
-AUX tenshi-create-mandir.patch 473 RMD160 69e20a5eb6765b550bd8a5a0b713ee616796c71a SHA1 82a3e8f765e1a30271cd77425f13a81e807745e8 SHA256 03116f30486a2e03bab10897d87a0bc60e868b12c3a5d0f861bbdfe6bff73318
-AUX tenshi-openrc-init.patch 473 RMD160 538c340dfbf7280166fe99c5dfa3995d7fa38ea6 SHA1 979f1557301e38499932b7147853a9a8a58915b3 SHA256 f657ba4dfcfd80f5acce1d77caf88006ba5e60e9fa5762085caf91326185a47a
-AUX tenshi-remove-timezone-cache.patch 442 RMD160 ca57001e1a7129071dd0161966f00af8e68287fb SHA1 94a0e8599c2fb5b8bca9d326de6a63c454006606 SHA256 1e69f71c9c6a590a98f13c2c4c225b76140949092edffdcca9f84a208ecd6adf
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX tenshi-0.10-solo-queue-escalation.patch 2420 RMD160 d195abc6821a8ef327ee907129ade69fa2dccca7 SHA1 699452d1d68120343df1d59fb11ddc467507feba SHA256 323741d45b183d3dee0a54c5aeaf8c8baf7d8f1bf0343a46cf5facba3d879101
+AUX tenshi-0.10-warn-logfile.patch 1011 RMD160 4ff09828195d429a69ae9490966d3048dbc071e2 SHA1 598ac57e182de379fe6724ef7b1a29a6889969f8 SHA256 fab40dee83dbc8d6bab82035d98bd0067c63a3174016483ced9a33ab9092ca9d
+AUX tenshi-create-mandir.patch 400 RMD160 9d0b394d89b92336a0c66b429fedc083ae7cf1b3 SHA1 6997a0d82c800817628a182d6200cad7f18066d1 SHA256 8491ddb878481136c755718a42d172d67527df8cffac0723d89b5750e0a33c9e
+AUX tenshi-openrc-init.patch 400 RMD160 1df5cca7c963132a630cdae60715957e2feeb4db SHA1 e13d45fb1814bc239d70214ddb70c3e0e142d73e SHA256 ccd3596990737cc093acdcd299b8ae063795e2f81c80f859425d86b3bf0eeb2a
+AUX tenshi-remove-timezone-cache.patch 369 RMD160 c164cfdf5c0c4e7be1e4a252759de7ab2c8f7646 SHA1 c7867a288640a232b6f273caa6a5bd18f6e92dbc SHA256 50dc2089e04047605721bcd010aeb11b8a94f0cd0f695aa290f20ff6a2f1477f
 DIST tenshi-0.10.tar.gz 26131 RMD160 27a3dc2e0fc7e6790497ddfa0dc6bd85cafd7316 SHA1 998ecafd263af9ee54d1494cd973a91ec734ea2d SHA256 b57dd0c23f222c28d017394c57277d1e1077fddcfd6b5930bc0a43b4f082b432
+DIST tenshi-0.12.tar.gz 28467 RMD160 096aad64184b58ec5276f7cab80d45626eff30da SHA1 0920db96c17d8c2eee4b4adb06ac359cf4c8376a SHA256 953bbad01cb03674ab6135b70f707467ccd55dd1b8cb7257f1f49473d7767920
 EBUILD tenshi-0.10-r3.ebuild 1660 RMD160 5b87fadc79d5214834e401f8e729d49da077945a SHA1 0f4576c12e858f696514341549e36ae3a63ca3a9 SHA256 c46e9f299447f65c8cab34d42c6199194feddc858c4f94aefc24fdd01282dd16
-MISC ChangeLog 8164 RMD160 d902a7f1ca262ebd44662b22618f71142cb100fa SHA1 d5f6651c39158807ef94e2d95dcfd0a9cf5caff9 SHA256 2fb2b18f25bfbe5c9d372b6f99e171bb35604a78063fd294dee3a9b97592a559
+EBUILD tenshi-0.12.ebuild 1422 RMD160 4de64aaf1c49504ee1b70520a7a7aa1d6a5ea71c SHA1 e45fd76de9c448dcee8f0ca73c20292953833f39 SHA256 17fa3498f2c5e5ab53d993868d9c01ddf26fd7b73258ddf1ffc7d6d0cc079f52
+MISC ChangeLog 8496 RMD160 33335da0e7370c1bf1bca9f3ffb39879adb311e2 SHA1 bb5e4441e6b58d9ead7d93dda111a2bfdfa17ba9 SHA256 252ae9aa9b6591a8fb31e86aacf0c5a4a16cd83df252a1facd2f8a91064acd4a
 MISC metadata.xml 325 RMD160 2a509cec25f2fedda5eab84862444958bf5e6be6 SHA1 a6aec3e71fc931c3a0c3d654a7b2a3bfc0f87a94 SHA256 293cab5ace7e2f9b62e923b232edb431027db90fb1216f5dfc101cf1d00fffa5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk36PAYACgkQVWmRsqeSphOfCwCfeCHmgl2PDbFft0iBWW/tWQxa
+F54An1ojIdbzC3eYz0qrSXHHUSWRyKrM
+=Apk4
+-----END PGP SIGNATURE-----
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."
+}