gentoo resync : 13.06.2020

4 files changed, 3 insertions, 62 deletions

diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index c915634d2d4a..9e069e5e67a6 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -1,6 +1,4 @@
-DIST dump1090-1.15_pre20180509.tar.gz 1032244 BLAKE2B 2d91c8bdbe2fca787e9653ac08eb40a4faab181ab10f7247a9dedf6390f35520642caee548dbadb58c5347c0f0284a66e000da747bc39b3dab1e4cbce0fbbc3d SHA512 08d7f1d031a5d3a26ea73bce543209bd84054b1acd94ba72a0dca206cc7f11c1778fb5d6286bfe434812f6647ccaab73b56bc6539ae594e2aa3364851428cad3
 DIST dump1090-3.7.2.tar.gz 5657288 BLAKE2B 267374ec034ba5bb03989d04001f1ca82cfb5f2cb77af06d85c1d5f4446955ef84bdf60162c0c74e702266f8051a22fe15723dae9b26323c3f5cf03bf48342b7 SHA512 8958bc711b44c8c9f26242bdd4005a422498e023632bbb87f8e93de30b6fa20b6c6ab3208e7548a960c8c127e948d1bdf5e9d5ceaf84127ce9e686c6fad6cc1b
-EBUILD dump1090-1.15_pre20180509.ebuild 1359 BLAKE2B 7594ea89af34eca71d1049f713cf619270ad24beee6b5c96077ad00000960bcc7152d5e2c35c5510577b56e9c50786a0d88fc5c15b5e4d68292a3f2537184b1f SHA512 1256007d22664532e3420cf4d388eab6e5c905f1027bb16d31d5fee6d7931a3ae5ac2f738f0d74bd5774f18fb52b237659d24bb0a9cadfeefb9be57a98af5d14
-EBUILD dump1090-3.7.2.ebuild 1565 BLAKE2B 8963955f5180a8ec16b3fd406a4b66b671a7e391d41cb30c717e41416c87b323879e835b1fd34c257e0c8e73e8d9c27aeec41b6bb091a357198d0043d3248afa SHA512 ed26737b326570a5af8e6c1725b6f65380c2cf056c1c8fc07cdaa0a5ecb325e8add1b33348681bf9d57f75603e881751ee7e881b5eb7e260185f09ae556129fe
-EBUILD dump1090-9999.ebuild 1558 BLAKE2B c300d6d813531d99ee7e9bae8213dfdfa908b90adda44618ab0da162c89b0ccd4f623f90bcdf6b0ae5cec5f1e485c5abad39297d29c02087d27be0275f965a83 SHA512 290bf679ed1b7ed989f8212e32794a91fd255d2bf4d09648383af6620cb6cffc28752731c45c2c8394581f66361eb5a1b61478d8df8cc2360575689a0e60032c
+EBUILD dump1090-3.7.2.ebuild 1543 BLAKE2B ef4ea5495cd0a264c993ba40bc0a2d564f497b56b8248dfbbb4323bb293159017ac729eb5e17bcdcecd7e56bd04a001a9613e6fc986e3d6b8932039bfccaf272 SHA512 d70dbea5cef1ea41cfbfa430f8800057e12f5bb2a265368d5e7b6310f5386e2a4ed042ed971738efc242df37e098228371c999cf7596bd179d38a48cf58efd6a
+EBUILD dump1090-9999.ebuild 1545 BLAKE2B f4ad78598d6b99c66fa7eb716ecdda2d2091fb1a3e3722d9922f961a6ed58f8ea699c98a1fab6e6fbb4c10a20630955648851defcbeffd9e028b94e74e9fdbe5 SHA512 bc82f2db887f9290883bc82948a43793f5c953fc77dd3bdfb9a58dd405d71444204421bbfaef7767120b46d26379cc1376e8bd30d6706b05f24ad72c9c51630f
 MISC metadata.xml 475 BLAKE2B 65a7e4651f29eabc99e389d7ec78482bb20b87891e4313cd5d8f9b70d6f6567591dc30b8f81ef8b81d37f0a83fcde56b7616b142105639609f82054162ff7e4b SHA512 c91e0b24df8c2a90daa48fb1f94e3968fa4586b986e05d853d937d4a570d3828216840dd2c4babe0f5ee257f19079c94461a230a2327e9d2c2966d7b01d68999
diff --git a/net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild b/net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild
deleted file mode 100644
index 556e4a14a698..000000000000
--- a/net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs eutils
-
-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"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mutability/${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}"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="net-wireless/rtl-sdr
-		virtual/libusb:1"
-DEPEND="${RDEPEND}"
-
-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"
-}
-
-src_install() {
-	dobin ${PN}
-	dobin view1090
-	dodoc README.md
-
-	insinto /usr/share/${PN}/html
-	doins -r public_html/*
-
-	insinto /usr/share/${PN}/tools
-	doins -r tools/*
-
-	newdoc debian/lighttpd/89-dump1090.conf lighttpd.conf
-	newdoc debian/nginx/dump1090-mutability nginx.conf
-}
diff --git a/net-wireless/dump1090/dump1090-3.7.2.ebuild b/net-wireless/dump1090/dump1090-3.7.2.ebuild
index bb2497770e1e..742de05fd100 100644
--- a/net-wireless/dump1090/dump1090-3.7.2.ebuild
+++ b/net-wireless/dump1090/dump1090-3.7.2.ebuild
@@ -16,7 +16,6 @@ HOMEPAGE="https://github.com/flightaware/dump1090"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
-	KEYWORDS="amd64 x86"
 else
 	KEYWORDS="amd64 x86"
 	#COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"
diff --git a/net-wireless/dump1090/dump1090-9999.ebuild b/net-wireless/dump1090/dump1090-9999.ebuild
index a34578ba1b3d..f0099d87455f 100644
--- a/net-wireless/dump1090/dump1090-9999.ebuild
+++ b/net-wireless/dump1090/dump1090-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,6 @@ HOMEPAGE="https://github.com/flightaware/dump1090"
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/flightaware/${PN}.git"
-	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
 	#COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"