Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/
Date: Sun, 30 Oct 2016 04:21:13
Message-Id: 1477801253.3cd4ade04c732da8cbc744572c4f11e86a523831.floppym@gentoo
1 commit: 3cd4ade04c732da8cbc744572c4f11e86a523831
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 30 04:15:57 2016 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 30 04:20:53 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cd4ade0
7
8 sys-apps/systemd: skip distro patches when USE=vanilla
9
10 Package-Manager: portage-2.3.2_p1
11
12 sys-apps/systemd/systemd-9999.ebuild | 12 +++++++++---
13 1 file changed, 9 insertions(+), 3 deletions(-)
14
15 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
16 index b79eeac..fd23a34 100644
17 --- a/sys-apps/systemd/systemd-9999.ebuild
18 +++ b/sys-apps/systemd/systemd-9999.ebuild
19 @@ -157,10 +157,16 @@ src_prepare() {
20 sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
21
22 local PATCHES=(
23 - "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
24 - "${FILESDIR}/228-noclean-tmp.patch"
25 - "${FILESDIR}/232-systemd-user-pam.patch"
26 )
27 +
28 + if ! use vanilla; then
29 + PATCHES+=(
30 + "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
31 + "${FILESDIR}/228-noclean-tmp.patch"
32 + "${FILESDIR}/232-systemd-user-pam.patch"
33 + )
34 + fi
35 +
36 [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
37
38 default