gentoo resync : 11.07.2019

4 files changed, 6 insertions, 77 deletions

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}] )"