gentoo resync : 20.10.2021

4 files changed, 157 insertions, 2 deletions

diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index 3c4736b8bfbe..ae220792fcfd 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -1,10 +1,13 @@
 AUX dump1090-5.0-32bit-fix.patch 610 BLAKE2B cca8cab42380856503831c59cfec13f996132869ea4263594acf6966a96a8d99f1b1c936106c6d74b1a741a83afa121abe4fbebe7129ef3c29b8278739e38717 SHA512 f6d404a0e814e8f1f1cfe8a8d17ed93cf6586d3434130b4adad8c096ad37ca2280d86df8331766f2a8bac793f13c937d0d0de6c6c43a74ce055be4be4b5e2ee7
+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 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 2584 BLAKE2B ee5aa34518399253f157b2cbd3c119248d1816421368e7cbd73c9d9c5872b4fb72f1fcd2ef7aa09bb51e859b72256076db0ddd67ce45ecf389f8a0f5888b6797 SHA512 4ad7981ce1f041f4b91313e3b0bef8bf2c60bc1b2e8d3cd17ee4820330eeb6fe7c4c8f24d41616a87407dd67571dc4eb780a95a56178b72a764d964a38ee8702
+EBUILD dump1090-5.0.ebuild 2626 BLAKE2B dececa48e1b48005a4855cd056977490a1e0d6bdc412463b777ad006e3c96f74648e17362801b74ee9b751e38d58ff184390bd3c1142f8699b909677fc25c73d SHA512 36765019ee228703a9fc6798323323cf685a5647c8bac66557e095203b7e3ea3042ef8e7ee62f0d8897a53d09e5f90120a4a642ed4a2c0fb1e6b434a4dd513c1
+EBUILD dump1090-6.1.ebuild 2535 BLAKE2B 5560a564b3dbf4e3d89441afa783aa9f00e463dc68e11a3f6036ee18e81844477f3aaa79330ac61da5c381f81f355bd67e90e4b70e2fa987eb52d317ce555cd4 SHA512 e4f883236856a078c28fadddab095a2da894ad165ff0a200fdefd94b33dc3b1d54c0afc8942ae36fdfb1683e48ff977cc1fc0b8dd03703be8ec6d069abc49743
 EBUILD dump1090-9999.ebuild 2535 BLAKE2B 5560a564b3dbf4e3d89441afa783aa9f00e463dc68e11a3f6036ee18e81844477f3aaa79330ac61da5c381f81f355bd67e90e4b70e2fa987eb52d317ce555cd4 SHA512 e4f883236856a078c28fadddab095a2da894ad165ff0a200fdefd94b33dc3b1d54c0afc8942ae36fdfb1683e48ff977cc1fc0b8dd03703be8ec6d069abc49743
 MISC metadata.xml 658 BLAKE2B 6dd0aec90915a420b69849188a8b29211db8cad5824442d4c1d1c07cf1bd88c4d477a3fa35481b745c2dbfd7ea1c8459751cc2c037932430d230a6f24ccfbb64 SHA512 fb0c280c0bf81c614f91ff9a4dad532ac61db9419c48e335e86ed37a592183fd8181fe0f6ade7e165a16e734b1be50b05db57efc1f1b27c01ec38be68565a61d
diff --git a/net-wireless/dump1090/dump1090-5.0.ebuild b/net-wireless/dump1090/dump1090-5.0.ebuild
index 9c76ce811944..00364313d593 100644
--- a/net-wireless/dump1090/dump1090-5.0.ebuild
+++ b/net-wireless/dump1090/dump1090-5.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
@@ -30,6 +30,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}-32bit-fix.patch"
+	"${FILESDIR}/${P}-further-32bit-fix.patch"
 )
 
 src_prepare() {
diff --git a/net-wireless/dump1090/dump1090-6.1.ebuild b/net-wireless/dump1090/dump1090-6.1.ebuild
new file mode 100644
index 000000000000..04ee546dcf91
--- /dev/null
+++ b/net-wireless/dump1090/dump1090-6.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit tmpfiles toolchain-funcs
+
+DESCRIPTION="simple Mode S decoder for RTLSDR devices"
+HOMEPAGE="https://github.com/flightaware/dump1090"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="bladerf hackrf +rtlsdr minimal"
+
+DEPEND="
+	sys-libs/ncurses:=[tinfo]
+	bladerf? ( net-wireless/bladerf:= virtual/libusb:1 )
+	hackrf? ( net-libs/libhackrf:= virtual/libusb:1 )
+	rtlsdr? ( net-wireless/rtl-sdr:= virtual/libusb:1 )"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	sed -i -e '/CFLAGS/s# -O3 -g -Wall -Wmissing-declarations -Werror -W # #' Makefile || die
+	sed -i -e "/LIBS_CURSES/s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		BLADERF=$(usex bladerf) \
+		RTLSDR=$(usex rtlsdr) \
+		HACKRF=$(usex hackrf) \
+		CPUFEATURES=yes \
+		LIMESDR=no
+}
+
+src_install() {
+	dobin ${PN}
+	dobin view1090
+	dodoc README.md README-json.md
+	# DSP config for bladerf
+	if use bladerf; then
+		insinto usr/share/${PN}/bladerf
+		doins bladerf/*
+	fi
+
+	newtmpfiles "${FILESDIR}"/tmpfilesd-dump1090-5.0.conf ${PN}.conf
+	newconfd "${FILESDIR}"/dump1090-5.0.confd ${PN}
+	newinitd "${FILESDIR}"/dump1090-5.0.initd ${PN}
+
+	if use !minimal; then
+		insinto /usr/share/${PN}
+		doins -r tools
+
+		# Some tooling expects the -fa variant directory to contain the files
+		dosym ../../usr/share/${PN} /usr/share/dump1090-fa
+
+		# Older HTML
+		insinto /usr/share/${PN}/html
+		doins -r public_html/*
+		# Newer HTML
+		insinto /usr/share/skyaware/html
+		doins -r public_html_merged/*
+
+		# One of these this should be included into other lighttpd configs
+		insinto /usr/share/${PN}/lighttpd
+		# Old style:
+		doins debian/lighttpd/89-dump1090-fa.conf
+		doins debian/lighttpd/88-dump1090-fa-statcache.conf
+		# New style:
+		doins debian/lighttpd/89-skyaware.conf
+
+		# See README.md for how to use custom wisdom files
+		exeinto /usr/share/${PN}/wisdom
+		doexe debian/generate-wisdom
+		insinto /usr/share/${PN}/wisdom
+		doins wisdom.*
+		doins wisdom/wisdom.*
+		# For /etc/dump1090-fa/wisdom.local
+		keepdir /etc/dump1090-fa/
+
+		# Tooling to generate custom wisdom:
+		exeinto /usr/libexec/${PN}
+		doexe starch-benchmark
+	fi
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-wireless/dump1090/files/dump1090-5.0-further-32bit-fix.patch b/net-wireless/dump1090/files/dump1090-5.0-further-32bit-fix.patch
new file mode 100644
index 000000000000..bfcea2e4f88f
--- /dev/null
+++ b/net-wireless/dump1090/files/dump1090-5.0-further-32bit-fix.patch
@@ -0,0 +1,52 @@
+https://github.com/flightaware/dump1090/commit/462dee56f3a339bc4d83fea264fe89a1ced5bd22.patch
+https://github.com/flightaware/dump1090/commit/455896e86db84d10a197f5a3f88d13c0539ad470.patch
+https://bugs.gentoo.org/818130
+
+From 462dee56f3a339bc4d83fea264fe89a1ced5bd22 Mon Sep 17 00:00:00 2001
+From: Oliver Jowett <oliver.jowett@flightaware.com>
+Date: Sat, 13 Mar 2021 12:49:40 +0800
+Subject: [PATCH] Fix builds on 32-bit x86
+
+---
+ Makefile.cpufeatures | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures
+index 099714e08..12377ad81 100644
+--- a/Makefile.cpufeatures
++++ b/Makefile.cpufeatures
+@@ -17,7 +17,11 @@ ifeq ($(CPUFEATURES_UNAME),Darwin)
+   CPUFEATURES_CFLAGS += -DHAVE_SYSCTLBYNAME
+ endif
+ 
+-ifeq ($(CPUFEATURES_ARCH), x86_64)
++ifeq ($(CPUFEATURES_ARCH),x86_64)
++  CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o
++endif
++
++ifneq ($(filter-out $(CPUFEATURES_ARCH),i%86),)
+   CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o
+ endif
+ 
+From 455896e86db84d10a197f5a3f88d13c0539ad470 Mon Sep 17 00:00:00 2001
+From: Oliver Jowett <oliver.jowett@flightaware.com>
+Date: Wed, 17 Mar 2021 02:21:18 +0800
+Subject: [PATCH] Fix broken 32-bit x86 test that broke builds on non-x86
+
+---
+ Makefile.cpufeatures | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures
+index 12377ad81..8c3b8418d 100644
+--- a/Makefile.cpufeatures
++++ b/Makefile.cpufeatures
+@@ -21,7 +21,7 @@ ifeq ($(CPUFEATURES_ARCH),x86_64)
+   CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o
+ endif
+ 
+-ifneq ($(filter-out $(CPUFEATURES_ARCH),i%86),)
++ifneq (,$(filter i%86,$(CPUFEATURES_ARCH)))
+   CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o
+ endif
+