gentoo resync : 29.12.2022

3 files changed, 23 insertions, 2 deletions

diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index ae220792fcfd..b5eb04194966 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -2,12 +2,13 @@ AUX dump1090-5.0-32bit-fix.patch 610 BLAKE2B cca8cab42380856503831c59cfec13f9961
 AUX dump1090-5.0-further-32bit-fix.patch 1742 BLAKE2B 2cc502d6a88f4dd79a70efca538a8daaf9bbfa0cb122f7ae562943112b635ce19ca01197a4dce79bf0f81bbc5339f340534cfc6e7223510b6877c38f513212b1 SHA512 b3c3d3c8f63a1c3c149f5e44164c43b00d56829fe89a51ecbffc07fe201b7e88df9a49499c0d52add2f2a5d15f3ee80e7c4d287e863ca34453966487f2f7a587
 AUX dump1090-5.0.confd 927 BLAKE2B 144a8c2f51ba714b7c41a50ae58e893c1cfa2e9494a962c9033201c09fc889411b4b868b16934521709fe7402e593767be77ad6c43c0a4b4a9fba8b231756f58 SHA512 930267650aedb8012c2a92c1555d318789cf29ab42568109a9935a7d83a13fba4482cffff91b27062f74d9fde514e95060e0a53cb9438d39ede292ea9ca15b90
 AUX dump1090-5.0.initd 372 BLAKE2B f4e1ca0db565f56c104401b221af77966f499ad00f1fba5c804ee529fbc61fd75149c3d2d503d4a5e119784fcc10998ebbbad80cb09c1a27dba804a0d8a86c24 SHA512 0f9717d3f161658aefcd29f135bd3401bb539a0e83f40fdacf7326b48a96782d211dde1fc9237a822ee3d09a8b5b17ab22da63f6e93aceb526ff22c02eaa300e
+AUX dump1090-6.1-libdir.patch 586 BLAKE2B 20d358289b55e9f1ae11904b74035b8f1ba61061c741e7b71bf449350b255a630c1468b604f1ac98e02632346f26c5f8d7f34a00765e1b1a73dd232ab0a39e6d SHA512 470d8840b3da26f2bbb8be24f36ba17457a28d9b63080ea1483693b78e86ca38f69687a45209baf6767bac1e206bf62bd392024e9963926d4044fcf88e1fc5c6
 AUX tmpfilesd-dump1090-5.0.conf 212 BLAKE2B 081b8340377a40adbb3a9dfa87ede06729979ad50a138cb3caf6b0dac55203222df6c71714103c096b6fbdcd2b115dd2c40bd767b7e5ff1dd0360addc021882a SHA512 d44170620addbc3590d524ae540c38be31115d22f69fd55a075877ab482c0bbcdfe86e2eac3c3007c5476408c18623a0e179fadd2247beab01d1df296d7467b6
 DIST dump1090-4.0.tar.gz 6663754 BLAKE2B bf0a6c8dfd8b2da5ed0e7ae5f7b862c57a54e5d48bc24b29e42ebffec4e0606604fbe4b8502e85df60a3a618568bf9e2eba88e5ad2fdec7fb93043b823435362 SHA512 97dc872e4d0ac8df2f46e17b590e970a62a78baf81e18a9beeb23d37a4401a2e52591ca96cc01e1465b22aa234cf9e88f84a7b0f27d0144b3afeac62f6252c95
 DIST dump1090-5.0.tar.gz 10124422 BLAKE2B d6b26a444f73cccd002558b6863431537078e1fe9f61e4e240d4a5f06181b9ff713387aad623c2ee8257c2568bd4dd373746606c356ac3ff0f27f411d4949997 SHA512 1104982308db788993bf5dc130a5ca369c8bfaaae56cd5a435bbd22ed99b0633594789334d7f256bad2b288c4906923baf8bc73e2f7b7f9f52f7068b9b519142
 DIST dump1090-6.1.tar.gz 9879362 BLAKE2B 716c1abe6df7958fb5ec94c35ed6af75fdb6180a56cdfba72443a7b34d1614cede6ec29aaac22a1e15f31d05bf1d1971eebccdff21cf9442ae69617e7c535ae6 SHA512 5f20d52f1fda754e33774faab852252d802ae5da8694e768cbf92df56f7693cd2da788df9e0a422f1801603e62498fb0af0143f5ea3292e9d607296cd5983dc2
 EBUILD dump1090-4.0.ebuild 1250 BLAKE2B acd1dc457eced589b99528333cdbfa5bb0c29bacac3cb0eb18c6daaa902f3c5f498c7c6a6810c83f92155b87f6e3511fd87d1dff51fb46e462b48af47fa66948 SHA512 27c238ddb2d0d2223f1cbc286c0bf6860706d6ef6c76902af25c3c542deb6382ac71c5ab2f9b8576b2d0906633bd1acb72b6ba870f8cb62b9b353d96818cc5d9
 EBUILD dump1090-5.0.ebuild 2626 BLAKE2B dececa48e1b48005a4855cd056977490a1e0d6bdc412463b777ad006e3c96f74648e17362801b74ee9b751e38d58ff184390bd3c1142f8699b909677fc25c73d SHA512 36765019ee228703a9fc6798323323cf685a5647c8bac66557e095203b7e3ea3042ef8e7ee62f0d8897a53d09e5f90120a4a642ed4a2c0fb1e6b434a4dd513c1
-EBUILD dump1090-6.1.ebuild 2535 BLAKE2B 5560a564b3dbf4e3d89441afa783aa9f00e463dc68e11a3f6036ee18e81844477f3aaa79330ac61da5c381f81f355bd67e90e4b70e2fa987eb52d317ce555cd4 SHA512 e4f883236856a078c28fadddab095a2da894ad165ff0a200fdefd94b33dc3b1d54c0afc8942ae36fdfb1683e48ff977cc1fc0b8dd03703be8ec6d069abc49743
+EBUILD dump1090-6.1.ebuild 2586 BLAKE2B 8360ea1d8c8dee1320b39b9433c41c7a290f702f7ed32c4efd70cd0394eb98eef1c30068cf5f88aa27b7fde8a9829cb0e6b83e8a2733ef26ff55459ef1fae39b SHA512 4cfc533960815cdd2bae4c858be7788e2823a44c5d430f144bf3feebcdb43cab3dd9052c7d7e5ce866b3d5bcb749a768cf80f7df65bc217577a5f75a24846810
 EBUILD dump1090-9999.ebuild 2535 BLAKE2B 5560a564b3dbf4e3d89441afa783aa9f00e463dc68e11a3f6036ee18e81844477f3aaa79330ac61da5c381f81f355bd67e90e4b70e2fa987eb52d317ce555cd4 SHA512 e4f883236856a078c28fadddab095a2da894ad165ff0a200fdefd94b33dc3b1d54c0afc8942ae36fdfb1683e48ff977cc1fc0b8dd03703be8ec6d069abc49743
 MISC metadata.xml 658 BLAKE2B 6dd0aec90915a420b69849188a8b29211db8cad5824442d4c1d1c07cf1bd88c4d477a3fa35481b745c2dbfd7ea1c8459751cc2c037932430d230a6f24ccfbb64 SHA512 fb0c280c0bf81c614f91ff9a4dad532ac61db9419c48e335e86ed37a592183fd8181fe0f6ade7e165a16e734b1be50b05db57efc1f1b27c01ec38be68565a61d
diff --git a/net-wireless/dump1090/dump1090-6.1.ebuild b/net-wireless/dump1090/dump1090-6.1.ebuild
index 04ee546dcf91..0d8aaf94604b 100644
--- a/net-wireless/dump1090/dump1090-6.1.ebuild
+++ b/net-wireless/dump1090/dump1090-6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,6 +28,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1-libdir.patch
+)
+
 src_prepare() {
 	default
 	sed -i -e '/CFLAGS/s# -O3 -g -Wall -Wmissing-declarations -Werror -W # #' Makefile || die
diff --git a/net-wireless/dump1090/files/dump1090-6.1-libdir.patch b/net-wireless/dump1090/files/dump1090-6.1-libdir.patch
new file mode 100644
index 000000000000..b55fa95d2ea3
--- /dev/null
+++ b/net-wireless/dump1090/files/dump1090-6.1-libdir.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile b/Makefile
+index d4a5ff6..5d69505 100644
+--- a/Makefile
++++ b/Makefile
+@@ -99,9 +99,9 @@ ifeq ($(RTLSDR), yes)
+   ifdef RTLSDR_PREFIX
+     CPPFLAGS += -I$(RTLSDR_PREFIX)/include
+     ifeq ($(STATIC), yes)
+-      LIBS_SDR += -L$(RTLSDR_PREFIX)/lib -Wl,-Bstatic -lrtlsdr -Wl,-Bdynamic $(LIBS_USB)
++      LIBS_SDR += -Wl,-Bstatic -lrtlsdr -Wl,-Bdynamic $(LIBS_USB)
+     else
+-      LIBS_SDR += -L$(RTLSDR_PREFIX)/lib -lrtlsdr $(LIBS_USB)
++      LIBS_SDR += -lrtlsdr $(LIBS_USB)
+     endif
+   else
+     # some packaged .pc files are massively broken, try to handle it