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-foo/Manifest           |  2 +-
 net-wireless/gr-foo/gr-foo-9999.ebuild | 39 +++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 20 deletions(-)

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

diff --git a/net-wireless/gr-foo/Manifest b/net-wireless/gr-foo/Manifest
index a26ff8d21ebb..856fead7a44e 100644
--- a/net-wireless/gr-foo/Manifest
+++ b/net-wireless/gr-foo/Manifest
@@ -1,2 +1,2 @@
-EBUILD gr-foo-9999.ebuild 1146 BLAKE2B 593408677050e028dd29997633a20eb4b3abb45d3396e88665d1ae0c64613450d1b4cd5af2ed9d05d4d0a22dfef1112308f55ba3aaefb0d67f05f9fc30d3574d SHA512 09da2ac9283c450476bde6b9549dee6b6417318993082a372ba475c04f58037b598167580c9c223a18747db1554fb113b7ccac8cbec6065a1651afc5f2ab05f9
+EBUILD gr-foo-9999.ebuild 1169 BLAKE2B 9ee12e7c3c8721cc2f36a0a2f8cfdee5aa429cb9694c751e2080a97c11f510ac8dd1f479e7e790cd6397a7099d13ae4610b23d5dda029e98b00fc4a4d41c22c9 SHA512 e0fce7665744039b6cf25626ad148d91b1ab4e3e0c8eec368700048312eb0a57a75005446cb80a1b7fd4eeffcbd03cf1193fc3957d096008a8c6e7d70ca0f3fe
 MISC metadata.xml 317 BLAKE2B a600d3d673f37d66dbb32b1480bc115a246665dc69ef42a9e7ea144bc9145b23fd01eae793a313e7f6ccba4d072e80b97430f3dfa4937ed606716cd4519eee66 SHA512 4a8573f02b2807a76df349c29d61cf6d64631dac6fa13a86579b8df9ccba8abe379168e47eef796b02cf6b93765ae4826c25189c3f012105e8d949a939c966f1
diff --git a/net-wireless/gr-foo/gr-foo-9999.ebuild b/net-wireless/gr-foo/gr-foo-9999.ebuild
index 79a25cbde951..b54cc9402c9a 100644
--- a/net-wireless/gr-foo/gr-foo-9999.ebuild
+++ b/net-wireless/gr-foo/gr-foo-9999.ebuild
@@ -1,45 +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="Some GNU Radio blocks that bastianbl uses"
-HOMEPAGE="https://github.com/rftap/gr-rftap"
+PYTHON_COMPAT=( python2_7 )
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bastibl/gr-foo.git"
+else
 	KEYWORDS=""
-#else
-#	SRC_URI=""
-#	KEYWORDS=""
 fi
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="Some GNU Radio blocks that bastianbl uses"
+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}]
+	>=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_USEDEP}]
 	net-wireless/uhd:=[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
+"
 DEPEND="${RDEPEND}
-	dev-lang/swig:0"
+	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