gentoo resync : 28.04.2021

3 files changed, 2 insertions, 52 deletions

diff --git a/net-wireless/hackrf-tools/Manifest b/net-wireless/hackrf-tools/Manifest
index 16a4c01f1e07..f1c5df1183b3 100644
--- a/net-wireless/hackrf-tools/Manifest
+++ b/net-wireless/hackrf-tools/Manifest
@@ -1,7 +1,5 @@
 AUX hackrf_easy_flash-r1 4265 BLAKE2B 19cf7bfc441acac27a9eb1cba149019196134decf44b01d915dc5e2f564b169f00933c8cf36b3ddbc5dac3612620095a7e7f37f2bc46c19b0d1d5a1ede2969fc SHA512 ee11fedf2a9991b09ffd7fe6189149bd6646711011d5eb40f3c7db090e79a5966d86f524378527fd3e6a14d87e3d94a493b88998dbc2276e26bf16bdb5a69210
-DIST hackrf-2018.01.1.tar.xz 15464500 BLAKE2B 3a56305ce17b46660621b8f3e996e35909d7a8e7ab88ef643ed8f4c8d68f346e11dfe5fd2cb37aa23af62f202f28d9a8dc1da0cd8768fdbd6f293c65562f25a4 SHA512 89848fb58a8a29f7fe85bd817d5716117a2c7a5f2c4bb8582ad1ba8186831ca3054ea1314de943d1e923641eb18b6008cd8af79585e58fa50d55d5a7fd1b04e4
 DIST hackrf-2021.03.1.tar.xz 13661964 BLAKE2B 0a00b2d24cc6ac7ca36f66e8f5b3029cfd446a6c5b5427f7d25db6dd191693c1e1c010abd85907813d55c6bd367780c70860b4f7e7f83fb9970d425311893780 SHA512 4a88b877a9f6fee0c8d9496eb265655af4baa678e862ca6147596cd3a1d85dd50315da6531efa54d050847ce5068c4726393b4897d40576888d10a898ad57139
-EBUILD hackrf-tools-2018.01.1-r2.ebuild 1912 BLAKE2B c39a8df9077b3f03d924bc633ebcb6d260e53cda45a51a0c82974ca30804a513ed0ad3659605688747552440e7b03c7e1cd2a8c0db03cd20aefebe3cb4545b46 SHA512 869a05dc5ca5c367eef8fe0809277e8f05d040ef6da3ea0b7e4777629aae3c636743107404839068340ea97133f513cb820425aa93e4c313f6d2c64cbd0ae672
 EBUILD hackrf-tools-2021.03.1.ebuild 1917 BLAKE2B 336736f214b281f7825b2504ca9805fd59a940dd4647189258f98390f62238f4e3089830e470a392c63ec5fb1873b6b1e6328a35d64704d063cb499fd8495516 SHA512 a3e63bc305f9aa841180c10228874d17613493148cbed74a11527adf6372792559f33634cc992ca20be918065fb59dcb863d50b7bf2e770485921f8b9b4bbffe
-EBUILD hackrf-tools-9999.ebuild 1919 BLAKE2B 16777b893a526b5f55a339d714316a0342f5e211292538451fd57264cfefd8750ca3c4a5fb09901ab54445c42382752905797bf583c7283cc046cfe3954a05d2 SHA512 17a4c26dce1b384c9026cea475ae4effd0ba9706c9fd067e01d7bcfa0d2f6e730f06a2598d2df6e50432bb4b0bbf66da6a58b546340b61b1eaa89a1612c3bc55
+EBUILD hackrf-tools-9999.ebuild 1917 BLAKE2B 336736f214b281f7825b2504ca9805fd59a940dd4647189258f98390f62238f4e3089830e470a392c63ec5fb1873b6b1e6328a35d64704d063cb499fd8495516 SHA512 a3e63bc305f9aa841180c10228874d17613493148cbed74a11527adf6372792559f33634cc992ca20be918065fb59dcb863d50b7bf2e770485921f8b9b4bbffe
 MISC metadata.xml 477 BLAKE2B b801f5f0a79afbd3227a4ee2688b9332824f61b8bda623565d2f36408dc792aacc273495d7ada5a37a69092bedc61b7ca28952738a5969bfe3132253423d437d SHA512 ba679c6d4942d6a0f8efb480f820434676e37148bc60b481e9b7b0fe13b6037ee8c450632a85de25ed08e96b6e3308ee7b54b8a5f5130cd43827ad811d59a825
diff --git a/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r2.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r2.ebuild
deleted file mode 100644
index 1704b117cb69..000000000000
--- a/net-wireless/hackrf-tools/hackrf-tools-2018.01.1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="tools for communicating with HackRF SDR platform"
-HOMEPAGE="http://greatscottgadgets.com/hackrf/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
-	inherit git-r3
-	EGIT_CHECKOUT_DIR="${WORKDIR}/hackrf"
-	S="${WORKDIR}/hackrf/host/hackrf-tools"
-else
-	S="${WORKDIR}/hackrf-${PV}/host/hackrf-tools"
-	SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="~net-libs/libhackrf-${PV}:=
-		sci-libs/fftw:3.0="
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cmake_src_install
-	newsbin "${FILESDIR}/hackrf_easy_flash-r1" hackrf_easy_flash
-	if [[ ${PV} != "9999" ]] ; then
-		insinto /usr/share/hackrf
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.bin" hackrf_jawbreaker_usb-${PV}.bin
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.dfu" hackrf_jawbreaker_usb-${PV}.dfu
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.bin" hackrf_one_usb-${PV}.bin
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.dfu" hackrf_one_usb-${PV}.dfu
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_cpld_default.xsvf" hackrf_cpld_default-${PV}.xsvf
-		ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb_rom_to_ram.bin"
-		ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb.bin"
-		ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb_ram.dfu"
-		ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb.dfu"
-		ln -s hackrf_cpld_default-${PV}.xsvf "${ED}/usr/share/hackrf/hackrf_cpld_default.xsvf"
-	else
-		ewarn "The compiled firmware files are only available in the versioned releases, you are on your own for this."
-	fi
-}
diff --git a/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild b/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild
index a54c764d58c3..391540f6c443 100644
--- a/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild
+++ b/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild
@@ -36,7 +36,7 @@ src_install() {
 		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb.dfu" hackrf_jawbreaker_usb-${PV}.dfu
 		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.bin" hackrf_one_usb-${PV}.bin
 		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb.dfu" hackrf_one_usb-${PV}.dfu
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_cpld_default.xsvf" hackrf_cpld_default-${PV}.xsvf
+		newins "${WORKDIR}/hackrf-${PV}/firmware/cpld/sgpio_if/default.xsvf" hackrf_cpld_default-${PV}.xsvf
 		ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb_rom_to_ram.bin"
 		ln -s hackrf_one_usb-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb.bin"
 		ln -s hackrf_one_usb-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb_ram.dfu"