From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 35F4B138334 for ; Sun, 19 Aug 2018 22:29:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31A3DE09EE; Sun, 19 Aug 2018 22:29:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E2880E09EE for ; Sun, 19 Aug 2018 22:29:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 34E8F341233 for ; Sun, 19 Aug 2018 22:29:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8B137394 for ; Sun, 19 Aug 2018 22:29:43 +0000 (UTC) From: "Michael Weber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" Message-ID: <1534717773.10a16ac062416663daacd5b610a68e3ce3dc81c4.xmw@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-wireless/dump1090/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-wireless/dump1090/Manifest net-wireless/dump1090/dump1090-0.0_p20180509.ebuild net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild net-wireless/dump1090/dump1090-9999.ebuild X-VCS-Directories: net-wireless/dump1090/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: 10a16ac062416663daacd5b610a68e3ce3dc81c4 X-VCS-Branch: master Date: Sun, 19 Aug 2018 22:29:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 16c18322-af7b-4b99-aa12-c621b1134fe5 X-Archives-Hash: e07215658261def00205ff7e7787c42a commit: 10a16ac062416663daacd5b610a68e3ce3dc81c4 Author: Michael Weber gentoo org> AuthorDate: Sun Aug 19 22:29:20 2018 +0000 Commit: Michael Weber gentoo org> CommitDate: Sun Aug 19 22:29:33 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a16ac0 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 net-wireless/dump1090/Manifest | 2 +- ..._p20180509.ebuild => dump1090-1.15_pre20180509.ebuild} | 8 +++----- net-wireless/dump1090/dump1090-9999.ebuild | 15 ++++++++++----- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest index 806756ce7a2..7c02fcec57d 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 similarity index 86% rename from net-wireless/dump1090/dump1090-0.0_p20180509.ebuild rename to net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild index 219eca7ce77..556e4a14a69 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 be0c0e5e59c..556e4a14a69 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 }