Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Rick Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/
Date: Tue, 08 Feb 2022 03:14:43
Message-Id: 1644289965.32d4feb8912ac20396e86e9115f672f6fa36ba60.zerochaos@gentoo
1 commit: 32d4feb8912ac20396e86e9115f672f6fa36ba60
2 Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 8 03:11:21 2022 +0000
4 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 8 03:12:45 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32d4feb8
7
8 net-wireless/gnuradio: add 3.8.5.0
9
10 Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
11 Closes: https://bugs.gentoo.org/829272
12
13 net-wireless/gnuradio/Manifest | 1 +
14 ...nuradio-9999.ebuild => gnuradio-3.8.5.0.ebuild} | 32 ++++++++++++----------
15 net-wireless/gnuradio/gnuradio-9999.ebuild | 4 +--
16 3 files changed, 20 insertions(+), 17 deletions(-)
17
18 diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
19 index 1ba5c22b436d..7d575ab9a89b 100644
20 --- a/net-wireless/gnuradio/Manifest
21 +++ b/net-wireless/gnuradio/Manifest
22 @@ -1 +1,2 @@
23 DIST gnuradio-3.8.4.0.tar.gz 3395297 BLAKE2B 454724e61306bee4991f8a44c80963080b632f767cbb70e00ee518aa096f150a9bb5c29304b9c30a84ab537b8b19ccd2955806fadb88a6cc4d24a8531e8c0127 SHA512 80d34c6351947f45decf8ba09288d4fc4c411c8d286d2765fad59da421b99c15a4c7b7c25a17c89dacfafd872f13ba8d9a8d84d89a35568e5b088f77fcaaae67
24 +DIST gnuradio-3.8.5.0.tar.gz 3399660 BLAKE2B 19e3eecb40d7cdafe6fe551d3d36c0fcd34bb92ceb316537f4ebdc1c90d3c649daa1383f3642e2f64bba23026ed6638168fa77da0f21db03330b066e3108c880 SHA512 9b367c8afeb278b90e8ddd835e0ba301f07a53da26791e74913c812bde251daaa8f9611f21969938b215c9a110c9e69dfb6ec8b6d0db9c64013707c57596819a
25
26 diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-3.8.5.0.ebuild
27 similarity index 86%
28 copy from net-wireless/gnuradio/gnuradio-9999.ebuild
29 copy to net-wireless/gnuradio/gnuradio-3.8.5.0.ebuild
30 index c7bc68e24c4f..5251885bc66b 100644
31 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild
32 +++ b/net-wireless/gnuradio/gnuradio-3.8.5.0.ebuild
33 @@ -1,11 +1,11 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 +# Copyright 1999-2022 Gentoo Authors
36 # Distributed under the terms of the GNU General Public License v2
37
38 -EAPI=7
39 +EAPI=8
40 PYTHON_COMPAT=( python3_{7,8,9} )
41
42 CMAKE_BUILD_TYPE="None"
43 -inherit cmake python-single-r1 virtualx xdg-utils desktop
44 +inherit cmake python-single-r1 virtualx xdg-utils
45
46 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
47 HOMEPAGE="https://www.gnuradio.org/"
48 @@ -17,11 +17,11 @@ if [[ ${PV} =~ "9999" ]]; then
49 EGIT_BRANCH="maint-3.8"
50 inherit git-r3
51 else
52 - SRC_URI="https://github.com/gnuradio/gnuradio/releases/download/v${PV}/${P}.tar.xz"
53 + SRC_URI="https://github.com/gnuradio/gnuradio/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
54 KEYWORDS="~amd64 ~arm ~x86"
55 fi
56
57 -IUSE="+audio +alsa +analog +digital channels doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq"
58 +IUSE="+audio +alsa +analog +digital channels ctrlport doc dtv examples fec +filter grc jack modtool oss performance-counters portaudio +qt5 sdl test trellis uhd vocoder +utils wavelet zeromq"
59
60 #RESTRICT="!test? ( test )"
61 #Tests are known broken right now
62 @@ -53,6 +53,7 @@ RDEPEND="${PYTHON_DEPS}
63 sci-libs/mpir:=
64 sci-libs/volk:=
65 alsa? ( media-libs/alsa-lib:= )
66 + ctrlport? ( $(python_gen_cond_dep 'dev-python/thrift[${PYTHON_USEDEP}]') )
67 fec? (
68 sci-libs/gsl:=
69 dev-python/scipy
70 @@ -88,7 +89,7 @@ RDEPEND="${PYTHON_DEPS}
71 )
72 vocoder? (
73 media-sound/gsm
74 - >=media-libs/codec2-0.8.1
75 + >=media-libs/codec2-0.8.1:=
76 )
77 wavelet? (
78 sci-libs/gsl:=
79 @@ -101,7 +102,7 @@ RDEPEND="${PYTHON_DEPS}
80 #That's right, it can't build if gnuradio 3.7 is installed
81 #Both due to build failure, and then file collision due to bundled volk
82 DEPEND="${RDEPEND}
83 - !<net-wireless/gnuradio-3.8
84 + !!<net-wireless/gnuradio-3.8
85 app-text/docbook-xml-dtd:4.2
86 >=dev-lang/swig-3.0.5
87 virtual/pkgconfig
88 @@ -137,6 +138,7 @@ src_configure() {
89 -DENABLE_GR_AUDIO=ON
90 -DENABLE_GR_ANALOG="$(usex analog)"
91 -DENABLE_GR_CHANNELS="$(usex channels)"
92 + -DENABLE_GR_CTRLPORT="$(usex ctrlport)"
93 -DENABLE_GR_DIGITAL="$(usex digital)"
94 -DENABLE_DOXYGEN="$(usex doc)"
95 -DENABLE_GR_DTV="$(usex dtv)"
96 @@ -184,18 +186,18 @@ src_install() {
97 rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die
98
99 # Install icons, menu items and mime-types for GRC
100 - if use grc ; then
101 - local fd_path="${S}/grc/scripts/freedesktop"
102 - insinto /usr/share/mime/packages
103 - doins "${fd_path}/${PN}-grc.xml"
104 + #if use grc ; then
105 + # local fd_path="${S}/grc/scripts/freedesktop"
106 + # insinto /usr/share/mime/packages
107 + # doins "${fd_path}/${PN}-grc.xml"
108
109 - domenu "${fd_path}/"*.desktop
110 - doicon "${fd_path}/"*.png
111 - fi
112 + # domenu "${fd_path}/"*.desktop
113 + # doicon "${fd_path}/"*.png
114 + #fi
115
116 python_fix_shebang "${ED}"
117 # Remove incorrectly byte-compiled Python files and replace
118 - find "${ED}"/usr/lib -name "*.py[co]" -exec rm {} \; || die
119 + find "${ED}"/usr/lib* -name "*.py[co]" -exec rm {} \; || die
120 python_optimize
121 }
122
123
124 diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
125 index c7bc68e24c4f..5b2de67aa006 100644
126 --- a/net-wireless/gnuradio/gnuradio-9999.ebuild
127 +++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
128 @@ -1,7 +1,7 @@
129 -# Copyright 1999-2021 Gentoo Authors
130 +# Copyright 1999-2022 Gentoo Authors
131 # Distributed under the terms of the GNU General Public License v2
132
133 -EAPI=7
134 +EAPI=8
135 PYTHON_COMPAT=( python3_{7,8,9} )
136
137 CMAKE_BUILD_TYPE="None"
Report Message
Find on MARC Find on Google Groups