From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 34671138334 for ; Mon, 7 Jan 2019 23:01:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E7F3E0B35; Mon, 7 Jan 2019 23:01:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E27EFE0B35 for ; Mon, 7 Jan 2019 23:01:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 42BB8335D0D for ; Mon, 7 Jan 2019 23:01:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3188150B for ; Mon, 7 Jan 2019 23:01:35 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1546901994.29c3f5492d1b4e4d15b9028b097d5d80408bf9b6.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/gr-foo/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/gr-foo/gr-foo-9999.ebuild X-VCS-Directories: net-wireless/gr-foo/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 29c3f5492d1b4e4d15b9028b097d5d80408bf9b6 X-VCS-Branch: master Date: Mon, 7 Jan 2019 23:01:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d1a37e0f-783f-4572-8d51-03d6e1d147a9 X-Archives-Hash: c8b0eae3100ce46aa6f24614473f4977 commit: 29c3f5492d1b4e4d15b9028b097d5d80408bf9b6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jan 1 00:05:55 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 7 22:59:54 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29c3f549 net-wireless/gr-foo: EAPI-7 bump, add missing cmake-utils_src_prepare missing || die Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> net-wireless/gr-foo/gr-foo-9999.ebuild | 39 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/net-wireless/gr-foo/gr-foo-9999.ebuild b/net-wireless/gr-foo/gr-foo-9999.ebuild index 79a25cbde95..b54cc9402c9 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 }