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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4036715808B for ; Thu, 17 Mar 2022 00:51:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46EC3E0837; Thu, 17 Mar 2022 00:51:16 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 A1A13E0837 for ; Thu, 17 Mar 2022 00:51:15 +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 27ECE3435E3 for ; Thu, 17 Mar 2022 00:51:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41271AF for ; Thu, 17 Mar 2022 00:51:11 +0000 (UTC) From: "Rick Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Rick Farina" Message-ID: <1647478255.6b3fba66b43f3a0f2fe88d05bd45ad1c5d7ac27b.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/osmo-fl2k/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/osmo-fl2k/osmo-fl2k-0.1.1-r1.ebuild net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild X-VCS-Directories: net-wireless/osmo-fl2k/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Rick Farina X-VCS-Revision: 6b3fba66b43f3a0f2fe88d05bd45ad1c5d7ac27b X-VCS-Branch: master Date: Thu, 17 Mar 2022 00:51:11 +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: e3f869fc-3b1e-4f6e-b4f1-58b6f8506be8 X-Archives-Hash: ac1b30a76581e4e32c240625bf10d3df commit: 6b3fba66b43f3a0f2fe88d05bd45ad1c5d7ac27b Author: Rick Farina gentoo org> AuthorDate: Thu Mar 17 00:49:16 2022 +0000 Commit: Rick Farina gentoo org> CommitDate: Thu Mar 17 00:50:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b3fba66 net-wireless/osmo-fl2k: ebuild cleanup/updates Fixes: https://bugs.gentoo.org/727984 Fixes: https://bugs.gentoo.org/835085 Signed-off-by: Rick Farina gentoo.org> ...o-fl2k-0.1.1.ebuild => osmo-fl2k-0.1.1-r1.ebuild} | 20 +++++++++++--------- net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild | 20 +++++++++++--------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild b/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1-r1.ebuild similarity index 78% rename from net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild rename to net-wireless/osmo-fl2k/osmo-fl2k-0.1.1-r1.ebuild index 0df5cfc8b4b9..f8ab9250ade2 100644 --- a/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1.ebuild +++ b/net-wireless/osmo-fl2k/osmo-fl2k-0.1.1-r1.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit cmake-utils flag-o-matic linux-info udev +inherit cmake flag-o-matic linux-info udev DESCRIPTION="turns FL2000-based USB 3.0 to VGA adapters into low cost DACs" - HOMEPAGE="https://osmocom.org/projects/osmo-fl2k/wiki" if [[ ${PV} == "9999" ]]; then @@ -24,9 +23,9 @@ SLOT="0" IUSE="udev" DEPEND="virtual/libusb:1" -RDEPEND="${DEPEND}" -PDEPEND="media-sound/sox - sys-apps/pv" +RDEPEND="${DEPEND} + media-sound/sox + sys-apps/pv" # continguous memory allocator can optionally be used for zero-copy transfer # TODO: tell users to set CONFIG_CMA_SIZE_MBYTES or boot with cma=... parameter @@ -41,12 +40,15 @@ src_configure() { #https://gcc.gnu.org/bugzilla/show_bug.cgi?id=49653 replace-flags -O0 -O2 replace-flags -Os -O2 - cmake-utils_src_configure + cmake_src_configure } src_install() { if use udev; then udev_newrules ${PN}.rules 99-${PN}.rules fi - cmake-utils_src_install + cmake_src_install + # https://bugs.gentoo.org/727984 + # No obvious way to prevent build + find "${ED}" -name libosmo-fl2k.a -delete } diff --git a/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild b/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild index 148e9614dedc..f8ab9250ade2 100644 --- a/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild +++ b/net-wireless/osmo-fl2k/osmo-fl2k-9999.ebuild @@ -1,12 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit cmake-utils flag-o-matic linux-info udev +inherit cmake flag-o-matic linux-info udev DESCRIPTION="turns FL2000-based USB 3.0 to VGA adapters into low cost DACs" - HOMEPAGE="https://osmocom.org/projects/osmo-fl2k/wiki" if [[ ${PV} == "9999" ]]; then @@ -24,9 +23,9 @@ SLOT="0" IUSE="udev" DEPEND="virtual/libusb:1" -RDEPEND="${DEPEND}" -PDEPEND="media-sound/sox - sys-apps/pv" +RDEPEND="${DEPEND} + media-sound/sox + sys-apps/pv" # continguous memory allocator can optionally be used for zero-copy transfer # TODO: tell users to set CONFIG_CMA_SIZE_MBYTES or boot with cma=... parameter @@ -41,12 +40,15 @@ src_configure() { #https://gcc.gnu.org/bugzilla/show_bug.cgi?id=49653 replace-flags -O0 -O2 replace-flags -Os -O2 - cmake-utils_src_configure + cmake_src_configure } src_install() { if use udev; then udev_newrules ${PN}.rules 99-${PN}.rules fi - cmake-utils_src_install + cmake_src_install + # https://bugs.gentoo.org/727984 + # No obvious way to prevent build + find "${ED}" -name libosmo-fl2k.a -delete }