summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2016-10-30 00:15:57 -0400
committerMike Gilbert <floppym@gentoo.org>2016-10-30 00:20:53 -0400
commit3cd4ade04c732da8cbc744572c4f11e86a523831 (patch)
tree37c9c949f8ab25ac6e9624300f41b2deed05985e
parentsys-apps/systemd: call pam_limits for systemd-user (diff)
downloadgentoo-3cd4ade04c732da8cbc744572c4f11e86a523831.tar.gz
gentoo-3cd4ade04c732da8cbc744572c4f11e86a523831.tar.bz2
gentoo-3cd4ade04c732da8cbc744572c4f11e86a523831.zip
sys-apps/systemd: skip distro patches when USE=vanilla
Package-Manager: portage-2.3.2_p1
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild12
1 files changed, 9 insertions, 3 deletions
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