commit:     66356e8eae758816c354b705e3abf5bcd8d058c6
Author:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 15:59:10 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 16:00:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66356e8e

net-wireless/srslte: bumpish

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

 net-wireless/srslte/srslte-20.04.1.ebuild          | 26 ++++++++++++++--------
 .../{srslte-20.04.1.ebuild => srslte-9999.ebuild}  | 23 +++++++++++--------
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/net-wireless/srslte/srslte-20.04.1.ebuild 
b/net-wireless/srslte/srslte-20.04.1.ebuild
index 67d1eb85aac..3d539eb20f5 100644
--- a/net-wireless/srslte/srslte-20.04.1.ebuild
+++ b/net-wireless/srslte/srslte-20.04.1.ebuild
@@ -3,38 +3,46 @@
 
 EAPI=7
 
-inherit cmake-utils vcs-snapshot
-
-MY_PV=${PV//./_}
+inherit cmake
 
 DESCRIPTION="Open source SDR LTE software suite from Software Radio Systems"
 HOMEPAGE="http://www.softwareradiosystems.com";
-SRC_URI="https://github.com/srsLTE/srsLTE/archive/release_${MY_PV}.tar.gz -> 
${P}.tar.gz"
+
+if [ "${PV}" = "9999" ]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/srsLTE/srsLTE.git";
+else
+       inherit vcs-snapshot
+       #This version has not earned keywords:
+       #https://github.com/srsLTE/srsLTE/issues/526
+       #https://github.com/srsLTE/srsLTE/issues/527
+       #KEYWORDS="~amd64 ~x86"
+       MY_PV=${PV//./_}
+       
SRC_URI="https://github.com/srsLTE/srsLTE/archive/release_${MY_PV}.tar.gz -> 
${P}.tar.gz"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="bladerf simcard soapysdr uhd zeromq"
 
 DEPEND="
        dev-libs/boost
        dev-libs/libconfig
        net-misc/lksctp-tools
-       net-libs/mbedtls
+       net-libs/mbedtls:=
        sci-libs/fftw:*
        bladerf? ( net-wireless/bladerf:= )
        simcard? ( sys-apps/pcsc-lite )
        soapysdr? ( net-wireless/soapysdr:= )
        uhd? ( net-wireless/uhd:= )
        zeromq? ( net-libs/zeromq )
-
 "
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
 src_prepare() {
        sed -i '/ -Werror"/d' CMakeLists.txt || die
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -45,5 +53,5 @@ src_configure() {
                -DENABLE_ZEROMQ="$(usex zeromq)"
                -DENABLE_HARDSIM="$(usex simcard)"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }

diff --git a/net-wireless/srslte/srslte-20.04.1.ebuild 
b/net-wireless/srslte/srslte-9999.ebuild
similarity index 72%
copy from net-wireless/srslte/srslte-20.04.1.ebuild
copy to net-wireless/srslte/srslte-9999.ebuild
index 67d1eb85aac..2fbb7547197 100644
--- a/net-wireless/srslte/srslte-20.04.1.ebuild
+++ b/net-wireless/srslte/srslte-9999.ebuild
@@ -3,38 +3,43 @@
 
 EAPI=7
 
-inherit cmake-utils vcs-snapshot
-
-MY_PV=${PV//./_}
+inherit cmake
 
 DESCRIPTION="Open source SDR LTE software suite from Software Radio Systems"
 HOMEPAGE="http://www.softwareradiosystems.com";
-SRC_URI="https://github.com/srsLTE/srsLTE/archive/release_${MY_PV}.tar.gz -> 
${P}.tar.gz"
+
+if [ "${PV}" = "9999" ]; then
+       inherit git-r3
+       EGIT_REPO_URI="https://github.com/srsLTE/srsLTE.git";
+else
+       inherit vcs-snapshot
+       KEYWORDS="~amd64 ~x86"
+       MY_PV=${PV//./_}
+       
SRC_URI="https://github.com/srsLTE/srsLTE/archive/release_${MY_PV}.tar.gz -> 
${P}.tar.gz"
+fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 IUSE="bladerf simcard soapysdr uhd zeromq"
 
 DEPEND="
        dev-libs/boost
        dev-libs/libconfig
        net-misc/lksctp-tools
-       net-libs/mbedtls
+       net-libs/mbedtls:=
        sci-libs/fftw:*
        bladerf? ( net-wireless/bladerf:= )
        simcard? ( sys-apps/pcsc-lite )
        soapysdr? ( net-wireless/soapysdr:= )
        uhd? ( net-wireless/uhd:= )
        zeromq? ( net-libs/zeromq )
-
 "
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
 src_prepare() {
        sed -i '/ -Werror"/d' CMakeLists.txt || die
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -45,5 +50,5 @@ src_configure() {
                -DENABLE_ZEROMQ="$(usex zeromq)"
                -DENABLE_HARDSIM="$(usex simcard)"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }

Reply via email to