gentoo resync : 01.08.2021

4 files changed, 2 insertions, 93 deletions

diff --git a/net-wireless/bladerf/Manifest b/net-wireless/bladerf/Manifest
index 1603d3483437..fa030d11bc5c 100644
--- a/net-wireless/bladerf/Manifest
+++ b/net-wireless/bladerf/Manifest
@@ -1,8 +1,5 @@
-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
 DIST bladerf-2021.03.tar.gz 2261864 BLAKE2B b4e58e370c1e515162f01a0da3985b5ba3c210a8a045bd531e618a9da8e4e66e74a8ccca9138cf6427b512f9c4423bd4151cc63d70a5e218c2a24980afa73972 SHA512 76ebb6501ad9286c7a52a0540f991f7848e396b4d75104bf7186ffac5e3142aa79914352238c8a9e0b4453910c171218c0e861092f228202d0b236939fecc325
-EBUILD bladerf-2019.07.ebuild 1690 BLAKE2B 6bd198bd82099a861b202226a6de5339e252e458dcc8143c039b9011b60afb37b2c852f4d8767f7fe2494a32aca786e38cfe086a7971b7736269e373cc9d86d4 SHA512 9ceeb249595508d2f9d2278b33218f62a573e5dceab257828ab919d1fb00592a2d35451cfec23168c48f0bf54ae4c9f145918e37ac1375bdc92f21da0bc40a6a
-EBUILD bladerf-2021.03.ebuild 1635 BLAKE2B a094a4b9603bc24bd1214e3e65792982acc535ada7b32bbadf6f2f00f9560437582fc8d3777b08e069aec22536e4db762e8aa1c87943c8b68a5e293b1c8820db SHA512 bd46ac70a1e2b38854919f52ef5f1aa29ca3bbcf1a0e171c138a25e9e5c13dbea7fd14ebab35d12ce2d3238ea7e798d1bcca157a08d2b84840970fd65dea62b7
+EBUILD bladerf-2021.03.ebuild 1633 BLAKE2B 7d83c515d30a5f553753b6a153ae5a87eb4ecb87c4a0634e69550c6f6394d4cfdd27484eae069417b2ca7b6912c5bc9ab94007ecdfc19c6c6de166ab55851d62 SHA512 5be0ae2a713acac895913438bacc02974446ccac5185b2841cbeff35e7cf273efb9029c1ef86120711d277cfbe212aae44ae91d480f8aee8ac4ac735e1c154b4
 EBUILD bladerf-9999.ebuild 1635 BLAKE2B a094a4b9603bc24bd1214e3e65792982acc535ada7b32bbadf6f2f00f9560437582fc8d3777b08e069aec22536e4db762e8aa1c87943c8b68a5e293b1c8820db SHA512 bd46ac70a1e2b38854919f52ef5f1aa29ca3bbcf1a0e171c138a25e9e5c13dbea7fd14ebab35d12ce2d3238ea7e798d1bcca157a08d2b84840970fd65dea62b7
 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
deleted file mode 100644
index f3febfccacb6..000000000000
--- a/net-wireless/bladerf/bladerf-2019.07.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils 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.3.2
-	>=net-wireless/bladerf-fpga-0.11.0"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc10.patch"
-)
-
-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-utils_src_configure
-}
diff --git a/net-wireless/bladerf/bladerf-2021.03.ebuild b/net-wireless/bladerf/bladerf-2021.03.ebuild
index 09bf7b568186..ac1bd5fa0b1e 100644
--- a/net-wireless/bladerf/bladerf-2021.03.ebuild
+++ b/net-wireless/bladerf/bladerf-2021.03.ebuild
@@ -29,7 +29,7 @@ else
 	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"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 CDEPEND=">=dev-libs/libusb-1.0.16
diff --git a/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch b/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch
deleted file mode 100644
index bdd99c5cadcc..000000000000
--- a/net-wireless/bladerf/files/bladerf-2019.07-gcc10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 5cf9fd299a396a5ae5b4402215713fd2a84e607b Mon Sep 17 00:00:00 2001
-From: Robert Ghilduta <robert.ghilduta@nuand.com>
-Date: Mon, 25 May 2020 21:36:50 -0500
-Subject: [PATCH] libbladeRF: define bladerf2_state_to_string as extern in
- header
-
----
- host/libraries/libbladeRF/src/board/bladerf2/common.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/host/libraries/libbladeRF/src/board/bladerf2/common.h b/host/libraries/libbladeRF/src/board/bladerf2/common.h
-index 23187ba6c..efbebc867 100644
---- a/host/libraries/libbladeRF/src/board/bladerf2/common.h
-+++ b/host/libraries/libbladeRF/src/board/bladerf2/common.h
-@@ -207,7 +207,7 @@ extern const float ina219_r_shunt;
- /* Constants */
- /******************************************************************************/
- 
--char const *bladerf2_state_to_string[4];
-+extern char const *bladerf2_state_to_string[4];
- 
- 
- /******************************************************************************/