diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2012-03-04 10:33:08 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2012-03-04 10:33:08 +0000 |
| commit | dff5c93115a40af7b2c620d59e210ff7478a25e0 (patch) | |
| tree | 126bb399c7ae26494475491116f204c7f762cb4c /app-admin | |
| parent | Clean residual die and other comments (diff) | |
| download | gentoo-2-dff5c93115a40af7b2c620d59e210ff7478a25e0.tar.gz gentoo-2-dff5c93115a40af7b2c620d59e210ff7478a25e0.tar.bz2 gentoo-2-dff5c93115a40af7b2c620d59e210ff7478a25e0.zip | |
Fix init.d script, bug 398987 by Adam James.
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/tenshi/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/tenshi/files/tenshi-openrc-init-r1.patch | 11 | ||||
| -rw-r--r-- | app-admin/tenshi/tenshi-0.12.ebuild | 11 |
3 files changed, 21 insertions, 7 deletions
diff --git a/app-admin/tenshi/ChangeLog b/app-admin/tenshi/ChangeLog index 0d04d4253d2c..e7ef6749b298 100644 --- a/app-admin/tenshi/ChangeLog +++ b/app-admin/tenshi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/tenshi # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/ChangeLog,v 1.65 2012/02/05 13:45:57 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/ChangeLog,v 1.66 2012/03/04 10:33:08 pacho Exp $ + + 04 Mar 2012; Pacho Ramos <pacho@gentoo.org> + +files/tenshi-openrc-init-r1.patch, tenshi-0.12.ebuild: + Fix init.d script, bug 398987 by Adam James. 05 Feb 2012; Brent Baude <ranger@gentoo.org> tenshi-0.12.ebuild: Marking tenshi-0.12 ppc for bug 396759 diff --git a/app-admin/tenshi/files/tenshi-openrc-init-r1.patch b/app-admin/tenshi/files/tenshi-openrc-init-r1.patch new file mode 100644 index 000000000000..be300d25f7ea --- /dev/null +++ b/app-admin/tenshi/files/tenshi-openrc-init-r1.patch @@ -0,0 +1,11 @@ +--- a/tenshi.gentoo-init ++++ b/tenshi.gentoo-init +@@ -1,6 +1,7 @@ + #!/sbin/runscript + +-opts="depend start stop reload flush checkconfig" ++extra_commands="checkconfig" ++extra_started_commands="reload flush" + + depend() { + need clock hostname logger diff --git a/app-admin/tenshi/tenshi-0.12.ebuild b/app-admin/tenshi/tenshi-0.12.ebuild index 32c01fcad621..7d062e736c67 100644 --- a/app-admin/tenshi/tenshi-0.12.ebuild +++ b/app-admin/tenshi/tenshi-0.12.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2012 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.3 2012/02/05 13:45:57 ranger Exp $ - -EAPI="3" +# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/tenshi-0.12.ebuild,v 1.4 2012/03/04 10:33:08 pacho Exp $ +EAPI=4 inherit eutils DESCRIPTION="Log parsing and notification program" @@ -26,8 +25,8 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}/${PN}-create-mandir.patch" - # Fix for bug #218042 - epatch "${FILESDIR}/${PN}-openrc-init.patch" + epatch "${FILESDIR}/${PN}-openrc-init.patch" #218042 + epatch "${FILESDIR}/${PN}-openrc-init-r1.patch" #398987 # Fix for bug #241254 sed -i 's:^docdir =.*:docdir = /usr/share/doc/${PF}:' \ @@ -35,7 +34,7 @@ src_prepare() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install fowners tenshi:root /etc/tenshi/tenshi.conf dodir /var/lib/tenshi fowners tenshi:root /var/lib/tenshi |