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 AAE841382C5 for ; Sun, 18 Feb 2018 03:48:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0237E0B1D; Sun, 18 Feb 2018 03:48:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 90334E0B1D for ; Sun, 18 Feb 2018 03:48:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 90ECC335C51 for ; Sun, 18 Feb 2018 03:48:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D310F1E6 for ; Sun, 18 Feb 2018 03:48:08 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1518925680.a917249bcd71aa0537c16bf3f264280088ef53ba.zerochaos@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gr-fosphor/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild X-VCS-Directories: net-analyzer/gr-fosphor/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: a917249bcd71aa0537c16bf3f264280088ef53ba X-VCS-Branch: master Date: Sun, 18 Feb 2018 03:48:08 +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-Archives-Salt: ab0cd659-5553-487e-a68d-9a34cf48d27a X-Archives-Hash: 285bc488ee8e53027f2bcc3d9427c9b2 commit: a917249bcd71aa0537c16bf3f264280088ef53ba Author: Zero_Chaos gentoo org> AuthorDate: Sun Feb 18 02:24:11 2018 +0000 Commit: Richard Farina gentoo org> CommitDate: Sun Feb 18 03:48:00 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a917249b net-analyzer/gr-fosphor: re-add wx support minor fixes and eapi bump as well Package-Manager: Portage-2.3.24, Repoman-2.3.6 net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild index e31c44e5a78..80888f939b3 100644 --- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild +++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 ) inherit cmake-utils python-single-r1 @@ -10,9 +10,10 @@ DESCRIPTION="gnuradio fosphor block (GPU spectrum display)" HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor" if [[ ${PV} == 9999* ]]; then - inherit git-2 + inherit git-r3 SRC_URI="" - EGIT_REPO_URI="git://git.osmocom.org/${PN}.git" + #EGIT_REPO_URI="git://git.osmocom.org/${PN}.git" + EGIT_REPO_URI="https://github.com/osmocom/${PN}.git" KEYWORDS="" else SRC_URI="mirror://gentoo/${P}.tar.xz" @@ -23,14 +24,14 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" LICENSE="GPL-3+" SLOT="0" -IUSE="+glfw qt4" +IUSE="+glfw qt4 wxwidgets" RDEPEND="qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) - >=net-wireless/gnuradio-3.7_rc:0=[qt4?,${PYTHON_USEDEP}] + >=net-wireless/gnuradio-3.7_rc:0=[qt4?,wxwidgets?,${PYTHON_USEDEP}] media-libs/freetype dev-libs/boost:= glfw? ( >=media-libs/glfw-3 ) @@ -45,17 +46,19 @@ DEPEND="${RDEPEND} src_prepare() { cmake-utils_src_prepare + default } src_configure() { # tries to run OpenCL test program, but failing doesn't hurt addpredict /dev/dri - local mycmakeargs=" - $(cmake-utils_use_enable glfw GLFW) - $(cmake-utils_use_enable qt4 QT) + local mycmakeargs=( + -DENABLE_DEFAULT=OFF + -DENABLE_GLFW="$(usex glfw)" + -DENABLE_QT="$(usex qt4)" + -DENABLE_WX="$(usex wxwidgets)" -DENABLE_PYTHON=ON - -DENABLE_WX=OFF - " + ) cmake-utils_src_configure }