[gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-osmosdr/ - gentoo-commits

From:	Richard Farina <zerochaos@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-osmosdr/
Date:	Mon, 19 Feb 2018 17:29:41
Message-Id:	`1519061365.f929c88a71e18663f11ffbf87216016dae32b526.zerochaos@gentoo`

1

commit:     f929c88a71e18663f11ffbf87216016dae32b526

2

Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>

3

AuthorDate: Mon Feb 19 16:52:08 2018 +0000

4

Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>

5

CommitDate: Mon Feb 19 17:29:25 2018 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f929c88a

7

8

net-wireless/gr-osmosdr: add soapy backend

9

10

bump, minor updates

11

12

Package-Manager: Portage-2.3.24, Repoman-2.3.6

13

14

 net-wireless/gr-osmosdr/Manifest                   |  2 +-

15

 .../gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild   |  3 +-

16

 ....4.ebuild => gr-osmosdr-0.1.4_p20170612.ebuild} | 40 ++++++++++++----------

17

 net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild     | 34 +++++++++---------

18

 net-wireless/gr-osmosdr/metadata.xml               |  1 +

19

 5 files changed, 42 insertions(+), 38 deletions(-)

20

21

diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest

22

index 81784e2b4ec..8ca6ce87462 100644

23

--- a/net-wireless/gr-osmosdr/Manifest

24

+++ b/net-wireless/gr-osmosdr/Manifest

25

@@ -1,2 +1,2 @@

26

-DIST gr-osmosdr-0.1.4.tar.xz 141500 BLAKE2B 1e65d59440cd4beadcb54e6c20cb38b2ad222811348475ac9a7109971b64bbdc11991f6b4e7f0de1fba79f6eddba9befedf9a0a3903211cbae7581f99a13bd40 SHA512 930a7f6065fba709fb770fd373f0fe7eba13abf09e49f6e839718d547ce69176d93d89d1b037ee3f0cdffda7060ac6c9ff4023dc835ec50ef456d51d383046ab

27

 DIST gr-osmosdr-0.1.4_p20150730.tar.xz 1148596 BLAKE2B ff5f27dc32438c94ac920e77e7722b3a4331c350b0535a8a787b72ad8653f57dc2a434c3dec9499bbe791e12dc863323c8f9f6c750b2c154ab35ed722e8e221f SHA512 7e6847eba0d4e217ea71bb4b8105290b329bf8840a7193df013b3a0cd9c9ef57f3686252da48cb0df239288b5794c75178a8bb45ff2a2dd8b605f63fec2426d9

28

+DIST gr-osmosdr-0.1.4_p20170612.tar.xz 174416 BLAKE2B d0ef0d4348b561da10f3e8b99fb43f93fbee5c19a1a4fdcc465f2a63425a42ad0f8d64f522e4aafd5182e66c3c96b42f603e9b595e61b0be15b45eae5330fe5e SHA512 9cf3d0453696c7cfe0679136335a71ec5fd18c4b09cbe3e75fca90626065bf6640969bf224219fe796739abbc3b627eb8bf3509b52f764c38b57f169005ea933

29

30

diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild

31

index 417f9cbdcf4..b6d21d3f25c 100644

32

--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild

33

+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild

34

@@ -1,4 +1,4 @@

35

-# Copyright 1999-2015 Gentoo Foundation

36

+# Copyright 1999-2018 Gentoo Foundation

37

 # Distributed under the terms of the GNU General Public License v2

38

39

 EAPI=5

40

@@ -29,6 +29,7 @@ IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd"

41

 RDEPEND="${PYTHON_DEPS}

42

 	dev-libs/boost:=

43

 	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]

44

+	<net-wireless/gnuradio-9999

45

 	bladerf? ( net-wireless/bladerf:= )

46

 	hackrf? ( net-libs/libhackrf:= )

47

 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )

48

49

diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild

50

similarity index 62%

51

rename from net-wireless/gr-osmosdr/gr-osmosdr-0.1.4.ebuild

52

rename to net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild

53

index 3290d91a6d3..87fd96eee08 100644

54

--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4.ebuild

55

+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild

56

@@ -1,7 +1,7 @@

57

-# Copyright 1999-2014 Gentoo Foundation

58

+# Copyright 1999-2018 Gentoo Foundation

59

 # Distributed under the terms of the GNU General Public License v2

60

61

-EAPI=5

62

+EAPI=6

63

 PYTHON_COMPAT=( python2_7 )

64

65

 inherit cmake-utils python-single-r1

66

@@ -15,49 +15,49 @@ if [[ ${PV} == 9999* ]]; then

67

 	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"

68

 	KEYWORDS=""

69

 else

70

+	#SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"

71

 	#git clone git://git.osmocom.org/gr-osmosdr.git

72

 	#cd gr-osmosdr

73

 	#git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} | xz > ../gr-osmosdr-${PV}.tar.xz

74

-	SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"

75

-	KEYWORDS="~amd64 ~arm ~x86"

76

+	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz"

77

+	KEYWORDS="~amd64 ~x86"

78

fi

79

80

 LICENSE="GPL-3"

81

 SLOT="0/${PV}"

82

-IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd"

83

+IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd"

84

85

 RDEPEND="${PYTHON_DEPS}

86

 	dev-libs/boost:=

87

 	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]

88

+	<net-wireless/gnuradio-9999

89

 	bladerf? ( net-wireless/bladerf:= )

90

 	hackrf? ( net-libs/libhackrf:= )

91

 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )

92

 	mirisdr? ( net-libs/libmirisdr:= )

93

 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )

94

+	soapy? ( net-wireless/soapysdr )

95

 	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"

96

 DEPEND="${RDEPEND}

97

 	dev-python/cheetah"

98

99

 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

100

101

-src_prepare() {

102

-	epatch_user

103

-}

104

-

105

 src_configure() {

106

 	local mycmakeargs=(

107

 		-DENABLE_DEFAULT=OFF

108

 		-DPYTHON_EXECUTABLE="${PYTHON}"

109

 		-DENABLE_FILE=ON

110

-		$(cmake-utils_use_enable bladerf)

111

-		$(cmake-utils_use_enable fcd)

112

-		$(cmake-utils_use_enable hackrf)

113

-		$(cmake-utils_use_enable iqbalance)

114

-		$(cmake-utils_use_enable mirisdr MIRI)

115

-		$(cmake-utils_use_enable python)

116

-		$(cmake-utils_use_enable rtlsdr RTL)

117

-		$(cmake-utils_use_enable rtlsdr RTL_TCP)

118

-		$(cmake-utils_use_enable uhd)

119

+		-DENABLE_BLADERF="$(usex bladerf)"

120

+		-DENABLE_FCD="$(usex fcd)"

121

+		-DENABLE_HACKRF="$(usex hackrf)"

122

+		-DENABLE_IQBALANCE="$(usex iqbalance)"

123

+		-DENABLE_MIRI="$(usex mirisdr)"

124

+		-DENABLE_PYTHON="$(usex python)"

125

+		-DENABLE_RTL="$(usex rtlsdr)"

126

+		-DENABLE_RTL_TCP="$(usex rtlsdr)"

127

+		-DENABLE_SOAPY="$(usex soapy)"

128

+		-DENABLE_UHD="$(usex uhd)"

129

)

130

131

 	cmake-utils_src_configure

132

@@ -65,5 +65,7 @@ src_configure() {

133

134

 src_install() {

135

 	cmake-utils_src_install

136

-	python_fix_shebang "${ED}"/usr/bin

137

+	if use python; then

138

+		python_fix_shebang "${ED}"/usr/bin

139

+	fi

140

}

141

142

diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild

143

index 8c05c70733f..86677af90ca 100644

144

--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild

145

+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild

146

@@ -1,7 +1,7 @@

147

-# Copyright 1999-2015 Gentoo Foundation

148

+# Copyright 1999-2018 Gentoo Foundation

149

 # Distributed under the terms of the GNU General Public License v2

150

151

-EAPI=5

152

+EAPI=6

153

 PYTHON_COMPAT=( python2_7 )

154

155

 inherit cmake-utils python-single-r1

156

@@ -15,49 +15,49 @@ if [[ ${PV} == 9999* ]]; then

157

 	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"

158

 	KEYWORDS=""

159

 else

160

+	#SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"

161

 	#git clone git://git.osmocom.org/gr-osmosdr.git

162

 	#cd gr-osmosdr

163

 	#git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} | xz > ../gr-osmosdr-${PV}.tar.xz

164

-	SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"

165

+	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz"

166

 	KEYWORDS="~amd64 ~arm ~x86"

167

fi

168

169

 LICENSE="GPL-3"

170

 SLOT="0/${PV}"

171

-IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd"

172

+IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd"

173

174

 RDEPEND="${PYTHON_DEPS}

175

 	dev-libs/boost:=

176

 	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]

177

+	<net-wireless/gnuradio-9999

178

 	bladerf? ( net-wireless/bladerf:= )

179

 	hackrf? ( net-libs/libhackrf:= )

180

 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )

181

 	mirisdr? ( net-libs/libmirisdr:= )

182

 	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )

183

+	soapy? ( net-wireless/soapysdr )

184

 	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"

185

 DEPEND="${RDEPEND}

186

 	dev-python/cheetah"

187

188

 REQUIRED_USE="${PYTHON_REQUIRED_USE}"

189

190

-src_prepare() {

191

-	epatch_user

192

-}

193

-

194

 src_configure() {

195

 	local mycmakeargs=(

196

 		-DENABLE_DEFAULT=OFF

197

 		-DPYTHON_EXECUTABLE="${PYTHON}"

198

 		-DENABLE_FILE=ON

199

-		$(cmake-utils_use_enable bladerf)

200

-		$(cmake-utils_use_enable fcd)

201

-		$(cmake-utils_use_enable hackrf)

202

-		$(cmake-utils_use_enable iqbalance)

203

-		$(cmake-utils_use_enable mirisdr MIRI)

204

-		$(cmake-utils_use_enable python)

205

-		$(cmake-utils_use_enable rtlsdr RTL)

206

-		$(cmake-utils_use_enable rtlsdr RTL_TCP)

207

-		$(cmake-utils_use_enable uhd)

208

+		-DENABLE_BLADERF="$(usex bladerf)"

209

+		-DENABLE_FCD="$(usex fcd)"

210

+		-DENABLE_HACKRF="$(usex hackrf)"

211

+		-DENABLE_IQBALANCE="$(usex iqbalance)"

212

+		-DENABLE_MIRI="$(usex mirisdr)"

213

+		-DENABLE_PYTHON="$(usex python)"

214

+		-DENABLE_RTL="$(usex rtlsdr)"

215

+		-DENABLE_RTL_TCP="$(usex rtlsdr)"

216

+		-DENABLE_SOAPY="$(usex soapy)"

217

+		-DENABLE_UHD="$(usex uhd)"

218

)

219

220

 	cmake-utils_src_configure

221

222

diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml

223

index e8e448711ac..9dc2a893a65 100644

224

--- a/net-wireless/gr-osmosdr/metadata.xml

225

+++ b/net-wireless/gr-osmosdr/metadata.xml

226

@@ -12,6 +12,7 @@

227

 	<flag name="iqbalance">Enable support for I/Q balancing using gr-iqbal</flag>

228

 	<flag name="mirisdr">Build with Mirics MSi2500 + MSi001 SDR support</flag>

229

 	<flag name="rtlsdr">Build with Realtek RTL2832U (rtlsdr) support</flag>

230

+	<flag name="soapy">Build with SoapySDR support</flag>

231

 	<flag name="uhd">Build with Ettus Research USRP Hardware Driver support</flag>

232

 </use>

233

 </pkgmetadata>

1	commit: f929c88a71e18663f11ffbf87216016dae32b526
2	Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
3	AuthorDate: Mon Feb 19 16:52:08 2018 +0000
4	Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
5	CommitDate: Mon Feb 19 17:29:25 2018 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f929c88a
7
8	net-wireless/gr-osmosdr: add soapy backend
9
10	bump, minor updates
11
12	Package-Manager: Portage-2.3.24, Repoman-2.3.6
13
14	net-wireless/gr-osmosdr/Manifest \| 2 +-
15	.../gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild \| 3 +-
16	....4.ebuild => gr-osmosdr-0.1.4_p20170612.ebuild} \| 40 ++++++++++++----------
17	net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild \| 34 +++++++++---------
18	net-wireless/gr-osmosdr/metadata.xml \| 1 +
19	5 files changed, 42 insertions(+), 38 deletions(-)
20
21	diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
22	index 81784e2b4ec..8ca6ce87462 100644
23	--- a/net-wireless/gr-osmosdr/Manifest
24	+++ b/net-wireless/gr-osmosdr/Manifest
25	@@ -1,2 +1,2 @@
26	-DIST gr-osmosdr-0.1.4.tar.xz 141500 BLAKE2B 1e65d59440cd4beadcb54e6c20cb38b2ad222811348475ac9a7109971b64bbdc11991f6b4e7f0de1fba79f6eddba9befedf9a0a3903211cbae7581f99a13bd40 SHA512 930a7f6065fba709fb770fd373f0fe7eba13abf09e49f6e839718d547ce69176d93d89d1b037ee3f0cdffda7060ac6c9ff4023dc835ec50ef456d51d383046ab
27	DIST gr-osmosdr-0.1.4_p20150730.tar.xz 1148596 BLAKE2B ff5f27dc32438c94ac920e77e7722b3a4331c350b0535a8a787b72ad8653f57dc2a434c3dec9499bbe791e12dc863323c8f9f6c750b2c154ab35ed722e8e221f SHA512 7e6847eba0d4e217ea71bb4b8105290b329bf8840a7193df013b3a0cd9c9ef57f3686252da48cb0df239288b5794c75178a8bb45ff2a2dd8b605f63fec2426d9
28	+DIST gr-osmosdr-0.1.4_p20170612.tar.xz 174416 BLAKE2B d0ef0d4348b561da10f3e8b99fb43f93fbee5c19a1a4fdcc465f2a63425a42ad0f8d64f522e4aafd5182e66c3c96b42f603e9b595e61b0be15b45eae5330fe5e SHA512 9cf3d0453696c7cfe0679136335a71ec5fd18c4b09cbe3e75fca90626065bf6640969bf224219fe796739abbc3b627eb8bf3509b52f764c38b57f169005ea933
29
30	diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild
31	index 417f9cbdcf4..b6d21d3f25c 100644
32	--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild
33	+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild
34	@@ -1,4 +1,4 @@
35	-# Copyright 1999-2015 Gentoo Foundation
36	+# Copyright 1999-2018 Gentoo Foundation
37	# Distributed under the terms of the GNU General Public License v2
38
39	EAPI=5
40	@@ -29,6 +29,7 @@ IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd"
41	RDEPEND="${PYTHON_DEPS}
42	dev-libs/boost:=
43	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
44	+ <net-wireless/gnuradio-9999
45	bladerf? ( net-wireless/bladerf:= )
46	hackrf? ( net-libs/libhackrf:= )
47	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
48
49	diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild
50	similarity index 62%
51	rename from net-wireless/gr-osmosdr/gr-osmosdr-0.1.4.ebuild
52	rename to net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild
53	index 3290d91a6d3..87fd96eee08 100644
54	--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4.ebuild
55	+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild
56	@@ -1,7 +1,7 @@
57	-# Copyright 1999-2014 Gentoo Foundation
58	+# Copyright 1999-2018 Gentoo Foundation
59	# Distributed under the terms of the GNU General Public License v2
60
61	-EAPI=5
62	+EAPI=6
63	PYTHON_COMPAT=( python2_7 )
64
65	inherit cmake-utils python-single-r1
66	@@ -15,49 +15,49 @@ if [[ ${PV} == 9999* ]]; then
67	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
68	KEYWORDS=""
69	else
70	+ #SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"
71	#git clone git://git.osmocom.org/gr-osmosdr.git
72	#cd gr-osmosdr
73	#git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} \| xz > ../gr-osmosdr-${PV}.tar.xz
74	- SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"
75	- KEYWORDS="~amd64 ~arm ~x86"
76	+ SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz"
77	+ KEYWORDS="~amd64 ~x86"
78	fi
79
80	LICENSE="GPL-3"
81	SLOT="0/${PV}"
82	-IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd"
83	+IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd"
84
85	RDEPEND="${PYTHON_DEPS}
86	dev-libs/boost:=
87	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
88	+ <net-wireless/gnuradio-9999
89	bladerf? ( net-wireless/bladerf:= )
90	hackrf? ( net-libs/libhackrf:= )
91	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
92	mirisdr? ( net-libs/libmirisdr:= )
93	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
94	+ soapy? ( net-wireless/soapysdr )
95	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
96	DEPEND="${RDEPEND}
97	dev-python/cheetah"
98
99	REQUIRED_USE="${PYTHON_REQUIRED_USE}"
100
101	-src_prepare() {
102	- epatch_user
103	-}
104	-
105	src_configure() {
106	local mycmakeargs=(
107	-DENABLE_DEFAULT=OFF
108	-DPYTHON_EXECUTABLE="${PYTHON}"
109	-DENABLE_FILE=ON
110	- $(cmake-utils_use_enable bladerf)
111	- $(cmake-utils_use_enable fcd)
112	- $(cmake-utils_use_enable hackrf)
113	- $(cmake-utils_use_enable iqbalance)
114	- $(cmake-utils_use_enable mirisdr MIRI)
115	- $(cmake-utils_use_enable python)
116	- $(cmake-utils_use_enable rtlsdr RTL)
117	- $(cmake-utils_use_enable rtlsdr RTL_TCP)
118	- $(cmake-utils_use_enable uhd)
119	+ -DENABLE_BLADERF="$(usex bladerf)"
120	+ -DENABLE_FCD="$(usex fcd)"
121	+ -DENABLE_HACKRF="$(usex hackrf)"
122	+ -DENABLE_IQBALANCE="$(usex iqbalance)"
123	+ -DENABLE_MIRI="$(usex mirisdr)"
124	+ -DENABLE_PYTHON="$(usex python)"
125	+ -DENABLE_RTL="$(usex rtlsdr)"
126	+ -DENABLE_RTL_TCP="$(usex rtlsdr)"
127	+ -DENABLE_SOAPY="$(usex soapy)"
128	+ -DENABLE_UHD="$(usex uhd)"
129	)
130
131	cmake-utils_src_configure
132	@@ -65,5 +65,7 @@ src_configure() {
133
134	src_install() {
135	cmake-utils_src_install
136	- python_fix_shebang "${ED}"/usr/bin
137	+ if use python; then
138	+ python_fix_shebang "${ED}"/usr/bin
139	+ fi
140	}
141
142	diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
143	index 8c05c70733f..86677af90ca 100644
144	--- a/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
145	+++ b/net-wireless/gr-osmosdr/gr-osmosdr-9999.ebuild
146	@@ -1,7 +1,7 @@
147	-# Copyright 1999-2015 Gentoo Foundation
148	+# Copyright 1999-2018 Gentoo Foundation
149	# Distributed under the terms of the GNU General Public License v2
150
151	-EAPI=5
152	+EAPI=6
153	PYTHON_COMPAT=( python2_7 )
154
155	inherit cmake-utils python-single-r1
156	@@ -15,49 +15,49 @@ if [[ ${PV} == 9999* ]]; then
157	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
158	KEYWORDS=""
159	else
160	+ #SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"
161	#git clone git://git.osmocom.org/gr-osmosdr.git
162	#cd gr-osmosdr
163	#git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} \| xz > ../gr-osmosdr-${PV}.tar.xz
164	- SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"
165	+ SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz"
166	KEYWORDS="~amd64 ~arm ~x86"
167	fi
168
169	LICENSE="GPL-3"
170	SLOT="0/${PV}"
171	-IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr uhd"
172	+IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd"
173
174	RDEPEND="${PYTHON_DEPS}
175	dev-libs/boost:=
176	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
177	+ <net-wireless/gnuradio-9999
178	bladerf? ( net-wireless/bladerf:= )
179	hackrf? ( net-libs/libhackrf:= )
180	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
181	mirisdr? ( net-libs/libmirisdr:= )
182	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
183	+ soapy? ( net-wireless/soapysdr )
184	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
185	DEPEND="${RDEPEND}
186	dev-python/cheetah"
187
188	REQUIRED_USE="${PYTHON_REQUIRED_USE}"
189
190	-src_prepare() {
191	- epatch_user
192	-}
193	-
194	src_configure() {
195	local mycmakeargs=(
196	-DENABLE_DEFAULT=OFF
197	-DPYTHON_EXECUTABLE="${PYTHON}"
198	-DENABLE_FILE=ON
199	- $(cmake-utils_use_enable bladerf)
200	- $(cmake-utils_use_enable fcd)
201	- $(cmake-utils_use_enable hackrf)
202	- $(cmake-utils_use_enable iqbalance)
203	- $(cmake-utils_use_enable mirisdr MIRI)
204	- $(cmake-utils_use_enable python)
205	- $(cmake-utils_use_enable rtlsdr RTL)
206	- $(cmake-utils_use_enable rtlsdr RTL_TCP)
207	- $(cmake-utils_use_enable uhd)
208	+ -DENABLE_BLADERF="$(usex bladerf)"
209	+ -DENABLE_FCD="$(usex fcd)"
210	+ -DENABLE_HACKRF="$(usex hackrf)"
211	+ -DENABLE_IQBALANCE="$(usex iqbalance)"
212	+ -DENABLE_MIRI="$(usex mirisdr)"
213	+ -DENABLE_PYTHON="$(usex python)"
214	+ -DENABLE_RTL="$(usex rtlsdr)"
215	+ -DENABLE_RTL_TCP="$(usex rtlsdr)"
216	+ -DENABLE_SOAPY="$(usex soapy)"
217	+ -DENABLE_UHD="$(usex uhd)"
218	)
219
220	cmake-utils_src_configure
221
222	diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
223	index e8e448711ac..9dc2a893a65 100644
224	--- a/net-wireless/gr-osmosdr/metadata.xml
225	+++ b/net-wireless/gr-osmosdr/metadata.xml
226	@@ -12,6 +12,7 @@
227	<flag name="iqbalance">Enable support for I/Q balancing using gr-iqbal</flag>
228	<flag name="mirisdr">Build with Mirics MSi2500 + MSi001 SDR support</flag>
229	<flag name="rtlsdr">Build with Realtek RTL2832U (rtlsdr) support</flag>
230	+ <flag name="soapy">Build with SoapySDR support</flag>
231	<flag name="uhd">Build with Ettus Research USRP Hardware Driver support</flag>
232	</use>
233	</pkgmetadata>

Gentoo Archives: gentoo-commits