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 C0A5015817D for ; Tue, 11 Jun 2024 20:45:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C8B4E2B6B; Tue, 11 Jun 2024 20:45:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 8ABA1E2B5F for ; Tue, 11 Jun 2024 20:45:48 +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 B654833BE00 for ; Tue, 11 Jun 2024 20:45:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E7E1166B for ; Tue, 11 Jun 2024 20:45:46 +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: <1718138555.3701685bcdaa9a9d07e2dee2c3ac8ed9a71dfe54.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsigrok/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/libsigrok/libsigrok-9999.ebuild X-VCS-Directories: sci-libs/libsigrok/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3701685bcdaa9a9d07e2dee2c3ac8ed9a71dfe54 X-VCS-Branch: master Date: Tue, 11 Jun 2024 20:45:46 +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: 0c317bc4-b8ee-4b37-b9f8-d564d7bc36d8 X-Archives-Hash: 4ca301b08a6323cef5102531f4f41911 commit: 3701685bcdaa9a9d07e2dee2c3ac8ed9a71dfe54 Author: Sam James gentoo org> AuthorDate: Tue Jun 11 20:42:35 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jun 11 20:42:35 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3701685b sci-libs/libsigrok: fix broken 9999 sync Fixes: 0c2c5e8a704527b0d86548796f074b26bf339cda Signed-off-by: Sam James gentoo.org> sci-libs/libsigrok/libsigrok-9999.ebuild | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild index 589e3d9a56dd..951d87e75bb6 100644 --- a/sci-libs/libsigrok/libsigrok-9999.ebuild +++ b/sci-libs/libsigrok/libsigrok-9999.ebuild @@ -5,11 +5,11 @@ EAPI="8" PYTHON_COMPAT=( python3_{10..13} ) -inherit autotools python-r1 java-pkg-opt-2 udev xdg-utils +inherit python-r1 java-pkg-opt-2 udev xdg-utils if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="git://sigrok.org/${PN}" - inherit git-r3 + inherit git-r3 autotools else SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz" KEYWORDS="~amd64 ~arm ~arm64 ~x86" @@ -19,8 +19,8 @@ DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file fo HOMEPAGE="https://sigrok.org/wiki/Libsigrok" LICENSE="GPL-3" -SLOT="0/4" -IUSE="bluetooth +cxx ftdi hidapi java parport python serial static-libs test +udev usb" +SLOT="0/9999" +IUSE="bluetooth +cxx ftdi hidapi java nettle parport python serial static-libs test +udev usb" REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )" @@ -34,6 +34,7 @@ LIB_DEPEND=" cxx? ( dev-cpp/glibmm:2[static-libs(+)] ) ftdi? ( dev-embedded/libftdi:1[static-libs(+)] ) hidapi? ( >=dev-libs/hidapi-0.8.0 ) + nettle? ( dev-libs/nettle:=[static-libs(+)] ) parport? ( sys-libs/libieee1284[static-libs(+)] ) python? ( ${PYTHON_DEPS} @@ -64,15 +65,6 @@ DEPEND="${LIB_DEPEND//\[static-libs(+)]} S="${WORKDIR}"/${P} -PATCHES=( - # https://sigrok.org/bugzilla/show_bug.cgi?id=1527 - "${FILESDIR}/${P}-swig-4.patch" - # https://sigrok.org/bugzilla/show_bug.cgi?id=1526 - "${FILESDIR}/${P}-check-0.15.patch" - # https://bugs.gentoo.org/878395 - "${FILESDIR}/${PN}-0.5.2-swig-4.1.patch" -) - pkg_setup() { use python && python_setup java-pkg-opt-2_pkg_setup @@ -83,7 +75,7 @@ src_unpack() { } sigrok_src_prepare() { - eautoreconf + [[ ${PV} == *9999* ]] && eautoreconf } src_prepare() { @@ -97,6 +89,7 @@ sigrok_src_configure() { $(use_with bluetooth libbluez) \ $(use_with ftdi libftdi) \ $(use_with hidapi libhidapi) \ + $(use_with nettle libnettle) \ $(use_with parport libieee1284) \ $(use_with serial libserialport) \ $(use_with usb libusb) \