gentoo resync : 16.09.2020

3 files changed, 80 insertions, 3 deletions

diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index 9b58f3508d2f..9bcd627a6b6e 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -3,8 +3,10 @@ AUX rtl_tcp.initd 483 BLAKE2B 1e2feb9f481677792319b60fa99d0a2ed5c4a489c85c97a3a0
 DIST rtl-sdr-0.5.3_p20170919.tar.xz 98972 BLAKE2B fb7d977bd05a2c717897ba58a2242698d1a90cf38a7a8340d7ec8c3aefeeff49bfe9612285253b27c6726ae584172e0b26c8f535bc4bec704958c1296e232f04 SHA512 b1b97c720882ccbe8be8e30af28b8d52c5a27507861bdb9e964e153cd8ece9de977abd271b68861c163a7cf239044f28c8d17ccda5ff5acf60f17d839d782a82
 DIST rtl-sdr-0.5.4.tar.xz 108708 BLAKE2B 12f5f5a913089ec57327621eddab9b74b07cccceeac9d00ab2cbd413bc29d8444633953319e2887ef5e07a766f38b4ea2f5d3cbf73efd63a1886e30e2bed6968 SHA512 6cf3c62e6a56694f90deed64e2761105fdbeb40de8001a378e687d60cc3718ad64065b5d896b3f4b27ff6a5383173b53df52816e24b31c726485364cfd9c1a43
 DIST rtl-sdr-0.6.0.tar.gz 134289 BLAKE2B a630ceea359c49170c04bc6bb2a01b481e40b4529ed3d2c924d0370399bb149c47f751929716fa4c86fac9776d26584696ece7a5f83a428b300ccbed243d0ffd SHA512 a08356a08672f03d86adb662e28923e7998b78c0f49432dc1b1e3844976158c467242e0c5eabf206fd257bdebcf91cd2767dabf13d2ef475f2f3e1d82e23ed75
+DIST rtl-sdr-0.6.0_p2020802.tar.gz 134107 BLAKE2B 18ff8fe93a0dfaa20614924c7f951b2e7ffbccb4e5a2ebb6af698321ceaeba5012e6b88be03c7ff4c7b5cd45ec8df2baaa4ae55b813cdf448d895877a6757f47 SHA512 355af98a887a978794b562aa8ef78c91d19c33a6d0eb5740eb3a9b1e1329f8b11ca688eebc81a2d61440972ba5121225205de7165a22882a7e32cf6608888f25
 EBUILD rtl-sdr-0.5.3_p20170919.ebuild 1142 BLAKE2B 1321119ae94c5c89a8912dde134ee7890b987c70cafa61617f0118fa596cab58485f3fbf51b3f6ebfce819eb50b281606adfb36cbea12497ea02cbc7a0e053d2 SHA512 043448e7787215446c27eb1e264e7c18f463f829ae162dd23ede268c3664ed0073fac4c6f3c30c77902cf421bf535eee83a585575b980c1fafc9119809cbe9a1
 EBUILD rtl-sdr-0.5.4.ebuild 1149 BLAKE2B 3690e4cfd90271b6b49a0f453b0a1e290e096e432f42621cfd3a97aebcd0050a4a4cbc69334c6906eed637c3814bdb554e97edf997d116618715af8c1673f7b1 SHA512 08d4f453f18be3c631b54ca11f0042c60163182f25bcb335148d32978a64280f116d61fed6fa0bff8efc94acc09b901c87a89e3a93bfb6d7f24e8936ccd24411
 EBUILD rtl-sdr-0.6.0-r1.ebuild 1180 BLAKE2B 52cafed14f3ffadadfe80fc939bde5798eb93ceac4a7d050e1f03c5a1ece453f646619181476f0074752c24e6437ab218b92fe4c7531ef96cd38525e09ec9938 SHA512 d30cbb5fe9ab5c80a2eb44a53e875bb6042ad5352f5418cab1e2097197b94d15ffd1d8dd7e973891571258912562dab6c85b6a848e384c72c3fd7b0b6b4af395
-EBUILD rtl-sdr-9999.ebuild 1269 BLAKE2B c64ffc27db5f0eebe6423f96717ac2eb7ea3ce56ed374e4f1e5685ea738c5745f2498843795e7b0d93a4790c585a67a4b9520a22c32862b25a6d729a7f37d4a8 SHA512 01e3c7ba4e964fa48411a6a66aa1b631cb25ab102df693ec5859a8ee10b8f7966fe1d89260fe83c09a65d0752e8e60bdaa4b5512f176824af69a0f41b3772d04
+EBUILD rtl-sdr-0.6.0_p2020802.ebuild 1583 BLAKE2B 0b4b10624672aa7496f0b8a4542ab0754869f167b62c664ea190e980fc1f4b6d59ff6ac384867df28243586ccccaa723ae3382c4b8ca6b1bab2d140005c613a5 SHA512 c2d06c9b5073fa9f28120c02eff2689193db47fa0dd202b2c76cd2c61f7b047515cb68c82f2da0a90a39e9af5b14eef29879d823d4e09aeead017a80b67bb557
+EBUILD rtl-sdr-9999.ebuild 1583 BLAKE2B 0b4b10624672aa7496f0b8a4542ab0754869f167b62c664ea190e980fc1f4b6d59ff6ac384867df28243586ccccaa723ae3382c4b8ca6b1bab2d140005c613a5 SHA512 c2d06c9b5073fa9f28120c02eff2689193db47fa0dd202b2c76cd2c61f7b047515cb68c82f2da0a90a39e9af5b14eef29879d823d4e09aeead017a80b67bb557
 MISC metadata.xml 326 BLAKE2B bc05ca32a96bfdc2221a30c9214fddbf4c4616e2f79b97fb8ee6f0fc875c1934452cf8bbfe513c184addfeed36c007c4b5e78e08a0e1003b24396149460ee03c SHA512 df8ab517f535f57ae6ebecbecd33f49ecc83a4d0446020f9e40f4a43eb86b5f1cb279a4c356a09986c8dc8497ae2a5f309ae21cd8797ac5d1f546a785727ee1d
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild
new file mode 100644
index 000000000000..f119f1ec187a
--- /dev/null
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multilib
+
+DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
+HOMEPAGE="http://sdr.osmocom.org/trac/wiki/rtl-sdr"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://git.osmocom.org/${PN}"
+else
+	#git clone https://git.osmocom.org/rtl-sdr
+	#cd rtl-sdr
+	#git archive --format=tar --prefix=rtl-sdr-${PV}/ master | xz > ../rtl-sdr-${PV}.tar.xz
+	#SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+
+	COMMIT="ed0317e6a58c098874ac58b769cf2e609c18d9a5"
+	SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+zerocopy"
+
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	sed -i 's#VERSION_INFO_PATCH_VERSION git#VERSION_INFO_PATCH_VERSION 0_p20200802#' CMakeLists.txt
+	cmake_src_prepare
+}
+
+src_configure() {
+	#the udev rules are 666, we don't want that
+	mycmakeargs=(
+		-DINSTALL_UDEV_RULES=OFF
+		-DDETACH_KERNEL_DRIVER=ON
+		-DENABLE_ZEROCOPY="$(usex zerocopy)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newinitd "${FILESDIR}"/rtl_tcp.initd rtl_tcp
+	newconfd "${FILESDIR}"/rtl_tcp.confd rtl_tcp
+}
+
+pkg_postinst() {
+	elog "Only users in the usb group can capture."
+	elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login."
+}
diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
index f404f170f4f4..f119f1ec187a 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
@@ -16,8 +16,12 @@ else
 	#git clone https://git.osmocom.org/rtl-sdr
 	#cd rtl-sdr
 	#git archive --format=tar --prefix=rtl-sdr-${PV}/ master | xz > ../rtl-sdr-${PV}.tar.xz
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	#SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
+
+	COMMIT="ed0317e6a58c098874ac58b769cf2e609c18d9a5"
+	SRC_URI="https://github.com/osmocom/rtl-sdr/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${COMMIT}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -35,6 +39,11 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	sed -i 's#VERSION_INFO_PATCH_VERSION git#VERSION_INFO_PATCH_VERSION 0_p20200802#' CMakeLists.txt
+	cmake_src_prepare
+}
+
 src_configure() {
 	#the udev rules are 666, we don't want that
 	mycmakeargs=(