Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
Date: Mon, 29 Feb 2016 09:35:49
Message-Id: 1456738478.0838afb3eea111683ee35bf2684959892f23f558.zmedico@gentoo
1 commit: 0838afb3eea111683ee35bf2684959892f23f558
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 29 09:34:38 2016 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 29 09:34:38 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0838afb3
7
8 app-emulation/rkt: use ${PXE_SYSTEMD_VERSION} more
9
10 Package-Manager: portage-2.2.27
11
12 app-emulation/rkt/rkt-1.1.0.ebuild | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15 diff --git a/app-emulation/rkt/rkt-1.1.0.ebuild b/app-emulation/rkt/rkt-1.1.0.ebuild
16 index ff84098..aab5531 100644
17 --- a/app-emulation/rkt/rkt-1.1.0.ebuild
18 +++ b/app-emulation/rkt/rkt-1.1.0.ebuild
19 @@ -44,10 +44,10 @@ src_prepare() {
20 # disable git fetch of systemd
21 sed -e 's|^include makelib/git.mk$|_ := '\
22 '$(shell set -ex; [ -d "$(UFS_SYSTEMD_SRCDIR)" ] \&\& exit 0; '\
23 -'[ ! -d "$${WORKDIR}/systemd-222" ] \&\& exit 0; '\
24 +'[ ! -d "$${WORKDIR}/systemd-'${PXE_SYSTEMD_VERSION#v}'" ] \&\& exit 0; '\
25 'mkdir -p "$$( dirname "$(UFS_SYSTEMD_SRCDIR)")"; '\
26 -'mv "$${WORKDIR}/systemd-222" "$(UFS_SYSTEMD_SRCDIR)";)|' \
27 - i stage1/usr_from_src/usr_from_src.mk || die
28 +'mv "$${WORKDIR}/systemd-'${PXE_SYSTEMD_VERSION#v}'" "$(UFS_SYSTEMD_SRCDIR)";)|' \
29 + -i stage1/usr_from_src/usr_from_src.mk || die
30 autotools-utils_src_prepare
31 }