From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/rtl-sdr/
Date: Tue, 11 Mar 2025 20:28:07 +0000 (UTC) [thread overview]
Message-ID: <1741724872.c1713905efd44dfccb24fa025cd6c9deaaab0a61.conikost@gentoo> (raw)
commit: c1713905efd44dfccb24fa025cd6c9deaaab0a61
Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 11 20:23:16 2025 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> 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 <conikost <AT> 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"
next reply other threads:[~2025-03-11 20:28 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-11 20:28 Conrad Kostecki [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-24 21:03 [gentoo-commits] repo/gentoo:master commit in: net-wireless/rtl-sdr/ Andreas Sturmlechner
2024-03-16 17:06 Arthur Zamarin
2024-03-16 16:56 Arthur Zamarin
2024-03-16 16:56 Arthur Zamarin
2024-03-16 16:49 Arthur Zamarin
2024-03-16 16:37 Arthur Zamarin
2024-03-16 16:35 Arthur Zamarin
2023-12-14 4:15 Sam James
2023-12-07 2:44 Rick Farina
2022-12-20 21:59 Chí-Thanh Christopher Nguyễn
2021-10-02 15:43 Sam James
2021-09-30 12:28 Andreas Sturmlechner
2021-09-09 23:56 Sam James
2021-09-07 4:48 Sam James
2021-09-07 4:48 Sam James
2021-09-07 4:48 Sam James
2021-08-17 10:23 Marek Szuba
2021-08-03 23:37 Sam James
2021-07-26 6:54 Sam James
2021-07-18 0:36 Sam James
2020-09-09 13:53 Rick Farina
2020-08-18 15:15 Rick Farina
2020-07-05 13:38 Agostino Sarubbo
2020-07-01 17:40 Mike Gilbert
2020-04-28 17:20 Rick Farina
2020-01-21 10:42 Agostino Sarubbo
2020-01-20 12:52 Agostino Sarubbo
2019-07-03 5:22 Rick Farina
2019-05-21 16:55 Stephen Klimaszewski
2018-07-24 3:18 Richard Farina
2018-02-19 17:29 Richard Farina
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1741724872.c1713905efd44dfccb24fa025cd6c9deaaab0a61.conikost@gentoo \
--to=conikost@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox