[gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/

[Mike Gilbert]

commit:     9258b81a69cdc1fb0f3eb227a616b1a6798ee102
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  5 17:18:41 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Mar  5 18:10:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9258b81a

sys-apps/systemd: Move to EAPI 6

Package-Manager: portage-2.2.27_p64

 sys-apps/systemd/systemd-9999.ebuild | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/sys-apps/systemd/systemd-9999.ebuild 
b/sys-apps/systemd/systemd-9999.ebuild
index df82d8e..2213ad1 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 if [[ ${PV} == 9999 ]]; then
        EGIT_REPO_URI="https://github.com/systemd/systemd.git";
@@ -12,7 +12,7 @@ else
        KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-inherit autotools bash-completion-r1 linux-info multilib \
+inherit autotools bash-completion-r1 linux-info \
        multilib-minimal pam systemd toolchain-funcs udev user
 
 DESCRIPTION="System and service manager for Linux"
@@ -144,9 +144,15 @@ src_unpack() {
 src_prepare() {
        # Bug 463376
        sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
-       epatch "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-       epatch "${FILESDIR}/228-noclean-tmp.patch"
-       epatch_user
+
+       local PATCHES=(
+               "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
+               "${FILESDIR}/228-noclean-tmp.patch"
+       )
+       [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+       default
+
        eautoreconf
 }