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 62861b0d55ce5f54825fc9a6161de5d42a8262a6..70e3b76732f2444000a87c9875e2f63cd87a1a1f 100644 (file)
--- 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 62861b0d55ce5f54825fc9a6161de5d42a8262a6..70e3b76732f2444000a87c9875e2f63cd87a1a1f 100644 (file)
--- 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