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

[Rick Farina]

commit:     fdf6a54d73c0ae20a6f1de8d68c60e74d3d52af9
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 30 02:12:38 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sun Aug 30 02:12:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf6a54d

net-wireless/gr-rds: update

support new python
support new gnuradio

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

 net-wireless/gr-rds/Manifest                        |  1 +
 ...-rds-9999.ebuild => gr-rds-0.0_p20200807.ebuild} | 21 +++++++++++++++------
 net-wireless/gr-rds/gr-rds-9999.ebuild              | 21 +++++++++++++++------
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/net-wireless/gr-rds/Manifest b/net-wireless/gr-rds/Manifest
new file mode 100644
index 00000000000..73715037939
--- /dev/null
+++ b/net-wireless/gr-rds/Manifest
@@ -0,0 +1 @@
+DIST gr-rds-0.0_p20200807.tar.gz 210730 BLAKE2B 
be2ded79a744d97572f754458fbab6c4091eb9096fa01238e09cfb1703d50fc1f228000b973826456fe4fae7577ef4dcc871edb4f72bd4e2daacdf3d01330d03
 SHA512 
d04944db7c02d3a004beae5be96a42274dcc4503d94bd22b726c664fb49103c41479ce49f7b4f2e6fb86d7b6bdd01873375fd6a7a7cc4b04ec9bf033235743a2

diff --git a/net-wireless/gr-rds/gr-rds-9999.ebuild 
b/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild
similarity index 69%
copy from net-wireless/gr-rds/gr-rds-9999.ebuild
copy to net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild
index 10e9f43865d..e4b42b14c55 100644
--- a/net-wireless/gr-rds/gr-rds-9999.ebuild
+++ b/net-wireless/gr-rds/gr-rds-0.0_p20200807.ebuild
@@ -3,15 +3,19 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 if [[ ${PV} == 9999* ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/bastibl/${PN}";
+       EGIT_BRANCH="maint-3.8"
 else
-       KEYWORDS=""
+       KEYWORDS="~amd64 ~x86"
+       COMMIT="ffbe3ea302c32a621f14329b7fcc09e868305e78"
+       SRC_URI="https://github.com/bastibl/gr-rds/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+       S="${WORKDIR}/${PN}-${COMMIT}"
 fi
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="GNU Radio FM RDS Receiver"
 HOMEPAGE="https://github.com/bastibl/gr-rds";
@@ -25,7 +29,7 @@ RDEPEND="${PYTHON_DEPS}
        $(python_gen_cond_dep '
                dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
        ')
-       >=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+       =net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -35,7 +39,7 @@ BDEPEND="
 #      dev-util/cppunit"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_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 || die
        sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt || die
@@ -44,5 +48,10 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
-       cmake-utils_src_configure
+       cmake_src_configure
+}
+
+src_install() {
+       cmake_src_install
+       python_optimize
 }

diff --git a/net-wireless/gr-rds/gr-rds-9999.ebuild 
b/net-wireless/gr-rds/gr-rds-9999.ebuild
index 10e9f43865d..e4b42b14c55 100644
--- a/net-wireless/gr-rds/gr-rds-9999.ebuild
+++ b/net-wireless/gr-rds/gr-rds-9999.ebuild
@@ -3,15 +3,19 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{7,8} )
 
 if [[ ${PV} == 9999* ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://github.com/bastibl/${PN}";
+       EGIT_BRANCH="maint-3.8"
 else
-       KEYWORDS=""
+       KEYWORDS="~amd64 ~x86"
+       COMMIT="ffbe3ea302c32a621f14329b7fcc09e868305e78"
+       SRC_URI="https://github.com/bastibl/gr-rds/archive/${COMMIT}.tar.gz -> 
${P}.tar.gz"
+       S="${WORKDIR}/${PN}-${COMMIT}"
 fi
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="GNU Radio FM RDS Receiver"
 HOMEPAGE="https://github.com/bastibl/gr-rds";
@@ -25,7 +29,7 @@ RDEPEND="${PYTHON_DEPS}
        $(python_gen_cond_dep '
                dev-libs/boost:=[${PYTHON_MULTI_USEDEP}]
        ')
-       >=net-wireless/gnuradio-3.7_rc:0=[${PYTHON_SINGLE_USEDEP}]
+       =net-wireless/gnuradio-3.8*:0=[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -35,7 +39,7 @@ BDEPEND="
 #      dev-util/cppunit"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_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 || die
        sed -i '/${CPPUNIT_INCLUDE_DIRS}/d' CMakeLists.txt || die
@@ -44,5 +48,10 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=( -DPYTHON_EXECUTABLE="${PYTHON}" )
-       cmake-utils_src_configure
+       cmake_src_configure
+}
+
+src_install() {
+       cmake_src_install
+       python_optimize
 }