gentoo (valentine's day) resync : 14.02.2021

4 files changed, 68 insertions, 7 deletions

diff --git a/net-wireless/bladerf/Manifest b/net-wireless/bladerf/Manifest
index 4ea1e278d6c9..c5ffe715d936 100644
--- a/net-wireless/bladerf/Manifest
+++ b/net-wireless/bladerf/Manifest
@@ -1,6 +1,8 @@
 AUX bladerf-2019.07-gcc10.patch 966 BLAKE2B fe17328ea2c01e3345aab309414384395ac9bff0583bd324c995515a372ea84cb93d42e198a37ac650dcd4d219f8621f58740f15ecf8dbe08624891c228ee422 SHA512 287e0abdd5ba393b3d9376fb3f275bc2a0fe215e2918eef4365b580b0678683b81cabd80cfb1e4f42332b063b3800a6218254f6006b3d747ac6cd5e42686480e
 DIST analogdevices-no-OS-0bba46.tar.gz 44190321 BLAKE2B b5c31b4b9ed92e0ac9f1a4c1eda38e065f00e0ee8034a99615a2509a4c91c589faefaf2e42a8bd30e61eb36459fa264c6e1892577f759c2ca0810925cede163e SHA512 cf6f6d34fed9879ae7263782f20f33dd3af84201e3477fa0501e072eb08a8a545a07c496ad0ff3f7dc1a6ef407f136f843ba05942b4819e146c5fef023a3bb02
 DIST bladerf-2019.07.tar.gz 2186702 BLAKE2B 1d08dc90ddf5d5f650fdc49e5a7e4224de7caa988974c1252052975599066b2221741a2cd2f0ba496e98d63b6d417b0eb1ae12de4dd9a9d43fb730bb6b221dc2 SHA512 e6ba47106ac9904d41fc611560c8f4bc482b9f17b6c476d4a2ac36c5779e9a64222140f4f067fab2252ccfabebf74e866f0fefb359934ff4df7a8416a8558b87
-EBUILD bladerf-2019.07.ebuild 1712 BLAKE2B b2ef0e6fee8dd047ff30a0278ced5fd3893a3dd2bf725c392f152786e9e2f1dd4684ff1e361381c29be7fb603ce1d6c8ebb30dec23e1c27a2ef0a5acd287b330 SHA512 9e3b58f49d6e5781b80bbc3834fa0754da971523a8a22f37f3e3ac393142250a0a5c7ecce2edca60876f3507c77cc9e8e79d53593a0aa5fc610fb38d4a7af7de
-EBUILD bladerf-9999.ebuild 1660 BLAKE2B 65019f05d47d4c7d8003eecd4bd80a2360dbefb379c09643058c2a464175fe970a47a0f87557a851d06715e291f058e26e08dbfb6b3ceebafc1476d776790f05 SHA512 fd802f70997e4418c803edcb31ba4683c5ef6bcebf49323d3d07e970cb90658dde781811e2a8f543dc3abe749d12ba0d216a5f04f07593bd967d16bfec095f98
+DIST bladerf-2021.02.tar.gz 2261850 BLAKE2B 1450d6b865779af6a1ca2a88e6bda0d7292c98e5e194bdb73817d3339575815ed8b0c721515062b2798094affd1141341a1d738d9c7cb8bdb5d38b3641a42511 SHA512 7c0dc93bf0b299651691211ca207a245dd103001261e897058da4807ba14b6f44d6a35100db582d9648187c3e00de9ce282306d6fc6b347cdf874c61792a9926
+EBUILD bladerf-2019.07.ebuild 1690 BLAKE2B 6bd198bd82099a861b202226a6de5339e252e458dcc8143c039b9011b60afb37b2c852f4d8767f7fe2494a32aca786e38cfe086a7971b7736269e373cc9d86d4 SHA512 9ceeb249595508d2f9d2278b33218f62a573e5dceab257828ab919d1fb00592a2d35451cfec23168c48f0bf54ae4c9f145918e37ac1375bdc92f21da0bc40a6a
+EBUILD bladerf-2021.02.ebuild 1635 BLAKE2B a094a4b9603bc24bd1214e3e65792982acc535ada7b32bbadf6f2f00f9560437582fc8d3777b08e069aec22536e4db762e8aa1c87943c8b68a5e293b1c8820db SHA512 bd46ac70a1e2b38854919f52ef5f1aa29ca3bbcf1a0e171c138a25e9e5c13dbea7fd14ebab35d12ce2d3238ea7e798d1bcca157a08d2b84840970fd65dea62b7
+EBUILD bladerf-9999.ebuild 1635 BLAKE2B 4395fd25ded370e0949a0b89c39f253b4d91d6465e4651e3f140e22dde8b516a6f089008ee7173f6336d136909ecf5ace01ea4c6e829dd445c8a053c2e7a021b SHA512 054ed6d0d5eaca69b520bc7c748d4bb7e80b0a5e9d9b59aadd7400e951d65011eb3a44e33a1dec49402f2105a7a34912d23a2c53956442831b643af0a0dd8051
 MISC metadata.xml 534 BLAKE2B d39c41a686202aff5a46e2b67cdcb5f3dc339bd7854a313f8d58165995b030194638447c2c987d1c5372a241c030b7d715a9854d9daaec1a0a59b85c6f421c1c SHA512 b7d10693f1c08b1a60bf6f4542e7fad445a63249d3fa796b08b3c7db7d758c89000c09a6aeb0dffbe6a90467acc5ee18331d839162a540a2c7040d5dd7218db7
diff --git a/net-wireless/bladerf/bladerf-2019.07.ebuild b/net-wireless/bladerf/bladerf-2019.07.ebuild
index 675b62ecbef4..f3febfccacb6 100644
--- a/net-wireless/bladerf/bladerf-2019.07.ebuild
+++ b/net-wireless/bladerf/bladerf-2019.07.ebuild
@@ -24,7 +24,6 @@ MY_PN="bladeRF"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Nuand/${MY_PN}.git"
-	KEYWORDS="amd64 x86"
 else
 	MY_PV=${PV/\_/-}
 	S="${WORKDIR}/${MY_PN}-${MY_PV}"
diff --git a/net-wireless/bladerf/bladerf-2021.02.ebuild b/net-wireless/bladerf/bladerf-2021.02.ebuild
new file mode 100644
index 000000000000..09bf7b568186
--- /dev/null
+++ b/net-wireless/bladerf/bladerf-2021.02.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake udev
+
+DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand"
+HOMEPAGE="https://nuand.com/"
+
+#lib is LGPL and cli tools are GPL
+LICENSE="GPL-2+ LGPL-2.1+"
+
+SLOT="0/${PV}"
+
+#maintainer notes:
+#doc use flag, looks like it can't be disabled right now and will
+#	always build if pandoc and help2man are installed
+#	also ignores when deps are missing and just disables docs
+IUSE="doc +tecla"
+
+MY_PN="bladeRF"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Nuand/${MY_PN}.git"
+else
+	MY_PV=${PV/\_/-}
+	S="${WORKDIR}/${MY_PN}-${MY_PV}"
+	SRC_URI="https://github.com/Nuand/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz \
+			https://github.com/analogdevicesinc/no-OS/archive/0bba46e6f6f75785a65d425ece37d0a04daf6157.tar.gz -> analogdevices-no-OS-0bba46.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+CDEPEND=">=dev-libs/libusb-1.0.16
+	tecla? ( dev-libs/libtecla )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}"
+PDEPEND=">=net-wireless/bladerf-firmware-2.4.0
+	>=net-wireless/bladerf-fpga-0.12.0"
+
+src_unpack() {
+	if [ "${PV}" = "9999" ]; then
+		git-r3_src_unpack
+	else
+		default
+		mv "${WORKDIR}/no-OS-0bba46e6f6f75785a65d425ece37d0a04daf6157/ad9361" "${S}/thirdparty/analogdevicesinc/no-OS/" || die
+	fi
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DVERSION_INFO_OVERRIDE:STRING="${PV}"
+		-DBUILD_DOCUMENTATION="$(usex doc)"
+		-DENABLE_LIBTECLA="$(usex tecla)"
+		-DTREAT_WARNINGS_AS_ERRORS=OFF
+		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
+	)
+	cmake_src_configure
+}
diff --git a/net-wireless/bladerf/bladerf-9999.ebuild b/net-wireless/bladerf/bladerf-9999.ebuild
index e192ce20c313..aa9b028963b0 100644
--- a/net-wireless/bladerf/bladerf-9999.ebuild
+++ b/net-wireless/bladerf/bladerf-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils udev
+inherit cmake udev
 
 DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand"
 HOMEPAGE="https://nuand.com/"
@@ -24,7 +24,6 @@ MY_PN="bladeRF"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Nuand/${MY_PN}.git"
-	KEYWORDS=""
 else
 	MY_PV=${PV/\_/-}
 	S="${WORKDIR}/${MY_PN}-${MY_PV}"
@@ -58,5 +57,5 @@ src_configure() {
 		-DTREAT_WARNINGS_AS_ERRORS=OFF
 		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }