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

[Mike Gilbert]

commit:     3cd4ade04c732da8cbc744572c4f11e86a523831
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 04:15:57 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 04:20:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cd4ade0

sys-apps/systemd: skip distro patches when USE=vanilla

Package-Manager: portage-2.3.2_p1

 sys-apps/systemd/systemd-9999.ebuild | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/sys-apps/systemd/systemd-9999.ebuild 
b/sys-apps/systemd/systemd-9999.ebuild
index b79eeac..fd23a34 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -157,10 +157,16 @@ src_prepare() {
        sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
 
        local PATCHES=(
-               "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
-               "${FILESDIR}/228-noclean-tmp.patch"
-               "${FILESDIR}/232-systemd-user-pam.patch"
        )
+
+       if ! use vanilla; then
+               PATCHES+=(
+                       "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
+                       "${FILESDIR}/228-noclean-tmp.patch"
+                       "${FILESDIR}/232-systemd-user-pam.patch"
+               )
+       fi
+
        [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
 
        default