gentoo resync : 09.06.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-06-09 09:27:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-06-09 09:27:03 +0100
commit: cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch)
tree: 047fc92023c520d07f13ec5ac96e094d1b312a7a /net-wireless
parent: 7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff)
39 files changed, 722 insertions, 432 deletions
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 113e2aafd994..c3e4abcb891f 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 6b87fa372fd9..035ea44efeb0 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -10,7 +10,9 @@ AUX bluez-udevadm-path.patch 568 BLAKE2B 7c9d6fad4779cec9ee110c9f0723fe669e59907
 AUX rfcomm-init.d-r2 546 BLAKE2B c487e51fcd4837c1cfce8b630062d1a882c084691266fd00a43d5ee7aca045fb566ab39638664bc37ec54c516aa327c6ba54b046ed18696cabf3228ad0e28588 SHA512 bcbb6a78c4c25ad797dc1d45180382909a052e9be32439eec85772082a01799f45181e8a90be89b952a68b7276f6ac1cef98fc3f4d0a5e5c8075089a29f3ddd1
 DIST bluez-5.47.tar.xz 1718920 BLAKE2B e5863181ba9b19b81bc430fb900e1a8752749a02dac122a57bd44c41a1aeeb21b4c1476cab2ce89a7d3570fc1b592f1a2ed9e1f96c289faee942d203d1e3aa85 SHA512 86fa1baae1593d4824038db8418358b0be624c81fc23ee8f96ec08979d309a2377be3924ab53cc0fcb712aec8e696360e9a9f4de4c12cc31b14de5cf495a11a6
 DIST bluez-5.49.tar.xz 1744860 BLAKE2B 25b350debb016f93d23a2ecf14183197a3b8e8c0496b82b22a51ccc00ccf0241fb43d7d8d9ed04bdfcc0a1111078b8394e8b9ff23963854e51b6a19cf769811f SHA512 bc2988649420232b92e2c6836857027369f05ace005972f575ed0601c02cc97a07a3b7a0707a8bad72be73df7e8096c8bf023530443556e87c2ccb667981b37d
+DIST bluez-5.50.tar.xz 1755384 BLAKE2B d70763a80fa233cd31fbefc44f73ffceb54c2d7b64ee83df0d2dafb039771d2b18e69dd44b35b2cdf8eee97553c02deca2281f7ec54e958218cf6c4b364a8516 SHA512 64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45
 EBUILD bluez-5.47-r1.ebuild 8003 BLAKE2B d4bf09bdd60cc7bb4069a5cadccdebf31a04bba1d31f4374e394b8dd79a5901ae7e8881435cfe1790dc5882daeef43fae43263c03b9415795ee7694c89c5e5e2 SHA512 e307de7b0805f1d37755ae1355a25f993ac1e870bdc0276e582e66f26a7916c0cd829cceb185796930ecb95ea26b8c74c45f6bf8c47673b90ff922eb72fe2baf
 EBUILD bluez-5.49-r1.ebuild 8104 BLAKE2B 614bf0fab42321ed4b96f92d5309895ff816805ed9405e758981bb0ebc48196a6c14b43349c62b531f19144971b2dab92a6bb1c12894bb8f041580aeb16a04e9 SHA512 cd3308db12790dc05180f0501319d22786150936ce574ec685000aab65fd3bc2c26291cea538afd1ee74c7825fc84618117264d6662376f56f8bda2acca6fda3
 EBUILD bluez-5.49.ebuild 7932 BLAKE2B f9c6a66914d52f6e08d4d40ac27cf8b88c554865e10ade87cf66342489c18a514394eba0b0bca71e4fd37a8a90316a9a3296630b5c45da713c10241b5564e55d SHA512 c7bfd84e13fb86070dd5cdb9ccb1fdec8692973d9775c3b82d4ede76316fc98aaf7bf659acfc9027b049097ff9dc155640d3c1b336adedbe322061ba34a85f9e
-MISC metadata.xml 1123 BLAKE2B 87f3bc5c6709f1d82237c9ef91b30491f8854b79a9d661e7788496361cff763ec510368d08e832df58ad474802619a5b1434acd4c2c20f41a42fd12f2c946b96 SHA512 be4e0c9c8e589d9c2c1f1f8bc2119da6239d726201ce35979996a6364b02fae8782a9b44742a601e14342eb1501734d68b032bceb26d1f2628782dc9ab5d7f93
+EBUILD bluez-5.50.ebuild 8023 BLAKE2B 8a4de0906a26274dda252538c2515e17531b70750ac70db439347fec2b44f19a11caba5de9be4f6f1e69e57ca3d309cf6ecc57a392db8be9cddfb9e56668cc36 SHA512 48348e8bb6e68935985cbdacb0854ed03b6adc48606303fa6be9fd91e7770557b0cd58e4059d9ad1ebb2ba65c966ec541e422d70c81e4d989f7cc292ef6d03fb
+MISC metadata.xml 1173 BLAKE2B 1c9c14538f8686c8b6f99aced931cac0235f0bb86d2e8962ace5174c486b5e7436afc1db3bb493778e70be5b5b389964f0aa8e8925093e08490f98cf6aa6b79f SHA512 151424ecb4edbcb1c632453b42e22114cb9a4ac07a41211735ec28b18072a69a1286b4b9724701016a748df3a519daeb5ef5a3611def327fc2bd461547891de4
diff --git a/net-wireless/bluez/bluez-5.50.ebuild b/net-wireless/bluez/bluez-5.50.ebuild
new file mode 100644
index 000000000000..e6b7d9974ddf
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.50.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools multilib python-single-r1 readme.gentoo-r1 systemd udev user multilib-minimal
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://www.bluez.org"
+SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/3"
+KEYWORDS="~amd64 ~hppa ~mips ~x86"
+IUSE="alsa +btpclient cups doc debug deprecated extra-tools experimental +mesh +obex +readline selinux systemd test test-programs +udev user-session"
+
+# Since this release all remaining extra-tools need readline support, but this could
+# change in the future, hence, this REQUIRED_USE constraint could be dropped
+# again in the future.
+REQUIRED_USE="
+	extra-tools? ( deprecated readline )
+	test? ( ${PYTHON_REQUIRED_USE} )
+	test-programs? ( ${PYTHON_REQUIRED_USE} )
+	user-session? ( systemd )
+"
+
+CDEPEND="
+	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.6:=[user-session=]
+	>=sys-apps/hwids-20121202.2
+	alsa? ( media-libs/alsa-lib )
+	btpclient? ( >=dev-libs/ell-0.3 )
+	cups? ( net-print/cups:= )
+	mesh? (
+		>=dev-libs/ell-0.3
+		dev-libs/json-c:=
+		sys-libs/readline:0= )
+	obex? ( dev-libs/libical:= )
+	readline? ( sys-libs/readline:0= )
+	systemd? ( sys-apps/systemd )
+	udev? ( >=virtual/udev-172 )
+"
+TEST_DEPS="${PYTHON_DEPS}
+	>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+"
+
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	test? (	${TEST_DEPS} )
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-bluetooth )
+	test-programs? ( ${TEST_DEPS} )
+"
+DOC_CONTENTS="
+	If you want to control your bluetooth devices as a non-root user,
+	please remember to add you to plugdev group.
+"
+
+PATCHES=(
+	# Use static group "plugdev" to not force people to become root for
+	# controlling the devices.
+	"${FILESDIR}"/${PN}-plugdev.patch
+
+	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
+	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
+	"${FILESDIR}"/${PN}-udevadm-path.patch
+
+	# build: Quote systemd variable names, bug #527432
+	# http://article.gmane.org/gmane.linux.bluez.kernel/67230
+	"${FILESDIR}"/${PN}-5.39-systemd-quote.patch
+
+	# Fedora patches
+	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
+	"${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+
+	# ???
+	"${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
+)
+
+pkg_setup() {
+	enewgroup plugdev
+
+	if use test || use test-programs; then
+		python-single-r1_pkg_setup
+	fi
+
+	if ! use udev; then
+		ewarn
+		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
+		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
+		ewarn "and hid2hci will not be available."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	default
+
+	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
+	! use user-session && eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+
+	if use cups; then
+		sed -i \
+			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
+			Makefile.{in,tools} || die
+	fi
+
+	# Broken test https://bugzilla.kernel.org/show_bug.cgi?id=196621
+	sed -i -e '/unit_tests += unit\/test-gatt\b/d' Makefile.am || die
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# readline is automagic when client is enabled
+		# --enable-client always needs readline, bug #504038
+		# --enable-mesh is handled in the same way
+		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
+		ac_cv_header_readline_readline_h=$(multilib_native_usex mesh)
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# deps not used for the library
+			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	# btpclient disabled because we don't have ell library in the tree
+	econf \
+		--localstatedir=/var \
+		--disable-android \
+		--disable-btpclient \
+		--enable-datafiles \
+		--enable-experimental \
+		--enable-optimization \
+		$(use_enable debug) \
+		--enable-pie \
+		--enable-threads \
+		--enable-library \
+		--enable-tools \
+		--enable-manpages \
+		--enable-monitor \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
+		$(multilib_native_use_enable alsa midi) \
+		$(multilib_native_use_enable btpclient) \
+		$(multilib_native_use_enable cups) \
+		$(multilib_native_use_enable deprecated) \
+		$(multilib_native_use_enable experimental) \
+		$(multilib_native_use_enable mesh) \
+		$(multilib_native_use_enable obex) \
+		$(multilib_native_use_enable readline client) \
+		$(multilib_native_use_enable systemd) \
+		$(multilib_native_use_enable test-programs test) \
+		$(multilib_native_use_enable udev) \
+		$(multilib_native_use_enable udev sixaxis)
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -f Makefile -f - libs \
+			<<<'libs: $(lib_LTLIBRARIES)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+
+		# Only install extra-tools when relevant USE flag is enabled
+		if use extra-tools; then
+			ewarn "Upstream doesn't support using this tools and their bugs are"
+			ewarn "likely to be ignored forever, also that tools can break"
+			ewarn "without previous announcement."
+			ewarn "Upstream also states all this tools are not really needed,"
+			ewarn "then, if you still need to rely on them, you must ask them"
+			ewarn "to either install that tool by default or add the needed"
+			ewarn "functionality to the existing 'official' tools."
+			ewarn "Please report this issues to:"
+			ewarn "http://www.bluez.org/development/lists/"
+
+			# Upstream doesn't install this, bug #524640
+			# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
+			# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
+			# gatttool is only built with readline, bug #530776
+			dobin attrib/gatttool
+			dobin tools/btmgmt
+		fi
+
+		# Unittests are not that useful once installed, so make them optional
+		if use test-programs; then
+			# example-gatt-client is the only one needing
+			# python3, the others are python2 only. Remove
+			# until we see how to pull in python2 and python3
+			# for runtime
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-server || die
+			rm "${ED}"/usr/$(get_libdir)/bluez/test/example-gatt-client || die
+			python_fix_shebang "${ED}"/usr/$(get_libdir)/bluez/test
+			for i in $(find "${ED}"/usr/$(get_libdir)/bluez/test -maxdepth 1 -type f ! -name "*.*"); do
+				dosym "${i}" /usr/bin/bluez-"${i##*/}"
+			done
+		fi
+	else
+		emake DESTDIR="${D}" \
+			install-includeHEADERS \
+			install-libLTLIBRARIES \
+			install-pkgconfigDATA
+	fi
+}
+
+multilib_src_install_all() {
+	# We need to ensure obexd can be spawned automatically by systemd
+	# when user-session is enabled:
+	# http://marc.info/?l=linux-bluetooth&m=148096094716386&w=2
+	# https://bugs.gentoo.org/show_bug.cgi?id=577842
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=804908
+	# https://bugs.archlinux.org/task/45816
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
+	use user-session && ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
+
+	find "${D}" -name '*.la' -delete || die
+
+	keepdir /var/lib/bluetooth
+
+	# Upstream don't want people to play with them
+	# But we keep installing them due to 'historical' reasons
+	insinto /etc/bluetooth
+	local d
+	for d in input network; do
+		doins profiles/${d}/${d}.conf
+	done
+	doins src/main.conf
+
+	newinitd "${FILESDIR}"/bluetooth-init.d-r4 bluetooth
+
+	einstalldocs
+	use doc && dodoc doc/*.txt
+	! use systemd && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	! use systemd && readme.gentoo_print_elog
+
+	use udev && udev_reload
+	systemd_reenable bluetooth.service
+
+	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
+}
diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml
index 45d6538bf366..3f1b1fdf5cd3 100644
--- a/net-wireless/bluez/metadata.xml
+++ b/net-wireless/bluez/metadata.xml
@@ -6,6 +6,7 @@
     <name>Pacho Ramos</name>
   </maintainer>
 <use>
+  <flag name="btpclient">Enable BTP client</flag>
   <flag name="deprecated">Build deprecated plugins</flag>
   <flag name="experimental">Build experimental plugins</flag>
   <flag name="extra-tools">Install tools that upstream doesn't install on
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 412b295f270f..a769c16b90ac 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -2,9 +2,9 @@ AUX gnuradio-3.6.1-automagic-audio.patch 2839 BLAKE2B 5b7e2e224ef2dcc9d0645a0faf
 AUX gnuradio-wxpy3.0-compat.patch 2202 BLAKE2B 2efeb291e109c6251356bbe6bae93abaff9766984d141f2d9c0a180af4c0ccbc5de6cc0d07c0c7965ac48967ed7e4a5d576713c77fa98a31a12c0b4404987561 SHA512 6d06c76394954eb63784ef6edca06a8611f59c3bea0355c7a0623a56054d0466d83770ce4afd9d9be484543c3859d20209c858506f3d789a3818d549df95de3f
 DIST gnuradio-3.6.5.1.tar.gz 3150283 BLAKE2B f04121aab9a1b4c5424b5396c96269a53dd6302bf42e5a443b99ea642c8db8ed32df843a89ffe49869212cd2325b209407b5407dbd9b7730510c4ee42bd95836 SHA512 23a22aed482da11005b17e5197ee3ba24d442b30309522b0858e694b58f46b76cc050143d365623c7dd4241cdf8b9f988e1a4dabe2e1f98d0fd4cca71bbb82e8
 DIST gnuradio-3.7.11.tar.gz 4357123 BLAKE2B ae43e9f7e20605de484c4dc31bc33b9b99e5fba269d8d394e9053f4451083b2d6048c1d1fe19a774c0cc686c13e758f0b6e719cf15d05c5867e2ac1c4eecf789 SHA512 a3b44e04e63056ad5238ddbda7967ebaf5802d2ed7e24649190bde67a533b50780ec1260dc7710c5388c966b71e153d3d21468bbfee4529c62ac5b89b589dd14
-EBUILD gnuradio-3.6.5.1-r2.ebuild 5338 BLAKE2B 6bb26c728d0e3b5f4b2e4e99eb23511047319c5fe2168803388da77d78327ff58ace4985b38cc76954a6042c312cb9d4243355c7910540e7ddc20862c0240b2b SHA512 93a9be9c3b8abc3b9c6b33de2b1fad9b0f4d87461de2497ca4dbd17cb14ef8c3a552ea861e27750e0fed6cb1a4d48afa727c84415f2231bd3e9845be24b540ce
-EBUILD gnuradio-3.7.11-r3.ebuild 7032 BLAKE2B 2ada9c5dddc983c01179d0522026fa4b1576808aabd911de6fa822169bcd7ed1622a03ac38a01c1974007a7b724d9dedace797933006ce6b89b74b8d6c7f27ea SHA512 8728f26aa4f6e5fa7aa1e1b430c26dd53993c58974b6b841966c2afe581382dbe0c02b9b590d2ed6283e9c2422fc2bfefc416c9da774c902c50fdfdf28bded24
-EBUILD gnuradio-3.7.9999.ebuild 7109 BLAKE2B b7cc3f3db94948ae94a64b1e6491bbd54896f9f6ec6d9dd1e4be2d66ed40d77710795198c77cf9acc5d0784d8680e0a10eaeab95d72567e15a92eb5993ed85b3 SHA512 7c3d4128deed42a28478bbef779e29426e18f4b966bb31cc5084d12cb64e6049375d620594287e5c1f889f352ea699a34ce9e7c76c1fa486307cfa253b0bb935
-EBUILD gnuradio-3.8.9999.ebuild 6658 BLAKE2B a0aba22afedcb57ad905602f7dabdb61042b3ae51a0a41ed14ef46e23eafe35add7e335630ad0e284e47b46fda457f5618859bcaa954f68b4d20332d60fba542 SHA512 3b8d514421d415b8a326962839d31a38f519845097ef396a244dd827d5b9bae039ffcea25b995a2a6df9ff28564824118827977b339951e7d7a1fddaf420bb4b
-EBUILD gnuradio-9999.ebuild 7109 BLAKE2B b7cc3f3db94948ae94a64b1e6491bbd54896f9f6ec6d9dd1e4be2d66ed40d77710795198c77cf9acc5d0784d8680e0a10eaeab95d72567e15a92eb5993ed85b3 SHA512 7c3d4128deed42a28478bbef779e29426e18f4b966bb31cc5084d12cb64e6049375d620594287e5c1f889f352ea699a34ce9e7c76c1fa486307cfa253b0bb935
+EBUILD gnuradio-3.6.5.1-r2.ebuild 5334 BLAKE2B c1832d28df13b422a2c2c246d87ad2b73389c7293d99fd20cc13e9d43737d1393de8596140ca981b6dd5d39871fefcb12cc19925941db45f01200969ae5d887e SHA512 9a2975c4be004a7654ac466c15c04381e8f187a2584a0377d866b91f464c0870f8bcc96db8cc968c6b08986810ac1d17374c0e97455aefaf449f77b8650fa786
+EBUILD gnuradio-3.7.11-r3.ebuild 7024 BLAKE2B c29549a5022c6557c3466d6e9a5bb4d3cc2428a4a95a4e7cfb7ee20b639ddd49a7d2b1af9080f4a3b1975d278f0e186cccedce80410bc842c11bc97bb53deb92 SHA512 b7fe2d8931ac3dc94e0aa73b8b3d508cdb96015d62c11a7332282039a98c5a603be171de1efc675c9039e63261242d9d71c2fa9f2f0ff227705d9e2edcec24f0
+EBUILD gnuradio-3.7.9999.ebuild 7100 BLAKE2B a57e16d927a61c6a0ae5aaf77b80725a8e5e7906ffee58db901d2b018f35d2fac835314ff3c4244bc5537914a5e8288d89bbc031c1425c0e8c257a583272217d SHA512 ef3488005de9e5158e68636fffd964c30ecb614d3620d2964e66fb7d13116fadd01030e03b19c7b5d91113fa01b1b5e5755a317a306753a65ec9ac13f9d17141
+EBUILD gnuradio-3.8.9999.ebuild 6649 BLAKE2B be57d7c251d0ed046042da7ad9bef94e4512a5bf3d8301a05de208c1f94a35efc927e4e70606ca6f0d68ec5da74ad59f90cd68cf68da1d9276bccaa68ada9f71 SHA512 bc15231f5329e1ec59259487f38e58ca01babaaeb84551372a6643ca817526c545f7acb54e941835fcc05a1a458dda77325b54ac18c106676b2fd233e9d442ac
+EBUILD gnuradio-9999.ebuild 7100 BLAKE2B a57e16d927a61c6a0ae5aaf77b80725a8e5e7906ffee58db901d2b018f35d2fac835314ff3c4244bc5537914a5e8288d89bbc031c1425c0e8c257a583272217d SHA512 ef3488005de9e5158e68636fffd964c30ecb614d3620d2964e66fb7d13116fadd01030e03b19c7b5d91113fa01b1b5e5755a317a306753a65ec9ac13f9d17141
 MISC metadata.xml 1774 BLAKE2B de1e576c7aebab19d0b1d9b2c3962a888059b0a3a3ee8b1ecfd048cef9d4a0dcbec5fc1749742da29c0026cee13cf40c6e27b72068691389eb4c3ac14aecbf1f SHA512 18f0566bd5f65be0bd36e063f334301882f2ff0aeef10b7d6f544089c257c42617b4868659e63f9ea236715dbef479f1961e5bd3a3931b217a9cd6da49de0699
diff --git a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
index 2147baf1dabc..dfd9a9881248 100644
--- a/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.6.5.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils fdo-mime python-single-r1
+inherit cmake-utils python-single-r1 xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="http://gnuradio.org/"
@@ -12,11 +12,11 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
-	inherit git-2
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
+	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="http://gnuradio.org/releases/${PN}/${P}.tar.gz"
+	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -158,8 +158,8 @@ pkg_postinst()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
 				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -177,8 +177,8 @@ pkg_postrm()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
 				application-gnuradio-grc || ewarn "icon uninstall failed"
diff --git a/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild b/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild
index 4eaaf0dca196..209382cc3fe1 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.11-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
+inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="http://gnuradio.org/"
@@ -13,11 +13,11 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git"
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
+	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
@@ -214,8 +214,8 @@ pkg_postinst()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
 				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -233,8 +233,8 @@ pkg_postrm()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
 				application-gnuradio-grc || ewarn "icon uninstall failed"
diff --git a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
index 9c0cb3a61048..43aaf6e9d946 100644
--- a/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.7.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
+inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="http://gnuradio.org/"
@@ -13,11 +13,11 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git"
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
+	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 if [[ ${PV} == "3.7.9999" ]]; then
@@ -221,8 +221,8 @@ pkg_postinst()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
 				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -240,8 +240,8 @@ pkg_postrm()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
 				application-gnuradio-grc || ewarn "icon uninstall failed"
diff --git a/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
index 08671c06752a..ec6405c3f929 100644
--- a/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils python-utils-r1
+inherit cmake-utils eutils gnome2-utils python-single-r1 python-utils-r1 xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="http://gnuradio.org/"
@@ -13,11 +13,11 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git"
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
+	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 if [[ ${PV} == "3.7.9999" ]]; then
@@ -207,8 +207,8 @@ pkg_postinst()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
 				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -226,8 +226,8 @@ pkg_postrm()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
 				application-gnuradio-grc || ewarn "icon uninstall failed"
diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild b/net-wireless/gnuradio/gnuradio-9999.ebuild
index 9c0cb3a61048..43aaf6e9d946 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake-utils fdo-mime gnome2-utils python-single-r1 eutils
+inherit cmake-utils eutils gnome2-utils python-single-r1 xdg-utils
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios"
 HOMEPAGE="http://gnuradio.org/"
@@ -13,11 +13,11 @@ LICENSE="GPL-3"
 SLOT="0/${PV}"
 
 if [[ ${PV} =~ "9999" ]]; then
-	EGIT_REPO_URI="https://gnuradio.org/git/gnuradio.git"
+	EGIT_REPO_URI="https://www.gnuradio.org/cgit/gnuradio.git"
 	inherit git-r3
 	KEYWORDS=""
 else
-	SRC_URI="http://gnuradio.org/releases/gnuradio/${P}.tar.gz"
+	SRC_URI="https://www.gnuradio.org/releases/gnuradio/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 if [[ ${PV} == "3.7.9999" ]]; then
@@ -221,8 +221,8 @@ pkg_postinst()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource install --noupdate --context mimetypes --size ${size} \
 				"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \
@@ -240,8 +240,8 @@ pkg_postrm()
 	local GRC_ICON_SIZES="32 48 64 128 256"
 
 	if use grc ; then
-		fdo-mime_desktop_database_update
-		fdo-mime_mime_database_update
+		xdg_desktop_database_update
+		xdg_mime_database_update
 		for size in ${GRC_ICON_SIZES} ; do
 			xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \
 				application-gnuradio-grc || ewarn "icon uninstall failed"
diff --git a/net-wireless/gr-air-modes/Manifest b/net-wireless/gr-air-modes/Manifest
index c16f06cb139d..3ae1eec3c096 100644
--- a/net-wireless/gr-air-modes/Manifest
+++ b/net-wireless/gr-air-modes/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-air-modes-9999.ebuild 901 BLAKE2B 02b3be5a369f7357237a21171ca34e891a5525f241a545c7c90fdeaa30a20a5233e941031f92b5e713d5bcae6ca914de59b6eba17350f1a941e382c4e5d09dea SHA512 4e42d94e3fd0487367bcdc49e0bdc7c7fd6240cb447192472366181d04701e9c6e7e10aeb8318a3ca35e547588650b563af56936ba08bcceab78a5f797b510f8
+EBUILD gr-air-modes-9999.ebuild 902 BLAKE2B fa2417bfde40f6dada0c233b14aba231ffdc89b015fcc9bf3a2542feb39ace13491a5f250ccb701d68c45c51a0ece2836bc1a5fca755eed2ec254b276c0f163a SHA512 3995a239bf3020ed4038e72716482f8ae6c22f78bb08a4e711fc0019f07c3937d94510dfe3b6e566c90c86d2ecdd216f7086ae3c824a3c36fa075a2696fe186c
 MISC metadata.xml 447 BLAKE2B 3d205cace1b2c5446d3b3db17116f0e8d071cc1a1e59b17597c1a083b781e6ea1bc9e2f52de22d685ca53a96b08a13965e121f5924559040da23a827243579d3 SHA512 d05f480160792ec408d852a61ddaebe4088e38a7efbee14e8b576fb4ac2e2c98e5196b0c6fe62457e7de9ed2db80317e452061e90d5c6a760f5b5cf941027f0c
diff --git a/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild b/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild
index 355f3c208e6d..fe5fbccf4407 100644
--- a/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild
+++ b/net-wireless/gr-air-modes/gr-air-modes-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 cmake-utils git-2
+inherit python-single-r1 cmake-utils git-r3
 
 DESCRIPTION="This module implements a complete Mode S and ADS-B receiver for Gnuradio"
 HOMEPAGE="https://www.cgran.org/wiki/gr-air-modes"
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index ec32b68c1fea..233a39edf6c3 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,6 +1,4 @@
-DIST gr-osmosdr-0.1.4_p20150730.tar.xz 1148596 BLAKE2B ff5f27dc32438c94ac920e77e7722b3a4331c350b0535a8a787b72ad8653f57dc2a434c3dec9499bbe791e12dc863323c8f9f6c750b2c154ab35ed722e8e221f SHA512 7e6847eba0d4e217ea71bb4b8105290b329bf8840a7193df013b3a0cd9c9ef57f3686252da48cb0df239288b5794c75178a8bb45ff2a2dd8b605f63fec2426d9
 DIST gr-osmosdr-0.1.4_p20170612.tar.xz 174416 BLAKE2B d0ef0d4348b561da10f3e8b99fb43f93fbee5c19a1a4fdcc465f2a63425a42ad0f8d64f522e4aafd5182e66c3c96b42f603e9b595e61b0be15b45eae5330fe5e SHA512 9cf3d0453696c7cfe0679136335a71ec5fd18c4b09cbe3e75fca90626065bf6640969bf224219fe796739abbc3b627eb8bf3509b52f764c38b57f169005ea933
-EBUILD gr-osmosdr-0.1.4_p20150730.ebuild 1853 BLAKE2B f38fbb657305d45969cccc5ba1b6c87431d8b77d795ef6f37f31c0cc8bf5861172de32b41f25ebeb922ad1920c316bfb7d625df4f7105779bb10a740cdb3bc65 SHA512 5de5b03466ed8988fec9e8760d1b409cdb0f5ed5e719ea8cfebb110c8c4e031bb1999caab884a8fb93988e80520918f4d9cc5e4a2fbd31b1fef9aeb6e829ab75
-EBUILD gr-osmosdr-0.1.4_p20170612.ebuild 1946 BLAKE2B cd32fd38bf1d777bfbd27de9b49d39fd4fa4452929e426f348ae25929a32ef9e03c6dfefb0f57e9b991edcc72ddbcebadb7446604ff01b711f058bf3ecd35625 SHA512 6a0f8abe2944b5158c7e070f69040a4a2c705448db300bad86407cdb22623984e542034badf5e305908e25f2984b42dc5914e36d9c0d3c0ff4c2554b70c826b8
+EBUILD gr-osmosdr-0.1.4_p20170612.ebuild 1938 BLAKE2B 3e38f3d1095f3c5156a8c330075b76434cf7078b913cd1e69c523038470a10afa036fd0c09ff5cf3e20444ac3306646d45d7081b5fbffca544ee05eb9b11628e SHA512 f3ed65e23a8c25b4b6898e24b199659575185234eb92851483ce3d9fb213e1a868e4ba38a2dd7ebc0fec42fd1107888effa4a54886380fed9c750b356ab6e6e0
 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_p20150730.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild
deleted file mode 100644
index ba56a992249f..000000000000
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20150730.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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"
-	KEYWORDS=""
-else
-	#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 uhd"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
-	bladerf? ( net-wireless/bladerf:= )
-	hackrf? ( net-libs/libhackrf:= )
-	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
-	mirisdr? ( net-libs/libmirisdr:= )
-	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
-	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cheetah"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DENABLE_FILE=ON
-		$(cmake-utils_use_enable bladerf)
-		$(cmake-utils_use_enable fcd)
-		$(cmake-utils_use_enable hackrf)
-		$(cmake-utils_use_enable iqbalance)
-		$(cmake-utils_use_enable mirisdr MIRI)
-		$(cmake-utils_use_enable python)
-		$(cmake-utils_use_enable rtlsdr RTL)
-		$(cmake-utils_use_enable rtlsdr RTL_TCP)
-		$(cmake-utils_use_enable 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/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild
index 156b4781b570..579c974f8abe 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild
@@ -13,14 +13,13 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-	KEYWORDS=""
 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 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/net-wireless/hackrf-tools/Manifest b/net-wireless/hackrf-tools/Manifest
index 14c81c9672fb..9ca6eee3a6f6 100644
--- a/net-wireless/hackrf-tools/Manifest
+++ b/net-wireless/hackrf-tools/Manifest
@@ -1,7 +1,5 @@
-DIST hackrf-2015.07.2.tar.xz 14415212 BLAKE2B c9ef83e7a4c1c0cca9ea592c02cc1fe9fc5f42203d177f15b36893e719cf3c269cdb8c3d0e13ed5c51826b8e346b58d572b96c3d197c615e58f9d4464a306c14 SHA512 a4f7b7800ece9b260d5c8c374f5544aa55cd2e97e10c6a0b33cf476e2ad4811321ffb1308d9dfb2168b2624cd3af616d1c314ad86bcd6f4c3fd0897319fa2cbd
 DIST hackrf-2017.02.1.tar.xz 15409352 BLAKE2B 930c6d30cbcadd366f889add7cd8f9756edf7a6b82a478353ea94662e9d2e0b612ca5ec0473eb0083dcbec761f2d5385eea31608f50f81543449ffa4bc31d277 SHA512 7cd6ad9aa8fef8afed41c48a3358bff18c6b2a9a112b13daabda87726e0e3ca4cf1e0c0c6ff9689bdd49f854e2e5887a84ccd7975abef43a43b75ecf8a5236ce
 DIST hackrf-2018.01.1.tar.xz 15464500 BLAKE2B 3a56305ce17b46660621b8f3e996e35909d7a8e7ab88ef643ed8f4c8d68f346e11dfe5fd2cb37aa23af62f202f28d9a8dc1da0cd8768fdbd6f293c65562f25a4 SHA512 89848fb58a8a29f7fe85bd817d5716117a2c7a5f2c4bb8582ad1ba8186831ca3054ea1314de943d1e923641eb18b6008cd8af79585e58fa50d55d5a7fd1b04e4
-EBUILD hackrf-tools-2015.07.2-r1.ebuild 1683 BLAKE2B 785a87dce81761d59a79e38baa3bedc5b334fe216d149c6170bea480c3f4835e708c0ddbf1be7ce45630cc72fd8fc4fa5bba1e8889f4ac7aef5e8ee88fd48ddb SHA512 3909d29654d4e6dbd3a93f0f7dcdd0521ef640772241f99a450784a4b32915962992bb634637d95ac73b69c079ffbc2cbe314a9f176fb560e27fbaf20f8a0e7c
 EBUILD hackrf-tools-2017.02.1.ebuild 1789 BLAKE2B 20161a6b7e8671113734a07739e3b06877a0cccbedca9a7c2e5c46b565bef9895ce53892154287af729bf4ce9976dcc4bab10a9c6dfa534545d51d80adb80f3d SHA512 30db812a7478defce70a780c43bab24faeb84487b6b4a0dea633637e9c5169a98b6655a8378dee88a518bce4bcb8759eecc198095f857da18c1a40098bc13150
 EBUILD hackrf-tools-2018.01.1.ebuild 1789 BLAKE2B ceb59c1a24d3a825bed85a04d53d72b0814fe98dd2602a5a329d72c791923075bd5764747308aeebba212d42cfe1bcd2f188a85a9a4159c75e5d61d7e8896fb0 SHA512 a98f7a085966d5679f7a2eccac5689afe1d13169ccdb0e5155d7f19a901a3ee517e59036427ec65ad31bf4e79ddff53229b4574aa021d8b573f814fb0ee10270
 EBUILD hackrf-tools-9999.ebuild 1789 BLAKE2B 20161a6b7e8671113734a07739e3b06877a0cccbedca9a7c2e5c46b565bef9895ce53892154287af729bf4ce9976dcc4bab10a9c6dfa534545d51d80adb80f3d SHA512 30db812a7478defce70a780c43bab24faeb84487b6b4a0dea633637e9c5169a98b6655a8378dee88a518bce4bcb8759eecc198095f857da18c1a40098bc13150
diff --git a/net-wireless/hackrf-tools/hackrf-tools-2015.07.2-r1.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2015.07.2-r1.ebuild
deleted file mode 100644
index fbc622bedbb4..000000000000
--- a/net-wireless/hackrf-tools/hackrf-tools-2015.07.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="tools for communicating with HackRF SDR platform"
-HOMEPAGE="http://greatscottgadgets.com/hackrf/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
-	inherit git-2
-	KEYWORDS=""
-	EGIT_SOURCEDIR="${WORKDIR}/hackrf"
-	S="${WORKDIR}/hackrf/host/hackrf-tools"
-else
-	S="${WORKDIR}/hackrf-${PV}/host/hackrf-tools"
-	SRC_URI="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND="=net-libs/libhackrf-${PV}:="
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	if [[ ${PV} != "9999" ]] ; then
-		insinto /usr/share/hackrf
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb_rom_to_ram.bin" hackrf_jawbreaker_usb_rom_to_ram-${PV}.bin
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb_ram.dfu" hackrf_jawbreaker_usb_ram-${PV}.dfu
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb_rom_to_ram.bin" hackrf_one_usb_rom_to_ram-${PV}.bin
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb_ram.dfu" hackrf_one_usb_ram-${PV}.dfu
-		newins "${WORKDIR}/hackrf-${PV}/firmware/cpld/sgpio_if/default.xsvf" hackrf_cpld_default-${PV}.xsvf
-		ln -s hackrf_one_usb_rom_to_ram-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb_rom_to_ram.bin"
-		ln -s hackrf_one_usb_ram-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb_ram.dfu"
-	else
-		ewarn "The compiled firmware files are only available in the versioned releases, you are on your own for this."
-	fi
-}
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index f5a1246add21..561d9e979663 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -10,8 +10,10 @@ AUX hostapd-conf.d 245 BLAKE2B 5a4315f10ab8fcfda662252bf31b53eb4d3c55fa258062f28
 AUX hostapd-init.d 739 BLAKE2B 83c48748cf20c8ee7d1124d373ee565c724d4714bffc512629a1850be0bfe5e9430a7512b296e1441dcaa4b098a665a873948162c5edec60430bf69cc90c157c SHA512 ab364383da45403d7734be20e7486937ad0a6be25a56eb1ec03d131243270a143189b699becf6e9e14d30b02bb5d93cddde55e51908801f2e6830de53791ccc8
 AUX hostapd.service 213 BLAKE2B 0141aace8e6f807611e423e70cce437a5ae38a5fee8af74a7284980a1c2f642f1e98d020f327dbe5591e9d68114f3ee966229fb6d8f5116fe7d9e2bd93bae7bd SHA512 4d1a1619c49ad0272f360d2c9d79f2fd30503786fe8f22dd3fc4abcc39176029fe907c79d22f168c100b0d7b4ac969b5f4b5815d5ebe6805db5881dda69eef29
 DIST hostapd-2.6.tar.gz 1822341 BLAKE2B c0075ffcdb11237e11410d87329a7a71aae5e00481022e02faf03771d45a61410ff906ebffdeea03fdeab751ce85e5a5e191173883ee9f1c284e6bc00342a011 SHA512 e60baaa092786250b8de9935f5417c7626f5d749210cce9f83d776b65c19fc92a8141f41923389f05c16295d482a15ae8d8b744f4667425040c99e3c2f5b1bda
+DIST net-wireless_hostapd_2.6-r5_extras.tar.xz 10648 BLAKE2B fef02c9fbc9b6bce662f7d569a56450371bc1e9c5cd34a7cf4fc0220bb8239214604806f3edfde87fd45c7cf07bab9cf16a6c215c1bfa3161ba4361e4b295981 SHA512 cf818854e7af6562a163b5a61d63f4fa1284905f5803abe4ef97a6743b74ce2d28c818aa462d843448146226b9c5c9578b6c69ffad2d4fb8a62777cd5d353e70
 EBUILD hostapd-2.6-r1.ebuild 6372 BLAKE2B a3202c1e11ca7d9fc252c2f4a0d3cdbde3eb06818a566bba57890e47347e71cc9553213146793c11c586c403a9d5020b14234ab6b2fbe949c5fc48774fc3eea2 SHA512 fec5dabf5ac3d4103f46d538bc45b7bb07b43755505a255989b0845cb0773c4ed39fb85977a9d73b2966095b5bb39118b2a464ce9a16d9b8ecb9ea8e243f7c95
 EBUILD hostapd-2.6-r2.ebuild 6453 BLAKE2B 3ea7ab9dbce47bf62a27953b5201318fc9f5eab8afa9d6d6e8a49aa58a6a4f412610956bd93485534eac57d41c851e53eac4965883bf1edf94895ee05554a7b5 SHA512 3b2196198d83b69f93e73ba62d8a939ef55cb2cb45abd62bc3e008d61b4b7e2f32e697546b1429d4147f651b5a09b5015ec62ece7d8e740b66f92c2fdd474c03
 EBUILD hostapd-2.6-r3.ebuild 6549 BLAKE2B f8469d75aeeba6c1d3f81d237c14482d30acf61023f5e7fd5b66cf1b5e56392d49dad96c00547d1382b350b2c6f2397b0c1a77da98d1e315f966310e6490a147 SHA512 1c9d50e31f453cce63043d159f7545a44c2c954153ebf2caf27bbbd515ba439621f0cf0c3cfc47e6e1a313ea6206422bfb8d121fbd48f11ec7e73f0a56b264dd
 EBUILD hostapd-2.6-r4.ebuild 6973 BLAKE2B b76c7d612398a241960c624a1c9c8f2dbc844c67255f1fd7ce77d0e7f16fe9f79dea0a89c64100a366c88903ba7a23ea5d31ae745d4ab62900f57807da7dcd6f SHA512 277a224ef2f4c23f675d8ca1dea432101efef209c632a92f1a630815eb440d5107ea385b0b29e8ad09bca5855091f9f4512438449a8a600823032d6fef99ff43
+EBUILD hostapd-2.6-r5.ebuild 7246 BLAKE2B 19db8237f3ca6da609333433f51cbe68a7be8242c5d11fabc7e55f6f66f607402dc59506cc24cfb34064b2d0258ccb45610b1f7299aaa35e624165a32d1c787c SHA512 54b77fffe854a8f214b4caac4a5e9d3d0bb650106afcdd02c6d2b13230fe7e1087438c80314f13f296f0d5c48590cbfdbb44204c98b2ca9846993d710323f8fa
 MISC metadata.xml 1024 BLAKE2B bcec2660f99c07f069daa175482fd7f6bcd15c4e0db2818af130221a737577223642a5439c325c39b263fc7bcabe3f5b4676a8d3311678cd24a062ea3273575d SHA512 cdb85ed770340ca5cfc4efdf7566e7f358b7c921db5a69763c01b2c2dc90a5f3aeb4e62d862452ddf67646b0ac4698cdc34be826187fede76121cb0824f00b18
diff --git a/net-wireless/hostapd/hostapd-2.6-r5.ebuild b/net-wireless/hostapd/hostapd-2.6-r5.ebuild
new file mode 100644
index 000000000000..67f105b8c77a
--- /dev/null
+++ b/net-wireless/hostapd/hostapd-2.6-r5.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs eutils systemd savedconfig
+
+DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
+HOMEPAGE="http://w1.fi"
+EXTRAS_VER="2.6-r5"
+EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
+SRC_URI="http://w1.fi/releases/${P}.tar.gz
+	https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+
+DEPEND="
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? (
+		internal-tls? ( dev-libs/libtommath )
+		!internal-tls? ( dev-libs/openssl:0=[-bindist] )
+	)
+	kernel_linux? (
+		dev-libs/libnl:3
+		crda? ( net-wireless/crda )
+	)
+	netlink? ( net-libs/libnfnetlink )
+	sqlite? ( >=dev-db/sqlite-3 )"
+
+RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"
+
+pkg_pretend() {
+	if use internal-tls; then
+		if use libressl; then
+			elog "libressl flag takes precedence over internal-tls"
+		else
+			ewarn "internal-tls implementation is experimental and provides fewer features"
+		fi
+	fi
+}
+
+src_prepare() {
+	# Allow users to apply patches to src/drivers for example,
+	# i.e. anything outside ${S}/${PN}
+	pushd ../ >/dev/null || die
+
+	# Add LibreSSL compatibility patch bug (#567262)
+	eapply "${WORKDIR}/${EXTRAS_NAME}/${P}-libressl-compatibility.patch"
+
+	# https://w1.fi/security/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch"
+	eapply "${WORKDIR}/${EXTRAS_NAME}/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch"
+	default
+	popd >/dev/null || die
+
+	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
+		"${S}/hostapd.conf" || die
+
+}
+
+src_configure() {
+	local CONFIG="${S}/.config"
+
+	restore_config "${CONFIG}"
+	if [[ -f "${CONFIG}" ]]; then
+		default_src_configure
+		return 0
+	fi
+
+	# toolchain setup
+	echo "CC = $(tc-getCC)" > ${CONFIG}
+
+	# EAP authentication methods
+	echo "CONFIG_EAP=y" >> ${CONFIG}
+	echo "CONFIG_ERP=y" >> ${CONFIG}
+	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
+
+	if use internal-tls && !use libressl; then
+		echo "CONFIG_TLS=internal" >> ${CONFIG}
+	else
+		# SSL authentication methods
+		echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
+		echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
+		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
+		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
+		echo "CONFIG_TLSV11=y" >> ${CONFIG}
+		echo "CONFIG_TLSV12=y" >> ${CONFIG}
+		echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
+	fi
+
+	if use wps; then
+		# Enable Wi-Fi Protected Setup
+		echo "CONFIG_WPS=y" >> ${CONFIG}
+		echo "CONFIG_WPS2=y" >> ${CONFIG}
+		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
+		echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
+		einfo "Enabling Wi-Fi Protected Setup support"
+	fi
+
+	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
+	echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
+	echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
+	echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
+	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
+	echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
+	echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
+	echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
+	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
+	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
+
+	einfo "Enabling drivers: "
+
+	# drivers
+	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
+	einfo "  HostAP driver enabled"
+	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
+	einfo "  Wired driver enabled"
+	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
+	einfo "  None driver enabled"
+
+	einfo "  nl80211 driver enabled"
+	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
+
+	# epoll
+	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}
+
+	# misc
+	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}
+	echo "CONFIG_PKCS12=y" >> ${CONFIG}
+	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
+	echo "CONFIG_IAPP=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
+	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG}
+	echo "CONFIG_PEERKEY=y" >> ${CONFIG}
+	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
+	echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
+	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG}
+	echo "CONFIG_HS20=y" >> ${CONFIG}
+	echo "CONFIG_WNM=y" >> ${CONFIG}
+	echo "CONFIG_FST=y" >> ${CONFIG}
+	echo "CONFIG_FST_TEST=y" >> ${CONFIG}
+	echo "CONFIG_ACS=y" >> ${CONFIG}
+
+	if use netlink; then
+		# Netlink support
+		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
+	fi
+
+	if use ipv6; then
+		# IPv6 support
+		echo "CONFIG_IPV6=y" >> ${CONFIG}
+	fi
+
+	if use sqlite; then
+		# Sqlite support
+		echo "CONFIG_SQLITE=y" >> ${CONFIG}
+	fi
+
+	# If we are using libnl 2.0 and above, enable support for it
+	# Removed for now, since the 3.2 version is broken, and we don't
+	# support it.
+	if has_version ">=dev-libs/libnl-3.2"; then
+		echo "CONFIG_LIBNL32=y" >> .config
+	fi
+
+	# TODO: Add support for BSD drivers
+
+	default_src_configure
+}
+
+src_compile() {
+	emake V=1
+
+	if use libressl || !use internal-tls; then
+		emake V=1 nt_password_hash
+		emake V=1 hlr_auc_gw
+	fi
+}
+
+src_install() {
+	insinto /etc/${PN}
+	doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
+
+	fperms -R 600 /etc/${PN}
+
+	dosbin ${PN}
+	dobin ${PN}_cli
+
+	if use libressl || !use internal-tls; then
+		dobin nt_password_hash hlr_auc_gw
+	fi
+
+	newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN}
+	newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN}
+	systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service
+
+	doman ${PN}{.8,_cli.1}
+
+	dodoc ChangeLog README
+	use wps && dodoc README-WPS
+
+	docinto examples
+	dodoc wired.conf
+
+	if use logwatch; then
+		insinto /etc/log.d/conf/services/
+		doins logwatch/${PN}.conf
+
+		exeinto /etc/log.d/scripts/services/
+		doexe logwatch/${PN}
+	fi
+
+	save_config .config
+}
+
+pkg_postinst() {
+	einfo
+	einfo "If you are running openRC you need to follow this instructions:"
+	einfo "In order to use ${PN} you need to set up your wireless card"
+	einfo "for master mode in /etc/conf.d/net and then start"
+	einfo "/etc/init.d/${PN}."
+	einfo
+	einfo "Example configuration:"
+	einfo
+	einfo "config_wlan0=( \"192.168.1.1/24\" )"
+	einfo "channel_wlan0=\"6\""
+	einfo "essid_wlan0=\"test\""
+	einfo "mode_wlan0=\"master\""
+	einfo
+	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
+	#	einfo "This package now compiles against the headers installed by"
+	#	einfo "the kernel source for the mac80211 driver. You should "
+	#	einfo "re-emerge ${PN} after upgrading your kernel source."
+	#fi
+
+	if use wps; then
+		einfo "You have enabled Wi-Fi Protected Setup support, please"
+		einfo "read the README-WPS file in /usr/share/doc/${P}"
+		einfo "for info on how to use WPS"
+	fi
+}
diff --git a/net-wireless/inspectrum/Manifest b/net-wireless/inspectrum/Manifest
index 7d40a6c7a124..1479be19423a 100644
--- a/net-wireless/inspectrum/Manifest
+++ b/net-wireless/inspectrum/Manifest
@@ -1,6 +1,4 @@
-DIST inspectrum-0.1.1.tar.gz 151874 BLAKE2B d0b60d479e2b6a93a6971390a23c7fa242ebdf956d9b55f6316f6684d1534d88c062c93ed4928605a256b794f3cf6d65d943822e239390c6c2d3e879d3b492a6 SHA512 e151448f7071540a00b6d74036752b336c69cab166952a2d0e54cd3e4ed04e23fba54c1382bcbc3f9a8da4f88caa8fd188c6bcbc248f2da872681fe108613721
-DIST inspectrum-0.2.tar.gz 108562 BLAKE2B 7a8704a7a14873d2f4759f9b286f2642e49eeacdab4e98c217e864f04959ab6b57c0a425c60cbbc7e027bcc130f3e84c76306984e74a940830f18ea3a2d40e92 SHA512 743058ab32d7aa10e7f31e225b35c4a64f8cac2e43c0e7ecc88c17786e11df8f83234ed8f0361d08e9759ba322fc38952582014cde31c8d1a81ede99a6585c73
-EBUILD inspectrum-0.1.1.ebuild 657 BLAKE2B a29efa640dc1c4ad1727e3a379815d13e29d2a8325a3460be9e77dec1230b1ddad2dac746a3bd494af8e58287d026ae584b6c2aa71bba69d65b1c06fa9cbda6a SHA512 225024f23f98affba59e596a59f7ac476d3a691f8d4038cc7be6a849ac0bc71ac2ee7d2ac207c28c8ada17048572614bbc5556df135a28668d34eee36b3df776
-EBUILD inspectrum-0.2.ebuild 701 BLAKE2B 867db11a0499c8c67ff1b7f94fa66209b1957e1c6381982c6e5d81e3cd4c74656252ecd71923b777571901aa6d6a308f15b590559611b77cf30da7408a4df7aa SHA512 0e448bfb2a47728a9ea6de25ef792aa03bc953f3d9d19078533898ee63c36129fbcf87f20a82762449c699301372ea335e9ccc134d1d7b5d5f22af6c18ed9413
+DIST inspectrum-0.2.2.tar.gz 109165 BLAKE2B 62926305bfa03bb3a404ed2a9098b9afd93f0de7f35846cfcf66b42ec6a81532003976bcc9a6916217044ad80fce8df689d200aa5861778f0e3f00d67373cbb6 SHA512 37ad48f87889731b7aa83a6cfa401c9986d2657f5f06f8dbdf02213123ff4d0d7cb23aa21e9b4062b7ab746d32c937dd56e85bd5c8d0bbf2181a54929e3fc501
+EBUILD inspectrum-0.2.2.ebuild 701 BLAKE2B 08445e6eada91acc1728a4ac137875b32ca78ae359310ba8c9d375b991ffe23dabc3791c1cc41354110302143dc4bc4d018b3acab67815d6a7b1445ef768f01a SHA512 e6da862809dd1ffcef94a8e6951e776c0c09542f9d3fca873c33902997919ad259065e274e264a089c66f645aa5a09bf8202e617931adf1e97a79a44ba6626e3
 EBUILD inspectrum-9999.ebuild 701 BLAKE2B 867db11a0499c8c67ff1b7f94fa66209b1957e1c6381982c6e5d81e3cd4c74656252ecd71923b777571901aa6d6a308f15b590559611b77cf30da7408a4df7aa SHA512 0e448bfb2a47728a9ea6de25ef792aa03bc953f3d9d19078533898ee63c36129fbcf87f20a82762449c699301372ea335e9ccc134d1d7b5d5f22af6c18ed9413
 MISC metadata.xml 426 BLAKE2B a117a458ba8b91db0841ba470ee987daf8c5b55c1f87064d203b58feb9e0650b6c33f37f4259a2f5ad051c9ade4d67c7b37077f9772c3c84c942e00789ce655e SHA512 a1da383e40f0fccae9fbb2b8b29051619104e4276b8d4027c9584de14625b3612d6bdf1343f1261e5d6df8b13789f1d4f95e62b76d1ef1eda84b66c82464520e
diff --git a/net-wireless/inspectrum/inspectrum-0.1.1.ebuild b/net-wireless/inspectrum/inspectrum-0.1.1.ebuild
deleted file mode 100644
index b0770bdc411a..000000000000
--- a/net-wireless/inspectrum/inspectrum-0.1.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="a tool for analysing captured signals from software-defined radio receivers"
-HOMEPAGE="https://github.com/miek/inspectrum"
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/miek/inspectrum.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/miek/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-
-RDEPEND="sci-libs/fftw:3.0=
-	dev-qt/qtwidgets:5
-	dev-qt/qtgui:5
-	dev-qt/qtcore:5"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
diff --git a/net-wireless/inspectrum/inspectrum-0.2.ebuild b/net-wireless/inspectrum/inspectrum-0.2.2.ebuild
index a9a777d77d39..55640eba8fb0 100644
--- a/net-wireless/inspectrum/inspectrum-0.2.ebuild
+++ b/net-wireless/inspectrum/inspectrum-0.2.2.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
diff --git a/net-wireless/openbsc/Manifest b/net-wireless/openbsc/Manifest
index 97d8d2b4a4cf..f56ba046eb52 100644
--- a/net-wireless/openbsc/Manifest
+++ b/net-wireless/openbsc/Manifest
@@ -1,2 +1,2 @@
-EBUILD openbsc-9999.ebuild 664 BLAKE2B 3b171b93c98ad5fd453d578105e6c3f7f3ae2154cfbbfff34af1cad635cd02cdc7dade6776abce9d72dd66b2ce5eea7b3364ee4b0453c20d92d044f875d8a6a5 SHA512 0a041c03b706366eef7ca32961f0a8668f0f3844caa20a452610772954fc8d665ba08e03412f811b690759dea551b2fd3e75f34201ab933036bb454f05bb22ea
+EBUILD openbsc-9999.ebuild 632 BLAKE2B 460c96c1ca460d4854c51847cdbfbccf9d81b89d9b28d170d99e7525ef65b7069824bfdda45ce524654049055e82b4825eb75b81facc18c50aef9975a61ae03d SHA512 ff18ee81695dbf4874b13c100571fa4defa159ea6c216d0302910f155ea60fc3997f2d760b5887cc5c15d00941ba880d1885b280a85bcf01bed37dd5682a007c
 MISC metadata.xml 306 BLAKE2B c430f924b1f5811fab4efa2f4a3a42529e8a37744783e8adb2ee48f10ca1aa2030f544a89bd554fb53ea746a48a69710e586d47d007100762cd34a81534c6b13 SHA512 b2cba4799307872808b4d932c487c1344e2251f0da3186ab7ccf6bd8e76bca2c7d31661d7ef4cd5982c97483a53d8197aaf49ff88e1aa172ed179dcf75505f28
diff --git a/net-wireless/openbsc/openbsc-9999.ebuild b/net-wireless/openbsc/openbsc-9999.ebuild
index 2c055ae0bb6a..c8175a0f58f9 100644
--- a/net-wireless/openbsc/openbsc-9999.ebuild
+++ b/net-wireless/openbsc/openbsc-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit autotools git-2 eutils
+inherit autotools eutils git-r3
 
 DESCRIPTION="OpenBSC, OsmoSGSN, OsmoBSC and other programs"
 HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/OpenBSC"
@@ -25,7 +25,6 @@ RDEPEND="${DEPEND}
 	dev-db/sqlite:3"
 
 S="${WORKDIR}/${P}/${PN}"
-EGIT_SOURCEDIR="${WORKDIR}/${P}"
 
 src_prepare() {
 	epatch_user
diff --git a/net-wireless/openggsn/Manifest b/net-wireless/openggsn/Manifest
index fdfd6eaf379a..aae191092e82 100644
--- a/net-wireless/openggsn/Manifest
+++ b/net-wireless/openggsn/Manifest
@@ -1,2 +1,2 @@
-EBUILD openggsn-9999.ebuild 398 BLAKE2B 26f3474c17fe49a5e35f72cdc6da117fcdcc1f6827f1fbcd35bbf2d565bc5ffb7386a06a93873254ce4324e059e39ae12a4a2fb7f49b9db7ef800cf22e55c749 SHA512 7e4be8ef342de12a0a7145304302f2b74cf06a60d010e65839941ce72c7782ccebc7adeba89bc2a4589f4e997be3157bdbe300679d5d8f3b325621f0e6a98ae8
+EBUILD openggsn-9999.ebuild 399 BLAKE2B 602d12169c5d8d8f248be49b5fe956139412ad996c5bbc9103fcfb6076dd779f8288681366ed2c0e0679ad4e6d5a4e6bb3e472dd91497c514ccbadc91a872571 SHA512 a55b6ab3dce424f90bf9f3194c8a919af37050a52c96e30528cc97e05c3e385da0c37dc0ca79d420e69f41ac1b0e3c5c61dd08e520abf7705c24d4f221acbb82
 MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-wireless/openggsn/openggsn-9999.ebuild b/net-wireless/openggsn/openggsn-9999.ebuild
index 51836d9bccfb..eb2dc537ed83 100644
--- a/net-wireless/openggsn/openggsn-9999.ebuild
+++ b/net-wireless/openggsn/openggsn-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit git-2 autotools
+inherit autotools git-r3
 
 DESCRIPTION="Gateway GPRS Support Node"
 HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/OpenBSC_GPRS"
diff --git a/net-wireless/osmobts/Manifest b/net-wireless/osmobts/Manifest
index 6e00f827f5bd..cc8a6a6925bf 100644
--- a/net-wireless/osmobts/Manifest
+++ b/net-wireless/osmobts/Manifest
@@ -1,2 +1,2 @@
-EBUILD osmobts-9999.ebuild 801 BLAKE2B 2a85101dcd24a27b41a4993d71f86db52fe87c0a54ec803718f4b1eafd4911c61c78247bd42f26ef77535eacc60ef21dd864343f65d00a176e1ab1bd778b6944 SHA512 64e41db9c8c616750a88db50110cc00bf18bc376eaa6c25963319f57c694a69a8764443b4799c703224021d3ec8c6613a0edacd359d2b6356110d573548b317f
+EBUILD osmobts-9999.ebuild 842 BLAKE2B 6dcd29c3ea81884543b600d1f8d81af17ebac8cf42dcc0b63187e933863031239d1266c6e42ab392b331bd57a793511848e3c8940ac3cf576e849bedcc973fb1 SHA512 99d1cbdab522e38632da3af1ceae22214b76501749cb2778ed6c0dd68c7dce3889f2ec72cb4353415aa98165bf753c7784a263d717f5b28b881dec963aac8842
 MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-wireless/osmobts/osmobts-9999.ebuild b/net-wireless/osmobts/osmobts-9999.ebuild
index 134b5749b7bb..c88880d41de7 100644
--- a/net-wireless/osmobts/osmobts-9999.ebuild
+++ b/net-wireless/osmobts/osmobts-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit autotools git-2
+inherit autotools git-r3
 
 DESCRIPTION="Osmocom BTS-Side code (Abis, scheduling)"
 HOMEPAGE="http://openbsc.osmocom.org/trac/wiki/OsmoBTS"
@@ -19,6 +19,7 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	eautoreconf
+	mkdir -p "${S}"/include/openbsc || die
 	wget -O "${S}"/include/openbsc/gsm_data_shared.h http://cgit.osmocom.org/openbsc/plain/openbsc/include/openbsc/gsm_data_shared.h || die
 	wget -O "${S}"/src/common/gsm_data_shared.c http://cgit.osmocom.org/openbsc/plain/openbsc/src/libcommon/gsm_data_shared.c || die
 
diff --git a/net-wireless/osmocom-bb/Manifest b/net-wireless/osmocom-bb/Manifest
index 7e436d9c0b96..528be7067240 100644
--- a/net-wireless/osmocom-bb/Manifest
+++ b/net-wireless/osmocom-bb/Manifest
@@ -1,2 +1,2 @@
-EBUILD osmocom-bb-9999.ebuild 1268 BLAKE2B 3440decc71d48570294fa717f9f3992e66fe2e9da84db619bb4c187b2c7e861db8323d88868e65d684f22090c7974d1284ec86c0e95104c6aab947c6058abc99 SHA512 b4b6263953ae779cd98eb2645c0f7b4f0160ef665fdccbc04453fcd9f698ddce7442ca2cb08ae36d1a09d932d924a5c52025dab82e8c0cfac0fda3f8fce8d6bd
+EBUILD osmocom-bb-9999.ebuild 1269 BLAKE2B 573ddf5a8436ea3b701a9b0312a90f2dff7543c4cbf0413f6d42c2aea8f60d5161001a7fa3f11fe2f4dda39ad2535f1b8a4640ced410f8d2570be74f97f5b267 SHA512 14d85cf119bed653c84707943b655f7892a50524bef096cc3eafa2ef1dbc09488dd9001d52c6bd39de0b552efc994fa8e443a19a0bcb3a90e245d3629ef5619c
 MISC metadata.xml 318 BLAKE2B a84cbe76b571c704e7ccb8f8a62d6966a891c27276e238947360beba3105bc8e7d714cf43765d87b3549652e4bccf99554b50d56e1b36017625dbd287c045229 SHA512 e4f59e33a6c647e67c1ac74f8d9b8cf1be9283162e838bea486c59ba312c9ce44c81103ce05d90592a831c03516aa0a6532c83a4c71761db32c68def4c20a301
diff --git a/net-wireless/osmocom-bb/osmocom-bb-9999.ebuild b/net-wireless/osmocom-bb/osmocom-bb-9999.ebuild
index e8413a907551..be88f95016e4 100644
--- a/net-wireless/osmocom-bb/osmocom-bb-9999.ebuild
+++ b/net-wireless/osmocom-bb/osmocom-bb-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit git-2 autotools flag-o-matic
+inherit autotools flag-o-matic git-r3
 
 DESCRIPTION="OsmocomBB MS-side GSM Protocol stack (L1, L2, L3) excluding firmware"
 HOMEPAGE="http://bb.osmocom.org"
diff --git a/net-wireless/rfcat/Manifest b/net-wireless/rfcat/Manifest
index 7b4cda49573b..022c454d1b70 100644
--- a/net-wireless/rfcat/Manifest
+++ b/net-wireless/rfcat/Manifest
@@ -4,5 +4,5 @@ DIST RfCatYS1CCBootloader-170313.hex 50208 BLAKE2B 9df19800d5c0c5a4b8c99f550c758
 DIST immeSniff-170508.hex 38770 BLAKE2B fd34fee85ee6bf893234939cab9794c34f9302e37d86636116e544ca39e368ed8b6015ae2efa80c49ad56722b1fa573897e0b93ca4d5b2e6496c9f92c9c761d6 SHA512 3f06693fc893071adfb75e510da4d5c47752480896e449f893141b4db43dc7fb859dc25ab368d742ae612ebda085f199bcd8e18c9f5fa6f58c6b6204defc7b5f
 DIST rfcat_170508.tgz 462440 BLAKE2B 20d4b875be7caeb8263e3582c101a2402527b2f4f54feceba49bf01f65d268f3f9537c42a9a40502a6e232c7d828b6be27d899e979509c607c1160a71aa3677a SHA512 79f960ee6b8c2d66cb17ca69216041bb9679b0d38579feb3ab59bbb6e41337b29c4ad30a6d03b2de4c58eeeff5f22fe26412a670da5278e81a47a2ec3d699f60
 EBUILD rfcat-0.0.170508.ebuild 1381 BLAKE2B 06c89b4f5b5edbc0f9569fbe13e3c51b68e81775d77d8e03a7e8f2bb6ded0d567a46329171bdb8f83fdaf5db2e156d1337b37412565d05a0eb9331d37e83a7d6 SHA512 5957e81e866b1ecafa618c435da3790e1a540f31d8d893c42314f9339af4e9bd8a0158be50e8404b54efbc2fee29638369935291be5b6452b4085f880165ca45
-EBUILD rfcat-9999.ebuild 1381 BLAKE2B 06c89b4f5b5edbc0f9569fbe13e3c51b68e81775d77d8e03a7e8f2bb6ded0d567a46329171bdb8f83fdaf5db2e156d1337b37412565d05a0eb9331d37e83a7d6 SHA512 5957e81e866b1ecafa618c435da3790e1a540f31d8d893c42314f9339af4e9bd8a0158be50e8404b54efbc2fee29638369935291be5b6452b4085f880165ca45
+EBUILD rfcat-9999.ebuild 1380 BLAKE2B d7a670474617557244737596581b355472b1c49d8675d33ec7a3b84dfe7c82db202d0b87597246a7386df913ffdbc587dce40dccd05781da4bb60e56dea40e3d SHA512 15d164d65d44d5eb6a2240d5babb7edcdf9d15911a94f48c0d4e2d760af30b7c8bb08a8b15bb20d141f2ed9271c16b8a24d1d5ecd4fad38f3d668fe9d4e3fbaf
 MISC metadata.xml 332 BLAKE2B f434ada12078111a24ebbf48d22c9820bd2c4f93c86b90a75e3e31b62dada319d35260ca469b9e8931abfd34416b9018c55e6a246ba9f29b793f32eb30e3bfce SHA512 c99ea897c8e261d0fe784a70e40fa34d11e5ed1600ff1a24c5b0a3618430c9509d94755ec3c4e76e656c62cc51502b6345f0de7713f9a3dc213ef00bb5fce468
diff --git a/net-wireless/rfcat/rfcat-9999.ebuild b/net-wireless/rfcat/rfcat-9999.ebuild
index 344278dba590..12bb3e32f0c5 100644
--- a/net-wireless/rfcat/rfcat-9999.ebuild
+++ b/net-wireless/rfcat/rfcat-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
@@ -10,8 +10,8 @@ DESCRIPTION="The swiss army knife of subGHz"
 HOMEPAGE="https://bitbucket.org/atlas0fd00m/rfcat/"
 
 if [ "${PV}" = "9999" ]; then
-	EHG_REPO_URI="https://bitbucket.org/atlas0fd00m/rfcat"
-	inherit mercurial
+	EGIT_REPO_URI="https://github.com/atlas0fd00m/rfcat.git"
+	inherit git-r3
 	KEYWORDS=""
 else
 	DATE="170508"
diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index 37714f32df38..2e5c247aac01 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -1,7 +1,4 @@
-AUX rtl-sdr-0.5.3-static-inline.patch 1994 BLAKE2B b986fdeb438f9f566b74c4f0914019667c45a654eeb6c875e5d20bbdf8be37e5881db9648fc556354f1b20c9fdfec62c5afddebfbd76c0685ebbe6f6908efb80 SHA512 f7de6345a9ede8b05ebdd28a3c1fd07a58caadafe24a1009ca05d82d9cd8fbc86fc04fe545d05c951cea7b6b819e54911f8b4ad06ce7fbe8d998e51d9480ac3e
-DIST rtl-sdr-0.5.3_p20150730.tar.xz 485476 BLAKE2B 950d6b6d959bf6998c1ddb0c8ee55621e05ccce16abc7b03ee6632dc194249a8cea75f68697a54c0e156750708f14365bbb327f4198e36a9e042898ea015f945 SHA512 b19e9ce6ebc1c63a26ad3d8b13ccdcac76d4dee317aba547a8cd760e59256251df59ecc3ff6f8cb42d9be8235d67bd280f3373e58acb64f553fae5e3c2d113a6
 DIST rtl-sdr-0.5.3_p20170919.tar.xz 98972 BLAKE2B fb7d977bd05a2c717897ba58a2242698d1a90cf38a7a8340d7ec8c3aefeeff49bfe9612285253b27c6726ae584172e0b26c8f535bc4bec704958c1296e232f04 SHA512 b1b97c720882ccbe8be8e30af28b8d52c5a27507861bdb9e964e153cd8ece9de977abd271b68861c163a7cf239044f28c8d17ccda5ff5acf60f17d839d782a82
-EBUILD rtl-sdr-0.5.3_p20150730.ebuild 1074 BLAKE2B f6e0df306e19cc6dd9932660153ed44958c4e22d0c3a080963105179bb8e18c8e2f3531891f4d39614e718c1402028f012ed847fc7a9f4a0511b981b15af6d8a SHA512 9eabb3496eed4409b2382a5a76f1c3e68219111c8ae56f2a25739c05eb53cf520203ce7ac612535ef6b7a0eda75cb40a2f57ab5c01ccd3c4b216ed3debf96932
 EBUILD rtl-sdr-0.5.3_p20170919.ebuild 1158 BLAKE2B 060c6584b65db1609668b8fe4d00193f4cc449e3cb3eab530200c7e16914fc18169237734039394eacc2abeb790ac73b6dc72d8e6bd630d8f60a96bfcc88d764 SHA512 7fe51f8e935b15509c12382c43bbc17e5db09ce3917e4fc8786fc96276b58781066c6069478d067c91cdb78fabb09e6bf05a6f55776f073f0811264b472a241b
 EBUILD rtl-sdr-9999.ebuild 1158 BLAKE2B 060c6584b65db1609668b8fe4d00193f4cc449e3cb3eab530200c7e16914fc18169237734039394eacc2abeb790ac73b6dc72d8e6bd630d8f60a96bfcc88d764 SHA512 7fe51f8e935b15509c12382c43bbc17e5db09ce3917e4fc8786fc96276b58781066c6069478d067c91cdb78fabb09e6bf05a6f55776f073f0811264b472a241b
 MISC metadata.xml 238 BLAKE2B 34ac0d15fbd529b95d6a8c5656482832843c35f4befaa7bb238eec7634acb09a074de43cbd4d4c0a57d3b2810901bc85c7d2780beee573cd72c37b6244d78dc8 SHA512 b8e525ce325eb8201273f8d0ea320d6ba41a183d7f80b0f44dcca44c48049baec1c3489ebd32a17d3be9d6a31a9427ce40cd1686f12e42ca99b0d7037af9532f
diff --git a/net-wireless/rtl-sdr/files/rtl-sdr-0.5.3-static-inline.patch b/net-wireless/rtl-sdr/files/rtl-sdr-0.5.3-static-inline.patch
deleted file mode 100644
index 0f0e829e3b06..000000000000
--- a/net-wireless/rtl-sdr/files/rtl-sdr-0.5.3-static-inline.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-https://github.com/steve-m/librtlsdr/pull/38
-
-From ea6a86d8e792430faa3a8161ee99f2bc392875d1 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Fri, 3 Feb 2017 15:44:18 -1000
-Subject: [PATCH] fix builds with newer compilers & C standards
-
-The meaning of "inline" has changed when "static" is not used.
-Since none of these functions are used outside of their respective
-files, mark them as static to avoid build errors where funcs are
-not inlined (based on compiler flags too).
----
- src/rtl_adsb.c  | 8 ++++----
- src/rtl_power.c | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/rtl_adsb.c b/src/rtl_adsb.c
-index e611e78f3dad..a3bfa7f36b5e 100644
---- a/src/rtl_adsb.c
-+++ b/src/rtl_adsb.c
-@@ -182,7 +182,7 @@ int magnitute(uint8_t *buf, int len)
- 	return len/2;
- }
- 
--inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d)
-+static inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d)
- /* takes 4 consecutive real samples, return 0 or 1, BADSAMPLE on error */
- {
- 	int bit, bit_p;
-@@ -223,17 +223,17 @@ inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d
- 	return BADSAMPLE;
- }
- 
--inline uint16_t min16(uint16_t a, uint16_t b)
-+static inline uint16_t min16(uint16_t a, uint16_t b)
- {
- 	return a<b ? a : b;
- }
- 
--inline uint16_t max16(uint16_t a, uint16_t b)
-+static inline uint16_t max16(uint16_t a, uint16_t b)
- {
- 	return a>b ? a : b;
- }
- 
--inline int preamble(uint16_t *buf, int i)
-+static inline int preamble(uint16_t *buf, int i)
- /* returns 0/1 for preamble at index i */
- {
- 	int i2;
-diff --git a/src/rtl_power.c b/src/rtl_power.c
-index aa7a138a8cd3..a7a43bbd2507 100644
---- a/src/rtl_power.c
-+++ b/src/rtl_power.c
-@@ -249,7 +249,7 @@ void sine_table(int size)
- 	}
- }
- 
--inline int16_t FIX_MPY(int16_t a, int16_t b)
-+static inline int16_t FIX_MPY(int16_t a, int16_t b)
- /* fixed point multiply and scale */
- {
- 	int c = ((int)a * (int)b) >> 14;
--- 
-2.11.0
-
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20150730.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20150730.ebuild
deleted file mode 100644
index 11c384d72641..000000000000
--- a/net-wireless/rtl-sdr/rtl-sdr-0.5.3_p20150730.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
-HOMEPAGE="http://sdr.osmocom.org/trac/wiki/rtl-sdr"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.3-static-inline.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_configure() {
-	#the udev rules are 666, we don't want that
-	mycmakeargs=(
-		-DINSTALL_UDEV_RULES=OFF
-		-DDETACH_KERNEL_DRIVER=ON
-		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "Only users in the usb group can capture."
-	elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login."
-}
diff --git a/net-wireless/uhd/Manifest b/net-wireless/uhd/Manifest
index 53bde86a49a4..4e94f7c2dad1 100644
--- a/net-wireless/uhd/Manifest
+++ b/net-wireless/uhd/Manifest
@@ -1,12 +1,11 @@
 AUX uhd-3.10.3.0-tinfo.patch 1680 BLAKE2B 6b31b95c4b63d043e66e5fb41f75b3e73d0e9327d304a211d950bc982209f12425ee716ff2218ceace317ba978ddfe7d0b94961c9feeb0a08dd5454515df7505 SHA512 2c0e6163ddb005b5d02a380033030d111d1eff23f8327aff802e80e449594e48bdd8f2656ffd21c6281233a36ac89d52aa6833e2ea0349276baaef497c463cba
-AUX uhd-3.9.6-tinfo.patch 1824 BLAKE2B bbbd4f17e7e24532d49847f7ab476bc2105d4de63346d73cecc77cf422e471a9f8cb6bec6545eac8226da12e66ee6be9088070970408ec2aa48867e817fa0aeb SHA512 66d1b7197b727c1e16469e47fa7392585e68f30e61c23114152f8cb0dab41bb074236f33637bba4e7b03421468e43943ad65b8f148a341666cc407ebc10f5522
 DIST EttusResearch-UHD-3.10.3.0.tar.gz 7566274 BLAKE2B 4267f1cb2e30808e54709946c74fbab8612560d38ad32f58745085b2b8c18f1c376e642ff430db476dd829bc0ecfca62faa211fe8800ce8589223f9123a1c608 SHA512 398fdaa29daf4a0d49172afce46ec57a8a96861a8d3262fdd19f78a29dc7d17ae7cb3731639950784420eca50c0a2f0dc8bf83da7be0b63af208b7bf0b382f6b
 DIST EttusResearch-UHD-3.11.0.0.tar.gz 9279808 BLAKE2B b0c083d0ad04b7012b0a7bfa866f26db0e159d6daa2209b56ab8733d8d5288e8ff039aa3e2a27e5d715d08022e175a4e04e65f465ceea5da77dc4339d9ba5951 SHA512 63a50f2736c4ba05e06517cfdcb3eae465f78d506e75df36055d8cdec5259ffeebdd6e7ef352c64dfd6b9ef7fbd0df572515bdedefcabe2006abbecb012b169f
-DIST EttusResearch-UHD-3.9.6.tar.gz 2458419 BLAKE2B 39859c9c7a520b91fd0ad11b82a454ae267d0e04bbb3d3f474ab31ea8daac69c03e5abe4ed54f3eec5810d180d00aa700e67b10d989295fdedf73cb198ae324d SHA512 f8e89f67659e9509d90fb63a91c75b7a5fe037821ccd2f33313ac0b20d856cbdc2cab79715f7fca035ba0e28b240c73408d6764cb09b01700c4ddbdcafa71da1
-DIST uhd-images_003.009.006-release.zip 26268656 BLAKE2B 7d8c1b0bbd627a0180d5e2de996eb68b1fb995ea2c28ed12fa73705cda680d6304ff013a80cfd4ea5928137c16ac128546bdb9ed3cf932a837faa6dfe0866ffa SHA512 3b07a054583a55424edeb37d3ee70b9bd8c7b6cb4c83a10faf4dd518aa148be17af7cb8b5e4fb7cbb643eae32d7a3295a94d9a0eb031823ccf1f414da0cef631
+DIST EttusResearch-UHD-3.12.0.0.tar.gz 9317321 BLAKE2B 7fdbef49482166d929952848dc2a978161e739462c6743dc162ad92b93190086e6957b08f54cba23e6118ddff41c5fb1cfceffedc8411791aece866ab2ab98f7 SHA512 33efcb913a40fcceaf21460eeb7b8fe7fdd9066cefc1f6ae7d4f436532965b3fe55557d551a8e95c3823418ffec4c0e2804e200c9222b5bf5735622cc2cb1389
 DIST uhd-images_003.010.003.000-release.zip 57008597 BLAKE2B 9fc93404860956e217c1bac6d3ade6fb5fb160afa6b07e5f4ccf10bf48a932d29068cca8730796797c66f36e9e30bd1d699359fad02b191ba4a224e096bf5fc3 SHA512 a211cc9e40e3ff718150e4fed92a2acd0c5612524e0127b7f5ae0b20242e479cd9a44d4e48e7dfebc1a555555e4d2adea6c0e0517d3e81817d8d50f03cd7e8f7
+DIST uhd-images_3.12.0.0.tar.xz 87309808 BLAKE2B 02e121cada37e2b2956521317513eb02a5b2ce6d9ca04609b5f847bda31e12a4ef4d83135f9e78fb88042f455afe8636d2c8c1a4539fa7e03ef3310a215fa938 SHA512 7bba0d87580413e2843c7e71938c5d5bfeaf7aa3bc58d058c1c80d5e1397443bcec637e378b2e9582752b97b11e57110299231c4ad3ae81cdd629251f49e84d8
 DIST uhd_3.11.0.0_images.tar.xz 73634376 BLAKE2B 1d6ff5ec976082e1b3f6db3e8277e277591c7b2a96698c93407099a3543c6787632724d385f319828a9fe8e6ea750e0cd2256cd1cb32aeddda7dfa6ab88ffb3e SHA512 1a665ea58ef545f0a0b643916b822127d55cf81a59c6f447d8006619200d1be69ebebf47261ac318d6ecd1d0e265b9cf4b5da83b082b649496aadd9b4293c6c8
 EBUILD uhd-3.10.3.0.ebuild 2043 BLAKE2B 299a8f73dbabe40dafae728cca63636e29ba90b0ee48bec4637bbab4c61668fb2121f6a65808a44696a2c4f8bf5f2bc773d4485a2b6556bc6e7c3e819b5bf1cd SHA512 777d6d6fd40bd74816916dc94e712de0cecc9e5a4275bfff67d69cef63866e9ae75cdaf0ed75bf17591b8667e3f73fda35f513ab13070c40d855b807bc53d93e
 EBUILD uhd-3.11.0.0.ebuild 3902 BLAKE2B 34d21ac5fca3a00b255bb0dbae36d5930416013d79a7544d0c365c0f3cdd6df5a9418cc5a4196968e15b469312522545ce6c360103bfd76191aa6595a777e5fe SHA512 1ee713c893dbf749851df9a4e628504b7a3bd907b3a9f06de3444656e101d63ab6f85a0b201658da3afce3a03389dba027fde92b09076976289694cb091ab498
-EBUILD uhd-3.9.6.ebuild 1900 BLAKE2B 99a2bb4b1e3a391408c48222a4ebb0e7a423d48400468993554e127bd3c16a7a5f415f91a8ba8d39d766ff3ee4361e51d89ea580f0114f67af8ba9dfa8084e39 SHA512 38673ebcb6d9acff3be5173dec793fc0a8f3dcc3839c92e80dabcfeae34a5cfbeadd5bd2acb48cbbd5834abe7416ec1d232714d1ec3f91a965bbfe22a9522bec
+EBUILD uhd-3.12.0.0.ebuild 3535 BLAKE2B cde3b15683186acf7f2eb877609df487c83afb924718076b591e5670eee32634867e658088d88edab7ebf3b3346572b4c3a19b070169e5e78a9e72962a35bf90 SHA512 6e6cb73b52e631dc7ac6274f77756846d5252e73e7b95c28b639ff1713be1bbca0ab333aaecd971553433fe49ebbd61ab18f9be04b2ff0b81bdf9a45e0ceb8c8
 MISC metadata.xml 1159 BLAKE2B 59bc09885a8911e12ceda3558007e33f57bbd5e672540d56d41c1f637bd30166eb0260789fc4d2769a40f9e820fae18641d19ee2c8b204e34c4bc99cc7f6d20a SHA512 2ae758d9366e815bb099c0bf71a526787a810f3911294e0ec6cde4b4c3d924a67028d2c1bb0ef3922dae4c03d4cc5ccb2f1dd44da31ad58f87bd4403f1e2a777
diff --git a/net-wireless/uhd/files/uhd-3.9.6-tinfo.patch b/net-wireless/uhd/files/uhd-3.9.6-tinfo.patch
deleted file mode 100644
index 511bc3c13fcd..000000000000
--- a/net-wireless/uhd/files/uhd-3.9.6-tinfo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- uhd-release_003_009_006/host/utils/latency/CMakeLists.txt.orig	2017-05-11 19:44:54.824946672 +0300
-+++ uhd-release_003_009_006/host/utils/latency/CMakeLists.txt	2017-05-11 19:45:08.498880360 +0300
-@@ -35,7 +35,8 @@
-         GET_FILENAME_COMPONENT(name ${source} NAME_WE)
-         ADD_EXECUTABLE(${name} ${source} ${latency_lib_path})
-     	LIBUHD_APPEND_SOURCES(${name})
--        TARGET_LINK_LIBRARIES(${name} uhd ${Boost_LIBRARIES} ${CURSES_LIBRARIES})
-+        TARGET_LINK_LIBRARIES(${name} uhd ${Boost_LIBRARIES}
-+            ${CURSES_LIBRARIES} tinfo)
-     	UHD_INSTALL(TARGETS ${name} RUNTIME DESTINATION ${latency_comp_dest} COMPONENT ${latency_comp_name})
-     ENDFOREACH(source)
- 
---- uhd-release_003_009_006/host/examples/CMakeLists.txt.orig	2017-05-11 19:41:02.322302577 +0300
-+++ uhd-release_003_009_006/host/examples/CMakeLists.txt	2017-05-11 19:44:32.604066325 +0300
-@@ -59,7 +59,7 @@
- IF(CURSES_FOUND)
-     INCLUDE_DIRECTORIES(${CURSES_INCLUDE_DIR})
-     ADD_EXECUTABLE(rx_ascii_art_dft rx_ascii_art_dft.cpp)
--    TARGET_LINK_LIBRARIES(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} ${Boost_LIBRARIES})
-+    TARGET_LINK_LIBRARIES(rx_ascii_art_dft uhd ${CURSES_LIBRARIES} tinfo ${Boost_LIBRARIES})
-     UHD_INSTALL(TARGETS rx_ascii_art_dft RUNTIME DESTINATION ${PKG_LIB_DIR}/examples COMPONENT examples)
- ENDIF(CURSES_FOUND)
- 
---- uhd-release_003_009_006/host/CMakeLists.txt.orig	2017-05-11 19:36:38.944798634 +0300
-+++ uhd-release_003_009_006/host/CMakeLists.txt	2017-05-11 19:36:40.819788408 +0300
-@@ -436,6 +436,8 @@
-     LIST(APPEND UHD_LINK_LIST_STATIC "usb-1.0")
- ENDIF(ENABLE_USB)
- 
-+LIST(APPEND UHD_LINK_LIST_STATIC "tinfo")
-+
- CONFIGURE_FILE(
-     ${CMAKE_SOURCE_DIR}/cmake/Modules/UHDConfigVersion.cmake.in
-     ${CMAKE_BINARY_DIR}/cmake/Modules/UHDConfigVersion.cmake
diff --git a/net-wireless/uhd/uhd-3.12.0.0.ebuild b/net-wireless/uhd/uhd-3.12.0.0.ebuild
new file mode 100644
index 000000000000..18e5ddf13060
--- /dev/null
+++ b/net-wireless/uhd/uhd-3.12.0.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
+
+DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
+HOMEPAGE="https://kb.ettus.com"
+
+image_version=uhd-images_00$(get_version_component_range 1).0$(get_version_component_range 2).00$(get_version_component_range 3).00$(get_version_component_range 4)-release
+SRC_URI="https://github.com/EttusResearch/uhd/archive/v${PV}.tar.gz -> EttusResearch-UHD-${PV}.tar.gz \
+	https://github.com/EttusResearch/uhd/releases/download/v${PV}/uhd-images_${PV}.tar.xz"
+#https://github.com/EttusResearch/UHD-Mirror/tags
+#http://files.ettus.com/binaries/images/
+
+LICENSE="GPL-3"
+SLOT="0/$(get_version_component_range 1).$(get_version_component_range 2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="b100 b200 doc e300 examples mpmd octoclock n230 test usb usrp1 usrp2 +utils x300"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+			b100? ( usb )
+			b200? ( usb )
+			usrp1? ( usb )
+			usrp2? ( usb )
+			|| ( b100 b200 e300 mpmd n230 usrp1 usrp2 x300 )"
+
+RDEPEND="${PYTHON_DEPS}
+	e300? ( virtual/udev )
+	usb? ( virtual/libusb:1 )
+	dev-libs/boost:=
+	sys-libs/ncurses:0[tinfo]
+"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	dev-python/mako
+	app-arch/unzip
+	app-arch/gzip
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.10.3.0-tinfo.patch" )
+
+S="${WORKDIR}/${P}/host"
+
+src_unpack() {
+	default
+	mv "uhd-images_${PV}" images || die
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	gnome2_environment_reset #534582
+
+	#this may not be needed in 3.4.3 and above, please verify
+	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_LIBUHD=ON
+		-DENABLE_C_API=ON
+		-DENABLE_LIBERIO=OFF
+		-DENABLE_MAN_PAGES=ON
+		-DENABLE_GPSD=OFF
+		-DENABLE_EXAMPLES="$(usex examples)"
+		-DENABLE_TESTS="$(usex test)"
+		-DENABLE_USB="$(usex usb)"
+		-DENABLE_UTILS="$(usex utils)"
+		-DENABLE_MANUAL="$(usex doc)"
+		-DENABLE_DOXYGEN="$(usex doc)"
+		-DENABLE_B100="$(usex b100)"
+		-DENABLE_B200="$(usex b200)"
+		-DENABLE_E300="$(usex e300)"
+		-DENABLE_USRP1="$(usex usrp1)"
+		-DENABLE_USRP2="$(usex usrp2)"
+		-DENABLE_X300="$(usex x300)"
+		-DENABLE_N230="$(usex n230)"
+		-DENABLE_MPMD="$(usex mpmd)"
+		-DENABLE_OCTOCLOCK="$(usex octoclock)"
+	)
+	cmake-utils_src_configure
+}
+src_install() {
+	cmake-utils_src_install
+	use utils && python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
+	if [ "${PV}" != "9999" ]; then
+		rm -rf "${ED}/usr/bin/uhd_images_downloader"
+		rm -rf "${ED}/usr/share/man/man1/uhd_images_downloader.1.gz"
+	fi
+
+	insinto /lib/udev/rules.d/
+	doins "${S}/utils/uhd-usrp.rules"
+
+	rm -rf "${WORKDIR}/images/winusb_driver"
+	if ! use b100; then
+		rm "${WORKDIR}"/images/usrp_b100* || die
+	fi
+	if ! use b200; then
+		rm "${WORKDIR}"/images/usrp_b2[01]* || die
+	fi
+	if ! use e300; then
+		rm "${WORKDIR}"/images/usrp_e3* || die
+	fi
+	if ! use mpmd; then
+		rm "${WORKDIR}"/images/usrp_n310* || die
+	fi
+	if ! use n230; then
+		rm "${WORKDIR}"/images/usrp_n230* || die
+	fi
+	if ! use octoclock; then
+		rm "${WORKDIR}"/images/octoclock* || die
+	fi
+	if ! use usrp1; then
+		rm "${WORKDIR}"/images/usrp1* || die
+	fi
+	if ! use usrp2; then
+		rm "${WORKDIR}"/images/usrp2* || die
+		rm "${WORKDIR}"/images/usrp_n2[01]* || die
+		rm -r "${WORKDIR}"/images/bit || die
+	fi
+	if ! use x300; then
+		rm "${WORKDIR}/"images/usrp_x3* || die
+	fi
+	insinto /usr/share/${PN}
+	doins -r "${WORKDIR}/images"
+}
diff --git a/net-wireless/uhd/uhd-3.9.6.ebuild b/net-wireless/uhd/uhd-3.9.6.ebuild
deleted file mode 100644
index d7bf1683325c..000000000000
--- a/net-wireless/uhd/uhd-3.9.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator python-single-r1 gnome2-utils cmake-utils multilib
-
-DESCRIPTION="Universal Software Radio Peripheral (USRP) Hardware Driver"
-HOMEPAGE="http://code.ettus.com/redmine/ettus/projects/uhd/wiki"
-
-image_version=uhd-images_00$(get_version_component_range 1).00$(get_version_component_range 2).00$(get_version_component_range 3)-release
-SRC_URI="https://github.com/EttusResearch/uhd/archive/release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3).tar.gz -> EttusResearch-UHD-$(get_version_component_range 1).$(get_version_component_range 2).$(get_version_component_range 3).tar.gz \
-	http://files.ettus.com/binaries/images/${image_version}.zip"
-#https://github.com/EttusResearch/UHD-Mirror/tags
-#http://files.ettus.com/binaries/images/
-
-LICENSE="GPL-3"
-SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	virtual/libusb:1
-	dev-lang/orc
-	dev-libs/boost:=
-	sys-libs/ncurses:0
-	"
-DEPEND="${RDEPEND}
-	dev-python/mako
-	dev-python/cheetah
-	app-arch/unzip"
-
-S="${WORKDIR}"/uhd-release_00$(get_version_component_range 1)_00$(get_version_component_range 2)_00$(get_version_component_range 3)/host
-
-PATCHES=( "${FILESDIR}/${P}-tinfo.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	gnome2_environment_reset #534582
-
-	#this may not be needed in 3.4.3 and above, please verify
-	sed -i 's#SET(PKG_LIB_DIR ${PKG_DATA_DIR})#SET(PKG_LIB_DIR ${LIBRARY_DIR}/uhd)#g' CMakeLists.txt || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"/usr/$(get_libdir)/${PN}/utils/
-	insinto /lib/udev/rules.d/
-	doins "${S}"/utils/uhd-usrp.rules
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}"/"${image_version}"/share/uhd/images
-}
author	V3n3RiX <venerix@redcorelinux.org>	2018-06-09 09:27:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-06-09 09:27:03 +0100
commit	cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (patch)
tree	047fc92023c520d07f13ec5ac96e094d1b312a7a /net-wireless
parent	7b9f15840068dfaeea5684f8a1af1fe460dfa14c (diff)