gentoo resync : 20.03.2022

5 files changed, 42 insertions, 71 deletions

diff --git a/net-wireless/soapysdrplay/Manifest b/net-wireless/soapysdrplay/Manifest
index 95a2905ceb45..1d9dff205ca0 100644
--- a/net-wireless/soapysdrplay/Manifest
+++ b/net-wireless/soapysdrplay/Manifest
@@ -1,6 +1,4 @@
-DIST soapysdrplay-0.1.0.tar.gz 11736 BLAKE2B 746e01092d094cedb6b15b9c11ec0b828e18cd3c814e46cbe5cb9473cfd494d8342ab9618d8c5d945429b2b62178b02b81c2b000e20c53a7cb027d4b2a25c789 SHA512 28382b4ac79e27a0b84ed6edb4abeca99b90222ad2890041e1585cac21177518ca3fcea0a3e14f8502091d47e7b2a223913dd77c53b6c0360f0f3875328613da
-DIST soapysdrplay-0.2.0.tar.gz 13570 BLAKE2B c77342b091a3510986e4388911dc2e45d7bc0e54dfef7ebe1fe774d564193bc773509d46238c0a3ea87458ab0c7ea2447a877f083a72a26f2ca5e592386b1ba1 SHA512 7ed6e34ee42416b4d2eec76b66cdc0e9b40835ab3299a2b3a906492cf342bbdef7c92dd3e9e63b12fdceb897ca4fb2bb574b23d4aee121cc32fbfcddbb7b060a
-EBUILD soapysdrplay-0.1.0.ebuild 686 BLAKE2B 67605a2e120369a6eef55bf0cae9b5e8c8c68e21979b051b1ee86da576c345163468f591dd58312b53cd025fcd6d2f80ab6fc4724899331d7fe1f5a5336ee384 SHA512 9b014528ba37b646fd720e8327e3c549a0ac3b82b25113a942928fe85ce47628275d34d504c903af8e0e084142fda154dce44de7f03bea3a59077d1797d112fc
-EBUILD soapysdrplay-0.2.0.ebuild 686 BLAKE2B 67605a2e120369a6eef55bf0cae9b5e8c8c68e21979b051b1ee86da576c345163468f591dd58312b53cd025fcd6d2f80ab6fc4724899331d7fe1f5a5336ee384 SHA512 9b014528ba37b646fd720e8327e3c549a0ac3b82b25113a942928fe85ce47628275d34d504c903af8e0e084142fda154dce44de7f03bea3a59077d1797d112fc
-EBUILD soapysdrplay-9999.ebuild 686 BLAKE2B 67605a2e120369a6eef55bf0cae9b5e8c8c68e21979b051b1ee86da576c345163468f591dd58312b53cd025fcd6d2f80ab6fc4724899331d7fe1f5a5336ee384 SHA512 9b014528ba37b646fd720e8327e3c549a0ac3b82b25113a942928fe85ce47628275d34d504c903af8e0e084142fda154dce44de7f03bea3a59077d1797d112fc
+DIST soapysdrplay-20220120.tar.gz 21089 BLAKE2B db8a8f7b20a57d637f69b45cab283419e46808ab95bfbcba96b155c696bb6673223347ef720c8556f4122a53659eb166edb15b48796b2e01ec3ee5bb10eafba1 SHA512 a0cd5e84da86ab9fc6ffae93e963a14091c0936bc93a0ab86d7c3cab15cf2e62e1382da9fff10b1f457d1fbf925dc3ea74683f0fa13e12394d994f9571e52334
+EBUILD soapysdrplay-20220120.ebuild 736 BLAKE2B 2b96151d8ca6f1db4bef0dbfebd1898d9238e92469d48c113cd72aef1db917a8a9fd366e631a9624efd7c617d7ac1f8e98678660e1e070c03b0385331a745a54 SHA512 4c03e8aa7c0061d530fbd8ac16a45795e46fae1f5bb5818372a20c5490ffc0b4e4171b75ffbfc41c75dfcc3f1e9d46fd3fc691ce15ffa6ace42d0c3ecf2d112d
+EBUILD soapysdrplay-9999.ebuild 736 BLAKE2B 2b96151d8ca6f1db4bef0dbfebd1898d9238e92469d48c113cd72aef1db917a8a9fd366e631a9624efd7c617d7ac1f8e98678660e1e070c03b0385331a745a54 SHA512 4c03e8aa7c0061d530fbd8ac16a45795e46fae1f5bb5818372a20c5490ffc0b4e4171b75ffbfc41c75dfcc3f1e9d46fd3fc691ce15ffa6ace42d0c3ecf2d112d
 MISC metadata.xml 338 BLAKE2B 97886cad40497300d044a9cff632cfb311c5d1bbebe218d61fd633cf3002b4ae9c62345f42e9e60bf1fe192ab029aebe00f14bd732d10317c6c9351ddc94ea99 SHA512 d7b9ac4a2ac9845657211b51beea569b7ca849f989ad68e1bd016148d6bbbd62764e62ee619b765ed08903b48922ef4d4eb662230b875d5e2be2f419cc8f1f11
diff --git a/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild b/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild
deleted file mode 100644
index 935b6c269996..000000000000
--- a/net-wireless/soapysdrplay/soapysdrplay-0.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Soapy SDR plugin for SDRPlay"
-HOMEPAGE="https://github.com/pothosware/SoapySDRPlay"
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay.git"
-	EGIT_CLONE_TYPE="shallow"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/SoapySDRPlay-soapy-sdrplay-"${PV}"
-fi
-
-LICENSE="Boost-1.0"
-SLOT="0"
-
-IUSE=""
-REQUIRED_USE=""
-
-RDEPEND="net-wireless/soapysdr
-	net-wireless/sdrplay"
-DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapysdrplay/soapysdrplay-0.2.0.ebuild b/net-wireless/soapysdrplay/soapysdrplay-0.2.0.ebuild
deleted file mode 100644
index 935b6c269996..000000000000
--- a/net-wireless/soapysdrplay/soapysdrplay-0.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Soapy SDR plugin for SDRPlay"
-HOMEPAGE="https://github.com/pothosware/SoapySDRPlay"
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay.git"
-	EGIT_CLONE_TYPE="shallow"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/SoapySDRPlay-soapy-sdrplay-"${PV}"
-fi
-
-LICENSE="Boost-1.0"
-SLOT="0"
-
-IUSE=""
-REQUIRED_USE=""
-
-RDEPEND="net-wireless/soapysdr
-	net-wireless/sdrplay"
-DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapysdrplay/soapysdrplay-20220120.ebuild b/net-wireless/soapysdrplay/soapysdrplay-20220120.ebuild
new file mode 100644
index 000000000000..446b5336ed79
--- /dev/null
+++ b/net-wireless/soapysdrplay/soapysdrplay-20220120.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Soapy SDR plugin for SDRPlay"
+HOMEPAGE="https://github.com/pothosware/SoapySDRPlay3"
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay3.git"
+	EGIT_CLONE_TYPE="shallow"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	COMMIT_HASH="b789d5985b900973c81c69aa04cb3c7ebe620a75"
+	SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapySDRPlay3-"${COMMIT_HASH}"
+fi
+
+LICENSE="Boost-1.0"
+SLOT="0"
+
+IUSE=""
+REQUIRED_USE=""
+
+RDEPEND="net-wireless/soapysdr
+	>=net-wireless/sdrplay-3.07"
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapysdrplay/soapysdrplay-9999.ebuild b/net-wireless/soapysdrplay/soapysdrplay-9999.ebuild
index 935b6c269996..446b5336ed79 100644
--- a/net-wireless/soapysdrplay/soapysdrplay-9999.ebuild
+++ b/net-wireless/soapysdrplay/soapysdrplay-9999.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Soapy SDR plugin for SDRPlay"
-HOMEPAGE="https://github.com/pothosware/SoapySDRPlay"
+HOMEPAGE="https://github.com/pothosware/SoapySDRPlay3"
 
 if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay.git"
+	EGIT_REPO_URI="https://github.com/pothosware/SoapySDRPlay3.git"
 	EGIT_CLONE_TYPE="shallow"
 	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/soapy-sdrplay-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/SoapySDRPlay-soapy-sdrplay-"${PV}"
+	COMMIT_HASH="b789d5985b900973c81c69aa04cb3c7ebe620a75"
+	SRC_URI="https://github.com/pothosware/SoapySDRPlay/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/SoapySDRPlay3-"${COMMIT_HASH}"
 fi
 
 LICENSE="Boost-1.0"
@@ -25,5 +26,5 @@ IUSE=""
 REQUIRED_USE=""
 
 RDEPEND="net-wireless/soapysdr
-	net-wireless/sdrplay"
+	>=net-wireless/sdrplay-3.07"
 DEPEND="${RDEPEND}"