sys-apps/s6: Bump to EAPI 6

diff --git a/sys-apps/s6/s6-2.2.4.3.ebuild b/sys-apps/s6/s6-2.2.4.3.ebuild
index 8aeee3a383e0b3955646e7c524b58ea16e5ea973..51c3fc2d08e20e66e627a64757403f97c9dc503e 100644 (file)
--- a/sys-apps/s6/s6-2.2.4.3.ebuild
+++ b/sys-apps/s6/s6-2.2.4.3.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-
-inherit multilib
+EAPI=6
 
 DESCRIPTION="skarnet.org's small and secure supervision software suite"
 HOMEPAGE="http://www.skarnet.org/software/s6/"
@@ -32,10 +30,15 @@ RDEPEND="
        )
        "
 
+DOCS="AUTHORS examples README*"
+HTML_DOCS="doc/*"
+
 src_prepare()
 {
        # Remove QA warning about LDFLAGS addition
        sed -i "s~tryldflag LDFLAGS_AUTO -Wl,--hash-style=both~:~" "${S}/configure" || die
+
+       eapply_user
 }
 
 src_configure()
@@ -53,15 +56,3 @@ src_configure()
                --with-dynlib=/$(get_libdir) \
                --with-sysdeps=/usr/$(get_libdir)/skalibs
 }
-
-src_compile()
-{
-       emake DESTDIR="${D}"
-}
-
-src_install()
-{
-       default
-       dodoc -r examples
-       dohtml -r doc/*
-}