gentoo resync : 25.08.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
commit: 43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree: 6208a7f4fc744684fce0f55acbb47511acace498 /net-wireless
parent: 28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)
53 files changed, 645 insertions, 585 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 18b97ab62469..6f1bbde89a85 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/aircrack-ng/Manifest b/net-wireless/aircrack-ng/Manifest
index 5a2a8e3d40ce..e499f7bf2983 100644
--- a/net-wireless/aircrack-ng/Manifest
+++ b/net-wireless/aircrack-ng/Manifest
@@ -1,13 +1,9 @@
 AUX aircrack-ng-1.2-no-force-stack-protector.patch 2245 BLAKE2B a7f200711a4e24cc92d4626d24c62abe11a2d378e8876a801a516aa2023b7aa7566c868e890186cebf9dacecc59037b23c39380b1b435b0f0985a02f939ccfec SHA512 35e5f717bc3b90507a879bbd4ffd3bb88c7bc98676abac1241cbc50dbb1bcf2c53e5c45514b643d7ad7d86d0b74e662803de155ae6bbf430a1fdb32e50682068
 AUX aircrack-ng-1.2_rc4-openssl.patch 1227 BLAKE2B ac474222d14a25d6ea4f95c313f0f660940cdacd0ed4295e869a91a81f30284a669fd1e49959d1f6c7fd0c015cbc93464181b3e79571751d400400323b276934 SHA512 142542996e83f729bf8c7e77ac0d4be428b60368c7c005c2dda6c7fe7d45cbe029381523059566a35f1c8d748c0aaf9e46086cbf9ce429f22b2c61ae78a6ba1c
-AUX aircrack-ng-1.3-8812au.patch 3453 BLAKE2B 6cc77e78bd1598d9ce1c4accb1ea79d68eb9f3cde9d4306f0d06ec81ad1d3d52b7b6d3de20144de7de5ee9e14274e95bc33fc976d5b34624006f32934c2a6d7f SHA512 9fc1effa2498f8f5f055d50431bb9268ca7307005cc7e9f9e8c91dc296ab352645f883bacbc84464b06faf955a7ad34a2d042ed495f576a7f679c75f291464cb
+AUX aircrack-ng-1.3-8812au.patch 7279 BLAKE2B 80ce8246b2719bf897c22d727beb3fe71d58e9866e35e9d4930535b4695044d9183d4e7f781c97ed5ab3dd45e59453d10239482073baa75f3b2c9be0e02556b9 SHA512 53cecc21d6b091e3ebbd2c163a918513382d35697f7df5e2462a774863e3cbbfdecd5aebe341b9b62bb1987ee8d22acbd962526e78b6f6537185bcb286ffcbc3
 DIST aircrack-ng-1.2-rc1.tar.gz 2046476 BLAKE2B aec848a3dedae564cc29fc94475d0dec9cfb33af5185a4bceb9f88c1a3cce7a910439405fd76390ca352e52393b9094e570bf54980af27a50709a36ffab33752 SHA512 897427c535846c0ede58b2f99ed469bc01f50f9b38fc70d5711261fca7342339192cc0c71a724fc04c99114db7534d825a44f09e7bc5754286ec44933a33e40d
-DIST aircrack-ng-1.2-rc4.tar.gz 4379880 BLAKE2B 8034e99a9a7117b0552ecd82603883661d7442970a24d26f4754122abd07cc661fbeb57519cecbefb6eea1fc0e8b0f228a116a04f07e1a7d2eb41ea4b5f6040b SHA512 f1e1d465813a5f00fd8f8b287353033ea30b657a4c3a9fe81281ab2546d3238690f0659076bff53703fbc796ba40efb16115804d21f8516adca2c774fefea20c
-DIST aircrack-ng-1.2.tar.gz 4517658 BLAKE2B 1a3d17608dafe69a7a500526807310bf9ae8f0f14ed4198d06fc1cd6287fa25aeed996bad85c82b9ed87c214951e2bbc73384513361b7e8ce6ba05ef32f6530c SHA512 efc8cd17994fd74dcdd60e4ff26f81dc4f090a368668c2b1d62e204d2a9c001f2614a9d2ad0e4ae0ae38fb71e1957e0342f8216d757e38db105b1e467de82bd9
-DIST aircrack-ng-1.3.tar.gz 4182502 BLAKE2B d18d3644fd5bad7a45d8684a50a42d84d9e0e832e88876a34cb7b308c4496c7b1d39159cb24c19097b7ca4286f62560b509e84e816d65c77d2f72883dd3c9457 SHA512 bc092f84fb204b5764a16a230695b69ff916aceae865bf73827c56b155100e7bd64941d0c5f999585d25ee8faad2d35a3c580a57b60c320f7857bd8750558961
-EBUILD aircrack-ng-1.2.ebuild 3179 BLAKE2B afccc183aff511d9cbe26c50580b7a9ca3d69d152980927fa9b66f8d7d0feff53142e65e986f64fe46ee5e989a05275f7ec2770478c914f04e451c938ba0ddec SHA512 fa5e63c1fca15ea1830d2ab2a566a65e05d684623ae6cab72f8aa0c3dd3923fd6d01baac519c55134dd05993d801caa93f6e9ce761b4ebe6c1ffc82941bc776a
+DIST aircrack-ng-1.3.tar.gz 4501507 BLAKE2B ae73303fbc0c632faa2468d5fbf0daa318767633bf92571cc53fd79d8df518c1fc03ad83397e12585a804f0171e3fe3865c070ccdb39cb43ae46edbfc880b37e SHA512 0c2376ac702cd36021b9017b40c5af9466c5689832a0e40debcb8c0a2cd13ec942170930903c4e2e06678c429a89cd4d78ab43e925b707f816bf48d6c9514ec9
 EBUILD aircrack-ng-1.2_rc1-r1.ebuild 3523 BLAKE2B eeda867b14d763a397287928b64217635a2b4b11250b98fc818ce0910c9fa9e30e68a78c02a741c79a653f6c9177d733caaae7e63748c20f29ebd6c4819f007f SHA512 151fec44861e17742ec7cbbbc7198eaf24f9cdd4ceee78902c248fced3ab6df49ed1da466b39f203201e9c9124b5e8b1042df75ef705a7024205c5276853a0d7
-EBUILD aircrack-ng-1.2_rc4-r1.ebuild 2918 BLAKE2B f8f585175b7899e3e367875c23642a60a733118677c91daa68ea3087671cbdd3e853a02f48733080bcc3bf7c3040fb9777409a84e2275d1042b73733e03943b8 SHA512 2e396a16de545a0b39f38ffc243b35f041ecc1f4a62c1b2596a13d91793def3dbaba74a873ac635cbc684dec0c8ea21410ee35994ed3af0c00ed6a1d718ca33f
-EBUILD aircrack-ng-1.3-r1.ebuild 3181 BLAKE2B 2fb30fed14d679e0392a0c6a4f40e2b61e6f329b1bc59f80a9a1eafe0ba8d48ff8f32dca509d8c429ed80a407408ae6a7b94a512488f9307ef043c46f561dfed SHA512 a766354d39a2d4c7f51883c121d3a15a125e2cf7bb035dfb98af0ed2e7143b3a098c5e979142ce0549afbbe1c1c891da99a99478763d516710aa46a27b5285fb
-EBUILD aircrack-ng-9999.ebuild 3110 BLAKE2B 9ca03f75ab07f78157a6cf27014e83c45a3928d0d0a457993e5e86201a30b06cea11485d060cfd7597556dbe227a3ae4915aa0a8cc7a0ee8bde151cff49de848 SHA512 4904ffb8f45ff1e7c63fb033b77543db69b9813e8549a1ef0c4e70da268563058d6d076f51b463c26151f47105aeacf237e70df6f4e54304f13721e66ea9278a
+EBUILD aircrack-ng-1.3-r3.ebuild 2913 BLAKE2B 525fa4983a8796bda57f24583bde0de564e93d649255fea2df1151d6ade8c20a44c5ee3452e20d1704c01d17ab8cd7b5d22f1b192fb30b03cd6e94734ca277de SHA512 171a67bd916ad7e3a22f6ae7c338797b94edad98f22eb0f08876a2efee26ce265fe720901bf78c0107af0a3213081b0f9731c3b45748c307ed5f39b858585e7f
+EBUILD aircrack-ng-9999.ebuild 2860 BLAKE2B f827952b3e4619b7271a31fe6db719b829ef338deaaadf8b61821705ae40c533f14df7bbf8f4c0aa1fbf32d8eb04cf881ab472a257031d9abfe0943f2af6f654 SHA512 ff0e04780dcc94123e8f2e1ca40d279207fdd0a87d443092051ab37187e3df1efb0f9d005d1b47be4135e03a33ae7e84937c0e9d6756028c858e848102384e9e
 MISC metadata.xml 1130 BLAKE2B 9d3c0463a4a1cf4360ce77c550a701a805cd3db5f06ee895aa8888180246d6b51970d23b74b723a241e09bb6dde426055ca8f1288afffa90e8e4abc7d9c4b92a SHA512 0ca935ebf651d221657fda9320fc8a8f8dbabd9d10fc4eebb8b301b63ca8f9316069bee16b2468d227ea5acf53a28747c8479eb776983334b9496d68fefa76ee
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.2_rc4-r1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.2_rc4-r1.ebuild
deleted file mode 100644
index 0ea4750ff5b3..000000000000
--- a/net-wireless/aircrack-ng/aircrack-ng-1.2_rc4-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit toolchain-funcs distutils-r1 flag-o-matic
-
-DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
-HOMEPAGE="http://www.aircrack-ng.org"
-
-MY_PV=${PV/_/-}
-SRC_URI="http://download.${PN}.org/${PN}-${MY_PV}.tar.gz"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental"
-
-DEPEND="net-libs/libpcap
-	dev-libs/openssl:0=
-	netlink? ( dev-libs/libnl:3 )
-	pcre? ( dev-libs/libpcre )
-	airdrop-ng? ( ${PYTHON_DEPS} )
-	airgraph-ng? ( ${PYTHON_DEPS} )
-	experimental? ( sys-libs/zlib )
-	sqlite? ( >=dev-db/sqlite-3.4 )"
-RDEPEND="${DEPEND}
-	kernel_linux? (
-		net-wireless/iw
-		net-wireless/wireless-tools
-		sys-apps/ethtool
-		sys-apps/usbutils
-		sys-apps/pciutils )
-	sys-apps/hwids
-	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
-		airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-openssl.patch"
-)
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-pkg_setup() {
-	MAKE_COMMON=(
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		LD="$(tc-getLD)" \
-		RANLIB="$(tc-getRANLIB)" \
-		libnl=$(usex netlink true false) \
-		pcre=$(usex pcre true false) \
-		sqlite=$(usex sqlite true false) \
-		experimental=$(usex experimental true false)
-		prefix="${ED}/usr" \
-	)
-}
-
-src_compile() {
-	if [[ $($(tc-getCC) --version) == clang* ]] ; then
-		#https://bugs.gentoo.org/show_bug.cgi?id=472890
-		filter-flags -frecord-gcc-switches
-	fi
-
-	emake "${MAKE_COMMON[@]}"
-
-	if use airgraph-ng; then
-		cd "${S}/scripts/airgraph-ng"
-		distutils-r1_src_compile
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng"
-		distutils-r1_src_compile
-	fi
-}
-
-src_test() {
-	emake "${MAKE_COMMON[@]}" check
-}
-
-src_install() {
-	einstalldocs
-	emake "${MAKE_COMMON[@]}" install
-
-	if use airgraph-ng; then
-		cd "${S}/scripts/airgraph-ng"
-		distutils-r1_src_install
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng"
-		distutils-r1_src_install
-	fi
-
-	#we don't need aircrack-ng's oui updater, we have our own
-	rm "${ED}"/usr/sbin/airodump-ng-oui-update
-}
-
-pkg_postinst() {
-	# Message is (c) FreeBSD
-	# http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5
-	if use kernel_FreeBSD ; then
-		einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor"
-		einfo "mode of your wireless card.  So do not care about what the manpages say about"
-		einfo "airmon-ng, airodump-ng sets monitor mode automatically."
-		echo
-		einfo "To return from monitor mode, issue the following command:"
-		einfo "    ifconfig \${INTERFACE} -mediaopt monitor"
-		einfo
-		einfo "For aireplay-ng you need FreeBSD >= 7.0."
-	fi
-}
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.3-r1.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.3-r1.ebuild
deleted file mode 100644
index c35e3fb3d4af..000000000000
--- a/net-wireless/aircrack-ng/aircrack-ng-1.3-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit toolchain-funcs distutils-r1 flag-o-matic autotools
-
-DESCRIPTION="WLAN tools for breaking 802.11 WEP/WPA keys"
-HOMEPAGE="http://www.aircrack-ng.org"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
-	KEYWORDS=""
-else
-	MY_PV=${PV/_/-}
-	SRC_URI="https://github.com/aircrack-ng/aircrack-ng/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental"
-
-DEPEND="net-libs/libpcap
-	dev-libs/openssl:0=
-	netlink? ( dev-libs/libnl:3 )
-	pcre? ( dev-libs/libpcre )
-	airdrop-ng? ( ${PYTHON_DEPS} )
-	airgraph-ng? ( ${PYTHON_DEPS} )
-	experimental? ( sys-libs/zlib )
-	sqlite? ( >=dev-db/sqlite-3.4 )"
-RDEPEND="${DEPEND}"
-PDEPEND="kernel_linux? (
-		net-wireless/iw
-		net-wireless/wireless-tools
-		sys-apps/ethtool
-		sys-apps/usbutils
-		sys-apps/pciutils )
-	sys-apps/hwids
-	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
-		airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	MAKE_COMMON=(
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		LD="$(tc-getLD)" \
-		RANLIB="$(tc-getRANLIB)" \
-		DESTDIR="${ED}"
-	)
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-8812au.patch"
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-asan \
-		$(use_enable netlink libnl) \
-		$(use_with experimental) \
-		$(use_with sqlite sqlite3) \
-		--enable-shared \
-		--disable-static \
-		--without-opt
-}
-
-src_compile() {
-	if [[ $($(tc-getCC) --version) == clang* ]] ; then
-		#https://bugs.gentoo.org/show_bug.cgi?id=472890
-		filter-flags -frecord-gcc-switches
-	fi
-
-	emake "${MAKE_COMMON[@]}"
-
-	if use airgraph-ng; then
-		cd "${S}/scripts/airgraph-ng"
-		distutils-r1_src_compile
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng"
-		distutils-r1_src_compile
-	fi
-}
-
-src_test() {
-	emake "${MAKE_COMMON[@]}" check
-}
-
-src_install() {
-	einstalldocs
-	emake "${MAKE_COMMON[@]}" install
-
-	if use airgraph-ng; then
-		cd "${S}/scripts/airgraph-ng"
-		distutils-r1_src_install
-	fi
-	if use airdrop-ng; then
-		cd "${S}/scripts/airdrop-ng"
-		distutils-r1_src_install
-	fi
-
-	#we don't need aircrack-ng's oui updater, we have our own
-	rm "${ED}"/usr/sbin/airodump-ng-oui-update
-}
-
-pkg_postinst() {
-	# Message is (c) FreeBSD
-	# http://www.freebsd.org/cgi/cvsweb.cgi/ports/net-mgmt/aircrack-ng/files/pkg-message.in?rev=1.5
-	if use kernel_FreeBSD ; then
-		einfo "Contrary to Linux, it is not necessary to use airmon-ng to enable the monitor"
-		einfo "mode of your wireless card.  So do not care about what the manpages say about"
-		einfo "airmon-ng, airodump-ng sets monitor mode automatically."
-		echo
-		einfo "To return from monitor mode, issue the following command:"
-		einfo "    ifconfig \${INTERFACE} -mediaopt monitor"
-		einfo
-		einfo "For aireplay-ng you need FreeBSD >= 7.0."
-	fi
-}
diff --git a/net-wireless/aircrack-ng/aircrack-ng-1.2.ebuild b/net-wireless/aircrack-ng/aircrack-ng-1.3-r3.ebuild
index 972e687e1ba3..e5103942e69c 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-1.2.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-1.3-r3.ebuild
@@ -14,21 +14,21 @@ HOMEPAGE="http://www.aircrack-ng.org"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/aircrack-ng/aircrack-ng.git"
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 else
 	MY_PV=${PV/_/-}
-	SRC_URI="http://download.${PN}.org/${PN}-${MY_PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}-${MY_PV}"
+	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
+	KEYWORDS="amd64 ~arm ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental"
+IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD libressl +netlink +pcre +sqlite +experimental"
 
 DEPEND="net-libs/libpcap
-	dev-libs/openssl:0=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	netlink? ( dev-libs/libnl:3 )
 	pcre? ( dev-libs/libpcre )
 	airdrop-ng? ( ${PYTHON_DEPS} )
@@ -45,35 +45,29 @@ PDEPEND="kernel_linux? (
 	sys-apps/hwids
 	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
 
-REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
-		airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	MAKE_COMMON=(
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		LD="$(tc-getLD)" \
-		RANLIB="$(tc-getRANLIB)" \
-		DESTDIR="${ED}"
-	)
-}
+REQUIRED_USE="
+	airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
+	airgraph-ng? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-8812au.patch"
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/aircrack-ng-1.2-no-force-stack-protector.patch
-	eapply_user
+	default
 	eautoreconf
 }
 
 src_configure() {
 	econf \
 		--disable-asan \
-		$(use_enable netlink libnl) \
-		$(use_with experimental) \
-		$(use_with sqlite sqlite3) \
 		--enable-shared \
 		--disable-static \
-		--without-opt
+		--without-opt \
+		$(use_enable netlink libnl) \
+		$(use_with experimental) \
+		$(use_with sqlite sqlite3)
 }
 
 src_compile() {
@@ -82,7 +76,7 @@ src_compile() {
 		filter-flags -frecord-gcc-switches
 	fi
 
-	emake "${MAKE_COMMON[@]}"
+	default
 
 	if use airgraph-ng; then
 		cd "${S}/scripts/airgraph-ng"
@@ -94,13 +88,8 @@ src_compile() {
 	fi
 }
 
-src_test() {
-	emake "${MAKE_COMMON[@]}" check
-}
-
 src_install() {
-	einstalldocs
-	emake "${MAKE_COMMON[@]}" install
+	default
 
 	if use airgraph-ng; then
 		cd "${S}/scripts/airgraph-ng"
@@ -111,7 +100,7 @@ src_install() {
 		distutils-r1_src_install
 	fi
 
-	#we don't need aircrack-ng's oui updater, we have our own
+	# we don't need aircrack-ng's oui updater, we have our own
 	rm "${ED}"/usr/sbin/airodump-ng-oui-update
 }
 
diff --git a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
index 1d10edd8197a..82a54cb816c4 100644
--- a/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
+++ b/net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
@@ -17,18 +17,18 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	MY_PV=${PV/_/-}
-	SRC_URI="http://download.${PN}.org/${PN}-${MY_PV}.tar.gz"
+	SRC_URI="https://download.aircrack-ng.org/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD +netlink +pcre +sqlite +experimental"
+IUSE="+airdrop-ng +airgraph-ng kernel_linux kernel_FreeBSD libressl +netlink +pcre +sqlite +experimental"
 
 DEPEND="net-libs/libpcap
-	dev-libs/openssl:0=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	netlink? ( dev-libs/libnl:3 )
 	pcre? ( dev-libs/libpcre )
 	airdrop-ng? ( ${PYTHON_DEPS} )
@@ -45,34 +45,25 @@ PDEPEND="kernel_linux? (
 	sys-apps/hwids
 	airdrop-ng? ( net-wireless/lorcon[python,${PYTHON_USEDEP}] )"
 
-REQUIRED_USE="airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
-		airgraph-ng? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	MAKE_COMMON=(
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		LD="$(tc-getLD)" \
-		RANLIB="$(tc-getRANLIB)" \
-		DESTDIR="${ED}"
-	)
-}
+REQUIRED_USE="
+	airdrop-ng? ( ${PYTHON_REQUIRED_USE} )
+	airgraph-ng? ( ${PYTHON_REQUIRED_USE} )
+"
 
 src_prepare() {
-	eapply_user
+	default
 	eautoreconf
 }
 
 src_configure() {
 	econf \
 		--disable-asan \
-		$(use_enable netlink libnl) \
-		$(use_with experimental) \
-		$(use_with sqlite sqlite3) \
 		--enable-shared \
 		--disable-static \
-		--without-opt
+		--without-opt \
+		$(use_enable netlink libnl) \
+		$(use_with experimental) \
+		$(use_with sqlite sqlite3)
 }
 
 src_compile() {
@@ -81,7 +72,7 @@ src_compile() {
 		filter-flags -frecord-gcc-switches
 	fi
 
-	emake "${MAKE_COMMON[@]}"
+	default
 
 	if use airgraph-ng; then
 		cd "${S}/scripts/airgraph-ng"
@@ -93,13 +84,8 @@ src_compile() {
 	fi
 }
 
-src_test() {
-	emake "${MAKE_COMMON[@]}" check
-}
-
 src_install() {
-	einstalldocs
-	emake "${MAKE_COMMON[@]}" install
+	default
 
 	if use airgraph-ng; then
 		cd "${S}/scripts/airgraph-ng"
@@ -110,7 +96,7 @@ src_install() {
 		distutils-r1_src_install
 	fi
 
-	#we don't need aircrack-ng's oui updater, we have our own
+	# we don't need aircrack-ng's oui updater, we have our own
 	rm "${ED}"/usr/sbin/airodump-ng-oui-update
 }
 
diff --git a/net-wireless/aircrack-ng/files/aircrack-ng-1.3-8812au.patch b/net-wireless/aircrack-ng/files/aircrack-ng-1.3-8812au.patch
index 6ce0fbc51eba..e5343023aaec 100644
--- a/net-wireless/aircrack-ng/files/aircrack-ng-1.3-8812au.patch
+++ b/net-wireless/aircrack-ng/files/aircrack-ng-1.3-8812au.patch
@@ -1,14 +1,28 @@
-commit 3cc9de5e7cbe6565c7e1fe12ebbcf2c6f7413c8d
-Author: Rick Farina (Zero_Chaos) <zerochaos@gentoo.org>
-Date:   Tue Aug 7 01:27:05 2018 +0000
-
-    airmon-ng support 8812au
-
 diff --git a/scripts/airmon-ng.linux b/scripts/airmon-ng.linux
-index 14e4bdcd..d7328f4b 100755
+index 7f488391..4d0a5e0c 100755
 --- a/scripts/airmon-ng.linux
 +++ b/scripts/airmon-ng.linux
-@@ -354,21 +354,21 @@ ifaceIsUp() {
+@@ -106,7 +106,18 @@ else
+ fi
+ 
+ if [ -d /sys/bus/pci ] || [ -d /sys/bus/pci_express ] || [ -d /proc/bus/pci ]; then
+-	if [ ! -x "$(command -v lspci 2>&1)" ]; then
++	PCI_DEVICES=0
++	if [ -d /sys/bus/pci/devices ] && [ "$(ls -1 /sys/bus/pci/devices 2>/dev/null | wc -l)" != '0' ]; then
++		PCI_DEVICES=1
++	elif [ -r /proc/bus/pci/devices ] && [ -n "$(cat /proc/bus/pci/devices 2>/dev/null)" ]; then
++		PCI_DEVICES=1
++	elif [ -d /sys/bus/pci_express/devices ] && [ -n "$(ls -1 /sys/bus/pci_express/devices 2>/dev/null | wc -l)" != '0' ]; then
++		PCI_DEVICES=1
++	fi
++
++	if [ ${PCI_DEVICES} -eq 0 ]; then
++		LSPCI=0
++	elif [ ! -x "$(command -v lspci 2>&1)" ]; then
+ 		printf "Please install lspci from your distro's package manager.\n"
+ 		exit 1
+ 	else
+@@ -347,21 +358,21 @@ ifaceIsUp() {
  #	fi
  #}
  
@@ -45,7 +59,7 @@ index 14e4bdcd..d7328f4b 100755
  
  yesorno() {
  	read input
-@@ -426,7 +426,7 @@ startMac80211Iface() {
+@@ -419,7 +430,7 @@ startMac80211Iface() {
  		done
  	fi
  	#we didn't bail means we need a monitor interface
@@ -54,11 +68,11 @@ index 14e4bdcd..d7328f4b 100755
  		printf "Interface ${1}mon is too long for linux so it will be renamed to the old style (wlan#) name.\n"
  		findFreeInterface monitor
  	else
-@@ -438,10 +438,16 @@ startMac80211Iface() {
+@@ -431,10 +442,16 @@ startMac80211Iface() {
  		fi
  		#we didn't bail means our target interface is available
  		setLink ${1} down
-+		if [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ] || [ "${DRIVER}" = "rtl8812au" ]; then
++		if [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ]; then
 +			#grumble grumble, seriously crap vendor driver
 +			startDeprecatedIface ${1}
 +			setChannelMac80211 ${1}
@@ -72,7 +86,55 @@ index 14e4bdcd..d7328f4b 100755
  				setChannelMac80211 ${1}mon
  			else
  				printf "\nNewly created monitor mode interface ${1}mon is *NOT* in monitor mode.\n"
-@@ -569,12 +575,12 @@ setChannelMac80211() {
+@@ -456,15 +473,12 @@ startMac80211Iface() {
+ 			printf "\nPlease run \"airmon-ng check kill\" and/or kill your network manager."
+ 		fi
+ 	else
+-		iw ${1} del
++		isRPiWireless && iw ${1} del
+ 		printf "\t\t(mac80211 station mode vif disabled for [${PHYDEV}]${1})\n"
+ 	fi
+ }
+ 
+-NEXMON_FIRMWARE_DIR=/opt
+-NEXMON_DRIVER_DIR=/opt
+-
+-hasRPiWireless() {
++isRPiWireless() {
+ 	local HW_REV=$(grep Revision /proc/cpuinfo | awk '{print $3}')
+ 	[ -z "${HW_REV}" ] && return 0
+ 	# http://www.raspberrypi-spy.co.uk/2012/09/checking-your-raspberry-pi-board-version/
+@@ -475,29 +489,6 @@ hasRPiWireless() {
+ 	return 0
+ }
+ 
+-isNexutilPresent() {
+-	type nexutil >/dev/null 2>/dev/null
+-	if [ $? -eq 0 ]; then
+-		return 1
+-	fi
+-	return 0
+-}
+-
+-startNexmonIface() {
+-	[ -z $1 ] && return
+-
+-	if [ -n "$(iwconfig $1 | grep 'Mode:Monitor')" ] && [ -n "$(nexutil -m | grep 'monitor: 2')" ]; then
+-		printf "\n\tInterface $1 is already in monitor mode\n"
+-	else
+-		ifconfig $1 up 2>/dev/null
+-		iwconfig $1 mode monitor 2>/dev/null
+-		[ "$1" = "wlan0" ] && nexutil -m2
+-		[ "$1" = "wlan0" ] || nexutil -m2 -I $1
+-		iwconfig $1 channel ${CH}
+-		printf "\n\t\t(monitor mode enabled for [${PHYDEV}]${1})\n"
+-	fi
+-}
+-
+ startwlIface() {
+ 	if [ -f "/proc/brcm_monitor0" ]; then
+ 		if [ -r "/proc/brcm_monitor0" ]; then
+@@ -587,12 +578,12 @@ setChannelMac80211() {
  	fi
  }
  
@@ -91,11 +153,11 @@ index 14e4bdcd..d7328f4b 100755
  
  stopMac80211Iface() {
  	if [ -f /sys/class/net/${1}/type ]; then
-@@ -587,6 +593,11 @@ stopMac80211Iface() {
+@@ -605,6 +596,11 @@ stopMac80211Iface() {
  			printf "please report it.\n"
  			exit 1
  		else
-+			if [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ] || [ "${DRIVER}" = "rtl8812au" ]; then
++			if [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ]; then
 +				#grumble grumble, seriously crap vendor driver
 +				stopDeprecatedIface ${1}
 +				return
@@ -103,7 +165,48 @@ index 14e4bdcd..d7328f4b 100755
  			if [ "${ELITE}" = "0" ]; then
  				local need_sta=1
  				if [ -d /sys/class/ieee80211/${PHYDEV}/device/net ]; then
-@@ -1316,8 +1327,10 @@ if [ "$DEBUG" = "1" ]; then
+@@ -665,18 +661,6 @@ stopMac80211Iface() {
+ 	fi
+ }
+ 
+-stopNexmonIface() {
+-	[ -z $1 ] && return
+-	ifconfig $1 down
+-	# Running nexutil is not necessary, it gets reset when putting interface down
+-	[ "$1" = "wlan0" ] && nexutil -m0
+-	[ "$1" = "wlan0" ] || nexutil -m0 -I $1
+-	ifconfig $1 down
+-	ifconfig $1 up 2> /dev/null
+-	iwconfig $1 mode managed 2> /dev/null
+-	printf "\n\t\t(monitor mode disabled for [${PHYDEV}]${1})\n"
+-}
+-
+ stopwlIface() {
+ 	if [ -f "/proc/brcm_monitor0" ]; then
+ 		if [ -r "/proc/brcm_monitor0" ]; then
+@@ -751,6 +735,12 @@ getDriver() {
+ 	if [ "$DRIVER" = "rtl8187" ] && [ "$STACK" = "ieee80211" ]; then
+ 		DRIVER="r8187"
+ 	fi
++	if [ "$DRIVER" = "rtl88xxau" ]; then
++		DRIVER="88XXau"
++	fi
++	if [ "$DRIVER" = "rtl8812au" ]; then
++		DRIVER="8812au"
++	fi
+ 
+ 	#Here we will catch the broken lying drivers not caught above
+ 	#currently this only functions for pci devices and not usb since lsusb has no -k option
+@@ -795,6 +785,8 @@ getFrom() {
+ 				FROM="V"
+ 			elif [ "$DRIVER" = "rt5390sta" ]; then
+ 				FROM="V"
++			elif [ "${DRIVER}" = "8812au" ] || [ "${DRIVER}" = "8814au" ]; then
++				FROM="V"
+ 			fi
+ 		elif modinfo -F filename $DRIVER 2>&1 | grep -q 'updates/drivers'
+ 		then
+@@ -1346,8 +1338,10 @@ if [ "$DEBUG" = "1" ]; then
  	fi
  fi
  if [ "$VERBOSE" = "1" ]; then
@@ -116,3 +219,27 @@ index 14e4bdcd..d7328f4b 100755
  	uname -a
  
  	checkvm
+@@ -1493,23 +1487,6 @@ for iface in $(printf "${iface_list}"); do
+ 		if [ "$1" = "stop" ] && [ "$2" = "$iface" ]; then
+ 			stopwlIface $iface
+ 		fi
+-	elif [ "${CHIPSET}" = 'Broadcom 43430' ] || [ "${CHIPSET}" = 'Broadcom 43455' ]; then
+-		hasRPiWireless
+-		if [ $? -eq 0 ]; then
+-			printf "\n\tNot a Raspberry Pi 3, 3B+ or Zero Wireless, cannot put in monitor mode.\n"
+-		else
+-			isNexutilPresent
+-			if [ $? -eq 0 ]; then
+-				printf "\n\tMissing nexutil, cannot switch to monitor mode.\n"
+-			else
+-				if [ "$1" = "start" ] && [ "$2" = "$iface" ]; then
+-					startNexmonIface $iface
+-				fi
+-				if [ "$1" = "stop" ] && [ "$2" = "$iface" ]; then
+-					stopNexmonIface $iface
+-				fi
+-			fi
+-		fi
+ 	elif [ "$MAC80211" = "1" ]; then
+ 		if [ "$1" = "start" ] && [ "$2" = "$iface" ]; then
+ 			startMac80211Iface $iface
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
diff --git a/net-wireless/bladerf-fpga/Manifest b/net-wireless/bladerf-fpga/Manifest
index 60609c08322e..b2f4e509aee8 100644
--- a/net-wireless/bladerf-fpga/Manifest
+++ b/net-wireless/bladerf-fpga/Manifest
@@ -1,19 +1,9 @@
-DIST hostedx115-0.1.1.rbf 3571462 BLAKE2B a0b166b738cc025156c3c4d80b6822b4cbd09b5cbd56c90c2fd0af821533e41a29d1a292956cbe88eb57cdd7eb004700ce686dddae1887c1a4abec01b047da86 SHA512 14a74942963d0a47b6c3a46540fb8fbedf0204d9e056e5ad8c87b3988441ab0e4d1f875196a6c2e7c8e462b5e091a18e7cbe5a7e5c3d3773952e43d7a4165e99
-DIST hostedx115-0.1.2.rbf 3571462 BLAKE2B c3e7caf5994606ca3bf36140171a923f6af5af047d894a20e45177b99d140d15389c4ad27b655026539bf437edb21d697d29384c5b812836f6ed453b7cc4c843 SHA512 0c90a2e5add5443df549b2428e6ea2c043171b4c18bbbf953eb1c96ad3a2bb53f655212353eac6df1e7758366fd4ea5dabc355f85db3abdecdb16b4b2b85fd4d
-DIST hostedx115-0.3.4.rbf 3571462 BLAKE2B 39e98a1cb275eb86596f326549563482f1196e5d79dfc4d7350ff1c7e320d1cdf6c17ac8ccaed685e52a211a6d778cc3c3836f2bad476b7f7cd2abb1ee625859 SHA512 8ab1373c7ac2de64962f619e0809e0bff7d0df82666ed9601cf51dae0de1914240e929c6ab3a8b34928b7f89c2906782522238cd6a8809f8201af4d1275d8e25
-DIST hostedx115-0.5.0.rbf 3571462 BLAKE2B 9d8c60d75bb03eddcbcae828bc6535c09015203b0f975b608cda7ce7bc3f1f1b397fd326afe05946df60f088a387167954488d07e82d878606195e9a5d38cff2 SHA512 9ae85345551c11bcb3242d243d5da046bcc385861dba8e10cb2986017344eaa43609280aef75f18da6a6ce6ec5b685e701b918923daf1c9999b1f4b5a2bec80c
 DIST hostedx115-0.6.0.rbf 3571462 BLAKE2B 922b12fe65f5fb0dcd886eb9c7f082ef9ce01ac4501be47f33e9f0bb7199ce03dc6f574c7c97331f52b2a424142ca037b28a2236b6402b0c359e2eb50347d1ff SHA512 771625cfeda4f184660834a99309e351ddd6e05d53e2cc2252773fd9decf689479da07ad2ca2f1bb8f8fd14be79cf0d661021a40af7f70aaf92e1948a5b80b8c
-DIST hostedx115.rbf 3571462 BLAKE2B 5c097653b57e9c7e08dc5b54cdb6890bd0eeb376bb5b0cbd25ebadbc24eb1398127d81efe31367cded97f88e5267a015f4f1e16ae5fe026db3123bd5f1e5f1d1 SHA512 4df268602e662cd54a6da2b94d52cc355afdda8578c8342ea1be6a168ff874c095f92230f3cdfe5aada3d1c3237d8572e427c377c57f4a6d555f0ca49f85d6e4
-DIST hostedx40-0.1.1.rbf 1191788 BLAKE2B d0c8c4f8622815cc3bfd73cc81b99e5163389b0594941b20b98c64c5ed751d6c611fc853e5ce1af7c1ccad91c271bc221040dedbc43c24e4c6ebb7f7cab99719 SHA512 426aa48c588e02fe3a13c7310ab7f2a78f0c5aaba1925164c78f484cf99cfcfba103b8a738329a198c3b905fd23cb48fbe29fa4e08ded6d2fe5d70f90b850af1
-DIST hostedx40-0.1.2.rbf 1191788 BLAKE2B 51a67c8b757d9fb16ce2300211dc7d843e304b6ca8e0c5fe908fb043c96514f439733bcf6dda6d49425047ac825e0426575d62daa0a1fdca10e1c974311db22e SHA512 9f06b5560d91ed65df14e48c729da04ae4c8720aae863d215f24db7efc4a353751840605aeb6b2ae9e4a71ffb9820d7f310bdca6dddad27768514e2edd7fc933
-DIST hostedx40-0.3.4.rbf 1191788 BLAKE2B 8fea897acaa6623fca3289d40e83768d10e22b6b0d9761545aa2af8aa38a4803d70733805a26aed7b3e5f557d57d758ab9e704b96e86ed9324ea54749815773d SHA512 0529bda4bf39ee83aa9d48dabc30af7333018e3a369e9968d030995a915e6f4ae67c17df22e55e0c4144eced0fbbac786d82dccb70d0393e8eee095e49792ade
-DIST hostedx40-0.5.0.rbf 1191788 BLAKE2B 1d57a8906ae6072f597cfbb44b97cbddf28287b37311e6eff334ec560dc0096cc25e2001fe06fcc868248dca4851d660ad0a354086629da75401afa1088d805c SHA512 140d83197aa847124a32ede492a1f15365fb0300fad1d4d67f13d4fa0f787cae59c293be0f7e355e61ef345f9e8c1d6eeb500cfa04e67d02790bc4ec5122b5eb
+DIST hostedx115-0.7.3.rbf 3571462 BLAKE2B 828c28623b42c8f16ee5ec8d6b3f8132b7d93662d5e8b6aad45cb3bfbd14f9788b1a0f236377ce6fb204163d4b1ea1d775d7ddcb566610bef04a8143d9525ce0 SHA512 43a46b5081d52ed0770dafa19e7e71925b9d79ead13da782ee42637db41c42140597c703b0b6da1b56866c92947f811c76c08407eff3b043eeaf66e5560ffa6f
 DIST hostedx40-0.6.0.rbf 1191788 BLAKE2B 8e2567430baf56f6d09729b9924630d9b5c6e8f0b68816635b2043dafa5c029933aafbbfdabf0980682732468d253f07be969a09d916d9fd8c28b07a614ffb79 SHA512 25ccccae9d14f2044f978b0d0a58f121a3bc52bc5c5a9d20ef383efaa5b38d41b7adbb320d82c15f473863cf8d9de37671ae5a5b263eb513c515ea8b84be1547
-DIST hostedx40.rbf 1191788 BLAKE2B 86b48c9b5bd8e3f3f9af689a49c45608ced241d64d728cbe365b9ff0c6f3b00f3018c45a7fb5662580297952d32d67d473ae42cccb10196d5b3ce75cf949f381 SHA512 e56686a8dd4372cf11d3f373ef4262c3897f9adbd8952d82b3d737d38e77d8ddde9c427ddb6ba20364ff3748d57f29974044bd32c0f4177690ff37a600b210e9
-EBUILD bladerf-fpga-0.0.6.ebuild 715 BLAKE2B 79852087e8c77bd33740910828ed8054ccaf00f302bc133a24e239988f12cd18395b0e5493032af717234b9ab62f9b1f18262409bcf371f0e447b782d1a71294 SHA512 cb6958afa8c6593ac4f2a265593008b8422b9c385d0b28b9f211197664c9096b6eb57e729a31a7a43dcafcd6b6a6101b19395679c872246c4abe01fdae24bf37
-EBUILD bladerf-fpga-0.1.1-r1.ebuild 805 BLAKE2B 249319550eedbbd9d16041eed4f18d964392f0b1040dc08da7b7dfac1af560f69db56c25b1ae4d61da74ffbe23ae66d79ee137cc11ea6897831dd36da481a7dd SHA512 60c6415886c24830b06cce407ab28505ca13a3bce7da2bb0adf146a72596e04a2c0173d2d25cb4505d9ef44eee9f8bc0baeea0f20491085c22eb3b56a0c159fd
-EBUILD bladerf-fpga-0.1.2.ebuild 805 BLAKE2B 97a80002ed177bec21282299d69644e5957abc02e19ef0995f58db8b8995b0ccfe9dbbb7aefe789686f26fd801c90429aae2e3e2dd1f2e6a9d52638ae3e8dda4 SHA512 baca269a407a85c28dd161f90a8731fb058a57cc611dd3e1b50919e243110978a8b7a3a0c50721570ea062635e486922fbc268544d35e463776679a5911e3eaa
-EBUILD bladerf-fpga-0.3.4.ebuild 805 BLAKE2B 97a80002ed177bec21282299d69644e5957abc02e19ef0995f58db8b8995b0ccfe9dbbb7aefe789686f26fd801c90429aae2e3e2dd1f2e6a9d52638ae3e8dda4 SHA512 baca269a407a85c28dd161f90a8731fb058a57cc611dd3e1b50919e243110978a8b7a3a0c50721570ea062635e486922fbc268544d35e463776679a5911e3eaa
-EBUILD bladerf-fpga-0.5.0.ebuild 805 BLAKE2B f0121b5c7860810cfa9195863339a8e31d711a41289739948cfc330d9bd92ad39be5eda495ec3fd61b3b719adc7782af56f247146f2da0ed309b1a254551f2e8 SHA512 942874c7f68942194cae051ca4eabe4b8e5468dd7106604653b20feb1fa261282edbcce9d1f28532960470d2b74565a5cbfd88423f97b7b56af71d6d394200e3
+DIST hostedx40-0.7.3.rbf 1191788 BLAKE2B 489372b297a9e7385809b36efa80df7d489cc803e5ae5b8c1a6bdc80434fd462ec5e12ab5996a4412fe3306038766330200776b0e11c816d0004cc7602721aec SHA512 b4619b8918d178a42e0bd4885ef1671a96e8aeb224291ee21a792e0be73a6e4ea2b8951003aa093581971aa220f7d101c4a1cddec90845ca31f11b17c5f67fdd
+DIST hostedxA4-0.7.3.rbf 2632660 BLAKE2B a98ea6ffc1ffdbf9b8ded3144d4f9fb19dac6b196239dccdd9ce908b185eac4898a65ac897f460b1a0dee437131bdeccecf2b36714099d4f86962f04108c856e SHA512 655df2f698ae376577925349fc4773cf3819360f7bff0932761160aa823625d408be48a809df7edd2e3a4054b418f5dd6a0769f2aa982551ea3b847eaea5fc87
+DIST hostedxA9-0.7.3.rbf 12858972 BLAKE2B 71bbdea5ef372b9a6a6512757391c2b143ff69efbcfec58178873eff14c7995750a43939ea93b69529ccca62987ec4437621b6f78289a94acbc2f14c02069e64 SHA512 e33970360e3104891d3c738ab46662b80a29160d87b913c3a4655aa03bd6ff8236274d1f2ad591e4dcee40c85ff579abcd69e637aa5cf86e1a08c143f89ba685
 EBUILD bladerf-fpga-0.6.0.ebuild 805 BLAKE2B f0121b5c7860810cfa9195863339a8e31d711a41289739948cfc330d9bd92ad39be5eda495ec3fd61b3b719adc7782af56f247146f2da0ed309b1a254551f2e8 SHA512 942874c7f68942194cae051ca4eabe4b8e5468dd7106604653b20feb1fa261282edbcce9d1f28532960470d2b74565a5cbfd88423f97b7b56af71d6d394200e3
-MISC metadata.xml 509 BLAKE2B 272562b78b181af44bdf8a61cf0e4d8695084bf172e214e4e2bff18ce3fd59aa8400967fa2a08d08cd8dcb8c2ba8d759db49c7c622c82b5eed6d987847f06abd SHA512 13c3666ae2087a7b5b31c0aad64d5ad36e14eb0bef54cd599e4fd36585ab1127760f66aca9bae9c9a53edd09c519333701f28a1120a604e2594b23ce81bc3cd0
+EBUILD bladerf-fpga-0.7.3.ebuild 1099 BLAKE2B e68325362b5cc55e5ddd887202a6ae310f309fd5237916ffdacc80c04a5d0e19dfed5a251c42399189cd24bc77c942ee606b8d36613d299499e0d4d7161b2635 SHA512 3f0ae72740e00885f354f4b14c094574f84f5dc7efd98504a10a50a386181a8e58162dcbb98f49ad7473267eaa5e8ef7a1a8c7087ffd68d9f533fbabccc53984
+MISC metadata.xml 698 BLAKE2B d11ce3cfe82a1fc860cb8d7e796cc70f1d3140430437c9ce676e56836f6e5945f6657493e7087928a684903ac394e51742104a128e3db84fdbe2c7be4f87b646 SHA512 dbe253746eb236f7cc3d3701148ac0bd95604c459261f93bc21c27193ee62dcebd9d1f56da2e95a162d4eb86fc55790c5ad9c285181c955a12ac284caf2e6584
diff --git a/net-wireless/bladerf-fpga/bladerf-fpga-0.0.6.ebuild b/net-wireless/bladerf-fpga/bladerf-fpga-0.0.6.ebuild
deleted file mode 100644
index 3f5cb6a4c854..000000000000
--- a/net-wireless/bladerf-fpga/bladerf-fpga-0.0.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="bladeRF FPGA bitstreams"
-HOMEPAGE="http://nuand.com/fpga.php"
-
-#fpga code 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="x40? ( http://nuand.com/fpga/v${PV}/hostedx40.rbf )
-		x115? ( http://nuand.com/fpga/v${PV}/hostedx115.rbf )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+x40 +x115"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${DISTDIR}"
-
-src_install() {
-	insinto /usr/share/Nuand/bladeRF/
-	use x40 && doins hostedx40.rbf
-	use x115 && doins hostedx115.rbf
-}
diff --git a/net-wireless/bladerf-fpga/bladerf-fpga-0.1.1-r1.ebuild b/net-wireless/bladerf-fpga/bladerf-fpga-0.1.1-r1.ebuild
deleted file mode 100644
index 455815cb7c07..000000000000
--- a/net-wireless/bladerf-fpga/bladerf-fpga-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="bladeRF FPGA bitstreams"
-HOMEPAGE="http://nuand.com/fpga.php"
-
-#fpga code 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="x40? ( http://nuand.com/fpga/v${PV}/hostedx40.rbf -> hostedx40-${PV}.rbf )
-		x115? ( http://nuand.com/fpga/v${PV}/hostedx115.rbf -> hostedx115-${PV}.rbf )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+x40 +x115"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${DISTDIR}"
-
-src_install() {
-	insinto /usr/share/Nuand/bladeRF/
-	use x40 && newins hostedx40-${PV}.rbf hostedx40.rbf
-	use x115 && newins hostedx115-${PV}.rbf hostedx115.rbf
-}
diff --git a/net-wireless/bladerf-fpga/bladerf-fpga-0.3.4.ebuild b/net-wireless/bladerf-fpga/bladerf-fpga-0.3.4.ebuild
deleted file mode 100644
index 0d4fb2f05a14..000000000000
--- a/net-wireless/bladerf-fpga/bladerf-fpga-0.3.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="bladeRF FPGA bitstreams"
-HOMEPAGE="http://nuand.com/fpga.php"
-
-#fpga code 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="x40? ( http://nuand.com/fpga/v${PV}/hostedx40.rbf -> hostedx40-${PV}.rbf )
-		x115? ( http://nuand.com/fpga/v${PV}/hostedx115.rbf -> hostedx115-${PV}.rbf )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+x40 +x115"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${DISTDIR}"
-
-src_install() {
-	insinto /usr/share/Nuand/bladeRF/
-	use x40 && newins hostedx40-${PV}.rbf hostedx40.rbf
-	use x115 && newins hostedx115-${PV}.rbf hostedx115.rbf
-}
diff --git a/net-wireless/bladerf-fpga/bladerf-fpga-0.5.0.ebuild b/net-wireless/bladerf-fpga/bladerf-fpga-0.5.0.ebuild
deleted file mode 100644
index 8f39930627a3..000000000000
--- a/net-wireless/bladerf-fpga/bladerf-fpga-0.5.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="bladeRF FPGA bitstreams"
-HOMEPAGE="http://nuand.com/fpga.php"
-
-#fpga code 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="x40? ( http://nuand.com/fpga/v${PV}/hostedx40.rbf -> hostedx40-${PV}.rbf )
-		x115? ( http://nuand.com/fpga/v${PV}/hostedx115.rbf -> hostedx115-${PV}.rbf )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+x40 +x115"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S="${DISTDIR}"
-
-src_install() {
-	insinto /usr/share/Nuand/bladeRF/
-	use x40 && newins hostedx40-${PV}.rbf hostedx40.rbf
-	use x115 && newins hostedx115-${PV}.rbf hostedx115.rbf
-}
diff --git a/net-wireless/bladerf-fpga/bladerf-fpga-0.1.2.ebuild b/net-wireless/bladerf-fpga/bladerf-fpga-0.7.3.ebuild
index 0d4fb2f05a14..739ce1773ca2 100644
--- a/net-wireless/bladerf-fpga/bladerf-fpga-0.1.2.ebuild
+++ b/net-wireless/bladerf-fpga/bladerf-fpga-0.7.3.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 FPGA bitstreams"
 HOMEPAGE="http://nuand.com/fpga.php"
@@ -9,21 +9,29 @@ HOMEPAGE="http://nuand.com/fpga.php"
 #fpga code 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="x40? ( http://nuand.com/fpga/v${PV}/hostedx40.rbf -> hostedx40-${PV}.rbf )
+SRC_URI="xA4? ( http://nuand.com/fpga/v${PV}/hostedxA4.rbf -> hostedxA4-${PV}.rbf )
+		xA9? ( http://nuand.com/fpga/v${PV}/hostedxA9.rbf -> hostedxA9-${PV}.rbf )
+		x40? ( http://nuand.com/fpga/v${PV}/hostedx40.rbf -> hostedx40-${PV}.rbf )
 		x115? ( http://nuand.com/fpga/v${PV}/hostedx115.rbf -> hostedx115-${PV}.rbf )"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+x40 +x115"
+IUSE="+xA4 +xA9 +x40 +x115"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
 S="${DISTDIR}"
 
+src_unpack() {
+	true
+}
+
 src_install() {
 	insinto /usr/share/Nuand/bladeRF/
+	use xA4 && newins hostedxA4-${PV}.rbf hostedxA4.rbf
+	use xA9 && newins hostedxA9-${PV}.rbf hostedxA9.rbf
 	use x40 && newins hostedx40-${PV}.rbf hostedx40.rbf
 	use x115 && newins hostedx115-${PV}.rbf hostedx115.rbf
 }
diff --git a/net-wireless/bladerf-fpga/metadata.xml b/net-wireless/bladerf-fpga/metadata.xml
index 6513afabbb3d..3db0ffc8038d 100644
--- a/net-wireless/bladerf-fpga/metadata.xml
+++ b/net-wireless/bladerf-fpga/metadata.xml
@@ -10,7 +10,9 @@
 <name>Radio</name>
 </maintainer>
 <use>
-<flag name="x40">bitstream for the x40KLE Cyclone IV FPGA bladerf model"</flag>
-<flag name="x115">bitstream for the x115KLE Cyclone IV FPGA bladerf model"</flag>
+<flag name="xA4">bitstream for the xA4 49 kLE Cyclone V FPGA bladerf 2.0 micro model"</flag>
+<flag name="xA9">bitstream for the xA9 301 kLE Cyclone V FPGA bladerf 2.0 micro model"</flag>
+<flag name="x40">bitstream for the x40 kLE Cyclone IV FPGA bladerf model"</flag>
+<flag name="x115">bitstream for the x115 kLE Cyclone IV FPGA bladerf model"</flag>
 </use>
 </pkgmetadata>
diff --git a/net-wireless/bladerf/Manifest b/net-wireless/bladerf/Manifest
index cdb191fbf5ff..85afe90bc941 100644
--- a/net-wireless/bladerf/Manifest
+++ b/net-wireless/bladerf/Manifest
@@ -1,6 +1,6 @@
-DIST bladerf-2016.06.tar.gz 1654784 BLAKE2B 540f9fbb21c1439e80bda37a9e265dfaf987a9c6cedb29ac8556bbdff4ead899d99d00cc9b5a02f03055945955a5d43f4d94b822085dffecc7e2f63ee0724764 SHA512 0834e9f5fa2e41bf15629d9699f11ef29d5365a0ed2c17b83c6a77ed43d72fa62e6d35060d8d478dcbc1e7080cac825d82644b8fcdc03eae0dccef3cb1a7325d
 DIST bladerf-2017.12_rc1.tar.gz 1723370 BLAKE2B f6d19765674602354b42bb62acdfd874b04df55bd45ec74077aa310e5f6bd81d298148c3b1f2e1396d8659644f374cadf2e91df4b644a29d70c8369aaa6f4694 SHA512 19a3f24f9b6000af9e9d80cc31cbbf46b11deabb4e12eafb68c01f240cdf43884c5f8640ecbfa32fab8cc6a9c8e3b6cbc8596dfe564869c1a85163f00c62d96f
-EBUILD bladerf-2016.06.ebuild 1332 BLAKE2B cf3093526b1ff0ada5c3c7602149be955a8ddbbcff2ec93a447c5326dbb1904fbce1eca642ea134cae17154a079955db8459be8ce33d79aed9ef13eaa7bf72f4 SHA512 67816f126c9a25ab23f73287ce2ef5198ee03441e2d0b4b80201eb40b57781b3932fd39baf1630db4db5a61c4cd9a00d31dd71731c2b6c3e57b1ff4d52b13899
+DIST bladerf-2018.08_rc3.tar.gz 2175352 BLAKE2B 06b7d5b97b682649d6385e2f82858f354ebf13e92ceccd0dc80defe0b520692b122c7cfe590d93a04e36e48492bf82519dac5d48cf3d70f6310130cba7f1a52c SHA512 bdfe17e5ac24247e9e5da69d5144658dfb06022b488c4a3a6ee22541eae8990ce44082224b13dc8c80ed63c6fd9b56e8f24c328dd5ea4845af519847e48daa4a
 EBUILD bladerf-2017.12_rc1.ebuild 1332 BLAKE2B 50d435fc5f417834f5f8330a4176b164f02954bf74b7b0d0612f0b00064803c7163f0086f1975b143431908750d24cb044209a27c91161221658747fc92aa43d SHA512 f37c25a9d4367867cf845b03f104e194beda9a48dbf6cafd6025408347a8f209337c2117184fac7f4948555014bc1379492258673d19a2d3e14a9ae2be15ad13
-EBUILD bladerf-9999.ebuild 1332 BLAKE2B cf3093526b1ff0ada5c3c7602149be955a8ddbbcff2ec93a447c5326dbb1904fbce1eca642ea134cae17154a079955db8459be8ce33d79aed9ef13eaa7bf72f4 SHA512 67816f126c9a25ab23f73287ce2ef5198ee03441e2d0b4b80201eb40b57781b3932fd39baf1630db4db5a61c4cd9a00d31dd71731c2b6c3e57b1ff4d52b13899
+EBUILD bladerf-2018.08_rc3.ebuild 1311 BLAKE2B cf2b8db17bbb3522047bbc35000be8c98730e35da0bb34b88a7ce9f2eafa43a9bd71f3a0dccd03914fd0c3afc05aec31418e7946ec197908f54d3bee3a6f5861 SHA512 5be9b57e483236e7ed5705bb7e25db73b3980bf4973843313629852caf317b533747a348bbcc800302002b1ea79d9febae57e476a6f481afec1767aba500a73d
+EBUILD bladerf-9999.ebuild 1311 BLAKE2B cf2b8db17bbb3522047bbc35000be8c98730e35da0bb34b88a7ce9f2eafa43a9bd71f3a0dccd03914fd0c3afc05aec31418e7946ec197908f54d3bee3a6f5861 SHA512 5be9b57e483236e7ed5705bb7e25db73b3980bf4973843313629852caf317b533747a348bbcc800302002b1ea79d9febae57e476a6f481afec1767aba500a73d
 MISC metadata.xml 534 BLAKE2B d39c41a686202aff5a46e2b67cdcb5f3dc339bd7854a313f8d58165995b030194638447c2c987d1c5372a241c030b7d715a9854d9daaec1a0a59b85c6f421c1c SHA512 b7d10693f1c08b1a60bf6f4542e7fad445a63249d3fa796b08b3c7db7d758c89000c09a6aeb0dffbe6a90467acc5ee18331d839162a540a2c7040d5dd7218db7
diff --git a/net-wireless/bladerf/bladerf-2016.06.ebuild b/net-wireless/bladerf/bladerf-2018.08_rc3.ebuild
index 856e4493762d..f8fd38c19cd7 100644
--- a/net-wireless/bladerf/bladerf-2016.06.ebuild
+++ b/net-wireless/bladerf/bladerf-2018.08_rc3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils udev
 
@@ -37,14 +37,14 @@ CDEPEND=">=dev-libs/libusb-1.0.16
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}"
-PDEPEND=">=net-wireless/bladerf-firmware-2.0.0
-	>=net-wireless/bladerf-fpga-0.6.0"
+PDEPEND=">=net-wireless/bladerf-firmware-2.2.0
+	>=net-wireless/bladerf-fpga-0.7.3"
 
 src_configure() {
 	mycmakeargs=(
 		-DVERSION_INFO_OVERRIDE:STRING="${PV}"
-		$(cmake-utils_use_enable doc BUILD_DOCUMENTATION)
-		$(cmake-utils_use_enable tecla LIBTECLA)
+		-DBUILD_DOCUMENTATION="$(usex doc)"
+		-DENABLE_LIBTECLA="$(usex tecla)"
 		-DTREAT_WARNINGS_AS_ERRORS=OFF
 		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
 	)
diff --git a/net-wireless/bladerf/bladerf-9999.ebuild b/net-wireless/bladerf/bladerf-9999.ebuild
index 856e4493762d..f8fd38c19cd7 100644
--- a/net-wireless/bladerf/bladerf-9999.ebuild
+++ b/net-wireless/bladerf/bladerf-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit cmake-utils udev
 
@@ -37,14 +37,14 @@ CDEPEND=">=dev-libs/libusb-1.0.16
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}"
-PDEPEND=">=net-wireless/bladerf-firmware-2.0.0
-	>=net-wireless/bladerf-fpga-0.6.0"
+PDEPEND=">=net-wireless/bladerf-firmware-2.2.0
+	>=net-wireless/bladerf-fpga-0.7.3"
 
 src_configure() {
 	mycmakeargs=(
 		-DVERSION_INFO_OVERRIDE:STRING="${PV}"
-		$(cmake-utils_use_enable doc BUILD_DOCUMENTATION)
-		$(cmake-utils_use_enable tecla LIBTECLA)
+		-DBUILD_DOCUMENTATION="$(usex doc)"
+		-DENABLE_LIBTECLA="$(usex tecla)"
 		-DTREAT_WARNINGS_AS_ERRORS=OFF
 		-DUDEV_RULES_PATH="$(get_udevdir)"/rules.d
 	)
diff --git a/net-wireless/chirp/Manifest b/net-wireless/chirp/Manifest
index 6e2c1ffa715c..c9734603de00 100644
--- a/net-wireless/chirp/Manifest
+++ b/net-wireless/chirp/Manifest
@@ -1,4 +1,4 @@
-DIST chirp-daily-20180623.tar.gz 767246 BLAKE2B c842ade8f5d25ca44bbb9ffea09f32ad4f4c04747e5eb08ad2e533b6dc4fa323bdd8a1a1b47da44e50efa502e856dfa5da14fab6688d1dda470d13e219d08341 SHA512 2c82f575faaac7f922e4aae192f992f724be7dc6788f194e581a21238f21af3b554ae0c3bba08d34806d310b796a4f49ef96de97ba758c41cc55edf6e1a1566f
-EBUILD chirp-20180623.ebuild 1139 BLAKE2B ddd873216fe53fd35ff3f7395d05b3c95cc5434e326de6abe65bf3a928e6f9fd9f0def0d00609c1be53b76376ba14f257aba68d270803fbe7c8412052252ba68 SHA512 7b49e6b80c1a6acea83085a3eeb2c2e5172b93fc90ed5d0e87b63e742c98ca32a9bdcb8252a5ba990244abddee9e25abae042675bd3f59a148ddfb6531964fb9
+DIST chirp-daily-20180815.tar.gz 769042 BLAKE2B 27286f90a400e7a8dc5612c4093790e2b15d0ca4fcd5eb6e5e85cdd1d03e8e9aebc2c78fd8cb396ad0458abd58e391f775659cb532de1b678ebaeafdf869d6e6 SHA512 5eac517685722266db0b591a58c911d856e5ad07dca7ab5d9482c0e326e3da17343ca9e0822136374af3cd33a4d34b9fa103a6a65f599c07127f069b64b0ee41
+EBUILD chirp-20180815.ebuild 1139 BLAKE2B ddd873216fe53fd35ff3f7395d05b3c95cc5434e326de6abe65bf3a928e6f9fd9f0def0d00609c1be53b76376ba14f257aba68d270803fbe7c8412052252ba68 SHA512 7b49e6b80c1a6acea83085a3eeb2c2e5172b93fc90ed5d0e87b63e742c98ca32a9bdcb8252a5ba990244abddee9e25abae042675bd3f59a148ddfb6531964fb9
 EBUILD chirp-99999999.ebuild 1139 BLAKE2B ddd873216fe53fd35ff3f7395d05b3c95cc5434e326de6abe65bf3a928e6f9fd9f0def0d00609c1be53b76376ba14f257aba68d270803fbe7c8412052252ba68 SHA512 7b49e6b80c1a6acea83085a3eeb2c2e5172b93fc90ed5d0e87b63e742c98ca32a9bdcb8252a5ba990244abddee9e25abae042675bd3f59a148ddfb6531964fb9
 MISC metadata.xml 457 BLAKE2B 1f7caba85f5961ded80d4d421e260465f69de0549bf2f50186bbad8d75ff090e6b6bbf8e2a73b732b164f8210faec27051ae24e2fe677fc3a00c0960e7b39d38 SHA512 748db876146f4074e0ea1290e451f3f06531fc24ea823eff121dfa6ac58a95af0cd819ae0832417a74725a0ff61384c921906050128d144412c9f3b56edf8c67
diff --git a/net-wireless/chirp/chirp-20180623.ebuild b/net-wireless/chirp/chirp-20180815.ebuild
index ef243acf8ac1..ef243acf8ac1 100644
--- a/net-wireless/chirp/chirp-20180623.ebuild
+++ b/net-wireless/chirp/chirp-20180815.ebuild
diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index d447942c6f9a..9977b0ee9e29 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -1,5 +1,7 @@
 AUX gmap_usr_share_mv.patch 459 BLAKE2B 54afd9183d40041b541325041975b8a20ebfa45a29d9625ba1b22635aa567f57e607215582c4b55f40dc7339fe031c017c98c51216edf80087f4c602526c5b9e SHA512 3ffa7cf9a172642015373df29a8acd952d25a1634b9a7cb3cad8ad67c6ebd95b0a94c47713f444e1270ce52ed04db1282992e31435fca7aacbc0da955d419c59
 DIST dump1090-0.0_p20140919.tar.xz 445108 BLAKE2B 96da9faae0139710b92adfeb921f7b84ea3342c3916d69baebfb2709076c9f3d8e3be3457d8f2c074d3b58255ad745cda9f35a71f6707b8184a83c0c8a54e141 SHA512 4b7f915d5dd9c728da36298ecfe6c0e1da17bb9082e5f1c41376e6425dce429c099b0fd2d8436a966f5d3189788b818602f26fb0aea62e5dbe753e489bf0a760
+DIST dump1090-1.15_pre20180509.tar.gz 1032244 BLAKE2B 2d91c8bdbe2fca787e9653ac08eb40a4faab181ab10f7247a9dedf6390f35520642caee548dbadb58c5347c0f0284a66e000da747bc39b3dab1e4cbce0fbbc3d SHA512 08d7f1d031a5d3a26ea73bce543209bd84054b1acd94ba72a0dca206cc7f11c1778fb5d6286bfe434812f6647ccaab73b56bc6539ae594e2aa3364851428cad3
 EBUILD dump1090-0.0_p20140919.ebuild 940 BLAKE2B efc8640aead079dfd58a47d31ddf2c51e9c2afd9dfdd18b36e7e7f311b1d71de36fc7970caed9ef1d8a1eb938ec432a1eea0e2a83e71bcadf50f05a10724ed3d SHA512 8beb46b548d5a802b474e32b0f36077c68c3db833a79e4f783bbcc3ad5cfd7b9b7e2b84017eb88b1903a41a2ba6d1de80df79ca40b9b4b771604c6721227de2c
-EBUILD dump1090-9999.ebuild 1132 BLAKE2B a5a844c8699df3d48978c7e7ae6bcd5eb0434ba06521197710736b64f9c6a7dd971f36535e708616da72bb6158d4c59778a6e88a668a59db13ac10b2505baa7f SHA512 21da8ec67f7b052078ded11cab9492e4b59452b917f08fa91a2582950e47d61e558f12e84334c1993536d4b72f776b66606d92e4138699c11d606c17c9c84ce2
+EBUILD dump1090-1.15_pre20180509.ebuild 1359 BLAKE2B 7594ea89af34eca71d1049f713cf619270ad24beee6b5c96077ad00000960bcc7152d5e2c35c5510577b56e9c50786a0d88fc5c15b5e4d68292a3f2537184b1f SHA512 1256007d22664532e3420cf4d388eab6e5c905f1027bb16d31d5fee6d7931a3ae5ac2f738f0d74bd5774f18fb52b237659d24bb0a9cadfeefb9be57a98af5d14
+EBUILD dump1090-9999.ebuild 1359 BLAKE2B 7594ea89af34eca71d1049f713cf619270ad24beee6b5c96077ad00000960bcc7152d5e2c35c5510577b56e9c50786a0d88fc5c15b5e4d68292a3f2537184b1f SHA512 1256007d22664532e3420cf4d388eab6e5c905f1027bb16d31d5fee6d7931a3ae5ac2f738f0d74bd5774f18fb52b237659d24bb0a9cadfeefb9be57a98af5d14
 MISC metadata.xml 423 BLAKE2B 5a9cc427c7c34cdb0c63e433769a0f7695d54b8027da2b37dd62636003d3b39cef16957503c3bad0116a2ec344674172be1d5d61aaef222b710c5d78a9042c2a SHA512 6fcab3c262761efdb8742d485789fac8284494e5b2c21fa8ecaa671429ae11dfa22a9c0ce3f66eaf78d0001f01d4d117a7967521d478457af4765f9bdec84ba9
diff --git a/net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild b/net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild
new file mode 100644
index 000000000000..556e4a14a698
--- /dev/null
+++ b/net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="simple Mode S decoder for RTLSDR devices"
+#Original repo
+#HOMEPAGE="https://github.com/antirez/dump1090"
+#Repo that has actually been touched recenly
+HOMEPAGE="https://github.com/mutability/dump1090"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mutability/${PN}.git"
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+	COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"
+	SRC_URI="https://github.com/mutability/dump1090/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="net-wireless/rtl-sdr
+		virtual/libusb:1"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		UNAME="Linux" \
+		DUMP1090_VERSION=${PV} \
+		CFLAGS="$($(tc-getPKG_CONFIG) --cflags librtlsdr) ${CFLAGS}" \
+		EXTRACFLAGS="-DHTMLPATH=\\\"/usr/share/dump1090/html\\\"" \
+		LIBS="${LDFLAGS} $($(tc-getPKG_CONFIG) --libs librtlsdr) -lm -lpthread"
+}
+
+src_install() {
+	dobin ${PN}
+	dobin view1090
+	dodoc README.md
+
+	insinto /usr/share/${PN}/html
+	doins -r public_html/*
+
+	insinto /usr/share/${PN}/tools
+	doins -r tools/*
+
+	newdoc debian/lighttpd/89-dump1090.conf lighttpd.conf
+	newdoc debian/nginx/dump1090-mutability nginx.conf
+}
diff --git a/net-wireless/dump1090/dump1090-9999.ebuild b/net-wireless/dump1090/dump1090-9999.ebuild
index be0c0e5e59cf..556e4a14a698 100644
--- a/net-wireless/dump1090/dump1090-9999.ebuild
+++ b/net-wireless/dump1090/dump1090-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,8 +17,9 @@ if [[ ${PV} == "9999" ]] ; then
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	S="${WORKDIR}/${PN}"
+	COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"
+	SRC_URI="https://github.com/mutability/dump1090/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
 fi
 
 LICENSE="BSD"
@@ -31,9 +32,10 @@ DEPEND="${RDEPEND}"
 
 src_compile() {
 	emake CC="$(tc-getCC)" \
-		UNAME="Linux"
+		UNAME="Linux" \
+		DUMP1090_VERSION=${PV} \
 		CFLAGS="$($(tc-getPKG_CONFIG) --cflags librtlsdr) ${CFLAGS}" \
-		EXTRACFLAGS="-DHTMLPATH='/usr/share/dump1090/html'" \
+		EXTRACFLAGS="-DHTMLPATH=\\\"/usr/share/dump1090/html\\\"" \
 		LIBS="${LDFLAGS} $($(tc-getPKG_CONFIG) --libs librtlsdr) -lm -lpthread"
 }
 
@@ -47,4 +49,7 @@ src_install() {
 
 	insinto /usr/share/${PN}/tools
 	doins -r tools/*
+
+	newdoc debian/lighttpd/89-dump1090.conf lighttpd.conf
+	newdoc debian/nginx/dump1090-mutability nginx.conf
 }
diff --git a/net-wireless/gqrx/Manifest b/net-wireless/gqrx/Manifest
index c522c99b2003..d9c6cad8e4b6 100644
--- a/net-wireless/gqrx/Manifest
+++ b/net-wireless/gqrx/Manifest
@@ -1,4 +1,4 @@
-DIST gqrx-2.10.tar.gz 1327015 BLAKE2B ee3e83825e5e7d165d991b6715435f924c6c2c8a9c045ebc3f0c9c2dec3f186b68ff0057e22a55fcc9222eeac173956778587df20fbdeb777aec41c3fbcae2d8 SHA512 662894326b5fd9527fb918cfb890e2cdbf248660201452d6c2adf105341650cd2a3dbd03561d055e182626a078fcd788aa401efaaa73f45d16f34f5f1ade97a9
-EBUILD gqrx-2.10.ebuild 1373 BLAKE2B 36907539d73a640c06bb3745d65433149c672b98780374614b16c56af094548ba21d6684169c9da834ba394e5301b8c94dc2391da83a1f794ad1cc31c744c4a0 SHA512 958fc26e393a5537498981b7561f47fadc349b2c79d14cd50fcfe88a1d89bd9ffb1bf52827917a36af7183ec31d491636337de3eee88fba81b49e96304456250
-EBUILD gqrx-9999.ebuild 1373 BLAKE2B 1841c52415d49192a2d8625b1b010fee24f5dc6ef52987dc9d55a2eededa69c60a5f70cd8b865f6705fdd8ec7ea1e6f07ca0b822ea2356c6b198314c64bbc593 SHA512 9bb73caade0c195d363491117d909479452e7fad8a48dc9f5c3b5a262482be23a6c4fe6c10de17dfc65245b94ce5d865366f0aae3904fc54596271a65fad5e24
+DIST gqrx-2.11.5.tar.gz 1329054 BLAKE2B 205bf1d984f18d43c914bb24e59f7ed42e9faf8060b44c2f78f6d1bb7a222d87395c347626802438c45a30225acac18ca3114d412faf3f8385840276c0c08ac8 SHA512 d2928559d377b85ea683839b0e7dd1213038ee350718f9dad5064afacab20b08d1c1edc189ae8c5ae992ad019636c930555f9a441aee88964231d174db25ae6f
+EBUILD gqrx-2.11.5.ebuild 1398 BLAKE2B 857836230183b383172f2e525addec716adb1294671edb85593a7c41f385fdb0aa1ee35eac8c57b520c72ccd855b5019835b23eb51aecba7a7135586c919cf52 SHA512 9f6aee5bd333f0baf5f9ba214d7dfa71b1b10f3f6ea98044d2dc66546c7d5e5ddb75a22e143d4701a709c0ceee93f1526327f2afb286d63dde13fce78e0d8b1d
+EBUILD gqrx-9999.ebuild 1398 BLAKE2B 857836230183b383172f2e525addec716adb1294671edb85593a7c41f385fdb0aa1ee35eac8c57b520c72ccd855b5019835b23eb51aecba7a7135586c919cf52 SHA512 9f6aee5bd333f0baf5f9ba214d7dfa71b1b10f3f6ea98044d2dc66546c7d5e5ddb75a22e143d4701a709c0ceee93f1526327f2afb286d63dde13fce78e0d8b1d
 MISC metadata.xml 523 BLAKE2B e40faae08e17b5c9c887870f51a9ea731c60037fa023d85ef386483108047c05b7a1cca299d1d9f92e8933957949b818d5c58c784d0032bb62031348f396dfe7 SHA512 26a1e52770090a69982939ebff1ec4ee26f7c637abf2748c5de5997087e17c0624871e311b17b1b5857ba9ac0bdc8113fd71e13975404462cc84946535adecd8
diff --git a/net-wireless/gqrx/gqrx-2.10.ebuild b/net-wireless/gqrx/gqrx-2.11.5.ebuild
index f696cb12c53e..b9b3d7bb2cf0 100644
--- a/net-wireless/gqrx/gqrx-2.10.ebuild
+++ b/net-wireless/gqrx/gqrx-2.11.5.ebuild
@@ -53,6 +53,7 @@ src_prepare() {
 	if use !pulseaudio; then
 		sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
 	fi
+	cmake-utils_src_prepare
 	eapply_user
 }
 
diff --git a/net-wireless/gqrx/gqrx-9999.ebuild b/net-wireless/gqrx/gqrx-9999.ebuild
index d280c8f3e3c5..b9b3d7bb2cf0 100644
--- a/net-wireless/gqrx/gqrx-9999.ebuild
+++ b/net-wireless/gqrx/gqrx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,6 +53,7 @@ src_prepare() {
 	if use !pulseaudio; then
 		sed -i 's/AUDIO_BACKEND = pulse/#AUDIO_BACKEND = pulse/' gqrx.pro || die
 	fi
+	cmake-utils_src_prepare
 	eapply_user
 }
 
diff --git a/net-wireless/gr-ieee802154/Manifest b/net-wireless/gr-ieee802154/Manifest
index cea06fd67242..b71f75c7360b 100644
--- a/net-wireless/gr-ieee802154/Manifest
+++ b/net-wireless/gr-ieee802154/Manifest
@@ -1,2 +1,4 @@
-EBUILD gr-ieee802154-9999.ebuild 1117 BLAKE2B 7eb4f00602d9dc3159a28687e3bf436137b66753e3f1b71bd51cc16017b116e312bd07db864eb91a1fc4314152f1491acfde3d8953210c6fd3a4ee3792265d75 SHA512 9c4d0358f1389352ae4d5d37fd1ad0b6fd2c55ff75392d2096fd3602f024293a8b1f33483eefce3f8cc193716dc619e267f0ae757b9a90bfde64017cf7c3a089
+DIST gr-ieee802154-0.0_p20180402.tar.gz 195464 BLAKE2B 391bd4eefb5a90135a084a94c2edd83e6f2c2bd6dca26be4d9a54448382d5ee463e1740c305e9583be0107b424c67e74fac84ece147844e7c2a63f6096c7dd36 SHA512 90f164bdcd636dee68a49fe844901ca73e1f743fdeacd8019edddc57c681ec3d1fcfe209d8abd89e2013c2c2c436b7992fe0b0dbe9c88c04352aebc0813a9d96
+EBUILD gr-ieee802154-0.0_p20180402.ebuild 1325 BLAKE2B b7747fd6122f2901578effdca4b729b526abe2aa01f3535c1f98cc80bd4591edb6a75f58f6b5e875488474bd4903673bb217b499d81d545b9bb3e9c46ed18896 SHA512 5c08a8ee25f84f05a2cb5bceb5e45382fed59ce06751fe4c9e9cd7bd1485405dd19d7a04042a70cff1e87cef5fb0d28742db824554dddc342b4f8cb30456b74c
+EBUILD gr-ieee802154-9999.ebuild 1325 BLAKE2B b7747fd6122f2901578effdca4b729b526abe2aa01f3535c1f98cc80bd4591edb6a75f58f6b5e875488474bd4903673bb217b499d81d545b9bb3e9c46ed18896 SHA512 5c08a8ee25f84f05a2cb5bceb5e45382fed59ce06751fe4c9e9cd7bd1485405dd19d7a04042a70cff1e87cef5fb0d28742db824554dddc342b4f8cb30456b74c
 MISC metadata.xml 326 BLAKE2B 0c715a85a0e2a4aa2ff0ac84318ea552eab5731a60b9b8391ec2540cd30c0f28e13e0b9aa17c45169d335bd10f457b79b11cd2c81538f6b3b11773223ca13364 SHA512 725d903a1befe5e9b41eae5478f65f11dd30a42c5c73597cd8a613347a271528357a176d5e88359ff6cd1074070e6ff413cb70f23d21b9467dd53a5b0d2d65a9
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild
new file mode 100644
index 000000000000..558bac59bdce
--- /dev/null
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-0.0_p20180402.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="IEEE 802.15.4 ZigBee Transceiver"
+HOMEPAGE="https://github.com/bastibl/gr-ieee802-15-4"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git"
+	KEYWORDS=""
+else
+	COMMIT="c969b3fd2059472a28dee6f911083dd03d1dd569"
+	SRC_URI="https://github.com/bastibl/gr-ieee802-15-4/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/gr-ieee802-15-4-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+
+RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+	dev-libs/boost:=[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	dev-lang/swig:0"
+#cppunit is listed in cmake, but only needed for tests and there are no tests
+#	dev-util/cppunit"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	#although cppunit is not used, it fails if it isn't there, fix it
+	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt
+	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt
+	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	cmake-utils_src_configure
+}
diff --git a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
index d697f092a4dd..558bac59bdce 100644
--- a/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
+++ b/net-wireless/gr-ieee802154/gr-ieee802154-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 inherit cmake-utils python-single-r1
@@ -13,9 +13,11 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bastibl/gr-ieee802-15-4.git"
 	KEYWORDS=""
-#else
-#	SRC_URI=""
-#	KEYWORDS=""
+else
+	COMMIT="c969b3fd2059472a28dee6f911083dd03d1dd569"
+	SRC_URI="https://github.com/bastibl/gr-ieee802-15-4/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/gr-ieee802-15-4-${COMMIT}"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
@@ -36,6 +38,7 @@ src_prepare() {
 	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt
 	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt
 	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt
+	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 233a39edf6c3..b354bb235fad 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,4 +1,6 @@
 DIST gr-osmosdr-0.1.4_p20170612.tar.xz 174416 BLAKE2B d0ef0d4348b561da10f3e8b99fb43f93fbee5c19a1a4fdcc465f2a63425a42ad0f8d64f522e4aafd5182e66c3c96b42f603e9b595e61b0be15b45eae5330fe5e SHA512 9cf3d0453696c7cfe0679136335a71ec5fd18c4b09cbe3e75fca90626065bf6640969bf224219fe796739abbc3b627eb8bf3509b52f764c38b57f169005ea933
-EBUILD gr-osmosdr-0.1.4_p20170612.ebuild 1938 BLAKE2B 3e38f3d1095f3c5156a8c330075b76434cf7078b913cd1e69c523038470a10afa036fd0c09ff5cf3e20444ac3306646d45d7081b5fbffca544ee05eb9b11628e SHA512 f3ed65e23a8c25b4b6898e24b199659575185234eb92851483ce3d9fb213e1a868e4ba38a2dd7ebc0fec42fd1107888effa4a54886380fed9c750b356ab6e6e0
+DIST gr-osmosdr-0.1.4_p20180626.tar.xz 179568 BLAKE2B 223d23bd17edd5f4ee78237e509c79e5e7e49bbfb516009c3b5a715f386fcd138beea48e417d4576a7749cdb440736b6d92c8766b614bf617ef6b2bb4a293fda SHA512 8540da1f4d6936e0a97fa2f3e24af1866d44620fd7e7bc65b323364f67f1527fe8e0efd7bf0349be5e3d61f2ed24fa736c924ea0038e44fa3ab72848fe254a28
+EBUILD gr-osmosdr-0.1.4_p20170612-r1.ebuild 1951 BLAKE2B 1c1fbdf48c2f2562bc915ec64ad446dac8b3b71e32e0ad515731204057d9b6e2f5c79530b5a0bdd44703e93b01f294cae6ab25f343749f091fd40ec9429ef204 SHA512 fc42ab57b5ab2fe4971d3043f183a35958380e97bcc5641fc791b767ecda98397fa5315b89e568666a6de475330ac4dd90709c8d81b55e30422fd107e7af2286
+EBUILD gr-osmosdr-0.1.4_p20180626.ebuild 1952 BLAKE2B 373da56a29a037cbe3bd428985ab230f48da301489ddd752f8d55c4aa37fd110ecf6479e43b11cf3522fcfa6e4cac0a16632b287bd4925f6074ce5bef7753d8e SHA512 5f1f3ae2c1b0b0a5d5b189f97394d9007250a7b0d9e8596d7edb6c5a2cbd25340ff929c245dbccf6344737bc36ed1be2f94119302205ddd29c1994302d4c974e
 EBUILD gr-osmosdr-9999.ebuild 1951 BLAKE2B 188473e7daca19b30ac21eb480164950833fc90c2f46464622d59041210d238b040b9d45c216d8b1107cc8c2d1c690694173c2665e14ed9509b3681d4a90914c SHA512 25c5db2b82e7072085fcc65d06a8472228a2f313c37dbadbe2a3078cd306a2cacf4333a05038e6b31171ee37e33db2c31deed6809daaa7e15aa35a60e09dd139
 MISC metadata.xml 807 BLAKE2B 1bfa0c852f52882323bd9a08d0ca16eb234e4514b7bc1d6825baf8e29e650ccbf28d1e33ff45c826563cd256e12eb32207a217dfdc70a5623baae2da39040a4d SHA512 9981bc760da9077c8ccf54a5184caa03f3e9614ff253f9163bd6be0245506e26489c97010186e7861f9a8513245d789c73d2f28ba3045878bf2a5b0b440b69f1
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612-r1.ebuild
index 579c974f8abe..6e8fa0434f9e 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612-r1.ebuild
@@ -29,7 +29,7 @@ IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd"
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
 	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
-	bladerf? ( net-wireless/bladerf:= )
+	bladerf? ( <net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild
new file mode 100644
index 000000000000..2286e8a9c6a1
--- /dev/null
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf"
+HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+else
+	#SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"
+	#git clone git://git.osmocom.org/gr-osmosdr.git
+	#cd gr-osmosdr
+	#git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} | xz > ../gr-osmosdr-${PV}.tar.xz
+	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
+	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
+	hackrf? ( net-libs/libhackrf:= )
+	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
+	mirisdr? ( net-libs/libmirisdr:= )
+	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
+	soapy? ( net-wireless/soapysdr )
+	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/cheetah"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DENABLE_FILE=ON
+		-DENABLE_BLADERF="$(usex bladerf)"
+		-DENABLE_FCD="$(usex fcd)"
+		-DENABLE_HACKRF="$(usex hackrf)"
+		-DENABLE_IQBALANCE="$(usex iqbalance)"
+		-DENABLE_MIRI="$(usex mirisdr)"
+		-DENABLE_PYTHON="$(usex python)"
+		-DENABLE_RTL="$(usex rtlsdr)"
+		-DENABLE_RTL_TCP="$(usex rtlsdr)"
+		-DENABLE_SOAPY="$(usex soapy)"
+		-DENABLE_UHD="$(usex uhd)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use python; then
+		python_fix_shebang "${ED}"/usr/bin
+	fi
+}
diff --git a/net-wireless/jackit/Manifest b/net-wireless/jackit/Manifest
new file mode 100644
index 000000000000..9ce0256be7e9
--- /dev/null
+++ b/net-wireless/jackit/Manifest
@@ -0,0 +1,3 @@
+DIST jackit-0.0_p20170918.tar.gz 19104 BLAKE2B 57ba557e8ce0e10af68ed5445dc13ac51661ecd8b7dae7093643968b82d90a3ce3844571b4d84d3355a143382624af1fa16ff6d2432d07a4edc7ed9fd8a4b1fa SHA512 15e11594adf1f95e8b547ca1da9d44d93e263fa8b289a23413492bb9a991fdfc0d20d633c5ba66a9a254f12ad7301793f8456bd9197e1ad4207e5a2dd109babd
+EBUILD jackit-0.0_p20170918.ebuild 679 BLAKE2B 878ff6371649cd6839ed851aa35c91dcde41fd7d367f919a7643c79b6a5a2626671f5d60bbea296cdf06bf5ddebef1dad111ea1d729a258f58e96307985b1a34 SHA512 825416ca7d79052bc890f7bfcaabb9a29604208faa551cc7305cc13dcd50b43f59743e767e369b5307babf98b4adc6447e6a854dc2d61df43b407c1f5c586b7f
+MISC metadata.xml 347 BLAKE2B eb39ba237c6c887ba3ad252447e758af07bd54dad54213350f1db3f1dcda41fbc0e706604e86a4d99344b290c79df24d7908c153b2029b9a686c6a6af3cbc12c SHA512 75f028b7eb6bc20c2b9b401c1bf29a32b9c51aa4ec247e1d9effc8a658237d8932748c14cdb11014eb8a11c30fa0b8199830023294b33f38fe10e16e3a463af8
diff --git a/net-wireless/jackit/jackit-0.0_p20170918.ebuild b/net-wireless/jackit/jackit-0.0_p20170918.ebuild
new file mode 100644
index 000000000000..09d8500674b8
--- /dev/null
+++ b/net-wireless/jackit/jackit-0.0_p20170918.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Exploit Code for Mousejack"
+HOMEPAGE="https://github.com/insecurityofthings/jackit"
+COMMIT="1c057fad102af7daad537421d95e2695caeff2b7"
+SRC_URI="https://github.com/insecurityofthings/jackit/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+		dev-python/tabulate[${PYTHON_USEDEP}]
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pyusb[${PYTHON_USEDEP}]"
diff --git a/net-wireless/jackit/metadata.xml b/net-wireless/jackit/metadata.xml
new file mode 100644
index 000000000000..75a85e8dac53
--- /dev/null
+++ b/net-wireless/jackit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">insecurityofthings/jackit</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-wireless/mousejack/Manifest b/net-wireless/mousejack/Manifest
new file mode 100644
index 000000000000..f3aca9d19521
--- /dev/null
+++ b/net-wireless/mousejack/Manifest
@@ -0,0 +1,4 @@
+AUX mousejack 858 BLAKE2B 5989e4f8c6645bc2feb8fe2ebbb9d2a2b5beba328016aa3c0c53ff20720b8e62cd08f83dc08dc608eb1b8ff27f3a92ea0a547547074bf9cca56276b0e63caad3 SHA512 31c89a7d85ab36a978439ecaaa03dbae1b1e8511d3aa02b1acb521854d81b4e8c012c202792abbf28f25283ec718ad4abd4d14a16ba4c8ead073c054490e9c84
+DIST mousejack-0.0_p20160726.tar.gz 34252 BLAKE2B 7511d29aa94f2fb5590b34d52eaa64150f3931933f043c9028e2d9cae61342a314a369e80e51e1150294afaadca06e58ec71ba4df4150a7a58d9a82d28919a58 SHA512 01fc87a347aea9ccad7611ef494da0521da278b7664e511409f0f822327b02f6fb555c5b5da86aae998b8fd34b7a55260d03594fbd9bb61c3ceca77e7d54958c
+EBUILD mousejack-0.0_p20160726-r1.ebuild 1223 BLAKE2B 368d2988a0de8955e236f6cf7d79b005607df67adb376b9ceb9b55dff5fc9499ba65e8fdd3589fc72b7aaddf2a93e0222f46dd05bd4b6bb19f373bc5a8f15df4 SHA512 d214d836d1b00b8fa464fd0e3f50713a60b2d3799566a3809105485d2f500614442aba9f867f777edea184c9e81cf1b6421dbe79a5a30ed3b28d4d9cbe0a8395
+MISC metadata.xml 360 BLAKE2B ca2e678d3f96cece827270a7c5ee404a5e926c0a231979c4cc4442085fde9af1ce8d28f2a07b5bcf7f475eccb3b772d843ef36c03ae405205e710f5a3a240195 SHA512 ed42ea84e9b7f97be6aafb2cea3495e63abab197759a31795ebab8900f29caf500040b0deaf7997c6f598a8a8db3b2a64925d6df05f9b5b851037bd4e25b0b3a
diff --git a/net-wireless/mousejack/files/mousejack b/net-wireless/mousejack/files/mousejack
new file mode 100644
index 000000000000..666ea47d9c9e
--- /dev/null
+++ b/net-wireless/mousejack/files/mousejack
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+usage() {
+  printf "The following firmware's are supported:\n"
+  printf "Nordic Semiconductor Bootloader\n"
+  printf "CrazyRadio Firmware\n"
+  printf "RFStorm Research Firmware\n"
+  printf "run \"mousejack install\"\n\n"
+  printf "To flash Logitech Unifying Dongle C-U0007\n"
+  printf "run \"mousejack logitech_install\"\n\n"
+}
+
+if [ -z "${1}" ]; then
+  usage
+  exit 1
+fi
+
+#parse args
+while true; do
+  case $1 in
+    -h|--help)
+      usage
+      exit 0
+      ;;
+    install)
+      /usr/share/mousejack/prog/usb-flash.py /usr/share/mousejack/dongle.bin
+      exit $?
+      ;;
+    logitech_install)
+      /usr/share/mousejack/prog/logitech-usb-flash.py /usr/share/mousejack/dongle.formatted.bin /usr/share/mousejack/dongle.formatted.ihx
+      exit $?
+      ;;
+    --)
+      shift
+      break
+      ;;
+    *)
+      break
+      ;;
+  esac
+  shift
+done
diff --git a/net-wireless/mousejack/metadata.xml b/net-wireless/mousejack/metadata.xml
new file mode 100644
index 000000000000..c5c7cc912abc
--- /dev/null
+++ b/net-wireless/mousejack/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zerochaos@gentoo.org</email>
+    <name>Rick Farina</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">BastilleResearch/nrf-research-firmware</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-wireless/mousejack/mousejack-0.0_p20160726-r1.ebuild b/net-wireless/mousejack/mousejack-0.0_p20160726-r1.ebuild
new file mode 100644
index 000000000000..2593ee853819
--- /dev/null
+++ b/net-wireless/mousejack/mousejack-0.0_p20160726-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Firmware and research tools for nRF24LU1+ based USB dongles and breakout boards"
+HOMEPAGE="https://www.mousejack.com/"
+COMMIT="02b84d1c4e59c0fb98263c83b2e7c7f9863a3b93"
+SRC_URI="https://github.com/BastilleResearch/nrf-research-firmware/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/nrf-research-firmware-${COMMIT}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-embedded/sdcc[device-lib,mcs51,sdbinutils]"
+RDEPEND="${DEPEND}
+		${PYTHON_DEPS}
+		dev-python/pyusb[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	mv tools/lib tools/nrf24 || die
+	for file in tools/nrf24-*; do
+		sed -i 's#from lib#from nrf24#' ${file} || die
+	done
+	default
+}
+src_install() {
+	insinto /usr/share/${PN}
+	doins bin/dongle.{bin,formatted.bin,formatted.ihx}
+
+	python_domodule tools/nrf24
+	python_doscript tools/nrf24-*
+
+	python_scriptinto /usr/share/${PN}/prog
+	python_doscript prog/usb-flasher/usb-flash.py
+	python_doscript prog/usb-flasher/logitech-usb-flash.py
+	python_doscript prog/usb-flasher/unifying.py
+
+	dosbin "${FILESDIR}/mousejack"
+}
diff --git a/net-wireless/portapack-havoc/Manifest b/net-wireless/portapack-havoc/Manifest
new file mode 100644
index 000000000000..648c4bd5febf
--- /dev/null
+++ b/net-wireless/portapack-havoc/Manifest
@@ -0,0 +1,3 @@
+DIST portapack-havoc-0.0_p20180612.tar.gz 74244267 BLAKE2B 7a6b632cd3766681e691cb0e8405e9493d4d4b46008c9905192f492715238378713da6a305383855b50935f5ffa943e5134677ab1580275a645b46e0e025c561 SHA512 b8ea6a4aa6682793a69cefb2815fcaf51a5f6f253bea2c34e00d76fba15f9d700f45f1a36c1ac7e1d7c640ac19ee64dc835c76c3d9964d73d18443299a2d6fdd
+EBUILD portapack-havoc-0.0_p20180612.ebuild 1321 BLAKE2B 5c05a19c2d1ca029f9a7435a68e9806a937c758473e01b8b8dcf2f34bf31e5deba41f9772bd126014609a16011097d36ec4abfd1be4e81da52cb70659fee7b33 SHA512 29511fbcb82841e86480744af001654ab049ed98e3e2e30eb0a138fb1c7d75165498f93c36b1d54cf8f0bd767e653c4f743b9decaac31c82ad18e9f242cc68cd
+MISC metadata.xml 335 BLAKE2B 86a1ca94a1af4aeea45ca7025863b74eda0267683d4ff10a8816320146ba47ed42ac6c61410cdaa3a3b74fccdce43f4309b8b85c3ba0451f7ed0086e9bd3a2c8 SHA512 bcaa25c76ac35f9e588ed193542a4835eb3bdd36e379e7808f2ac3f1da0da19cd36f0b2d86875887e6e6bc70bbf4d6cbf9fc0c0f8ba0f88b2fdc4a1db46b377c
diff --git a/net-wireless/portapack-havoc/metadata.xml b/net-wireless/portapack-havoc/metadata.xml
new file mode 100644
index 000000000000..379b11c6216c
--- /dev/null
+++ b/net-wireless/portapack-havoc/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zerochaos@gentoo.org</email>
+		<name>Rick Farina</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">furrtek/portapack-havoc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-wireless/portapack-havoc/portapack-havoc-0.0_p20180612.ebuild b/net-wireless/portapack-havoc/portapack-havoc-0.0_p20180612.ebuild
new file mode 100644
index 000000000000..59b7f30080d1
--- /dev/null
+++ b/net-wireless/portapack-havoc/portapack-havoc-0.0_p20180612.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Custom firmware for the HackRF SDR + PortaPack H1 addon"
+HOMEPAGE="https://github.com/furrtek/portapack-havoc/wiki"
+COMMIT="609235b19f55d0bf278c0e7c4b9f9b6b15136247"
+SRC_URI="https://github.com/furrtek/portapack-havoc/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
+
+PDEPEND=">=net-wireless/hackrf-tools-2015.07.2-r1
+	>=app-mobilephone/dfu-util-0.7"
+
+src_configure() {
+	true
+}
+
+src_compile() {
+	true
+}
+
+src_install() {
+	insinto /usr/share/hackrf
+	newins firmware/portapack-h1-havoc.bin portapack-h1-havoc-${PV}.bin
+	ln -s portapack-h1-havoc-${PV}.bin "${ED}/usr/share/hackrf/portapack-h1-havoc.bin"
+
+	cat << EOF > switch_to_havoc
+#!/bin/sh
+printf "Hold down the HackRF's DFU button (the button closest to the antenna jack)\n"
+printf "then plug the HackRF into a USB port on your computer.\n"
+printf "After the HackRF is plugged in, you may release the DFU button.\n"
+printf "Press any key to continue or ^c to abort\n"
+read
+dfu-util --device 1fc9:000c --download /usr/share/hackrf/hackrf_one_usb_ram.dfu --reset
+sleep 2s
+hackrf_spiflash -w /usr/share/hackrf/portapack-h1-havoc.bin
+EOF
+	dobin switch_to_havoc
+}
diff --git a/net-wireless/soapybladerf/Manifest b/net-wireless/soapybladerf/Manifest
index 0a38fa3910ea..ca3d1234c949 100644
--- a/net-wireless/soapybladerf/Manifest
+++ b/net-wireless/soapybladerf/Manifest
@@ -1,4 +1,4 @@
-DIST soapybladerf-0.3.4.tar.gz 26618 BLAKE2B 1c09aa4733e16de67bb176bd531d544b11358901a58325e6fdff3391bf8e218cdb13729f14c0ed87d5d32de5783368024a3c73e8ea8a9d5885d06bd8ae51e44f SHA512 694ec68da292efc98b5d0864a8afa71ecf72fa91ac03650e5f2b75e938fb27cc73fb1dabe57c336e4d4a217d8931fb6750b1932881bdf4aa0bbd53cf8617564b
-EBUILD soapybladerf-0.3.4.ebuild 667 BLAKE2B e5791fde26d13c654e649342bca7e702e5ebef668b450a029919c995a8989f5ef139a9ff934031c2d25592ca265ea8135b4ec46da17770c47441f3e426109b84 SHA512 642bf5bcf6e9e100a096fd6c4d12e611bea0f21c3ef124c41174df6cf24fd4f0bb8c55cbd14dca50ff4747988ded6c04777d45a0792eac3507783585207ab45b
+DIST soapybladerf-0.3.5.tar.gz 27937 BLAKE2B eb94e0deb97a376b2e45f41100ce64ed4a0718c9b2623b4270e27c23faa0c035d6568b2a8129308851a75ebef8f9f7e9ad519af23896493ca4616d271e0a2438 SHA512 af22703c16d8b40d58e966ce9ce705652e2661bd46d2c0dc2a2c0315a66f4283172d17de4dc3d080cf011cdde9c002107653fe5a02de27df19b47098235f40a7
+EBUILD soapybladerf-0.3.5.ebuild 666 BLAKE2B f0cc90e8491fe04c8f525f5cec7d0535026fd45464c20a94de56858f6802db81db61af52a1435753639a652d9509a6d042be8e446d38da3d010d41cf2bf8e6bc SHA512 16ef7d5ec0f0cf1205c79aa49dbe22cd9e244c7c087f662d9ef48f867757734805cfdc3c9f1d7672980f501145c92f885c721453259abc6850f128d49634b004
 EBUILD soapybladerf-9999.ebuild 667 BLAKE2B e5791fde26d13c654e649342bca7e702e5ebef668b450a029919c995a8989f5ef139a9ff934031c2d25592ca265ea8135b4ec46da17770c47441f3e426109b84 SHA512 642bf5bcf6e9e100a096fd6c4d12e611bea0f21c3ef124c41174df6cf24fd4f0bb8c55cbd14dca50ff4747988ded6c04777d45a0792eac3507783585207ab45b
 MISC metadata.xml 434 BLAKE2B da3841724dfb1d301e29abd0c97ff4db9cb851fe55b1fb1ac576d39edb2dbb800bfc5b0857132325103b0138c6809d38d4af49b7548214f83dda38b2ce0ce39d SHA512 a672da1167904fe55179376d6c769066ab66639369fae311ad3a6b9afcab931554f148920c4deedcfbb57cd4fd8cee940462082a7fa68408913731939f651439
diff --git a/net-wireless/soapybladerf/soapybladerf-0.3.4.ebuild b/net-wireless/soapybladerf/soapybladerf-0.3.5.ebuild
index 29262fb3f0f0..d12292f05f7d 100644
--- a/net-wireless/soapybladerf/soapybladerf-0.3.4.ebuild
+++ b/net-wireless/soapybladerf/soapybladerf-0.3.5.ebuild
@@ -22,5 +22,5 @@ LICENSE="MIT"
 SLOT="0"
 
 RDEPEND="net-wireless/soapysdr
-		>=net-wireless/bladerf-2017.12_rc1:="
+		~net-wireless/bladerf-2017.12_rc1:="
 DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapyhackrf/Manifest b/net-wireless/soapyhackrf/Manifest
index 11e1d1158374..80c76f42b684 100644
--- a/net-wireless/soapyhackrf/Manifest
+++ b/net-wireless/soapyhackrf/Manifest
@@ -1,4 +1,4 @@
-DIST soapyhackrf-0.3.2.tar.gz 15643 BLAKE2B e57a0e2bc50984434f0e97207f8b274cc08d84e5884f4bee523614adb07d10cee810f1dd43d771f8b3a97bdb0dd84a0ac6b34d840aa9c93df19f7777f658d8d4 SHA512 667f27491d5fe18a04670ff0ade32b4a6f696ba8718e211957c7f8bab64957023ee4905df22214524ae3796a350a725d4f192fde21bb3d60cb9e69a4e629df90
-EBUILD soapyhackrf-0.3.2.ebuild 633 BLAKE2B c0149f8cb1f577f83b31821265a3356219f4b3b9b1609f01b0fdabd87d3f973af4fd32f79c3a5c27bbebe6e6018e17ffd3e6d747261f84d20d54f18d0aabaa04 SHA512 6d676eaa271fbf6376a7a4a818ab73a130668224124ad85bcfb3bcac6108d5cb94bb4acaa02715f230b7b9bab564561e88421ccf54b34db528c06d51c2e95901
+DIST soapyhackrf-0.3.3.tar.gz 15853 BLAKE2B 2e4c551add132e153033197ca6dc4762bac854d0959b524de7c65cdb0371ff862a52102868a1c9a5ad730c43d09730c2093666d186b79abe0d3d74e84b76a800 SHA512 d0e6ddbb8054b11bfb121a18e435c0f0c23290e5e29e89af83f660865e1c8adf4ed38082c96ab6a3cb68a50b7379f3fe5ef171616eccabe3f67d65b71d08dba9
+EBUILD soapyhackrf-0.3.3.ebuild 633 BLAKE2B c0149f8cb1f577f83b31821265a3356219f4b3b9b1609f01b0fdabd87d3f973af4fd32f79c3a5c27bbebe6e6018e17ffd3e6d747261f84d20d54f18d0aabaa04 SHA512 6d676eaa271fbf6376a7a4a818ab73a130668224124ad85bcfb3bcac6108d5cb94bb4acaa02715f230b7b9bab564561e88421ccf54b34db528c06d51c2e95901
 EBUILD soapyhackrf-9999.ebuild 633 BLAKE2B c0149f8cb1f577f83b31821265a3356219f4b3b9b1609f01b0fdabd87d3f973af4fd32f79c3a5c27bbebe6e6018e17ffd3e6d747261f84d20d54f18d0aabaa04 SHA512 6d676eaa271fbf6376a7a4a818ab73a130668224124ad85bcfb3bcac6108d5cb94bb4acaa02715f230b7b9bab564561e88421ccf54b34db528c06d51c2e95901
 MISC metadata.xml 433 BLAKE2B b7864a9b9321c5cf86ad577d28555f00e4fd49ac6fada7c22a4e204fb38508e3f3e4cd3020940b8cae33b0aa14338e3c96b044bd56804d181d018f5c31be82bd SHA512 6ca16459623f460a4d9b6b101aa96e1092ee29ccdb9098780b236596608505886d047d0207ea65a2415fe7096f595c2a9c3161bbcc1131ac0977b8d0f66011cf
diff --git a/net-wireless/soapyhackrf/soapyhackrf-0.3.2.ebuild b/net-wireless/soapyhackrf/soapyhackrf-0.3.3.ebuild
index b5dece6d6651..b5dece6d6651 100644
--- a/net-wireless/soapyhackrf/soapyhackrf-0.3.2.ebuild
+++ b/net-wireless/soapyhackrf/soapyhackrf-0.3.3.ebuild
diff --git a/net-wireless/soapyrtlsdr/Manifest b/net-wireless/soapyrtlsdr/Manifest
index 540d7c6e445d..2048e7c8fb72 100644
--- a/net-wireless/soapyrtlsdr/Manifest
+++ b/net-wireless/soapyrtlsdr/Manifest
@@ -1,4 +1,4 @@
-DIST soapyrtlsdr-0.2.4.tar.gz 14003 BLAKE2B b638bc9795d722446cec4e2866e3cf8ee78665b874e44bb7249b6b8c465b024488284ccf3ac50aa504146253501d96c899abfa367732f14d90cf5d3641866de0 SHA512 3e5efd18793cc0404b833784c7d0b2f1786b38ed34529c12e949ce624d2488f04f0236e86bec7da08cd0baec5f36ccb6610d945d57622868e9e340c6f288b7a6
-EBUILD soapyrtlsdr-0.2.4.ebuild 642 BLAKE2B 7b21c292da81448ee01e86752502dd75bf0e403c6c7d2a849767c9aa525f4245654fa2b42c67fd7c5877a5217e312a11c96749905480cddd937492a737ee6f8e SHA512 f0dc7f8a53b950081d9e16a1394a933754fcdd566bebe4212d6e41d4402fd3c07d1d9e8b4d170ef5f38ca2673077a677b256a669062b6a53d2ac658ad4796399
+DIST soapyrtlsdr-0.2.5.tar.gz 14101 BLAKE2B 3fc48e5cece291220a64ec1fd06492a94497e3e639c4fbdcb4c88d4b0431676bbf7a8d531123acc91d937380abe6a96a1b9df4cd7150203e31e17ba859da7113 SHA512 2e6343833d0ef48b11c6be6ea85c87276d58ab810b6b47fa2735b909beb6a758856ef2cbef3a0d478c27dd1fea829a049dd91252ae9807415f8ea66f15054a64
+EBUILD soapyrtlsdr-0.2.5.ebuild 642 BLAKE2B 7b21c292da81448ee01e86752502dd75bf0e403c6c7d2a849767c9aa525f4245654fa2b42c67fd7c5877a5217e312a11c96749905480cddd937492a737ee6f8e SHA512 f0dc7f8a53b950081d9e16a1394a933754fcdd566bebe4212d6e41d4402fd3c07d1d9e8b4d170ef5f38ca2673077a677b256a669062b6a53d2ac658ad4796399
 EBUILD soapyrtlsdr-9999.ebuild 642 BLAKE2B 7b21c292da81448ee01e86752502dd75bf0e403c6c7d2a849767c9aa525f4245654fa2b42c67fd7c5877a5217e312a11c96749905480cddd937492a737ee6f8e SHA512 f0dc7f8a53b950081d9e16a1394a933754fcdd566bebe4212d6e41d4402fd3c07d1d9e8b4d170ef5f38ca2673077a677b256a669062b6a53d2ac658ad4796399
 MISC metadata.xml 433 BLAKE2B 17192d2957af1deaddf7baec5c5ff77eb4ea40bbd80b7a91e5a36f91a4b53f6f6b142dc76ade70c016f8934905642c49851857bcb7823e5e3adee5e24cfccece SHA512 6b6295bd49522a9c1eb4747c4039a77201ec2dabb03250dae21b93605a1df695970d33ebe12108bd2effa7fc07ba6ab695de949e02099f89b7e334531145fe41
diff --git a/net-wireless/soapyrtlsdr/soapyrtlsdr-0.2.4.ebuild b/net-wireless/soapyrtlsdr/soapyrtlsdr-0.2.5.ebuild
index 0527f6ff8d21..0527f6ff8d21 100644
--- a/net-wireless/soapyrtlsdr/soapyrtlsdr-0.2.4.ebuild
+++ b/net-wireless/soapyrtlsdr/soapyrtlsdr-0.2.5.ebuild
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index c2ad36ca49f7..75f9ad2d0972 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -5,11 +5,11 @@ AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9
 DIST unifi-5.6.39.zip 63559153 BLAKE2B 377c9cbcb49f3f7fe687c7877ca37b4cf4c62076da1a05ce64599be86b8503b910e941bdaa93b9bf77ed259e46ed5355befb695c0cff41157fe1e43a10643216 SHA512 456407a0fe140ef35718591777fcc1084ca9ee4f70c97deb554318390aa3e530c5dfbbbe57b659f83d52ca44be8ebd57071cfad2bf7f0f180fa5f2fa9100a1d9
 DIST unifi-5.8.25.zip 80091828 BLAKE2B f675ff304c2e7a87da7ed02bd4873015a1155949e6b3b2b4561db06565197e1660512cbea118a50bd975de7d6268a090fad6742e3a82bb4fdf20f19f39099ae2 SHA512 4572ebe55971d14ca76f39cf298eedf879c4ad597ac87e4fe13167f8219b8f822f3478002ccda7ca1d72daba05efa52932e6d163c1e2b5ac5d289020e351044f
 DIST unifi-5.8.28.zip 80106124 BLAKE2B 9cf6a433bf22d6946572f277759f032f9c7ac3bcc853deaacf2b858d95609f9cb6bbceb2258224db5a56b5d161daec0ff18320ecf3bc589ce045426d3ca9ed3c SHA512 b76bff822971896d7b0a0837aba6075aaa60a185dc25a8849ec12b34b36a9ffdb84cf3c71ec65ad81bcd068aa9917574eee109582bad341bf2edd0ffca00acd6
-DIST unifi-5.9.20.zip 103033996 BLAKE2B 25058eb76580afadcfb0a49ab6cb654afd56084a3b912cc151e78a0b9c571d89d774a0a5fd80c9354a9d4fa80cc32076b67c1e7b1a79102a1eeb4208922e43ff SHA512 cd6c886f14e912abf4d94db8ef6bab63d2c5d70c7116e00457d1c43331f66882a3dd3d8e6b5769d17981bd9d7d3417448c4cdf5cf456b4e035a602431debc578
 DIST unifi-5.9.22.zip 103036220 BLAKE2B 1f9df10787a9b5c52ddf786a478dc6a1a08be8f1cb36e4112906294510c2e7f85f5288f9a1bb1796b9902b40b17036ef5051dc4e7d0c970647d0cdab1362ad1b SHA512 9287cfee865aff9cb5612b8559a318d288253206da3a16f7f490146be63886fdd84d686f9e3cfd7c150af3aebcc9fbf3ef99102ca427717742e770578cbc3b47
+DIST unifi-5.9.24.zip 105267574 BLAKE2B 340805389023b0c487aa0b77b4ba1abe92fe12482015eed20c2a77d900324d95686c237d63082507747b6efdaf7904a4b052d1dc332f6d2b9b303d671c0cf5d0 SHA512 630a8410f49741ea00e663907a40979005e71dda0f64767fb5e64107e4a20fba6ba127c0c8a0e7f184d7e417fd5799cf4d6bf00edae9280386a03080db8ced64
 EBUILD unifi-5.6.39-r1.ebuild 1729 BLAKE2B 77a4fb38b6e82763f83f072d595e3f39306aed4ce39f98bfe6783e85eb1c83ab0fc996e94d25b86cd4bad196ae898dace5eb7469147cb3394cda1699ffec1900 SHA512 4415d13c43c30238c756542f6931c12bb6cbcd0163cb6e2c522b6adef39f0c5d3c069d25facdb12575fc0463a8aa3fd479f3274009083a645139d656ce998ae2
 EBUILD unifi-5.8.25.ebuild 1853 BLAKE2B dab351e3ae3b414f81d1b95bdef4d2a1fa406f804dc6d0331169e14138f5436d092803bb8ea86f7000b9d7a9b032dd1995da8130233c3f5db013a0e7bd7e1abf SHA512 cf2b4a2639c1bb4ef8cb73ca9bae37955f3d12e661f2fcf0187b1a880ff3eab67bab41b3292868940f27cf701eedc31a322cd19a0c80686e7bba5a9f7ebf2cc0
 EBUILD unifi-5.8.28.ebuild 1847 BLAKE2B 2165ff736cf596b62291a96d6a7d5967a70fbf3e060c68ed9e21d3658628a93c6f9df441ffd1d75774764a4556f0880dcd3b835767aad87eb2e3c00f9382a76c SHA512 61fc42af8101817953df870a384ce6e156093909f34930c40dcdbb9a3baa402c629ba850a97534384798e8603c33a6b720dec577418c50e039674f8f202515f2
-EBUILD unifi-5.9.20-r1.ebuild 1853 BLAKE2B 147e94e87d0857fb61737e817ff131ba8c9121fba93612be2424b9e0e668b4488e506c0fde9eede0cc7ebb37411a2871b349f359390204d6a6a38bade887d37a SHA512 ccb9dd1c4ae84d1ff2bc69cf6dd69ca13dcd5765380d2cddff76b3e5db7aac1535813e56147a2a51ef9c566fe1f4325286f5691f589a1139c96b3ff7f3c6c99b
 EBUILD unifi-5.9.22.ebuild 1853 BLAKE2B b19069311e9112dbdc45561fae214ca9d65e77bb715f7e1038d7ea501ac4879a4c494e1a9fa9e46661a5b640e64547ad1c740806aa2f06d4f7e70c69710d0228 SHA512 d2d73da5c6cb736dd1ca5787e361d2ea001341197c7044b35556bccd7a4dc8d43b1fc7dd07334b29d38919086248986a16ff1ced68d7c342b32785804ed14a45
+EBUILD unifi-5.9.24.ebuild 1853 BLAKE2B 4c7c121244827553ba3c6ea605a7555a1444af4606ed0dd461b432962351285a3630184e2683de852401ab8eb8b2fc005d1a189eb70a602f0f66abf4c73c4125 SHA512 460497e76da156f6f27444e9c0de2e6443704a4998962d11df2025a3f3c30812350edea9ea4a1ba635d5f26f01482272c7221fe5ba59cc5ea9a7200c26a3a8bc
 MISC metadata.xml 803 BLAKE2B 5d50d4d0c8353661b471d243682812f77cc9a969d3117c6cf1fff60ecef4e83767b8e235cb0e010383bf1f754a7f1a1261a73427b3bfc1446f7ef08ba837ab36 SHA512 2588b43cf7049379def1b487815c317377e8e04293e54dd6035c50ce612f0ce3ac2039c3802eb7b9b6be172c49aef68f28a547fec5f565e42acaf0d2fdac8abe
diff --git a/net-wireless/unifi/unifi-5.9.20-r1.ebuild b/net-wireless/unifi/unifi-5.9.24.ebuild
index 45d86d138b02..20d8c534e037 100644
--- a/net-wireless/unifi/unifi-5.9.20-r1.ebuild
+++ b/net-wireless/unifi/unifi-5.9.24.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Used, when it's an unstable, beta or release candidate
-RC_SUFFIX="-5975c092ea"
+RC_SUFFIX="-64c9fed777"
 
 inherit systemd user
author	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
commit	43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree	6208a7f4fc744684fce0f55acbb47511acace498 /net-wireless
parent	28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)