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

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

6 files changed, 114 insertions, 16 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/Manifest b/net-wireless/dump1090/Manifest
index 964d1fb15566..f835e5d9bd8d 100644
--- a/net-wireless/dump1090/Manifest
+++ b/net-wireless/dump1090/Manifest
@@ -1,13 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-EBUILD dump1090-9999.ebuild 731 SHA256 dd603f886584f234150ef419a6e2203ed8fb53a0b19ff6b871af71562fcb7a5b SHA512 250ffcb063664a4c50344422c40041758c419800e298ff6302442db1649fd45771fbe19fa0a47f414a4fc299be2c956bd9b44c91c3713c6782bff8648796495e WHIRLPOOL f32633359a397fe5b02125f83c6f8666e5f94985e7377d0e3e1cebb2fe958b4420ef7001b0725f73d5997f8b00ed7689c7c0089dcaeb444edba8c60197fa8f22
-MISC ChangeLog 346 SHA256 1cc78b2961ce1de9bddf52e45751f8dbfba60f3a662dbf503d43d9dd0d9f286d SHA512 124b28c5e5908d208d64c2de2515009b4fccd371ade295f04fcfc09d47a00793e5b882f6b2d245bb82c74943007779de562cfbb503b40018a8310d7d4e6acc97 WHIRLPOOL 9747cf6e3484d3920a789024e38b9dd9c759df8c5eea3be1faaa7efc222ef6fa8290e3cbff1b7d8edc89809001ab407b7318eb91d81bfde21b869f7f36722639
-MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
+AUX gmap_usr_share_mv.patch 606 SHA256 018339a76b008ba4f787aea5c0ef040ce77f88f94ab788c16b7579dc4e649475 SHA512 4dd9547d00fa09ae9ad9fc53dfd789e48df6a5b1289cb9158a6e3b6d724d76ce1abcaa8fa8375f21107c8b38d0970354a6e3d70cc07f005787984205ed5bfdbb WHIRLPOOL 84c6611f50e62a6090696190e0350d8d78804acb12f1479071a21fb1de9bdbab77eba39cea372e701eef7f3664a752a6f352cd8bb236ddc5358f61416c5d069c
+DIST dump1090-0.0_p20140919.tar.xz 445108 SHA256 5c2248e092036a0f40cd719c79a5f6d7eb089c394ca7d3966c281985d16866e4 SHA512 4b7f915d5dd9c728da36298ecfe6c0e1da17bb9082e5f1c41376e6425dce429c099b0fd2d8436a966f5d3189788b818602f26fb0aea62e5dbe753e489bf0a760 WHIRLPOOL 046b8f70a68fc7b46a787e885e5323ce53ca216cf060f0f64081265d110a6353128191a99e7a1a4c539db3c547b0fcf81312badaf37f83e70bb71e55f91667bc
+EBUILD dump1090-0.0_p20140919.ebuild 1052 SHA256 49d40ed0909eb7c16d42a559098f1823c7c7007988448377690222a737441052 SHA512 cc59a9c7c8fc870e9d48e4fdd65c767545fa68dc23142819bacc9d906d6c5ac44ff0879b938d9db04ddae024e9fc66411f00179a800fffc2625aa1f29bf3da75 WHIRLPOOL b46129d4744d6b37f3d587a066a748674cb844101a7f86782589b9305100ce63ff0a55a7035726cbf3ed7e2899e0e6c506f0d6da47351ee01d56f8876417ebc3
+EBUILD dump1090-9999.ebuild 1043 SHA256 95de2a607f39663cb34bf3e224ee2dabef17abf6c7dd73dd10a6a40773bec9d3 SHA512 0c7aafe8182c0a8e637160ee43b36cbfe12f13323551c67db98aa2b0c6b98b1aaf1a7d7db1d3a14061416960ac8674d2c7dc98b04fa40447b1ca4ad33f91f3ab WHIRLPOOL 3472432fc7389a3182de2f3978eb58acf305ab269d1bdc0195f295dfce8a17acbaea333b483ff7736844250a3f20face6600f127a7ea833c9d6afec2dc73ed6b
+MISC ChangeLog 644 SHA256 98baa232aa62c5fae3a76f62a9cb625cd0c1794920706f7020da3698a44fd186 SHA512 b91f4a655ff98d22b974d433d793aa4f51d4e0146f71622605ee7e3f0f6b3f3dabedf287e4d0a292b111ac516983d27b9f79a77d5acc30be59d69ab47d918ee3 WHIRLPOOL c6ddc8bb58d6ec1cbf699f8c1ad76fa7c85529fd50cb16c471e9252d79f87a103b18b24c66713574e842f05627236e016f03012c8e18996a09084718e954d505
+MISC metadata.xml 242 SHA256 5a20cd865fad81f304c90240177eb3d09ad9caafe184e1009ece4ba61f8f4fde SHA512 24f82df02189378a5f5eabd69e1eb329f0f6776f8bf467a657360c5b5ec9d5fc89cc34f24ab23195ad4c9d78f9b39922765304aa0ab36cbdb197bb8a8b151396 WHIRLPOOL 0f4d62e82886a502915924242718a4af310d49f117129e6726c25645cb08080fc3325ac84ffa01609b979ea6f9ff2672a6aed6514be02d62fb137ee5a7039144
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlEVNKUACgkQknrdDGLu8JB6+QD/d518hMIGjwlmW3ZFbQ0bLG6I
-C7d3YM6kgzs/9TuBpQsA/ie08aVBIqO2bpS42GqIcKwmT4zd9edgc+YASCipPi4o
-=xRXA
+iQIcBAEBCgAGBQJUaj+3AAoJEKXdFCfdEflKA6AP/AzNbqP98Wqgj0CCXs7avyK+
+tW6ZsZhfhOPAr/O60u1HfAZJ8ta8MmQoFdFmPYXwNzZx5FhYIpIuHjhR750YuuK5
+t2+GXrQjckPGp/KNLKkmMD2cd7bMsDo0iWxfOTcyU+Hh0uAOi82G2kc9sM/KNoi1
+8MVuqJ3NHDaRi26P/JXdjll0JQvJDMPzfW3q0to+CWhpL1ftUQ6rb4INavychnc1
+OxjYtDTAuvcdlh9KBd5LWAG6aIx5416Xa6BbYXWGW9ciAu2lGN2JnVHiv3HV50O6
+t5MlczxnC5T2VirVPjUqRoAcxZkevLU3f4Zi6DuuWTzrzI3acFAZTgBfpgEYGlFs
+OGarkhSN/CdARl1O/4AGOoaF2x8fHw4+DyJVbhaSJ/qCsgtwjmo9+GQZlx7/0ls3
+4YpSJNDCVFer5L6oxDjZGVJMz6ReLLs/I5XnjcYqnzz6kk2h4X9xD0ObV3b6pHkj
+1xmlDeF9IZ2GFZtPmpmjn4Opygl3rhX2K+1anx2HafuWo3PiBtTYeQQ5nCBJ8ukx
+FijKAS2efNFeuSeXg+Q3b/YfPD4AcBXAbFkhFUMtXx1oUljzLQh+vMoRiuLoK6lT
+RmedZ3uKI7iwlNSn7xb8ORPiKsqxdqE+Mn9QZzCiHxbzL/fsIrODt+ioGA8lKBAO
+yb7NY/9NTHPL3djIh8jg
+=Ff2j
 -----END PGP SIGNATURE-----
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>