gentoo resync : 11.07.2019

20 files changed, 264 insertions, 111 deletions

diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index f593550407fa..e5dbea2d3765 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index b546d5d5737a..a701df44ea90 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,6 +1,8 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
+DIST blueman-2.1.1.tar.xz 950296 BLAKE2B 10113bf9bd6744d6aaa5e4d0912d87ba11ace36027acfb10802988ad7c7458dbe2c092095148277f437a8dac68f93c017da53a0925a2c3e8c24e0400db567c87 SHA512 bde7dffc369a7204e2c0e05005f3c1cb97760b3d8625342fe69a5b5c729d6b90eabeca37c679c56f73499f1dbc17ccc15800b4e6e48e717f0e306083525981e9
 DIST blueman-2.1.beta1.tar.xz 948440 BLAKE2B da1c6935b47b498d8fa2681c9672381bb6242f8fd752f28d2f2874dd4b602927044db1a291246dfd4c0931d934cc32b2516680cb963fec948fa9452d08d69671 SHA512 c7f04f6d65c9228660efc6e4d2e417eef8dd08f1f703a16270fc883f40be2b7d8f1d7e8728f3a0523b854bfef7fed18b58eb8cdae697d9890a76c220ee2b818b
 DIST blueman-2.1.tar.xz 950124 BLAKE2B e357d8b56e7fa20a03b401585c0bd9680e5138363ec9894c4aaa51c3082fa83f0d2c6ae2f4911c1fab23aa0eab30bd070ec4b97abf997a0cf55365d26f1b7782 SHA512 b675b9edc4fbf4c27f48d3e59bafbe555e59d6d21f7f9358fdd5741b1c7584490010cc5f53f812a7640f0c45aaa29ec4a946548b2a33dfddd7dcad4cce54400c
+EBUILD blueman-2.1.1.ebuild 2780 BLAKE2B 7b184eadc3b08275ec5a69be05ffe634a952c4e8734f7eaf8f923d77b397da0c2a4494f0ce692574cc9077310b44b6ab41e004315c7c65bbd3c20614ad276259 SHA512 b8bac18ecab2f956120aab08728bac5ba4568bae21031ba6f7be9fe994a829513625625a875c57db74c9d5a437d4ed39a4a6b2ca9bb8db6ce9e0768ba4120e89
 EBUILD blueman-2.1.ebuild 2780 BLAKE2B 7b184eadc3b08275ec5a69be05ffe634a952c4e8734f7eaf8f923d77b397da0c2a4494f0ce692574cc9077310b44b6ab41e004315c7c65bbd3c20614ad276259 SHA512 b8bac18ecab2f956120aab08728bac5ba4568bae21031ba6f7be9fe994a829513625625a875c57db74c9d5a437d4ed39a4a6b2ca9bb8db6ce9e0768ba4120e89
 EBUILD blueman-2.1_beta1.ebuild 2780 BLAKE2B 7b184eadc3b08275ec5a69be05ffe634a952c4e8734f7eaf8f923d77b397da0c2a4494f0ce692574cc9077310b44b6ab41e004315c7c65bbd3c20614ad276259 SHA512 b8bac18ecab2f956120aab08728bac5ba4568bae21031ba6f7be9fe994a829513625625a875c57db74c9d5a437d4ed39a4a6b2ca9bb8db6ce9e0768ba4120e89
 EBUILD blueman-9999.ebuild 2757 BLAKE2B 30cb997a1c7473786e45728aa447c1c3b3329d8285033b26115bd29342b731201747ce80eb45004df82f5661fdc534c1ecb2ce37363ed5409500ad86bb604ed5 SHA512 02cb66900dddb5a3cecd25c24f20eef45daea1eae5f6fde4b44e17da5e795c530e6ed00c5a89a2ff7620409d152cccb752a6fef05668b8757e404e5ec04469e1
diff --git a/net-wireless/blueman/blueman-2.1.1.ebuild b/net-wireless/blueman/blueman-2.1.1.ebuild
new file mode 100644
index 000000000000..6f86023ac9c9
--- /dev/null
+++ b/net-wireless/blueman/blueman-2.1.1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit gnome2-utils linux-info python-single-r1 systemd xdg-utils
+
+DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
+HOMEPAGE="https://github.com/blueman-project/blueman"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV/_/.}/${P/_/.}.tar.xz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+fi
+
+# icons are GPL-2
+# source files are mixed GPL-3+ and GPL-2+
+LICENSE="GPL-3+ GPL-2"
+SLOT="0"
+IUSE="appindicator network nls policykit pulseaudio"
+
+DEPEND="
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=net-wireless/bluez-5:=
+	${PYTHON_DEPS}"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	nls? ( dev-util/intltool sys-devel/gettext )"
+RDEPEND="${DEPEND}
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	sys-apps/dbus
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	|| (
+		x11-themes/adwaita-icon-theme
+		x11-themes/faenza-icon-theme
+		x11-themes/mate-icon-theme
+	)
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	network? (
+		net-firewall/iptables
+		|| (
+			sys-apps/net-tools
+			sys-apps/iproute2
+		)
+		|| (
+			net-dns/dnsmasq
+			net-misc/dhcp
+			>=net-misc/networkmanager-0.8
+		)
+	)
+	policykit? ( sys-auth/polkit )
+	pulseaudio? ( media-sound/pulseaudio[bluetooth] )
+	!net-wireless/gnome-bluetooth
+"
+
+S=${WORKDIR}/${P/_/.}
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+pkg_pretend() {
+	if use network; then
+		local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
+			~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--docdir=/usr/share/doc/${PF}
+		--disable-runtime-deps-check
+		--disable-static
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+		--with-dhcp-config="/etc/dhcp/dhcpd.conf"
+		$(use_enable appindicator)
+		$(use_enable policykit polkit)
+		$(use_enable nls)
+		$(use_enable pulseaudio)
+		# thunar integration is a single data file with no extra deps
+		# so install it unconditionally
+		--enable-thunar-sendto
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if use policykit; then
+		# Allow users in plugdev group to modify connections
+		insinto /usr/share/polkit-1/rules.d
+		doins "${FILESDIR}/01-org.blueman.rules"
+	fi
+
+	rm "${D}"/$(python_get_sitedir)/*.la || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index 1df0cccab1b1..2d9862347cd0 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -3,5 +3,5 @@ DIST dump1090-0.0_p20140919.tar.xz 445108 BLAKE2B 96da9faae0139710b92adfeb921f7b
 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-1.15_pre20180509.ebuild 1359 BLAKE2B 7594ea89af34eca71d1049f713cf619270ad24beee6b5c96077ad00000960bcc7152d5e2c35c5510577b56e9c50786a0d88fc5c15b5e4d68292a3f2537184b1f SHA512 1256007d22664532e3420cf4d388eab6e5c905f1027bb16d31d5fee6d7931a3ae5ac2f738f0d74bd5774f18fb52b237659d24bb0a9cadfeefb9be57a98af5d14
-EBUILD dump1090-9999.ebuild 1359 BLAKE2B 7594ea89af34eca71d1049f713cf619270ad24beee6b5c96077ad00000960bcc7152d5e2c35c5510577b56e9c50786a0d88fc5c15b5e4d68292a3f2537184b1f SHA512 1256007d22664532e3420cf4d388eab6e5c905f1027bb16d31d5fee6d7931a3ae5ac2f738f0d74bd5774f18fb52b237659d24bb0a9cadfeefb9be57a98af5d14
-MISC metadata.xml 319 BLAKE2B 2e5d70af3000792a01f1fbae591b55d7c9473574f51bf30a6b6c9c13fd6a9247f3934d94c78969bf31425f47c63b708cfc07f861c4c2c5c96a9eea85cf177f72 SHA512 678fd4aeaa6cddbb2761cf63b66250e8ee83a58aabad547d208c11d2b8c4094be7c35b284db36db5e061a363cababde70f8355460dd3200f089b6f65c5104ecb
+EBUILD dump1090-9999.ebuild 1532 BLAKE2B 4c75d55a1401a09800f561b61e6d92d1838113a4fce3cb9d51d5a564395352b8527fc5e8d6d9ce0be0ac1f4f6cf39a05e637ec595146f2cdf8b6b7472df3746d SHA512 c72721881cc2a9e335a2d189551a0b1c36847c4f6101ee1d502f30dbee457ec01a7081d2c9038cc6cdae660b68fdeed779f2a6cbd00a0d4dbd5fd440ffe9846a
+MISC metadata.xml 475 BLAKE2B 65a7e4651f29eabc99e389d7ec78482bb20b87891e4313cd5d8f9b70d6f6567591dc30b8f81ef8b81d37f0a83fcde56b7616b142105639609f82054162ff7e4b SHA512 c91e0b24df8c2a90daa48fb1f94e3968fa4586b986e05d853d937d4a570d3828216840dd2c4babe0f5ee257f19079c94461a230a2327e9d2c2966d7b01d68999
diff --git a/net-wireless/dump1090/dump1090-9999.ebuild b/net-wireless/dump1090/dump1090-9999.ebuild
index 556e4a14a698..e4ab4ba0cfe8 100644
--- a/net-wireless/dump1090/dump1090-9999.ebuild
+++ b/net-wireless/dump1090/dump1090-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,34 +9,42 @@ 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"
+#HOMEPAGE="https://github.com/mutability/dump1090"
+#And now we move to the next one in line
+HOMEPAGE="https://github.com/flightaware/dump1090"
 
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mutability/${PN}.git"
+	EGIT_REPO_URI="https://github.com/flightaware/${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}"
+	#COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"
+	#SRC_URI="https://github.com/flightaware/dump1090/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}/${PN}-${COMMIT}"
+	SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
+IUSE="bladerf +rtlsdr"
 
-RDEPEND="net-wireless/rtl-sdr
+RDEPEND="bladerf? ( net-wireless/bladerf:= )
+		rtlsdr? ( net-wireless/rtl-sdr:= )
+		sys-libs/ncurses:=
 		virtual/libusb:1"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	default
+	sed -i 's#-O2 -g -Wall -Werror -W##' Makefile
+	sed -i "s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile
+}
+
 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"
+		BLADERF=$(usex bladerf) \
+		RTLSDR=$(usex rtlsdr)
 }
 
 src_install() {
@@ -50,6 +58,5 @@ 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
+	newdoc debian/lighttpd/89-dump1090-fa.conf lighttpd.conf
 }
diff --git a/net-wireless/dump1090/metadata.xml b/net-wireless/dump1090/metadata.xml
index 88faf189fed3..da238ebeece0 100644
--- a/net-wireless/dump1090/metadata.xml
+++ b/net-wireless/dump1090/metadata.xml
@@ -5,7 +5,11 @@
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
+	<use>
+		<flag name="bladerf">Build with Nuand BladeRF support</flag>
+		<flag name="rtlsdr">Build with Realtek RTL2832U (rtlsdr) support</flag>
+	</use>
 	<upstream>
-		<remote-id type="github">antirez/dump1090</remote-id>
+		<remote-id type="github">flightaware/dump1090</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 4c29e9b0a0b5..f64d86ee9512 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,8 +1,6 @@
 AUX csete-iio.patch 18603 BLAKE2B 437bc8318e88090012cfc98a1b5910ade54b191abb6cb96ea82ba1974c68682477d7429489546fca21ce19d3b9042d6321146d34c0cf8bf94f591bf8da576a39 SHA512 b8c41a1df12a1a74a4d491e694e89d9de753791a433da4d8451c2b20a3e448312316cf66b8bd7d2c1445d91e483331c4328e0acc738fc0dc61ab98b30d48a14a
-DIST gr-osmosdr-0.1.4_p20170612.tar.xz 174416 BLAKE2B d0ef0d4348b561da10f3e8b99fb43f93fbee5c19a1a4fdcc465f2a63425a42ad0f8d64f522e4aafd5182e66c3c96b42f603e9b595e61b0be15b45eae5330fe5e SHA512 9cf3d0453696c7cfe0679136335a71ec5fd18c4b09cbe3e75fca90626065bf6640969bf224219fe796739abbc3b627eb8bf3509b52f764c38b57f169005ea933
 DIST gr-osmosdr-0.1.4_p20180626.tar.xz 179568 BLAKE2B 223d23bd17edd5f4ee78237e509c79e5e7e49bbfb516009c3b5a715f386fcd138beea48e417d4576a7749cdb440736b6d92c8766b614bf617ef6b2bb4a293fda SHA512 8540da1f4d6936e0a97fa2f3e24af1866d44620fd7e7bc65b323364f67f1527fe8e0efd7bf0349be5e3d61f2ed24fa736c924ea0038e44fa3ab72848fe254a28
-EBUILD gr-osmosdr-0.1.4_p20170612-r2.ebuild 1950 BLAKE2B aca9b716335f5b39ae8f5c87359fb3fe099a80c2e5425bc9f08cb4611def2c2f11d09edf487d4d805cbc9f9d650aef3af74b12fd7f09a04bc9ba2e852fa385ea SHA512 55d58bce20aeebcfd5a71a14f1da0f923b41e1f6dfc7468877f737284d34d5fb48081ada94efcbcdc4defa26d626cb04d3b5dc7451ad171669e2c1e58fca1cc3
-EBUILD gr-osmosdr-0.1.4_p20180626-r2.ebuild 2081 BLAKE2B 07d45fa701bde6b687139a68af7500b3d582fecea5e2a083d82e4e995c9bfdb6fcefcf7cf043c7ee9520cc5ac6ebbd000c6d106446fc63933813befdcd0837af SHA512 5b9e6dbfa918117698ddf622f71a62868214e5dee06146b371724026b2c6c2c3134a547dea03d75bb1b050b7d6004a08aeca2bf0460dc6bda0dd8f1dfe76cb66
-EBUILD gr-osmosdr-0.1.4_p20180626-r3.ebuild 2210 BLAKE2B 74fcd619a155be749005f1eee751864f7dcda579b1f2f09bd1aed693464b92ae042e3fe094d73b18c50f606d47eb25d42ec70550c03ff05729ca954d67f58028 SHA512 a838bb31d61fbcd0ca94b7a0bbfd880a0c389e88336f50e95f77d778361860381c3ef7fadabaa7e958257d1c2f7cb7401e039f36cb56399e764139b64500ef32
+EBUILD gr-osmosdr-0.1.4_p20180626-r4.ebuild 2081 BLAKE2B 923ad7b4a1b152948b37d11af00358e328527cf49212c931ee8a8aed04284391e8b672bd82191db4055eea946628575ad88ba3ebc8b23f04355a6d7639b21426 SHA512 a58dde517573c804a3b847b82669cc2931aaaec442008cf79ade344c84fbe9d91cd2adc9f2f71c94ea7c59c201cf7c58af5d112a96cb2ef8f2deeb378cb291d4
+EBUILD gr-osmosdr-0.1.4_p20180626-r5.ebuild 2210 BLAKE2B fc07ded75c0df5c1d68917d199f326cc464478466d5436b4ed07fabe9113d3683400b3bb610b691a6533f97eb7f58b99cf1b6ea76e662829128fff24f28fe196 SHA512 42d10d5fc4bba9e7f5790ee6a50476b959e28f7c7079d4b48bdb41e994de11989f6e97c950739fd430a4e75a0536ceb6cf0f9ead335467c186eddff87250d179
 EBUILD gr-osmosdr-9999.ebuild 2081 BLAKE2B 07d45fa701bde6b687139a68af7500b3d582fecea5e2a083d82e4e995c9bfdb6fcefcf7cf043c7ee9520cc5ac6ebbd000c6d106446fc63933813befdcd0837af SHA512 5b9e6dbfa918117698ddf622f71a62868214e5dee06146b371724026b2c6c2c3134a547dea03d75bb1b050b7d6004a08aeca2bf0460dc6bda0dd8f1dfe76cb66
 MISC metadata.xml 1010 BLAKE2B e4f3fbd3eb67c98876fb8df6db5d809011a8cf120134cb34ed63254b328e15914e696c80c848313c296c43cca71d0c61feb6788effacce30862d982ff6cf8975 SHA512 7144c3e40a28dc0e684f236ec7c70269a7734b3ca55df89f159e803904a43883563b8efb3b1bbc8f3f6eb96bf1c18040df4b1528f5bf1a674f8e8d875dbd69d3
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612-r2.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612-r2.ebuild
deleted file mode 100644
index c60df9c387d6..000000000000
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r2.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r4.ebuild
index 2e7d5bdcee77..67f6413233c9 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r2.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,7 +34,7 @@ RDEPEND="${PYTHON_DEPS}
 	hackrf? ( net-libs/libhackrf:= )
 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
-	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
+	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
 	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r3.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild
index 952e813ad617..08764526720e 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r3.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,7 +35,7 @@ RDEPEND="${PYTHON_DEPS}
 	iio? ( net-wireless/gr-iio )
 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
-	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
+	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.4:= )
 	sdrplay? ( net-wireless/sdrplay )
 	soapy? ( net-wireless/soapysdr:= )
 	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
diff --git a/net-wireless/kismet/Manifest b/net-wireless/kismet/Manifest
index 806709e9a18f..4b32401aecf9 100644
--- a/net-wireless/kismet/Manifest
+++ b/net-wireless/kismet/Manifest
@@ -7,5 +7,5 @@ DIST kismet-2016-07-R1.tar.xz 709364 BLAKE2B 5b667a02b517bd413d569f40df1f2a2e115
 DIST kismet-2019-05-R1.tar.xz 3025984 BLAKE2B dbb286a2bd53e78be2fd6ecc8d7046b65b88f11c34b82787c9a3a0198549317c254fd32d9097492bef60fb5e074b7d9c964da5993881305e0dd135b15a77f39d SHA512 1be981020aff723b52e887d3db40c7842b6639a83c524fadd468094a1aef7ca80540db1691984958ec9f8a4e31d2486557aeef5bf1769d410416638cb783b7cd
 EBUILD kismet-2016.07.1-r2.ebuild 4224 BLAKE2B 810401dfc709c81f55e881cc625d029544f37b454bb1076a902fa38254506fd82e8b1226dab0c2a4b7a58ed580bdc8202fcf9200df8591f67ca48caaa604747c SHA512 1c798255763de2961884ee73abe4c5c2aacdde1f85a36daf01595ba2b04d906d03adff68a81c0f23a4c66db66b6f74cf609c4f4a680627db26cdbf19b9c88bb8
 EBUILD kismet-2019.05.1.ebuild 3426 BLAKE2B 411ab8cb5c085ea6031df9dd1abeeae2693826a096f914474aa02f3a84a442f180962b09ef933b16b496dcde8a04f8304d4ce8c5a1ab09eeaea151e1328ebf2e SHA512 34a1e6c9d617bf5bcedf2d56f28311ecead912db0d6ace211198a14c7dc79f86ace08973e40b9cf762051ccac4c81f948a1c6352a77855cd4f08ebc9bcc9b00c
-EBUILD kismet-9999.ebuild 3435 BLAKE2B 5a0b61d4074417391e8d4712a4d49c4728071e861ed3453f17bca81386e143bb5d3dd30467cd9fe34dc81ec23e7518092df509cdc94e5802ebaba62c120333ed SHA512 a16498604c8f363607522dae3dea555d732fa7462f00cc83fc8a24f72ec4751b0565b8de1013d7ce0d543de144057358608681bd1ab3392cca03b830c360e3e6
+EBUILD kismet-9999.ebuild 3474 BLAKE2B fb18e8bba589b80ea7f6f557da68a59090767f584ee9959e53db1fdaf6b96db52b359b1d2da8dc51142ff8924733c2235a169cc6cf570de930a39b03aefd4441 SHA512 ffdd06ce01efccee7e869ae9aad50247c70d3a8a5e6955f785fa3ef5d3445f7e8b24b957b0dd1a02c2a3a3349702047e9530b55d6c8aba4dfac3e7d94bd72aae
 MISC metadata.xml 1259 BLAKE2B c9c91a87613a3126a81c28e768dbcf37422e04c8679d991ed2149361bf07d43a1dc17e5eaffebbb77bb9e92f2fd316192745e8b3cde04729db12b7dbefd33d26 SHA512 777ea0bad8a04dc4ac303eee0006692aa0107a7c38322b890565fab59288d84932b531145445623af1fa594b762aec627dd00f659b90f1fb595d7b49f6ab20a0
diff --git a/net-wireless/kismet/kismet-9999.ebuild b/net-wireless/kismet/kismet-9999.ebuild
index ec7ea7c64b4e..9361c44b1797 100644
--- a/net-wireless/kismet/kismet-9999.ebuild
+++ b/net-wireless/kismet/kismet-9999.ebuild
@@ -62,6 +62,7 @@ DEPEND="${CDEPEND}
 "
 
 RDEPEND="${CDEPEND}
+	dev-python/pyserial[${PYTHON_USEDEP}]
 	selinux? ( sec-policy/selinux-kismet )
 "
 
diff --git a/net-wireless/rfcat/Manifest b/net-wireless/rfcat/Manifest
index 022c454d1b70..687f7e03138e 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 1380 BLAKE2B d7a670474617557244737596581b355472b1c49d8675d33ec7a3b84dfe7c82db202d0b87597246a7386df913ffdbc587dce40dccd05781da4bb60e56dea40e3d SHA512 15d164d65d44d5eb6a2240d5babb7edcdf9d15911a94f48c0d4e2d760af30b7c8bb08a8b15bb20d141f2ed9271c16b8a24d1d5ecd4fad38f3d668fe9d4e3fbaf
+EBUILD rfcat-9999.ebuild 1423 BLAKE2B 91ea201c358d8c121fc5726873fee1d61d085c80a2f02c1d0a5d2711d98774971ef77daeef87ce6758a638051728f7da8d7fc1431c3214571ffa5154f75388eb SHA512 aed3e045cc64cd5a54161dca37bb3159d89eff5e35387975d95656abfc633f72ee252ecd264a7fa5804b56ce43087d9aa487e049e34e44f4d8932276fc653cab
 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 12bb3e32f0c5..a2f1584d251c 100644
--- a/net-wireless/rfcat/rfcat-9999.ebuild
+++ b/net-wireless/rfcat/rfcat-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,6 +31,7 @@ IUSE=""
 
 #DEPEND="dev-embedded/sdcc"
 #RDEPEND="${DEPEND}"
+PDEPEND="dev-python/future[${PYTHON_USEDEP}]"
 
 src_install() {
 	distutils-r1_src_install
diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index e194340ad1a1..623d7fd1e876 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -1,6 +1,8 @@
 DIST rtl-sdr-0.5.3_p20170919.tar.xz 98972 BLAKE2B fb7d977bd05a2c717897ba58a2242698d1a90cf38a7a8340d7ec8c3aefeeff49bfe9612285253b27c6726ae584172e0b26c8f535bc4bec704958c1296e232f04 SHA512 b1b97c720882ccbe8be8e30af28b8d52c5a27507861bdb9e964e153cd8ece9de977abd271b68861c163a7cf239044f28c8d17ccda5ff5acf60f17d839d782a82
 DIST rtl-sdr-0.5.4.tar.xz 108708 BLAKE2B 12f5f5a913089ec57327621eddab9b74b07cccceeac9d00ab2cbd413bc29d8444633953319e2887ef5e07a766f38b4ea2f5d3cbf73efd63a1886e30e2bed6968 SHA512 6cf3c62e6a56694f90deed64e2761105fdbeb40de8001a378e687d60cc3718ad64065b5d896b3f4b27ff6a5383173b53df52816e24b31c726485364cfd9c1a43
+DIST rtl-sdr-0.6.0.tar.gz 134289 BLAKE2B a630ceea359c49170c04bc6bb2a01b481e40b4529ed3d2c924d0370399bb149c47f751929716fa4c86fac9776d26584696ece7a5f83a428b300ccbed243d0ffd SHA512 a08356a08672f03d86adb662e28923e7998b78c0f49432dc1b1e3844976158c467242e0c5eabf206fd257bdebcf91cd2767dabf13d2ef475f2f3e1d82e23ed75
 EBUILD rtl-sdr-0.5.3_p20170919.ebuild 1158 BLAKE2B 060c6584b65db1609668b8fe4d00193f4cc449e3cb3eab530200c7e16914fc18169237734039394eacc2abeb790ac73b6dc72d8e6bd630d8f60a96bfcc88d764 SHA512 7fe51f8e935b15509c12382c43bbc17e5db09ce3917e4fc8786fc96276b58781066c6069478d067c91cdb78fabb09e6bf05a6f55776f073f0811264b472a241b
 EBUILD rtl-sdr-0.5.4.ebuild 1162 BLAKE2B f3088c38e3f3307f4c4320a034c5cd573c5578ffc9f83d1994a1773c7c3f91846055201c46ba55926967fc9c2312077020d6e39351c3fda2d89995f4900360af SHA512 68bc4fa2d8fa2bcacded03f85c6d68ebdc4600d4440fc366991940e2e5a54362088b50f7bc58a4b152bb1edb7b3f24f86e3354f0ce9e391486e1cfecee5c75bb
+EBUILD rtl-sdr-0.6.0.ebuild 1060 BLAKE2B 7c05d7f7c635c13c3bcedd8f09b55f6361e59df7768b5bc6744acc3180deee5ccdc6e99ae21d61d5ddc9075b4515d10781abc61c61529b9c4b08a4039f3dd5d0 SHA512 83408c4cd34ae6d3402eb825008221e62134369ce775ee8475f34ee6c47d20ef7200be36f75b17c43b485695f76bef145b0fad423aa33348f98ab308201c977d
 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/rtl-sdr-0.6.0.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0.ebuild
new file mode 100644
index 000000000000..a6d38d237ac6
--- /dev/null
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="https://git.osmocom.org/${PN}"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/steve-m/librtlsdr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S="${WORKDIR}"/librtlsdr-${PV}
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+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=$(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/rtl_433/Manifest b/net-wireless/rtl_433/Manifest
index 227516ba198d..10c6c7bf4548 100644
--- a/net-wireless/rtl_433/Manifest
+++ b/net-wireless/rtl_433/Manifest
@@ -1,4 +1,4 @@
-DIST rtl_433-0.1_p20180223.tar.gz 228857 BLAKE2B a2fc4e49ce62a5908426fa8a35b0f305c1b09ac62c4f0e299141d1bd85c5c48824868197244307797a21e9919c284d04d6f981ed66c4c11745c7ce1772aebb8b SHA512 68a36159eadf9180969e8ad587db553829cd77d0d9c7226d29a32e39867387025a8ff373a0cf553aec07243685510ec3dbecedfcb96970e379265cd3def7a674
-EBUILD rtl_433-0.1_p20180223.ebuild 627 BLAKE2B 28851aa475ecd4bfdb0cc84dd180dac310707a717fc25e74c61625fcc5eab8b16cdd08feb3717599a77952b0c03418a4ac0cfa160e4124d1d604e5f74205fa70 SHA512 0e77df60f3def863548485c9d25c2acc5d46249c5347d029510cbb2f78feb31cfa68e4348fff5b8d1e71c6eb8e36fb6f1fe5d5c49f702603b7a56a597fc2576e
-EBUILD rtl_433-9999.ebuild 612 BLAKE2B b9cb21176f1c5e851d4996d14eca6aa9e064c8c38c154ff86084ac3b6ecbace94f2ddfddbd4133f47a4b2a4c1755b791c207a30b7331a4aec07a6f5b7b4f26f2 SHA512 9871a0a51d4106c5d6f052bf8ac675f33a70ac2fc45e875f954c88d598bcedf15ebe54d19ec908e4923e25b18ea51ddab6c3e16802ebe7cebc1b98355c1b56ec
-MISC metadata.xml 329 BLAKE2B beaa09efbaecc4e65a2b82f94eda432b93182b63afbd7879f053911c7a935741577e99929d5247bfa921c51bc40746e0b73ba7c45c09aaa6edc6fe93d4028b6a SHA512 1af5cd3514c72c9e8e676a8c09a47ffeb17a1ea24a765e0701b26b1f89af35673f1d7f160cbf3021fe108c935d81870a72147bbcc5a76f2b325a854337640b98
+DIST rtl_433-0.1_p20190709.tar.gz 718424 BLAKE2B f7acd89013114c7d357edfc4610be8a7405feac11843dcb1bc7fefe81556a3b09ee26622dd58d68afb3d99840db8e997dbbc66cccda53a34964b32bac352462c SHA512 d36757a567c7696b150b03a1e09fda74f7a4ec454bc1b5658e4a6b22370de5c102a152257d436c87f0ddff325c17b0e9b8afbae0dc3e82ab04111d78a728a590
+EBUILD rtl_433-0.1_p20190709.ebuild 979 BLAKE2B ca2a7b4d1235b6d7a52ce0831017c45bc302e821fe74f9c4bdfbf5e615acf05aadd4dbae8f8e633a87bbb37c87007da97b10fa3259f6619499d3c0dd2739b4ab SHA512 e50b24fa1e953b24cb43344e4bbe1a92005ad5469386b06d23698688ff2bad3f0cdc3ebd734db0c492b7f3b1c064a3bcd95194db173606f5394e9a0d993bda31
+EBUILD rtl_433-9999.ebuild 979 BLAKE2B ca2a7b4d1235b6d7a52ce0831017c45bc302e821fe74f9c4bdfbf5e615acf05aadd4dbae8f8e633a87bbb37c87007da97b10fa3259f6619499d3c0dd2739b4ab SHA512 e50b24fa1e953b24cb43344e4bbe1a92005ad5469386b06d23698688ff2bad3f0cdc3ebd734db0c492b7f3b1c064a3bcd95194db173606f5394e9a0d993bda31
+MISC metadata.xml 470 BLAKE2B d7862ab9d869d528eb0a52b46fc97cc3e71c3cee98dfd1adb3f98e858d6797795c71273333bbc67ca643ff3d49b72b2aa3e40ed773ec80dd56e3a30a4f63c6a0 SHA512 aff0e462a7753d570fd4e539d070367a71faea2c373711bccde042918cc2f801b305839110408c0659706d6359fe541265acb79b5f1fa806c6ad15a5434fd900
diff --git a/net-wireless/rtl_433/metadata.xml b/net-wireless/rtl_433/metadata.xml
index 5437f3ff41b1..56e3f6727b94 100644
--- a/net-wireless/rtl_433/metadata.xml
+++ b/net-wireless/rtl_433/metadata.xml
@@ -5,6 +5,10 @@
     <email>radio@gentoo.org</email>
     <name>Radio</name>
   </maintainer>
+<use>
+	<flag name="rtlsdr">Build with Realtek RTL2832U (rtlsdr) support</flag>
+	<flag name="soapy">Build with SoapySDR support</flag>
+</use>
   <upstream>
     <remote-id type="github">merbanan/rtl_433</remote-id>
   </upstream>
diff --git a/net-wireless/rtl_433/rtl_433-0.1_p20180223.ebuild b/net-wireless/rtl_433/rtl_433-0.1_p20190709.ebuild
index a7c363904f68..b983719b12b8 100644
--- a/net-wireless/rtl_433/rtl_433-0.1_p20180223.ebuild
+++ b/net-wireless/rtl_433/rtl_433-0.1_p20190709.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ $PV == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/merbanan/rtl_433"
 	KEYWORDS=""
 else
-	COMMIT="51d275cd08c517d5445b568bf9c2f1b4103bec9f"
+	COMMIT="496f82b54b8957dbdd1bb60a080aeccfd31da73e"
 	SRC_URI="https://github.com/merbanan/rtl_433/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
 	KEYWORDS="~amd64 ~x86"
@@ -20,7 +20,22 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="+rtlsdr soapy"
 
-DEPEND="net-wireless/rtl-sdr:="
+DEPEND="rtlsdr? ( net-wireless/rtl-sdr:= )
+	soapy? ( net-wireless/soapysdr:= )"
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_RTLSDR="$(usex rtlsdr)"
+		-DENABLE_SOAPYSDR="$(usex soapy)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	mv "${ED}/usr/etc" "${ED}/" || die
+	mv "${ED}/etc/${PN}/${PN}.example.conf" "${ED}/etc/${PN}/${PN}.conf" || die
+}
diff --git a/net-wireless/rtl_433/rtl_433-9999.ebuild b/net-wireless/rtl_433/rtl_433-9999.ebuild
index 04955a8a9d01..b983719b12b8 100644
--- a/net-wireless/rtl_433/rtl_433-9999.ebuild
+++ b/net-wireless/rtl_433/rtl_433-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,15 +12,30 @@ if [[ $PV == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/merbanan/rtl_433"
 	KEYWORDS=""
 else
-	COMMIT="51d275cd08c517d5445b568bf9c2f1b4103bec9f"
-	SRC_URI="https://github.com/merbanan/rtl_433/archive/${COMMIT}.tar.gz"
+	COMMIT="496f82b54b8957dbdd1bb60a080aeccfd31da73e"
+	SRC_URI="https://github.com/merbanan/rtl_433/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="+rtlsdr soapy"
 
-DEPEND="net-wireless/rtl-sdr:="
+DEPEND="rtlsdr? ( net-wireless/rtl-sdr:= )
+	soapy? ( net-wireless/soapysdr:= )"
 RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_RTLSDR="$(usex rtlsdr)"
+		-DENABLE_SOAPYSDR="$(usex soapy)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	mv "${ED}/usr/etc" "${ED}/" || die
+	mv "${ED}/etc/${PN}/${PN}.example.conf" "${ED}/etc/${PN}/${PN}.conf" || die
+}