From e619ce061100a44dfd15a6cab2a3789c35ba1cc0 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 2 Oct 2016 02:05:45 -0700 Subject: [PATCH] app-emulation/rkt: avoid sd-journal.h include for bug 595874 Package-Manager: portage-2.3.1 --- app-emulation/rkt/rkt-1.15.0.ebuild | 6 ++++++ app-emulation/rkt/rkt-1.16.0.ebuild | 6 ++++++ 2 files changed, 12 insertions(+) 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 -- 2.26.2