[gentoo-commits] repo/gentoo:master commit in: net-libs/daq/

[Sam James]

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
 }