From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 29 Feb 2016 09:34:38 +0000 (-0800)
Subject: app-emulation/rkt: use ${PXE_SYSTEMD_VERSION} more
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0838afb3eea111683ee35bf2684959892f23f558;p=gentoo.git

app-emulation/rkt: use ${PXE_SYSTEMD_VERSION} more

Package-Manager: portage-2.2.27
---

diff --git a/app-emulation/rkt/rkt-1.1.0.ebuild b/app-emulation/rkt/rkt-1.1.0.ebuild
index ff8409858f5d..aab553164fdf 100644
--- a/app-emulation/rkt/rkt-1.1.0.ebuild
+++ b/app-emulation/rkt/rkt-1.1.0.ebuild
@@ -44,10 +44,10 @@ src_prepare() {
 	# disable git fetch of systemd
 	sed -e 's|^include makelib/git.mk$|_ := '\
 '$(shell set -ex; [ -d "$(UFS_SYSTEMD_SRCDIR)" ] \&\& exit 0; '\
-'[ ! -d "$${WORKDIR}/systemd-222" ] \&\& exit 0; '\
+'[ ! -d "$${WORKDIR}/systemd-'${PXE_SYSTEMD_VERSION#v}'" ] \&\& exit 0; '\
 'mkdir -p "$$( dirname "$(UFS_SYSTEMD_SRCDIR)")"; '\
-'mv "$${WORKDIR}/systemd-222" "$(UFS_SYSTEMD_SRCDIR)";)|' \
-		i stage1/usr_from_src/usr_from_src.mk || die
+'mv "$${WORKDIR}/systemd-'${PXE_SYSTEMD_VERSION#v}'" "$(UFS_SYSTEMD_SRCDIR)";)|' \
+		-i stage1/usr_from_src/usr_from_src.mk || die
 	autotools-utils_src_prepare
 }