Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/daemontools/
Date: Thu, 07 Nov 2019 17:05:41
Message-Id: 1573146314.4dd796748cf5b8455513b658d813a1765e987a68.polynomial-c@gentoo
1 commit: 4dd796748cf5b8455513b658d813a1765e987a68
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 7 14:47:19 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 7 17:05:14 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dd79674
7
8 sys-process/daemontools: EAPI-7 revbump
9
10 Closes: https://bugs.gentoo.org/697166
11 Package-Manager: Portage-2.3.78, Repoman-2.3.17
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 ...s-0.76-r7.ebuild => daemontools-0.76-r8.ebuild} | 26 ++++++++++++----------
15 1 file changed, 14 insertions(+), 12 deletions(-)
16
17 diff --git a/sys-process/daemontools/daemontools-0.76-r7.ebuild b/sys-process/daemontools/daemontools-0.76-r8.ebuild
18 similarity index 78%
19 rename from sys-process/daemontools/daemontools-0.76-r7.ebuild
20 rename to sys-process/daemontools/daemontools-0.76-r8.ebuild
21 index 5f2a20bcb1e..98a02977441 100644
22 --- a/sys-process/daemontools/daemontools-0.76-r7.ebuild
23 +++ b/sys-process/daemontools/daemontools-0.76-r8.ebuild
24 @@ -1,9 +1,9 @@
25 -# Copyright 1999-2018 Gentoo Foundation
26 +# Copyright 1999-2019 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 -EAPI=0
30 +EAPI=7
31
32 -inherit eutils flag-o-matic qmail
33 +inherit flag-o-matic qmail
34
35 DESCRIPTION="Collection of tools for managing UNIX services"
36 HOMEPAGE="http://cr.yp.to/daemontools.html"
37 @@ -19,14 +19,16 @@ DEPEND=""
38 RDEPEND="selinux? ( sec-policy/selinux-daemontools )
39 !app-doc/daemontools-man"
40
41 -S="${WORKDIR}"/admin/${P}/src
42 +S="${WORKDIR}/admin/${P}/src"
43
44 -src_unpack() {
45 - unpack ${A}
46 - cd "${S}"
47 +PATCHES=(
48 + "${FILESDIR}"/${PV}-errno.patch
49 + "${FILESDIR}"/${PV}-warnings.patch
50 +)
51 +
52 +src_prepare() {
53 + default
54
55 - epatch "${FILESDIR}"/${PV}-errno.patch
56 - epatch "${FILESDIR}"/${PV}-warnings.patch
57 ht_fix_file Makefile print-{cc,ld}.sh
58
59 use static && append-ldflags -static
60 @@ -34,14 +36,14 @@ src_unpack() {
61 }
62
63 src_compile() {
64 - touch home
65 - emake || die
66 + touch home || die
67 + emake
68 }
69
70 src_install() {
71 keepdir /service
72
73 - dobin $(<../package/commands) || die
74 + dobin $(<../package/commands)
75 dodoc CHANGES ../package/README TODO
76 doman "${WORKDIR}"/${PN}-man/*.8