gentoo resync : 25.08.2020

4 files changed, 130 insertions, 11 deletions

diff --git a/net-wireless/srslte/Manifest b/net-wireless/srslte/Manifest
index 0cca963aef0a..541bcf9643a4 100644
--- a/net-wireless/srslte/Manifest
+++ b/net-wireless/srslte/Manifest
@@ -1,3 +1,6 @@
 DIST srslte-19.09.tar.gz 2372283 BLAKE2B 8d3b3cdfe777824c30e570f61ffddd1a9b1fd8136b6f67c2d54cbcfe089a1f55cc56d5b02ddb983c8a3e96af4228509b17a3c816b2d5196bc87bae29e14a625f SHA512 3516bb4aa027437420509eeca98e30f8f5c2bc7f8f1a606309587b70b51f2e6712c605155ec76a38868bf4c1f9007641c8c5b986c1cda76486bf3c4788eed888
-EBUILD srslte-19.09.ebuild 1107 BLAKE2B 9fb6445e2629d7d896d017a825d6fe3507f97314333d1d7ee62c1c5a52d90699c886f6e6dbd8228f64362b4505900840cadf45cc129ff29a571d3ae41d06e7b2 SHA512 817a68fdca302fbfff955aba9a4e20f381441ee42a9cd9f72a76a466c5af5c68a59dc57bcff5369d7becfc58d5fef01aa39a443d8fee3ff5c20c80d7911b6dca
+DIST srslte-20.04.1.tar.gz 7852357 BLAKE2B 1a9f4064c39fb09d155d0fef7de77f2277528296f749a8cef42624d0dd68a3e957eabceea44d74a1c5a4b28bf6e89f10dbf4b91a4b35ef197e07c36863277167 SHA512 0c55fc5f29a419c74c1bdbf94f63d0296341a1691faac9bf1e862d1b8afd207807907d376efc49513bb0f0e4f8fa6ef16fa8785d203a454824b33652788b5d2f
+EBUILD srslte-19.09-r2.ebuild 1214 BLAKE2B e926eb4c012f8ed0fdaa1a0a83fba5c0d86da8fc16efb85a00d26a96f4d19ff59b77721dee14baf43e8c4a057a36ed074aa98ab956815ce021b7a2cfbf20ae85 SHA512 9f32c82f5053c841912b5353cd1631d16613aea201e5aebe9e70d683298de782f82ee69e9043b9bd0675dc7332a1d93478c262c4829ac4c2809a02cd1c122077
+EBUILD srslte-20.04.1-r1.ebuild 1347 BLAKE2B 1dcd99948780ebff4ed51e10cc8807bdd94907e25268f8cd9504a5160344997dea2c0a04ac5c10d5197a4cad60b5d81a55e0d3115aec37829e3ca150da18e82e SHA512 eaf90de135182158f2ea36e169feeec77c0c3ff8374e9d0e72667c64c8ede8d589e3c29ad85d4bf790481a545fa4845d1fb0b71ac680c8d5c6e9a31089e8b737
+EBUILD srslte-9999.ebuild 1214 BLAKE2B e926eb4c012f8ed0fdaa1a0a83fba5c0d86da8fc16efb85a00d26a96f4d19ff59b77721dee14baf43e8c4a057a36ed074aa98ab956815ce021b7a2cfbf20ae85 SHA512 9f32c82f5053c841912b5353cd1631d16613aea201e5aebe9e70d683298de782f82ee69e9043b9bd0675dc7332a1d93478c262c4829ac4c2809a02cd1c122077
 MISC metadata.xml 560 BLAKE2B b7ddd92fc58b496527910d8f81df05ff473dc557c92d9a46ce18193ec411b5fb5b6b431f3f6bd54c2cd303570fb4215f438cbdbf5105c4316645a4cf734f3d68 SHA512 6f34f666c0b11b6ccb576117ae114f6628d50b0fff6cae384e77bec82c6398951f4b0dabfb273d801ff79e2e0aa70ae7babc0c19ed75f3cfd0be02527c6ebebd
diff --git a/net-wireless/srslte/srslte-19.09.ebuild b/net-wireless/srslte/srslte-19.09-r2.ebuild
index 444a0103a637..15a5ca816b79 100644
--- a/net-wireless/srslte/srslte-19.09.ebuild
+++ b/net-wireless/srslte/srslte-19.09-r2.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
-	sci-libs/fftw:*
+	net-libs/mbedtls:=
+	sci-libs/fftw:3.0=
 	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
 }
diff --git a/net-wireless/srslte/srslte-20.04.1-r1.ebuild b/net-wireless/srslte/srslte-20.04.1-r1.ebuild
new file mode 100644
index 000000000000..8bfdf919f31d
--- /dev/null
+++ b/net-wireless/srslte/srslte-20.04.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Open source SDR LTE software suite from Software Radio Systems"
+HOMEPAGE="http://www.softwareradiosystems.com"
+
+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"
+IUSE="bladerf simcard soapysdr uhd zeromq"
+
+DEPEND="
+	dev-libs/boost
+	dev-libs/libconfig
+	net-misc/lksctp-tools
+	net-libs/mbedtls:=
+	sci-libs/fftw:3.0=
+	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_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_UHD="$(usex uhd)"
+		-DENABLE_BLADERF="$(usex bladerf)"
+		-DENABLE_SOAPYSDR="$(usex soapysdr)"
+		-DENABLE_ZEROMQ="$(usex zeromq)"
+		-DENABLE_HARDSIM="$(usex simcard)"
+	)
+	cmake_src_configure
+}
diff --git a/net-wireless/srslte/srslte-9999.ebuild b/net-wireless/srslte/srslte-9999.ebuild
new file mode 100644
index 000000000000..15a5ca816b79
--- /dev/null
+++ b/net-wireless/srslte/srslte-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Open source SDR LTE software suite from Software Radio Systems"
+HOMEPAGE="http://www.softwareradiosystems.com"
+
+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"
+IUSE="bladerf simcard soapysdr uhd zeromq"
+
+DEPEND="
+	dev-libs/boost
+	dev-libs/libconfig
+	net-misc/lksctp-tools
+	net-libs/mbedtls:=
+	sci-libs/fftw:3.0=
+	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_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DENABLE_UHD="$(usex uhd)"
+		-DENABLE_BLADERF="$(usex bladerf)"
+		-DENABLE_SOAPYSDR="$(usex soapysdr)"
+		-DENABLE_ZEROMQ="$(usex zeromq)"
+		-DENABLE_HARDSIM="$(usex simcard)"
+	)
+	cmake_src_configure
+}