gentoo resync : 29.12.2022

4 files changed, 85 insertions, 12 deletions

diff --git a/net-wireless/rtl-sdr/Manifest b/net-wireless/rtl-sdr/Manifest
index 9d587d84050d..6c001aaa4423 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -1,6 +1,8 @@
+AUX rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch 423 BLAKE2B 885b014e776f0342d147e066b879d251a99850f86c907f573e7c89364bf04b2103de95c66c866dd6572c71ab91506760e72e9fb5a7777dcb637c3062562c061c SHA512 f559e5d72b36f9abe689e4726fb6b0b1ab571796acbca02d8b49d5e568f567fbd73579c3b8f0cfe343cd442dc7141d7743f9ba0a795f66e791239f65cb4859d0
 AUX rtl_tcp.confd 138 BLAKE2B 04df300f0add96490ab861d99301b53ae45d414891f808780f79ef7c6c1cd7b0a48696510933b0cb8fc04c65ef4b2cd23109bcf266472225a8ee4a2ff430d404 SHA512 48324164cc7adab2e7c7f44b45a3a590ef9bcb161b4f6b22a94b4c4abf989b353a37c7b28ad1d81ffdff96dda84c10ba36bc9948f70a6b1f1c767394dc03ab77
 AUX rtl_tcp.initd 483 BLAKE2B 1e2feb9f481677792319b60fa99d0a2ed5c4a489c85c97a3a0e54e65fc8fe0c4b1ed8c1c6d4ea5991736fa232d26bb17b3e31fa8e6d01c111ec4ccae4c9df924 SHA512 7ac01b0568b1c12e906ae0d102708070b9aacca97d590b61d80125dac9f84587438fe5b582765552d37b0a9b730e00fca8894f8d5ff0c6a518fa2fb5dd4fb407
 DIST rtl-sdr-0.6.0_p2020802.tar.gz 134107 BLAKE2B 18ff8fe93a0dfaa20614924c7f951b2e7ffbccb4e5a2ebb6af698321ceaeba5012e6b88be03c7ff4c7b5cd45ec8df2baaa4ae55b813cdf448d895877a6757f47 SHA512 355af98a887a978794b562aa8ef78c91d19c33a6d0eb5740eb3a9b1e1329f8b11ca688eebc81a2d61440972ba5121225205de7165a22882a7e32cf6608888f25
+EBUILD rtl-sdr-0.6.0_p2020802-r1.ebuild 1583 BLAKE2B 13adcf9c4fd65c18800e0177fb4be3c20721d4b8b1705db6e6ab092cfae23aefca0b7e7b228c935f06d39e933c7d682564dc3cc27a8d0187527fde52f196080e SHA512 b921b52eacca787c5fc5add6d1a5e31b2cc58d5a57bc0a2a863d7f7c35e27f5b6748600cba28dd4241ce4fcb8651b19ef596568bbc5d07093f81d8b690c2d0c5
 EBUILD rtl-sdr-0.6.0_p2020802.ebuild 1597 BLAKE2B bacdcdada679b958ec906cce9e50d79007a247bbec5a4222aa51d57b453de3c6516e95b07b9996057371522ac9ef04c51a021ce4cedb5dfd54a987f108c34ff8 SHA512 66509ad51b2ac62490257901eb919a50617204f158bb21fe5b0370e194232e9b2ed2c11f8af3b96d5b23111f6e516c46dfcbcc135bb5f6d740c42485100935a7
-EBUILD rtl-sdr-9999.ebuild 1603 BLAKE2B 33a129066b5b6b9c137f49b43912f81a5c477d443cf7fd58f3f6a3181689c421080960a4cd30ada8f77a2682011e9f2af022871d49445fd3b858b85f8f68f3f2 SHA512 17aea001e8fe4a4259161051f7125daefaaa13da4b77c0e10a8696874c390415fda5de68cb7e2f145d5fb0eaf1d91204982736325124021cdb5ec38693bc61d7
+EBUILD rtl-sdr-9999.ebuild 1583 BLAKE2B 13adcf9c4fd65c18800e0177fb4be3c20721d4b8b1705db6e6ab092cfae23aefca0b7e7b228c935f06d39e933c7d682564dc3cc27a8d0187527fde52f196080e SHA512 b921b52eacca787c5fc5add6d1a5e31b2cc58d5a57bc0a2a863d7f7c35e27f5b6748600cba28dd4241ce4fcb8651b19ef596568bbc5d07093f81d8b690c2d0c5
 MISC metadata.xml 327 BLAKE2B c850854368e94999292623351c2b09508b49ff74cf8a3cde1872340347a07766ead3427ab6445fde90788e1a0b264a53829114633c515d4b0b30713a65a3739e SHA512 7770f1736d4207f81194646409e8a971c4ee97a9b2285eb67aef37bc7ec1002191e775ee7b489726580f86b5be8d8d8d8f82e84b37fb480c364c29e5e77f683c
diff --git a/net-wireless/rtl-sdr/files/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch b/net-wireless/rtl-sdr/files/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch
new file mode 100644
index 000000000000..b71454b87828
--- /dev/null
+++ b/net-wireless/rtl-sdr/files/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cc39bc3..4833602 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -160,7 +160,7 @@ ENDIF(CMAKE_CROSSCOMPILING)
+ set(prefix "${CMAKE_INSTALL_PREFIX}")
+ set(exec_prefix \${prefix})
+ set(includedir \${prefix}/include)
+-set(libdir \${exec_prefix}/lib)
++set(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR})
+ 
+ CONFIGURE_FILE(
+     ${CMAKE_CURRENT_SOURCE_DIR}/librtlsdr.pc.in
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild
new file mode 100644
index 000000000000..b00901863baa
--- /dev/null
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.6.0_p2020802-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
+HOMEPAGE="https://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 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+zerocopy"
+
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch
+)
+
+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 4f87f3a82cdd..b00901863baa 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake multilib
+inherit cmake
 
-DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
+DESCRIPTION="Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
 HOMEPAGE="https://sdr.osmocom.org/trac/wiki/rtl-sdr"
 
 if [[ ${PV} == 9999* ]]; then
@@ -31,13 +31,9 @@ IUSE="+zerocopy"
 DEPEND="virtual/libusb:1"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
+PATCHES=(
+	"${FILESDIR}"/rtl-sdl-0.6.0_p2020802-fix-pkgconfig-libdir.patch
+)
 
 src_prepare() {
 	sed -i 's#VERSION_INFO_PATCH_VERSION git#VERSION_INFO_PATCH_VERSION 0_p20200802#' CMakeLists.txt