public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Rick Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gr-fosphor/
Date: Fri,  6 Dec 2019 18:24:02 +0000 (UTC)	[thread overview]
Message-ID: <1575656626.bd5515cceb69d34d275ceb957ef2cdc3ad133d75.zerochaos@gentoo> (raw)

commit:     bd5515cceb69d34d275ceb957ef2cdc3ad133d75
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  6 18:23:34 2019 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Dec  6 18:23:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd5515cc

net-analyzer/gr-fosphor: qt5 support

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>

 net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
index 29c293990cc..1797e9d1a6a 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,10 +11,9 @@ HOMEPAGE="https://sdr.osmocom.org/trac/wiki/fosphor"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	SRC_URI=""
 	#EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
 	EGIT_REPO_URI="https://github.com/osmocom/${PN}.git"
-	KEYWORDS=""
+	EGIT_BRANCH="gr37-qt5"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
@@ -24,10 +23,15 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+glfw wxwidgets"
+IUSE="glfw qt5 wxwidgets"
 
-RDEPEND="
-	>=net-wireless/gnuradio-3.7_rc:0=[wxwidgets?,${PYTHON_USEDEP}]
+RDEPEND="qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)
+	>=net-wireless/gnuradio-3.7_rc:0=[qt5,wxwidgets?,${PYTHON_USEDEP}]
 	media-libs/freetype
 	dev-libs/boost:=
 	glfw? ( >=media-libs/glfw-3 )
@@ -52,10 +56,9 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DEFAULT=OFF
 		-DENABLE_GLFW="$(usex glfw)"
-		-DENABLE_QT=OFF
+		-DENABLE_QT="$(usex qt5)"
 		-DENABLE_WX="$(usex wxwidgets)"
 		-DENABLE_PYTHON=ON
 	)
-	# re-enable Qt if port to Qt5 is ever finished
 	cmake-utils_src_configure
 }


             reply	other threads:[~2019-12-06 18:24 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-06 18:24 Rick Farina [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-05-31 18:26 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gr-fosphor/ Thomas Beierlein
2023-04-06  2:18 Rick Farina
2023-04-04 23:58 Sam James
2022-11-22 17:05 Thomas Beierlein
2022-11-22 17:05 Thomas Beierlein
2022-07-07 16:01 Rick Farina
2022-03-12 11:14 David Seifert
2021-02-15  2:19 Rick Farina
2020-10-11 14:46 Mikle Kolyada
2020-06-01 20:45 Rick Farina
2019-12-09 17:25 Rick Farina
2018-04-03 16:26 Andreas Sturmlechner
2018-02-18  3:48 Richard Farina
2017-07-08  1:35 Jason Donenfeld
2016-02-18 23:03 Jason Donenfeld

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1575656626.bd5515cceb69d34d275ceb957ef2cdc3ad133d75.zerochaos@gentoo \
    --to=zerochaos@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox