gentoo resync : 11.07.2019

4 files changed, 47 insertions, 13 deletions

diff --git a/net-wireless/rtl_433/Manifest b/net-wireless/rtl_433/Manifest
index 227516ba198d..10c6c7bf4548 100644
--- a/net-wireless/rtl_433/Manifest
+++ b/net-wireless/rtl_433/Manifest
@@ -1,4 +1,4 @@
-DIST rtl_433-0.1_p20180223.tar.gz 228857 BLAKE2B a2fc4e49ce62a5908426fa8a35b0f305c1b09ac62c4f0e299141d1bd85c5c48824868197244307797a21e9919c284d04d6f981ed66c4c11745c7ce1772aebb8b SHA512 68a36159eadf9180969e8ad587db553829cd77d0d9c7226d29a32e39867387025a8ff373a0cf553aec07243685510ec3dbecedfcb96970e379265cd3def7a674
-EBUILD rtl_433-0.1_p20180223.ebuild 627 BLAKE2B 28851aa475ecd4bfdb0cc84dd180dac310707a717fc25e74c61625fcc5eab8b16cdd08feb3717599a77952b0c03418a4ac0cfa160e4124d1d604e5f74205fa70 SHA512 0e77df60f3def863548485c9d25c2acc5d46249c5347d029510cbb2f78feb31cfa68e4348fff5b8d1e71c6eb8e36fb6f1fe5d5c49f702603b7a56a597fc2576e
-EBUILD rtl_433-9999.ebuild 612 BLAKE2B b9cb21176f1c5e851d4996d14eca6aa9e064c8c38c154ff86084ac3b6ecbace94f2ddfddbd4133f47a4b2a4c1755b791c207a30b7331a4aec07a6f5b7b4f26f2 SHA512 9871a0a51d4106c5d6f052bf8ac675f33a70ac2fc45e875f954c88d598bcedf15ebe54d19ec908e4923e25b18ea51ddab6c3e16802ebe7cebc1b98355c1b56ec
-MISC metadata.xml 329 BLAKE2B beaa09efbaecc4e65a2b82f94eda432b93182b63afbd7879f053911c7a935741577e99929d5247bfa921c51bc40746e0b73ba7c45c09aaa6edc6fe93d4028b6a SHA512 1af5cd3514c72c9e8e676a8c09a47ffeb17a1ea24a765e0701b26b1f89af35673f1d7f160cbf3021fe108c935d81870a72147bbcc5a76f2b325a854337640b98
+DIST rtl_433-0.1_p20190709.tar.gz 718424 BLAKE2B f7acd89013114c7d357edfc4610be8a7405feac11843dcb1bc7fefe81556a3b09ee26622dd58d68afb3d99840db8e997dbbc66cccda53a34964b32bac352462c SHA512 d36757a567c7696b150b03a1e09fda74f7a4ec454bc1b5658e4a6b22370de5c102a152257d436c87f0ddff325c17b0e9b8afbae0dc3e82ab04111d78a728a590
+EBUILD rtl_433-0.1_p20190709.ebuild 979 BLAKE2B ca2a7b4d1235b6d7a52ce0831017c45bc302e821fe74f9c4bdfbf5e615acf05aadd4dbae8f8e633a87bbb37c87007da97b10fa3259f6619499d3c0dd2739b4ab SHA512 e50b24fa1e953b24cb43344e4bbe1a92005ad5469386b06d23698688ff2bad3f0cdc3ebd734db0c492b7f3b1c064a3bcd95194db173606f5394e9a0d993bda31
+EBUILD rtl_433-9999.ebuild 979 BLAKE2B ca2a7b4d1235b6d7a52ce0831017c45bc302e821fe74f9c4bdfbf5e615acf05aadd4dbae8f8e633a87bbb37c87007da97b10fa3259f6619499d3c0dd2739b4ab SHA512 e50b24fa1e953b24cb43344e4bbe1a92005ad5469386b06d23698688ff2bad3f0cdc3ebd734db0c492b7f3b1c064a3bcd95194db173606f5394e9a0d993bda31
+MISC metadata.xml 470 BLAKE2B d7862ab9d869d528eb0a52b46fc97cc3e71c3cee98dfd1adb3f98e858d6797795c71273333bbc67ca643ff3d49b72b2aa3e40ed773ec80dd56e3a30a4f63c6a0 SHA512 aff0e462a7753d570fd4e539d070367a71faea2c373711bccde042918cc2f801b305839110408c0659706d6359fe541265acb79b5f1fa806c6ad15a5434fd900
diff --git a/net-wireless/rtl_433/metadata.xml b/net-wireless/rtl_433/metadata.xml
index 5437f3ff41b1..56e3f6727b94 100644
--- a/net-wireless/rtl_433/metadata.xml
+++ b/net-wireless/rtl_433/metadata.xml
@@ -5,6 +5,10 @@
     <email>radio@gentoo.org</email>
     <name>Radio</name>
   </maintainer>
+<use>
+	<flag name="rtlsdr">Build with Realtek RTL2832U (rtlsdr) support</flag>
+	<flag name="soapy">Build with SoapySDR support</flag>
+</use>
   <upstream>
     <remote-id type="github">merbanan/rtl_433</remote-id>
   </upstream>
diff --git a/net-wireless/rtl_433/rtl_433-0.1_p20180223.ebuild b/net-wireless/rtl_433/rtl_433-0.1_p20190709.ebuild
index a7c363904f68..b983719b12b8 100644
--- a/net-wireless/rtl_433/rtl_433-0.1_p20180223.ebuild
+++ b/net-wireless/rtl_433/rtl_433-0.1_p20190709.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ $PV == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/merbanan/rtl_433"
 	KEYWORDS=""
 else
-	COMMIT="51d275cd08c517d5445b568bf9c2f1b4103bec9f"
+	COMMIT="496f82b54b8957dbdd1bb60a080aeccfd31da73e"
 	SRC_URI="https://github.com/merbanan/rtl_433/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${COMMIT}"
 	KEYWORDS="~amd64 ~x86"
@@ -20,7 +20,22 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
+IUSE="+rtlsdr soapy"
 
-DEPEND="net-wireless/rtl-sdr:="
+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
+	mv "${ED}/etc/${PN}/${PN}.example.conf" "${ED}/etc/${PN}/${PN}.conf" || die
+}
diff --git a/net-wireless/rtl_433/rtl_433-9999.ebuild b/net-wireless/rtl_433/rtl_433-9999.ebuild
index 04955a8a9d01..b983719b12b8 100644
--- a/net-wireless/rtl_433/rtl_433-9999.ebuild
+++ b/net-wireless/rtl_433/rtl_433-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,15 +12,30 @@ if [[ $PV == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/merbanan/rtl_433"
 	KEYWORDS=""
 else
-	COMMIT="51d275cd08c517d5445b568bf9c2f1b4103bec9f"
-	SRC_URI="https://github.com/merbanan/rtl_433/archive/${COMMIT}.tar.gz"
+	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=""
+IUSE="+rtlsdr soapy"
 
-DEPEND="net-wireless/rtl-sdr:="
+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
+	mv "${ED}/etc/${PN}/${PN}.example.conf" "${ED}/etc/${PN}/${PN}.conf" || die
+}