[gentoo-commits] repo/gentoo:master commit in: net-analyzer/gr-fosphor/

[Rick Farina]

commit:     f91973f01e9ccf851555c9f059c9d424e48ff4e9
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  1 19:06:31 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Jun  1 20:45:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f91973f0

net-analyzer/gr-fosphor: fix gr3.8

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

 net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild | 8 ++++----
 net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild          | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild 
b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
index 79dc792325f..73f6863f9df 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-0.0_p20200131.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/osmocom/${PN}.git";
 else
-       COMMIT="fa6761afbf8c2658782e0c7fc5d51063679b7ae4"
+       COMMIT="defdd4aca6cd157ccc3b10ea16b5b4f552f34b96"
        SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz 
-> ${P}.tar.gz"
        S="${WORKDIR}/${PN}-${COMMIT}"
        KEYWORDS="~amd64 ~x86"
@@ -31,9 +31,10 @@ RDEPEND="qt5? (
                dev-qt/qtopengl:5
                dev-qt/qtwidgets:5
        )
-       =net-wireless/gnuradio-3.8*:0=[qt5,${PYTHON_SINGLE_USEDEP}]
-       media-libs/freetype
        dev-libs/boost:=
+       dev-libs/log4cpp
+       media-libs/freetype
+       =net-wireless/gnuradio-3.8*:0=[qt5,${PYTHON_SINGLE_USEDEP}]
        glfw? ( >=media-libs/glfw-3 )
        virtual/opencl
        virtual/opengl
@@ -57,7 +58,6 @@ src_configure() {
                -DENABLE_DEFAULT=OFF
                -DENABLE_GLFW="$(usex glfw)"
                -DENABLE_QT="$(usex qt5)"
-               -DENABLE_WX="$(usex wxwidgets)"
                -DENABLE_PYTHON=ON
        )
        cmake-utils_src_configure

diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild 
b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
index 79dc792325f..73f6863f9df 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/osmocom/${PN}.git";
 else
-       COMMIT="fa6761afbf8c2658782e0c7fc5d51063679b7ae4"
+       COMMIT="defdd4aca6cd157ccc3b10ea16b5b4f552f34b96"
        SRC_URI="https://github.com/osmocom/gr-fosphor/archive/${COMMIT}.tar.gz 
-> ${P}.tar.gz"
        S="${WORKDIR}/${PN}-${COMMIT}"
        KEYWORDS="~amd64 ~x86"
@@ -31,9 +31,10 @@ RDEPEND="qt5? (
                dev-qt/qtopengl:5
                dev-qt/qtwidgets:5
        )
-       =net-wireless/gnuradio-3.8*:0=[qt5,${PYTHON_SINGLE_USEDEP}]
-       media-libs/freetype
        dev-libs/boost:=
+       dev-libs/log4cpp
+       media-libs/freetype
+       =net-wireless/gnuradio-3.8*:0=[qt5,${PYTHON_SINGLE_USEDEP}]
        glfw? ( >=media-libs/glfw-3 )
        virtual/opencl
        virtual/opengl
@@ -57,7 +58,6 @@ src_configure() {
                -DENABLE_DEFAULT=OFF
                -DENABLE_GLFW="$(usex glfw)"
                -DENABLE_QT="$(usex qt5)"
-               -DENABLE_WX="$(usex wxwidgets)"
                -DENABLE_PYTHON=ON
        )
        cmake-utils_src_configure