Ensure patch happens

Signed-off-by: Daniel Solano <gentoo@sattvik.com>

3 files changed, 6 insertions, 83 deletions

diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 5345907..bf4dfa4 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,6 +1,4 @@
 AUX airspyhf.patch 22601 BLAKE2B 42b8f24e24845fc4b90854d0c41521da7289335f9aba10ebc1da42d432a6f2c21669d34b7cc11adf03f57b9f21879b9817a8f67628c4e5e2d80f379aab659b07 SHA512 7717debe00c812b357c14a0ae2c464cd18f5953f5e428afa2f754f38b16cdf18435e082b7aacb265ed69f68ae419fc316b70cc65ea32411493ecf2a441b5fa7b
-DIST gr-osmosdr-0.1.4_p20180626.tar.xz 179568 BLAKE2B 223d23bd17edd5f4ee78237e509c79e5e7e49bbfb516009c3b5a715f386fcd138beea48e417d4576a7749cdb440736b6d92c8766b614bf617ef6b2bb4a293fda SHA512 8540da1f4d6936e0a97fa2f3e24af1866d44620fd7e7bc65b323364f67f1527fe8e0efd7bf0349be5e3d61f2ed24fa736c924ea0038e44fa3ab72848fe254a28
 DIST gr-osmosdr-0.1.5.tar.gz 278257 BLAKE2B f63704bd8d7e1fc86cfab256e8813716ac56a4b962f37d9e027df6234ee8e6d78a9d8459408d31ace4a3d6f46edfca0cc1eb9c1004b7052332ead1528cc5ec4b SHA512 5c028dcacf3cb94696eecdd31f4f09b31158c8ce12646d577535ba20942103899e5e21f001f2dd7d0a56eb58f17c2aa849139b495c61e21b60dd6678444b0983
-EBUILD gr-osmosdr-0.1.4_p20180626-r4.ebuild 2247 BLAKE2B e3232228354179215d617c0096069aedebe817ac319269c77aef478cf995b65059eac8464ae63ef235b3f15c911431039ff9eede3722bf54e066a859007a1431 SHA512 bcd93db3720b88b7587625230fe2268fa8df30773b08d7a73c92163a4cb0265c2ded7a84b944b1a4cfc0872481ad27926e9fc5d14d8283a4bb084b95c1495eb9
-EBUILD gr-osmosdr-0.1.5.ebuild 2014 BLAKE2B c0860cade63026f412200e64e7f499525d9f85f9fb9403c52e6c4bcacb7bd99659056eb0fbb5b0b1c4e139d34cd7718b067b04fcab36d970e5657cefa106fb6e SHA512 480fbb100cd3edd725a3dfb7f24779cdfa8aea131887fb18da895004591a6c967968d7dda0f137bb422f971a447055972994302be0e81a7e2eec40c1ad49c589
+EBUILD gr-osmosdr-0.1.5.ebuild 2095 BLAKE2B 7210f08d31d9d6ab3204a8b4a6de24b9eae5314280a6678f877d79a9efe1c07917776ebd827c01919a206e0cfa714fc2caf9ae5c14378252ecbfdc34f3cfc377 SHA512 2a33251cd8ea4a80d98b8a058935cd82ff8b56aec5a48c1a9bec212907a6b9f02d164feab1f168250d324dd9bdcb9a19294d009457ab01bfca4dbf97ed63c127
 MISC metadata.xml 1010 BLAKE2B e4f3fbd3eb67c98876fb8df6db5d809011a8cf120134cb34ed63254b328e15914e696c80c848313c296c43cca71d0c61feb6788effacce30862d982ff6cf8975 SHA512 7144c3e40a28dc0e684f236ec7c70269a7734b3ca55df89f159e803904a43883563b8efb3b1bbc8f3f6eb96bf1c18040df4b1528f5bf1a674f8e8d875dbd69d3
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r4.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r4.ebuild
deleted file mode 100644
index 185d756..0000000
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 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"
-	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 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-IUSE="airspyhf bladerf fcd hackrf iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	>=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
-	airspyhf? ( net-wireless/airspyhf )
-	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.4:= )
-	sdrplay? ( net-wireless/sdrplay )
-	soapy? ( net-wireless/soapysdr:= )
-	uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/cheetah"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	eapply "${FILESDIR}/airspyhf.patch"
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DENABLE_FILE=ON
-		-DENABLE_AIRSPYHF="$(usex airspyhf)"
-		-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)"
-		-DENABLE_SDRPLAY="$(usex sdrplay)"
-		-DENABLE_NONFREE="$(usex sdrplay)"
-	)
-
-	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.5.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild
index 4a209f7..0dae992 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.5.ebuild
@@ -39,6 +39,11 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+src_prepare() {
+	eapply "${FILESDIR}/airspyhf.patch"
+	cmake-utils_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF