From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 5C58A1582EF for ; Tue, 11 Mar 2025 20:28:13 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 47BEA343167 for ; Tue, 11 Mar 2025 20:28:13 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 900651103C7; Tue, 11 Mar 2025 20:28:09 +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 bobolink.gentoo.org (Postfix) with ESMTPS id 877341103C7 for ; Tue, 11 Mar 2025 20:28:09 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C91734309A for ; Tue, 11 Mar 2025 20:28:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C793628AE for ; Tue, 11 Mar 2025 20:28:07 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1741724872.c1713905efd44dfccb24fa025cd6c9deaaab0a61.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/rtl-sdr/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/rtl-sdr/rtl-sdr-2.0.1-r1.ebuild net-wireless/rtl-sdr/rtl-sdr-2.0.1.ebuild net-wireless/rtl-sdr/rtl-sdr-2.0.2-r1.ebuild net-wireless/rtl-sdr/rtl-sdr-2.0.2.ebuild net-wireless/rtl-sdr/rtl-sdr-9999.ebuild X-VCS-Directories: net-wireless/rtl-sdr/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: c1713905efd44dfccb24fa025cd6c9deaaab0a61 X-VCS-Branch: master Date: Tue, 11 Mar 2025 20:28:07 +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: e2c0e158-142b-4293-8711-fdaee8130629 X-Archives-Hash: fa4d1b4ac1a01626e9ed7e1895a0ac75 commit: c1713905efd44dfccb24fa025cd6c9deaaab0a61 Author: Conrad Kostecki gentoo org> AuthorDate: Tue Mar 11 20:23:16 2025 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Tue Mar 11 20:27:52 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1713905 net-wireless/rtl-sdr: add blocker on net-wireless/rtl-sdr-blog net-wireless/rtl-sdr and net-wireless/rtl-sdr-blog cannot be installed at the same time, as net-wireless/rtl-sdr-blog is a modified fork. Closes: https://bugs.gentoo.org/951174 Signed-off-by: Conrad Kostecki gentoo.org> .../{rtl-sdr-2.0.1.ebuild => rtl-sdr-2.0.1-r1.ebuild} | 13 ++++++++----- .../{rtl-sdr-2.0.2.ebuild => rtl-sdr-2.0.2-r1.ebuild} | 7 +++++-- net-wireless/rtl-sdr/rtl-sdr-9999.ebuild | 7 +++++-- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/net-wireless/rtl-sdr/rtl-sdr-2.0.1.ebuild b/net-wireless/rtl-sdr/rtl-sdr-2.0.1-r1.ebuild similarity index 80% rename from net-wireless/rtl-sdr/rtl-sdr-2.0.1.ebuild rename to net-wireless/rtl-sdr/rtl-sdr-2.0.1-r1.ebuild index be4305a53b0c..9dc6d39365a4 100644 --- a/net-wireless/rtl-sdr/rtl-sdr-2.0.1.ebuild +++ b/net-wireless/rtl-sdr/rtl-sdr-2.0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,9 +12,9 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://git.osmocom.org/${PN}" else - #COMMIT="142325a93c6ad70f851f43434acfdf75e12dfe03" - #SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - #S="${WORKDIR}/${PN}-${COMMIT}" + # COMMIT="142325a93c6ad70f851f43434acfdf75e12dfe03" + # SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + # S="${WORKDIR}/${PN}-${COMMIT}" SRC_URI="https://github.com/osmocom/rtl-sdr/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86" fi @@ -24,7 +24,10 @@ SLOT="0" IUSE="+zerocopy" DEPEND="virtual/libusb:1" -RDEPEND="${DEPEND}" +RDEPEND=" + ${DEPEND} + !net-wireless/rtl-sdr-blog +" PATCHES=( "${FILESDIR}"/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch diff --git a/net-wireless/rtl-sdr/rtl-sdr-2.0.2.ebuild b/net-wireless/rtl-sdr/rtl-sdr-2.0.2-r1.ebuild similarity index 94% rename from net-wireless/rtl-sdr/rtl-sdr-2.0.2.ebuild rename to net-wireless/rtl-sdr/rtl-sdr-2.0.2-r1.ebuild index 846819c0a2da..521b9853c53c 100644 --- a/net-wireless/rtl-sdr/rtl-sdr-2.0.2.ebuild +++ b/net-wireless/rtl-sdr/rtl-sdr-2.0.2-r1.ebuild @@ -20,8 +20,11 @@ LICENSE="GPL-2+ GPL-3+" SLOT="0" IUSE="+zerocopy" -RDEPEND="virtual/libusb:1" -DEPEND="${RDEPEND}" +DEPEND="virtual/libusb:1" +RDEPEND=" + ${DEPEND} + !net-wireless/rtl-sdr-blog +" PATCHES=( "${FILESDIR}/${PN}-2.0.2-disable-static.patch" diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild index 846819c0a2da..521b9853c53c 100644 --- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild +++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild @@ -20,8 +20,11 @@ LICENSE="GPL-2+ GPL-3+" SLOT="0" IUSE="+zerocopy" -RDEPEND="virtual/libusb:1" -DEPEND="${RDEPEND}" +DEPEND="virtual/libusb:1" +RDEPEND=" + ${DEPEND} + !net-wireless/rtl-sdr-blog +" PATCHES=( "${FILESDIR}/${PN}-2.0.2-disable-static.patch"