gentoo new year resync : 01.01.2021

3 files changed, 70 insertions, 20 deletions

diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index 9e069e5e67a6..aabbeeb0fedd 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -1,4 +1,6 @@
 DIST dump1090-3.7.2.tar.gz 5657288 BLAKE2B 267374ec034ba5bb03989d04001f1ca82cfb5f2cb77af06d85c1d5f4446955ef84bdf60162c0c74e702266f8051a22fe15723dae9b26323c3f5cf03bf48342b7 SHA512 8958bc711b44c8c9f26242bdd4005a422498e023632bbb87f8e93de30b6fa20b6c6ab3208e7548a960c8c127e948d1bdf5e9d5ceaf84127ce9e686c6fad6cc1b
+DIST dump1090-4.0.tar.gz 6663754 BLAKE2B bf0a6c8dfd8b2da5ed0e7ae5f7b862c57a54e5d48bc24b29e42ebffec4e0606604fbe4b8502e85df60a3a618568bf9e2eba88e5ad2fdec7fb93043b823435362 SHA512 97dc872e4d0ac8df2f46e17b590e970a62a78baf81e18a9beeb23d37a4401a2e52591ca96cc01e1465b22aa234cf9e88f84a7b0f27d0144b3afeac62f6252c95
 EBUILD dump1090-3.7.2.ebuild 1543 BLAKE2B ef4ea5495cd0a264c993ba40bc0a2d564f497b56b8248dfbbb4323bb293159017ac729eb5e17bcdcecd7e56bd04a001a9613e6fc986e3d6b8932039bfccaf272 SHA512 d70dbea5cef1ea41cfbfa430f8800057e12f5bb2a265368d5e7b6310f5386e2a4ed042ed971738efc242df37e098228371c999cf7596bd179d38a48cf58efd6a
-EBUILD dump1090-9999.ebuild 1545 BLAKE2B f4ad78598d6b99c66fa7eb716ecdda2d2091fb1a3e3722d9922f961a6ed58f8ea699c98a1fab6e6fbb4c10a20630955648851defcbeffd9e028b94e74e9fdbe5 SHA512 bc82f2db887f9290883bc82948a43793f5c953fc77dd3bdfb9a58dd405d71444204421bbfaef7767120b46d26379cc1376e8bd30d6706b05f24ad72c9c51630f
+EBUILD dump1090-4.0.ebuild 1200 BLAKE2B f228e05164a56a0ab88d4db5adc12c14faa34b5229f419bbd24bdb1b107ab66bc1aab5b232990bdaef014dc1c11bd0923fa3805e3c5d3a41f7f083bb1aefb13d SHA512 a8b894977f7d26ac853d784bb72635f8a0354bc309ae13b0b3cb77bbdb23b06e877f9c26d3205136f5431f325f515d5ea20dc24c5ef19563cd087a2e32120620
+EBUILD dump1090-9999.ebuild 1177 BLAKE2B 9d7fc48eec212479ab0b5e8eff2ee88e7fa8764546da69a8df7efaea579a80ed21720ac7c6e6eb7588be68a7bcdbe6e5f0b4d1a7e2d62d3fd9de273313f655ba SHA512 8dade3337cd83b09b4cb7748464410bf1765a9af86d03ad57dad51a0c5b1937025631b8bc8cee89b94dccb03de27457a050f2c7e8bccbc4374141e4b84a67f04
 MISC metadata.xml 475 BLAKE2B 65a7e4651f29eabc99e389d7ec78482bb20b87891e4313cd5d8f9b70d6f6567591dc30b8f81ef8b81d37f0a83fcde56b7616b142105639609f82054162ff7e4b SHA512 c91e0b24df8c2a90daa48fb1f94e3968fa4586b986e05d853d937d4a570d3828216840dd2c4babe0f5ee257f19079c94461a230a2327e9d2c2966d7b01d68999
diff --git a/net-wireless/dump1090/dump1090-4.0.ebuild b/net-wireless/dump1090/dump1090-4.0.ebuild
new file mode 100644
index 000000000000..ea826fc4f16a
--- /dev/null
+++ b/net-wireless/dump1090/dump1090-4.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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 +rtlsdr"
+
+DEPEND="
+	sys-libs/ncurses:=[tinfo]
+	virtual/libusb:1
+	bladerf? ( net-wireless/bladerf:= )
+	rtlsdr? ( net-wireless/rtl-sdr:= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e 's#-O3 -g -Wall -Wmissing-declarations -Werror -W##' Makefile || die
+	sed -i -e "s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		BLADERF=$(usex bladerf) \
+		RTLSDR=$(usex rtlsdr)
+}
+
+src_install() {
+	dobin ${PN}
+	dobin view1090
+	dodoc README.md
+
+	insinto /usr/share/${PN}/html
+	doins -r public_html/*
+
+	insinto /usr/share/${PN}
+	doins -r tools
+
+	insinto /usr/share/${PN}
+	newins debian/lighttpd/89-dump1090-fa.conf lighttpd.conf
+}
diff --git a/net-wireless/dump1090/dump1090-9999.ebuild b/net-wireless/dump1090/dump1090-9999.ebuild
index f0099d87455f..9e0920b465cf 100644
--- a/net-wireless/dump1090/dump1090-9999.ebuild
+++ b/net-wireless/dump1090/dump1090-9999.ebuild
@@ -3,24 +3,16 @@
 
 EAPI=7
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="simple Mode S decoder for RTLSDR devices"
-#Original repo
-#HOMEPAGE="https://github.com/antirez/dump1090"
-#Repo that has actually been touched recenly
-#HOMEPAGE="https://github.com/mutability/dump1090"
-#And now we move to the next one in line
 HOMEPAGE="https://github.com/flightaware/dump1090"
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
 else
 	KEYWORDS="~amd64 ~x86"
-	#COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"
-	#SRC_URI="https://github.com/flightaware/dump1090/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	#S="${WORKDIR}/${PN}-${COMMIT}"
 	SRC_URI="https://github.com/flightaware/dump1090/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
@@ -28,16 +20,17 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="bladerf +rtlsdr"
 
-RDEPEND="bladerf? ( net-wireless/bladerf:= )
-		rtlsdr? ( net-wireless/rtl-sdr:= )
-		sys-libs/ncurses:=
-		virtual/libusb:1"
-DEPEND="${RDEPEND}"
+DEPEND="
+	sys-libs/ncurses:=[tinfo]
+	virtual/libusb:1
+	bladerf? ( net-wireless/bladerf:= )
+	rtlsdr? ( net-wireless/rtl-sdr:= )"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
-	sed -i 's#-O2 -g -Wall -Werror -W##' Makefile
-	sed -i "s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile
+	sed -i -e 's#-O2 -g -Wall -Werror -W##' Makefile || die
+	sed -i -e "s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile || die
 }
 
 src_compile() {
@@ -54,8 +47,8 @@ src_install() {
 	insinto /usr/share/${PN}/html
 	doins -r public_html/*
 
-	insinto /usr/share/${PN}/tools
-	doins -r tools/*
+	insinto /usr/share/${PN}
+	doins -r tools
 
 	insinto /usr/share/${PN}
 	newins debian/lighttpd/89-dump1090-fa.conf lighttpd.conf