public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/
Date: Sun,  2 Oct 2016 09:09:34 +0000 (UTC)	[thread overview]
Message-ID: <1475399369.e619ce061100a44dfd15a6cab2a3789c35ba1cc0.zmedico@gentoo> (raw)

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


             reply	other threads:[~2016-10-02  9:09 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-02  9:09 Zac Medico [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-11-17 15:27 [gentoo-commits] repo/gentoo:master commit in: app-emulation/rkt/ Zac Medico
2018-07-03 19:32 Zac Medico
2017-10-29 22:43 Zac Medico
2017-10-20 23:38 Zac Medico
2017-10-20 23:04 Zac Medico
2017-10-20 21:48 Zac Medico
2017-08-11  3:21 Zac Medico
2017-08-11  2:38 Zac Medico
2017-07-18 22:30 Zac Medico
2017-06-29  5:26 Zac Medico
2017-05-26  5:56 Zac Medico
2017-05-26  5:56 Zac Medico
2017-02-26 23:21 Zac Medico
2017-02-09  7:12 Zac Medico
2017-02-09  5:22 Zac Medico
2017-01-31 21:58 Zac Medico
2017-01-08 22:29 Zac Medico
2017-01-08 21:13 Zac Medico
2016-12-13  7:22 Zac Medico
2016-11-28  1:54 Zac Medico
2016-11-28  1:52 Zac Medico
2016-11-20  0:08 Zac Medico
2016-11-19 20:47 Zac Medico
2016-11-19 19:01 Zac Medico
2016-11-06 21:02 Zac Medico
2016-11-04  6:04 Zac Medico
2016-10-17  4:56 Zac Medico
2016-10-17  4:56 Zac Medico
2016-10-02  0:44 Zac Medico
2016-10-01 23:56 Zac Medico
2016-10-01 23:54 Zac Medico
2016-09-29 16:20 Zac Medico
2016-09-29  1:23 Zac Medico
2016-09-07 17:04 Zac Medico
2016-08-15 19:10 Zac Medico
2016-08-15  9:02 Zac Medico
2016-08-15  8:55 Zac Medico
2016-08-15  8:53 Zac Medico
2016-07-30 18:52 Zac Medico
2016-07-30 18:46 Zac Medico
2016-07-30  7:15 Zac Medico
2016-07-30  7:13 Zac Medico
2016-07-30  7:11 Zac Medico
2016-07-19  6:46 Zac Medico
2016-06-06  8:24 Zac Medico
2016-06-06  8:22 Zac Medico
2016-05-22 20:18 Zac Medico
2016-05-16  2:51 Zac Medico
2016-04-17  6:08 Zac Medico
2016-04-06 20:35 Zac Medico
2016-04-06 20:19 Zac Medico
2016-03-06  7:01 Zac Medico
2016-03-06  6:42 Zac Medico
2016-03-03 17:02 Zac Medico
2016-03-03 10:16 Zac Medico
2016-03-01  4:27 Zac Medico
2016-02-29 18:24 Zac Medico
2016-02-29 18:11 Patrick Lauer
2016-02-29 12:04 Zac Medico
2016-02-29  9:35 Zac Medico
2016-02-29  9:20 Zac Medico
2016-02-28  5:00 Zac Medico
2016-02-22  5:55 Zac Medico
2016-02-21 15:14 Alex Brandt
2015-09-06 20:27 Alex Brandt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1475399369.e619ce061100a44dfd15a6cab2a3789c35ba1cc0.zmedico@gentoo \
    --to=zmedico@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox