From: Mike Gilbert <floppym@gentoo.org>
Date: Sun, 30 Oct 2016 04:15:57 +0000 (-0400)
Subject: sys-apps/systemd: skip distro patches when USE=vanilla
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3cd4ade04c732da8cbc744572c4f11e86a523831;p=gentoo.git

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

Package-Manager: portage-2.3.2_p1
---

diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index b79eeacb3f46..fd23a3492dd5 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