public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/daq/
Date: Sat,  3 Apr 2021 19:53:30 +0000 (UTC)	[thread overview]
Message-ID: <1617479584.5f121c9f43d4502a819d791838ac019e7d083537.sam@gentoo> (raw)

commit:     5f121c9f43d4502a819d791838ac019e7d083537
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  3 19:46:59 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr  3 19:53:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f121c9f

net-libs/daq: multilib--, ${ED}

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-libs/daq/daq-2.0.7.ebuild | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/net-libs/daq/daq-2.0.7.ebuild b/net-libs/daq/daq-2.0.7.ebuild
index d6681e08a35..9ec2ff60a4b 100644
--- a/net-libs/daq/daq-2.0.7.ebuild
+++ b/net-libs/daq/daq-2.0.7.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-inherit autotools multilib
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Data Acquisition library, for packet I/O"
 HOMEPAGE="https://www.snort.org/"
@@ -27,6 +28,7 @@ DEPEND="
 	pcap? ( ${PCAP_DEPEND} )
 "
 RDEPEND="${DEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.6-parallel-grammar.patch #673390
 	"${FILESDIR}"/${PN}-2.0.6-static-libs.patch
@@ -34,7 +36,6 @@ PATCHES=(
 
 src_prepare() {
 	default
-
 	eautoreconf
 }
 
@@ -66,7 +67,7 @@ src_install() {
 	# This has been bugged upstream
 	if ! use static-libs; then
 		for z in libdaq_static libdaq_static_modules; do
-			rm "${D}"/usr/$(get_libdir)/${z}.a
+			rm "${ED}"/usr/$(get_libdir)/${z}.a || die
 		done
 	fi
 }


             reply	other threads:[~2021-04-03 19:53 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-03 19:53 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-01-05 20:51 [gentoo-commits] repo/gentoo:master commit in: net-libs/daq/ Sam James
2020-12-29  8:36 Sam James
2020-12-27  5:40 Sam James
2020-04-14  8:38 Jeroen Roovers
2019-12-13 15:55 Aaron Bauman
2019-11-18 12:22 Agostino Sarubbo
2019-08-11 11:20 David Seifert
2018-12-10 16:45 Thomas Deutschmann
2017-10-29 14:47 Jonas Stein

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=1617479584.5f121c9f43d4502a819d791838ac019e7d083537.sam@gentoo \
    --to=sam@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