gentoo resync : 25.08.2018

4 files changed, 8 insertions, 68 deletions

diff --git a/net-wireless/bladerf-firmware/Manifest b/net-wireless/bladerf-firmware/Manifest
index 8269fc45f336..86bc111c1d61 100644
--- a/net-wireless/bladerf-firmware/Manifest
+++ b/net-wireless/bladerf-firmware/Manifest
@@ -1,9 +1,5 @@
-DIST bladeRF_fw_v1.7.1.img 122408 BLAKE2B 41477eac09fd8f69f716ac4c182c023a4e214392fbc3070a3fdcfd4687df138e5ecd978a70f6d21d304df11fa359b813197e467cf346a546daa9bcb4804050c8 SHA512 9dc1f461bc48a7eb32957fef4818a2e3b50b13da0924385404abb972d653243c0de5717044bcac6eb44dac637ae429311e776a4f5aaa235a80193eb3ec7a0e7e
-DIST bladeRF_fw_v1.8.0.img 122576 BLAKE2B 08850c706ea0a069c58cc1aee12b03716143c51cd77d4da3b67b49468eaac0400b4d924f27d2b5294dd34d6ef146daec99a8848f66962ae803e40e5f15dbb572 SHA512 5cc8e69e550e60af0c9fbead9655c6af19a29afa18c352b0d010727e28b7c8fa015c6294054d19a65caa4a8ed2fb5096fa90f460561e4a7abaabb2b0bb15e366
-DIST bladeRF_fw_v1.9.0.img 118704 BLAKE2B 8ead6156e5e3ede9ad9fbe754faaa7eff6ac59918d3f5818b8a15c5cd77d0661273e7bf3cbd2f1d7306acb42ef6032b5201ba41cd2e5c3fd84da742e0ba7f4d2 SHA512 a1cebd8abdcebfc84eb581808900926033ae7f621e4abfe217c6aae6169bf60dd78f32b1d883eab8b82b5d1f10afbf949821c19421bd6d4ffe2707a5acd58553
 DIST bladeRF_fw_v2.0.0.img 121128 BLAKE2B 9783fba9c24fd87702d83c27962ff5e358d248167cd1ebad22e492b64555c0c57964a08258de47e404b29a1627196ac27a80df81fe37deb55c309c5359dff53d SHA512 716aaaad1d0c14186bd1dcf258b46a102ee720ce7c8dc8bd0998cd72e42c9df7a4372fc27ec0c3860cca50cb62894008326c65937f461a37a908d56f5989eaab
-EBUILD bladerf-firmware-1.7.1.ebuild 605 BLAKE2B 7b7035ff459580afa3f9ebde773c3db10922536b3572711edfa3576c3068e5954853306903f1cada37cb98028b1e0a7014e52002501a2d61eee498662fe0c7a0 SHA512 963cb7c87b417db871af6314ce1a3a8c2445c003d35130ae817b5d4da30251c4dc08453f5805d9631e077ea795887407c591d063aba136e264e2f6be97beddba
-EBUILD bladerf-firmware-1.8.0.ebuild 805 BLAKE2B fbe6adcbb9f2c3f41495acfeba1dde2e9d9523c2a2a41ceeb264224c2d28f7edcfc60bb69256421d12190b03c7b1f1644f904ed1065eb88e544519343bdf009a SHA512 421cd2b8b9dd67e916df1a43027b982db6db092e6ab59cc8935799ceb91f30d3ae89c10daea4c9a5e167d5c56d1a39241db9edcb456ee67f81aaca393e9723eb
-EBUILD bladerf-firmware-1.9.0.ebuild 805 BLAKE2B 5a323f5b8e34506ee239e4995ac469b4f502f66449adbacb55c8db8b7e26a36b9cda189a6b8e096e64dbeef4ada134e85acc86b2064174592d43fa049e72ca82 SHA512 4630c77da13c5d74c710c6941bb312fe56bd6a6c0c6b18c144216d53dc06921e55d0f4714c76e11b19fcd071dc5dee08ebb9d51dad74c731cf024f53d994c203
+DIST bladeRF_fw_v2.2.0.img 122760 BLAKE2B ec7ea8e7abec7feba9efbbc4b1e681fdeae51622013e72e2244368b5b9522861f7f76fcc9f8a7d523281d4be06726e63bf286670530641d55da540424cf11963 SHA512 64c75b8ad8a2be6a311892e7e28b16966f6c962b483547e2b959e28b050e0d6b1ac4fa078c53711555bf41e1c5a56945c58807870941b499501b6274410b05f7
 EBUILD bladerf-firmware-2.0.0.ebuild 805 BLAKE2B 5a323f5b8e34506ee239e4995ac469b4f502f66449adbacb55c8db8b7e26a36b9cda189a6b8e096e64dbeef4ada134e85acc86b2064174592d43fa049e72ca82 SHA512 4630c77da13c5d74c710c6941bb312fe56bd6a6c0c6b18c144216d53dc06921e55d0f4714c76e11b19fcd071dc5dee08ebb9d51dad74c731cf024f53d994c203
+EBUILD bladerf-firmware-2.2.0.ebuild 829 BLAKE2B bc8f35217abd47d51f004c3604079b9b934774bfd155cecf21f9cbcb049b69962f06918d6d3ce4e968317a45ba8b79bedebac908d9598fdefbb90c38cb4affc5 SHA512 f7f68bcc3b436fba5e7ec663eb646e960d45d8d21a7fd4c7326b5d869a9ac85e2862ec8eb5c111076599a6be9117b88f0782d5de7700478feb6e481037492ff2
 MISC metadata.xml 334 BLAKE2B e82616e663e38e847defbdaf2b65d13fd1c73fceb64c32f06d2f2a6dfabc04412c98c608fb7b725461135c7b7a6f57fae8c7bb08602f98cf2dff9dcd8d1f6038 SHA512 afd8a067d88044c1c9111b889f3a729e6fbc228d4875a4b22b8d3c4a9cae1c46c37642bc8fd87c78a450438df644686dfcbb3b0dd63d319bb602b86667a6912b
diff --git a/net-wireless/bladerf-firmware/bladerf-firmware-1.7.1.ebuild b/net-wireless/bladerf-firmware/bladerf-firmware-1.7.1.ebuild
deleted file mode 100644
index 7e2cdcac1050..000000000000
--- a/net-wireless/bladerf-firmware/bladerf-firmware-1.7.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="bladeRF FX3 firmware images"
-HOMEPAGE="http://nuand.com/fx3.php"
-
-#firmware is open source, but uses a proprietary toolchain to build
-#automated builds from git are available, but likely unneeded
-#http://hoopycat.com/bladerf_builds/
-SRC_URI="http://nuand.com/fx3/bladeRF_fw_v${PV}.img"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${DISTDIR}"
-
-src_install() {
-	insinto /usr/share/Nuand/bladeRF/
-	doins bladeRF_fw_v${PV}.img
-}
diff --git a/net-wireless/bladerf-firmware/bladerf-firmware-1.9.0.ebuild b/net-wireless/bladerf-firmware/bladerf-firmware-1.9.0.ebuild
deleted file mode 100644
index bc23d17e8b89..000000000000
--- a/net-wireless/bladerf-firmware/bladerf-firmware-1.9.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="bladeRF FX3 firmware images"
-HOMEPAGE="http://nuand.com/fx3.php"
-
-#firmware is open source, but uses a proprietary toolchain to build
-#automated builds from git are available, but likely unneeded
-#http://hoopycat.com/bladerf_builds/
-SRC_URI="http://nuand.com/fx3/bladeRF_fw_v${PV}.img"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${DISTDIR}"
-
-src_install() {
-	insinto /usr/share/Nuand/bladeRF/
-	doins bladeRF_fw_v${PV}.img
-}
-
-pkg_postinst() {
-	elog "Please remember you have to actually flash this onto"
-	elog "your bladerf with the following command:"
-	elog "bladeRF-cli -f /usr/share/Nuand/bladeRF/bladeRF_fw_v${PV}.img"
-}
diff --git a/net-wireless/bladerf-firmware/bladerf-firmware-1.8.0.ebuild b/net-wireless/bladerf-firmware/bladerf-firmware-2.2.0.ebuild
index 42cf9ce7706a..b10085ff842e 100644
--- a/net-wireless/bladerf-firmware/bladerf-firmware-1.8.0.ebuild
+++ b/net-wireless/bladerf-firmware/bladerf-firmware-2.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 DESCRIPTION="bladeRF FX3 firmware images"
 HOMEPAGE="http://nuand.com/fx3.php"
@@ -21,6 +21,10 @@ RDEPEND="${DEPEND}"
 
 S="${DISTDIR}"
 
+src_unpack() {
+	true
+}
+
 src_install() {
 	insinto /usr/share/Nuand/bladeRF/
 	doins bladeRF_fw_v${PV}.img