[gentoo-commits] repo/gentoo:master commit in: net-wireless/dump1090/

[David Seifert]

commit:     b13c4a473d68c4bc32a59902a35ef1869ca7a0fb
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Dec 28 14:47:59 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 14:47:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b13c4a47

net-wireless/dump1090: Sync live ebuild

Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 net-wireless/dump1090/dump1090-9999.ebuild | 31 ++++++++++++------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/net-wireless/dump1090/dump1090-9999.ebuild b/net-wireless/dump1090/dump1090-9999.ebuild
index f0099d87455..9e0920b465c 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