* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-09-26 16:19 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2022-09-26 16:19 UTC (permalink / raw
To: gentoo-commits
commit: 4da8c59251449a199ec14d50f0123f0a7c76e60b
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 16:18:37 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 16:19:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4da8c592
net-wireless/uhd: fix bug 839498
fix use flag conditional file removal
minor comment spelling fix
Closes: https://bugs.gentoo.org/839498
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-4.1.0.5.ebuild | 12 +++++++-----
net-wireless/uhd/uhd-4.2.0.0.ebuild | 10 ++++++----
net-wireless/uhd/uhd-4.3.0.0.ebuild | 10 ++++++----
3 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/net-wireless/uhd/uhd-4.1.0.5.ebuild b/net-wireless/uhd/uhd-4.1.0.5.ebuild
index f77c3fbc8a83..abf30a8c22b6 100644
--- a/net-wireless/uhd/uhd-4.1.0.5.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.5.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${PYTHON_DEPS}
')
"
DEPEND="${RDEPEND}"
-#zip an gzip are directly used by the build system
+#zip and gzip are directly used by the build system
BDEPEND="
doc? ( app-doc/doxygen )
$(python_gen_cond_dep '
@@ -97,10 +97,12 @@ src_configure() {
src_install() {
cmake_src_install
python_optimize
- use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
- if [[ "${PV}" != "9999" ]]; then
- rm -r "${ED}/usr/bin/uhd_images_downloader" || die
- rm -r "${ED}/usr/share/man/man1/uhd_images_downloader.1" || die
+ if use utils; then
+ python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+ if [[ "${PV}" != "9999" ]]; then
+ rm -r "${ED}/usr/bin/uhd_images_downloader" || die
+ rm -r "${ED}/usr/share/man/man1/uhd_images_downloader.1" || die
+ fi
fi
udev_dorules "${S}/utils/uhd-usrp.rules"
diff --git a/net-wireless/uhd/uhd-4.2.0.0.ebuild b/net-wireless/uhd/uhd-4.2.0.0.ebuild
index 065339744a53..43bc62d7590a 100644
--- a/net-wireless/uhd/uhd-4.2.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.2.0.0.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${PYTHON_DEPS}
')
"
DEPEND="${RDEPEND}"
-#zip an gzip are directly used by the build system
+#zip and gzip are directly used by the build system
BDEPEND="
doc? ( app-doc/doxygen )
$(python_gen_cond_dep '
@@ -96,9 +96,11 @@ src_configure() {
src_install() {
cmake_src_install
python_optimize
- use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
- if [[ "${PV}" != "9999" ]]; then
- rm -r "${ED}/usr/bin/uhd_images_downloader" || die
+ if use utils; then
+ python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+ if [[ "${PV}" != "9999" ]]; then
+ rm -r "${ED}/usr/bin/uhd_images_downloader" || die
+ fi
fi
# do not install test files (bug #857492)
if use test; then
diff --git a/net-wireless/uhd/uhd-4.3.0.0.ebuild b/net-wireless/uhd/uhd-4.3.0.0.ebuild
index 065339744a53..43bc62d7590a 100644
--- a/net-wireless/uhd/uhd-4.3.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.3.0.0.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${PYTHON_DEPS}
')
"
DEPEND="${RDEPEND}"
-#zip an gzip are directly used by the build system
+#zip and gzip are directly used by the build system
BDEPEND="
doc? ( app-doc/doxygen )
$(python_gen_cond_dep '
@@ -96,9 +96,11 @@ src_configure() {
src_install() {
cmake_src_install
python_optimize
- use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
- if [[ "${PV}" != "9999" ]]; then
- rm -r "${ED}/usr/bin/uhd_images_downloader" || die
+ if use utils; then
+ python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+ if [[ "${PV}" != "9999" ]]; then
+ rm -r "${ED}/usr/bin/uhd_images_downloader" || die
+ fi
fi
# do not install test files (bug #857492)
if use test; then
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2024-05-18 8:18 Arthur Zamarin
0 siblings, 0 replies; 55+ messages in thread
From: Arthur Zamarin @ 2024-05-18 8:18 UTC (permalink / raw
To: gentoo-commits
commit: b29a0d447551032d321ba80338802ca381a30d03
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 08:18:06 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat May 18 08:18:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b29a0d44
net-wireless/uhd: Stabilize 4.6.0.0 amd64, #908603
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-wireless/uhd/uhd-4.6.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-wireless/uhd/uhd-4.6.0.0.ebuild b/net-wireless/uhd/uhd-4.6.0.0.ebuild
index 514bdaafdd63..9872c06071f8 100644
--- a/net-wireless/uhd/uhd-4.6.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.6.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusRese
LICENSE="GPL-3"
SLOT="0/$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~riscv ~x86"
IUSE="+b100 +b200 doc cpu_flags_arm_neon cpu_flags_x86_ssse3 e300 examples +mpmd octoclock test +usb +usrp1 +usrp2 +utils +x300"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2024-01-25 16:44 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2024-01-25 16:44 UTC (permalink / raw
To: gentoo-commits
commit: 321a457332e578ba0addb8c6f65aa20101af690c
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 25 16:39:45 2024 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 16:44:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=321a4573
net-wireless/uhd: remove unneeded cmake flag
upstream handles ncurses in their cmakefile now
Closes: https://bugs.gentoo.org/876445
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-4.6.0.0.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/net-wireless/uhd/uhd-4.6.0.0.ebuild b/net-wireless/uhd/uhd-4.6.0.0.ebuild
index e84fcfca773b..514bdaafdd63 100644
--- a/net-wireless/uhd/uhd-4.6.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.6.0.0.ebuild
@@ -65,7 +65,6 @@ src_configure() {
#https://gitlab.kitware.com/cmake/cmake/-/issues/23236
#https://github.com/EttusResearch/uhd/pull/560
local mycmakeargs=(
- -DCURSES_NEED_NCURSES=ON
-DENABLE_LIBUHD=ON
-DENABLE_C_API=ON
-DENABLE_MAN_PAGES=ON
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2024-01-25 16:44 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2024-01-25 16:44 UTC (permalink / raw
To: gentoo-commits
commit: 53cead1daa8ff2218fc68cef6673bbc0ec303ac6
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 25 16:34:18 2024 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 16:44:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53cead1d
net-wireless/uhd: add 4.6.0.0
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/Manifest | 2 +
net-wireless/uhd/uhd-4.6.0.0.ebuild | 149 ++++++++++++++++++++++++++++++++++++
2 files changed, 151 insertions(+)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 91a65be5da1c..3c32537c43ec 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,2 +1,4 @@
DIST EttusResearch-UHD-4.4.0.0.tar.gz 38210999 BLAKE2B defc2ae91c1422491c0c434f76852c253d84e2bdc43f6768069e23c40803d33aac8f087d51c28037102ab4760c5f3d5e04dc090655ddca26eef3440bf703db61 SHA512 3c9b57dc776e0fadc991ffeede84c2367f7403bfae6fd30a045baf1c9cfb21889310b9a8340a35ea13eea00208bf678cccd7b82e190dfb6b9d61e42bdef3b21a
+DIST EttusResearch-UHD-4.6.0.0.tar.gz 41235519 BLAKE2B 4a9c9d0064bf52edd4a4a93ee8602eaa61029b5350728431e4e2e17d9f4a06de21c2598a6ffde0832ecfd5a499344d190ba113f1c5d96ffea0a029186f95de87 SHA512 de9bb10e5109bd860a9b2f61841e3ade55fbbc7d8000f385fcdf1c831585c9d25999d159a7da95e3e3f0b74330c1512265994e9aacf00b1b0891f9ba6db58e30
DIST uhd-images_4.4.0.0.tar.xz 127558912 BLAKE2B bb7135241c4e39db2450e0fca8c8c6b0421d76f512dca08e50732ee0a2dbfa5f330df168101607d52b6215aba083cd966027a9da8f14331f6bac17fdd76d766b SHA512 17b364128155bf850ff5ae72eeb8fa52446881d0234254943d27524610f0efc4d5bf5da7be248982fc603101d4f76f5a8019fbecb044d2637a1022cdccde0463
+DIST uhd-images_4.6.0.0.tar.xz 180745328 BLAKE2B f698c68c66e706146cd2163abca10bc2d3660827e2425f395b9096b1ccecdadaf563730912e930e29b6f286dd77a83dc2ab0280e0d55ceb550496de03c208917 SHA512 944a26bea2f11d0df630e14a2a586d07e185e2c9bf40e10ff17cc103a33a8cf32c37b676e15cf55a1c1efd17c82384c7323526aed4b0624fda0b58d39ed487d3
diff --git a/net-wireless/uhd/uhd-4.6.0.0.ebuild b/net-wireless/uhd/uhd-4.6.0.0.ebuild
new file mode 100644
index 000000000000..e84fcfca773b
--- /dev/null
+++ b/net-wireless/uhd/uhd-4.6.0.0.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit cmake gnome2-utils python-single-r1 udev
+
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
+HOMEPAGE="https://kb.ettus.com"
+
+SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
+ https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
+#https://github.com/EttusResearch/UHD-Mirror/tags
+#http://files.ettus.com/binaries/images/
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="+b100 +b200 doc cpu_flags_arm_neon cpu_flags_x86_ssse3 e300 examples +mpmd octoclock test +usb +usrp1 +usrp2 +utils +x300"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ b100? ( usb )
+ b200? ( usb )
+ usrp1? ( usb )
+ usrp2? ( usb )
+ || ( b100 b200 e300 mpmd usrp1 usrp2 x300 )"
+
+RDEPEND="${PYTHON_DEPS}
+ e300? ( virtual/udev )
+ usb? ( virtual/libusb:1 )
+ dev-libs/boost:=
+ sys-libs/ncurses:0=
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ ')
+"
+DEPEND="${RDEPEND}"
+#zip and gzip are directly used by the build system
+BDEPEND="
+ doc? ( app-text/doxygen )
+ $(python_gen_cond_dep '
+ dev-python/mako[${PYTHON_USEDEP}]
+ ')
+ app-arch/unzip
+ app-arch/gzip
+"
+
+S="${WORKDIR}/${P}/host"
+
+src_unpack() {
+ default
+ mv "uhd-images_${PV}" images || die
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ gnome2_environment_reset #534582
+}
+
+src_configure() {
+ #https://gitlab.kitware.com/cmake/cmake/-/issues/23236
+ #https://github.com/EttusResearch/uhd/pull/560
+ local mycmakeargs=(
+ -DCURSES_NEED_NCURSES=ON
+ -DENABLE_LIBUHD=ON
+ -DENABLE_C_API=ON
+ -DENABLE_MAN_PAGES=ON
+ -DENABLE_MAN_PAGE_COMPRESSION=OFF
+ -DENABLE_EXAMPLES="$(usex examples)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_USB="$(usex usb)"
+ -DENABLE_UTILS="$(usex utils)"
+ -DENABLE_MANUAL="$(usex doc)"
+ -DENABLE_DOXYGEN="$(usex doc)"
+ -DENABLE_B100="$(usex b100)"
+ -DENABLE_B200="$(usex b200)"
+ -DENABLE_E300="$(usex e300)"
+ -DENABLE_USRP1="$(usex usrp1)"
+ -DENABLE_USRP2="$(usex usrp2)"
+ -DENABLE_X300="$(usex x300)"
+ -DENABLE_MPMD="$(usex mpmd)"
+ -DENABLE_OCTOCLOCK="$(usex octoclock)"
+ -DENABLE_SSSE3="$(usex cpu_flags_x86_ssse3)"
+ -DNEON_SIMD_ENABLE="$(usex cpu_flags_arm_neon)"
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+ -DUHD_VERSION="${PV}"
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ python_optimize
+ if use utils; then
+ python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+ if [[ "${PV}" != "9999" ]]; then
+ rm -r "${ED}/usr/bin/uhd_images_downloader" || die
+ fi
+ fi
+ # do not install test files (bug #857492)
+ if use test; then
+ rm "${ED}/usr/lib64/${PN}/tests" -R || die
+ fi
+
+ udev_dorules "${S}/utils/uhd-usrp.rules"
+
+ rm -r "${WORKDIR}/images/winusb_driver" || die
+ if ! use b100; then
+ rm "${WORKDIR}"/images/usrp_b100* || die
+ fi
+ if ! use b200; then
+ rm "${WORKDIR}"/images/usrp_b2[01]* || die
+ fi
+ if ! use e300; then
+ rm "${WORKDIR}"/images/usrp_e3* || die
+ fi
+ if ! use mpmd; then
+ rm "${WORKDIR}"/images/usrp_n310* || die
+ fi
+ if ! use octoclock; then
+ rm "${WORKDIR}"/images/octoclock* || die
+ fi
+ if ! use usrp1; then
+ rm "${WORKDIR}"/images/usrp1* || die
+ fi
+ if ! use usrp2; then
+ rm "${WORKDIR}"/images/usrp2* || die
+ rm "${WORKDIR}"/images/usrp_n2[01]* || die
+ rm -r "${WORKDIR}"/images/bit || die
+ fi
+ if ! use x300; then
+ rm "${WORKDIR}/"images/usrp_x3* || die
+ fi
+ insinto /usr/share/${PN}
+ doins -r "${WORKDIR}/images"
+}
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2023-08-19 22:48 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2023-08-19 22:48 UTC (permalink / raw
To: gentoo-commits
commit: d77b0300a5450d2970337c9acab437c4518b494b
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 22:45:25 2023 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 22:45:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d77b0300
net-wireless/uhd: drop unused USE flag
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/metadata.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/net-wireless/uhd/metadata.xml b/net-wireless/uhd/metadata.xml
index 6e0308ff1a54..53ff3bc77463 100644
--- a/net-wireless/uhd/metadata.xml
+++ b/net-wireless/uhd/metadata.xml
@@ -22,7 +22,6 @@
<flag name="e300">support E300, E310 hardware</flag>
<flag name="mpmd">support N300, N310 hardware</flag>
<flag name="octoclock">Octoclock Network Support</flag>
- <flag name="n230">support N230 harware</flag>
<flag name="usrp1">support USRP1 hardware</flag>
<flag name="usrp2">support USRP2, N200, N210 hardware</flag>
<flag name="utils">utilities needed to list, query, calibrate, or update FPGA/Firmware</flag>
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2023-08-19 13:34 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2023-08-19 13:34 UTC (permalink / raw
To: gentoo-commits
commit: be01aa24e231481250444690b94f6fb7660db483
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 13:29:42 2023 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 13:29:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be01aa24
net-wireless/uhd: drop 4.3.0.0
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/Manifest | 2 -
net-wireless/uhd/uhd-4.3.0.0.ebuild | 153 ------------------------------------
2 files changed, 155 deletions(-)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 2000dd6e75a4..91a65be5da1c 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,4 +1,2 @@
-DIST EttusResearch-UHD-4.3.0.0.tar.gz 38204958 BLAKE2B 64b30d97611a96ed15b8a4bbe91065301d7b8b20e61b69e2dafd93088dcd7780c9c897462c482dff548b9b52081fa2832b09ff4a682208fed0a9a86aa3a3d957 SHA512 8907e134747b853dd3fa457ac097287783b362a56ac9fdf6fb44157baa1ddabfe3934e110bfac81180b42ea7ec2defefc444736955091a072b1166b5d27253fc
DIST EttusResearch-UHD-4.4.0.0.tar.gz 38210999 BLAKE2B defc2ae91c1422491c0c434f76852c253d84e2bdc43f6768069e23c40803d33aac8f087d51c28037102ab4760c5f3d5e04dc090655ddca26eef3440bf703db61 SHA512 3c9b57dc776e0fadc991ffeede84c2367f7403bfae6fd30a045baf1c9cfb21889310b9a8340a35ea13eea00208bf678cccd7b82e190dfb6b9d61e42bdef3b21a
-DIST uhd-images_4.3.0.0.tar.xz 126848556 BLAKE2B d352b0cbb5e23b0c16c540be756f23342aa63b14679bf19ae940cfd9f686ef2c7830b7feb0b3dc53aaec3cca502e8ab1ab9b8754c95edb116fd34f03ac378843 SHA512 3b34d7b2d3d957284cd8a94043158ba5d7b9999d3da4ed6f97f6d38b427c3af54129e7b5a9840d7ec8ff1e8c5c61ef31f62994d81d7ea8a36cbd098274a999d7
DIST uhd-images_4.4.0.0.tar.xz 127558912 BLAKE2B bb7135241c4e39db2450e0fca8c8c6b0421d76f512dca08e50732ee0a2dbfa5f330df168101607d52b6215aba083cd966027a9da8f14331f6bac17fdd76d766b SHA512 17b364128155bf850ff5ae72eeb8fa52446881d0234254943d27524610f0efc4d5bf5da7be248982fc603101d4f76f5a8019fbecb044d2637a1022cdccde0463
diff --git a/net-wireless/uhd/uhd-4.3.0.0.ebuild b/net-wireless/uhd/uhd-4.3.0.0.ebuild
deleted file mode 100644
index 5586a4dae981..000000000000
--- a/net-wireless/uhd/uhd-4.3.0.0.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake gnome2-utils python-single-r1 udev
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
- https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
-IUSE="+b100 +b200 doc cpu_flags_arm_neon cpu_flags_x86_ssse3 e300 examples +mpmd octoclock test +usb +usrp1 +usrp2 +utils +x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- b100? ( usb )
- b200? ( usb )
- usrp1? ( usb )
- usrp2? ( usb )
- || ( b100 b200 e300 mpmd usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
- e300? ( virtual/udev )
- usb? ( virtual/libusb:1 )
- dev-libs/boost:=
- sys-libs/ncurses:0=
- $(python_gen_cond_dep '
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- ')
-"
-DEPEND="${RDEPEND}"
-#zip and gzip are directly used by the build system
-BDEPEND="
- doc? ( app-doc/doxygen )
- $(python_gen_cond_dep '
- dev-python/mako[${PYTHON_USEDEP}]
- ')
- app-arch/unzip
- app-arch/gzip
-"
-
-S="${WORKDIR}/${P}/host"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.3.0.0-gcc-13.patch
-)
-
-src_unpack() {
- default
- mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
- cmake_src_prepare
-
- gnome2_environment_reset #534582
-}
-
-src_configure() {
- #https://gitlab.kitware.com/cmake/cmake/-/issues/23236
- #https://github.com/EttusResearch/uhd/pull/560
- local mycmakeargs=(
- -DCURSES_NEED_NCURSES=ON
- -DENABLE_LIBUHD=ON
- -DENABLE_C_API=ON
- -DENABLE_MAN_PAGES=ON
- -DENABLE_MAN_PAGE_COMPRESSION=OFF
- -DENABLE_EXAMPLES="$(usex examples)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_USB="$(usex usb)"
- -DENABLE_UTILS="$(usex utils)"
- -DENABLE_MANUAL="$(usex doc)"
- -DENABLE_DOXYGEN="$(usex doc)"
- -DENABLE_B100="$(usex b100)"
- -DENABLE_B200="$(usex b200)"
- -DENABLE_E300="$(usex e300)"
- -DENABLE_USRP1="$(usex usrp1)"
- -DENABLE_USRP2="$(usex usrp2)"
- -DENABLE_X300="$(usex x300)"
- -DENABLE_MPMD="$(usex mpmd)"
- -DENABLE_OCTOCLOCK="$(usex octoclock)"
- -DENABLE_SSSE3="$(usex cpu_flags_x86_ssse3)"
- -DNEON_SIMD_ENABLE="$(usex cpu_flags_arm_neon)"
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
- -DUHD_VERSION="${PV}"
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- python_optimize
- if use utils; then
- python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
- if [[ "${PV}" != "9999" ]]; then
- rm -r "${ED}/usr/bin/uhd_images_downloader" || die
- fi
- fi
- # do not install test files (bug #857492)
- if use test; then
- rm "${ED}/usr/lib64/${PN}/tests" -R || die
- fi
-
- udev_dorules "${S}/utils/uhd-usrp.rules"
-
- rm -r "${WORKDIR}/images/winusb_driver" || die
- if ! use b100; then
- rm "${WORKDIR}"/images/usrp_b100* || die
- fi
- if ! use b200; then
- rm "${WORKDIR}"/images/usrp_b2[01]* || die
- fi
- if ! use e300; then
- rm "${WORKDIR}"/images/usrp_e3* || die
- fi
- if ! use mpmd; then
- rm "${WORKDIR}"/images/usrp_n310* || die
- fi
- if ! use octoclock; then
- rm "${WORKDIR}"/images/octoclock* || die
- fi
- if ! use usrp1; then
- rm "${WORKDIR}"/images/usrp1* || die
- fi
- if ! use usrp2; then
- rm "${WORKDIR}"/images/usrp2* || die
- rm "${WORKDIR}"/images/usrp_n2[01]* || die
- rm -r "${WORKDIR}"/images/bit || die
- fi
- if ! use x300; then
- rm "${WORKDIR}/"images/usrp_x3* || die
- fi
- insinto /usr/share/${PN}
- doins -r "${WORKDIR}/images"
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2023-08-19 13:34 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2023-08-19 13:34 UTC (permalink / raw
To: gentoo-commits
commit: 6664ebc251261a3aca058fe2b5cda3e9a1a484b1
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 13:28:27 2023 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 13:28:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6664ebc2
net-wireless/uhd: drop 4.2.0.0
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/Manifest | 2 -
net-wireless/uhd/uhd-4.2.0.0.ebuild | 149 ------------------------------------
2 files changed, 151 deletions(-)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 9a5ae218762c..2000dd6e75a4 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,6 +1,4 @@
-DIST EttusResearch-UHD-4.2.0.0.tar.gz 38124395 BLAKE2B cbb149e6f6aaff628e40463b37b3e52ee758acaaf8e86f85586a70fb4d9744408fb2c807a491b91de64a8cb23adb566722eece99eb8bd844e704d5412372b2ec SHA512 a5f105a8765a06e53bed17dee760dfa985d40a97c61ca243127c8a912378d6f5ae81170a48e8e5f92a238bcfd66742798043b3fb0119e574dbac74291f15ec9c
DIST EttusResearch-UHD-4.3.0.0.tar.gz 38204958 BLAKE2B 64b30d97611a96ed15b8a4bbe91065301d7b8b20e61b69e2dafd93088dcd7780c9c897462c482dff548b9b52081fa2832b09ff4a682208fed0a9a86aa3a3d957 SHA512 8907e134747b853dd3fa457ac097287783b362a56ac9fdf6fb44157baa1ddabfe3934e110bfac81180b42ea7ec2defefc444736955091a072b1166b5d27253fc
DIST EttusResearch-UHD-4.4.0.0.tar.gz 38210999 BLAKE2B defc2ae91c1422491c0c434f76852c253d84e2bdc43f6768069e23c40803d33aac8f087d51c28037102ab4760c5f3d5e04dc090655ddca26eef3440bf703db61 SHA512 3c9b57dc776e0fadc991ffeede84c2367f7403bfae6fd30a045baf1c9cfb21889310b9a8340a35ea13eea00208bf678cccd7b82e190dfb6b9d61e42bdef3b21a
-DIST uhd-images_4.2.0.0.tar.xz 127034940 BLAKE2B ab186ad83fe607c745a56862363a8cc0566450bffc90f070714b07124f1172d09a823fa7b74c7b7cd0fe42cd00d1f0178ed63b07a7959fd59ea5cde071c639fd SHA512 b3cee57b63137e074d370eed3d1c1533627a85cd3937103721d2f4ee322c6725a38be62cd737891193fa2b4c32f32cff372fadf4f75cb3cec3f9085cdc889c8f
DIST uhd-images_4.3.0.0.tar.xz 126848556 BLAKE2B d352b0cbb5e23b0c16c540be756f23342aa63b14679bf19ae940cfd9f686ef2c7830b7feb0b3dc53aaec3cca502e8ab1ab9b8754c95edb116fd34f03ac378843 SHA512 3b34d7b2d3d957284cd8a94043158ba5d7b9999d3da4ed6f97f6d38b427c3af54129e7b5a9840d7ec8ff1e8c5c61ef31f62994d81d7ea8a36cbd098274a999d7
DIST uhd-images_4.4.0.0.tar.xz 127558912 BLAKE2B bb7135241c4e39db2450e0fca8c8c6b0421d76f512dca08e50732ee0a2dbfa5f330df168101607d52b6215aba083cd966027a9da8f14331f6bac17fdd76d766b SHA512 17b364128155bf850ff5ae72eeb8fa52446881d0234254943d27524610f0efc4d5bf5da7be248982fc603101d4f76f5a8019fbecb044d2637a1022cdccde0463
diff --git a/net-wireless/uhd/uhd-4.2.0.0.ebuild b/net-wireless/uhd/uhd-4.2.0.0.ebuild
deleted file mode 100644
index 105e2cb0463c..000000000000
--- a/net-wireless/uhd/uhd-4.2.0.0.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake gnome2-utils python-single-r1 udev
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
- https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
-IUSE="+b100 +b200 doc cpu_flags_arm_neon cpu_flags_x86_ssse3 e300 examples +mpmd octoclock test +usb +usrp1 +usrp2 +utils +x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- b100? ( usb )
- b200? ( usb )
- usrp1? ( usb )
- usrp2? ( usb )
- || ( b100 b200 e300 mpmd usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
- e300? ( virtual/udev )
- usb? ( virtual/libusb:1 )
- dev-libs/boost:=
- sys-libs/ncurses:0=
- $(python_gen_cond_dep '
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- ')
-"
-DEPEND="${RDEPEND}"
-#zip and gzip are directly used by the build system
-BDEPEND="
- doc? ( app-doc/doxygen )
- $(python_gen_cond_dep '
- dev-python/mako[${PYTHON_USEDEP}]
- ')
- app-arch/unzip
- app-arch/gzip
-"
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
- default
- mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
- cmake_src_prepare
-
- gnome2_environment_reset #534582
-}
-
-src_configure() {
- #https://gitlab.kitware.com/cmake/cmake/-/issues/23236
- #https://github.com/EttusResearch/uhd/pull/560
- local mycmakeargs=(
- -DCURSES_NEED_NCURSES=ON
- -DENABLE_LIBUHD=ON
- -DENABLE_C_API=ON
- -DENABLE_MAN_PAGES=ON
- -DENABLE_MAN_PAGE_COMPRESSION=OFF
- -DENABLE_EXAMPLES="$(usex examples)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_USB="$(usex usb)"
- -DENABLE_UTILS="$(usex utils)"
- -DENABLE_MANUAL="$(usex doc)"
- -DENABLE_DOXYGEN="$(usex doc)"
- -DENABLE_B100="$(usex b100)"
- -DENABLE_B200="$(usex b200)"
- -DENABLE_E300="$(usex e300)"
- -DENABLE_USRP1="$(usex usrp1)"
- -DENABLE_USRP2="$(usex usrp2)"
- -DENABLE_X300="$(usex x300)"
- -DENABLE_MPMD="$(usex mpmd)"
- -DENABLE_OCTOCLOCK="$(usex octoclock)"
- -DENABLE_SSSE3="$(usex cpu_flags_x86_ssse3)"
- -DNEON_SIMD_ENABLE="$(usex cpu_flags_arm_neon)"
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
- -DUHD_VERSION="${PV}"
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- python_optimize
- if use utils; then
- python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
- if [[ "${PV}" != "9999" ]]; then
- rm -r "${ED}/usr/bin/uhd_images_downloader" || die
- fi
- fi
- # do not install test files (bug #857492)
- if use test; then
- rm "${ED}/usr/lib64/${PN}/tests" -R || die
- fi
-
- udev_dorules "${S}/utils/uhd-usrp.rules"
-
- rm -r "${WORKDIR}/images/winusb_driver" || die
- if ! use b100; then
- rm "${WORKDIR}"/images/usrp_b100* || die
- fi
- if ! use b200; then
- rm "${WORKDIR}"/images/usrp_b2[01]* || die
- fi
- if ! use e300; then
- rm "${WORKDIR}"/images/usrp_e3* || die
- fi
- if ! use mpmd; then
- rm "${WORKDIR}"/images/usrp_n310* || die
- fi
- if ! use octoclock; then
- rm "${WORKDIR}"/images/octoclock* || die
- fi
- if ! use usrp1; then
- rm "${WORKDIR}"/images/usrp1* || die
- fi
- if ! use usrp2; then
- rm "${WORKDIR}"/images/usrp2* || die
- rm "${WORKDIR}"/images/usrp_n2[01]* || die
- rm -r "${WORKDIR}"/images/bit || die
- fi
- if ! use x300; then
- rm "${WORKDIR}/"images/usrp_x3* || die
- fi
- insinto /usr/share/${PN}
- doins -r "${WORKDIR}/images"
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2023-08-19 13:34 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2023-08-19 13:34 UTC (permalink / raw
To: gentoo-commits
commit: bf4279f1d076bb54e843f565ebc715ca48c11196
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 13:27:59 2023 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 13:27:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf4279f1
net-wireless/uhd: drop 4.1.0.5
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/Manifest | 2 -
net-wireless/uhd/uhd-4.1.0.5.ebuild | 142 ------------------------------------
2 files changed, 144 deletions(-)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index f792b51a451d..9a5ae218762c 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,8 +1,6 @@
-DIST EttusResearch-UHD-4.1.0.5.tar.gz 37975618 BLAKE2B ff5b38be7ef7088168f2bf8908e59e74d2f492a860dac6b7fef48abd5d25840435a57b3ef980ceb7416efd1d3520a3f83bace3bc5bca5caaecc14088e9609fcd SHA512 4929ebc8a12bcc0acfe4a64ceafe17387420e2f056e7bb7284a8d7b60d14aba05484b3c033ce63b00c6d9115f570b056df4e2b36e11a2b25079a8c34b1d084af
DIST EttusResearch-UHD-4.2.0.0.tar.gz 38124395 BLAKE2B cbb149e6f6aaff628e40463b37b3e52ee758acaaf8e86f85586a70fb4d9744408fb2c807a491b91de64a8cb23adb566722eece99eb8bd844e704d5412372b2ec SHA512 a5f105a8765a06e53bed17dee760dfa985d40a97c61ca243127c8a912378d6f5ae81170a48e8e5f92a238bcfd66742798043b3fb0119e574dbac74291f15ec9c
DIST EttusResearch-UHD-4.3.0.0.tar.gz 38204958 BLAKE2B 64b30d97611a96ed15b8a4bbe91065301d7b8b20e61b69e2dafd93088dcd7780c9c897462c482dff548b9b52081fa2832b09ff4a682208fed0a9a86aa3a3d957 SHA512 8907e134747b853dd3fa457ac097287783b362a56ac9fdf6fb44157baa1ddabfe3934e110bfac81180b42ea7ec2defefc444736955091a072b1166b5d27253fc
DIST EttusResearch-UHD-4.4.0.0.tar.gz 38210999 BLAKE2B defc2ae91c1422491c0c434f76852c253d84e2bdc43f6768069e23c40803d33aac8f087d51c28037102ab4760c5f3d5e04dc090655ddca26eef3440bf703db61 SHA512 3c9b57dc776e0fadc991ffeede84c2367f7403bfae6fd30a045baf1c9cfb21889310b9a8340a35ea13eea00208bf678cccd7b82e190dfb6b9d61e42bdef3b21a
-DIST uhd-images_4.1.0.5.tar.xz 118480128 BLAKE2B 90803ca0a7452e601481837d006dbaf0eab57070d4fccfd0576a7a7736c11fa62caf9ea141be807a5c4d65ba2bb0f7a5361833ff2afb9f732f231b2bb659f08e SHA512 fa9ca49bc917e55a1505acce090dc6b06cac6c59fbe7a78c2c47f79783fab52baf9563903715da205762962485c8b4a83292a171a33e7c247b0eeb35819aff5c
DIST uhd-images_4.2.0.0.tar.xz 127034940 BLAKE2B ab186ad83fe607c745a56862363a8cc0566450bffc90f070714b07124f1172d09a823fa7b74c7b7cd0fe42cd00d1f0178ed63b07a7959fd59ea5cde071c639fd SHA512 b3cee57b63137e074d370eed3d1c1533627a85cd3937103721d2f4ee322c6725a38be62cd737891193fa2b4c32f32cff372fadf4f75cb3cec3f9085cdc889c8f
DIST uhd-images_4.3.0.0.tar.xz 126848556 BLAKE2B d352b0cbb5e23b0c16c540be756f23342aa63b14679bf19ae940cfd9f686ef2c7830b7feb0b3dc53aaec3cca502e8ab1ab9b8754c95edb116fd34f03ac378843 SHA512 3b34d7b2d3d957284cd8a94043158ba5d7b9999d3da4ed6f97f6d38b427c3af54129e7b5a9840d7ec8ff1e8c5c61ef31f62994d81d7ea8a36cbd098274a999d7
DIST uhd-images_4.4.0.0.tar.xz 127558912 BLAKE2B bb7135241c4e39db2450e0fca8c8c6b0421d76f512dca08e50732ee0a2dbfa5f330df168101607d52b6215aba083cd966027a9da8f14331f6bac17fdd76d766b SHA512 17b364128155bf850ff5ae72eeb8fa52446881d0234254943d27524610f0efc4d5bf5da7be248982fc603101d4f76f5a8019fbecb044d2637a1022cdccde0463
diff --git a/net-wireless/uhd/uhd-4.1.0.5.ebuild b/net-wireless/uhd/uhd-4.1.0.5.ebuild
deleted file mode 100644
index 0cd814244c4d..000000000000
--- a/net-wireless/uhd/uhd-4.1.0.5.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake gnome2-utils python-single-r1 udev
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
- https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- b100? ( usb )
- b200? ( usb )
- usrp1? ( usb )
- usrp2? ( usb )
- || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
- e300? ( virtual/udev )
- usb? ( virtual/libusb:1 )
- dev-libs/boost:=
- sys-libs/ncurses:0=
- $(python_gen_cond_dep '
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- ')
-"
-DEPEND="${RDEPEND}"
-#zip and gzip are directly used by the build system
-BDEPEND="
- doc? ( app-doc/doxygen )
- $(python_gen_cond_dep '
- dev-python/mako[${PYTHON_USEDEP}]
- ')
- app-arch/unzip
- app-arch/gzip
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.1.0.5-hidden-visibility-tests.patch"
-)
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
- default
- mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
- cmake_src_prepare
-
- gnome2_environment_reset #534582
-}
-
-src_configure() {
- #https://gitlab.kitware.com/cmake/cmake/-/issues/23236
- #https://github.com/EttusResearch/uhd/pull/560
- local mycmakeargs=(
- -DCURSES_NEED_NCURSES=ON
- -DENABLE_LIBUHD=ON
- -DENABLE_C_API=ON
- -DENABLE_MAN_PAGES=ON
- -DENABLE_MAN_PAGE_COMPRESSION=OFF
- -DENABLE_EXAMPLES="$(usex examples)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_USB="$(usex usb)"
- -DENABLE_UTILS="$(usex utils)"
- -DENABLE_MANUAL="$(usex doc)"
- -DENABLE_DOXYGEN="$(usex doc)"
- -DENABLE_B100="$(usex b100)"
- -DENABLE_B200="$(usex b200)"
- -DENABLE_E300="$(usex e300)"
- -DENABLE_USRP1="$(usex usrp1)"
- -DENABLE_USRP2="$(usex usrp2)"
- -DENABLE_X300="$(usex x300)"
- -DENABLE_MPMD="$(usex mpmd)"
- -DENABLE_OCTOCLOCK="$(usex octoclock)"
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
- )
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- python_optimize
- if use utils; then
- python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
- if [[ "${PV}" != "9999" ]]; then
- rm -r "${ED}/usr/bin/uhd_images_downloader" || die
- rm -r "${ED}/usr/share/man/man1/uhd_images_downloader.1" || die
- fi
- fi
-
- udev_dorules "${S}/utils/uhd-usrp.rules"
-
- rm -r "${WORKDIR}/images/winusb_driver" || die
- if ! use b100; then
- rm "${WORKDIR}"/images/usrp_b100* || die
- fi
- if ! use b200; then
- rm "${WORKDIR}"/images/usrp_b2[01]* || die
- fi
- if ! use e300; then
- rm "${WORKDIR}"/images/usrp_e3* || die
- fi
- if ! use mpmd; then
- rm "${WORKDIR}"/images/usrp_n310* || die
- fi
- if ! use n230; then
- rm "${WORKDIR}"/images/usrp_n230* || die
- fi
- if ! use octoclock; then
- rm "${WORKDIR}"/images/octoclock* || die
- fi
- if ! use usrp1; then
- rm "${WORKDIR}"/images/usrp1* || die
- fi
- if ! use usrp2; then
- rm "${WORKDIR}"/images/usrp2* || die
- rm "${WORKDIR}"/images/usrp_n2[01]* || die
- rm -r "${WORKDIR}"/images/bit || die
- fi
- if ! use x300; then
- rm "${WORKDIR}/"images/usrp_x3* || die
- fi
- insinto /usr/share/${PN}
- doins -r "${WORKDIR}/images"
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2023-07-28 18:23 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2023-07-28 18:23 UTC (permalink / raw
To: gentoo-commits
commit: 23e4656dcd3e3558113fbbdc1d26e73bdb01a0bc
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 28 15:36:36 2023 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Jul 28 18:23:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23e4656d
net-wireless/uhd: drop merged patch 4.4.0.0
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-4.4.0.0.ebuild | 4 ----
1 file changed, 4 deletions(-)
diff --git a/net-wireless/uhd/uhd-4.4.0.0.ebuild b/net-wireless/uhd/uhd-4.4.0.0.ebuild
index f436fe282051..b0f2d369163a 100644
--- a/net-wireless/uhd/uhd-4.4.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.4.0.0.ebuild
@@ -50,10 +50,6 @@ BDEPEND="
S="${WORKDIR}/${P}/host"
-PATCHES=(
- "${FILESDIR}"/${PN}-4.3.0.0-gcc-13.patch
-)
-
src_unpack() {
default
mv "uhd-images_${PV}" images || die
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2023-07-28 18:23 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2023-07-28 18:23 UTC (permalink / raw
To: gentoo-commits
commit: 60bf11bf4b1645edf6a8b56308de3bb5194d2b82
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 28 15:21:07 2023 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Jul 28 18:23:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60bf11bf
net-wireless/uhd: add 4.4.0.0
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/Manifest | 2 +
net-wireless/uhd/uhd-4.4.0.0.ebuild | 153 ++++++++++++++++++++++++++++++++++++
2 files changed, 155 insertions(+)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 2c2baae6732f..f792b51a451d 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,6 +1,8 @@
DIST EttusResearch-UHD-4.1.0.5.tar.gz 37975618 BLAKE2B ff5b38be7ef7088168f2bf8908e59e74d2f492a860dac6b7fef48abd5d25840435a57b3ef980ceb7416efd1d3520a3f83bace3bc5bca5caaecc14088e9609fcd SHA512 4929ebc8a12bcc0acfe4a64ceafe17387420e2f056e7bb7284a8d7b60d14aba05484b3c033ce63b00c6d9115f570b056df4e2b36e11a2b25079a8c34b1d084af
DIST EttusResearch-UHD-4.2.0.0.tar.gz 38124395 BLAKE2B cbb149e6f6aaff628e40463b37b3e52ee758acaaf8e86f85586a70fb4d9744408fb2c807a491b91de64a8cb23adb566722eece99eb8bd844e704d5412372b2ec SHA512 a5f105a8765a06e53bed17dee760dfa985d40a97c61ca243127c8a912378d6f5ae81170a48e8e5f92a238bcfd66742798043b3fb0119e574dbac74291f15ec9c
DIST EttusResearch-UHD-4.3.0.0.tar.gz 38204958 BLAKE2B 64b30d97611a96ed15b8a4bbe91065301d7b8b20e61b69e2dafd93088dcd7780c9c897462c482dff548b9b52081fa2832b09ff4a682208fed0a9a86aa3a3d957 SHA512 8907e134747b853dd3fa457ac097287783b362a56ac9fdf6fb44157baa1ddabfe3934e110bfac81180b42ea7ec2defefc444736955091a072b1166b5d27253fc
+DIST EttusResearch-UHD-4.4.0.0.tar.gz 38210999 BLAKE2B defc2ae91c1422491c0c434f76852c253d84e2bdc43f6768069e23c40803d33aac8f087d51c28037102ab4760c5f3d5e04dc090655ddca26eef3440bf703db61 SHA512 3c9b57dc776e0fadc991ffeede84c2367f7403bfae6fd30a045baf1c9cfb21889310b9a8340a35ea13eea00208bf678cccd7b82e190dfb6b9d61e42bdef3b21a
DIST uhd-images_4.1.0.5.tar.xz 118480128 BLAKE2B 90803ca0a7452e601481837d006dbaf0eab57070d4fccfd0576a7a7736c11fa62caf9ea141be807a5c4d65ba2bb0f7a5361833ff2afb9f732f231b2bb659f08e SHA512 fa9ca49bc917e55a1505acce090dc6b06cac6c59fbe7a78c2c47f79783fab52baf9563903715da205762962485c8b4a83292a171a33e7c247b0eeb35819aff5c
DIST uhd-images_4.2.0.0.tar.xz 127034940 BLAKE2B ab186ad83fe607c745a56862363a8cc0566450bffc90f070714b07124f1172d09a823fa7b74c7b7cd0fe42cd00d1f0178ed63b07a7959fd59ea5cde071c639fd SHA512 b3cee57b63137e074d370eed3d1c1533627a85cd3937103721d2f4ee322c6725a38be62cd737891193fa2b4c32f32cff372fadf4f75cb3cec3f9085cdc889c8f
DIST uhd-images_4.3.0.0.tar.xz 126848556 BLAKE2B d352b0cbb5e23b0c16c540be756f23342aa63b14679bf19ae940cfd9f686ef2c7830b7feb0b3dc53aaec3cca502e8ab1ab9b8754c95edb116fd34f03ac378843 SHA512 3b34d7b2d3d957284cd8a94043158ba5d7b9999d3da4ed6f97f6d38b427c3af54129e7b5a9840d7ec8ff1e8c5c61ef31f62994d81d7ea8a36cbd098274a999d7
+DIST uhd-images_4.4.0.0.tar.xz 127558912 BLAKE2B bb7135241c4e39db2450e0fca8c8c6b0421d76f512dca08e50732ee0a2dbfa5f330df168101607d52b6215aba083cd966027a9da8f14331f6bac17fdd76d766b SHA512 17b364128155bf850ff5ae72eeb8fa52446881d0234254943d27524610f0efc4d5bf5da7be248982fc603101d4f76f5a8019fbecb044d2637a1022cdccde0463
diff --git a/net-wireless/uhd/uhd-4.4.0.0.ebuild b/net-wireless/uhd/uhd-4.4.0.0.ebuild
new file mode 100644
index 000000000000..f436fe282051
--- /dev/null
+++ b/net-wireless/uhd/uhd-4.4.0.0.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit cmake gnome2-utils python-single-r1 udev
+
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
+HOMEPAGE="https://kb.ettus.com"
+
+SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
+ https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
+#https://github.com/EttusResearch/UHD-Mirror/tags
+#http://files.ettus.com/binaries/images/
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="+b100 +b200 doc cpu_flags_arm_neon cpu_flags_x86_ssse3 e300 examples +mpmd octoclock test +usb +usrp1 +usrp2 +utils +x300"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ b100? ( usb )
+ b200? ( usb )
+ usrp1? ( usb )
+ usrp2? ( usb )
+ || ( b100 b200 e300 mpmd usrp1 usrp2 x300 )"
+
+RDEPEND="${PYTHON_DEPS}
+ e300? ( virtual/udev )
+ usb? ( virtual/libusb:1 )
+ dev-libs/boost:=
+ sys-libs/ncurses:0=
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ ')
+"
+DEPEND="${RDEPEND}"
+#zip and gzip are directly used by the build system
+BDEPEND="
+ doc? ( app-doc/doxygen )
+ $(python_gen_cond_dep '
+ dev-python/mako[${PYTHON_USEDEP}]
+ ')
+ app-arch/unzip
+ app-arch/gzip
+"
+
+S="${WORKDIR}/${P}/host"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.3.0.0-gcc-13.patch
+)
+
+src_unpack() {
+ default
+ mv "uhd-images_${PV}" images || die
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ gnome2_environment_reset #534582
+}
+
+src_configure() {
+ #https://gitlab.kitware.com/cmake/cmake/-/issues/23236
+ #https://github.com/EttusResearch/uhd/pull/560
+ local mycmakeargs=(
+ -DCURSES_NEED_NCURSES=ON
+ -DENABLE_LIBUHD=ON
+ -DENABLE_C_API=ON
+ -DENABLE_MAN_PAGES=ON
+ -DENABLE_MAN_PAGE_COMPRESSION=OFF
+ -DENABLE_EXAMPLES="$(usex examples)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_USB="$(usex usb)"
+ -DENABLE_UTILS="$(usex utils)"
+ -DENABLE_MANUAL="$(usex doc)"
+ -DENABLE_DOXYGEN="$(usex doc)"
+ -DENABLE_B100="$(usex b100)"
+ -DENABLE_B200="$(usex b200)"
+ -DENABLE_E300="$(usex e300)"
+ -DENABLE_USRP1="$(usex usrp1)"
+ -DENABLE_USRP2="$(usex usrp2)"
+ -DENABLE_X300="$(usex x300)"
+ -DENABLE_MPMD="$(usex mpmd)"
+ -DENABLE_OCTOCLOCK="$(usex octoclock)"
+ -DENABLE_SSSE3="$(usex cpu_flags_x86_ssse3)"
+ -DNEON_SIMD_ENABLE="$(usex cpu_flags_arm_neon)"
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+ -DUHD_VERSION="${PV}"
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ python_optimize
+ if use utils; then
+ python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+ if [[ "${PV}" != "9999" ]]; then
+ rm -r "${ED}/usr/bin/uhd_images_downloader" || die
+ fi
+ fi
+ # do not install test files (bug #857492)
+ if use test; then
+ rm "${ED}/usr/lib64/${PN}/tests" -R || die
+ fi
+
+ udev_dorules "${S}/utils/uhd-usrp.rules"
+
+ rm -r "${WORKDIR}/images/winusb_driver" || die
+ if ! use b100; then
+ rm "${WORKDIR}"/images/usrp_b100* || die
+ fi
+ if ! use b200; then
+ rm "${WORKDIR}"/images/usrp_b2[01]* || die
+ fi
+ if ! use e300; then
+ rm "${WORKDIR}"/images/usrp_e3* || die
+ fi
+ if ! use mpmd; then
+ rm "${WORKDIR}"/images/usrp_n310* || die
+ fi
+ if ! use octoclock; then
+ rm "${WORKDIR}"/images/octoclock* || die
+ fi
+ if ! use usrp1; then
+ rm "${WORKDIR}"/images/usrp1* || die
+ fi
+ if ! use usrp2; then
+ rm "${WORKDIR}"/images/usrp2* || die
+ rm "${WORKDIR}"/images/usrp_n2[01]* || die
+ rm -r "${WORKDIR}"/images/bit || die
+ fi
+ if ! use x300; then
+ rm "${WORKDIR}/"images/usrp_x3* || die
+ fi
+ insinto /usr/share/${PN}
+ doins -r "${WORKDIR}/images"
+}
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2023-04-06 2:18 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2023-04-06 2:18 UTC (permalink / raw
To: gentoo-commits
commit: 44d84b7a9a1f7c8148787e0da9037190b37e0aee
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 6 02:05:49 2023 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Apr 6 02:05:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d84b7a
net-wireless/uhd: enable py3.11
Closes: https://bugs.gentoo.org/897186
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-4.1.0.5.ebuild | 2 +-
net-wireless/uhd/uhd-4.2.0.0.ebuild | 2 +-
net-wireless/uhd/uhd-4.3.0.0.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-wireless/uhd/uhd-4.1.0.5.ebuild b/net-wireless/uhd/uhd-4.1.0.5.ebuild
index 971639578bbc..0cd814244c4d 100644
--- a/net-wireless/uhd/uhd-4.1.0.5.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.5.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit cmake gnome2-utils python-single-r1 udev
diff --git a/net-wireless/uhd/uhd-4.2.0.0.ebuild b/net-wireless/uhd/uhd-4.2.0.0.ebuild
index c2bb6f5dc9e2..105e2cb0463c 100644
--- a/net-wireless/uhd/uhd-4.2.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.2.0.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit cmake gnome2-utils python-single-r1 udev
diff --git a/net-wireless/uhd/uhd-4.3.0.0.ebuild b/net-wireless/uhd/uhd-4.3.0.0.ebuild
index 5f17fad3b27a..5586a4dae981 100644
--- a/net-wireless/uhd/uhd-4.3.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.3.0.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
inherit cmake gnome2-utils python-single-r1 udev
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-09-19 13:33 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2022-09-19 13:33 UTC (permalink / raw
To: gentoo-commits
commit: e0315174774c523d3739b6ad112b2c40b7ffd154
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 13:31:07 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 13:33:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0315174
net-wireless/uhd: add 4.3.0.0
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/Manifest | 2 +
net-wireless/uhd/uhd-4.3.0.0.ebuild | 147 ++++++++++++++++++++++++++++++++++++
2 files changed, 149 insertions(+)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index c47b64c14330..2c2baae6732f 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,4 +1,6 @@
DIST EttusResearch-UHD-4.1.0.5.tar.gz 37975618 BLAKE2B ff5b38be7ef7088168f2bf8908e59e74d2f492a860dac6b7fef48abd5d25840435a57b3ef980ceb7416efd1d3520a3f83bace3bc5bca5caaecc14088e9609fcd SHA512 4929ebc8a12bcc0acfe4a64ceafe17387420e2f056e7bb7284a8d7b60d14aba05484b3c033ce63b00c6d9115f570b056df4e2b36e11a2b25079a8c34b1d084af
DIST EttusResearch-UHD-4.2.0.0.tar.gz 38124395 BLAKE2B cbb149e6f6aaff628e40463b37b3e52ee758acaaf8e86f85586a70fb4d9744408fb2c807a491b91de64a8cb23adb566722eece99eb8bd844e704d5412372b2ec SHA512 a5f105a8765a06e53bed17dee760dfa985d40a97c61ca243127c8a912378d6f5ae81170a48e8e5f92a238bcfd66742798043b3fb0119e574dbac74291f15ec9c
+DIST EttusResearch-UHD-4.3.0.0.tar.gz 38204958 BLAKE2B 64b30d97611a96ed15b8a4bbe91065301d7b8b20e61b69e2dafd93088dcd7780c9c897462c482dff548b9b52081fa2832b09ff4a682208fed0a9a86aa3a3d957 SHA512 8907e134747b853dd3fa457ac097287783b362a56ac9fdf6fb44157baa1ddabfe3934e110bfac81180b42ea7ec2defefc444736955091a072b1166b5d27253fc
DIST uhd-images_4.1.0.5.tar.xz 118480128 BLAKE2B 90803ca0a7452e601481837d006dbaf0eab57070d4fccfd0576a7a7736c11fa62caf9ea141be807a5c4d65ba2bb0f7a5361833ff2afb9f732f231b2bb659f08e SHA512 fa9ca49bc917e55a1505acce090dc6b06cac6c59fbe7a78c2c47f79783fab52baf9563903715da205762962485c8b4a83292a171a33e7c247b0eeb35819aff5c
DIST uhd-images_4.2.0.0.tar.xz 127034940 BLAKE2B ab186ad83fe607c745a56862363a8cc0566450bffc90f070714b07124f1172d09a823fa7b74c7b7cd0fe42cd00d1f0178ed63b07a7959fd59ea5cde071c639fd SHA512 b3cee57b63137e074d370eed3d1c1533627a85cd3937103721d2f4ee322c6725a38be62cd737891193fa2b4c32f32cff372fadf4f75cb3cec3f9085cdc889c8f
+DIST uhd-images_4.3.0.0.tar.xz 126848556 BLAKE2B d352b0cbb5e23b0c16c540be756f23342aa63b14679bf19ae940cfd9f686ef2c7830b7feb0b3dc53aaec3cca502e8ab1ab9b8754c95edb116fd34f03ac378843 SHA512 3b34d7b2d3d957284cd8a94043158ba5d7b9999d3da4ed6f97f6d38b427c3af54129e7b5a9840d7ec8ff1e8c5c61ef31f62994d81d7ea8a36cbd098274a999d7
diff --git a/net-wireless/uhd/uhd-4.3.0.0.ebuild b/net-wireless/uhd/uhd-4.3.0.0.ebuild
new file mode 100644
index 000000000000..065339744a53
--- /dev/null
+++ b/net-wireless/uhd/uhd-4.3.0.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake gnome2-utils python-single-r1 udev
+
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
+HOMEPAGE="https://kb.ettus.com"
+
+SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
+ https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
+#https://github.com/EttusResearch/UHD-Mirror/tags
+#http://files.ettus.com/binaries/images/
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+IUSE="+b100 +b200 doc cpu_flags_arm_neon cpu_flags_x86_ssse3 e300 examples +mpmd octoclock test +usb +usrp1 +usrp2 +utils +x300"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ b100? ( usb )
+ b200? ( usb )
+ usrp1? ( usb )
+ usrp2? ( usb )
+ || ( b100 b200 e300 mpmd usrp1 usrp2 x300 )"
+
+RDEPEND="${PYTHON_DEPS}
+ e300? ( virtual/udev )
+ usb? ( virtual/libusb:1 )
+ dev-libs/boost:=
+ sys-libs/ncurses:0=
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ ')
+"
+DEPEND="${RDEPEND}"
+#zip an gzip are directly used by the build system
+BDEPEND="
+ doc? ( app-doc/doxygen )
+ $(python_gen_cond_dep '
+ dev-python/mako[${PYTHON_USEDEP}]
+ ')
+ app-arch/unzip
+ app-arch/gzip
+"
+
+S="${WORKDIR}/${P}/host"
+
+src_unpack() {
+ default
+ mv "uhd-images_${PV}" images || die
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ gnome2_environment_reset #534582
+}
+
+src_configure() {
+ #https://gitlab.kitware.com/cmake/cmake/-/issues/23236
+ #https://github.com/EttusResearch/uhd/pull/560
+ local mycmakeargs=(
+ -DCURSES_NEED_NCURSES=ON
+ -DENABLE_LIBUHD=ON
+ -DENABLE_C_API=ON
+ -DENABLE_MAN_PAGES=ON
+ -DENABLE_MAN_PAGE_COMPRESSION=OFF
+ -DENABLE_EXAMPLES="$(usex examples)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_USB="$(usex usb)"
+ -DENABLE_UTILS="$(usex utils)"
+ -DENABLE_MANUAL="$(usex doc)"
+ -DENABLE_DOXYGEN="$(usex doc)"
+ -DENABLE_B100="$(usex b100)"
+ -DENABLE_B200="$(usex b200)"
+ -DENABLE_E300="$(usex e300)"
+ -DENABLE_USRP1="$(usex usrp1)"
+ -DENABLE_USRP2="$(usex usrp2)"
+ -DENABLE_X300="$(usex x300)"
+ -DENABLE_MPMD="$(usex mpmd)"
+ -DENABLE_OCTOCLOCK="$(usex octoclock)"
+ -DENABLE_SSSE3="$(usex cpu_flags_x86_ssse3)"
+ -DNEON_SIMD_ENABLE="$(usex cpu_flags_arm_neon)"
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+ -DUHD_VERSION="${PV}"
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ python_optimize
+ use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+ if [[ "${PV}" != "9999" ]]; then
+ rm -r "${ED}/usr/bin/uhd_images_downloader" || die
+ fi
+ # do not install test files (bug #857492)
+ if use test; then
+ rm "${ED}/usr/lib64/${PN}/tests" -R || die
+ fi
+
+ udev_dorules "${S}/utils/uhd-usrp.rules"
+
+ rm -r "${WORKDIR}/images/winusb_driver" || die
+ if ! use b100; then
+ rm "${WORKDIR}"/images/usrp_b100* || die
+ fi
+ if ! use b200; then
+ rm "${WORKDIR}"/images/usrp_b2[01]* || die
+ fi
+ if ! use e300; then
+ rm "${WORKDIR}"/images/usrp_e3* || die
+ fi
+ if ! use mpmd; then
+ rm "${WORKDIR}"/images/usrp_n310* || die
+ fi
+ if ! use octoclock; then
+ rm "${WORKDIR}"/images/octoclock* || die
+ fi
+ if ! use usrp1; then
+ rm "${WORKDIR}"/images/usrp1* || die
+ fi
+ if ! use usrp2; then
+ rm "${WORKDIR}"/images/usrp2* || die
+ rm "${WORKDIR}"/images/usrp_n2[01]* || die
+ rm -r "${WORKDIR}"/images/bit || die
+ fi
+ if ! use x300; then
+ rm "${WORKDIR}/"images/usrp_x3* || die
+ fi
+ insinto /usr/share/${PN}
+ doins -r "${WORKDIR}/images"
+}
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-07-15 13:48 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2022-07-15 13:48 UTC (permalink / raw
To: gentoo-commits
commit: b8dbd7d00c381205a1d8d16667e66170607aeff4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 13:48:38 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 13:48:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8dbd7d0
net-wireless/uhd: make SSSE3, NEON optional
hit NEON issue when testing on armv8l (32-bit)
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-wireless/uhd/uhd-4.2.0.0.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net-wireless/uhd/uhd-4.2.0.0.ebuild b/net-wireless/uhd/uhd-4.2.0.0.ebuild
index 3af996fef0db..065339744a53 100644
--- a/net-wireless/uhd/uhd-4.2.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.2.0.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusRese
LICENSE="GPL-3"
SLOT="0/$(ver_cut 1-3)"
KEYWORDS="~amd64 ~arm ~riscv ~x86"
-IUSE="+b100 +b200 doc e300 examples +mpmd octoclock test +usb +usrp1 +usrp2 +utils +x300"
+IUSE="+b100 +b200 doc cpu_flags_arm_neon cpu_flags_x86_ssse3 e300 examples +mpmd octoclock test +usb +usrp1 +usrp2 +utils +x300"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
b100? ( usb )
@@ -84,6 +84,8 @@ src_configure() {
-DENABLE_X300="$(usex x300)"
-DENABLE_MPMD="$(usex mpmd)"
-DENABLE_OCTOCLOCK="$(usex octoclock)"
+ -DENABLE_SSSE3="$(usex cpu_flags_x86_ssse3)"
+ -DNEON_SIMD_ENABLE="$(usex cpu_flags_arm_neon)"
-DPYTHON_EXECUTABLE="${PYTHON}"
-DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
-DUHD_VERSION="${PV}"
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-07-11 17:44 Thomas Beierlein
0 siblings, 0 replies; 55+ messages in thread
From: Thomas Beierlein @ 2022-07-11 17:44 UTC (permalink / raw
To: gentoo-commits
commit: d6e89f8b728e3a7dc324531d0eb9e940ec0a8eeb
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 17:44:38 2022 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 17:44:38 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6e89f8b
net-wireless/uhd: Drop test files from install
Closes: https://bugs.gentoo.org/857492
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
net-wireless/uhd/uhd-4.2.0.0.ebuild | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net-wireless/uhd/uhd-4.2.0.0.ebuild b/net-wireless/uhd/uhd-4.2.0.0.ebuild
index 05294ec529fe..3af996fef0db 100644
--- a/net-wireless/uhd/uhd-4.2.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.2.0.0.ebuild
@@ -98,6 +98,10 @@ src_install() {
if [[ "${PV}" != "9999" ]]; then
rm -r "${ED}/usr/bin/uhd_images_downloader" || die
fi
+ # do not install test files (bug #857492)
+ if use test; then
+ rm "${ED}/usr/lib64/${PN}/tests" -R || die
+ fi
udev_dorules "${S}/utils/uhd-usrp.rules"
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-07-11 5:05 Thomas Beierlein
0 siblings, 0 replies; 55+ messages in thread
From: Thomas Beierlein @ 2022-07-11 5:05 UTC (permalink / raw
To: gentoo-commits
commit: 15148d323f83a623e0192d7fcb23bf761b09fba1
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 05:05:00 2022 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 05:05:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15148d32
net-wireless/uhd: Calling udev_reload now
Closes: https://bugs.gentoo.org/849653
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
net-wireless/uhd/uhd-4.2.0.0.ebuild | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/net-wireless/uhd/uhd-4.2.0.0.ebuild b/net-wireless/uhd/uhd-4.2.0.0.ebuild
index cc566523aad6..05294ec529fe 100644
--- a/net-wireless/uhd/uhd-4.2.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.2.0.0.ebuild
@@ -131,3 +131,11 @@ src_install() {
insinto /usr/share/${PN}
doins -r "${WORKDIR}/images"
}
+
+pkg_postinst() {
+ udev_reload
+}
+
+pkg_postrm() {
+ udev_reload
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-07-11 4:52 Thomas Beierlein
0 siblings, 0 replies; 55+ messages in thread
From: Thomas Beierlein @ 2022-07-11 4:52 UTC (permalink / raw
To: gentoo-commits
commit: 056a5cc4b08d5eed9fa324738ddb9824c8d9027f
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 11 04:51:30 2022 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 04:51:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=056a5cc4
net-wireless/uhd: Fix mismatched version in pkg-config file
Closes: https://bugs.gentoo.org/857489
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
net-wireless/uhd/uhd-4.2.0.0.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-wireless/uhd/uhd-4.2.0.0.ebuild b/net-wireless/uhd/uhd-4.2.0.0.ebuild
index 9af0519e9afe..cc566523aad6 100644
--- a/net-wireless/uhd/uhd-4.2.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.2.0.0.ebuild
@@ -86,6 +86,7 @@ src_configure() {
-DENABLE_OCTOCLOCK="$(usex octoclock)"
-DPYTHON_EXECUTABLE="${PYTHON}"
-DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+ -DUHD_VERSION="${PV}"
)
cmake_src_configure
}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-07-10 18:19 Thomas Beierlein
0 siblings, 0 replies; 55+ messages in thread
From: Thomas Beierlein @ 2022-07-10 18:19 UTC (permalink / raw
To: gentoo-commits
commit: 0210055497f3740aa5fa6ef1ef9a471f4bb789c6
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 18:18:36 2022 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 18:19:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02100554
net-wireless/uhd: Drop no longer available N230 device
Closes: https://bugs.gentoo.org/840520
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
net-wireless/uhd/uhd-4.2.0.0.ebuild | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/net-wireless/uhd/uhd-4.2.0.0.ebuild b/net-wireless/uhd/uhd-4.2.0.0.ebuild
index cc43f7cef743..9af0519e9afe 100644
--- a/net-wireless/uhd/uhd-4.2.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.2.0.0.ebuild
@@ -18,14 +18,14 @@ SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusRese
LICENSE="GPL-3"
SLOT="0/$(ver_cut 1-3)"
KEYWORDS="~amd64 ~arm ~riscv ~x86"
-IUSE="+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300"
+IUSE="+b100 +b200 doc e300 examples +mpmd octoclock test +usb +usrp1 +usrp2 +utils +x300"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
b100? ( usb )
b200? ( usb )
usrp1? ( usb )
usrp2? ( usb )
- || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
+ || ( b100 b200 e300 mpmd usrp1 usrp2 x300 )"
RDEPEND="${PYTHON_DEPS}
e300? ( virtual/udev )
@@ -113,9 +113,6 @@ src_install() {
if ! use mpmd; then
rm "${WORKDIR}"/images/usrp_n310* || die
fi
- if ! use n230; then
- rm "${WORKDIR}"/images/usrp_n230* || die
- fi
if ! use octoclock; then
rm "${WORKDIR}"/images/octoclock* || die
fi
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-04-30 15:53 Marek Szuba
0 siblings, 0 replies; 55+ messages in thread
From: Marek Szuba @ 2022-04-30 15:53 UTC (permalink / raw
To: gentoo-commits
commit: ea2f2ca3d888eb8590a0b2564f8149fbdd77a3b3
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 15:52:36 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 15:53:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea2f2ca3
net-wireless/uhd: keyword 4.2.0.0 for ~riscv
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
net-wireless/uhd/uhd-4.2.0.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-wireless/uhd/uhd-4.2.0.0.ebuild b/net-wireless/uhd/uhd-4.2.0.0.ebuild
index ccf27525ff51..cc43f7cef743 100644
--- a/net-wireless/uhd/uhd-4.2.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.2.0.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusRese
LICENSE="GPL-3"
SLOT="0/$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
IUSE="+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-04-28 3:38 Sam James
0 siblings, 0 replies; 55+ messages in thread
From: Sam James @ 2022-04-28 3:38 UTC (permalink / raw
To: gentoo-commits
commit: 65919306b5d04096b3fec8c67dac8c214dfe1b62
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 03:34:58 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 03:36:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65919306
net-wireless/uhd: use get_udevdir
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-wireless/uhd/uhd-4.1.0.5.ebuild | 5 ++---
net-wireless/uhd/uhd-4.2.0.0.ebuild | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/net-wireless/uhd/uhd-4.1.0.5.ebuild b/net-wireless/uhd/uhd-4.1.0.5.ebuild
index 6d285be59c72..f77c3fbc8a83 100644
--- a/net-wireless/uhd/uhd-4.1.0.5.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.5.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{8,9,10} )
-inherit cmake gnome2-utils python-single-r1
+inherit cmake gnome2-utils python-single-r1 udev
DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
HOMEPAGE="https://kb.ettus.com"
@@ -103,8 +103,7 @@ src_install() {
rm -r "${ED}/usr/share/man/man1/uhd_images_downloader.1" || die
fi
- insinto /lib/udev/rules.d/
- doins "${S}/utils/uhd-usrp.rules"
+ udev_dorules "${S}/utils/uhd-usrp.rules"
rm -r "${WORKDIR}/images/winusb_driver" || die
if ! use b100; then
diff --git a/net-wireless/uhd/uhd-4.2.0.0.ebuild b/net-wireless/uhd/uhd-4.2.0.0.ebuild
index aa1063896294..ccf27525ff51 100644
--- a/net-wireless/uhd/uhd-4.2.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.2.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{8,9,10} )
-inherit cmake gnome2-utils python-single-r1
+inherit cmake gnome2-utils python-single-r1 udev
DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
HOMEPAGE="https://kb.ettus.com"
@@ -98,8 +98,7 @@ src_install() {
rm -r "${ED}/usr/bin/uhd_images_downloader" || die
fi
- insinto /lib/udev/rules.d/
- doins "${S}/utils/uhd-usrp.rules"
+ udev_dorules "${S}/utils/uhd-usrp.rules"
rm -r "${WORKDIR}/images/winusb_driver" || die
if ! use b100; then
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-04-22 16:53 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2022-04-22 16:53 UTC (permalink / raw
To: gentoo-commits
commit: ac801a821f01eaf5c50da197b52a25aab56c3a2b
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 16:52:38 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 16:53:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac801a82
net-wireless/uhd: add 4.2.0.0
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
Fixes: https://bugs.gentoo.org/822063
net-wireless/uhd/Manifest | 2 +
net-wireless/uhd/uhd-4.2.0.0.ebuild | 136 ++++++++++++++++++++++++++++++++++++
2 files changed, 138 insertions(+)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 6bb84d840684..c47b64c14330 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,2 +1,4 @@
DIST EttusResearch-UHD-4.1.0.5.tar.gz 37975618 BLAKE2B ff5b38be7ef7088168f2bf8908e59e74d2f492a860dac6b7fef48abd5d25840435a57b3ef980ceb7416efd1d3520a3f83bace3bc5bca5caaecc14088e9609fcd SHA512 4929ebc8a12bcc0acfe4a64ceafe17387420e2f056e7bb7284a8d7b60d14aba05484b3c033ce63b00c6d9115f570b056df4e2b36e11a2b25079a8c34b1d084af
+DIST EttusResearch-UHD-4.2.0.0.tar.gz 38124395 BLAKE2B cbb149e6f6aaff628e40463b37b3e52ee758acaaf8e86f85586a70fb4d9744408fb2c807a491b91de64a8cb23adb566722eece99eb8bd844e704d5412372b2ec SHA512 a5f105a8765a06e53bed17dee760dfa985d40a97c61ca243127c8a912378d6f5ae81170a48e8e5f92a238bcfd66742798043b3fb0119e574dbac74291f15ec9c
DIST uhd-images_4.1.0.5.tar.xz 118480128 BLAKE2B 90803ca0a7452e601481837d006dbaf0eab57070d4fccfd0576a7a7736c11fa62caf9ea141be807a5c4d65ba2bb0f7a5361833ff2afb9f732f231b2bb659f08e SHA512 fa9ca49bc917e55a1505acce090dc6b06cac6c59fbe7a78c2c47f79783fab52baf9563903715da205762962485c8b4a83292a171a33e7c247b0eeb35819aff5c
+DIST uhd-images_4.2.0.0.tar.xz 127034940 BLAKE2B ab186ad83fe607c745a56862363a8cc0566450bffc90f070714b07124f1172d09a823fa7b74c7b7cd0fe42cd00d1f0178ed63b07a7959fd59ea5cde071c639fd SHA512 b3cee57b63137e074d370eed3d1c1533627a85cd3937103721d2f4ee322c6725a38be62cd737891193fa2b4c32f32cff372fadf4f75cb3cec3f9085cdc889c8f
diff --git a/net-wireless/uhd/uhd-4.2.0.0.ebuild b/net-wireless/uhd/uhd-4.2.0.0.ebuild
new file mode 100644
index 000000000000..aa1063896294
--- /dev/null
+++ b/net-wireless/uhd/uhd-4.2.0.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake gnome2-utils python-single-r1
+
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
+HOMEPAGE="https://kb.ettus.com"
+
+SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
+ https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
+#https://github.com/EttusResearch/UHD-Mirror/tags
+#http://files.ettus.com/binaries/images/
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ b100? ( usb )
+ b200? ( usb )
+ usrp1? ( usb )
+ usrp2? ( usb )
+ || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
+
+RDEPEND="${PYTHON_DEPS}
+ e300? ( virtual/udev )
+ usb? ( virtual/libusb:1 )
+ dev-libs/boost:=
+ sys-libs/ncurses:0=
+ $(python_gen_cond_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ ')
+"
+DEPEND="${RDEPEND}"
+#zip an gzip are directly used by the build system
+BDEPEND="
+ doc? ( app-doc/doxygen )
+ $(python_gen_cond_dep '
+ dev-python/mako[${PYTHON_USEDEP}]
+ ')
+ app-arch/unzip
+ app-arch/gzip
+"
+
+S="${WORKDIR}/${P}/host"
+
+src_unpack() {
+ default
+ mv "uhd-images_${PV}" images || die
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ gnome2_environment_reset #534582
+}
+
+src_configure() {
+ #https://gitlab.kitware.com/cmake/cmake/-/issues/23236
+ #https://github.com/EttusResearch/uhd/pull/560
+ local mycmakeargs=(
+ -DCURSES_NEED_NCURSES=ON
+ -DENABLE_LIBUHD=ON
+ -DENABLE_C_API=ON
+ -DENABLE_MAN_PAGES=ON
+ -DENABLE_MAN_PAGE_COMPRESSION=OFF
+ -DENABLE_EXAMPLES="$(usex examples)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_USB="$(usex usb)"
+ -DENABLE_UTILS="$(usex utils)"
+ -DENABLE_MANUAL="$(usex doc)"
+ -DENABLE_DOXYGEN="$(usex doc)"
+ -DENABLE_B100="$(usex b100)"
+ -DENABLE_B200="$(usex b200)"
+ -DENABLE_E300="$(usex e300)"
+ -DENABLE_USRP1="$(usex usrp1)"
+ -DENABLE_USRP2="$(usex usrp2)"
+ -DENABLE_X300="$(usex x300)"
+ -DENABLE_MPMD="$(usex mpmd)"
+ -DENABLE_OCTOCLOCK="$(usex octoclock)"
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ python_optimize
+ use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+ if [[ "${PV}" != "9999" ]]; then
+ rm -r "${ED}/usr/bin/uhd_images_downloader" || die
+ fi
+
+ insinto /lib/udev/rules.d/
+ doins "${S}/utils/uhd-usrp.rules"
+
+ rm -r "${WORKDIR}/images/winusb_driver" || die
+ if ! use b100; then
+ rm "${WORKDIR}"/images/usrp_b100* || die
+ fi
+ if ! use b200; then
+ rm "${WORKDIR}"/images/usrp_b2[01]* || die
+ fi
+ if ! use e300; then
+ rm "${WORKDIR}"/images/usrp_e3* || die
+ fi
+ if ! use mpmd; then
+ rm "${WORKDIR}"/images/usrp_n310* || die
+ fi
+ if ! use n230; then
+ rm "${WORKDIR}"/images/usrp_n230* || die
+ fi
+ if ! use octoclock; then
+ rm "${WORKDIR}"/images/octoclock* || die
+ fi
+ if ! use usrp1; then
+ rm "${WORKDIR}"/images/usrp1* || die
+ fi
+ if ! use usrp2; then
+ rm "${WORKDIR}"/images/usrp2* || die
+ rm "${WORKDIR}"/images/usrp_n2[01]* || die
+ rm -r "${WORKDIR}"/images/bit || die
+ fi
+ if ! use x300; then
+ rm "${WORKDIR}/"images/usrp_x3* || die
+ fi
+ insinto /usr/share/${PN}
+ doins -r "${WORKDIR}/images"
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-02-24 16:04 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2022-02-24 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 10f1c0adf249e40d9c5d752c7bffe9e35f78a510
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 02:34:33 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 16:04:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10f1c0ad
net-wireless/uhd: add another comment
Include the uhd upstream PR for fixing FindCurses "correctly" per cmake
upstream
Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-4.1.0.5.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-wireless/uhd/uhd-4.1.0.5.ebuild b/net-wireless/uhd/uhd-4.1.0.5.ebuild
index f16f8d7f4666..6d285be59c72 100644
--- a/net-wireless/uhd/uhd-4.1.0.5.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.5.ebuild
@@ -67,6 +67,7 @@ src_prepare() {
src_configure() {
#https://gitlab.kitware.com/cmake/cmake/-/issues/23236
+ #https://github.com/EttusResearch/uhd/pull/560
local mycmakeargs=(
-DCURSES_NEED_NCURSES=ON
-DENABLE_LIBUHD=ON
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-02-24 16:04 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2022-02-24 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 5b0aeb82a8dcc71f4de3fdf1449a746105d7d1a8
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 21:04:28 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 16:04:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b0aeb82
net-wireless/uhd: add BDEPEND
Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-4.1.0.4.ebuild | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/net-wireless/uhd/uhd-4.1.0.4.ebuild b/net-wireless/uhd/uhd-4.1.0.4.ebuild
index 6f1f88beebde..32fd889f0f34 100644
--- a/net-wireless/uhd/uhd-4.1.0.4.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.4.ebuild
@@ -27,6 +27,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
usrp2? ( usb )
|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
+BDEPEND="
+ doc? ( app-doc/doxygen )
+ $(python_gen_cond_dep '
+ dev-python/mako[${PYTHON_USEDEP}]
+ ')
+ app-arch/unzip
+ app-arch/gzip
+"
RDEPEND="${PYTHON_DEPS}
e300? ( virtual/udev )
usb? ( virtual/libusb:1 )
@@ -37,15 +45,7 @@ RDEPEND="${PYTHON_DEPS}
dev-python/requests[${PYTHON_USEDEP}]
')
"
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- $(python_gen_cond_dep '
- dev-python/mako[${PYTHON_USEDEP}]
- ')
- app-arch/unzip
- app-arch/gzip
-"
+DEPEND="${RDEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-4.0.0.0-tinfo.patch"
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-02-24 16:04 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2022-02-24 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 48cb8fc6b9eeb32f79a5d3e390ce72394be15d9a
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 00:29:07 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 16:04:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48cb8fc6
net-wireless/uhd: remove tinfo dep
With tinfo building fixed slightly more correctly, this dep is obsolete
Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-4.1.0.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-wireless/uhd/uhd-4.1.0.5.ebuild b/net-wireless/uhd/uhd-4.1.0.5.ebuild
index fc72374bca2c..f16f8d7f4666 100644
--- a/net-wireless/uhd/uhd-4.1.0.5.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.5.ebuild
@@ -31,7 +31,7 @@ RDEPEND="${PYTHON_DEPS}
e300? ( virtual/udev )
usb? ( virtual/libusb:1 )
dev-libs/boost:=
- sys-libs/ncurses:0=[tinfo]
+ sys-libs/ncurses:0=
$(python_gen_cond_dep '
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-02-24 16:04 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2022-02-24 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 240956a13044cb2a98f6a60160c611072b1445c0
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 20:06:50 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 16:04:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=240956a1
net-wireless/uhd: add = to ncurses dep
Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-4.1.0.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-wireless/uhd/uhd-4.1.0.4.ebuild b/net-wireless/uhd/uhd-4.1.0.4.ebuild
index 74f7b4ccacd2..6f1f88beebde 100644
--- a/net-wireless/uhd/uhd-4.1.0.4.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.4.ebuild
@@ -31,7 +31,7 @@ RDEPEND="${PYTHON_DEPS}
e300? ( virtual/udev )
usb? ( virtual/libusb:1 )
dev-libs/boost:=
- sys-libs/ncurses:0[tinfo]
+ sys-libs/ncurses:0=[tinfo]
$(python_gen_cond_dep '
dev-python/numpy[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-02-24 16:04 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2022-02-24 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 933768dc9f9bdf45876cb59154285df5e7f5af26
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 19:40:57 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 16:04:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=933768dc
net-wireless/uhd: remove sed
Upstream bug fixed: https://github.com/EttusResearch/uhd/issues/338
Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-4.1.0.4.ebuild | 3 ---
1 file changed, 3 deletions(-)
diff --git a/net-wireless/uhd/uhd-4.1.0.4.ebuild b/net-wireless/uhd/uhd-4.1.0.4.ebuild
index ef4be3637e18..7a928c6e80c9 100644
--- a/net-wireless/uhd/uhd-4.1.0.4.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.4.ebuild
@@ -63,9 +63,6 @@ src_prepare() {
cmake_src_prepare
gnome2_environment_reset #534582
-
- #rpath is set for apple and no one else, just remove the conditional
- sed -i -e '/if(APPLE)/d' -e '/endif(APPLE)/d' CMakeLists.txt || die
}
src_configure() {
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-02-24 16:04 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2022-02-24 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 39a0778f1c04c54bd550a7d1b364495e09c733d2
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 19:58:07 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 16:04:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a0778f
net-wireless/uhd: addressing more qa feedback
local cmakeargs
Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-4.1.0.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-wireless/uhd/uhd-4.1.0.4.ebuild b/net-wireless/uhd/uhd-4.1.0.4.ebuild
index 9ed87e644bbf..74f7b4ccacd2 100644
--- a/net-wireless/uhd/uhd-4.1.0.4.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.4.ebuild
@@ -66,7 +66,7 @@ src_prepare() {
}
src_configure() {
- mycmakeargs=(
+ local mycmakeargs=(
-DENABLE_LIBUHD=ON
-DENABLE_C_API=ON
-DENABLE_MAN_PAGES=ON
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-02-24 16:04 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2022-02-24 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 2ff13ed459a87f090b24d261f4b1ae7c4161a06c
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 21:20:10 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 16:04:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ff13ed4
net-wireless/uhd: reorder *DEPEND
Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-4.1.0.4.ebuild | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/net-wireless/uhd/uhd-4.1.0.4.ebuild b/net-wireless/uhd/uhd-4.1.0.4.ebuild
index 01a789176b2a..4bcb7e47ea2c 100644
--- a/net-wireless/uhd/uhd-4.1.0.4.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.4.ebuild
@@ -27,15 +27,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
usrp2? ( usb )
|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-#zip an gzip are directly used by the build system
-BDEPEND="
- doc? ( app-doc/doxygen )
- $(python_gen_cond_dep '
- dev-python/mako[${PYTHON_USEDEP}]
- ')
- app-arch/unzip
- app-arch/gzip
-"
RDEPEND="${PYTHON_DEPS}
e300? ( virtual/udev )
usb? ( virtual/libusb:1 )
@@ -47,6 +38,15 @@ RDEPEND="${PYTHON_DEPS}
')
"
DEPEND="${RDEPEND}"
+#zip an gzip are directly used by the build system
+BDEPEND="
+ doc? ( app-doc/doxygen )
+ $(python_gen_cond_dep '
+ dev-python/mako[${PYTHON_USEDEP}]
+ ')
+ app-arch/unzip
+ app-arch/gzip
+"
PATCHES=(
"${FILESDIR}/${PN}-4.0.0.0-tinfo.patch"
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-02-24 16:04 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2022-02-24 16:04 UTC (permalink / raw
To: gentoo-commits
commit: dc727b47beafd06361e8152c554ea3adf7459844
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 19:52:56 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 16:04:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc727b47
net-wireless/uhd: remove unneeded functions
sort inherit
remove src_test, no longer needed after upstream bug fix https://github.com/EttusResearch/uhd/issues/338
drop force and add missing die for rm
Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-4.1.0.4.ebuild | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/net-wireless/uhd/uhd-4.1.0.4.ebuild b/net-wireless/uhd/uhd-4.1.0.4.ebuild
index 7a928c6e80c9..9ed87e644bbf 100644
--- a/net-wireless/uhd/uhd-4.1.0.4.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{8,9,10} )
-inherit python-single-r1 gnome2-utils cmake
+inherit cmake gnome2-utils python-single-r1
DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
HOMEPAGE="https://kb.ettus.com"
@@ -91,19 +91,13 @@ src_configure() {
cmake_src_configure
}
-src_test() {
- #we can disable the python tests
- #ctest -E 'py*'
- PYTHON_PATH=python/ cmake_src_test
-}
-
src_install() {
cmake_src_install
python_optimize
use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
if [[ "${PV}" != "9999" ]]; then
- rm -rf "${ED}/usr/bin/uhd_images_downloader"
- rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1"
+ rm -r "${ED}/usr/bin/uhd_images_downloader" || die
+ rm -r "${ED}/usr/share/man/man1/uhd_images_downloader.1" || die
fi
insinto /lib/udev/rules.d/
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-02-24 16:04 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2022-02-24 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 9c9d85e1becc7d5754cf931d59df2348f7786e28
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 21:07:07 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 16:04:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c9d85e1
net-wireless/uhd: add comment for bdep
Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-4.1.0.4.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-wireless/uhd/uhd-4.1.0.4.ebuild b/net-wireless/uhd/uhd-4.1.0.4.ebuild
index 32fd889f0f34..01a789176b2a 100644
--- a/net-wireless/uhd/uhd-4.1.0.4.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.4.ebuild
@@ -27,6 +27,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
usrp2? ( usb )
|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
+#zip an gzip are directly used by the build system
BDEPEND="
doc? ( app-doc/doxygen )
$(python_gen_cond_dep '
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-02-24 16:04 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2022-02-24 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 893b162fd8000db534292f8860fe73497e714ed1
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 18:53:21 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 16:04:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893b162f
net-wireless/uhd: fix phase order
Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-4.1.0.4.ebuild | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/net-wireless/uhd/uhd-4.1.0.4.ebuild b/net-wireless/uhd/uhd-4.1.0.4.ebuild
index d522d556fc21..ef4be3637e18 100644
--- a/net-wireless/uhd/uhd-4.1.0.4.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.4.ebuild
@@ -93,6 +93,13 @@ src_configure() {
)
cmake_src_configure
}
+
+src_test() {
+ #we can disable the python tests
+ #ctest -E 'py*'
+ PYTHON_PATH=python/ cmake_src_test
+}
+
src_install() {
cmake_src_install
python_optimize
@@ -138,9 +145,3 @@ src_install() {
insinto /usr/share/${PN}
doins -r "${WORKDIR}/images"
}
-
-src_test() {
- #we can disable the python tests
- #ctest -E 'py*'
- PYTHON_PATH=python/ cmake_src_test
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-02-24 16:04 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2022-02-24 16:04 UTC (permalink / raw
To: gentoo-commits
commit: a541e110c63621f7768ae68489bc59bae114f6b2
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 19:05:10 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 16:04:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a541e110
net-wireless/uhd: backport changes to 3.15
Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-3.15.0.0-r100.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
index 598f6ea06237..8d5e3e111f99 100644
--- a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
@@ -98,11 +98,12 @@ src_configure() {
)
cmake_src_configure
}
+
src_install() {
cmake_src_install
python_optimize
use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
- if [ "${PV}" != "9999" ]; then
+ if [[ "${PV}" != "9999" ]]; then
rm -rf "${ED}/usr/bin/uhd_images_downloader"
rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1"
fi
@@ -110,7 +111,7 @@ src_install() {
insinto /lib/udev/rules.d/
doins "${S}/utils/uhd-usrp.rules"
- rm -rf "${WORKDIR}/images/winusb_driver"
+ rm -r "${WORKDIR}/images/winusb_driver" || die
if ! use b100; then
rm "${WORKDIR}"/images/usrp_b100* || die
fi
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-02-24 16:04 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2022-02-24 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 37b450a21884e166125aa38e6a72bb1e7a1b7906
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 14 17:24:19 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 16:04:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37b450a2
net-wireless/uhd: fix ebuild deprecation
Bump eapi 7 -> 8
Migrate eclass cmake-utils -> cmake
Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-3.15.0.0-r100.ebuild | 11 +++++------
net-wireless/uhd/uhd-4.1.0.4.ebuild | 13 ++++++-------
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
index 439b2f78fc50..598f6ea06237 100644
--- a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
@@ -1,12 +1,11 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-#not sure why, but eapi 7 fails
+EAPI=8
PYTHON_COMPAT=( python3_{8,9,10} )
-inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils
+inherit python-single-r1 gnome2-utils cmake
DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
HOMEPAGE="https://kb.ettus.com"
@@ -61,7 +60,7 @@ src_unpack() {
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
gnome2_environment_reset #534582
@@ -97,10 +96,10 @@ src_configure() {
-DPYTHON_EXECUTABLE="${PYTHON}"
-DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
python_optimize
use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
if [ "${PV}" != "9999" ]; then
diff --git a/net-wireless/uhd/uhd-4.1.0.4.ebuild b/net-wireless/uhd/uhd-4.1.0.4.ebuild
index 3b262ab66ff5..8fbc0ab1a94a 100644
--- a/net-wireless/uhd/uhd-4.1.0.4.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.4.ebuild
@@ -1,12 +1,11 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-#not sure why, but eapi 7 fails
+EAPI=8
PYTHON_COMPAT=( python3_{8,9,10} )
-inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils
+inherit python-single-r1 gnome2-utils cmake
DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
HOMEPAGE="https://kb.ettus.com"
@@ -61,7 +60,7 @@ src_unpack() {
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
gnome2_environment_reset #534582
@@ -92,10 +91,10 @@ src_configure() {
-DPYTHON_EXECUTABLE="${PYTHON}"
-DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake_src_install
python_optimize
use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
if [ "${PV}" != "9999" ]; then
@@ -143,5 +142,5 @@ src_install() {
src_test() {
#we can disable the python tests
#ctest -E 'py*'
- PYTHON_PATH=python/ cmake-utils_src_test
+ PYTHON_PATH=python/ cmake_src_test
}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-02-24 16:04 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2022-02-24 16:04 UTC (permalink / raw
To: gentoo-commits
commit: f266fda1f2144143ecc40a73d2d3f4da1b3825f7
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 18:49:30 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Feb 24 16:04:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f266fda1
net-wireless/uhd: qa fixes
fix rm abuse
posix -> bash
Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-4.1.0.4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-wireless/uhd/uhd-4.1.0.4.ebuild b/net-wireless/uhd/uhd-4.1.0.4.ebuild
index 8fbc0ab1a94a..d522d556fc21 100644
--- a/net-wireless/uhd/uhd-4.1.0.4.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.4.ebuild
@@ -97,7 +97,7 @@ src_install() {
cmake_src_install
python_optimize
use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
- if [ "${PV}" != "9999" ]; then
+ if [[ "${PV}" != "9999" ]]; then
rm -rf "${ED}/usr/bin/uhd_images_downloader"
rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1"
fi
@@ -105,7 +105,7 @@ src_install() {
insinto /lib/udev/rules.d/
doins "${S}/utils/uhd-usrp.rules"
- rm -rf "${WORKDIR}/images/winusb_driver"
+ rm -r "${WORKDIR}/images/winusb_driver" || die
if ! use b100; then
rm "${WORKDIR}"/images/usrp_b100* || die
fi
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2022-02-14 3:33 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2022-02-14 3:33 UTC (permalink / raw
To: gentoo-commits
commit: 0a1b39046a9eb89dd0fe7d6c4d8f50a90e293cfc
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 14 03:32:00 2022 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Feb 14 03:33:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a1b3904
net-wireless/uhd: fix some pkgcheck warnings
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-3.15.0.0-r100.ebuild | 6 +++---
net-wireless/uhd/uhd-4.1.0.4.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
index 3854e1ceee95..94f22c4bddc2 100644
--- a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
#not sure why, but eapi 7 fails
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
-inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
+inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils
DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
HOMEPAGE="https://kb.ettus.com"
diff --git a/net-wireless/uhd/uhd-4.1.0.4.ebuild b/net-wireless/uhd/uhd-4.1.0.4.ebuild
index e74d51a15c92..654ad81cca82 100644
--- a/net-wireless/uhd/uhd-4.1.0.4.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
#not sure why, but eapi 7 fails
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
-inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
+inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils
DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
HOMEPAGE="https://kb.ettus.com"
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2021-10-15 17:20 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2021-10-15 17:20 UTC (permalink / raw
To: gentoo-commits
commit: 7b8f7ffb859f5524c33e4b0bb45252a84eaa377f
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 15 17:20:18 2021 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Oct 15 17:20:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b8f7ffb
net-wireless/uhd: bump
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/Manifest | 4 ++--
net-wireless/uhd/{uhd-4.1.0.3.ebuild => uhd-4.1.0.4.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 0c014961fd2..db104b0ddc9 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,4 +1,4 @@
DIST EttusResearch-UHD-3.15.0.0.tar.gz 12895934 BLAKE2B 75bf474120a09ffe1268684659c8bbc8e781060db96b82e42a4d3463265e2a3df5e60da77d835587e6650795ae50bcab8bdecccf0f2bdd32fe77bbd6ce1ec5c8 SHA512 ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0
-DIST EttusResearch-UHD-4.1.0.3.tar.gz 37915130 BLAKE2B 8c01d1c99b5f98ddd4d3ddd5993d5674bf8c601c63cdf63003696dcec2ed6942462da5479c0e0ab72ab0596fb6566d939bdbf257aaaa3ba1816d2b14f1c94e4e SHA512 ddc8676d7bbfc5bedddfd33cfa8a050174550c94f89055a87d3cf32eb13c4b2f35c13bb26d2d44e61ff064754a3371f0371ccdd681351c38f9f0ef2d3d64d1e5
+DIST EttusResearch-UHD-4.1.0.4.tar.gz 37913211 BLAKE2B 28cd3892490aaa8ec01ca8233c4f0500fd49a3184be74f77dbb8a5fdafc08d74144eb01485e5059d8c115406606024261f851fa7c592687637a5906e12d42b2e SHA512 f3ada2f2b114b1e8d0eca71da7ed5494191364c864adb1498314255ba280c7c747f2f5d118c98ae1f7ae96f3ef0e4aafd86955fb7e6271c800b359f95703fcd6
DIST uhd-images_3.15.0.0.tar.xz 110161052 BLAKE2B 681b5ab0d79bbd2e5661bbfe5c975fdda83e7749f1c3b8a5ac2ba4088009a69c58f9b6a4e4c697c5ac90bdb809bc859937b3b63c9daf0984636bafaeee10e977 SHA512 ec7aa9740e0eda90bbee3751f5c65d5998e67d2bf74d36aa912041be8818e3ad03e5dfbf26ad340261f72fc98048ab5a90c56f6dff8efdd38cf0501585554033
-DIST uhd-images_4.1.0.3.tar.xz 118529824 BLAKE2B b9d56dccee60b581dc81b3de705a4b0c582b83f57eb217d78148fb7bdff5b4b7cf97d281a84ec58767c56d841f1ec2f371feaa3625b25e0726b928c9d8ae0de7 SHA512 ea57dcaebadc23287793095ae69f3a9429e6d825404f08103df6514ea84d4d9a32e4e65cda6bce9dc1c37b4f9bef410c5707688dcfeeff4d6aaf4c5f81c0cb53
+DIST uhd-images_4.1.0.4.tar.xz 118536976 BLAKE2B 6ac9b0b4aff5cbe1336edcb07a450dba3e050bf36c87af37fdbb2e83c472d86a2a8b51720fad3046d4f58d5ad1b6a836d35d1d7c57e1a36171161c22f2c7fe30 SHA512 6dfd612d794281e01739e6d2623c89d1a516e6a770cc39ce7536d6b760a51a4e2e09453d80791c417d635d3f76326a397875e04dd08418ed724b4d0679f2961b
diff --git a/net-wireless/uhd/uhd-4.1.0.3.ebuild b/net-wireless/uhd/uhd-4.1.0.4.ebuild
similarity index 100%
rename from net-wireless/uhd/uhd-4.1.0.3.ebuild
rename to net-wireless/uhd/uhd-4.1.0.4.ebuild
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2021-10-12 15:37 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2021-10-12 15:37 UTC (permalink / raw
To: gentoo-commits
commit: c5ddacf9f02c13cea40b3042f21ec23c52be7afa
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 12 15:30:17 2021 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Oct 12 15:37:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ddacf9
net-wireless/uhd: bump
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/Manifest | 4 ++--
net-wireless/uhd/{uhd-4.0.0.0.ebuild => uhd-4.1.0.3.ebuild} | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 122ca7ff41e..0c014961fd2 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,4 +1,4 @@
DIST EttusResearch-UHD-3.15.0.0.tar.gz 12895934 BLAKE2B 75bf474120a09ffe1268684659c8bbc8e781060db96b82e42a4d3463265e2a3df5e60da77d835587e6650795ae50bcab8bdecccf0f2bdd32fe77bbd6ce1ec5c8 SHA512 ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0
-DIST EttusResearch-UHD-4.0.0.0.tar.gz 33942895 BLAKE2B 632e701420c3a1165f2e1f0e2766b457595326141cb42c5701b247857e699dbfd6f8dbbcc668184d87bf0764516213044f79a5acde5db3d3c1c387335474f5fc SHA512 1f897397467111e634428e807c2c6748e9fc33e5b09083372139cd6e4445fbd71c48f43e18d0c3faef483d448879e40bc9a5a63df4e908b1bec65454ed67a6dd
+DIST EttusResearch-UHD-4.1.0.3.tar.gz 37915130 BLAKE2B 8c01d1c99b5f98ddd4d3ddd5993d5674bf8c601c63cdf63003696dcec2ed6942462da5479c0e0ab72ab0596fb6566d939bdbf257aaaa3ba1816d2b14f1c94e4e SHA512 ddc8676d7bbfc5bedddfd33cfa8a050174550c94f89055a87d3cf32eb13c4b2f35c13bb26d2d44e61ff064754a3371f0371ccdd681351c38f9f0ef2d3d64d1e5
DIST uhd-images_3.15.0.0.tar.xz 110161052 BLAKE2B 681b5ab0d79bbd2e5661bbfe5c975fdda83e7749f1c3b8a5ac2ba4088009a69c58f9b6a4e4c697c5ac90bdb809bc859937b3b63c9daf0984636bafaeee10e977 SHA512 ec7aa9740e0eda90bbee3751f5c65d5998e67d2bf74d36aa912041be8818e3ad03e5dfbf26ad340261f72fc98048ab5a90c56f6dff8efdd38cf0501585554033
-DIST uhd-images_4.0.0.0.tar.xz 111748176 BLAKE2B 2924cf1b3f150c0afd3c31a03c44f509047fb7122e55faec07860ffa56b95e1ad84d4768a0608ee32403a8b31ae5efd16abdc3469779674faedaf13778335a4d SHA512 32bc47ad48b2c9228df452c90d9cd4625fafd0c5d202f5fdfc49d2d9b14154ef7101035f403de56c369956df4f5901f6c653a3ae92c64797dd5e005f954a2a1f
+DIST uhd-images_4.1.0.3.tar.xz 118529824 BLAKE2B b9d56dccee60b581dc81b3de705a4b0c582b83f57eb217d78148fb7bdff5b4b7cf97d281a84ec58767c56d841f1ec2f371feaa3625b25e0726b928c9d8ae0de7 SHA512 ea57dcaebadc23287793095ae69f3a9429e6d825404f08103df6514ea84d4d9a32e4e65cda6bce9dc1c37b4f9bef410c5707688dcfeeff4d6aaf4c5f81c0cb53
diff --git a/net-wireless/uhd/uhd-4.0.0.0.ebuild b/net-wireless/uhd/uhd-4.1.0.3.ebuild
similarity index 98%
rename from net-wireless/uhd/uhd-4.0.0.0.ebuild
rename to net-wireless/uhd/uhd-4.1.0.3.ebuild
index c93dca6d407..e74d51a15c9 100644
--- a/net-wireless/uhd/uhd-4.0.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.1.0.3.ebuild
@@ -50,7 +50,6 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-4.0.0.0-tinfo.patch"
- "${FILESDIR}/${PN}-4.0.0.0-boost-1.76.patch"
)
S="${WORKDIR}/${P}/host"
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2021-02-15 2:19 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2021-02-15 2:19 UTC (permalink / raw
To: gentoo-commits
commit: d66f82af57c808694c347dbca32ea4bac5ca3a98
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 12 18:05:29 2021 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 02:19:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d66f82af
net-wireless/uhd: python bump
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-3.15.0.0-r100.ebuild | 9 +++------
net-wireless/uhd/uhd-4.0.0.0.ebuild | 9 +++------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
index 0385c7efbe5..044251f32ff 100644
--- a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
#not sure why, but eapi 7 fails
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
@@ -34,10 +34,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=
sys-libs/ncurses:0[tinfo]
$(python_gen_cond_dep '
- || (
- dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- )
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
dev-python/requests[${PYTHON_MULTI_USEDEP}]
')
"
diff --git a/net-wireless/uhd/uhd-4.0.0.0.ebuild b/net-wireless/uhd/uhd-4.0.0.0.ebuild
index d9315f6f09e..25a3b44949e 100644
--- a/net-wireless/uhd/uhd-4.0.0.0.ebuild
+++ b/net-wireless/uhd/uhd-4.0.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
#not sure why, but eapi 7 fails
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
@@ -34,10 +34,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=
sys-libs/ncurses:0[tinfo]
$(python_gen_cond_dep '
- || (
- dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- )
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
dev-python/requests[${PYTHON_MULTI_USEDEP}]
')
"
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2020-09-19 12:29 Michał Górny
0 siblings, 0 replies; 55+ messages in thread
From: Michał Górny @ 2020-09-19 12:29 UTC (permalink / raw
To: gentoo-commits
commit: 2a6771c092a7a7e6cffa2b582d2fc9c63674f0b0
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 19 11:49:10 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 12:29:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a6771c0
net-wireless/uhd: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
net-wireless/uhd/uhd-3.15.0.0-r1.ebuild | 146 --------------------------------
1 file changed, 146 deletions(-)
diff --git a/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
deleted file mode 100644
index 21c29ff40be..00000000000
--- a/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-#not sure why, but eapi 7 fails
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="https://kb.ettus.com"
-
-SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
- https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- b100? ( usb )
- b200? ( usb )
- usrp1? ( usb )
- usrp2? ( usb )
- || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
-
-RDEPEND="${PYTHON_DEPS}
- e300? ( virtual/udev )
- usb? ( virtual/libusb:1 )
- dev-libs/boost:=
- sys-libs/ncurses:0[tinfo]
- $(python_gen_cond_dep '
- || (
- dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
- dev-python/numpy[${PYTHON_MULTI_USEDEP}]
- )
- dev-python/requests[${PYTHON_MULTI_USEDEP}]
- ')
-"
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- $(python_gen_cond_dep '
- dev-python/mako[${PYTHON_MULTI_USEDEP}]
- ')
- app-arch/unzip
- app-arch/gzip
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" )
-
-S="${WORKDIR}/${P}/host"
-
-src_unpack() {
- default
- mv "uhd-images_${PV}" images || die
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- gnome2_environment_reset #534582
-
- #this may not be needed in 3.4.3 and above, please verify
- sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
-
- #rpath is set for apple and no one else, just remove the conditional
- sed -i -e '/if(APPLE)/d' -e '/endif(APPLE)/d' CMakeLists.txt || die
-}
-
-src_configure() {
- mycmakeargs=(
- -DENABLE_LIBUHD=ON
- -DENABLE_C_API=ON
- -DENABLE_LIBERIO=OFF
- -DENABLE_MAN_PAGES=ON
- -DENABLE_MAN_PAGE_COMPRESSION=OFF
- -DENABLE_EXAMPLES="$(usex examples)"
- -DENABLE_TESTS="$(usex test)"
- -DENABLE_USB="$(usex usb)"
- -DENABLE_UTILS="$(usex utils)"
- -DENABLE_MANUAL="$(usex doc)"
- -DENABLE_DOXYGEN="$(usex doc)"
- -DENABLE_B100="$(usex b100)"
- -DENABLE_B200="$(usex b200)"
- -DENABLE_E300="$(usex e300)"
- -DENABLE_USRP1="$(usex usrp1)"
- -DENABLE_USRP2="$(usex usrp2)"
- -DENABLE_X300="$(usex x300)"
- -DENABLE_N230="$(usex n230)"
- -DENABLE_MPMD="$(usex mpmd)"
- -DENABLE_OCTOCLOCK="$(usex octoclock)"
- -DPYTHON_EXECUTABLE="${PYTHON}"
- -DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
- )
- cmake-utils_src_configure
-}
-src_install() {
- cmake-utils_src_install
- python_optimize
- use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
- if [ "${PV}" != "9999" ]; then
- rm -rf "${ED}/usr/bin/uhd_images_downloader"
- rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1"
- fi
-
- insinto /lib/udev/rules.d/
- doins "${S}/utils/uhd-usrp.rules"
-
- rm -rf "${WORKDIR}/images/winusb_driver"
- if ! use b100; then
- rm "${WORKDIR}"/images/usrp_b100* || die
- fi
- if ! use b200; then
- rm "${WORKDIR}"/images/usrp_b2[01]* || die
- fi
- if ! use e300; then
- rm "${WORKDIR}"/images/usrp_e3* || die
- fi
- if ! use mpmd; then
- rm "${WORKDIR}"/images/usrp_n310* || die
- fi
- if ! use n230; then
- rm "${WORKDIR}"/images/usrp_n230* || die
- fi
- if ! use octoclock; then
- rm "${WORKDIR}"/images/octoclock* || die
- fi
- if ! use usrp1; then
- rm "${WORKDIR}"/images/usrp1* || die
- fi
- if ! use usrp2; then
- rm "${WORKDIR}"/images/usrp2* || die
- rm "${WORKDIR}"/images/usrp_n2[01]* || die
- rm -r "${WORKDIR}"/images/bit || die
- fi
- if ! use x300; then
- rm "${WORKDIR}/"images/usrp_x3* || die
- fi
- insinto /usr/share/${PN}
- doins -r "${WORKDIR}/images"
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2020-06-09 21:09 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2020-06-09 21:09 UTC (permalink / raw
To: gentoo-commits
commit: f6e03ea4fed995b51cfd66d58de98cfedc1d8259
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 9 21:09:29 2020 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jun 9 21:09:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6e03ea4
net-wireless/uhd: install everything by default
pkgcheck wants this, and users can still -use whatever they want
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-3.15.0.0-r1.ebuild | 2 +-
net-wireless/uhd/uhd-3.15.0.0-r100.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
index 9e805a23f6d..21c29ff40be 100644
--- a/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusRese
LICENSE="GPL-3"
SLOT="0/$(ver_cut 1-3)"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
+IUSE="+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
b100? ( usb )
diff --git a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
index d598931abd1..ea636741926 100644
--- a/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r100.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusRese
LICENSE="GPL-3"
SLOT="0/$(ver_cut 1-3)"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
+IUSE="+b100 +b200 doc e300 examples +mpmd octoclock +n230 test +usb +usrp1 +usrp2 +utils +x300"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
b100? ( usb )
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2020-04-10 20:19 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2020-04-10 20:19 UTC (permalink / raw
To: gentoo-commits
commit: 6bce09ad1f3ac65679428ae402a6c6425ed412c6
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 20:19:40 2020 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 20:19:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bce09ad
net-wireless/uhd: fix a ton of QA issues
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/{uhd-3.15.0.0.ebuild => uhd-3.15.0.0-r1.ebuild} | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/net-wireless/uhd/uhd-3.15.0.0.ebuild b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
similarity index 93%
rename from net-wireless/uhd/uhd-3.15.0.0.ebuild
rename to net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
index aa3efa300c7..0bc67971a97 100644
--- a/net-wireless/uhd/uhd-3.15.0.0.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0-r1.ebuild
@@ -67,6 +67,9 @@ src_prepare() {
#this may not be needed in 3.4.3 and above, please verify
sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
+
+ #rpath is set for apple and no one else, just remove the conditional
+ sed -i -e '/if(APPLE)/d' -e '/endif(APPLE)/d' CMakeLists.txt || die
}
src_configure() {
@@ -92,11 +95,14 @@ src_configure() {
-DENABLE_N230="$(usex n230)"
-DENABLE_MPMD="$(usex mpmd)"
-DENABLE_OCTOCLOCK="$(usex octoclock)"
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DPKG_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}"
)
cmake-utils_src_configure
}
src_install() {
cmake-utils_src_install
+ python_optimize
use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
if [ "${PV}" != "9999" ]; then
rm -rf "${ED}/usr/bin/uhd_images_downloader"
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2020-04-09 15:18 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2020-04-09 15:18 UTC (permalink / raw
To: gentoo-commits
commit: f1bcf2e4340d94c7197d08fc91d7c37d730a1096
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 9 15:17:50 2020 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 15:18:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1bcf2e4
net-wireless/uhd: deps fix
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-3.15.0.0.ebuild | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/net-wireless/uhd/uhd-3.15.0.0.ebuild b/net-wireless/uhd/uhd-3.15.0.0.ebuild
index 1c00d41a19f..aa3efa300c7 100644
--- a/net-wireless/uhd/uhd-3.15.0.0.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0.ebuild
@@ -33,18 +33,20 @@ RDEPEND="${PYTHON_DEPS}
usb? ( virtual/libusb:1 )
dev-libs/boost:=
sys-libs/ncurses:0[tinfo]
-"
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
$(python_gen_cond_dep '
- dev-python/mako[${PYTHON_MULTI_USEDEP}]
|| (
dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
dev-python/numpy[${PYTHON_MULTI_USEDEP}]
)
dev-python/requests[${PYTHON_MULTI_USEDEP}]
')
+"
+
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ $(python_gen_cond_dep '
+ dev-python/mako[${PYTHON_MULTI_USEDEP}]
+ ')
app-arch/unzip
app-arch/gzip
"
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2020-04-09 1:29 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2020-04-09 1:29 UTC (permalink / raw
To: gentoo-commits
commit: 1fa4d3257b4e1cdd9f8ec6deda80e0e38fae452b
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 9 01:29:05 2020 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 01:29:05 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fa4d325
net-wireless/uhd: moar deps!
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-3.15.0.0.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-wireless/uhd/uhd-3.15.0.0.ebuild b/net-wireless/uhd/uhd-3.15.0.0.ebuild
index 66c1cda9508..1c00d41a19f 100644
--- a/net-wireless/uhd/uhd-3.15.0.0.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0.ebuild
@@ -43,6 +43,7 @@ DEPEND="${RDEPEND}
dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
dev-python/numpy[${PYTHON_MULTI_USEDEP}]
)
+ dev-python/requests[${PYTHON_MULTI_USEDEP}]
')
app-arch/unzip
app-arch/gzip
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2020-04-09 1:29 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2020-04-09 1:29 UTC (permalink / raw
To: gentoo-commits
commit: 8a766108775830247febb870765c513fdbde6996
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 9 01:26:19 2020 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Apr 9 01:26:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a766108
net-wireless/uhd: missing deps, I think
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/uhd-3.15.0.0.ebuild | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/net-wireless/uhd/uhd-3.15.0.0.ebuild b/net-wireless/uhd/uhd-3.15.0.0.ebuild
index c73dca778cd..66c1cda9508 100644
--- a/net-wireless/uhd/uhd-3.15.0.0.ebuild
+++ b/net-wireless/uhd/uhd-3.15.0.0.ebuild
@@ -37,7 +37,13 @@ RDEPEND="${PYTHON_DEPS}
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
- dev-python/mako
+ $(python_gen_cond_dep '
+ dev-python/mako[${PYTHON_MULTI_USEDEP}]
+ || (
+ dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
+ dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+ )
+ ')
app-arch/unzip
app-arch/gzip
"
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2020-01-07 17:27 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2020-01-07 17:27 UTC (permalink / raw
To: gentoo-commits
commit: b228d78179968217a230f2f1a8869e7424898e08
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 7 17:27:10 2020 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jan 7 17:27:24 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b228d781
net-wireless/uhd: bump
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/Manifest | 2 +
net-wireless/uhd/uhd-3.15.0.0.ebuild | 132 +++++++++++++++++++++++++++++++++++
2 files changed, 134 insertions(+)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index ff210d1f574..2d85130bec3 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -5,10 +5,12 @@ DIST EttusResearch-UHD-3.13.0.1.tar.gz 9409122 BLAKE2B 69d84db2b908598545af81753
DIST EttusResearch-UHD-3.13.1.0.tar.gz 11587157 BLAKE2B 44cd1759c9106c36e149431e655c673ba665b2a632e7bbf598b60950b31d4325921a1fe265d2fc47eb23dd3f90733b1407a6ed522f57ba975a0a4a5d9576c238 SHA512 3ef85e0b166879456fba49ab2a2ffd7ce670130700833fb4ac20376b69bd85354632ee9f320760f94d275449f10a36fdc8c106683a060e02924304fc9bc50bf8
DIST EttusResearch-UHD-3.14.0.0.tar.gz 12935658 BLAKE2B 8b5273ee3cd4c39ebb3848152116dc26caac951b3cea4c5e5efe37a90ac3a1e0580e7ed65af9145e4981abf7abd9ef748f9b3c823d87194ce7a4a5f9b799abec SHA512 c4754dbbd3540a41407a3bb31866a83c8ab319375db300113c0d13a3debbc4f0f820ccb83c30079c22388409edd032609cdb77bf6c098b37152b1985f773d1cb
DIST EttusResearch-UHD-3.14.1.1.tar.gz 12960651 BLAKE2B 8a2a0ac4d1cf71177dad1334dcc7426dc78a0c6b8c1bd895d7eb1ca4e2eb5b9a4208998118ba084f1932edacc7503b49a5ebd78dd1b1d9acbac6fe83f503b9eb SHA512 461f9314dd0af5feed91b18196cccb7828cee91a712dec0bb8b59878d54500906beea9f6dd938a90eae041dca6a1f6b564b6924d8e53e4b2fb507f2ed7be0ff4
+DIST EttusResearch-UHD-3.15.0.0.tar.gz 12895934 BLAKE2B 75bf474120a09ffe1268684659c8bbc8e781060db96b82e42a4d3463265e2a3df5e60da77d835587e6650795ae50bcab8bdecccf0f2bdd32fe77bbd6ce1ec5c8 SHA512 ef62639d956adb5b4815b8e57bf4d6e62519bcaf509ce87af4f6091b79b4bb78c2bc079ec6f678777c24a146d5d5e1c8f225ad7ac5dba46bec6f8e1cc20309b0
DIST uhd-images_003.010.003.000-release.zip 57008597 BLAKE2B 9fc93404860956e217c1bac6d3ade6fb5fb160afa6b07e5f4ccf10bf48a932d29068cca8730796797c66f36e9e30bd1d699359fad02b191ba4a224e096bf5fc3 SHA512 a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a555555e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7
DIST uhd-images_3.12.0.0.tar.xz 87309808 BLAKE2B 02e121cada37e2b2956521317513eb02a5b2ce6d9ca04609b5f847bda31e12a4ef4d83135f9e78fb88042f455afe8636d2c8c1a4539fa7e03ef3310a215fa938 SHA512 7bba0d87580413e2843c7e71938c5d5bfeaf7aa3bc58d058c1c80d5e1397443bcec637e378b2e9582752b97b11e57110299231c4ad3ae81cdd629251f49e84d8
DIST uhd-images_3.13.0.1.tar.xz 73484904 BLAKE2B 0045a9b0ed20661c8e1f2e650635cf4263a192b418ac82a6aea29ff899b3ef62d18591a4faee92b02c0618c5f5992d9177f816ca6050778fa69367afc73b0842 SHA512 94fdd4277306341ed9334b040aa5825edf762459976c1b68471d20ef3b29c102e5ac61be412fea8a1678c4ff59637cb9098594616ebd7153e7434005cfa1b672
DIST uhd-images_3.13.1.0.tar.xz 176004828 BLAKE2B 3a476337443f58a55773dd55f3605a37591d73ddd875a2cdb0459adfe93774ebc6c6f380aee7b00b70fd26ca5ac72730fdacd213f31239599227e19b24b9cc2a SHA512 3db7429c99823a7ef48253bb996e284c66f8f44913ed9d48baa3d7553a7d13724cbc1fe2df0032504491b677bdb3d609e3c6c01a580bd717cc311d54aa10d9fa
DIST uhd-images_3.14.0.0.tar.xz 112971440 BLAKE2B b0aeb77251500c42ccaa753483b20d82113d55f1e2f2e1181a27cd95f6aec1768e8a02c9dbc65db612d04d43e7756c6b6e3d6f662a4e66043b3ec52b44bbeb77 SHA512 a173d8c384dbe4936b5cfb580c572ca94b877c07ce578960cb9dab30e8d3ee9bfc1833c13981828bb31a748bb0db3e7e1ab475620596ad62d1570703ac0a163b
DIST uhd-images_3.14.1.1.tar.xz 113265248 BLAKE2B b1ac40435b8bce5cdc29bbdfd182f65d8d2f7d80b21a835202551e52cdc5d7f3b028faa73850121a79a1ff4df73620b8c36a5cab38cb2fed9c582a48429e0ee3 SHA512 d2afde2f6a243fe3763f09ffe50bf4372af7f2b840df013f3eb111f0e713c9d57317414c389c8db87151ec8c2a868b2d4c67e571a8f6d3b17a250fb63f25aedd
+DIST uhd-images_3.15.0.0.tar.xz 110161052 BLAKE2B 681b5ab0d79bbd2e5661bbfe5c975fdda83e7749f1c3b8a5ac2ba4088009a69c58f9b6a4e4c697c5ac90bdb809bc859937b3b63c9daf0984636bafaeee10e977 SHA512 ec7aa9740e0eda90bbee3751f5c65d5998e67d2bf74d36aa912041be8818e3ad03e5dfbf26ad340261f72fc98048ab5a90c56f6dff8efdd38cf0501585554033
DIST uhd_3.11.0.0_images.tar.xz 73634376 BLAKE2B 1d6ff5ec976082e1b3f6db3e8277e277591c7b2a96698c93407099a3543c6787632724d385f319828a9fe8e6ea750e0cd2256cd1cb32aeddda7dfa6ab88ffb3e SHA512 1a665ea58ef545f0a0b643916b822127d55cf81a59c6f447d8006619200d1be69ebebf47261ac318d6ecd1d0e265b9cf4b5da83b082b649496aadd9b4293c6c8
diff --git a/net-wireless/uhd/uhd-3.15.0.0.ebuild b/net-wireless/uhd/uhd-3.15.0.0.ebuild
new file mode 100644
index 00000000000..c73dca778cd
--- /dev/null
+++ b/net-wireless/uhd/uhd-3.15.0.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+#not sure why, but eapi 7 fails
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eapi7-ver python-single-r1 gnome2-utils cmake-utils multilib
+
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
+HOMEPAGE="https://kb.ettus.com"
+
+SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
+ https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
+#https://github.com/EttusResearch/UHD-Mirror/tags
+#http://files.ettus.com/binaries/images/
+
+LICENSE="GPL-3"
+SLOT="0/$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ b100? ( usb )
+ b200? ( usb )
+ usrp1? ( usb )
+ usrp2? ( usb )
+ || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
+
+RDEPEND="${PYTHON_DEPS}
+ e300? ( virtual/udev )
+ usb? ( virtual/libusb:1 )
+ dev-libs/boost:=
+ sys-libs/ncurses:0[tinfo]
+"
+
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ dev-python/mako
+ app-arch/unzip
+ app-arch/gzip
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" )
+
+S="${WORKDIR}/${P}/host"
+
+src_unpack() {
+ default
+ mv "uhd-images_${PV}" images || die
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ gnome2_environment_reset #534582
+
+ #this may not be needed in 3.4.3 and above, please verify
+ sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DENABLE_LIBUHD=ON
+ -DENABLE_C_API=ON
+ -DENABLE_LIBERIO=OFF
+ -DENABLE_MAN_PAGES=ON
+ -DENABLE_GPSD=OFF
+ -DENABLE_MAN_PAGE_COMPRESSION=OFF
+ -DENABLE_EXAMPLES="$(usex examples)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_USB="$(usex usb)"
+ -DENABLE_UTILS="$(usex utils)"
+ -DENABLE_MANUAL="$(usex doc)"
+ -DENABLE_DOXYGEN="$(usex doc)"
+ -DENABLE_B100="$(usex b100)"
+ -DENABLE_B200="$(usex b200)"
+ -DENABLE_E300="$(usex e300)"
+ -DENABLE_USRP1="$(usex usrp1)"
+ -DENABLE_USRP2="$(usex usrp2)"
+ -DENABLE_X300="$(usex x300)"
+ -DENABLE_N230="$(usex n230)"
+ -DENABLE_MPMD="$(usex mpmd)"
+ -DENABLE_OCTOCLOCK="$(usex octoclock)"
+ )
+ cmake-utils_src_configure
+}
+src_install() {
+ cmake-utils_src_install
+ use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+ if [ "${PV}" != "9999" ]; then
+ rm -rf "${ED}/usr/bin/uhd_images_downloader"
+ rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1"
+ fi
+
+ insinto /lib/udev/rules.d/
+ doins "${S}/utils/uhd-usrp.rules"
+
+ rm -rf "${WORKDIR}/images/winusb_driver"
+ if ! use b100; then
+ rm "${WORKDIR}"/images/usrp_b100* || die
+ fi
+ if ! use b200; then
+ rm "${WORKDIR}"/images/usrp_b2[01]* || die
+ fi
+ if ! use e300; then
+ rm "${WORKDIR}"/images/usrp_e3* || die
+ fi
+ if ! use mpmd; then
+ rm "${WORKDIR}"/images/usrp_n310* || die
+ fi
+ if ! use n230; then
+ rm "${WORKDIR}"/images/usrp_n230* || die
+ fi
+ if ! use octoclock; then
+ rm "${WORKDIR}"/images/octoclock* || die
+ fi
+ if ! use usrp1; then
+ rm "${WORKDIR}"/images/usrp1* || die
+ fi
+ if ! use usrp2; then
+ rm "${WORKDIR}"/images/usrp2* || die
+ rm "${WORKDIR}"/images/usrp_n2[01]* || die
+ rm -r "${WORKDIR}"/images/bit || die
+ fi
+ if ! use x300; then
+ rm "${WORKDIR}/"images/usrp_x3* || die
+ fi
+ insinto /usr/share/${PN}
+ doins -r "${WORKDIR}/images"
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2019-03-27 14:53 Rick Farina
0 siblings, 0 replies; 55+ messages in thread
From: Rick Farina @ 2019-03-27 14:53 UTC (permalink / raw
To: gentoo-commits
commit: 16351b149d7f1b5007c7fe2acd547836b9f1ab6d
Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 14:51:15 2019 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 14:53:22 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16351b14
net-wireless/uhd: version bump
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
net-wireless/uhd/Manifest | 2 +
net-wireless/uhd/uhd-3.14.0.0.ebuild | 130 +++++++++++++++++++++++++++++++++++
2 files changed, 132 insertions(+)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 5b428d26f33..59017e8c6a0 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -3,8 +3,10 @@ DIST EttusResearch-UHD-3.11.0.0.tar.gz 9279808 BLAKE2B b0c083d0ad04b7012b0a7bfa8
DIST EttusResearch-UHD-3.12.0.0.tar.gz 9317321 BLAKE2B 7fdbef49482166d929952848dc2a978161e739462c6743dc162ad92b93190086e6957b08f54cba23e6118ddff41c5fb1cfceffedc8411791aece866ab2ab98f7 SHA512 33efcb913a40fcceaf21460eeb7b8fe7fdd9066cefc1f6ae7d4f436532965b3fe55557d551a8e95c3823418ffec4c0e2804e200c9222b5bf5735622cc2cb1389
DIST EttusResearch-UHD-3.13.0.1.tar.gz 9409122 BLAKE2B 69d84db2b908598545af8175304c19d00bde29d606b6af55e12ed2184d14a08bee7cb229b54dc5f339f587194b493e04f6f584685c2e836f81a9063ffc5e5799 SHA512 83196212326ab43f7996bf297677980f1e2cb2e51fc6479f086e010078d2ff6ee42ffd5af6bdcaaf0d6c45a3e773b117f8bdbf2e8e0add2b8dc6f3e19ad777cd
DIST EttusResearch-UHD-3.13.1.0.tar.gz 11587157 BLAKE2B 44cd1759c9106c36e149431e655c673ba665b2a632e7bbf598b60950b31d4325921a1fe265d2fc47eb23dd3f90733b1407a6ed522f57ba975a0a4a5d9576c238 SHA512 3ef85e0b166879456fba49ab2a2ffd7ce670130700833fb4ac20376b69bd85354632ee9f320760f94d275449f10a36fdc8c106683a060e02924304fc9bc50bf8
+DIST EttusResearch-UHD-3.14.0.0.tar.gz 12935658 BLAKE2B 8b5273ee3cd4c39ebb3848152116dc26caac951b3cea4c5e5efe37a90ac3a1e0580e7ed65af9145e4981abf7abd9ef748f9b3c823d87194ce7a4a5f9b799abec SHA512 c4754dbbd3540a41407a3bb31866a83c8ab319375db300113c0d13a3debbc4f0f820ccb83c30079c22388409edd032609cdb77bf6c098b37152b1985f773d1cb
DIST uhd-images_003.010.003.000-release.zip 57008597 BLAKE2B 9fc93404860956e217c1bac6d3ade6fb5fb160afa6b07e5f4ccf10bf48a932d29068cca8730796797c66f36e9e30bd1d699359fad02b191ba4a224e096bf5fc3 SHA512 a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a555555e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7
DIST uhd-images_3.12.0.0.tar.xz 87309808 BLAKE2B 02e121cada37e2b2956521317513eb02a5b2ce6d9ca04609b5f847bda31e12a4ef4d83135f9e78fb88042f455afe8636d2c8c1a4539fa7e03ef3310a215fa938 SHA512 7bba0d87580413e2843c7e71938c5d5bfeaf7aa3bc58d058c1c80d5e1397443bcec637e378b2e9582752b97b11e57110299231c4ad3ae81cdd629251f49e84d8
DIST uhd-images_3.13.0.1.tar.xz 73484904 BLAKE2B 0045a9b0ed20661c8e1f2e650635cf4263a192b418ac82a6aea29ff899b3ef62d18591a4faee92b02c0618c5f5992d9177f816ca6050778fa69367afc73b0842 SHA512 94fdd4277306341ed9334b040aa5825edf762459976c1b68471d20ef3b29c102e5ac61be412fea8a1678c4ff59637cb9098594616ebd7153e7434005cfa1b672
DIST uhd-images_3.13.1.0.tar.xz 176004828 BLAKE2B 3a476337443f58a55773dd55f3605a37591d73ddd875a2cdb0459adfe93774ebc6c6f380aee7b00b70fd26ca5ac72730fdacd213f31239599227e19b24b9cc2a SHA512 3db7429c99823a7ef48253bb996e284c66f8f44913ed9d48baa3d7553a7d13724cbc1fe2df0032504491b677bdb3d609e3c6c01a580bd717cc311d54aa10d9fa
+DIST uhd-images_3.14.0.0.tar.xz 112971440 BLAKE2B b0aeb77251500c42ccaa753483b20d82113d55f1e2f2e1181a27cd95f6aec1768e8a02c9dbc65db612d04d43e7756c6b6e3d6f662a4e66043b3ec52b44bbeb77 SHA512 a173d8c384dbe4936b5cfb580c572ca94b877c07ce578960cb9dab30e8d3ee9bfc1833c13981828bb31a748bb0db3e7e1ab475620596ad62d1570703ac0a163b
DIST uhd_3.11.0.0_images.tar.xz 73634376 BLAKE2B 1d6ff5ec976082e1b3f6db3e8277e277591c7b2a96698c93407099a3543c6787632724d385f319828a9fe8e6ea750e0cd2256cd1cb32aeddda7dfa6ab88ffb3e SHA512 1a665ea58ef545f0a0b643916b822127d55cf81a59c6f447d8006619200d1be69ebebf47261ac318d6ecd1d0e265b9cf4b5da83b082b649496aadd9b4293c6c8
diff --git a/net-wireless/uhd/uhd-3.14.0.0.ebuild b/net-wireless/uhd/uhd-3.14.0.0.ebuild
new file mode 100644
index 00000000000..3d955335e62
--- /dev/null
+++ b/net-wireless/uhd/uhd-3.14.0.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
+
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
+HOMEPAGE="https://kb.ettus.com"
+
+image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
+SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
+ https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
+#https://github.com/EttusResearch/UHD-Mirror/tags
+#http://files.ettus.com/binaries/images/
+
+LICENSE="GPL-3"
+SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ b100? ( usb )
+ b200? ( usb )
+ usrp1? ( usb )
+ usrp2? ( usb )
+ || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
+
+RDEPEND="${PYTHON_DEPS}
+ e300? ( virtual/udev )
+ usb? ( virtual/libusb:1 )
+ dev-libs/boost:=
+ sys-libs/ncurses:0[tinfo]
+"
+
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ dev-python/mako
+ app-arch/unzip
+ app-arch/gzip
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.13.1.0-tinfo.patch" )
+
+S="${WORKDIR}/${P}/host"
+
+src_unpack() {
+ default
+ mv "uhd-images_${PV}" images || die
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ gnome2_environment_reset #534582
+
+ #this may not be needed in 3.4.3 and above, please verify
+ sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DENABLE_LIBUHD=ON
+ -DENABLE_C_API=ON
+ -DENABLE_LIBERIO=OFF
+ -DENABLE_MAN_PAGES=ON
+ -DENABLE_GPSD=OFF
+ -DENABLE_EXAMPLES="$(usex examples)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_USB="$(usex usb)"
+ -DENABLE_UTILS="$(usex utils)"
+ -DENABLE_MANUAL="$(usex doc)"
+ -DENABLE_DOXYGEN="$(usex doc)"
+ -DENABLE_B100="$(usex b100)"
+ -DENABLE_B200="$(usex b200)"
+ -DENABLE_E300="$(usex e300)"
+ -DENABLE_USRP1="$(usex usrp1)"
+ -DENABLE_USRP2="$(usex usrp2)"
+ -DENABLE_X300="$(usex x300)"
+ -DENABLE_N230="$(usex n230)"
+ -DENABLE_MPMD="$(usex mpmd)"
+ -DENABLE_OCTOCLOCK="$(usex octoclock)"
+ )
+ cmake-utils_src_configure
+}
+src_install() {
+ cmake-utils_src_install
+ use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+ if [ "${PV}" != "9999" ]; then
+ rm -rf "${ED}/usr/bin/uhd_images_downloader"
+ rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
+ fi
+
+ insinto /lib/udev/rules.d/
+ doins "${S}/utils/uhd-usrp.rules"
+
+ rm -rf "${WORKDIR}/images/winusb_driver"
+ if ! use b100; then
+ rm "${WORKDIR}"/images/usrp_b100* || die
+ fi
+ if ! use b200; then
+ rm "${WORKDIR}"/images/usrp_b2[01]* || die
+ fi
+ if ! use e300; then
+ rm "${WORKDIR}"/images/usrp_e3* || die
+ fi
+ if ! use mpmd; then
+ rm "${WORKDIR}"/images/usrp_n310* || die
+ fi
+ if ! use n230; then
+ rm "${WORKDIR}"/images/usrp_n230* || die
+ fi
+ if ! use octoclock; then
+ rm "${WORKDIR}"/images/octoclock* || die
+ fi
+ if ! use usrp1; then
+ rm "${WORKDIR}"/images/usrp1* || die
+ fi
+ if ! use usrp2; then
+ rm "${WORKDIR}"/images/usrp2* || die
+ rm "${WORKDIR}"/images/usrp_n2[01]* || die
+ rm -r "${WORKDIR}"/images/bit || die
+ fi
+ if ! use x300; then
+ rm "${WORKDIR}/"images/usrp_x3* || die
+ fi
+ insinto /usr/share/${PN}
+ doins -r "${WORKDIR}/images"
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2018-09-05 15:42 Richard Farina
0 siblings, 0 replies; 55+ messages in thread
From: Richard Farina @ 2018-09-05 15:42 UTC (permalink / raw
To: gentoo-commits
commit: c589904fddee686bb9353420ad6ca5c5d73c6b15
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 5 15:41:48 2018 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Sep 5 15:42:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c589904f
net-wireless/uhd: bump
Package-Manager: Portage-2.3.49, Repoman-2.3.10
net-wireless/uhd/Manifest | 2 +
net-wireless/uhd/uhd-3.13.0.1.ebuild | 130 +++++++++++++++++++++++++++++++++++
2 files changed, 132 insertions(+)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 7697d5a75e9..79684a22b4b 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,6 +1,8 @@
DIST EttusResearch-UHD-3.10.3.0.tar.gz 7566274 BLAKE2B 4267f1cb2e30808e54709946c74fbab8612560d38ad32f58745085b2b8c18f1c376e642ff430db476dd829bc0ecfca62faa211fe8800ce8589223f9123a1c608 SHA512 398fdaa29daf4a0d49172afce46ec57a8a96861a8d3262fdd19f78a29dc7d17ae7cb3731639950784420eca50c0a2f0dc8bf83da7be0b63af208b7bf0b382f6b
DIST EttusResearch-UHD-3.11.0.0.tar.gz 9279808 BLAKE2B b0c083d0ad04b7012b0a7bfa866f26db0e159d6daa2209b56ab8733d8d5288e8ff039aa3e2a27e5d715d08022e175a4e04e65f465ceea5da77dc4339d9ba5951 SHA512 63a50f2736c4ba05e06517cfdcb3eae465f78d506e75df36055d8cdec5259ffeebdd6e7ef352c64dfd6b9ef7fbd0df572515bdedefcabe2006abbecb012b169f
DIST EttusResearch-UHD-3.12.0.0.tar.gz 9317321 BLAKE2B 7fdbef49482166d929952848dc2a978161e739462c6743dc162ad92b93190086e6957b08f54cba23e6118ddff41c5fb1cfceffedc8411791aece866ab2ab98f7 SHA512 33efcb913a40fcceaf21460eeb7b8fe7fdd9066cefc1f6ae7d4f436532965b3fe55557d551a8e95c3823418ffec4c0e2804e200c9222b5bf5735622cc2cb1389
+DIST EttusResearch-UHD-3.13.0.1.tar.gz 9409122 BLAKE2B 69d84db2b908598545af8175304c19d00bde29d606b6af55e12ed2184d14a08bee7cb229b54dc5f339f587194b493e04f6f584685c2e836f81a9063ffc5e5799 SHA512 83196212326ab43f7996bf297677980f1e2cb2e51fc6479f086e010078d2ff6ee42ffd5af6bdcaaf0d6c45a3e773b117f8bdbf2e8e0add2b8dc6f3e19ad777cd
DIST uhd-images_003.010.003.000-release.zip 57008597 BLAKE2B 9fc93404860956e217c1bac6d3ade6fb5fb160afa6b07e5f4ccf10bf48a932d29068cca8730796797c66f36e9e30bd1d699359fad02b191ba4a224e096bf5fc3 SHA512 a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a555555e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7
DIST uhd-images_3.12.0.0.tar.xz 87309808 BLAKE2B 02e121cada37e2b2956521317513eb02a5b2ce6d9ca04609b5f847bda31e12a4ef4d83135f9e78fb88042f455afe8636d2c8c1a4539fa7e03ef3310a215fa938 SHA512 7bba0d87580413e2843c7e71938c5d5bfeaf7aa3bc58d058c1c80d5e1397443bcec637e378b2e9582752b97b11e57110299231c4ad3ae81cdd629251f49e84d8
+DIST uhd-images_3.13.0.1.tar.xz 73484904 BLAKE2B 0045a9b0ed20661c8e1f2e650635cf4263a192b418ac82a6aea29ff899b3ef62d18591a4faee92b02c0618c5f5992d9177f816ca6050778fa69367afc73b0842 SHA512 94fdd4277306341ed9334b040aa5825edf762459976c1b68471d20ef3b29c102e5ac61be412fea8a1678c4ff59637cb9098594616ebd7153e7434005cfa1b672
DIST uhd_3.11.0.0_images.tar.xz 73634376 BLAKE2B 1d6ff5ec976082e1b3f6db3e8277e277591c7b2a96698c93407099a3543c6787632724d385f319828a9fe8e6ea750e0cd2256cd1cb32aeddda7dfa6ab88ffb3e SHA512 1a665ea58ef545f0a0b643916b822127d55cf81a59c6f447d8006619200d1be69ebebf47261ac318d6ecd1d0e265b9cf4b5da83b082b649496aadd9b4293c6c8
diff --git a/net-wireless/uhd/uhd-3.13.0.1.ebuild b/net-wireless/uhd/uhd-3.13.0.1.ebuild
new file mode 100644
index 00000000000..18e5ddf1306
--- /dev/null
+++ b/net-wireless/uhd/uhd-3.13.0.1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
+
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
+HOMEPAGE="https://kb.ettus.com"
+
+image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
+SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
+ https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
+#https://github.com/EttusResearch/UHD-Mirror/tags
+#http://files.ettus.com/binaries/images/
+
+LICENSE="GPL-3"
+SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ b100? ( usb )
+ b200? ( usb )
+ usrp1? ( usb )
+ usrp2? ( usb )
+ || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
+
+RDEPEND="${PYTHON_DEPS}
+ e300? ( virtual/udev )
+ usb? ( virtual/libusb:1 )
+ dev-libs/boost:=
+ sys-libs/ncurses:0[tinfo]
+"
+
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ dev-python/mako
+ app-arch/unzip
+ app-arch/gzip
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.10.3.0-tinfo.patch" )
+
+S="${WORKDIR}/${P}/host"
+
+src_unpack() {
+ default
+ mv "uhd-images_${PV}" images || die
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ gnome2_environment_reset #534582
+
+ #this may not be needed in 3.4.3 and above, please verify
+ sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DENABLE_LIBUHD=ON
+ -DENABLE_C_API=ON
+ -DENABLE_LIBERIO=OFF
+ -DENABLE_MAN_PAGES=ON
+ -DENABLE_GPSD=OFF
+ -DENABLE_EXAMPLES="$(usex examples)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_USB="$(usex usb)"
+ -DENABLE_UTILS="$(usex utils)"
+ -DENABLE_MANUAL="$(usex doc)"
+ -DENABLE_DOXYGEN="$(usex doc)"
+ -DENABLE_B100="$(usex b100)"
+ -DENABLE_B200="$(usex b200)"
+ -DENABLE_E300="$(usex e300)"
+ -DENABLE_USRP1="$(usex usrp1)"
+ -DENABLE_USRP2="$(usex usrp2)"
+ -DENABLE_X300="$(usex x300)"
+ -DENABLE_N230="$(usex n230)"
+ -DENABLE_MPMD="$(usex mpmd)"
+ -DENABLE_OCTOCLOCK="$(usex octoclock)"
+ )
+ cmake-utils_src_configure
+}
+src_install() {
+ cmake-utils_src_install
+ use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+ if [ "${PV}" != "9999" ]; then
+ rm -rf "${ED}/usr/bin/uhd_images_downloader"
+ rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
+ fi
+
+ insinto /lib/udev/rules.d/
+ doins "${S}/utils/uhd-usrp.rules"
+
+ rm -rf "${WORKDIR}/images/winusb_driver"
+ if ! use b100; then
+ rm "${WORKDIR}"/images/usrp_b100* || die
+ fi
+ if ! use b200; then
+ rm "${WORKDIR}"/images/usrp_b2[01]* || die
+ fi
+ if ! use e300; then
+ rm "${WORKDIR}"/images/usrp_e3* || die
+ fi
+ if ! use mpmd; then
+ rm "${WORKDIR}"/images/usrp_n310* || die
+ fi
+ if ! use n230; then
+ rm "${WORKDIR}"/images/usrp_n230* || die
+ fi
+ if ! use octoclock; then
+ rm "${WORKDIR}"/images/octoclock* || die
+ fi
+ if ! use usrp1; then
+ rm "${WORKDIR}"/images/usrp1* || die
+ fi
+ if ! use usrp2; then
+ rm "${WORKDIR}"/images/usrp2* || die
+ rm "${WORKDIR}"/images/usrp_n2[01]* || die
+ rm -r "${WORKDIR}"/images/bit || die
+ fi
+ if ! use x300; then
+ rm "${WORKDIR}/"images/usrp_x3* || die
+ fi
+ insinto /usr/share/${PN}
+ doins -r "${WORKDIR}/images"
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2018-06-06 20:51 Richard Farina
0 siblings, 0 replies; 55+ messages in thread
From: Richard Farina @ 2018-06-06 20:51 UTC (permalink / raw
To: gentoo-commits
commit: a6b945b27a21ef33e562606434a020afd21906e8
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 6 20:51:20 2018 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Jun 6 20:51:37 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b945b2
net-wireless/uhd: bump with minor shuffling
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-wireless/uhd/Manifest | 2 +
net-wireless/uhd/uhd-3.12.0.0.ebuild | 130 +++++++++++++++++++++++++++++++++++
2 files changed, 132 insertions(+)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index e7a1b9c0023..7697d5a75e9 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,4 +1,6 @@
DIST EttusResearch-UHD-3.10.3.0.tar.gz 7566274 BLAKE2B 4267f1cb2e30808e54709946c74fbab8612560d38ad32f58745085b2b8c18f1c376e642ff430db476dd829bc0ecfca62faa211fe8800ce8589223f9123a1c608 SHA512 398fdaa29daf4a0d49172afce46ec57a8a96861a8d3262fdd19f78a29dc7d17ae7cb3731639950784420eca50c0a2f0dc8bf83da7be0b63af208b7bf0b382f6b
DIST EttusResearch-UHD-3.11.0.0.tar.gz 9279808 BLAKE2B b0c083d0ad04b7012b0a7bfa866f26db0e159d6daa2209b56ab8733d8d5288e8ff039aa3e2a27e5d715d08022e175a4e04e65f465ceea5da77dc4339d9ba5951 SHA512 63a50f2736c4ba05e06517cfdcb3eae465f78d506e75df36055d8cdec5259ffeebdd6e7ef352c64dfd6b9ef7fbd0df572515bdedefcabe2006abbecb012b169f
+DIST EttusResearch-UHD-3.12.0.0.tar.gz 9317321 BLAKE2B 7fdbef49482166d929952848dc2a978161e739462c6743dc162ad92b93190086e6957b08f54cba23e6118ddff41c5fb1cfceffedc8411791aece866ab2ab98f7 SHA512 33efcb913a40fcceaf21460eeb7b8fe7fdd9066cefc1f6ae7d4f436532965b3fe55557d551a8e95c3823418ffec4c0e2804e200c9222b5bf5735622cc2cb1389
DIST uhd-images_003.010.003.000-release.zip 57008597 BLAKE2B 9fc93404860956e217c1bac6d3ade6fb5fb160afa6b07e5f4ccf10bf48a932d29068cca8730796797c66f36e9e30bd1d699359fad02b191ba4a224e096bf5fc3 SHA512 a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a555555e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7
+DIST uhd-images_3.12.0.0.tar.xz 87309808 BLAKE2B 02e121cada37e2b2956521317513eb02a5b2ce6d9ca04609b5f847bda31e12a4ef4d83135f9e78fb88042f455afe8636d2c8c1a4539fa7e03ef3310a215fa938 SHA512 7bba0d87580413e2843c7e71938c5d5bfeaf7aa3bc58d058c1c80d5e1397443bcec637e378b2e9582752b97b11e57110299231c4ad3ae81cdd629251f49e84d8
DIST uhd_3.11.0.0_images.tar.xz 73634376 BLAKE2B 1d6ff5ec976082e1b3f6db3e8277e277591c7b2a96698c93407099a3543c6787632724d385f319828a9fe8e6ea750e0cd2256cd1cb32aeddda7dfa6ab88ffb3e SHA512 1a665ea58ef545f0a0b643916b822127d55cf81a59c6f447d8006619200d1be69ebebf47261ac318d6ecd1d0e265b9cf4b5da83b082b649496aadd9b4293c6c8
diff --git a/net-wireless/uhd/uhd-3.12.0.0.ebuild b/net-wireless/uhd/uhd-3.12.0.0.ebuild
new file mode 100644
index 00000000000..18e5ddf1306
--- /dev/null
+++ b/net-wireless/uhd/uhd-3.12.0.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
+
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
+HOMEPAGE="https://kb.ettus.com"
+
+image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
+SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
+ https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
+#https://github.com/EttusResearch/UHD-Mirror/tags
+#http://files.ettus.com/binaries/images/
+
+LICENSE="GPL-3"
+SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ b100? ( usb )
+ b200? ( usb )
+ usrp1? ( usb )
+ usrp2? ( usb )
+ || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
+
+RDEPEND="${PYTHON_DEPS}
+ e300? ( virtual/udev )
+ usb? ( virtual/libusb:1 )
+ dev-libs/boost:=
+ sys-libs/ncurses:0[tinfo]
+"
+
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ dev-python/mako
+ app-arch/unzip
+ app-arch/gzip
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.10.3.0-tinfo.patch" )
+
+S="${WORKDIR}/${P}/host"
+
+src_unpack() {
+ default
+ mv "uhd-images_${PV}" images || die
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ gnome2_environment_reset #534582
+
+ #this may not be needed in 3.4.3 and above, please verify
+ sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DENABLE_LIBUHD=ON
+ -DENABLE_C_API=ON
+ -DENABLE_LIBERIO=OFF
+ -DENABLE_MAN_PAGES=ON
+ -DENABLE_GPSD=OFF
+ -DENABLE_EXAMPLES="$(usex examples)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_USB="$(usex usb)"
+ -DENABLE_UTILS="$(usex utils)"
+ -DENABLE_MANUAL="$(usex doc)"
+ -DENABLE_DOXYGEN="$(usex doc)"
+ -DENABLE_B100="$(usex b100)"
+ -DENABLE_B200="$(usex b200)"
+ -DENABLE_E300="$(usex e300)"
+ -DENABLE_USRP1="$(usex usrp1)"
+ -DENABLE_USRP2="$(usex usrp2)"
+ -DENABLE_X300="$(usex x300)"
+ -DENABLE_N230="$(usex n230)"
+ -DENABLE_MPMD="$(usex mpmd)"
+ -DENABLE_OCTOCLOCK="$(usex octoclock)"
+ )
+ cmake-utils_src_configure
+}
+src_install() {
+ cmake-utils_src_install
+ use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+ if [ "${PV}" != "9999" ]; then
+ rm -rf "${ED}/usr/bin/uhd_images_downloader"
+ rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
+ fi
+
+ insinto /lib/udev/rules.d/
+ doins "${S}/utils/uhd-usrp.rules"
+
+ rm -rf "${WORKDIR}/images/winusb_driver"
+ if ! use b100; then
+ rm "${WORKDIR}"/images/usrp_b100* || die
+ fi
+ if ! use b200; then
+ rm "${WORKDIR}"/images/usrp_b2[01]* || die
+ fi
+ if ! use e300; then
+ rm "${WORKDIR}"/images/usrp_e3* || die
+ fi
+ if ! use mpmd; then
+ rm "${WORKDIR}"/images/usrp_n310* || die
+ fi
+ if ! use n230; then
+ rm "${WORKDIR}"/images/usrp_n230* || die
+ fi
+ if ! use octoclock; then
+ rm "${WORKDIR}"/images/octoclock* || die
+ fi
+ if ! use usrp1; then
+ rm "${WORKDIR}"/images/usrp1* || die
+ fi
+ if ! use usrp2; then
+ rm "${WORKDIR}"/images/usrp2* || die
+ rm "${WORKDIR}"/images/usrp_n2[01]* || die
+ rm -r "${WORKDIR}"/images/bit || die
+ fi
+ if ! use x300; then
+ rm "${WORKDIR}/"images/usrp_x3* || die
+ fi
+ insinto /usr/share/${PN}
+ doins -r "${WORKDIR}/images"
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2018-03-08 19:25 Richard Farina
0 siblings, 0 replies; 55+ messages in thread
From: Richard Farina @ 2018-03-08 19:25 UTC (permalink / raw
To: gentoo-commits
commit: 0d46bec172b7ae8dea9cee877a060389430b38d1
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 8 19:24:45 2018 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Mar 8 19:25:11 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d46bec1
net-wireless/uhd: bump with lots of help from upstream
add use flags for things upstream has exposed while disabling things
which make no sense to run on the host
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-wireless/uhd/Manifest | 2 +
net-wireless/uhd/metadata.xml | 12 ++++
net-wireless/uhd/uhd-3.11.0.0.ebuild | 132 +++++++++++++++++++++++++++++++++++
3 files changed, 146 insertions(+)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index e1e05e780aa..d260b3955ce 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,4 +1,6 @@
DIST EttusResearch-UHD-3.10.3.0.tar.gz 7566274 BLAKE2B 4267f1cb2e30808e54709946c74fbab8612560d38ad32f58745085b2b8c18f1c376e642ff430db476dd829bc0ecfca62faa211fe8800ce8589223f9123a1c608 SHA512 398fdaa29daf4a0d49172afce46ec57a8a96861a8d3262fdd19f78a29dc7d17ae7cb3731639950784420eca50c0a2f0dc8bf83da7be0b63af208b7bf0b382f6b
+DIST EttusResearch-UHD-3.11.0.0.tar.gz 9279808 BLAKE2B b0c083d0ad04b7012b0a7bfa866f26db0e159d6daa2209b56ab8733d8d5288e8ff039aa3e2a27e5d715d08022e175a4e04e65f465ceea5da77dc4339d9ba5951 SHA512 63a50f2736c4ba05e06517cfdcb3eae465f78d506e75df36055d8cdec5259ffeebdd6e7ef352c64dfd6b9ef7fbd0df572515bdedefcabe2006abbecb012b169f
DIST EttusResearch-UHD-3.9.6.tar.gz 2458419 BLAKE2B 39859c9c7a520b91fd0ad11b82a454ae267d0e04bbb3d3f474ab31ea8daac69c03e5abe4ed54f3eec5810d180d00aa700e67b10d989295fdedf73cb198ae324d SHA512 f8e89f67659e9509d90fb63a91c75b7a5fe037821ccd2f33313ac0b20d856cbdc2cab79715f7fca035ba0e28b240c73408d6764cb09b01700c4ddbdcafa71da1
DIST uhd-images_003.009.006-release.zip 26268656 BLAKE2B 7d8c1b0bbd627a0180d5e2de996eb68b1fb995ea2c28ed12fa73705cda680d6304ff013a80cfd4ea5928137c16ac128546bdb9ed3cf932a837faa6dfe0866ffa SHA512 3b07a054583a55424edeb37d3ee70b9bd8c7b6cb4c83a10faf4dd518aa148be17af7cb8b5e4fb7cbb643eae32d7a3295a94d9a0eb031823ccf1f414da0cef631
DIST uhd-images_003.010.003.000-release.zip 57008597 BLAKE2B 9fc93404860956e217c1bac6d3ade6fb5fb160afa6b07e5f4ccf10bf48a932d29068cca8730796797c66f36e9e30bd1d699359fad02b191ba4a224e096bf5fc3 SHA512 a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a555555e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7
+DIST uhd_3.11.0.0_images.tar.xz 73634376 BLAKE2B 1d6ff5ec976082e1b3f6db3e8277e277591c7b2a96698c93407099a3543c6787632724d385f319828a9fe8e6ea750e0cd2256cd1cb32aeddda7dfa6ab88ffb3e SHA512 1a665ea58ef545f0a0b643916b822127d55cf81a59c6f447d8006619200d1be69ebebf47261ac318d6ecd1d0e265b9cf4b5da83b082b649496aadd9b4293c6c8
diff --git a/net-wireless/uhd/metadata.xml b/net-wireless/uhd/metadata.xml
index 9e997879740..c6f847e4feb 100644
--- a/net-wireless/uhd/metadata.xml
+++ b/net-wireless/uhd/metadata.xml
@@ -16,4 +16,16 @@
<upstream>
<remote-id type="github">EttusResearch/uhd</remote-id>
</upstream>
+ <use>
+ <flag name="b100">support B100 hardware</flag>
+ <flag name="b200">support B200, B210, B200mini, B205mini hardware</flag>
+ <flag name="e300">support E300, E310 hardware</flag>
+ <flag name="mpmd">support N300, N310 hardware</flag>
+ <flag name="octoclock">Octoclock Network Support</flag>
+ <flag name="n230">support N230 harware</flag>
+ <flag name="usrp1">support USRP1 hardware</flag>
+ <flag name="usrp2">support USRP2, N200, N210 hardware</flag>
+ <flag name="utils">utilities needed to list, query, calibrate, or update FPGA/Firmware</flag>
+ <flag name="x300">support X300, X310 hardware</flag>
+ </use>
</pkgmetadata>
diff --git a/net-wireless/uhd/uhd-3.11.0.0.ebuild b/net-wireless/uhd/uhd-3.11.0.0.ebuild
new file mode 100644
index 00000000000..c3489e4e0be
--- /dev/null
+++ b/net-wireless/uhd/uhd-3.11.0.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
+
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
+HOMEPAGE="https://kb.ettus.com"
+
+image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
+SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4).tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
+ https://github.com/EttusResearch/uhd/releases/download/release_003_011_000_000/uhd_${PV}_images.tar.xz"
+#https://github.com/EttusResearch/UHD-Mirror/tags
+#http://files.ettus.com/binaries/images/
+
+LICENSE="GPL-3"
+SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ b100? ( usb )
+ b200? ( usb )
+ usrp1? ( usb )
+ usrp2? ( usb )
+ || ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
+
+RDEPEND="${PYTHON_DEPS}
+ e300? ( virtual/udev )
+ usb? ( virtual/libusb:1 )
+ dev-libs/boost:=
+ sys-libs/ncurses:0[tinfo]
+"
+
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ dev-python/mako
+ app-arch/unzip
+ app-arch/gzip
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.10.3.0-tinfo.patch" )
+
+S="${WORKDIR}/uhd-release_00$(get_version_component_range 1)_0$(get_version_component_range 2)_00$(get_version_component_range 3)_00$(get_version_component_range 4)/host"
+
+src_unpack() {
+ unpack EttusResearch-UHD-${PV}.tar.gz
+ mkdir images || die
+ cd images || die
+ unpack uhd_${PV}_images.tar.xz
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ gnome2_environment_reset #534582
+
+ #this may not be needed in 3.4.3 and above, please verify
+ sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DENABLE_LIBUHD=ON
+ -DENABLE_C_API=ON
+ -DENABLE_LIBERIO=OFF
+ -DENABLE_MAN_PAGES=ON
+ -DENABLE_GPSD=OFF
+ -DENABLE_EXAMPLES="$(usex examples)"
+ -DENABLE_TESTS="$(usex test)"
+ -DENABLE_USB="$(usex usb)"
+ -DENABLE_UTILS="$(usex utils)"
+ -DENABLE_MANUAL="$(usex doc)"
+ -DENABLE_DOXYGEN="$(usex doc)"
+ -DENABLE_B100="$(usex b100)"
+ -DENABLE_B200="$(usex b200)"
+ -DENABLE_E300="$(usex e300)"
+ -DENABLE_USRP1="$(usex usrp1)"
+ -DENABLE_USRP2="$(usex usrp2)"
+ -DENABLE_X300="$(usex x300)"
+ -DENABLE_N230="$(usex n230)"
+ -DENABLE_MPMD="$(usex mpmd)"
+ -DENABLE_OCTOCLOCK="$(usex octoclock)"
+ )
+ cmake-utils_src_configure
+}
+src_install() {
+ cmake-utils_src_install
+ use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+ if [ "${PV}" != "9999" ]; then
+ rm -rf "${ED}/usr/bin/uhd_images_downloader"
+ rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
+ fi
+
+ insinto /lib/udev/rules.d/
+ doins "${S}/utils/uhd-usrp.rules"
+
+ rm -rf "${WORKDIR}/images/winusb_driver"
+ if ! use b100; then
+ rm "${WORKDIR}"/images/usrp_b100* || die
+ fi
+ if ! use b200; then
+ rm "${WORKDIR}"/images/usrp_b2[01]* || die
+ fi
+ if ! use e300; then
+ rm "${WORKDIR}"/images/usrp_e3* || die
+ fi
+ if ! use mpmd; then
+ rm "${WORKDIR}"/images/usrp_n310* || die
+ fi
+ if ! use n230; then
+ rm "${WORKDIR}"/images/usrp_n230* || die
+ fi
+ if ! use octoclock; then
+ rm "${WORKDIR}"/images/octoclock* || die
+ fi
+ if ! use usrp1; then
+ rm "${WORKDIR}"/images/usrp1* || die
+ fi
+ if ! use usrp2; then
+ rm "${WORKDIR}"/images/usrp2* || die
+ rm "${WORKDIR}"/images/usrp_n2[01]* || die
+ rm -r "${WORKDIR}"/images/bit || die
+ fi
+ if ! use x300; then
+ rm "${WORKDIR}/"images/usrp_x3* || die
+ fi
+ insinto /usr/share/${PN}
+ doins -r "${WORKDIR}/images"
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2017-10-04 9:15 Michał Górny
0 siblings, 0 replies; 55+ messages in thread
From: Michał Górny @ 2017-10-04 9:15 UTC (permalink / raw
To: gentoo-commits
commit: 5900e58949ab92fe7e241c9e6bf0d9967bb150f7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 4 07:31:38 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct 4 09:15:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5900e589
net-wireless/uhd: Strip empty metadata.xml elements
net-wireless/uhd/metadata.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/net-wireless/uhd/metadata.xml b/net-wireless/uhd/metadata.xml
index f91b166286c..9e997879740 100644
--- a/net-wireless/uhd/metadata.xml
+++ b/net-wireless/uhd/metadata.xml
@@ -13,8 +13,6 @@
<email>radio@gentoo.org</email>
<name>Radio</name>
</maintainer>
- <longdescription lang="en">
-</longdescription>
<upstream>
<remote-id type="github">EttusResearch/uhd</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 55+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2017-07-03 20:54 Jason Donenfeld
0 siblings, 0 replies; 55+ messages in thread
From: Jason Donenfeld @ 2017-07-03 20:54 UTC (permalink / raw
To: gentoo-commits
commit: 31f78a7c24fa8a1c039e34bcab7a46e675b4564d
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 3 20:53:48 2017 +0000
Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Mon Jul 3 20:53:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31f78a7c
net-wireless/uhd: these packages do not build with ncurses[tinfo]
Package-Manager: Portage-2.3.6, Repoman-2.3.2
net-wireless/uhd/uhd-3.8.5.ebuild | 2 +-
net-wireless/uhd/uhd-3.9.6.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-wireless/uhd/uhd-3.8.5.ebuild b/net-wireless/uhd/uhd-3.8.5.ebuild
index abd8eb48026..1474f296e8c 100644
--- a/net-wireless/uhd/uhd-3.8.5.ebuild
+++ b/net-wireless/uhd/uhd-3.8.5.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${PYTHON_DEPS}
virtual/libusb:1
dev-lang/orc
dev-libs/boost:=
- sys-libs/ncurses:0
+ sys-libs/ncurses:0[-tinfo]
"
DEPEND="${RDEPEND}
dev-python/cheetah
diff --git a/net-wireless/uhd/uhd-3.9.6.ebuild b/net-wireless/uhd/uhd-3.9.6.ebuild
index e1278ff8082..f1f73a61caf 100644
--- a/net-wireless/uhd/uhd-3.9.6.ebuild
+++ b/net-wireless/uhd/uhd-3.9.6.ebuild
@@ -26,7 +26,7 @@ RDEPEND="${PYTHON_DEPS}
virtual/libusb:1
dev-lang/orc
dev-libs/boost:=
- sys-libs/ncurses:0
+ sys-libs/ncurses:0[-tinfo]
"
DEPEND="${RDEPEND}
dev-python/mako
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2017-04-23 21:01 David Seifert
0 siblings, 0 replies; 55+ messages in thread
From: David Seifert @ 2017-04-23 21:01 UTC (permalink / raw
To: gentoo-commits
commit: 6a11020954a0614531881b4e260de3354986a1de
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 20:47:26 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 21:00:47 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a110209
net-wireless/uhd: [QA] Add missing python metadata variables
Package-Manager: Portage-2.3.5, Repoman-2.3.2
net-wireless/uhd/uhd-3.8.5.ebuild | 14 ++++++++++----
net-wireless/uhd/uhd-3.9.6.ebuild | 12 +++++++++---
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/net-wireless/uhd/uhd-3.8.5.ebuild b/net-wireless/uhd/uhd-3.8.5.ebuild
index 5fd1110f2b5..abd8eb48026 100644
--- a/net-wireless/uhd/uhd-3.8.5.ebuild
+++ b/net-wireless/uhd/uhd-3.8.5.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
+
PYTHON_COMPAT=( python2_7 )
+
inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
@@ -13,13 +15,15 @@ SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_co
http://files.ettus.com/binaries/images/${image_version}.zip"
#https://github.com/EttusResearch/UHD-Mirror/tags
#http://files.ettus.com/binaries/images/
-KEYWORDS="~amd64 ~arm ~x86"
-S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3)/host
LICENSE="GPL-3"
SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE=""
-RDEPEND="virtual/libusb:1
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ virtual/libusb:1
dev-lang/orc
dev-libs/boost:=
sys-libs/ncurses:0
@@ -28,6 +32,8 @@ DEPEND="${RDEPEND}
dev-python/cheetah
app-arch/unzip"
+S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3)/host
+
src_prepare() {
gnome2_environment_reset #534582
diff --git a/net-wireless/uhd/uhd-3.9.6.ebuild b/net-wireless/uhd/uhd-3.9.6.ebuild
index 7ad7928d4f2..e1278ff8082 100644
--- a/net-wireless/uhd/uhd-3.9.6.ebuild
+++ b/net-wireless/uhd/uhd-3.9.6.ebuild
@@ -2,7 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=5
+
PYTHON_COMPAT=( python2_7 )
+
inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
@@ -13,13 +15,15 @@ SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_co
http://files.ettus.com/binaries/images/${image_version}.zip"
#https://github.com/EttusResearch/UHD-Mirror/tags
#http://files.ettus.com/binaries/images/
-KEYWORDS="~amd64 ~arm ~x86"
-S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3)/host
LICENSE="GPL-3"
SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE=""
-RDEPEND="virtual/libusb:1
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ virtual/libusb:1
dev-lang/orc
dev-libs/boost:=
sys-libs/ncurses:0
@@ -29,6 +33,8 @@ DEPEND="${RDEPEND}
dev-python/cheetah
app-arch/unzip"
+S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3)/host
+
src_prepare() {
gnome2_environment_reset #534582
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2017-04-22 22:28 Jason Donenfeld
0 siblings, 0 replies; 55+ messages in thread
From: Jason Donenfeld @ 2017-04-22 22:28 UTC (permalink / raw
To: gentoo-commits
commit: 7c86d7c528be3ed958afef5e3e244a5b39850f84
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 22:28:00 2017 +0000
Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 22:28:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c86d7c5
net-wireless/uhd: requires mako to build
Package-Manager: Portage-2.3.5, Repoman-2.3.2
net-wireless/uhd/uhd-3.9.6.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-wireless/uhd/uhd-3.9.6.ebuild b/net-wireless/uhd/uhd-3.9.6.ebuild
index ab4d780cf5f..7ad7928d4f2 100644
--- a/net-wireless/uhd/uhd-3.9.6.ebuild
+++ b/net-wireless/uhd/uhd-3.9.6.ebuild
@@ -25,6 +25,7 @@ RDEPEND="virtual/libusb:1
sys-libs/ncurses:0
"
DEPEND="${RDEPEND}
+ dev-python/mako
dev-python/cheetah
app-arch/unzip"
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2017-04-17 20:47 Richard Farina
0 siblings, 0 replies; 55+ messages in thread
From: Richard Farina @ 2017-04-17 20:47 UTC (permalink / raw
To: gentoo-commits
commit: 594c9d181163140840f8a4e5be69e3f8aa36474c
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 20:45:18 2017 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 20:47:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=594c9d18
net-wireless/uhd: bump
Package-Manager: Portage-2.3.5, Repoman-2.3.2
net-wireless/uhd/Manifest | 2 ++
net-wireless/uhd/uhd-3.9.6.ebuild | 45 +++++++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 146eb09af58..f292a2d27c7 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,2 +1,4 @@
DIST EttusResearch-UHD-3.8.5.tar.gz 2910398 SHA256 e0a36e64bffa7d06ac948fd8fc07ff3ce321e1efc3f7e8604b53e0c3ce842989 SHA512 edbc79e5a524e655e6c9016d2e1d2f0d242a9c7dcfa0130995b4c7cf77b95d4c9ba486e31891554746db755e0b47c46b0b8b9323e8c5de250a15d1271a8ccfc1 WHIRLPOOL 3516b74e247bbf6930cb25f639ff34eec2c95102d7c38ddcf7c892c80394ebd7c3e0c91d77277bb4c719c05d83cd6fc507449f9fd072371456843a3a12f6b778
+DIST EttusResearch-UHD-3.9.6.tar.gz 2458419 SHA256 18218c78ce8c7d6d50fd04c3e0e3596948a3a9196f5c1d993da89f2e65f3e5ad SHA512 f8e89f67659e9509d90fb63a91c75b7a5fe037821ccd2f33313ac0b20d856cbdc2cab79715f7fca035ba0e28b240c73408d6764cb09b01700c4ddbdcafa71da1 WHIRLPOOL e5e46384d4470861b208bdda703604104ee20055ad41328934977021df2284ca6be16cc4f2f9709ffd0619f3410f68f3c04176cb4ec743912cc3baa031434253
DIST uhd-images_003.008.005-release.zip 24897325 SHA256 e04e5b63dd550d8bba8db4c6138996c18a54533a158015cea301800da387e198 SHA512 4d3d60453320a05bf5008ffeddafdf01c08a906e6469a32ece9f1102072e03a8d140487febad7c392ba64f10fc3b94e2fdbe26e2e263a8fe1b1a29077a15e512 WHIRLPOOL 2493d969ae60b715592c7e47ee1648a418d808026b950cc524de492010de9b85087186f39c19d59c70e0d0cb1ebacf760e926ba9cf2edf608e95a6c3a7f30929
+DIST uhd-images_003.009.006-release.zip 26268656 SHA256 45d1abfb64b42dcb8a3a1b8bbe6ef79b47fba99d308c9abfd87c40382f2fc971 SHA512 3b07a054583a55424edeb37d3ee70b9bd8c7b6cb4c83a10faf4dd518aa148be17af7cb8b5e4fb7cbb643eae32d7a3295a94d9a0eb031823ccf1f414da0cef631 WHIRLPOOL 7653a97c6d5e17380bd831347badd59a7a3d870b258e7bd87fbd0b33ede33a66e4949d0cdecde77f192b5fda2d55278e0723171a4e31dae08360a0f2de5beef7
diff --git a/net-wireless/uhd/uhd-3.9.6.ebuild b/net-wireless/uhd/uhd-3.9.6.ebuild
new file mode 100644
index 00000000000..ab4d780cf5f
--- /dev/null
+++ b/net-wireless/uhd/uhd-3.9.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
+
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
+HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki"
+
+image_version=uhd-images_00$(get_version_component_range 1).00$(get_version_component_range 2).00$(get_version_component_range 3)-release
+SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3).tar.gz -> EttusResearch-UHD-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).tar.gz \
+ http://files.ettus.com/binaries/images/${image_version}.zip"
+#https://github.com/EttusResearch/UHD-Mirror/tags
+#http://files.ettus.com/binaries/images/
+KEYWORDS="~amd64 ~arm ~x86"
+S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3)/host
+
+LICENSE="GPL-3"
+SLOT="0/1"
+IUSE=""
+RDEPEND="virtual/libusb:1
+ dev-lang/orc
+ dev-libs/boost:=
+ sys-libs/ncurses:0
+ "
+DEPEND="${RDEPEND}
+ dev-python/cheetah
+ app-arch/unzip"
+
+src_prepare() {
+ gnome2_environment_reset #534582
+
+ #this may not be needed in 3.4.3 and above, please verify
+ sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
+}
+
+src_install() {
+ cmake-utils_src_install
+ python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+ insinto /lib/udev/rules.d/
+ doins "${S}"/utils/uhd-usrp.rules
+ insinto /usr/share/${PN}
+ doins -r "${WORKDIR}"/"${image_version}"/share/uhd/images
+}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2017-04-03 18:16 Richard Farina
0 siblings, 0 replies; 55+ messages in thread
From: Richard Farina @ 2017-04-03 18:16 UTC (permalink / raw
To: gentoo-commits
commit: dbd002aeb6f82f1950189725cafcbc03b7ef7d29
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 3 18:15:57 2017 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Apr 3 18:16:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbd002ae
net-wireless/uhd: drop old
Package-Manager: Portage-2.3.5, Repoman-2.3.2
net-wireless/uhd/Manifest | 2 --
net-wireless/uhd/uhd-3.8.2.ebuild | 45 ---------------------------------------
2 files changed, 47 deletions(-)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 90d6d69e01b..146eb09af58 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,4 +1,2 @@
-DIST EttusResearch-UHD-3.8.2.tar.gz 2170233 SHA256 04fc1e42010560a5c74c714be2729a252b06bf46b982321a3e47ca5ed72a3bce SHA512 7a2939f883bd5445fc8f16e1e09d3fc3dc2b41481dfb4bdefd4a8e4f2c6c0d1c703f2a47e373b295d11419740b5c62d959557ed3fd880bf75977c9716316a844 WHIRLPOOL ff883bd01768d68b7bc20b97d92e38e7f8ee79571a2cc62917f435482fdd415af7166b3032d71b842cabf12a42c3d3da09ea962f68393b7dc723acce49db65d3
DIST EttusResearch-UHD-3.8.5.tar.gz 2910398 SHA256 e0a36e64bffa7d06ac948fd8fc07ff3ce321e1efc3f7e8604b53e0c3ce842989 SHA512 edbc79e5a524e655e6c9016d2e1d2f0d242a9c7dcfa0130995b4c7cf77b95d4c9ba486e31891554746db755e0b47c46b0b8b9323e8c5de250a15d1271a8ccfc1 WHIRLPOOL 3516b74e247bbf6930cb25f639ff34eec2c95102d7c38ddcf7c892c80394ebd7c3e0c91d77277bb4c719c05d83cd6fc507449f9fd072371456843a3a12f6b778
-DIST uhd-images_003.008.002-release.zip 24803095 SHA256 5e3df6bff5040276208d25848ad085e0ecbbd9f8c528be04f19f91d3b169a1ee SHA512 a2a970928f7f4e9bbf983f19c71bcf9b1b26a6f7bd66f1a171e6fc7d329a7107bff0e6425734299a88b639663951e27ec4a49efcb7731cb2f3e94c2cd4557e36 WHIRLPOOL 404bfe4f87e26e0f39b467abebd7735fef42833a117561b8a73917e36d59b20dc9d62fe89bfd19e9daa3d3e7069ec4b1e0a92808f835f8f5f17e8cccd153495a
DIST uhd-images_003.008.005-release.zip 24897325 SHA256 e04e5b63dd550d8bba8db4c6138996c18a54533a158015cea301800da387e198 SHA512 4d3d60453320a05bf5008ffeddafdf01c08a906e6469a32ece9f1102072e03a8d140487febad7c392ba64f10fc3b94e2fdbe26e2e263a8fe1b1a29077a15e512 WHIRLPOOL 2493d969ae60b715592c7e47ee1648a418d808026b950cc524de492010de9b85087186f39c19d59c70e0d0cb1ebacf760e926ba9cf2edf608e95a6c3a7f30929
diff --git a/net-wireless/uhd/uhd-3.8.2.ebuild b/net-wireless/uhd/uhd-3.8.2.ebuild
deleted file mode 100644
index 101f0364ae8..00000000000
--- a/net-wireless/uhd/uhd-3.8.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki"
-
-image_version=uhd-images_00$(get_version_component_range 1).00$(get_version_component_range 2).00$(get_version_component_range 3)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3).tar.gz -> EttusResearch-UHD-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).tar.gz \
- http://files.ettus.com/binaries/images/${image_version}.zip"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-KEYWORDS="~amd64 ~arm ~x86"
-S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3)/host
-
-LICENSE="GPL-3"
-SLOT="0/1"
-IUSE=""
-RDEPEND="virtual/libusb:1
- dev-lang/orc
- <dev-libs/boost-1.58.0:=
- sys-libs/ncurses
- "
-DEPEND="${RDEPEND}
- dev-python/cheetah
- app-arch/unzip"
-
-src_prepare() {
- gnome2_environment_reset #534582
-
- #this may not be needed in 3.4.3 and above, please verify
- sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
-}
-
-src_install() {
- cmake-utils_src_install
- python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
- insinto /lib/udev/rules.d/
- doins "${S}"/utils/uhd-usrp.rules
- insinto /usr/share/${PN}
- doins -r "${WORKDIR}"/"${image_version}"/share/uhd/images
-}
^ permalink raw reply related [flat|nested] 55+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/
@ 2015-12-25 9:11 Sergey Popov
0 siblings, 0 replies; 55+ messages in thread
From: Sergey Popov @ 2015-12-25 9:11 UTC (permalink / raw
To: gentoo-commits
commit: b35f5b80985d29894a46ca979e5a98c3dd21324a
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 09:10:39 2015 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 09:11:27 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b35f5b80
net-wireless/uhd: version bump
Correct dev-libs/boost dependency in older version
Gentoo-Bug: 558520
Package-Manager: portage-2.2.26
net-wireless/uhd/Manifest | 2 ++
net-wireless/uhd/uhd-3.8.2.ebuild | 2 +-
net-wireless/uhd/{uhd-3.8.2.ebuild => uhd-3.8.5.ebuild} | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 9745beb..90d6d69 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,2 +1,4 @@
DIST EttusResearch-UHD-3.8.2.tar.gz 2170233 SHA256 04fc1e42010560a5c74c714be2729a252b06bf46b982321a3e47ca5ed72a3bce SHA512 7a2939f883bd5445fc8f16e1e09d3fc3dc2b41481dfb4bdefd4a8e4f2c6c0d1c703f2a47e373b295d11419740b5c62d959557ed3fd880bf75977c9716316a844 WHIRLPOOL ff883bd01768d68b7bc20b97d92e38e7f8ee79571a2cc62917f435482fdd415af7166b3032d71b842cabf12a42c3d3da09ea962f68393b7dc723acce49db65d3
+DIST EttusResearch-UHD-3.8.5.tar.gz 2910398 SHA256 e0a36e64bffa7d06ac948fd8fc07ff3ce321e1efc3f7e8604b53e0c3ce842989 SHA512 edbc79e5a524e655e6c9016d2e1d2f0d242a9c7dcfa0130995b4c7cf77b95d4c9ba486e31891554746db755e0b47c46b0b8b9323e8c5de250a15d1271a8ccfc1 WHIRLPOOL 3516b74e247bbf6930cb25f639ff34eec2c95102d7c38ddcf7c892c80394ebd7c3e0c91d77277bb4c719c05d83cd6fc507449f9fd072371456843a3a12f6b778
DIST uhd-images_003.008.002-release.zip 24803095 SHA256 5e3df6bff5040276208d25848ad085e0ecbbd9f8c528be04f19f91d3b169a1ee SHA512 a2a970928f7f4e9bbf983f19c71bcf9b1b26a6f7bd66f1a171e6fc7d329a7107bff0e6425734299a88b639663951e27ec4a49efcb7731cb2f3e94c2cd4557e36 WHIRLPOOL 404bfe4f87e26e0f39b467abebd7735fef42833a117561b8a73917e36d59b20dc9d62fe89bfd19e9daa3d3e7069ec4b1e0a92808f835f8f5f17e8cccd153495a
+DIST uhd-images_003.008.005-release.zip 24897325 SHA256 e04e5b63dd550d8bba8db4c6138996c18a54533a158015cea301800da387e198 SHA512 4d3d60453320a05bf5008ffeddafdf01c08a906e6469a32ece9f1102072e03a8d140487febad7c392ba64f10fc3b94e2fdbe26e2e263a8fe1b1a29077a15e512 WHIRLPOOL 2493d969ae60b715592c7e47ee1648a418d808026b950cc524de492010de9b85087186f39c19d59c70e0d0cb1ebacf760e926ba9cf2edf608e95a6c3a7f30929
diff --git a/net-wireless/uhd/uhd-3.8.2.ebuild b/net-wireless/uhd/uhd-3.8.2.ebuild
index 750ae0a..2af6ab8 100644
--- a/net-wireless/uhd/uhd-3.8.2.ebuild
+++ b/net-wireless/uhd/uhd-3.8.2.ebuild
@@ -22,7 +22,7 @@ SLOT="0/1"
IUSE=""
RDEPEND="virtual/libusb:1
dev-lang/orc
- dev-libs/boost:=
+ <dev-libs/boost-1.58.0:=
sys-libs/ncurses
"
DEPEND="${RDEPEND}
diff --git a/net-wireless/uhd/uhd-3.8.2.ebuild b/net-wireless/uhd/uhd-3.8.5.ebuild
similarity index 98%
copy from net-wireless/uhd/uhd-3.8.2.ebuild
copy to net-wireless/uhd/uhd-3.8.5.ebuild
index 750ae0a..11d28e3 100644
--- a/net-wireless/uhd/uhd-3.8.2.ebuild
+++ b/net-wireless/uhd/uhd-3.8.5.ebuild
@@ -23,7 +23,7 @@ IUSE=""
RDEPEND="virtual/libusb:1
dev-lang/orc
dev-libs/boost:=
- sys-libs/ncurses
+ sys-libs/ncurses:0
"
DEPEND="${RDEPEND}
dev-python/cheetah
^ permalink raw reply related [flat|nested] 55+ messages in thread
end of thread, other threads:[~2024-05-18 8:18 UTC | newest]
Thread overview: 55+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-26 16:19 [gentoo-commits] repo/gentoo:master commit in: net-wireless/uhd/ Rick Farina
-- strict thread matches above, loose matches on Subject: below --
2024-05-18 8:18 Arthur Zamarin
2024-01-25 16:44 Rick Farina
2024-01-25 16:44 Rick Farina
2023-08-19 22:48 Rick Farina
2023-08-19 13:34 Rick Farina
2023-08-19 13:34 Rick Farina
2023-08-19 13:34 Rick Farina
2023-07-28 18:23 Rick Farina
2023-07-28 18:23 Rick Farina
2023-04-06 2:18 Rick Farina
2022-09-19 13:33 Rick Farina
2022-07-15 13:48 Sam James
2022-07-11 17:44 Thomas Beierlein
2022-07-11 5:05 Thomas Beierlein
2022-07-11 4:52 Thomas Beierlein
2022-07-10 18:19 Thomas Beierlein
2022-04-30 15:53 Marek Szuba
2022-04-28 3:38 Sam James
2022-04-22 16:53 Rick Farina
2022-02-24 16:04 Rick Farina
2022-02-24 16:04 Rick Farina
2022-02-24 16:04 Rick Farina
2022-02-24 16:04 Rick Farina
2022-02-24 16:04 Rick Farina
2022-02-24 16:04 Rick Farina
2022-02-24 16:04 Rick Farina
2022-02-24 16:04 Rick Farina
2022-02-24 16:04 Rick Farina
2022-02-24 16:04 Rick Farina
2022-02-24 16:04 Rick Farina
2022-02-24 16:04 Rick Farina
2022-02-24 16:04 Rick Farina
2022-02-14 3:33 Rick Farina
2021-10-15 17:20 Rick Farina
2021-10-12 15:37 Rick Farina
2021-02-15 2:19 Rick Farina
2020-09-19 12:29 Michał Górny
2020-06-09 21:09 Rick Farina
2020-04-10 20:19 Rick Farina
2020-04-09 15:18 Rick Farina
2020-04-09 1:29 Rick Farina
2020-04-09 1:29 Rick Farina
2020-01-07 17:27 Rick Farina
2019-03-27 14:53 Rick Farina
2018-09-05 15:42 Richard Farina
2018-06-06 20:51 Richard Farina
2018-03-08 19:25 Richard Farina
2017-10-04 9:15 Michał Górny
2017-07-03 20:54 Jason Donenfeld
2017-04-23 21:01 David Seifert
2017-04-22 22:28 Jason Donenfeld
2017-04-17 20:47 Richard Farina
2017-04-03 18:16 Richard Farina
2015-12-25 9:11 Sergey Popov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox