gentoo resync : 23.09.2020

5 files changed, 13 insertions, 57 deletions

diff --git a/net-wireless/rtl_433/Manifest b/net-wireless/rtl_433/Manifest
index 780415c50c61..e28c6857df6e 100644
--- a/net-wireless/rtl_433/Manifest
+++ b/net-wireless/rtl_433/Manifest
@@ -1,6 +1,4 @@
-DIST rtl_433-0.1_p20190709.tar.gz 718424 BLAKE2B f7acd89013114c7d357edfc4610be8a7405feac11843dcb1bc7fefe81556a3b09ee26622dd58d68afb3d99840db8e997dbbc66cccda53a34964b32bac352462c SHA512 d36757a567c7696b150b03a1e09fda74f7a4ec454bc1b5658e4a6b22370de5c102a152257d436c87f0ddff325c17b0e9b8afbae0dc3e82ab04111d78a728a590
-DIST rtl_433-20.02_p20200327.tar.gz 805791 BLAKE2B db1eb9563252d2711b441b12071f5de887e835decc93e30bec0a8133b927cd14cc7030380febe97b3d135df97a9eb01d5b42ebe93b761f524709f3a072a792b4 SHA512 2aecf45669dfdca849b6761b069c107491f879624092ea2ab9738ea9f1514b1c516e0bfcc0851f6947863fa6682ac809220bb88635edf10fb77025a8f4be07f3
-EBUILD rtl_433-0.1_p20190709-r1.ebuild 902 BLAKE2B 56650cbafb488b7b7ac4a40773d5c1218f4b059bea5fb7919d353f851335ab8d3289bed08b3566251fa6255c658236e4e909d5c547b4250564d3a11021d2d4cc SHA512 17630501c94699ac49fe62e80dc5a5167ea3fcf86e9f01220614ad16c0f8eb9fc7b5f0013f16f81e6114e76d76a5979df4986d3a528290d409fccec404e2c959
-EBUILD rtl_433-20.02_p20200327.ebuild 1068 BLAKE2B 33b648fc425bdedf4098cf735df6e81033e7fa898c54050309973695ecc22af2d80950300d7a5f12a988828b857cd98db9566ae7927827cd8ecc2f6879a68872 SHA512 ab2e97530f0c0a046d2ba26a1a6937cf76d7990ce42505e1e2f74f384a684243d90cd71c2ef5015d1278b2ccc10e0d96625a6b9a34c00490afc7cc7c7f46f295
-EBUILD rtl_433-9999.ebuild 1068 BLAKE2B 33b648fc425bdedf4098cf735df6e81033e7fa898c54050309973695ecc22af2d80950300d7a5f12a988828b857cd98db9566ae7927827cd8ecc2f6879a68872 SHA512 ab2e97530f0c0a046d2ba26a1a6937cf76d7990ce42505e1e2f74f384a684243d90cd71c2ef5015d1278b2ccc10e0d96625a6b9a34c00490afc7cc7c7f46f295
-MISC metadata.xml 480 BLAKE2B 981c663d0bf6138305e869fa5c2c2486a92fae661a5f8700241350db57ad9da12a6d271a36603f895cff902d726243ffa647fada5cb1d02358eff5fee24b14a9 SHA512 23de623b5ecaaaa8bdca0a1b9e73194f26b039cfc547e64afcef865f2a52c40553a5560f420b9c4db6c32e858c6c3d48dc66248743916ebed83744eda7b072dd
+DIST rtl_433-20.02_p20200922.tar.gz 841774 BLAKE2B 4a3c060c85233a85e951eff5fb210cc4ec5529a6cc868782fdbf7b3dad7372dcd7d428776c539d25105b9cfdf5f260bc031bbd5435eb2658e73b8b275f2040ee SHA512 fe0a26b14df97c679968536b5b3dfe41e5f8c6e0af00265461b4e1bf6312dd71cc1b1ccf2f5f78bc4d67b5f2effb17a88b743dc38db4a0a73f9f5b756868dba4
+EBUILD rtl_433-20.02_p20200922.ebuild 1064 BLAKE2B 00aca84b3bb114c63e95dd015ed2905fd9e88cca4ff36dae773a0b82584bf6fe5ab14ee4f8909b1fd42d6acd27aed51b44c592983831759c1b60f814575f216e SHA512 e603a15c4362e40ca20cbd3adfd9318cab22e24618039a776ce81357ae88584eac6c6bce2225b1885d3cb94496c75e7bdd873bf97fe623432f76282373409604
+EBUILD rtl_433-9999.ebuild 1064 BLAKE2B 00aca84b3bb114c63e95dd015ed2905fd9e88cca4ff36dae773a0b82584bf6fe5ab14ee4f8909b1fd42d6acd27aed51b44c592983831759c1b60f814575f216e SHA512 e603a15c4362e40ca20cbd3adfd9318cab22e24618039a776ce81357ae88584eac6c6bce2225b1885d3cb94496c75e7bdd873bf97fe623432f76282373409604
+MISC metadata.xml 483 BLAKE2B 9e8acd25e8e0234d628267907ac17b9613349d9263a2b59dee400cb6a0fa202e4e9373dbb65fb05fd53ca03ac2734b8bec78d3dfecac652d401fa79508d2cff4 SHA512 a040362e74c0d7f41185d0d4d45d2e3055151090276d77647f47d41031487d8648fdc727fb61b283cf415737ed9fd0bd1753c594138582866e67b662b0c78222
diff --git a/net-wireless/rtl_433/metadata.xml b/net-wireless/rtl_433/metadata.xml
index 0d857348a304..2d1d33ef0ae0 100644
--- a/net-wireless/rtl_433/metadata.xml
+++ b/net-wireless/rtl_433/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <use>
     <flag name="rtlsdr">Build with Realtek RTL2832U (rtlsdr) support</flag>
-    <flag name="soapy">Build with SoapySDR support</flag>
+    <flag name="soapysdr">Build with SoapySDR support</flag>
   </use>
   <upstream>
     <remote-id type="github">merbanan/rtl_433</remote-id>
diff --git a/net-wireless/rtl_433/rtl_433-0.1_p20190709-r1.ebuild b/net-wireless/rtl_433/rtl_433-0.1_p20190709-r1.ebuild
deleted file mode 100644
index b952620e854e..000000000000
--- a/net-wireless/rtl_433/rtl_433-0.1_p20190709-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Decode OOK modulated signals"
-HOMEPAGE="https://github.com/merbanan/rtl_433"
-if [[ $PV == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/merbanan/rtl_433"
-	KEYWORDS=""
-else
-	COMMIT="496f82b54b8957dbdd1bb60a080aeccfd31da73e"
-	SRC_URI="https://github.com/merbanan/rtl_433/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+rtlsdr soapy"
-
-DEPEND="rtlsdr? ( net-wireless/rtl-sdr:= )
-	soapy? ( net-wireless/soapysdr:= )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DENABLE_RTLSDR="$(usex rtlsdr)"
-		-DENABLE_SOAPYSDR="$(usex soapy)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	mv "${ED}/usr/etc" "${ED}/" || die
-}
diff --git a/net-wireless/rtl_433/rtl_433-20.02_p20200327.ebuild b/net-wireless/rtl_433/rtl_433-20.02_p20200922.ebuild
index 610e9924f290..c5ce6b6c42a2 100644
--- a/net-wireless/rtl_433/rtl_433-20.02_p20200327.ebuild
+++ b/net-wireless/rtl_433/rtl_433-20.02_p20200922.ebuild
@@ -11,9 +11,8 @@ HOMEPAGE="https://github.com/merbanan/rtl_433"
 if [[ $PV == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/merbanan/rtl_433"
-	KEYWORDS=""
 else
-	COMMIT="f82c02561dcde055143903d0f65257eb3211d45b"
+	COMMIT="105342a33271bac6837d06aa86c23eec9e9ecb6a"
 	SRC_URI="https://github.com/merbanan/rtl_433/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
 	#SRC_URI="https://github.com/merbanan/rtl_433/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -22,17 +21,17 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+rtlsdr soapy"
+IUSE="+rtlsdr soapysdr"
 
 DEPEND="rtlsdr? ( net-wireless/rtl-sdr:=
 			virtual/libusb:1 )
-	soapy? ( net-wireless/soapysdr:= )"
+	soapysdr? ( net-wireless/soapysdr:= )"
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
 		-DENABLE_RTLSDR="$(usex rtlsdr)"
-		-DENABLE_SOAPYSDR="$(usex soapy)"
+		-DENABLE_SOAPYSDR="$(usex soapysdr)"
 	)
 	cmake-utils_src_configure
 }
diff --git a/net-wireless/rtl_433/rtl_433-9999.ebuild b/net-wireless/rtl_433/rtl_433-9999.ebuild
index 610e9924f290..c5ce6b6c42a2 100644
--- a/net-wireless/rtl_433/rtl_433-9999.ebuild
+++ b/net-wireless/rtl_433/rtl_433-9999.ebuild
@@ -11,9 +11,8 @@ HOMEPAGE="https://github.com/merbanan/rtl_433"
 if [[ $PV == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/merbanan/rtl_433"
-	KEYWORDS=""
 else
-	COMMIT="f82c02561dcde055143903d0f65257eb3211d45b"
+	COMMIT="105342a33271bac6837d06aa86c23eec9e9ecb6a"
 	SRC_URI="https://github.com/merbanan/rtl_433/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
 	#SRC_URI="https://github.com/merbanan/rtl_433/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -22,17 +21,17 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+rtlsdr soapy"
+IUSE="+rtlsdr soapysdr"
 
 DEPEND="rtlsdr? ( net-wireless/rtl-sdr:=
 			virtual/libusb:1 )
-	soapy? ( net-wireless/soapysdr:= )"
+	soapysdr? ( net-wireless/soapysdr:= )"
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	mycmakeargs=(
 		-DENABLE_RTLSDR="$(usex rtlsdr)"
-		-DENABLE_SOAPYSDR="$(usex soapy)"
+		-DENABLE_SOAPYSDR="$(usex soapysdr)"
 	)
 	cmake-utils_src_configure
 }