From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 2 Oct 2016 09:05:45 +0000 (-0700)
Subject: app-emulation/rkt: avoid sd-journal.h include for bug 595874
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e619ce061100a44dfd15a6cab2a3789c35ba1cc0;p=gentoo.git

app-emulation/rkt: avoid sd-journal.h include for bug 595874

Package-Manager: portage-2.3.1
---

diff --git a/app-emulation/rkt/rkt-1.15.0.ebuild b/app-emulation/rkt/rkt-1.15.0.ebuild
index 62861b0d55ce..70e3b76732f2 100644
--- a/app-emulation/rkt/rkt-1.15.0.ebuild
+++ b/app-emulation/rkt/rkt-1.15.0.ebuild
@@ -86,6 +86,12 @@ src_unpack() {
 src_prepare() {
 	eapply_user
 
+	# avoid sdjournal include for bug 595874
+	if ! use systemd; then
+		sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+			-i rkt/rkt.mk || die
+	fi
+
 	sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
 
 	# disable git fetch of systemd
diff --git a/app-emulation/rkt/rkt-1.16.0.ebuild b/app-emulation/rkt/rkt-1.16.0.ebuild
index 62861b0d55ce..70e3b76732f2 100644
--- a/app-emulation/rkt/rkt-1.16.0.ebuild
+++ b/app-emulation/rkt/rkt-1.16.0.ebuild
@@ -86,6 +86,12 @@ src_unpack() {
 src_prepare() {
 	eapply_user
 
+	# avoid sdjournal include for bug 595874
+	if ! use systemd; then
+		sed -e "s/^\\(LOCAL_DIST_SRC_FILTER := .*\\)'$/\\1|api_service'/" \
+			-i rkt/rkt.mk || die
+	fi
+
 	sed -e 's|^RKT_REQ_PROG(\[GIT\],.*|#\0|' -i configure.ac || die
 
 	# disable git fetch of systemd