gentoo christmass resync : 25.12.2020

4 files changed, 7 insertions, 61 deletions

diff --git a/net-wireless/srslte/Manifest b/net-wireless/srslte/Manifest
index 21536cac2cdf..967c8737722f 100644
--- a/net-wireless/srslte/Manifest
+++ b/net-wireless/srslte/Manifest
@@ -1,6 +1,4 @@
-DIST srslte-19.09.tar.gz 2372283 BLAKE2B 8d3b3cdfe777824c30e570f61ffddd1a9b1fd8136b6f67c2d54cbcfe089a1f55cc56d5b02ddb983c8a3e96af4228509b17a3c816b2d5196bc87bae29e14a625f SHA512 3516bb4aa027437420509eeca98e30f8f5c2bc7f8f1a606309587b70b51f2e6712c605155ec76a38868bf4c1f9007641c8c5b986c1cda76486bf3c4788eed888
-DIST srslte-20.04.2.tar.gz 7852105 BLAKE2B f9c7a5d83ee5e1cde0ad74775e504a8fe332e829343f64019b8f4d8f52cb001c29e5c0b611776db88a2c8338fa00ecdaccfc45e06fc8669554a326efd20f0a8d SHA512 2db146ab30e19fe2027252d5f4fd8c52385923e24d721f4deee01a99b8fbb9b03758997bc336fb0773e0633f0cdf1fa769e3f251e7b02b18a8f0e2d6d25e42d7
-EBUILD srslte-19.09-r2.ebuild 1214 BLAKE2B e926eb4c012f8ed0fdaa1a0a83fba5c0d86da8fc16efb85a00d26a96f4d19ff59b77721dee14baf43e8c4a057a36ed074aa98ab956815ce021b7a2cfbf20ae85 SHA512 9f32c82f5053c841912b5353cd1631d16613aea201e5aebe9e70d683298de782f82ee69e9043b9bd0675dc7332a1d93478c262c4829ac4c2809a02cd1c122077
-EBUILD srslte-20.04.2.ebuild 1275 BLAKE2B a25c0fadfd891f1d228782fc07d11e04427fcae2b0c8b24bf3f6d510f02c4e3c00d817967f4929cafddd02014fe2be62787f4038fb913ea89e50cd1afadbf905 SHA512 82e0cc8bda22f8c9f04139cfbe0b5f1a1ef83dc7ab111ebde208330bc0ae1b68153e987f15ba132c687e555f1c30c0bfbb857219f2cec16abc5593b15bd3c3b8
-EBUILD srslte-9999.ebuild 1214 BLAKE2B e926eb4c012f8ed0fdaa1a0a83fba5c0d86da8fc16efb85a00d26a96f4d19ff59b77721dee14baf43e8c4a057a36ed074aa98ab956815ce021b7a2cfbf20ae85 SHA512 9f32c82f5053c841912b5353cd1631d16613aea201e5aebe9e70d683298de782f82ee69e9043b9bd0675dc7332a1d93478c262c4829ac4c2809a02cd1c122077
+DIST srslte-20.10.1.tar.gz 8098321 BLAKE2B 713cbe45c49baa416b96dc432982656fef92082f026392c890f447d09588a48aafab32f94a4d7ed982814d2d838224303895a0bd0276a90f5815f6d0707d9732 SHA512 a6e38ccdb02a7e129f51fbad258722f5cd1f568541627c3e9e70f9e92491279cb55c18ab0463bce94b0f5fc62f0868027a83beffc483bb3689f0838fbea91186
+EBUILD srslte-20.10.1.ebuild 1275 BLAKE2B 3462eff2e3a56a4e763973b323e56f7b13ce4091111f64b700a9a1d84fcb861a31f21ac4b242132cc32780902f340314136ae87e50179cbaef4c4eb06844e380 SHA512 1e2708a885a3893df7a98acfa403ac2f2520cbc6e28e24c8f6777aea1f6876faf3d26dbd90d9ba1f0ef925fee94ae18ef7d051395f94288f0edbe2fa6775c0cd
+EBUILD srslte-9999.ebuild 1275 BLAKE2B 3462eff2e3a56a4e763973b323e56f7b13ce4091111f64b700a9a1d84fcb861a31f21ac4b242132cc32780902f340314136ae87e50179cbaef4c4eb06844e380 SHA512 1e2708a885a3893df7a98acfa403ac2f2520cbc6e28e24c8f6777aea1f6876faf3d26dbd90d9ba1f0ef925fee94ae18ef7d051395f94288f0edbe2fa6775c0cd
 MISC metadata.xml 560 BLAKE2B b7ddd92fc58b496527910d8f81df05ff473dc557c92d9a46ce18193ec411b5fb5b6b431f3f6bd54c2cd303570fb4215f438cbdbf5105c4316645a4cf734f3d68 SHA512 6f34f666c0b11b6ccb576117ae114f6628d50b0fff6cae384e77bec82c6398951f4b0dabfb273d801ff79e2e0aa70ae7babc0c19ed75f3cfd0be02527c6ebebd
diff --git a/net-wireless/srslte/srslte-20.04.2.ebuild b/net-wireless/srslte/srslte-20.04.2.ebuild
deleted file mode 100644
index 1015f72c313f..000000000000
--- a/net-wireless/srslte/srslte-20.04.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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"
-	#https://github.com/srsLTE/srsLTE/issues/537
-	RESTRICT=test
-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-19.09-r2.ebuild b/net-wireless/srslte/srslte-20.10.1.ebuild
index 15a5ca816b79..4030279938a7 100644
--- a/net-wireless/srslte/srslte-19.09-r2.ebuild
+++ b/net-wireless/srslte/srslte-20.10.1.ebuild
@@ -17,6 +17,8 @@ else
 	MY_PV=${PV//./_}
 	SRC_URI="https://github.com/srsLTE/srsLTE/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
 fi
+#https://github.com/srsLTE/srsLTE/issues/537
+RESTRICT="test"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-wireless/srslte/srslte-9999.ebuild b/net-wireless/srslte/srslte-9999.ebuild
index 15a5ca816b79..4030279938a7 100644
--- a/net-wireless/srslte/srslte-9999.ebuild
+++ b/net-wireless/srslte/srslte-9999.ebuild
@@ -17,6 +17,8 @@ else
 	MY_PV=${PV//./_}
 	SRC_URI="https://github.com/srsLTE/srsLTE/archive/release_${MY_PV}.tar.gz -> ${P}.tar.gz"
 fi
+#https://github.com/srsLTE/srsLTE/issues/537
+RESTRICT="test"
 
 LICENSE="GPL-3"
 SLOT="0"