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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1CCAA158003 for ; Fri, 30 Dec 2022 07:59:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C08E4E094A; Fri, 30 Dec 2022 07:59:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96DB2E094F for ; Fri, 30 Dec 2022 07:59:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 98569340E9A for ; Fri, 30 Dec 2022 07:59:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB5897E8 for ; Fri, 30 Dec 2022 07:59:04 +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: <1672387069.39b68aa3e8f76e368e3f322c75a8f923d2fb3e7d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libpcap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libpcap/libpcap-1.10.1-r2.ebuild net-libs/libpcap/libpcap-9999.ebuild X-VCS-Directories: net-libs/libpcap/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 39b68aa3e8f76e368e3f322c75a8f923d2fb3e7d X-VCS-Branch: master Date: Fri, 30 Dec 2022 07:59:04 +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: 9eb3f43a-4fa8-4d0a-bc34-1380d4bdc5bb X-Archives-Hash: 4ac87ed0f076497ecac51186fbeeaccd commit: 39b68aa3e8f76e368e3f322c75a8f923d2fb3e7d Author: Sam James gentoo org> AuthorDate: Fri Dec 30 07:57:49 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Dec 30 07:57:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39b68aa3 net-libs/libpcap: force LEX=flex Already BDEPENDing on it... Closes: https://bugs.gentoo.org/884275 Signed-off-by: Sam James gentoo.org> net-libs/libpcap/libpcap-1.10.1-r2.ebuild | 8 +++++--- net-libs/libpcap/libpcap-9999.ebuild | 17 +++++++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/net-libs/libpcap/libpcap-1.10.1-r2.ebuild b/net-libs/libpcap/libpcap-1.10.1-r2.ebuild index 6edb007ae109..bda001c29111 100644 --- a/net-libs/libpcap/libpcap-1.10.1-r2.ebuild +++ b/net-libs/libpcap/libpcap-1.10.1-r2.ebuild @@ -38,8 +38,8 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" - sys-devel/flex app-alternatives/yacc + sys-devel/flex dbus? ( virtual/pkgconfig ) " @@ -70,8 +70,10 @@ src_prepare() { } multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ + # bug #884275 + export LEX=flex + + ECONF_SOURCE="${S}" econf \ $(use_enable bluetooth) \ $(use_enable dbus) \ $(use_enable rdma) \ diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild index ddd15be165fc..6f83d33095c3 100644 --- a/net-libs/libpcap/libpcap-9999.ebuild +++ b/net-libs/libpcap/libpcap-9999.ebuild @@ -25,7 +25,8 @@ fi LICENSE="BSD" SLOT="0" -IUSE="bluetooth dbus netlink rdma remote static-libs usb yydebug" +IUSE="bluetooth dbus netlink rdma remote static-libs test usb yydebug" +RESTRICT="!test? ( test )" RDEPEND=" bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] ) @@ -37,8 +38,8 @@ RDEPEND=" " DEPEND="${RDEPEND}" BDEPEND=" - sys-devel/flex app-alternatives/yacc + sys-devel/flex dbus? ( virtual/pkgconfig ) " @@ -48,6 +49,7 @@ fi PATCHES=( "${FILESDIR}"/${PN}-1.10.0-usbmon.patch + "${FILESDIR}"/${PN}-1.10.1-pcap-config.patch ) @@ -62,8 +64,10 @@ src_prepare() { } multilib_src_configure() { - ECONF_SOURCE="${S}" \ - econf \ + # bug #884275 + export LEX=flex + + ECONF_SOURCE="${S}" econf \ $(use_enable bluetooth) \ $(use_enable dbus) \ $(use_enable rdma) \ @@ -76,6 +80,11 @@ multilib_src_configure() { multilib_src_compile() { emake all shared + use test && emake testprogs +} + +multilib_src_test() { + testprogs/findalldevstest || die } multilib_src_install_all() {