diff options
Diffstat (limited to 'net-wireless')
39 files changed, 467 insertions, 391 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz Binary files differindex d7b739a98534..d6f67822f8cd 100644 --- a/net-wireless/Manifest.gz +++ b/net-wireless/Manifest.gz diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest index 0ac79122b656..f491f6a67d8e 100644 --- a/net-wireless/dump1090/Manifest +++ b/net-wireless/dump1090/Manifest @@ -1,19 +1,11 @@ -AUX dump1090-5.0-32bit-fix.patch 610 BLAKE2B cca8cab42380856503831c59cfec13f996132869ea4263594acf6966a96a8d99f1b1c936106c6d74b1a741a83afa121abe4fbebe7129ef3c29b8278739e38717 SHA512 f6d404a0e814e8f1f1cfe8a8d17ed93cf6586d3434130b4adad8c096ad37ca2280d86df8331766f2a8bac793f13c937d0d0de6c6c43a74ce055be4be4b5e2ee7 -AUX dump1090-5.0-further-32bit-fix.patch 1742 BLAKE2B 2cc502d6a88f4dd79a70efca538a8daaf9bbfa0cb122f7ae562943112b635ce19ca01197a4dce79bf0f81bbc5339f340534cfc6e7223510b6877c38f513212b1 SHA512 b3c3d3c8f63a1c3c149f5e44164c43b00d56829fe89a51ecbffc07fe201b7e88df9a49499c0d52add2f2a5d15f3ee80e7c4d287e863ca34453966487f2f7a587 AUX dump1090-5.0.confd 927 BLAKE2B 144a8c2f51ba714b7c41a50ae58e893c1cfa2e9494a962c9033201c09fc889411b4b868b16934521709fe7402e593767be77ad6c43c0a4b4a9fba8b231756f58 SHA512 930267650aedb8012c2a92c1555d318789cf29ab42568109a9935a7d83a13fba4482cffff91b27062f74d9fde514e95060e0a53cb9438d39ede292ea9ca15b90 AUX dump1090-5.0.initd 372 BLAKE2B f4e1ca0db565f56c104401b221af77966f499ad00f1fba5c804ee529fbc61fd75149c3d2d503d4a5e119784fcc10998ebbbad80cb09c1a27dba804a0d8a86c24 SHA512 0f9717d3f161658aefcd29f135bd3401bb539a0e83f40fdacf7326b48a96782d211dde1fc9237a822ee3d09a8b5b17ab22da63f6e93aceb526ff22c02eaa300e AUX dump1090-6.1-libdir.patch 586 BLAKE2B 20d358289b55e9f1ae11904b74035b8f1ba61061c741e7b71bf449350b255a630c1468b604f1ac98e02632346f26c5f8d7f34a00765e1b1a73dd232ab0a39e6d SHA512 470d8840b3da26f2bbb8be24f36ba17457a28d9b63080ea1483693b78e86ca38f69687a45209baf6767bac1e206bf62bd392024e9963926d4044fcf88e1fc5c6 AUX dump1090-9.0-gcc14.patch 779 BLAKE2B 9e37dd486892990a0373e064b51ee08cb410ace7a988e9eb7a21c76440d4de0433c88c67445bbc0d8d799c8b70cdc76c33884ed00505756a7a2a3d99badeb213 SHA512 54970b9e25dc6963e81d1309f5f45abefbe875eb8be54ff3b825fcfd44121368525c57409207258d5af7f97454a888f875dc1dc6f1e6f5fdd33b70a7bd0bc963 AUX tmpfilesd-dump1090-5.0.conf 212 BLAKE2B 081b8340377a40adbb3a9dfa87ede06729979ad50a138cb3caf6b0dac55203222df6c71714103c096b6fbdcd2b115dd2c40bd767b7e5ff1dd0360addc021882a SHA512 d44170620addbc3590d524ae540c38be31115d22f69fd55a075877ab482c0bbcdfe86e2eac3c3007c5476408c18623a0e179fadd2247beab01d1df296d7467b6 -DIST dump1090-10.0.tar.gz 5744121 BLAKE2B 58c366bca12e2f2ab44d6f970ce2e5113bb4daea5c2138f00a3431aa3b37371ac8724b44c9e24d8faff2725282d61dc90b6be0226d617dec7c90f6013e63806c SHA512 516f4491070e5011d21a7f39d57c1dd94fb6b2152dbffa2b2034b72d58c18098ef3aa524d5db899ab68b2d81b2571c5c1390767873196003e19cf682d2d08b5a -DIST dump1090-4.0.tar.gz 6663754 BLAKE2B bf0a6c8dfd8b2da5ed0e7ae5f7b862c57a54e5d48bc24b29e42ebffec4e0606604fbe4b8502e85df60a3a618568bf9e2eba88e5ad2fdec7fb93043b823435362 SHA512 97dc872e4d0ac8df2f46e17b590e970a62a78baf81e18a9beeb23d37a4401a2e52591ca96cc01e1465b22aa234cf9e88f84a7b0f27d0144b3afeac62f6252c95 -DIST dump1090-5.0.tar.gz 10124422 BLAKE2B d6b26a444f73cccd002558b6863431537078e1fe9f61e4e240d4a5f06181b9ff713387aad623c2ee8257c2568bd4dd373746606c356ac3ff0f27f411d4949997 SHA512 1104982308db788993bf5dc130a5ca369c8bfaaae56cd5a435bbd22ed99b0633594789334d7f256bad2b288c4906923baf8bc73e2f7b7f9f52f7068b9b519142 -DIST dump1090-6.1.tar.gz 9879362 BLAKE2B 716c1abe6df7958fb5ec94c35ed6af75fdb6180a56cdfba72443a7b34d1614cede6ec29aaac22a1e15f31d05bf1d1971eebccdff21cf9442ae69617e7c535ae6 SHA512 5f20d52f1fda754e33774faab852252d802ae5da8694e768cbf92df56f7693cd2da788df9e0a422f1801603e62498fb0af0143f5ea3292e9d607296cd5983dc2 +DIST dump1090-10.0.1.tar.gz 5744154 BLAKE2B 7a1c3baedf9e425d34540542bebb514e0cada874ea347b214b6bcb64c7e3064d65fb21964119b0949a9f0f3b454982854d5ace6bb8b8bfe8e10ca08baf366664 SHA512 dec93f29b2f2e262b230e13e8e18cb2902b4204de005b0f70aa4909c000b0a24cee3c1020dca27e09eb23182d8e74e007ae724afc7484f8aab158e19502a59bb DIST dump1090-9.0.tar.gz 5743616 BLAKE2B 3276075d441f7d410b63fc08b702102637b3c95b0ec5ed3dbd1ea93ecd6af1e322929842db398a23e9e2bca690e601e8bb1916b9998fce1cc80194ca83484dbf SHA512 07408c5680e626eccd3f74d35a6e8a7538dfffd31675f036580003dbba2a78f2487e1980d72d3ec7e44d3f94880e3f231ab1c97bd99ba1ca6cdcfa0ebf198aff -EBUILD dump1090-10.0.ebuild 2416 BLAKE2B a072f0e3870badaa4be5b26e29dfc6ec7775e6a1499b252ccf7359e39002bc3068874ed76462218e25db1f4030bb9275d16c773e89b65ecd528aff501847c9c7 SHA512 32e20cb931858552af274bd69f3e13975743e7c13ccb9a6c981702c767006e6a254d20596db3b339a53a485c0790b240ccd3b4d003d4af1b994d8a0b2d34b6f0 -EBUILD dump1090-4.0.ebuild 1250 BLAKE2B acd1dc457eced589b99528333cdbfa5bb0c29bacac3cb0eb18c6daaa902f3c5f498c7c6a6810c83f92155b87f6e3511fd87d1dff51fb46e462b48af47fa66948 SHA512 27c238ddb2d0d2223f1cbc286c0bf6860706d6ef6c76902af25c3c542deb6382ac71c5ab2f9b8576b2d0906633bd1acb72b6ba870f8cb62b9b353d96818cc5d9 -EBUILD dump1090-5.0.ebuild 2626 BLAKE2B dececa48e1b48005a4855cd056977490a1e0d6bdc412463b777ad006e3c96f74648e17362801b74ee9b751e38d58ff184390bd3c1142f8699b909677fc25c73d SHA512 36765019ee228703a9fc6798323323cf685a5647c8bac66557e095203b7e3ea3042ef8e7ee62f0d8897a53d09e5f90120a4a642ed4a2c0fb1e6b434a4dd513c1 -EBUILD dump1090-6.1.ebuild 2584 BLAKE2B 280a8fe7401ad4d049970e1c62cf012e9adf91594c87b3f751b71074d65860b293dcda6415d64e83036c8335ac63f710f7a4f3637d3c2809c8a782e9f36bff48 SHA512 b13fa3e352ff4a4a859ae0ef8ace3597f72902a53752f9a69ad932f44289c30a66b2a6b366194a2110902aa70e26909ebe33bc0afc417750165c8a686b3cc37d -EBUILD dump1090-9.0.ebuild 2494 BLAKE2B 71461fe76e6cb02b0e2fd6fd947d2e552f6e5f593528022b5a3ab4a66bb487bba75a976d82c0aac4044af15aff6ce80cfadee5455f5706b35be364dba501aea6 SHA512 527df3ac55e4d0face363f0d8afc9c8e5a205c08082a0b2d014f0a5d81481b683f393d85afe675dac09646c93e0853a524376e01e603ede2220204e714da02ac +EBUILD dump1090-10.0.1.ebuild 2416 BLAKE2B a072f0e3870badaa4be5b26e29dfc6ec7775e6a1499b252ccf7359e39002bc3068874ed76462218e25db1f4030bb9275d16c773e89b65ecd528aff501847c9c7 SHA512 32e20cb931858552af274bd69f3e13975743e7c13ccb9a6c981702c767006e6a254d20596db3b339a53a485c0790b240ccd3b4d003d4af1b994d8a0b2d34b6f0 +EBUILD dump1090-9.0.ebuild 2492 BLAKE2B e0839958c5a105fc241dbaace23246bc5c1a94134118592928e773996ed176d349543fdeff446311298d293c3bcd2db187ac275e89a7307fba194c7cf6cc9c6e SHA512 cd842bf8f22c135b94df05815b4da2392addf59cf339bd31792c3ab79ad520013f589a2258c4fadc1c6279cde0ca4e19dc3524a00e6d60409187746659e7af11 EBUILD dump1090-9999.ebuild 2416 BLAKE2B a072f0e3870badaa4be5b26e29dfc6ec7775e6a1499b252ccf7359e39002bc3068874ed76462218e25db1f4030bb9275d16c773e89b65ecd528aff501847c9c7 SHA512 32e20cb931858552af274bd69f3e13975743e7c13ccb9a6c981702c767006e6a254d20596db3b339a53a485c0790b240ccd3b4d003d4af1b994d8a0b2d34b6f0 MISC metadata.xml 770 BLAKE2B 1103e032746ddcf4246c232a9a4b5160a7939f1b15b8899c4c62bf1f0cebd19bc2d466971d41ea41d2cdafe48ac30b413d080fc37f68f70fa4567c6e0013e6f0 SHA512 055c05533ab883057a22113d861c236fe7f0bcfc28b90e1893638bdd5267575ef18fbaf509c85835f9ac0c686e239694563aa71bc07c2ae00fc12f64b7d5e567 diff --git a/net-wireless/dump1090/dump1090-10.0.ebuild b/net-wireless/dump1090/dump1090-10.0.1.ebuild index 52be69c72a7f..52be69c72a7f 100644 --- a/net-wireless/dump1090/dump1090-10.0.ebuild +++ b/net-wireless/dump1090/dump1090-10.0.1.ebuild diff --git a/net-wireless/dump1090/dump1090-4.0.ebuild b/net-wireless/dump1090/dump1090-4.0.ebuild deleted file mode 100644 index c49bf27909f2..000000000000 --- a/net-wireless/dump1090/dump1090-4.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="simple Mode S decoder for RTLSDR devices" -HOMEPAGE="https://github.com/flightaware/dump1090" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/flightaware/${PN}.git" -else - KEYWORDS="amd64 x86" - SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="bladerf +rtlsdr" - -DEPEND=" - sys-libs/ncurses:=[tinfo] - virtual/libusb:1 - bladerf? ( net-wireless/bladerf:= ) - rtlsdr? ( net-wireless/rtl-sdr:= )" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - default - sed -i -e '/CFLAGS/s# -O3 -g -Wall -Wmissing-declarations -Werror -W # #' Makefile || die - sed -i -e "/LIBS_CURSES/s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile || die -} - -src_compile() { - emake CC="$(tc-getCC)" \ - BLADERF=$(usex bladerf) \ - RTLSDR=$(usex rtlsdr) -} - -src_install() { - dobin ${PN} - dobin view1090 - dodoc README.md - - insinto /usr/share/${PN}/html - doins -r public_html/* - - insinto /usr/share/${PN} - doins -r tools - - insinto /usr/share/${PN} - newins debian/lighttpd/89-dump1090-fa.conf lighttpd.conf -} diff --git a/net-wireless/dump1090/dump1090-5.0.ebuild b/net-wireless/dump1090/dump1090-5.0.ebuild deleted file mode 100644 index 00364313d593..000000000000 --- a/net-wireless/dump1090/dump1090-5.0.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit tmpfiles toolchain-funcs - -DESCRIPTION="simple Mode S decoder for RTLSDR devices" -HOMEPAGE="https://github.com/flightaware/dump1090" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/flightaware/${PN}.git" -else - KEYWORDS="amd64 x86" - SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="bladerf hackrf +rtlsdr minimal" - -DEPEND=" - sys-libs/ncurses:=[tinfo] - bladerf? ( net-wireless/bladerf:= virtual/libusb:1 ) - hackrf? ( net-libs/libhackrf:= virtual/libusb:1 ) - rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 )" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-32bit-fix.patch" - "${FILESDIR}/${P}-further-32bit-fix.patch" -) - -src_prepare() { - default - sed -i -e '/CFLAGS/s# -O3 -g -Wall -Wmissing-declarations -Werror -W # #' Makefile || die - sed -i -e "/LIBS_CURSES/s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile || die -} - -src_compile() { - emake CC="$(tc-getCC)" \ - BLADERF=$(usex bladerf) \ - RTLSDR=$(usex rtlsdr) \ - HACKRF=$(usex hackrf) \ - CPUFEATURES=yes \ - LIMESDR=no -} - -src_install() { - dobin ${PN} - dobin view1090 - dodoc README.md README-json.md - # DSP config for bladerf - if use bladerf; then - insinto usr/share/${PN}/bladerf - doins bladerf/* - fi - - newtmpfiles "${FILESDIR}"/tmpfilesd-dump1090-5.0.conf ${PN}.conf - newconfd "${FILESDIR}"/dump1090-5.0.confd ${PN} - newinitd "${FILESDIR}"/dump1090-5.0.initd ${PN} - - if use !minimal; then - insinto /usr/share/${PN} - doins -r tools - - # Some tooling expects the -fa variant directory to contain the files - dosym ../../usr/share/${PN} /usr/share/dump1090-fa - - # Older HTML - insinto /usr/share/${PN}/html - doins -r public_html/* - # Newer HTML - insinto /usr/share/skyaware/html - doins -r public_html_merged/* - - # One of these this should be included into other lighttpd configs - insinto /usr/share/${PN}/lighttpd - # Old style: - doins debian/lighttpd/89-dump1090-fa.conf - doins debian/lighttpd/88-dump1090-fa-statcache.conf - # New style: - doins debian/lighttpd/89-skyaware.conf - - # See README.md for how to use custom wisdom files - exeinto /usr/share/${PN}/wisdom - doexe debian/generate-wisdom - insinto /usr/share/${PN}/wisdom - doins wisdom.* - doins wisdom/wisdom.* - # For /etc/dump1090-fa/wisdom.local - keepdir /etc/dump1090-fa/ - - # Tooling to generate custom wisdom: - exeinto /usr/libexec/${PN} - doexe starch-benchmark - fi -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf -} diff --git a/net-wireless/dump1090/dump1090-6.1.ebuild b/net-wireless/dump1090/dump1090-6.1.ebuild deleted file mode 100644 index 199f64604457..000000000000 --- a/net-wireless/dump1090/dump1090-6.1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit tmpfiles toolchain-funcs - -DESCRIPTION="simple Mode S decoder for RTLSDR devices" -HOMEPAGE="https://github.com/flightaware/dump1090" - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/flightaware/${PN}.git" -else - KEYWORDS="amd64 x86" - SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="bladerf hackrf +rtlsdr minimal" - -DEPEND=" - sys-libs/ncurses:=[tinfo] - bladerf? ( net-wireless/bladerf:= virtual/libusb:1 ) - hackrf? ( net-libs/libhackrf:= virtual/libusb:1 ) - rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 )" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-6.1-libdir.patch -) - -src_prepare() { - default - sed -i -e '/CFLAGS/s# -O3 -g -Wall -Wmissing-declarations -Werror -W # #' Makefile || die - sed -i -e "/LIBS_CURSES/s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile || die -} - -src_compile() { - emake CC="$(tc-getCC)" \ - BLADERF=$(usex bladerf) \ - RTLSDR=$(usex rtlsdr) \ - HACKRF=$(usex hackrf) \ - CPUFEATURES=yes \ - LIMESDR=no -} - -src_install() { - dobin ${PN} - dobin view1090 - dodoc README.md README-json.md - # DSP config for bladerf - if use bladerf; then - insinto usr/share/${PN}/bladerf - doins bladerf/* - fi - - newtmpfiles "${FILESDIR}"/tmpfilesd-dump1090-5.0.conf ${PN}.conf - newconfd "${FILESDIR}"/dump1090-5.0.confd ${PN} - newinitd "${FILESDIR}"/dump1090-5.0.initd ${PN} - - if use !minimal; then - insinto /usr/share/${PN} - doins -r tools - - # Some tooling expects the -fa variant directory to contain the files - dosym ../../usr/share/${PN} /usr/share/dump1090-fa - - # Older HTML - insinto /usr/share/${PN}/html - doins -r public_html/* - # Newer HTML - insinto /usr/share/skyaware/html - doins -r public_html_merged/* - - # One of these this should be included into other lighttpd configs - insinto /usr/share/${PN}/lighttpd - # Old style: - doins debian/lighttpd/89-dump1090-fa.conf - doins debian/lighttpd/88-dump1090-fa-statcache.conf - # New style: - doins debian/lighttpd/89-skyaware.conf - - # See README.md for how to use custom wisdom files - exeinto /usr/share/${PN}/wisdom - doexe debian/generate-wisdom - insinto /usr/share/${PN}/wisdom - doins wisdom.* - doins wisdom/wisdom.* - # For /etc/dump1090-fa/wisdom.local - keepdir /etc/dump1090-fa/ - - # Tooling to generate custom wisdom: - exeinto /usr/libexec/${PN} - doexe starch-benchmark - fi -} - -pkg_postinst() { - tmpfiles_process ${PN}.conf -} diff --git a/net-wireless/dump1090/dump1090-9.0.ebuild b/net-wireless/dump1090/dump1090-9.0.ebuild index b61294afb217..44138a48f6f9 100644 --- a/net-wireless/dump1090/dump1090-9.0.ebuild +++ b/net-wireless/dump1090/dump1090-9.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/flightaware/${PN}.git" else - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz" fi diff --git a/net-wireless/dump1090/files/dump1090-5.0-32bit-fix.patch b/net-wireless/dump1090/files/dump1090-5.0-32bit-fix.patch deleted file mode 100644 index 8425f3d9da06..000000000000 --- a/net-wireless/dump1090/files/dump1090-5.0-32bit-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -From c97b83d3eded3e2232a9f938fee52771ebe09c9c Mon Sep 17 00:00:00 2001 -From: Oliver Jowett <oliver.jowett@flightaware.com> -Date: Sat, 13 Mar 2021 20:24:01 +0800 -Subject: [PATCH] Maybe fix alignment warnings in arm neon code with recent gcc - ---- - dsp-types.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dsp-types.h b/dsp-types.h -index a3ef98dab..962b608be 100644 ---- a/dsp-types.h -+++ b/dsp-types.h -@@ -16,6 +16,6 @@ typedef union { - typedef struct { - int16_t I; - int16_t Q; --} __attribute__((__packed__)) sc16_t; -+} __attribute__((__packed__, __aligned__(2))) sc16_t; - - #endif diff --git a/net-wireless/dump1090/files/dump1090-5.0-further-32bit-fix.patch b/net-wireless/dump1090/files/dump1090-5.0-further-32bit-fix.patch deleted file mode 100644 index bfcea2e4f88f..000000000000 --- a/net-wireless/dump1090/files/dump1090-5.0-further-32bit-fix.patch +++ /dev/null @@ -1,52 +0,0 @@ -https://github.com/flightaware/dump1090/commit/462dee56f3a339bc4d83fea264fe89a1ced5bd22.patch -https://github.com/flightaware/dump1090/commit/455896e86db84d10a197f5a3f88d13c0539ad470.patch -https://bugs.gentoo.org/818130 - -From 462dee56f3a339bc4d83fea264fe89a1ced5bd22 Mon Sep 17 00:00:00 2001 -From: Oliver Jowett <oliver.jowett@flightaware.com> -Date: Sat, 13 Mar 2021 12:49:40 +0800 -Subject: [PATCH] Fix builds on 32-bit x86 - ---- - Makefile.cpufeatures | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures -index 099714e08..12377ad81 100644 ---- a/Makefile.cpufeatures -+++ b/Makefile.cpufeatures -@@ -17,7 +17,11 @@ ifeq ($(CPUFEATURES_UNAME),Darwin) - CPUFEATURES_CFLAGS += -DHAVE_SYSCTLBYNAME - endif - --ifeq ($(CPUFEATURES_ARCH), x86_64) -+ifeq ($(CPUFEATURES_ARCH),x86_64) -+ CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o -+endif -+ -+ifneq ($(filter-out $(CPUFEATURES_ARCH),i%86),) - CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o - endif - -From 455896e86db84d10a197f5a3f88d13c0539ad470 Mon Sep 17 00:00:00 2001 -From: Oliver Jowett <oliver.jowett@flightaware.com> -Date: Wed, 17 Mar 2021 02:21:18 +0800 -Subject: [PATCH] Fix broken 32-bit x86 test that broke builds on non-x86 - ---- - Makefile.cpufeatures | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures -index 12377ad81..8c3b8418d 100644 ---- a/Makefile.cpufeatures -+++ b/Makefile.cpufeatures -@@ -21,7 +21,7 @@ ifeq ($(CPUFEATURES_ARCH),x86_64) - CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o - endif - --ifneq ($(filter-out $(CPUFEATURES_ARCH),i%86),) -+ifneq (,$(filter i%86,$(CPUFEATURES_ARCH))) - CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o - endif - diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest index 43288bf0799e..689ab1a747d2 100644 --- a/net-wireless/gnuradio/Manifest +++ b/net-wireless/gnuradio/Manifest @@ -4,7 +4,7 @@ AUX gnuradio-3.10.11.0-boost-1.87.patch 6533 BLAKE2B dea2f7d662c2c7119234f6cddd1 AUX gnuradio-3.10.9.2-libfmt-11.patch 1624 BLAKE2B a50f5db97a276ec1c1fbaa28338db377de8659ce8b1f19b271cb79672f807e152cec57f83b9e32ff39492e11b4b6e655a69cd77a5e925f0b2b598d66b2ad2381 SHA512 50398cbeba0bad9908d3f96795833a7ca683e169634ef4a89e1502c304c4a695be44538e99236b691c2e4ea105604e882048b0500579031a9516fbeba4984173 DIST gnuradio-3.10.11.0.tar.gz 4659646 BLAKE2B 21d523030e578ac335dc1497da27a957026206b36323473d5e96d9bc3832a06765d26684c46c03017e23c0bc6302429c366befac40113f9987840d5c22f978af SHA512 faf47956924832b04c66469ba3bdf174876d25c41e0f1c1dde3755596d232e2d18f5dab7aa848463f2d23ec8bcda0283ee8ede34fd57b079fe3cdb62c6470a82 DIST gnuradio-3.10.9.2.tar.gz 4413832 BLAKE2B 69443e9b6893c6cb9db1678c28ac0fd01fe57e81438903612f7f65908fede257dab06a98fa90da25fe8caa6befb731ba51759509ace10a5541cae3e9d055a5db SHA512 5eca8dd21def7354ab8bd3b98a5780f80bc71b0dd8f556a50def157964e121c7ba6a8a8dc96584f6b15a6b2d7e0391fe77f5c72ba31c1c5b49a76306dd6f78cd -EBUILD gnuradio-3.10.11.0.ebuild 7074 BLAKE2B 7cfc3d8071da0819ce2cf9d4c779938808e013536fe5de8f0654f27c6b1e84fccf816ae2b827f49e6b44aafeda54bd27f8acf6e375bf54d8b0b15ab624693882 SHA512 689c4e862b5ad24c1a0d01872b9fac9431e3e346c8ec6c8101ec8697f2113317696bfea3695f158032207c3c7aadb4f7c9f1fd9a6095bcf89c8cb484c4cec31e +EBUILD gnuradio-3.10.11.0.ebuild 7073 BLAKE2B cf7d9bea765373f603459890bdbc12adff94c4279cf6f6d62be6d7fff0f967bf29a4bb96e83f5b07e64f22aacfe1e4208e4d960f8da08fc547f54603890301b9 SHA512 4fe35eb9e354a2303bc8cee5f749e96392fdb25d6fe47f870b893885b665afadd1fd8436acd55ab374e285f61854beff92cafbacb6cf042ae4380cf69f359b6f EBUILD gnuradio-3.10.9.2-r6.ebuild 7168 BLAKE2B 6d7c121fd4f1bb6c614ea78417436d58cf03f64c39b7f3a776edc72cf81d2b775eb813821f5c5cc4ece13dce4f6db847a6ae004b03727ff9d52f15e0184ca3d2 SHA512 8162308fe3edee23d865fb4c0a3c507ae64a4407fa23b2adce5e8ea8a0a024feaa5639692e26470245536378bf440fb7b1a284080bed32aa69bfea60fbd8d3d6 EBUILD gnuradio-9999.ebuild 6987 BLAKE2B c70ae3d3f797cba882c6d1d5009c5c29935852492a437033d01d7baaca3ad00d6a022c9656ebef51bcfdc92d685557d4c806ab80ae3b692550c9c39198333d29 SHA512 1a1c530447c089e067a15e6476db9a9f911609f8a956f7c1d3ad5a6c38d2eac6f3ee56b048e9af5bd026acdf54c1175e6b0256542094050bdf64444bbb62ee2b MISC metadata.xml 1869 BLAKE2B de75463e64f4f3352d8959d795de15d9345e52f491f61fc824db738bccc4e2ae0487d988c22c17149f80cda5478a5bfbda03a6c5239970423371a2a76f374003 SHA512 69477d22de9e60b7f7420b14437265771391320d7c362d51b81fb573671568cf6b6b39ba50be1ad7c8bb07ed219998cf474e19b663f4a65b0e2cc69feef017a0 diff --git a/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild b/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild index 37cadf28ce7e..fc5205048127 100644 --- a/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild +++ b/net-wireless/gnuradio/gnuradio-3.10.11.0.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} =~ "9999" ]]; then inherit git-r3 else SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~riscv ~x86" + KEYWORDS="amd64 ~arm ~riscv ~x86" fi IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc iio jack modtool network oss performance-counters portaudio +qt5 sdl soapy test trellis uhd vocoder +utils wavelet zeromq" diff --git a/net-wireless/gr-ieee802154/Manifest b/net-wireless/gr-ieee802154/Manifest index b4c05b78e3d5..1a5cd0954f48 100644 --- a/net-wireless/gr-ieee802154/Manifest +++ b/net-wireless/gr-ieee802154/Manifest @@ -1,4 +1,6 @@ DIST gr-ieee802154-0.0_p20210719.tar.gz 155040 BLAKE2B c198de71391ddc2ad32255476b8b9ba0e13bd3eb3c674b21846174cd3d8804c68e407f4e019cc164b1d10eae5ee672ae31a5f23a450d08abd477aa244ef479fb SHA512 77f746832bfaec53ad6439b69de8712fb444d7b45fdc9937445c6df5d6a5a9a19363ab180c063b6c0647dff8c0404797d190730124a2248418e0fee5daff26f7 -EBUILD gr-ieee802154-0.0_p20210719-r3.ebuild 1669 BLAKE2B 527ae555cc4cdd258ac2b88aba94efa0b8f476b71da74050121b361daf3c80df28844d4c6e19ad7de426156d4208fa12bf31f118b849b517c1238a30f484adc9 SHA512 dace54db5decea345ab4f47f7ec14953750454e9ec48a08f7bc113e535ea49b2c46c80c7e54920c0a7e888f059c7b289361b4106449195449c29a25324ac45d1 -EBUILD gr-ieee802154-9999.ebuild 1671 BLAKE2B cc7ed6b2479f80ac8fe26bc3a24c64206dc42f68b2ace567d61c3a647cb3b834bd5c759cf5544ede329d8ff4fac79a3ea3310462a6bcf9022377d34081f1ef16 SHA512 db2f4babd27b4a59e8ffcfcf98779b0cccaedee0d01c9583f6791422ebdeb7407dd046e1d14acdb1a8b3390494c0b5ad19dca844a7efb54c55147a0597105147 +DIST gr-ieee802154-0.0_p20230828.tar.gz 155040 BLAKE2B c198de71391ddc2ad32255476b8b9ba0e13bd3eb3c674b21846174cd3d8804c68e407f4e019cc164b1d10eae5ee672ae31a5f23a450d08abd477aa244ef479fb SHA512 77f746832bfaec53ad6439b69de8712fb444d7b45fdc9937445c6df5d6a5a9a19363ab180c063b6c0647dff8c0404797d190730124a2248418e0fee5daff26f7 +EBUILD gr-ieee802154-0.0_p20210719-r4.ebuild 1433 BLAKE2B 2dca50bdc79fafa2ccc680c29cf8b700e7444d0835ab01132ae5955f2d2f4415353bc8b04b703034d4d5cf4c3c6d3e6856e56e463b627152e6de74a855990fb8 SHA512 c81dab1677b363ee554d032e99d84764ba323cde7ced332cbb701be473db2d9fd05e4367df2b7a8645d47d6570c1559a29535076fd72d2f9c522bda303617696 +EBUILD gr-ieee802154-0.0_p20230828.ebuild 1433 BLAKE2B 2dca50bdc79fafa2ccc680c29cf8b700e7444d0835ab01132ae5955f2d2f4415353bc8b04b703034d4d5cf4c3c6d3e6856e56e463b627152e6de74a855990fb8 SHA512 c81dab1677b363ee554d032e99d84764ba323cde7ced332cbb701be473db2d9fd05e4367df2b7a8645d47d6570c1559a29535076fd72d2f9c522bda303617696 +EBUILD gr-ieee802154-9999.ebuild 1435 BLAKE2B 1304eca6221285f942b53b5e7c0f5514874a85d0bffdde777f61ee1e07d23743d2e4bb23beed032c4e7e73761822925b1e6a33f0b1027eab4b7dca0d30b1742a SHA512 0991cc37d3dbf410b6a4711271d68c553173ba718b2815a8cb203935d6afa544641cc97d41d60bdea03e46bada254f1870e8cf7a6869f03be47a181fd0000563 MISC metadata.xml 327 BLAKE2B 2c9e8d4809ade74a47f5ec1e0f208345c49edc0a994226a8a29739643b1558fa3fe426ce64636742708b32a5a2ac0e9472fbd91545d30d18d0e8755d2743c483 SHA512 dd940d9241b852de89bfcb8f921663ec946f2833c2741ddf39ab6cffcbb275c63e7407a97f8c650135d79351f26622c2a23b05251ca2d9b61eb5a64108ad0200 diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r3.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r4.ebuild index e1b48bb9f238..1687c7d97ba0 100644 --- a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r3.ebuild +++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20210719-r4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{9..13} ) inherit cmake python-single-r1 @@ -38,18 +38,14 @@ BDEPEND="dev-lang/swig" REQUIRED_USE="${PYTHON_REQUIRED_USE}" src_prepare() { - #although cppunit is not used, it fails if it isn't there, fix it - sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt - sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt - sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt - sed -i '/GR_PKG_DOC_DIR/d' CMakeLists.txt + # fix path for doc files + sed -i "s/802_15_4 CXX/802154 CXX/" CMakeLists.txt || die cmake_src_prepare } src_configure() { local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" - -DGR_PKG_DOC_DIR="/usr/share/doc/${P}" ) cmake_src_configure } diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20230828.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20230828.ebuild new file mode 100644 index 000000000000..1687c7d97ba0 --- /dev/null +++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20230828.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{9..13} ) + +inherit cmake python-single-r1 + +DESCRIPTION="IEEE 802.15.4 ZigBee Transceiver" +HOMEPAGE="https://github.com/bastibl/gr-ieee802-15-4" + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git" + EGIT_BRANCH="maint-3.9" +else + COMMIT="1a2999ce2778df279870f028a4ce15d94e60fbd9" + SRC_URI="https://github.com/bastibl/gr-ieee802-15-4/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/gr-ieee802-15-4-${COMMIT}" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3" +SLOT="0/${PV}" + +RDEPEND="net-wireless/gnuradio:0=[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep ' + dev-libs/boost:=[python,${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + ') + dev-libs/gmp + dev-libs/spdlog:= + sci-libs/volk:= + ${PYTHON_DEPS}" +DEPEND="${RDEPEND}" +BDEPEND="dev-lang/swig" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +src_prepare() { + # fix path for doc files + sed -i "s/802_15_4 CXX/802154 CXX/" CMakeLists.txt || die + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DPYTHON_EXECUTABLE="${PYTHON}" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + # Remove stray python files generated by the build system + find "${ED}" -name '*.pyc' -exec rm -f {} \; || die + find "${ED}" -name '*.pyo' -exec rm -f {} \; || die + python_optimize +} diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild index fbf88104daa3..20f4fead01b5 100644 --- a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild +++ b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{9..13} ) inherit cmake python-single-r1 @@ -38,18 +38,14 @@ BDEPEND="dev-lang/swig" REQUIRED_USE="${PYTHON_REQUIRED_USE}" src_prepare() { - #although cppunit is not used, it fails if it isn't there, fix it - sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt - sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt - sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt - sed -i '/GR_PKG_DOC_DIR/d' CMakeLists.txt + # fix path for doc files + sed -i "s/802_15_4 CXX/802154 CXX/" CMakeLists.txt || die cmake_src_prepare } src_configure() { local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" - -DGR_PKG_DOC_DIR="/usr/share/doc/${P}" ) cmake_src_configure } diff --git a/net-wireless/gr-paint/Manifest b/net-wireless/gr-paint/Manifest index d6bd88a157b2..77694f15c3a1 100644 --- a/net-wireless/gr-paint/Manifest +++ b/net-wireless/gr-paint/Manifest @@ -1,3 +1,3 @@ DIST gr-paint-0.0_p20230427.tar.gz 2094691 BLAKE2B 1dfa5fce3d24911dd9802bd322d4e9916a13066e69e5a0b57201f679a4b9bb985d7ee570e1d3881ecced257927ceb9a3b3845bd60422f407a753482dd35bf0a3 SHA512 7be52c524cdfde8a9620102c9b8cbdd813443c7bd9db1466ec3b73c588bb685fdd917fd2d8c602237b1b0450922d8a058ba9d2d507194a7b1ed4efe0c8f0a5f5 -EBUILD gr-paint-0.0_p20230427-r1.ebuild 1433 BLAKE2B 1b49fb417b30c1a1b4847eeba0e912cf854d73360564bb0832f59e5a2a167c52b417187f973db6e1a77e8e0484eb9b2a6b8e5a7d8b0582cf75afa190772e4d84 SHA512 0f53c0d82b848cbff45ecef5ee52dee2c9dec1bac318f2c1ca6b15ec4a339f38b67189271d86b46de3a2d431099f1b74b017d3021379957ac56587b6b2e4ef99 +EBUILD gr-paint-0.0_p20230427-r2.ebuild 1433 BLAKE2B 507b4b37f1c93b1e2ade4ad4cfc02fa11099161f3b88bf0986df5da7a872eaddc3f24c9214d4f29ee0288d88126bd79ae7ffa11e7e72dd6276ca22f143f4eb41 SHA512 5ec63d5cc8871cbf0d47c886ae139227dad3fa0a8a79591a7b27fc1558566fc0018ec8e16ba68cc40d6aff0a3ffd4be637a6110b6c24d074bcb07e268dc53461 MISC metadata.xml 427 BLAKE2B 1a5880d32b5456304e782a308f10c9d3a566d660cb77aa7434fb9ddead7c20ab83824dd4a723221bec93adb2d700c1ae88726ad1dc28f3134570e312cbfa781e SHA512 decc8d4245a466a7517ffafdfabf1f62c747e40bc8df140c9fed39cf387cb64a183a3c97a128a0db101fa4a485331f086bebff46f92321fd0ed1ac0b9e433729 diff --git a/net-wireless/gr-paint/gr-paint-0.0_p20230427-r1.ebuild b/net-wireless/gr-paint/gr-paint-0.0_p20230427-r2.ebuild index c4d4160fbe8a..b59c6ea1ce70 100644 --- a/net-wireless/gr-paint/gr-paint-0.0_p20230427-r1.ebuild +++ b/net-wireless/gr-paint/gr-paint-0.0_p20230427-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{9..13} ) if [[ ${PV} == 9999* ]]; then inherit git-r3 diff --git a/net-wireless/gr-rds/Manifest b/net-wireless/gr-rds/Manifest index 9d4690644ce8..382d85055119 100644 --- a/net-wireless/gr-rds/Manifest +++ b/net-wireless/gr-rds/Manifest @@ -1,4 +1,6 @@ DIST gr-rds-0.0_p20220804.tar.gz 271652 BLAKE2B 5735f985d3e91c1194545f3e92786e8dd8ac8834a475df11c489673d8bbdfd918fe6b924eb3ce2765e7ec4913a09b4fe390627ba645b8130a81d4b045c98a2d5 SHA512 22e64c1d626a22c76fc71f6b23bfc47abf91adeaad3ce84cc4be688a510a90b69a1490a7a588f23204852e8bb1434882a88f8e496aa50cf944a945aa9f043e5c -EBUILD gr-rds-0.0_p20220804-r2.ebuild 1010 BLAKE2B 2e2aa678631cee4281c434cadab5d73965e73a99c7d0b84b88082a0fcc974460b88bf3e3a0d40b219449b8e576dc48715ef44b76a39576703c6cd5f8f0f8ca88 SHA512 8e7cdd719b13058aca8524bb975b0743a250ebfc5cf072c2f86d630680408a73faeb110cc43d67961f61f0f3919c57e5a82295492fe0b620908a55ff2eb7990e -EBUILD gr-rds-9999.ebuild 1010 BLAKE2B 2e2aa678631cee4281c434cadab5d73965e73a99c7d0b84b88082a0fcc974460b88bf3e3a0d40b219449b8e576dc48715ef44b76a39576703c6cd5f8f0f8ca88 SHA512 8e7cdd719b13058aca8524bb975b0743a250ebfc5cf072c2f86d630680408a73faeb110cc43d67961f61f0f3919c57e5a82295492fe0b620908a55ff2eb7990e +DIST gr-rds-0.0_p20250404.tar.gz 278830 BLAKE2B ede49538aa3e35e1f822fe2731cd213b448cf14ca0a428b0a05c288f9efc241254a317c50610b91a27d62c07572dc46bef6fff56b45e929c31fdf2fb3faf9be3 SHA512 06106930fecea7c77a3bcaa077dca9e1158b95ae94958a984be563bbbb5e90f6f7bedbab640f576dff36247c0b5d9bed6a4536d74e73ee3ffb5a4d2b5392fe85 +EBUILD gr-rds-0.0_p20220804-r3.ebuild 1010 BLAKE2B 0ef4c360c6bcb8753707ac1b297c892a71173edb73c14a4a8c58a9359a042f085a6274ebf726b476efb3c86fc1d22af714a3d9d9a22889d890ee8b72970c596e SHA512 9cd6a0335f818d5ca09c1b37dd747ff7b8fc23902a2c25df62a8baa438a829d342d988c9be2629d56a52deaf69e12e5c46a3b0ad781f61de705a8f368555f5c3 +EBUILD gr-rds-0.0_p20250404.ebuild 1010 BLAKE2B 25d59ea10a3b9b73302c5432dc4f32caaae192800d0375d514adae0a5395c3301af1f3c2325b383499b8dcbc20c6458eeaac644827268b115840f26fb48597cc SHA512 bc8ecf94ecf843cb6d0fff851372efb0d8c48bef55f50f10ce377b6b1fed8ce0a70767f0f6cba13e50feaeab125df2ab5025cca6a58acb16cf8318af033b06b3 +EBUILD gr-rds-9999.ebuild 1010 BLAKE2B 25d59ea10a3b9b73302c5432dc4f32caaae192800d0375d514adae0a5395c3301af1f3c2325b383499b8dcbc20c6458eeaac644827268b115840f26fb48597cc SHA512 bc8ecf94ecf843cb6d0fff851372efb0d8c48bef55f50f10ce377b6b1fed8ce0a70767f0f6cba13e50feaeab125df2ab5025cca6a58acb16cf8318af033b06b3 MISC metadata.xml 318 BLAKE2B 4eb17bc98ea42ef37762bf7d0017492b32e7c8837065ffbc615597e3153e20baea76501b2a43635abab8ef542f55ddde1f5bd30331741c19c9814ac8d58e6d87 SHA512 c6f75244cdb565c0d0b8653ffa05b5d4cf9af8faf56c54ee9e4fa2a8f45a031b28bdef22a52bd66f0b26f9cb2dbedafb4ca0ac3d5a6c3f8a11f6b39f4ea37a30 diff --git a/net-wireless/gr-rds/gr-rds-0.0_p20220804-r2.ebuild b/net-wireless/gr-rds/gr-rds-0.0_p20220804-r3.ebuild index ef3954a77e83..f8a8cd5dd466 100644 --- a/net-wireless/gr-rds/gr-rds-0.0_p20220804-r2.ebuild +++ b/net-wireless/gr-rds/gr-rds-0.0_p20220804-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{9..13} ) if [[ ${PV} == 9999* ]]; then inherit git-r3 diff --git a/net-wireless/gr-rds/gr-rds-0.0_p20250404.ebuild b/net-wireless/gr-rds/gr-rds-0.0_p20250404.ebuild new file mode 100644 index 000000000000..6d91ed065435 --- /dev/null +++ b/net-wireless/gr-rds/gr-rds-0.0_p20250404.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..13} ) + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/bastibl/${PN}" + EGIT_BRANCH="maint-3.10" +else + KEYWORDS="~amd64 ~x86" + COMMIT="c1cba54dfac0661c088c44a120eeb38c300f6c01" + SRC_URI="https://github.com/bastibl/gr-rds/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/${PN}-${COMMIT}" +fi +inherit cmake python-single-r1 + +DESCRIPTION="GNU Radio FM RDS Receiver" +HOMEPAGE="https://github.com/bastibl/gr-rds" + +LICENSE="GPL-3" +SLOT="0/${PV}" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-libs/boost:=[python,${PYTHON_USEDEP}] + ') + net-wireless/gnuradio:0=[${PYTHON_SINGLE_USEDEP}] +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-lang/swig:0 +" + +src_configure() { + local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" ) + cmake_src_configure +} + +src_install() { + cmake_src_install + python_optimize +} diff --git a/net-wireless/gr-rds/gr-rds-9999.ebuild b/net-wireless/gr-rds/gr-rds-9999.ebuild index ef3954a77e83..6d91ed065435 100644 --- a/net-wireless/gr-rds/gr-rds-9999.ebuild +++ b/net-wireless/gr-rds/gr-rds-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{9..13} ) if [[ ${PV} == 9999* ]]; then inherit git-r3 @@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then EGIT_BRANCH="maint-3.10" else KEYWORDS="~amd64 ~x86" - COMMIT="f3646d04c138dc3279528808dcf6f847887e4a4f" + COMMIT="c1cba54dfac0661c088c44a120eeb38c300f6c01" SRC_URI="https://github.com/bastibl/gr-rds/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" fi diff --git a/net-wireless/gr-scopy/Manifest b/net-wireless/gr-scopy/Manifest index 584f6bf9bfad..efce1913bb5d 100644 --- a/net-wireless/gr-scopy/Manifest +++ b/net-wireless/gr-scopy/Manifest @@ -1,4 +1,4 @@ DIST gr-scopy-0.0_p20220602.tar.gz 213557 BLAKE2B 9dcd1b1beb62fa8f18c478f8990339cbe064a6c60c2e68516f49634d838f42559f2b25527fed78b124b9373be5f9c475c66a4dcc57ea30e69127e7227220742f SHA512 28983f1380943b1cc02c34fe21c7f295e5d4bbf4611fdddc313b9f63624845485a8366bcae6e215d9fe228a51f004d051895af756b157d382c6da2f51a1ca432 -EBUILD gr-scopy-0.0_p20220602.ebuild 909 BLAKE2B 098b71b9d1ed94a70205d3fcd5f004bc1693bc5438d34843eaca16c831a71a431f80bfb561d1d6520789757cb91e5235f717355138d229d8b2018bf405db46b2 SHA512 d432ca679de2a111128c2e02fab35fc209209b783723e7a85cf99b74c9d534b0c02b431aa157a02a8fa1617f27a7e35318757234d9778b29d6a5e0021ac7f553 -EBUILD gr-scopy-9999.ebuild 909 BLAKE2B 098b71b9d1ed94a70205d3fcd5f004bc1693bc5438d34843eaca16c831a71a431f80bfb561d1d6520789757cb91e5235f717355138d229d8b2018bf405db46b2 SHA512 d432ca679de2a111128c2e02fab35fc209209b783723e7a85cf99b74c9d534b0c02b431aa157a02a8fa1617f27a7e35318757234d9778b29d6a5e0021ac7f553 +EBUILD gr-scopy-0.0_p20220602-r1.ebuild 909 BLAKE2B 8dddbddfbb0d619d57245a1f3db72a9682027dc77f953c1146241426746dbd0866f0414475aafcfb0d2645d1868c8a27ee65df24cd0fb5ad1f2643c1717f6123 SHA512 6e744cdaf6f5ad36451677bb274e4dd58d647f1ea7e9a0a84c186d83f52f16b797026bbb1e2c7521475a9b2a6a4e3a860ae7e4054607d7f5ee2cacdd0c7d695b +EBUILD gr-scopy-9999.ebuild 909 BLAKE2B 8dddbddfbb0d619d57245a1f3db72a9682027dc77f953c1146241426746dbd0866f0414475aafcfb0d2645d1868c8a27ee65df24cd0fb5ad1f2643c1717f6123 SHA512 6e744cdaf6f5ad36451677bb274e4dd58d647f1ea7e9a0a84c186d83f52f16b797026bbb1e2c7521475a9b2a6a4e3a860ae7e4054607d7f5ee2cacdd0c7d695b MISC metadata.xml 437 BLAKE2B 4a35ba663d2d8461738010b5f761fe998cbd778a39570ef834dd9ce758eb53b54abca782ef218fa89f536ebb1bf8e0de398b3e6711651d4df4aa0f32a27e4481 SHA512 2a44d3f8c5c72c69572e78427ee8ffd4bfc202a63e159e82c0b3f393d80176f473caf69d5460c217e602b44f92dd05a008c340014b518afeded662baf01c90ba diff --git a/net-wireless/gr-scopy/gr-scopy-0.0_p20220602.ebuild b/net-wireless/gr-scopy/gr-scopy-0.0_p20220602-r1.ebuild index 923d5095594f..e0c14ecc1e05 100644 --- a/net-wireless/gr-scopy/gr-scopy-0.0_p20220602.ebuild +++ b/net-wireless/gr-scopy/gr-scopy-0.0_p20220602-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake python-single-r1 diff --git a/net-wireless/gr-scopy/gr-scopy-9999.ebuild b/net-wireless/gr-scopy/gr-scopy-9999.ebuild index 923d5095594f..e0c14ecc1e05 100644 --- a/net-wireless/gr-scopy/gr-scopy-9999.ebuild +++ b/net-wireless/gr-scopy/gr-scopy-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake python-single-r1 diff --git a/net-wireless/iw/Manifest b/net-wireless/iw/Manifest index 9b46d09dcff0..26333e83b9ed 100644 --- a/net-wireless/iw/Manifest +++ b/net-wireless/iw/Manifest @@ -1,8 +1,10 @@ DIST iw-5.19.tar.xz 152044 BLAKE2B 57c14b3be0b171b80abcbc71a45f392115f62cc0c3f8440185cb05b42f7a7c901653969a4d5200878b7ceb7aea356d9cf02e07a9fbb282b34372c23561f4fe0a SHA512 ff5c23543806c91eda27c91da923737c74cbccd6acc55f1f45114338f518cd959ca292c9255fd75b91dc127ed016eb235dd97af319e30631578eba6cb0823c6c DIST iw-5.9.tar.xz 145296 BLAKE2B d7abe6c65d408a7570227dbe69fe11e1d72a1f502de21d1fcb7dcff6bfe229804020d5c1ebdda42a3694e31cf87c631faf089746f8df4733b0b1a459c185e2af SHA512 08b0c8d92c7e695bb2a107b89c3cc406e8386393b65ecbf96ded6fd757043ccd12bedaa90c14138e03e53f107365d04e229633c1cfa024ecab5fe993578491be DIST iw-6.7.tar.xz 158928 BLAKE2B f0ed86c35edb9a70549f1fcc1bccc33ca18e20051f8c4db94d7199b6ac51ecae601afd6d6389c94c63337cdda1247a9ca7fbb19c7e27fd7e36b54ee319bace8c SHA512 7370d3b55ce43691ba84913be334c04dcdf9aa44e9556e4214d8016ddf9733b2c555ebdfbdfc814d2eba7da68501503d267ad6353b14f87b81f064f629afbef5 +DIST iw-6.9.tar.xz 159480 BLAKE2B 90fca854795fb7e32675d14158250c0b0b06b0d757f375636bcf538fc5f9a658eab8ee39331465b93545e0b0b49ad29f92f5119a6f4e187fb84eca9c9e5151c2 SHA512 cbafa54cffa6098a727edd8fb90382ab9f08d2db999811e543bcdaf8de41386c87a34504cf8965340839445929879a608faf51314b7335783beab403cf3f9cbc EBUILD iw-5.19-r1.ebuild 986 BLAKE2B dc79d93e132485d37f0a9b49e6b03e8b43fbb4f4f6eb35821bf6d4630506d9c587be799167c48cf9a1a4deb2e76212105559b6fba46ccbac431f36c2243220b7 SHA512 7b2857bd19a49dbf13cfbe0f25bddb7dc22513fb99b6779a047332dfd8f5fe5f70353777c4ba54e1a62faf99e7df8fe078ef6d2297e9fa2cfa25098133a5c105 EBUILD iw-5.19.ebuild 892 BLAKE2B b8b826a6badf180de1f34ebac8b1d29cc04a37e28a1d9bef9cf180fed42fd3f3f863c63d5023cb9413cd4e11f2b3fc95570fd58baaac7ca1af0d6fa6e7465f0f SHA512 07ec4f182e7aac213c7199024378d96ddceb8dcaa3e3adad729b285da4c6e68d214609b93bcae3b14cbfe2d5132bcbc426ed8b7a85f9c9f238a08fedb43b46f9 EBUILD iw-5.9.ebuild 877 BLAKE2B b0c74e5e40698cd7a21d392499044f1fa353b92476eb1fe812d6f9dbb61267cba1d3da1d0c8cdb35e858ee229ef424d5eddc788059600ec01f5b4f4925cfbb77 SHA512 a57e92c602b132fe2d57a8afb5c103c49180c39d6c74ab876e54b6bdf1e8d7692c921ee30daca600365150139b1df6a074f147b6221d9ae729670dc72dde029d EBUILD iw-6.7.ebuild 980 BLAKE2B eaa26b215e0fc9afbc7f34f0a387a193ac7270c2debab8fdc8a31e07db165330d1076efe8e971d2eb6775b3424d35e719a67aa4ed3d0b862c9f85d6371b0c999 SHA512 8d3b46cfdd0d92dcca63203da652a5f31e38ec602b32a6ef4bab61088a08f4f4c1a0d86019cad1d0aa17c1760b3c9c020211e692c063ef4180b771fca90f967e +EBUILD iw-6.9.ebuild 986 BLAKE2B dc79d93e132485d37f0a9b49e6b03e8b43fbb4f4f6eb35821bf6d4630506d9c587be799167c48cf9a1a4deb2e76212105559b6fba46ccbac431f36c2243220b7 SHA512 7b2857bd19a49dbf13cfbe0f25bddb7dc22513fb99b6779a047332dfd8f5fe5f70353777c4ba54e1a62faf99e7df8fe078ef6d2297e9fa2cfa25098133a5c105 MISC metadata.xml 326 BLAKE2B b542a288462866aab338ad36546026aa12ce0c8b0e8abf2eff3cbff0bd591c6402379d68df77686b36524f1127ed0c061f57f223f4559f4456728009226a663c SHA512 32b6a69e2ad35466321ffa8ae5a9ffde83f99b64b91e65ffca3662fb7dc3c6c2d7d46acb0d8da40e46de3c1b9764abb836bdb0934d727837c4c7d5bacd501a0b diff --git a/net-wireless/iw/iw-6.9.ebuild b/net-wireless/iw/iw-6.9.ebuild new file mode 100644 index 000000000000..973ed4b8434f --- /dev/null +++ b/net-wireless/iw/iw-6.9.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="nl80211 configuration utility for wireless devices using the mac80211 stack" +HOMEPAGE="https://wireless.docs.kernel.org/en/latest/en/users/documentation/iw.html" +SRC_URI="https://mirrors.edge.kernel.org/pub/software/network/${PN}/${P}.tar.xz" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" + +DEPEND="dev-libs/libnl:=" +RDEPEND=" + ${DEPEND} + net-wireless/wireless-regdb +" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + tc-export CC LD PKG_CONFIG + + # do not compress man pages by default. + sed 's@\(iw\.8\)\.gz@\1@' -i Makefile || die +} + +src_compile() { + # Set flags prior so they are honored + CFLAGS="${CFLAGS:+${CFLAGS} }${CPPFLAGS}" + LDFLAGS="${CFLAGS:+${CFLAGS} }${LDFLAGS}" + emake V=1 +} + +src_install() { + emake V=1 DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install +} diff --git a/net-wireless/nanovna-saver/Manifest b/net-wireless/nanovna-saver/Manifest index d36b619e460b..d8788f7dd5b8 100644 --- a/net-wireless/nanovna-saver/Manifest +++ b/net-wireless/nanovna-saver/Manifest @@ -1,4 +1,5 @@ DIST nanovna-saver-0.6.8.tar.gz 586892 BLAKE2B 6cbbac42221a6c862a2cd20c3c0fde7c51f41f0659e2c7898f42252a5c78edf4eac845cd8742ecf193a1572d2277c7b43835430e9731d985ee4abb4a79926571 SHA512 046ab6097eb47ff7321d3eaf88277f7cca0748f4977c48ee558ea8ccee6fdebc82e0ded589d0c3916d120c851448e7f09dc368752150a57973be1ce9201ca762 +EBUILD nanovna-saver-0.6.8-r1.ebuild 1211 BLAKE2B 54466b2e105330145fa0ad7254c9991da96c08375a05f069069cb68e465f5bd9d527d07a1753ae38b59124a19409dfdfee51c21128a09f9aac9c759b2a563b1a SHA512 0b983bca19499f33a8e1709661d3efdff73a55281065f0162010dd43b7a7b04eac47a6e677704e9590e8ca30bc03b2d1b9161a1362e7a001d1601c636dee5ded EBUILD nanovna-saver-0.6.8.ebuild 1209 BLAKE2B f8be7afee11cab20904ed87f9b54b7f26afd59808af114f42ae23f75716b52f86961e5dd916984d9bfe0f4cf67449031a725d93d042e1e436042ab4bbb190466 SHA512 219949f9ce500722491bc8076acb165d0a31c77f7c84270e31cb4660f93aade987547c1ad6be750d29d52479026d127c1804ce0ac9a87836bb00dddc090bba00 -EBUILD nanovna-saver-9999.ebuild 1206 BLAKE2B 113821bb15d5a64d40592a43fbc4dc0b4da408ae2065ba054db71f6ef9cb97d9055e90466d116fa75c8a9b7d11a9ddc5933a984eaa94cbb37dc047caada308a1 SHA512 de5272286351caf037f5a1bea52d8a2b0983bda846cad713b6775bf40940827a53b4f474c9856de28035fe14fe3e52a15db1f093c833b016fe2ace9ca6b212ce +EBUILD nanovna-saver-9999.ebuild 1206 BLAKE2B 406615d9fb72e7eecc9754561cf9d16e8c41c3b5cf41a5e3b224ab6508c34580773ff96c2b5b4b4e7f14694efdcd2e3f13cf5d2ea758a4579748f30b46fbd543 SHA512 c1ec16476b9ef627e998057c58fc3b5e225ca3a6c3ee279e37f1c7eacfdbbdf350d492cfce2b648123a9925810bbd4d3f8ebf3a2ee4ae8fc0ad34737c068c15d MISC metadata.xml 543 BLAKE2B 04c50e81948a367bbe842cc1471471c482a5f813c90d7f98fb5af27868700496d4edc08aabd9d4a0674c556a467ab03a83f7b356039b1fc92e41e301e682f739 SHA512 e250acfe7bae2e5673270f4af746aca72a3d50b5b248cd70cf2a2f87aa30ce74d505fbf806cf5f7809be1aafad631f4e68a83aa13622dfdbbf498107f888bcab diff --git a/net-wireless/nanovna-saver/nanovna-saver-0.6.8-r1.ebuild b/net-wireless/nanovna-saver/nanovna-saver-0.6.8-r1.ebuild new file mode 100644 index 000000000000..d398862e0fd4 --- /dev/null +++ b/net-wireless/nanovna-saver/nanovna-saver-0.6.8-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 2019-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..13} ) +inherit distutils-r1 xdg-utils + +DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA" +HOMEPAGE="https://github.com/mihtjel/nanovna-saver" + +LICENSE="GPL-3+" +SLOT="0" +if [ "${PV}" = "9999" ]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/mihtjel/nanovna-saver.git" +else + SRC_URI="https://github.com/mihtjel/nanovna-saver/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}" +fi + +RDEPEND="${DEPEND} + dev-python/cython[${PYTHON_USEDEP}] + dev-python/pyserial[${PYTHON_USEDEP}] + dev-python/pyqt6[${PYTHON_USEDEP},gui,widgets] + dev-python/pyqt6-sip[${PYTHON_USEDEP}] + dev-python/sip[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/scipy[${PYTHON_USEDEP}]" +BDEPEND="dev-python/setuptools-scm[${PYTHON_USEDEP}]" + +distutils_enable_tests pytest + +python_install() { + distutils-r1_python_install +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild index 1cae85c8b5a6..d185d9f7d0b3 100644 --- a/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild +++ b/net-wireless/nanovna-saver/nanovna-saver-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 2019-2024 Gentoo Authors +# Copyright 2019-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit distutils-r1 xdg-utils DESCRIPTION="tool for reading, displaying and saving data from the NanoVNA" diff --git a/net-wireless/soapysdr/Manifest b/net-wireless/soapysdr/Manifest index 26eef020612b..72daa66326d5 100644 --- a/net-wireless/soapysdr/Manifest +++ b/net-wireless/soapysdr/Manifest @@ -1,5 +1,7 @@ +AUX soapysdr-0.8.1-cmake4.patch 1426 BLAKE2B 5465d606c60246994153782b3a8f7e9e9e0e2fc096ca0c0d30dc87cc567dfe7e83fedde2a9668352605a5f66daa6913a71abb6276c520fc9fef64a777c8a1a24 SHA512 12b31de4dca5d9a73ebf2ed6f7c1688d3aa451fffe5de4758872f366c06d6a014f83a3f687088364e37b8cdeb4d7e624bd6643c992e6228260825a62eb23dc1e AUX soapysdr-0.8.1-python3.12-distutils.patch 3044 BLAKE2B 04a24ef649a5a01c60e556b4ef51a16d3b1af4be28c0fe3dcad1fd040c57d450e0db07f7a614f6b61980700cff3d18cd129f8aecbf26cf4a5467ace085e613b5 SHA512 2ad79171bfad8358ecc170695199d2d23cefa54bb24e259b2ef6f9f7d6a3baaf4461495c7a0416318e7a2d918dee11949da1efa1d9e19bc550cb191b20a6fbd1 DIST soapysdr-0.8.1.tar.gz 131252 BLAKE2B 4dc97b683063a1bc52717f15b12a2471a338cebc30dccfd58723792119a496f5170b67eeda1ff4dbcd34811948f70b9f0e5df11b5b1738b46839ca7377fe557b SHA512 50c8f1652bf9ca09215f9c4115175427ca7b5338add7591e31ca0e627093c94b73e7cf7f84fa71ff419cc010d3c1263931506c728bbaa00413a7915d56a87787 EBUILD soapysdr-0.8.1-r1.ebuild 1431 BLAKE2B d471b15f4df3a644b68eeaa8d505cefdd59af67f0d6c4b4291e45fe3acddc8cc3a421b2118d5a2055aaa9adf617b992e9196b9a8eef9593f4a0725f02d38cb90 SHA512 78d5ce010465ac9b77f517718c2df680d5c3c3030881b4c0bb993f26ef52a77bdd6fe6f8850d979d0c997455fa110766777602cb974478869c036f0b513f659a -EBUILD soapysdr-9999.ebuild 1271 BLAKE2B 72577bcf89e55b7a527fd42feb287f28e3f53d0acd1c424453fd426531e94e7d7d235ad3f23bd5fe873eb9520b4735c0b08c60dd6ea1fcd6fb05c247087e3240 SHA512 3f770323e798df6b5fa906b84ee2ecc0d9b11f7db5ab87093162c5daab35b7e17de0ed9a2a357e84cbe170e4c5682dd9b26937087545ffe03006b35c4e1a7efb +EBUILD soapysdr-0.8.1-r2.ebuild 1475 BLAKE2B 4933845a78270ab61a1961380f787c42c7acc1377ebe7f9e02a53feb9ac390e9fddcb890462706d50ab81bc3ef958ce3139e3c4f58588b0bdf5ed5e6871b47cc SHA512 50f7680633ae7cd641b8dc65896d136d41bf00480d3657cd1dcb262164f5eee57917f9e7d37b577a4ee7aa74630daf2e6754e820d4e3a1e4eef405d12390075d +EBUILD soapysdr-9999.ebuild 1475 BLAKE2B 4933845a78270ab61a1961380f787c42c7acc1377ebe7f9e02a53feb9ac390e9fddcb890462706d50ab81bc3ef958ce3139e3c4f58588b0bdf5ed5e6871b47cc SHA512 50f7680633ae7cd641b8dc65896d136d41bf00480d3657cd1dcb262164f5eee57917f9e7d37b577a4ee7aa74630daf2e6754e820d4e3a1e4eef405d12390075d MISC metadata.xml 776 BLAKE2B e875dbd46723cba190cfe767f7c91518bbd73269fdef3bc64a67b1b48145f2eeb1ba6acbf258b4e1e578ad7f77225d37662ab70cb83b345c1acecbae4a113931 SHA512 4f92020b725b79bcb55b0e4fcb2f921d01fc582e53b56c333b83a3f04c24630200b7d72d49ee9d3aaa12c887c861744a660c4f0240b3c2d0ade6f29830b74de0 diff --git a/net-wireless/soapysdr/files/soapysdr-0.8.1-cmake4.patch b/net-wireless/soapysdr/files/soapysdr-0.8.1-cmake4.patch new file mode 100644 index 000000000000..a21cdf7da951 --- /dev/null +++ b/net-wireless/soapysdr/files/soapysdr-0.8.1-cmake4.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ff15ad0..8fff872 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,7 @@ + ######################################################################## + # Project setup + ######################################################################## +-cmake_minimum_required(VERSION 3.1.0) ++cmake_minimum_required(VERSION 3.10.0) + project(SoapySDR) + enable_language(CXX) + enable_testing() +diff --git a/ExampleDriver/CMakeLists.txt b/ExampleDriver/CMakeLists.txt +index 32cb6ca..ada07e9 100644 +--- a/ExampleDriver/CMakeLists.txt ++++ b/ExampleDriver/CMakeLists.txt +@@ -2,7 +2,7 @@ + # Project setup -- only needed if device support is a stand-alone build + # We recommend that the support module be built in-tree with the driver. + ######################################################################## +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.10.0) + project(SoapySDRMyDevice CXX) + enable_testing() + +diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt +index 8cb1592..a5c09ce 100644 +--- a/python/CMakeLists.txt ++++ b/python/CMakeLists.txt +@@ -1,7 +1,7 @@ + ######################################################################## + # Project setup + ######################################################################## +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 3.10.0) + project(SoapySDRPython CXX) + enable_testing() + diff --git a/net-wireless/soapysdr/soapysdr-0.8.1-r2.ebuild b/net-wireless/soapysdr/soapysdr-0.8.1-r2.ebuild new file mode 100644 index 000000000000..8f5ef69eb2ef --- /dev/null +++ b/net-wireless/soapysdr/soapysdr-0.8.1-r2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake python-single-r1 + +DESCRIPTION="vendor and platform neutral SDR support library" +HOMEPAGE="https://github.com/pothosware/SoapySDR" + +if [ "${PV}" = "9999" ]; then + EGIT_REPO_URI="https://github.com/pothosware/SoapySDR.git" + EGIT_CLONE_TYPE="shallow" + inherit git-r3 +else + KEYWORDS="~amd64 ~arm ~riscv ~x86" + SRC_URI="https://github.com/pothosware/SoapySDR/archive/soapy-sdr-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}"/SoapySDR-soapy-sdr-"${PV}" +fi + +LICENSE="Boost-1.0" +SLOT="0/${PV}" +IUSE="bladerf hackrf python rtlsdr plutosdr uhd" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND}" +BDEPEND="python? ( dev-lang/swig:0 )" +PDEPEND=" + bladerf? ( net-wireless/soapybladerf ) + hackrf? ( net-wireless/soapyhackrf ) + rtlsdr? ( net-wireless/soapyrtlsdr ) + plutosdr? ( net-wireless/soapyplutosdr ) + uhd? ( net-wireless/soapyuhd ) +" + +PATCHES=( + "${FILESDIR}"/soapysdr-0.8.1-python3.12-distutils.patch + "${FILESDIR}"/soapysdr-0.8.1-cmake4.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DENABLE_PYTHON=$(usex python) + -DENABLE_PYTHON3=$(usex python) + -DBUILD_PYTHON3=$(usex python) + -DUSE_PYTHON_CONFIG=ON + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + use python && python_optimize +} diff --git a/net-wireless/soapysdr/soapysdr-9999.ebuild b/net-wireless/soapysdr/soapysdr-9999.ebuild index aaa41be56cc9..8f5ef69eb2ef 100644 --- a/net-wireless/soapysdr/soapysdr-9999.ebuild +++ b/net-wireless/soapysdr/soapysdr-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -35,13 +35,21 @@ PDEPEND=" uhd? ( net-wireless/soapyuhd ) " +PATCHES=( + "${FILESDIR}"/soapysdr-0.8.1-python3.12-distutils.patch + "${FILESDIR}"/soapysdr-0.8.1-cmake4.patch +) + pkg_setup() { use python && python-single-r1_pkg_setup } src_configure() { local mycmakeargs=( + -DENABLE_PYTHON=$(usex python) -DENABLE_PYTHON3=$(usex python) + -DBUILD_PYTHON3=$(usex python) + -DUSE_PYTHON_CONFIG=ON ) cmake_src_configure diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest index 4163675f87a2..d4c4ed6f5a65 100644 --- a/net-wireless/uhd/Manifest +++ b/net-wireless/uhd/Manifest @@ -2,6 +2,8 @@ AUX uhd-4.6.0.0-boost-1.85-1.patch 3665 BLAKE2B 1fe78699d1e3c6e2359733ca8ca46ed1 AUX uhd-4.6.0.0-boost-1.85-2.patch 1155 BLAKE2B 84002da36d755899d3921a68d5748f80cf12a65f289001843bfdc04d6e69e3a3003c75099564d13cc8e8b6e7f8069c677f033d5fdc74469cb2d9de4c9129430c SHA512 0705b4102b3e73a2dd046f2b00d1d8f08f4324c7c9a5c41a9ce1a998c7439b8532cc77d97eeea23b191e5a0bb6c831e9a0d68659bb03f158c2fb8913c4bbaf8e AUX uhd-4.6.0.0-boost-1.87-1.patch 43586 BLAKE2B ab4bb57eca11c38573103899fc1673efe587c07400cf23503ab018320f1e81310b6bffd3a939e9e7ed39b5f789491d70b981f23bcfc0f85bc91276bfe9feb4c4 SHA512 b6f849e8255d560dc0d28d3d239494a10d381c62de0d4f3626b9793db868de9192e43f14d8fe5456360896a0540266e1c769d4ba5294850f87dd1fc475158092 AUX uhd-4.6.0.0-boost-1.87-2.patch 941 BLAKE2B ab1bed4e0e0492137893327b05cb29ef5596b4f249f7071df5c61c4319d4d7cf2267a0a83c8fc7fd26dc746f946f90dd0dd71333b9fd291ef5aacf4611d588a0 SHA512 b7cb6acfd7afc9e1eb50c982128bda982f2aba0ccef893416d69fd0543e62211724704b0ec362af02d65a75caec9e549911b02372aa9de498d98bc3cc0b7baff +AUX uhd-4.8.0.0-cmake4.patch 515 BLAKE2B cd8f6d4941f448877eed797715365aa70ae9453bc42889db69f2c5f2d1ef40fa3f97b2e1b7f829e4a62c8f7ad0c3944579e3cc5a9d497ddcf6137cad40e54779 SHA512 08b20ad4f4e640253c6beaf76ebba27305739a56557dab8f8a2dd4b052e7d40b20ba80faa42304f362b67f9c02570fb6baf60bad746b9f50a6df93ca803da6e5 +AUX uhd-4.8.0.0-includes.patch 1268 BLAKE2B a3412df91e58ab84752e43f0dba5a77fdc380a84891d9a8262290c9422f2a0e7d4c24eb4d813ad951312ff78399dedc6939f45077159c2a9e84f1be53eb0e594 SHA512 283f5b93b6dd6faabeef1e0c97c597f2a4c498d7ef80c09ebdecb478fd5465066b9458ca7aab7fb2289a2a6a3ec96a4d99c569f740982f3b063ae5478573a60b 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 EttusResearch-UHD-4.8.0.0.tar.gz 41358938 BLAKE2B c69af5aabcd7e02290b4a168f319dc43bb6cb277e235407a5ded8eb617fe957ca1326042a892efa7b688cfae52f3c345e0930a614ff59b25c05e8b202d62e82e SHA512 61e92209e69994b1c5d3a2a88f749ddca612a3fa3c1580c00a9577e25fab5055d7c80571f2843cca3951fc941d1a81566bafc21070fb93cb3e566228c46331e7 @@ -10,5 +12,5 @@ DIST uhd-images_4.6.0.0.tar.xz 180745328 BLAKE2B f698c68c66e706146cd2163abca10bc DIST uhd-images_4.8.0.0.tar.xz 180420544 BLAKE2B 5cce16db59c6c78035512e5275ac36b02a5d928104ff77877f8a13a9df64d0bde6c832497675b27a0090debef78ef4c284c48ef3b6169fae3420ca4d87e8209e SHA512 4203e5b7f642d7850e9563ba495a60efe965a64223d9208c780e1400ea755b322125fff53c3f8a3fb010617b57a4da638dc3cf80bf7d95604e20788cc469edb9 EBUILD uhd-4.4.0.0.ebuild 3707 BLAKE2B 0bef82e613b6f7fdfc89487382d5358db8787d53c308431697170c204deb57986e00578bd6a3c648aa57df9449af6e26a362d812c033d334d32273bdba8f2209 SHA512 e55d9be83e3262c094a3087ac77b5db2afff622be05df27a728d4e95affcc3d4a60e25dbf39de8a523d5f4b98e4ac4335e1d841d3744075ef4df82e5da3b500f EBUILD uhd-4.6.0.0.ebuild 3877 BLAKE2B 11e4c123d3092e465f77ddf3a1eb379b74add6878c9d0ed5de0f95be6a42894b2881e4215dd87cc54eaa819356bb5a2061f622e04e02d1b16ce8f5a47f03b343 SHA512 3b3faf2ebfddf03fb7fa2d41a7b29a15abfd78b318af70ed3d6a870372504490b9521c1e00092988afe62ff4d59baf243721ed347259ce0fe53a4255e9cbf360 -EBUILD uhd-4.8.0.0.ebuild 3695 BLAKE2B 829a811d04e180dc82d76fc8ca7dba3e70cb5f5489e4f61a1fd7a34935f865a0ecb5d68285c94c035f7e0882e38cd1cc321d7888cd59374875fd5110e54499b0 SHA512 3ade952792eedf5fb946bb4b9374cd3f98931d58bd9cc35bc77b570fefd0248ffc1adf09e83850b6e88c39951683206a2b32b29591ec1f16137106b0e355a1c3 +EBUILD uhd-4.8.0.0-r1.ebuild 3766 BLAKE2B 228342179d594f2de8999d0b8fcb8c3c2fe5d9eb43c3f444c7aa48b9f398f086f03ef6227e31c702a39b0633b6f4ed847769ac0ebf85eb353ab8a97e7502c2b1 SHA512 8df1fcca6ca0b164bfb18c1e6667fa29d3f9a9aca2a0b4f7611dd37b3bf73d20d4c6f00be342db0eaac103dab67db9e047c1d38a3a1e2abc982f945a0fbe18be MISC metadata.xml 1112 BLAKE2B 7bf2e25d7618581200731789b4c5ee05c6cd6b33c21a7912b3904ffd53e6948d4d2e36bb071d3f966febb5b3da1523c2316558f66d4297341264d534e08d122f SHA512 ac48857213ada598edec618d0c39fc8faaa2b405444b37958e47dc23068fdd61d80bffb8033b20428f2fa63caf8ca322eb4bb765c59389d4a070fee260dee66d diff --git a/net-wireless/uhd/files/uhd-4.8.0.0-cmake4.patch b/net-wireless/uhd/files/uhd-4.8.0.0-cmake4.patch new file mode 100644 index 000000000000..afdd84002962 --- /dev/null +++ b/net-wireless/uhd/files/uhd-4.8.0.0-cmake4.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/Modules/CMakeRC.cmake b/cmake/Modules/CMakeRC.cmake +index ce6d8fb..ba3c668 100644 +--- a/cmake/Modules/CMakeRC.cmake ++++ b/cmake/Modules/CMakeRC.cmake +@@ -60,7 +60,7 @@ endif() + + set(_version 2.0.0) + +-cmake_minimum_required(VERSION 3.3) ++cmake_minimum_required(VERSION 3.10) + include(CMakeParseArguments) + + if(COMMAND cmrc_add_resource_library) +diff --git a/include/uhd/features/ref_clk_calibration_iface.hpp b/include/uhd/features/ref_clk_calibration_iface.hpp +index 86a2005..0408489 100644 + diff --git a/net-wireless/uhd/files/uhd-4.8.0.0-includes.patch b/net-wireless/uhd/files/uhd-4.8.0.0-includes.patch new file mode 100644 index 000000000000..72f0545aafa0 --- /dev/null +++ b/net-wireless/uhd/files/uhd-4.8.0.0-includes.patch @@ -0,0 +1,36 @@ +diff --git a/include/uhd/features/ref_clk_calibration_iface.hpp b/include/uhd/features/ref_clk_calibration_iface.hpp +index 86a2005..0408489 100644 +--- a/include/uhd/features/ref_clk_calibration_iface.hpp ++++ b/include/uhd/features/ref_clk_calibration_iface.hpp +@@ -9,6 +9,7 @@ + #include <uhd/config.hpp> + #include <uhd/features/discoverable_feature.hpp> + #include <memory> ++#include <cstdint> + + namespace uhd { namespace features { + +diff --git a/lib/include/uhdlib/usrp/common/mpmd_mb_controller.hpp b/lib/include/uhdlib/usrp/common/mpmd_mb_controller.hpp +index 11e2064..9794ba3 100644 +--- a/lib/include/uhdlib/usrp/common/mpmd_mb_controller.hpp ++++ b/lib/include/uhdlib/usrp/common/mpmd_mb_controller.hpp +@@ -16,6 +16,7 @@ + #include <uhdlib/utils/rpc.hpp> + #include <map> + #include <memory> ++#include <cstdint> + + namespace uhd { namespace rfnoc { + +diff --git a/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp b/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp +index fd23fb8..32026ff 100644 +--- a/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp ++++ b/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp +@@ -15,6 +15,7 @@ + #include <map> + #include <string> + #include <vector> ++#include <cstdint> + + namespace uhd { namespace usrp { namespace fbx { + diff --git a/net-wireless/uhd/uhd-4.8.0.0.ebuild b/net-wireless/uhd/uhd-4.8.0.0-r1.ebuild index 6300fef45fe1..fad6c47a4fe6 100644 --- a/net-wireless/uhd/uhd-4.8.0.0.ebuild +++ b/net-wireless/uhd/uhd-4.8.0.0-r1.ebuild @@ -21,7 +21,6 @@ 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 ) @@ -52,6 +51,8 @@ BDEPEND=" " PATCHES=( + "${FILESDIR}"/"${P}"-includes.patch + "${FILESDIR}"/"${P}"-cmake4.patch ) src_unpack() { diff --git a/net-wireless/wireless-regdb/Manifest b/net-wireless/wireless-regdb/Manifest index 3503aebc8b42..b6034d598628 100644 --- a/net-wireless/wireless-regdb/Manifest +++ b/net-wireless/wireless-regdb/Manifest @@ -1,3 +1,5 @@ DIST wireless-regdb-2024.05.08.tar.xz 27716 BLAKE2B 223268c6ba9e3f616b28a9317d62ac687cd09c9ff3cc8e0d0827b3a59efa7b3bc64c0c094b70aaceb87cffba7d36d36d550c001d0778238adcf2ac5cbe3f6b93 SHA512 edb562d708be7119e80bb48d7520c11e409b81178168f9c6873ea97a2e4d9277d02d3b72b1af9f0302ba2e252d94d14c4468ee4cc1a6bb186a17d74c57d7594d +DIST wireless-regdb-2025.02.20.tar.xz 30900 BLAKE2B ae089e9bfb92c0643f537aed8aab7907a0179aedc0a0356f9ec483063d677d999839cffa8e6574e50d7fff82f5824466d4a23ca780bbe386c4c4be6b975a2bd6 SHA512 d7ccdd10d7258ef5470f90e0bb9aacd80f55e315e9703e2d765cdc09cdbf72179fe0a7ca1340b6338bc25c8d423401d1666a1243a4a118f03eafdb4b8c4a921b EBUILD wireless-regdb-20240508.ebuild 2254 BLAKE2B 39cd691e9ef1d94ae57997fea02ecb5faf074a68050a5454f2ba747fecc8d9a551e97051bb726e93c66a51b39aac9454d7d7dd814c2a42c18c5ef8688549b828 SHA512 3ae676a6b69d8fe658ce2563cffd72f41c4016ab4015cfa9a2f24e9c0ee57302b7f91cad164b967bbabab643a0a076651281f0b98606c1c89a5481308becdbdc +EBUILD wireless-regdb-20250220.ebuild 2261 BLAKE2B 37a0aa082bde419eccdd463a17ef7021c5c9ee1b6b07c006c542f88f0662081060efbfd7317e7af52692fc82916342dbf3854271df2845c60f0f123421c6d742 SHA512 4668b8c774cdf59ced6c1de0ee78f624c800a57a09fa7960344261b352bd28d1d9c633970ca823eb46a5f1dfc83f94c6e8bb1d444d55ba994b4f065ee00daa21 MISC metadata.xml 272 BLAKE2B 2a42142ca287ab19668cc11278dac4d0f16bf5b183646b0f06317a6e60568d9328d42baa986af6c692a256b28fdef32f24442faf69ae9b8305d625a3265df298 SHA512 4595277c33cd3d565c652cae1644c4ba131dea25899984629a48dc9a679441c95a7d26527c6fe4578a3e6f616e6f8c25580ee9f785fdcbd699bd43bacd846dd3 diff --git a/net-wireless/wireless-regdb/wireless-regdb-20250220.ebuild b/net-wireless/wireless-regdb/wireless-regdb-20250220.ebuild new file mode 100644 index 000000000000..54ee87dc20cc --- /dev/null +++ b/net-wireless/wireless-regdb/wireless-regdb-20250220.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info + +MY_P="wireless-regdb-${PV:0:4}.${PV:4:2}.${PV:6:2}" +DESCRIPTION="Wireless Regulatory database for Linux" +HOMEPAGE="https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb" +SRC_URI="https://mirrors.edge.kernel.org/pub/software/network/${PN}/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}" + +LICENSE="ISC" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +REQUIRED_USE="kernel_linux" + +pkg_pretend() { + if kernel_is -ge 4 15; then + if linux_config_exists; then + if linux_chkconfig_builtin CFG80211 && + [[ $(linux_chkconfig_string EXTRA_FIRMWARE) != *regulatory.db* ]]; then + ewarn "REGULATORY DOMAIN PROBLEM:" + ewarn " With CONFIG_CFG80211=y (built-in), the driver(s) won't be able to load regulatory.db from" + ewarn " /lib/firmware, resulting in broken regulatory domain support. Please set CONFIG_CFG80211=m" + ewarn " or add regulatory.db and regulatory.db.p7s to CONFIG_EXTRA_FIRMWARE." + fi + if ! linux_chkconfig_present CFG80211; then + ewarn "REGULATORY DOMAIN PROBLEM:" + ewarn " With CONFIG_CFG80211 unset, the driver(s) won't be able to load the regulatory.db from" + ewarn " /lib/firmware, resulting in broken regulatory domain support. Please set CONFIG_CFG80211=m." + fi + if linux_chkconfig_present EXPERT && linux_chkconfig_present CFG80211_CRDA_SUPPORT; then + ewarn "You can safely disable CFG80211_CRDA_SUPPORT" + fi + fi + else + CONFIG_CHECK="~CFG80211_CRDA_SUPPORT" + WARNING_CFG80211_CRDA_SUPPORT="REGULATORY DOMAIN PROBLEM: \ +please enable CFG80211_CRDA_SUPPORT for proper regulatory domain support" + fi + + check_extra_config +} + +src_compile() { + einfo "Recompiling regulatory database(s) from db.txt would break signature verification." + einfo "Installing unmodified binary version." +} + +src_install() { + # install the files the kernel needs unconditionally, + # they are small and kernels get upgraded + insinto /lib/firmware + doins regulatory.db regulatory.db.p7s + + # regulatory.db.5 is a reference to regulatory.bin.5 so you need both unconditionally + doman -i18n= regulatory.db.5 regulatory.bin.5 + dodoc README db.txt +} |