From 4ba504fa86ddbf3ebf1d8b0946a7beee7d2ba67a Mon Sep 17 00:00:00 2001 From: Rick Farina Date: Fri, 27 Sep 2019 10:04:44 -0400 Subject: net-wireless/dump1090: bump, add stable, remove old Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Rick Farina --- net-wireless/dump1090/Manifest | 2 +- .../dump1090/dump1090-0.0_p20140919.ebuild | 46 ---------------- net-wireless/dump1090/dump1090-3.7.2.ebuild | 63 ++++++++++++++++++++++ net-wireless/dump1090/dump1090-9999.ebuild | 5 +- 4 files changed, 67 insertions(+), 49 deletions(-) delete mode 100644 net-wireless/dump1090/dump1090-0.0_p20140919.ebuild create mode 100644 net-wireless/dump1090/dump1090-3.7.2.ebuild (limited to 'net-wireless/dump1090') diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest index 7c02fcec57d8..bf724be556c6 100644 --- a/net-wireless/dump1090/Manifest +++ b/net-wireless/dump1090/Manifest @@ -1,2 +1,2 @@ -DIST dump1090-0.0_p20140919.tar.xz 445108 BLAKE2B 96da9faae0139710b92adfeb921f7b84ea3342c3916d69baebfb2709076c9f3d8e3be3457d8f2c074d3b58255ad745cda9f35a71f6707b8184a83c0c8a54e141 SHA512 4b7f915d5dd9c728da36298ecfe6c0e1da17bb9082e5f1c41376e6425dce429c099b0fd2d8436a966f5d3189788b818602f26fb0aea62e5dbe753e489bf0a760 DIST dump1090-1.15_pre20180509.tar.gz 1032244 BLAKE2B 2d91c8bdbe2fca787e9653ac08eb40a4faab181ab10f7247a9dedf6390f35520642caee548dbadb58c5347c0f0284a66e000da747bc39b3dab1e4cbce0fbbc3d SHA512 08d7f1d031a5d3a26ea73bce543209bd84054b1acd94ba72a0dca206cc7f11c1778fb5d6286bfe434812f6647ccaab73b56bc6539ae594e2aa3364851428cad3 +DIST dump1090-3.7.2.tar.gz 5657288 BLAKE2B 267374ec034ba5bb03989d04001f1ca82cfb5f2cb77af06d85c1d5f4446955ef84bdf60162c0c74e702266f8051a22fe15723dae9b26323c3f5cf03bf48342b7 SHA512 8958bc711b44c8c9f26242bdd4005a422498e023632bbb87f8e93de30b6fa20b6c6ab3208e7548a960c8c127e948d1bdf5e9d5ceaf84127ce9e686c6fad6cc1b diff --git a/net-wireless/dump1090/dump1090-0.0_p20140919.ebuild b/net-wireless/dump1090/dump1090-0.0_p20140919.ebuild deleted file mode 100644 index 51c3554567bc..000000000000 --- a/net-wireless/dump1090/dump1090-0.0_p20140919.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs eutils - -DESCRIPTION="simple Mode S decoder for RTLSDR devices" -HOMEPAGE="https://github.com/antirez/dump1090" - -if [[ ${PV} == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/antirez/${PN}.git" - KEYWORDS="" -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz" - S="${WORKDIR}/${PN}" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="" - -RDEPEND="net-wireless/rtl-sdr" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/gmap_usr_share_mv.patch -} - -src_compile() { - emake CC="$(tc-getCC)" \ - CFLAGS="$($(tc-getPKG_CONFIG) --cflags librtlsdr)" \ - LIBS="${LDFLAGS} $($(tc-getPKG_CONFIG) --libs librtlsdr) -lm -lpthread" \ - all -} - -src_install() { - dobin ${PN} - dodoc TODO README.md - - insinto /usr/share/${PN} - doins gmap.html - doins tools/debug.html -} diff --git a/net-wireless/dump1090/dump1090-3.7.2.ebuild b/net-wireless/dump1090/dump1090-3.7.2.ebuild new file mode 100644 index 000000000000..a34578ba1b3d --- /dev/null +++ b/net-wireless/dump1090/dump1090-3.7.2.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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" +#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/flightaware/${PN}.git" + KEYWORDS="" +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 + +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}" + +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)" \ + 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}/tools + 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 e4ab4ba0cfe8..a34578ba1b3d 100644 --- a/net-wireless/dump1090/dump1090-9999.ebuild +++ b/net-wireless/dump1090/dump1090-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit toolchain-funcs eutils @@ -58,5 +58,6 @@ src_install() { insinto /usr/share/${PN}/tools doins -r tools/* - newdoc debian/lighttpd/89-dump1090-fa.conf lighttpd.conf + insinto /usr/share/${PN} + newins debian/lighttpd/89-dump1090-fa.conf lighttpd.conf } -- cgit v1.2.3-65-gdbad