commit: e619ce061100a44dfd15a6cab2a3789c35ba1cc0
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 09:05:45 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 09:09:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e619ce06
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 62861b0..70e3b76 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 62861b0..70e3b76 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
