gentoo resync : 11.07.2019

3 files changed, 29 insertions, 18 deletions

diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index 1df0cccab1b1..2d9862347cd0 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -3,5 +3,5 @@ DIST dump1090-0.0_p20140919.tar.xz 445108 BLAKE2B 96da9faae0139710b92adfeb921f7b
 DIST dump1090-1.15_pre20180509.tar.gz 1032244 BLAKE2B 2d91c8bdbe2fca787e9653ac08eb40a4faab181ab10f7247a9dedf6390f35520642caee548dbadb58c5347c0f0284a66e000da747bc39b3dab1e4cbce0fbbc3d SHA512 08d7f1d031a5d3a26ea73bce543209bd84054b1acd94ba72a0dca206cc7f11c1778fb5d6286bfe434812f6647ccaab73b56bc6539ae594e2aa3364851428cad3
 EBUILD dump1090-0.0_p20140919.ebuild 940 BLAKE2B efc8640aead079dfd58a47d31ddf2c51e9c2afd9dfdd18b36e7e7f311b1d71de36fc7970caed9ef1d8a1eb938ec432a1eea0e2a83e71bcadf50f05a10724ed3d SHA512 8beb46b548d5a802b474e32b0f36077c68c3db833a79e4f783bbcc3ad5cfd7b9b7e2b84017eb88b1903a41a2ba6d1de80df79ca40b9b4b771604c6721227de2c
 EBUILD dump1090-1.15_pre20180509.ebuild 1359 BLAKE2B 7594ea89af34eca71d1049f713cf619270ad24beee6b5c96077ad00000960bcc7152d5e2c35c5510577b56e9c50786a0d88fc5c15b5e4d68292a3f2537184b1f SHA512 1256007d22664532e3420cf4d388eab6e5c905f1027bb16d31d5fee6d7931a3ae5ac2f738f0d74bd5774f18fb52b237659d24bb0a9cadfeefb9be57a98af5d14
-EBUILD dump1090-9999.ebuild 1359 BLAKE2B 7594ea89af34eca71d1049f713cf619270ad24beee6b5c96077ad00000960bcc7152d5e2c35c5510577b56e9c50786a0d88fc5c15b5e4d68292a3f2537184b1f SHA512 1256007d22664532e3420cf4d388eab6e5c905f1027bb16d31d5fee6d7931a3ae5ac2f738f0d74bd5774f18fb52b237659d24bb0a9cadfeefb9be57a98af5d14
-MISC metadata.xml 319 BLAKE2B 2e5d70af3000792a01f1fbae591b55d7c9473574f51bf30a6b6c9c13fd6a9247f3934d94c78969bf31425f47c63b708cfc07f861c4c2c5c96a9eea85cf177f72 SHA512 678fd4aeaa6cddbb2761cf63b66250e8ee83a58aabad547d208c11d2b8c4094be7c35b284db36db5e061a363cababde70f8355460dd3200f089b6f65c5104ecb
+EBUILD dump1090-9999.ebuild 1532 BLAKE2B 4c75d55a1401a09800f561b61e6d92d1838113a4fce3cb9d51d5a564395352b8527fc5e8d6d9ce0be0ac1f4f6cf39a05e637ec595146f2cdf8b6b7472df3746d SHA512 c72721881cc2a9e335a2d189551a0b1c36847c4f6101ee1d502f30dbee457ec01a7081d2c9038cc6cdae660b68fdeed779f2a6cbd00a0d4dbd5fd440ffe9846a
+MISC metadata.xml 475 BLAKE2B 65a7e4651f29eabc99e389d7ec78482bb20b87891e4313cd5d8f9b70d6f6567591dc30b8f81ef8b81d37f0a83fcde56b7616b142105639609f82054162ff7e4b SHA512 c91e0b24df8c2a90daa48fb1f94e3968fa4586b986e05d853d937d4a570d3828216840dd2c4babe0f5ee257f19079c94461a230a2327e9d2c2966d7b01d68999
diff --git a/net-wireless/dump1090/dump1090-9999.ebuild b/net-wireless/dump1090/dump1090-9999.ebuild
index 556e4a14a698..e4ab4ba0cfe8 100644
--- a/net-wireless/dump1090/dump1090-9999.ebuild
+++ b/net-wireless/dump1090/dump1090-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,34 +9,42 @@ 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"
+#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
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mutability/${PN}.git"
+	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
 	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
-	COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"
-	SRC_URI="https://github.com/mutability/dump1090/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
+	#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
 
 LICENSE="BSD"
 SLOT="0"
-IUSE=""
+IUSE="bladerf +rtlsdr"
 
-RDEPEND="net-wireless/rtl-sdr
+RDEPEND="bladerf? ( net-wireless/bladerf:= )
+		rtlsdr? ( net-wireless/rtl-sdr:= )
+		sys-libs/ncurses:=
 		virtual/libusb:1"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	default
+	sed -i 's#-O2 -g -Wall -Werror -W##' Makefile
+	sed -i "s#-lncurses#$($(tc-getPKG_CONFIG) --libs ncurses)#" Makefile
+}
+
 src_compile() {
 	emake CC="$(tc-getCC)" \
-		UNAME="Linux" \
-		DUMP1090_VERSION=${PV} \
-		CFLAGS="$($(tc-getPKG_CONFIG) --cflags librtlsdr) ${CFLAGS}" \
-		EXTRACFLAGS="-DHTMLPATH=\\\"/usr/share/dump1090/html\\\"" \
-		LIBS="${LDFLAGS} $($(tc-getPKG_CONFIG) --libs librtlsdr) -lm -lpthread"
+		BLADERF=$(usex bladerf) \
+		RTLSDR=$(usex rtlsdr)
 }
 
 src_install() {
@@ -50,6 +58,5 @@ src_install() {
 	insinto /usr/share/${PN}/tools
 	doins -r tools/*
 
-	newdoc debian/lighttpd/89-dump1090.conf lighttpd.conf
-	newdoc debian/nginx/dump1090-mutability nginx.conf
+	newdoc debian/lighttpd/89-dump1090-fa.conf lighttpd.conf
 }
diff --git a/net-wireless/dump1090/metadata.xml b/net-wireless/dump1090/metadata.xml
index 88faf189fed3..da238ebeece0 100644
--- a/net-wireless/dump1090/metadata.xml
+++ b/net-wireless/dump1090/metadata.xml
@@ -5,7 +5,11 @@
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
+	<use>
+		<flag name="bladerf">Build with Nuand BladeRF support</flag>
+		<flag name="rtlsdr">Build with Realtek RTL2832U (rtlsdr) support</flag>
+	</use>
 	<upstream>
-		<remote-id type="github">antirez/dump1090</remote-id>
+		<remote-id type="github">flightaware/dump1090</remote-id>
 	</upstream>
 </pkgmetadata>