gentoo resync : 24.02.2018

4 files changed, 5 insertions, 113 deletions

diff --git a/net-wireless/bladerf/Manifest b/net-wireless/bladerf/Manifest
index 95d8d4c28744..cdb191fbf5ff 100644
--- a/net-wireless/bladerf/Manifest
+++ b/net-wireless/bladerf/Manifest
@@ -1,10 +1,6 @@
-DIST bladerf-2015.02.tar.gz 1297072 BLAKE2B 7e5b220cbd64c950bd39bf9a549ec15595e237b86587e02f0e32b0d029de6d9254d762f6d898e504dfad1f8095f6950c1d3ed5902adb5446073f6a89a1a7acd5 SHA512 04fa431232562cf589489961a5206022be59687531aeb118aac8b8b58f74862cac7fad5c55676c0cf3b33e19abbf9e2a1339237eade2fd96c5ecdb37b51e9603
-DIST bladerf-2015.07.tar.gz 1418766 BLAKE2B 22e90920111e8fa53f12edfadd5248fb2b5c6ba246c414dabcadfb4db779fdc3ae8e65a1bcefbce130fc3496c64b912237ad18b628f46246a793fdb737c1dd95 SHA512 01589bc9bd6ee2d4120597133c7a69ed91a80c74bc75b70fb4470a9a14328161fcf4ba7112ec91ea12bedb3de7325135ac125b26f09c22dc6e49d9c23247bec8
-DIST bladerf-2016.01_rc1.tar.gz 1605673 BLAKE2B 2f327c3be4150808b2dbe22cc69a0415b0cf86d0d34219216814ae3c1e0735aa6f16e435acfb51a238315d755d532fdce4837bbafab7b864eb07e631de3beecf SHA512 92b3a64688fc7022edde6cddb366a6997d66dd32d26daff5817cae5baeca0f1d641721a5eec1d65eac3d39fa74c207ad996b0c67c901d0759decbac713d3fd0f
 DIST bladerf-2016.06.tar.gz 1654784 BLAKE2B 540f9fbb21c1439e80bda37a9e265dfaf987a9c6cedb29ac8556bbdff4ead899d99d00cc9b5a02f03055945955a5d43f4d94b822085dffecc7e2f63ee0724764 SHA512 0834e9f5fa2e41bf15629d9699f11ef29d5365a0ed2c17b83c6a77ed43d72fa62e6d35060d8d478dcbc1e7080cac825d82644b8fcdc03eae0dccef3cb1a7325d
-EBUILD bladerf-2015.02.ebuild 1332 BLAKE2B 941ecbb2cb6f787163145ccf7ac2efcc1e6a5e0304de1a7c0a48fcc4e419129d5d2f3ac2726a5bf10cf58925a6220f8cf9c2aa551bd7081d84896a6aa344d318 SHA512 62c92e42f749c95c0edbb386966ccf370f50dd255be52f78a6dec8de6dc009bdeb1b716ceca154c76fc3e2920761b686f2eff5b99f33992e3a7a3c9c8c8e285a
-EBUILD bladerf-2015.07.ebuild 1332 BLAKE2B a690966ba0826c793825b81616d926ed07c4ab4047afcd26fec8d3e4febfba913d9e7eb6d2ba85cf961ec2d540f519a1a1deddc10a98189dc1b61fef44724220 SHA512 697a29da3985d88003fee9e451c615b825cd3e7d813997e50c29ad5ab58be6efdd220f4f8a8ea277ae24b7bed42860906d62e5f019feb1fb4b4b138275bd5586
-EBUILD bladerf-2016.01_rc1.ebuild 1332 BLAKE2B 91f492a9f44715decbc791198437b8584ea7db875f9616965bae20a0da33c8d758b6d4822c4bdce26309e67811320ce2164c0b2a40e606d5e72af395ad9faa6f SHA512 1040c0f7d5e4ce0337f81a5e4df0f097be9dfa58fe10f8e10fa222bdc6c837c3d78387eef4df158d1840bc2d8313c450e2c4d1c225a619b28a8ca418f37b49cf
+DIST bladerf-2017.12_rc1.tar.gz 1723370 BLAKE2B f6d19765674602354b42bb62acdfd874b04df55bd45ec74077aa310e5f6bd81d298148c3b1f2e1396d8659644f374cadf2e91df4b644a29d70c8369aaa6f4694 SHA512 19a3f24f9b6000af9e9d80cc31cbbf46b11deabb4e12eafb68c01f240cdf43884c5f8640ecbfa32fab8cc6a9c8e3b6cbc8596dfe564869c1a85163f00c62d96f
 EBUILD bladerf-2016.06.ebuild 1332 BLAKE2B cf3093526b1ff0ada5c3c7602149be955a8ddbbcff2ec93a447c5326dbb1904fbce1eca642ea134cae17154a079955db8459be8ce33d79aed9ef13eaa7bf72f4 SHA512 67816f126c9a25ab23f73287ce2ef5198ee03441e2d0b4b80201eb40b57781b3932fd39baf1630db4db5a61c4cd9a00d31dd71731c2b6c3e57b1ff4d52b13899
+EBUILD bladerf-2017.12_rc1.ebuild 1332 BLAKE2B 50d435fc5f417834f5f8330a4176b164f02954bf74b7b0d0612f0b00064803c7163f0086f1975b143431908750d24cb044209a27c91161221658747fc92aa43d SHA512 f37c25a9d4367867cf845b03f104e194beda9a48dbf6cafd6025408347a8f209337c2117184fac7f4948555014bc1379492258673d19a2d3e14a9ae2be15ad13
 EBUILD bladerf-9999.ebuild 1332 BLAKE2B cf3093526b1ff0ada5c3c7602149be955a8ddbbcff2ec93a447c5326dbb1904fbce1eca642ea134cae17154a079955db8459be8ce33d79aed9ef13eaa7bf72f4 SHA512 67816f126c9a25ab23f73287ce2ef5198ee03441e2d0b4b80201eb40b57781b3932fd39baf1630db4db5a61c4cd9a00d31dd71731c2b6c3e57b1ff4d52b13899
 MISC metadata.xml 534 BLAKE2B d39c41a686202aff5a46e2b67cdcb5f3dc339bd7854a313f8d58165995b030194638447c2c987d1c5372a241c030b7d715a9854d9daaec1a0a59b85c6f421c1c SHA512 b7d10693f1c08b1a60bf6f4542e7fad445a63249d3fa796b08b3c7db7d758c89000c09a6aeb0dffbe6a90467acc5ee18331d839162a540a2c7040d5dd7218db7
diff --git a/net-wireless/bladerf/bladerf-2015.07.ebuild b/net-wireless/bladerf/bladerf-2015.07.ebuild
deleted file mode 100644
index db03b2f9f5a5..000000000000
--- a/net-wireless/bladerf/bladerf-2015.07.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils udev
-
-DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand"
-HOMEPAGE="http://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"
-	KEYWORDS=""
-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"
-	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-1.8.0
-	>=net-wireless/bladerf-fpga-0.3.4"
-
-src_configure() {
-	mycmakeargs=(
-		-DVERSION_INFO_OVERRIDE:STRING="${PV}"
-		$(cmake-utils_use_enable doc BUILD_DOCUMENTATION)
-		$(cmake-utils_use_enable tecla LIBTECLA)
-		-DTREAT_WARNINGS_AS_ERRORS=OFF
-		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-wireless/bladerf/bladerf-2016.01_rc1.ebuild b/net-wireless/bladerf/bladerf-2016.01_rc1.ebuild
deleted file mode 100644
index b84336c94dd8..000000000000
--- a/net-wireless/bladerf/bladerf-2016.01_rc1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils udev
-
-DESCRIPTION="Libraries for supporing the BladeRF hardware from Nuand"
-HOMEPAGE="http://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"
-	KEYWORDS=""
-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"
-	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-1.9.0
-	>=net-wireless/bladerf-fpga-0.5.0"
-
-src_configure() {
-	mycmakeargs=(
-		-DVERSION_INFO_OVERRIDE:STRING="${PV}"
-		$(cmake-utils_use_enable doc BUILD_DOCUMENTATION)
-		$(cmake-utils_use_enable tecla LIBTECLA)
-		-DTREAT_WARNINGS_AS_ERRORS=OFF
-		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
-	)
-	cmake-utils_src_configure
-}
diff --git a/net-wireless/bladerf/bladerf-2015.02.ebuild b/net-wireless/bladerf/bladerf-2017.12_rc1.ebuild
index 7749a2256c4b..f289a36148fd 100644
--- a/net-wireless/bladerf/bladerf-2015.02.ebuild
+++ b/net-wireless/bladerf/bladerf-2017.12_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,8 +37,8 @@ CDEPEND=">=dev-libs/libusb-1.0.16
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}"
-PDEPEND=">=net-wireless/bladerf-firmware-1.8.0
-	>=net-wireless/bladerf-fpga-0.1.2"
+PDEPEND=">=net-wireless/bladerf-firmware-2.0.0
+	>=net-wireless/bladerf-fpga-0.6.0"
 
 src_configure() {
 	mycmakeargs=(