From c8a77dfe4d3d307c1d5dd2650b7297447d8b609d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 12 Jan 2019 16:58:08 +0000
Subject: gentoo resync : 12.01.2019

---
 net-wireless/gr-rftap/Manifest             |  2 +-
 net-wireless/gr-rftap/gr-rftap-9999.ebuild | 42 ++++++++++++++++--------------
 2 files changed, 23 insertions(+), 21 deletions(-)

(limited to 'net-wireless/gr-rftap')

diff --git a/net-wireless/gr-rftap/Manifest b/net-wireless/gr-rftap/Manifest
index b68daec06a9c..1f12dde1be18 100644
--- a/net-wireless/gr-rftap/Manifest
+++ b/net-wireless/gr-rftap/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-rftap-9999.ebuild 1093 BLAKE2B 37780de862576fde035d7862a2d4a4f8ba2bf8b8af65d9c97935dc7577082241a5f79bd5a916b76cf09b84ae93f68339fee94ad468aa0a52d4f0cd78b8a4c389 SHA512 71427c74384056940724723ee14a6d150863b8438fd474e60f50779e91e354e4254e2bdf5593edf6ac79f9465b64b244a634d0c8b68b7a6d6a42b88151d4ac99
+EBUILD gr-rftap-9999.ebuild 1127 BLAKE2B 2437cd7205d3123a5ce64cb1ba1e57c401794853a7245f0ab0d195a2517e9d54584d05b48a7a222d903e924a60686324a435c9445ebacc8e8e2480c4656c89bd SHA512 e214ccef445f01b05cd1a821731940eb3d904a3703f36c00202e0a3b9d59ed6c23adbe75b90630c451d0af9eb7328e0517b523dab11a23a4495508966d6aa3b3
 MISC metadata.xml 317 BLAKE2B 4970c2c939374961593cf134bf3f1030d14fed37ebdc9c15369a1c94dc4786649920c349f9aa6ea76b7d56bd720ae560b4b7e900c046f573cc75c55d7429f658 SHA512 bd237119e49e0e715f528eea05fc9cb8fd758779209849c7a5e5ffd964c98b3912c63af8363192ba94db59d2b62a4dd28c9d1521d61b843b02fe3feb6ad9558a
diff --git a/net-wireless/gr-rftap/gr-rftap-9999.ebuild b/net-wireless/gr-rftap/gr-rftap-9999.ebuild
index e0f9dc95c130..621dada2edb8 100644
--- a/net-wireless/gr-rftap/gr-rftap-9999.ebuild
+++ b/net-wireless/gr-rftap/gr-rftap-9999.ebuild
@@ -1,44 +1,46 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1
+EAPI=7
 
-DESCRIPTION="RFtap Module for GNU Radio"
-HOMEPAGE="https://github.com/rftap/gr-rftap"
+PYTHON_COMPAT=( python2_7 )
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/rftap/gr-rftap.git"
+else
 	KEYWORDS=""
-#else
-#	SRC_URI=""
-#	KEYWORDS=""
 fi
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="RFtap Module for GNU Radio"
+HOMEPAGE="https://github.com/rftap/gr-rftap"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 
-RDEPEND=">=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-lang/swig:0"
+	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/swig:0
+"
 #cppunit is listed in cmake, but only needed for tests and there are no tests
 #	dev-util/cppunit"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 src_prepare() {
+	cmake-utils_src_prepare
 	#although cppunit is not used, it fails if it isn't there, fix it
-	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt
-	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt
-	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt
+	sed -i 's#FATAL_ERROR "CppUnit#MESSAGE "CppUnit#' CMakeLists.txt || die
+	sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt || die
+	sed -i '/${CPPUNIT_LIBRARY_DIRS}/d' CMakeLists.txt || die
 }
 
 src_configure() {
-	mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+	local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
 	cmake-utils_src_configure
 }
-- 
cgit v1.2.3