summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2018-08-20 00:29:20 +0200
committerMichael Weber <xmw@gentoo.org>2018-08-20 00:29:33 +0200
commit10a16ac062416663daacd5b610a68e3ce3dc81c4 (patch)
treea25c8027fb4945028ac3e96ab8d7eb588235b1b6 /net-wireless
parentapp-emulation/lxd: Remove old versions (diff)
downloadgentoo-10a16ac062416663daacd5b610a68e3ce3dc81c4.tar.gz
gentoo-10a16ac062416663daacd5b610a68e3ce3dc81c4.tar.bz2
gentoo-10a16ac062416663daacd5b610a68e3ce3dc81c4.zip
net-wireless/dump1090: Improve ebuild.
- use tagged version in $PV - install nginx/lighttpd config examples as doc Closes: https://bugs.gentoo.org/620222 Package-Manager: Portage-2.3.45, Repoman-2.3.10
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/dump1090/Manifest2
-rw-r--r--net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild (renamed from net-wireless/dump1090/dump1090-0.0_p20180509.ebuild)8
-rw-r--r--net-wireless/dump1090/dump1090-9999.ebuild15
3 files changed, 14 insertions, 11 deletions
diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index 806756ce7a23..7c02fcec57d8 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-0.0_p20180509.tar.gz 1032244 BLAKE2B 2d91c8bdbe2fca787e9653ac08eb40a4faab181ab10f7247a9dedf6390f35520642caee548dbadb58c5347c0f0284a66e000da747bc39b3dab1e4cbce0fbbc3d SHA512 08d7f1d031a5d3a26ea73bce543209bd84054b1acd94ba72a0dca206cc7f11c1778fb5d6286bfe434812f6647ccaab73b56bc6539ae594e2aa3364851428cad3
+DIST dump1090-1.15_pre20180509.tar.gz 1032244 BLAKE2B 2d91c8bdbe2fca787e9653ac08eb40a4faab181ab10f7247a9dedf6390f35520642caee548dbadb58c5347c0f0284a66e000da747bc39b3dab1e4cbce0fbbc3d SHA512 08d7f1d031a5d3a26ea73bce543209bd84054b1acd94ba72a0dca206cc7f11c1778fb5d6286bfe434812f6647ccaab73b56bc6539ae594e2aa3364851428cad3
diff --git a/net-wireless/dump1090/dump1090-0.0_p20180509.ebuild b/net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild
index 219eca7ce773..556e4a14a698 100644
--- a/net-wireless/dump1090/dump1090-0.0_p20180509.ebuild
+++ b/net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild
@@ -35,7 +35,7 @@ src_compile() {
UNAME="Linux" \
DUMP1090_VERSION=${PV} \
CFLAGS="$($(tc-getPKG_CONFIG) --cflags librtlsdr) ${CFLAGS}" \
- EXTRACFLAGS="-DHTMLPATH=\\\"/usr/share/dump1090/html\\\""\
+ EXTRACFLAGS="-DHTMLPATH=\\\"/usr/share/dump1090/html\\\"" \
LIBS="${LDFLAGS} $($(tc-getPKG_CONFIG) --libs librtlsdr) -lm -lpthread"
}
@@ -50,8 +50,6 @@ src_install() {
insinto /usr/share/${PN}/tools
doins -r tools/*
- #insinto /etc/lighttpd/conf-available
- #doins -r debian/lighttpd/*
- #insinto /etc/nginx/sites-available
- #doins -r debian/nginx/*
+ newdoc debian/lighttpd/89-dump1090.conf lighttpd.conf
+ newdoc debian/nginx/dump1090-mutability nginx.conf
}
diff --git a/net-wireless/dump1090/dump1090-9999.ebuild b/net-wireless/dump1090/dump1090-9999.ebuild
index be0c0e5e59cf..556e4a14a698 100644
--- a/net-wireless/dump1090/dump1090-9999.ebuild
+++ b/net-wireless/dump1090/dump1090-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,8 +17,9 @@ if [[ ${PV} == "9999" ]] ; then
KEYWORDS=""
else
KEYWORDS="~amd64 ~x86"
- SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
- S="${WORKDIR}/${PN}"
+ COMMIT="fb5942dba6505a21cbafc7905a5a7c513b214dc9"
+ SRC_URI="https://github.com/mutability/dump1090/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${COMMIT}"
fi
LICENSE="BSD"
@@ -31,9 +32,10 @@ DEPEND="${RDEPEND}"
src_compile() {
emake CC="$(tc-getCC)" \
- UNAME="Linux"
+ UNAME="Linux" \
+ DUMP1090_VERSION=${PV} \
CFLAGS="$($(tc-getPKG_CONFIG) --cflags librtlsdr) ${CFLAGS}" \
- EXTRACFLAGS="-DHTMLPATH='/usr/share/dump1090/html'" \
+ EXTRACFLAGS="-DHTMLPATH=\\\"/usr/share/dump1090/html\\\"" \
LIBS="${LDFLAGS} $($(tc-getPKG_CONFIG) --libs librtlsdr) -lm -lpthread"
}
@@ -47,4 +49,7 @@ 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
}