gentoo resync : 25.08.2018

3 files changed, 68 insertions, 6 deletions

diff --git a/net-wireless/dump1090/Manifest b/net-wireless/dump1090/Manifest
index d447942c6f9a..9977b0ee9e29 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -1,5 +1,7 @@
 AUX gmap_usr_share_mv.patch 459 BLAKE2B 54afd9183d40041b541325041975b8a20ebfa45a29d9625ba1b22635aa567f57e607215582c4b55f40dc7339fe031c017c98c51216edf80087f4c602526c5b9e SHA512 3ffa7cf9a172642015373df29a8acd952d25a1634b9a7cb3cad8ad67c6ebd95b0a94c47713f444e1270ce52ed04db1282992e31435fca7aacbc0da955d419c59
 DIST dump1090-0.0_p20140919.tar.xz 445108 BLAKE2B 96da9faae0139710b92adfeb921f7b84ea3342c3916d69baebfb2709076c9f3d8e3be3457d8f2c074d3b58255ad745cda9f35a71f6707b8184a83c0c8a54e141 SHA512 4b7f915d5dd9c728da36298ecfe6c0e1da17bb9082e5f1c41376e6425dce429c099b0fd2d8436a966f5d3189788b818602f26fb0aea62e5dbe753e489bf0a760
+DIST dump1090-1.15_pre20180509.tar.gz 1032244 BLAKE2B 2d91c8bdbe2fca787e9653ac08eb40a4faab181ab10f7247a9dedf6390f35520642caee548dbadb58c5347c0f0284a66e000da747bc39b3dab1e4cbce0fbbc3d SHA512 08d7f1d031a5d3a26ea73bce543209bd84054b1acd94ba72a0dca206cc7f11c1778fb5d6286bfe434812f6647ccaab73b56bc6539ae594e2aa3364851428cad3
 EBUILD dump1090-0.0_p20140919.ebuild 940 BLAKE2B efc8640aead079dfd58a47d31ddf2c51e9c2afd9dfdd18b36e7e7f311b1d71de36fc7970caed9ef1d8a1eb938ec432a1eea0e2a83e71bcadf50f05a10724ed3d SHA512 8beb46b548d5a802b474e32b0f36077c68c3db833a79e4f783bbcc3ad5cfd7b9b7e2b84017eb88b1903a41a2ba6d1de80df79ca40b9b4b771604c6721227de2c
-EBUILD dump1090-9999.ebuild 1132 BLAKE2B a5a844c8699df3d48978c7e7ae6bcd5eb0434ba06521197710736b64f9c6a7dd971f36535e708616da72bb6158d4c59778a6e88a668a59db13ac10b2505baa7f SHA512 21da8ec67f7b052078ded11cab9492e4b59452b917f08fa91a2582950e47d61e558f12e84334c1993536d4b72f776b66606d92e4138699c11d606c17c9c84ce2
+EBUILD dump1090-1.15_pre20180509.ebuild 1359 BLAKE2B 7594ea89af34eca71d1049f713cf619270ad24beee6b5c96077ad00000960bcc7152d5e2c35c5510577b56e9c50786a0d88fc5c15b5e4d68292a3f2537184b1f SHA512 1256007d22664532e3420cf4d388eab6e5c905f1027bb16d31d5fee6d7931a3ae5ac2f738f0d74bd5774f18fb52b237659d24bb0a9cadfeefb9be57a98af5d14
+EBUILD dump1090-9999.ebuild 1359 BLAKE2B 7594ea89af34eca71d1049f713cf619270ad24beee6b5c96077ad00000960bcc7152d5e2c35c5510577b56e9c50786a0d88fc5c15b5e4d68292a3f2537184b1f SHA512 1256007d22664532e3420cf4d388eab6e5c905f1027bb16d31d5fee6d7931a3ae5ac2f738f0d74bd5774f18fb52b237659d24bb0a9cadfeefb9be57a98af5d14
 MISC metadata.xml 423 BLAKE2B 5a9cc427c7c34cdb0c63e433769a0f7695d54b8027da2b37dd62636003d3b39cef16957503c3bad0116a2ec344674172be1d5d61aaef222b710c5d78a9042c2a SHA512 6fcab3c262761efdb8742d485789fac8284494e5b2c21fa8ecaa671429ae11dfa22a9c0ce3f66eaf78d0001f01d4d117a7967521d478457af4765f9bdec84ba9
diff --git a/net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild b/net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild
new file mode 100644
index 000000000000..556e4a14a698
--- /dev/null
+++ b/net-wireless/dump1090/dump1090-1.15_pre20180509.ebuild
@@ -0,0 +1,55 @@
+# 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-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
 }