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/bladerf/
Date: Wed, 14 Aug 2019 20:37:58
Message-Id: 1565815043.4cc507505d334d5b501f147434114ab853968af1.zerochaos@gentoo
1 commit: 4cc507505d334d5b501f147434114ab853968af1
2 Author: Rick Farina <zerochaos <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 14 20:37:07 2019 +0000
4 Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 14 20:37:23 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cc50750
7
8 net-wireless/bladerf: bump
9
10 Package-Manager: Portage-2.3.71, Repoman-2.3.17
11 Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
12
13 net-wireless/bladerf/Manifest | 3 ++-
14 ...f-2017.12_rc1.ebuild => bladerf-2019.07.ebuild} | 24 +++++++++++++++-------
15 net-wireless/bladerf/bladerf-9999.ebuild | 20 +++++++++++++-----
16 3 files changed, 34 insertions(+), 13 deletions(-)
17
18 diff --git a/net-wireless/bladerf/Manifest b/net-wireless/bladerf/Manifest
19 index ed62d3bc7a5..84731f8d52e 100644
20 --- a/net-wireless/bladerf/Manifest
21 +++ b/net-wireless/bladerf/Manifest
22 @@ -1,2 +1,3 @@
23 -DIST bladerf-2017.12_rc1.tar.gz 1723370 BLAKE2B f6d19765674602354b42bb62acdfd874b04df55bd45ec74077aa310e5f6bd81d298148c3b1f2e1396d8659644f374cadf2e91df4b644a29d70c8369aaa6f4694 SHA512 19a3f24f9b6000af9e9d80cc31cbbf46b11deabb4e12eafb68c01f240cdf43884c5f8640ecbfa32fab8cc6a9c8e3b6cbc8596dfe564869c1a85163f00c62d96f
24 +DIST analogdevices-no-OS-0bba46.tar.gz 44190321 BLAKE2B b5c31b4b9ed92e0ac9f1a4c1eda38e065f00e0ee8034a99615a2509a4c91c589faefaf2e42a8bd30e61eb36459fa264c6e1892577f759c2ca0810925cede163e SHA512 cf6f6d34fed9879ae7263782f20f33dd3af84201e3477fa0501e072eb08a8a545a07c496ad0ff3f7dc1a6ef407f136f843ba05942b4819e146c5fef023a3bb02
25 DIST bladerf-2018.08.tar.gz 2177625 BLAKE2B 8c3970f38f7645ba46c44803fc370e16012b2ea894d16c5101ea9519f5f9ff1aaa0a39819ac13389a33f7e0336e0e89ffcb7a0abf363cb30b091e88502a7a8c3 SHA512 7f8d0ef146da34474774d00503f0838cdf9404bf42bf1f68fd0f6018c7e7d4937da56110d818237f712bd23547cfbed1e2d04455a9d4d7ac0df96336e331c8f4
26 +DIST bladerf-2019.07.tar.gz 2186702 BLAKE2B 1d08dc90ddf5d5f650fdc49e5a7e4224de7caa988974c1252052975599066b2221741a2cd2f0ba496e98d63b6d417b0eb1ae12de4dd9a9d43fb730bb6b221dc2 SHA512 e6ba47106ac9904d41fc611560c8f4bc482b9f17b6c476d4a2ac36c5779e9a64222140f4f067fab2252ccfabebf74e866f0fefb359934ff4df7a8416a8558b87
27
28 diff --git a/net-wireless/bladerf/bladerf-2017.12_rc1.ebuild b/net-wireless/bladerf/bladerf-2019.07.ebuild
29 similarity index 65%
30 rename from net-wireless/bladerf/bladerf-2017.12_rc1.ebuild
31 rename to net-wireless/bladerf/bladerf-2019.07.ebuild
32 index f289a36148f..686a4ee43c8 100644
33 --- a/net-wireless/bladerf/bladerf-2017.12_rc1.ebuild
34 +++ b/net-wireless/bladerf/bladerf-2019.07.ebuild
35 @@ -1,7 +1,7 @@
36 -# Copyright 1999-2018 Gentoo Foundation
37 +# Copyright 1999-2019 Gentoo Authors
38 # Distributed under the terms of the GNU General Public License v2
39
40 -EAPI=5
41 +EAPI=7
42
43 inherit cmake-utils udev
44
45 @@ -28,7 +28,8 @@ if [[ ${PV} == "9999" ]] ; then
46 else
47 MY_PV=${PV/\_/-}
48 S="${WORKDIR}/${MY_PN}-${MY_PV}"
49 - SRC_URI="https://github.com/Nuand/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
50 + SRC_URI="https://github.com/Nuand/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz \
51 + https://github.com/analogdevicesinc/no-OS/archive/0bba46e6f6f75785a65d425ece37d0a04daf6157.tar.gz -> analogdevices-no-OS-0bba46.tar.gz"
52 KEYWORDS="~amd64 ~arm ~x86"
53 fi
54
55 @@ -37,14 +38,23 @@ CDEPEND=">=dev-libs/libusb-1.0.16
56 DEPEND="${CDEPEND}
57 virtual/pkgconfig"
58 RDEPEND="${CDEPEND}"
59 -PDEPEND=">=net-wireless/bladerf-firmware-2.0.0
60 - >=net-wireless/bladerf-fpga-0.6.0"
61 +PDEPEND=">=net-wireless/bladerf-firmware-2.3.2
62 + >=net-wireless/bladerf-fpga-0.11.0"
63 +
64 +src_unpack() {
65 + if [ "${PV}" = "9999" ]; then
66 + git-r3_src_unpack
67 + else
68 + default
69 + mv "${WORKDIR}/no-OS-0bba46e6f6f75785a65d425ece37d0a04daf6157/ad9361" "${S}/thirdparty/analogdevicesinc/no-OS/" || die
70 + fi
71 +}
72
73 src_configure() {
74 mycmakeargs=(
75 -DVERSION_INFO_OVERRIDE:STRING="${PV}"
76 - $(cmake-utils_use_enable doc BUILD_DOCUMENTATION)
77 - $(cmake-utils_use_enable tecla LIBTECLA)
78 + -DBUILD_DOCUMENTATION="$(usex doc)"
79 + -DENABLE_LIBTECLA="$(usex tecla)"
80 -DTREAT_WARNINGS_AS_ERRORS=OFF
81 -DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
82 )
83
84 diff --git a/net-wireless/bladerf/bladerf-9999.ebuild b/net-wireless/bladerf/bladerf-9999.ebuild
85 index f8fd38c19cd..686a4ee43c8 100644
86 --- a/net-wireless/bladerf/bladerf-9999.ebuild
87 +++ b/net-wireless/bladerf/bladerf-9999.ebuild
88 @@ -1,7 +1,7 @@
89 -# Copyright 1999-2018 Gentoo Foundation
90 +# Copyright 1999-2019 Gentoo Authors
91 # Distributed under the terms of the GNU General Public License v2
92
93 -EAPI=6
94 +EAPI=7
95
96 inherit cmake-utils udev
97
98 @@ -28,7 +28,8 @@ if [[ ${PV} == "9999" ]] ; then
99 else
100 MY_PV=${PV/\_/-}
101 S="${WORKDIR}/${MY_PN}-${MY_PV}"
102 - SRC_URI="https://github.com/Nuand/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
103 + SRC_URI="https://github.com/Nuand/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz \
104 + https://github.com/analogdevicesinc/no-OS/archive/0bba46e6f6f75785a65d425ece37d0a04daf6157.tar.gz -> analogdevices-no-OS-0bba46.tar.gz"
105 KEYWORDS="~amd64 ~arm ~x86"
106 fi
107
108 @@ -37,8 +38,17 @@ CDEPEND=">=dev-libs/libusb-1.0.16
109 DEPEND="${CDEPEND}
110 virtual/pkgconfig"
111 RDEPEND="${CDEPEND}"
112 -PDEPEND=">=net-wireless/bladerf-firmware-2.2.0
113 - >=net-wireless/bladerf-fpga-0.7.3"
114 +PDEPEND=">=net-wireless/bladerf-firmware-2.3.2
115 + >=net-wireless/bladerf-fpga-0.11.0"
116 +
117 +src_unpack() {
118 + if [ "${PV}" = "9999" ]; then
119 + git-r3_src_unpack
120 + else
121 + default
122 + mv "${WORKDIR}/no-OS-0bba46e6f6f75785a65d425ece37d0a04daf6157/ad9361" "${S}/thirdparty/analogdevicesinc/no-OS/" || die
123 + fi
124 +}
125
126 src_configure() {
127 mycmakeargs=(