Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/s6/
Date: Mon, 07 Mar 2016 22:51:43
Message-Id: 1457389978.480552e9e3cdd8458007ed3f694dfff76cace7d1.williamh@gentoo
1 commit: 480552e9e3cdd8458007ed3f694dfff76cace7d1
2 Author: Luis Ressel <aranea <AT> aixah <DOT> de>
3 AuthorDate: Mon Mar 7 11:10:25 2016 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 7 22:32:58 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=480552e9
7
8 sys-apps/s6: Bump to EAPI 6
9
10 sys-apps/s6/s6-2.2.4.3.ebuild | 23 +++++++----------------
11 1 file changed, 7 insertions(+), 16 deletions(-)
12
13 diff --git a/sys-apps/s6/s6-2.2.4.3.ebuild b/sys-apps/s6/s6-2.2.4.3.ebuild
14 index 8aeee3a..51c3fc2 100644
15 --- a/sys-apps/s6/s6-2.2.4.3.ebuild
16 +++ b/sys-apps/s6/s6-2.2.4.3.ebuild
17 @@ -1,10 +1,8 @@
18 -# Copyright 1999-2015 Gentoo Foundation
19 +# Copyright 1999-2016 Gentoo Foundation
20 # Distributed under the terms of the GNU General Public License v2
21 # $Id$
22
23 -EAPI=5
24 -
25 -inherit multilib
26 +EAPI=6
27
28 DESCRIPTION="skarnet.org's small and secure supervision software suite"
29 HOMEPAGE="http://www.skarnet.org/software/s6/"
30 @@ -32,10 +30,15 @@ RDEPEND="
31 )
32 "
33
34 +DOCS="AUTHORS examples README*"
35 +HTML_DOCS="doc/*"
36 +
37 src_prepare()
38 {
39 # Remove QA warning about LDFLAGS addition
40 sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
41 +
42 + eapply_user
43 }
44
45 src_configure()
46 @@ -53,15 +56,3 @@ src_configure()
47 --with-dynlib=/$(get_libdir) \
48 --with-sysdeps=/usr/$(get_libdir)/skalibs
49 }
50 -
51 -src_compile()
52 -{
53 - emake DESTDIR="${D}"
54 -}
55 -
56 -src_install()
57 -{
58 - default
59 - dodoc -r examples
60 - dohtml -r doc/*
61 -}