From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6186D1382C5 for ; Sat, 3 Apr 2021 19:53:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15761E0857; Sat, 3 Apr 2021 19:53:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F156AE0857 for ; Sat, 3 Apr 2021 19:53:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1AED6340B7E for ; Sat, 3 Apr 2021 19:53:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D741A64B for ; Sat, 3 Apr 2021 19:53:30 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1617479584.5f121c9f43d4502a819d791838ac019e7d083537.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/daq/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/daq/daq-2.0.7.ebuild X-VCS-Directories: net-libs/daq/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5f121c9f43d4502a819d791838ac019e7d083537 X-VCS-Branch: master Date: Sat, 3 Apr 2021 19:53:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 617f4724-33a3-4fcb-9a0b-c039e6c8dcb5 X-Archives-Hash: 93c749c150551964e8627901d8e1bcc3 commit: 5f121c9f43d4502a819d791838ac019e7d083537 Author: Sam James gentoo org> AuthorDate: Sat Apr 3 19:46:59 2021 +0000 Commit: Sam James gentoo 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 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 }