gentoo resync : 25.08.2018

3 files changed, 73 insertions, 2 deletions

diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 233a39edf6c3..b354bb235fad 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,4 +1,6 @@
 DIST gr-osmosdr-0.1.4_p20170612.tar.xz 174416 BLAKE2B d0ef0d4348b561da10f3e8b99fb43f93fbee5c19a1a4fdcc465f2a63425a42ad0f8d64f522e4aafd5182e66c3c96b42f603e9b595e61b0be15b45eae5330fe5e SHA512 9cf3d0453696c7cfe0679136335a71ec5fd18c4b09cbe3e75fca90626065bf6640969bf224219fe796739abbc3b627eb8bf3509b52f764c38b57f169005ea933
-EBUILD gr-osmosdr-0.1.4_p20170612.ebuild 1938 BLAKE2B 3e38f3d1095f3c5156a8c330075b76434cf7078b913cd1e69c523038470a10afa036fd0c09ff5cf3e20444ac3306646d45d7081b5fbffca544ee05eb9b11628e SHA512 f3ed65e23a8c25b4b6898e24b199659575185234eb92851483ce3d9fb213e1a868e4ba38a2dd7ebc0fec42fd1107888effa4a54886380fed9c750b356ab6e6e0
+DIST gr-osmosdr-0.1.4_p20180626.tar.xz 179568 BLAKE2B 223d23bd17edd5f4ee78237e509c79e5e7e49bbfb516009c3b5a715f386fcd138beea48e417d4576a7749cdb440736b6d92c8766b614bf617ef6b2bb4a293fda SHA512 8540da1f4d6936e0a97fa2f3e24af1866d44620fd7e7bc65b323364f67f1527fe8e0efd7bf0349be5e3d61f2ed24fa736c924ea0038e44fa3ab72848fe254a28
+EBUILD gr-osmosdr-0.1.4_p20170612-r1.ebuild 1951 BLAKE2B 1c1fbdf48c2f2562bc915ec64ad446dac8b3b71e32e0ad515731204057d9b6e2f5c79530b5a0bdd44703e93b01f294cae6ab25f343749f091fd40ec9429ef204 SHA512 fc42ab57b5ab2fe4971d3043f183a35958380e97bcc5641fc791b767ecda98397fa5315b89e568666a6de475330ac4dd90709c8d81b55e30422fd107e7af2286
+EBUILD gr-osmosdr-0.1.4_p20180626.ebuild 1952 BLAKE2B 373da56a29a037cbe3bd428985ab230f48da301489ddd752f8d55c4aa37fd110ecf6479e43b11cf3522fcfa6e4cac0a16632b287bd4925f6074ce5bef7753d8e SHA512 5f1f3ae2c1b0b0a5d5b189f97394d9007250a7b0d9e8596d7edb6c5a2cbd25340ff929c245dbccf6344737bc36ed1be2f94119302205ddd29c1994302d4c974e
 EBUILD gr-osmosdr-9999.ebuild 1951 BLAKE2B 188473e7daca19b30ac21eb480164950833fc90c2f46464622d59041210d238b040b9d45c216d8b1107cc8c2d1c690694173c2665e14ed9509b3681d4a90914c SHA512 25c5db2b82e7072085fcc65d06a8472228a2f313c37dbadbe2a3078cd306a2cacf4333a05038e6b31171ee37e33db2c31deed6809daaa7e15aa35a60e09dd139
 MISC metadata.xml 807 BLAKE2B 1bfa0c852f52882323bd9a08d0ca16eb234e4514b7bc1d6825baf8e29e650ccbf28d1e33ff45c826563cd256e12eb32207a217dfdc70a5623baae2da39040a4d SHA512 9981bc760da9077c8ccf54a5184caa03f3e9614ff253f9163bd6be0245506e26489c97010186e7861f9a8513245d789c73d2f28ba3045878bf2a5b0b440b69f1
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612-r1.ebuild
index 579c974f8abe..6e8fa0434f9e 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20170612-r1.ebuild
@@ -29,7 +29,7 @@ IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd"
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
 	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
-	bladerf? ( net-wireless/bladerf:= )
+	bladerf? ( <net-wireless/bladerf-2018.08_rc1:= )
 	hackrf? ( net-libs/libhackrf:= )
 	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
 	mirisdr? ( net-libs/libmirisdr:= )
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild
new file mode 100644
index 000000000000..2286e8a9c6a1
--- /dev/null
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf"
+HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+else
+	#SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"
+	#git clone git://git.osmocom.org/gr-osmosdr.git
+	#cd gr-osmosdr
+	#git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} | xz > ../gr-osmosdr-${PV}.tar.xz
+	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="bladerf fcd hackrf iqbalance mirisdr python rtlsdr soapy uhd"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=
+	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
+	bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
+	hackrf? ( net-libs/libhackrf:= )
+	iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
+	mirisdr? ( net-libs/libmirisdr:= )
+	rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
+	soapy? ( net-wireless/soapysdr )
+	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	dev-python/cheetah"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_DEFAULT=OFF
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DENABLE_FILE=ON
+		-DENABLE_BLADERF="$(usex bladerf)"
+		-DENABLE_FCD="$(usex fcd)"
+		-DENABLE_HACKRF="$(usex hackrf)"
+		-DENABLE_IQBALANCE="$(usex iqbalance)"
+		-DENABLE_MIRI="$(usex mirisdr)"
+		-DENABLE_PYTHON="$(usex python)"
+		-DENABLE_RTL="$(usex rtlsdr)"
+		-DENABLE_RTL_TCP="$(usex rtlsdr)"
+		-DENABLE_SOAPY="$(usex soapy)"
+		-DENABLE_UHD="$(usex uhd)"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use python; then
+		python_fix_shebang "${ED}"/usr/bin
+	fi
+}