[gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/

Rick Farina Mon, 24 Aug 2020 12:01:44 -0700

commit:     58a5d1ce4dbf84cb58c804e837bccbe027c66282
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 18:36:24 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 19:01:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58a5d1ce


net-wireless/gnuradio: 3.8.2.0 bump

cleanup 9999 to track a useful branch

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

 net-wireless/gnuradio/Manifest                                    | 1 +
 .../gnuradio/{gnuradio-9999.ebuild => gnuradio-3.8.2.0.ebuild}    | 8 ++++----
 net-wireless/gnuradio/gnuradio-9999.ebuild                        | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index ec386c36bee..645064a69d8 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -3,3 +3,4 @@ DIST gnuradio-3.7.13-1-qt5.tar.xz 31412 BLAKE2B 
56aebd5ea61abd48723ed0c16050a05c
 DIST gnuradio-3.7.13-codec2.tar.xz 13148 BLAKE2B 
84f732dc562dbbd076e1656fad37c818fd9fa869b81f343d45b086659a6df1dc4e26afdb8f283b83c758f76e9d3b90e51ce32e396fbb03d1c0348d27ba9e2c1c
 SHA512 
f9e034ff240b836e336b48900a3b6a86a656ec4f35a9df639503ab99cf8da6acfc6e8d45f11c81994766d9d5bb381671fc678abd0280ebc0e218bcd8523a3f1b
 DIST gnuradio-3.7.13.5.tar.xz 2976120 BLAKE2B 
67aea67b0bd87994f8b4bf89405f410dc08c9fc603a0a59579036b28e575c864df28a0b43e2163fc6ec834fdeb015f110295cdca3aa4256d15e1d223d31579d3
 SHA512 
cf25491b81d317cd0cdfc70203695c4e819676bc6771c25e85fc62873e6e28d6ea3b9f0387e693976fa072fa1cfe9c9a503e4958ec658e2e0a6768752c61fb15
 DIST gnuradio-3.8.1.0.tar.xz 2436488 BLAKE2B 
f3919b458987c9dc72be2d9400473d64cc95870f4bf3a31b74c2ee9df8f291b6ca8e44d57269ad0af5e2fd0a22f777999986685f53665057f9a54478fa840479
 SHA512 
81e68db79b0927830a86d21f851f183becfad3e9b8b9b8379698c0d96d3f906b9b1b9292198829ce3d3c73fc29547e42a2532db62218d0b534bf02bf7a02fdde
+DIST gnuradio-3.8.2.0.tar.xz 2438736 BLAKE2B 
93eabff578cd6b3b6587a6aa083095c787323ebf87a447d61999813e7e5e48b414d080a4fc02d01dabaa9378d42e3a210451a9109fc202991ebda8d1c9669676
 SHA512 
33930f62762cd9e3d1038b4a903f01e7ab33129732d207c126a89c1f1e719e9d656a94cdcbf3f6010f8476fedacee639c8a12444c41cdd56ad9fbace7863a170

diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild 
b/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
similarity index 96%
copy from net-wireless/gnuradio/gnuradio-9999.ebuild
copy to net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
index aa068b0e06b..65be5a35852 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.8.2.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake python-single-r1 virtualx xdg-utils
+inherit cmake python-single-r1 virtualx xdg-utils desktop
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement 
software radios"
 HOMEPAGE="https://www.gnuradio.org/";
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 
 if [[ ${PV} =~ "9999" ]]; then
        EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git";
-       EGIT_BRANCH="pybind"
+       EGIT_BRANCH="maint-3.8"
        inherit git-r3
        KEYWORDS=""
 else
@@ -47,7 +47,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 "
 
 RDEPEND="${PYTHON_DEPS}
-       $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
        $(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
        dev-libs/log4cpp
        $(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
@@ -68,7 +67,7 @@ RDEPEND="${PYTHON_DEPS}
                x11-libs/gtk+:3[introspection]
                x11-libs/pango[introspection]
        )
-       jack? ( media-sound/jack-audio-connection-kit )
+       jack? ( virtual/jack )
        portaudio? ( >=media-libs/portaudio-19_pre )
        qt5? (
                $(python_gen_cond_dep 
'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]')
@@ -130,6 +129,7 @@ src_configure() {
        mycmakeargs=(
                -DENABLE_DEFAULT=OFF
                -DENABLE_VOLK=OFF
+               -DENABLE_INTERNAL_VOLK=OFF
                -DENABLE_GNURADIO_RUNTIME=ON
                -DENABLE_PYTHON=ON
                -DENABLE_GR_BLOCKS=ON

diff --git a/net-wireless/gnuradio/gnuradio-9999.ebuild 
b/net-wireless/gnuradio/gnuradio-9999.ebuild
index aa068b0e06b..65be5a35852 100644
--- a/net-wireless/gnuradio/gnuradio-9999.ebuild
+++ b/net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 
 CMAKE_BUILD_TYPE="None"
-inherit cmake python-single-r1 virtualx xdg-utils
+inherit cmake python-single-r1 virtualx xdg-utils desktop
 
 DESCRIPTION="Toolkit that provides signal processing blocks to implement 
software radios"
 HOMEPAGE="https://www.gnuradio.org/";
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 
 if [[ ${PV} =~ "9999" ]]; then
        EGIT_REPO_URI="https://github.com/gnuradio/gnuradio.git";
-       EGIT_BRANCH="pybind"
+       EGIT_BRANCH="maint-3.8"
        inherit git-r3
        KEYWORDS=""
 else
@@ -47,7 +47,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 "
 
 RDEPEND="${PYTHON_DEPS}
-       $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
        $(python_gen_cond_dep 'dev-libs/boost:0=[python,${PYTHON_USEDEP}]')
        dev-libs/log4cpp
        $(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
@@ -68,7 +67,7 @@ RDEPEND="${PYTHON_DEPS}
                x11-libs/gtk+:3[introspection]
                x11-libs/pango[introspection]
        )
-       jack? ( media-sound/jack-audio-connection-kit )
+       jack? ( virtual/jack )
        portaudio? ( >=media-libs/portaudio-19_pre )
        qt5? (
                $(python_gen_cond_dep 
'dev-python/PyQt5[opengl,${PYTHON_USEDEP}]')
@@ -130,6 +129,7 @@ src_configure() {
        mycmakeargs=(
                -DENABLE_DEFAULT=OFF
                -DENABLE_VOLK=OFF
+               -DENABLE_INTERNAL_VOLK=OFF
                -DENABLE_GNURADIO_RUNTIME=ON
                -DENABLE_PYTHON=ON
                -DENABLE_GR_BLOCKS=ON

[gentoo-commits] repo/gentoo:master commit in: net-wireless/gnuradio/

Reply via email to