add in patch and files needed for web interface, add in snapshot, add radio herd to maintainer

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)

5 files changed, 93 insertions, 8 deletions

diff --git a/net-wireless/dump1090/ChangeLog b/net-wireless/dump1090/ChangeLog
index b11afead748f..ef7b195108cd 100644
--- a/net-wireless/dump1090/ChangeLog
+++ b/net-wireless/dump1090/ChangeLog
@@ -1,10 +1,17 @@
 # ChangeLog for net-wireless/dump1090
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/dump1090/ChangeLog,v 1.1 2013/02/08 17:23:51 xmw Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/dump1090/ChangeLog,v 1.2 2014/11/17 18:34:17 zerochaos Exp $
+
+*dump1090-0.0_p20140919 (17 Nov 2014)
+
+  17 Nov 2014; Rick Farina <zerochaos@gentoo.org>
+  +dump1090-0.0_p20140919.ebuild, +files/gmap_usr_share_mv.patch,
+  dump1090-9999.ebuild, metadata.xml:
+  add in patch and files needed for web interface, add in snapshot, add radio
+  herd to maintainer
 
 *dump1090-9999 (08 Feb 2013)
 
   08 Feb 2013; Michael Weber <xmw@gentoo.org> +dump1090-9999.ebuild,
   +metadata.xml:
   Initial import
-
diff --git a/net-wireless/dump1090/dump1090-0.0_p20140919.ebuild b/net-wireless/dump1090/dump1090-0.0_p20140919.ebuild
new file mode 100644
index 000000000000..c5f945f4c5ae
--- /dev/null
+++ b/net-wireless/dump1090/dump1090-0.0_p20140919.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/dump1090/dump1090-0.0_p20140919.ebuild,v 1.1 2014/11/17 18:34:17 zerochaos Exp $
+
+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="git://github.com/antirez/dump1090.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="$(pkg-config --cflags librtlsdr)" \
+		LIBS="${LDFLAGS} $(pkg-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-9999.ebuild b/net-wireless/dump1090/dump1090-9999.ebuild
index 9319278cbf4a..461a13bdd537 100644
--- a/net-wireless/dump1090/dump1090-9999.ebuild
+++ b/net-wireless/dump1090/dump1090-9999.ebuild
@@ -1,23 +1,35 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/dump1090/dump1090-9999.ebuild,v 1.1 2013/02/08 17:23:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/dump1090/dump1090-9999.ebuild,v 1.2 2014/11/17 18:34:17 zerochaos Exp $
 
 EAPI=5
 
-inherit git-2 toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="simple Mode S decoder for RTLSDR devices"
 HOMEPAGE="https://github.com/antirez/dump1090"
-EGIT_REPO_URI="git://github.com/antirez/dump1090.git"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/antirez/dump1090.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"
-KEYWORDS=""
 IUSE=""
 
 RDEPEND="net-wireless/rtl-sdr"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/gmap_usr_share_mv.patch
+}
+
 src_compile() {
 	emake CC="$(tc-getCC)" \
 		CFLAGS="$(pkg-config --cflags librtlsdr)" \
@@ -28,4 +40,8 @@ src_compile() {
 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/files/gmap_usr_share_mv.patch b/net-wireless/dump1090/files/gmap_usr_share_mv.patch
new file mode 100644
index 000000000000..e1450e19f1f4
--- /dev/null
+++ b/net-wireless/dump1090/files/gmap_usr_share_mv.patch
@@ -0,0 +1,14 @@
+diff -Naur dump1090-orig/dump1090.c dump1090/dump1090.c
+--- dump1090-orig/dump1090.c	2014-11-17 13:23:59.518047332 -0500
++++ dump1090/dump1090.c	2014-11-17 13:24:33.876048252 -0500
+@@ -2233,8 +2233,8 @@
+         struct stat sbuf;
+         int fd = -1;
+ 
+-        if (stat("gmap.html",&sbuf) != -1 &&
+-            (fd = open("gmap.html",O_RDONLY)) != -1)
++        if (stat("/usr/share/dump1090/gmap.html",&sbuf) != -1 &&
++            (fd = open("/usr/share/dump1090/gmap.html",O_RDONLY)) != -1)
+         {
+             content = malloc(sbuf.st_size);
+             if (read(fd,content,sbuf.st_size) == -1) {
diff --git a/net-wireless/dump1090/metadata.xml b/net-wireless/dump1090/metadata.xml
index 5b80fb94c393..66566009b6cd 100644
--- a/net-wireless/dump1090/metadata.xml
+++ b/net-wireless/dump1090/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>radio</herd>
 <maintainer>
 <email>xmw@gentoo.org</email>
 <name>Michael Weber</name>