public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/barnyard/
Date: Fri, 31 Jul 2020 07:15:58 +0000 (UTC)	[thread overview]
Message-ID: <1596179754.024c14ca80470b56f71a9f194ebc083860e8fdd5.jer@gentoo> (raw)

commit:     024c14ca80470b56f71a9f194ebc083860e8fdd5
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 31 07:14:13 2020 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jul 31 07:15:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=024c14ca

net-analyzer/barnyard: Fix building with USE=-sguil

TODO: Fix the USE=sguil patchset properly.

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Closes: https://bugs.gentoo.org/734866
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild
index 4658d4eb7c6..6786fba3781 100644
--- a/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild
+++ b/net-analyzer/barnyard/barnyard-0.2.0-r6.ebuild
@@ -35,11 +35,14 @@ PATCHES=(
 	"${WORKDIR}"/${P}-64bit.patch
 	"${WORKDIR}"/${P}-canonical-ar.patch
 	"${WORKDIR}"/${P}-configure-in.patch
+)
+SGUIL_PATCHES=(
 	"${WORKDIR}"/${P}-op_plugbase.c.patch
 	"${WORKDIR}"/${P}-sguil_files.patch
 )
 
 src_prepare() {
+	use sguil && PATCHES+=( "${SGUIL_PATCHES[@]}" )
 	default
 
 	eautoreconf


             reply	other threads:[~2020-07-31  7:16 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-31  7:15 Jeroen Roovers [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-10-19 19:09 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/barnyard/ Jakov Smolić
2021-05-13 16:12 Ulrich Müller
2020-07-29 12:53 Jeroen Roovers
2019-02-27  5:17 Aaron Bauman
2019-02-09 21:00 Brian Evans
2019-02-09 19:56 Aaron Bauman

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=1596179754.024c14ca80470b56f71a9f194ebc083860e8fdd5.jer@gentoo \
    --to=jer@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