Allow building of high resolution tool rfsplat-hd (bug #482476). Thanks for reporting

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

4 files changed, 110 insertions, 6 deletions

diff --git a/sci-electronics/splat/ChangeLog b/sci-electronics/splat/ChangeLog
index 250d70e55966..7524d1c40b30 100644
--- a/sci-electronics/splat/ChangeLog
+++ b/sci-electronics/splat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-electronics/splat
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/splat/ChangeLog,v 1.16 2014/11/29 12:03:56 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/splat/ChangeLog,v 1.17 2014/11/29 12:57:05 tomjbe Exp $
+
+*splat-1.4.1-r1 (29 Nov 2014)
+
+  29 Nov 2014; Thomas Beierlein <tomjbe@gentoo.org> +splat-1.4.1-r1.ebuild,
+  metadata.xml:
+  Allow building of high resolution tool rfsplat-hd (bug #482476). Thanks for
+  reporting
 
   29 Nov 2014; Thomas Beierlein <tomjbe@gentoo.org> splat-1.4.1.ebuild:
   Fix missing src_configure()
diff --git a/sci-electronics/splat/Manifest b/sci-electronics/splat/Manifest
index 682f2028fde9..a3ce495183d9 100644
--- a/sci-electronics/splat/Manifest
+++ b/sci-electronics/splat/Manifest
@@ -9,13 +9,14 @@ DIST splat-1.4.1.tar.bz2 359165 SHA256 28b241fd393a3d14283712e0355f34d5c9faaf957
 EBUILD splat-1.2.2-r2.ebuild 1901 SHA256 dd1fc07b7a8b71c7c77e238c69f65683ad9bb649591166a975e9912aae3f6dda SHA512 3b6268f00a869d6927275351f4a8984ea4a9cf4f9de516b1ccbedee0f198d2c7b741c6fac0cbf283549bfc8c7f5bc92df2f46b3ea41a46f203da76f22617b828 WHIRLPOOL bd1c0fccb6882421eda4b558d7c7e9df6fb72faa4e205bed582022fd66d9bbf8fb7d5a35b60b8f20ce6a55e3a66e09a499a52cb1001399236c991a225a813ec0
 EBUILD splat-1.3.0.ebuild 2145 SHA256 a60c017523e05ed28d6ba7128c8658eefadacc570f9ee0563d11c1a339db7a88 SHA512 d53e429efe0977f2316459da7b7f196a0abf516a599440c82ea3413620f5f54e26a0486bb9fb38aaf43cb7e474036ee8cc199e4abf28ab6db99fbffb9f1e7aab WHIRLPOOL 14f5ca21ec15aa6882dcfc8a04c8561ae7c310fa3daaf51e765cbc85d0fe463d457cb7ba12d327841e8fd754cc18f15be6d7fe65e0cf9e61994236a9cbc6f95b
 EBUILD splat-1.4.0.ebuild 2150 SHA256 702f490c1e58cfe4ec0f184d5cfdc5b789c9d228ceedd9d7677576960800cff9 SHA512 16f6f6e45657976860248538ab241c4a7b5e224760729c70b987dcad1d3a190f5ec1cf8b117d207e3f2b71e8cdb4d52d16af48436fa062d38c69cbb90182b274 WHIRLPOOL 3b72e9fe2be0f5a027387b5146176b1b10180711aa9f8d45365cc5e7d25ad67563690462061a5c359757c08ac931f6fd20127b5d8bf8fc00d9daa1e187673279
+EBUILD splat-1.4.1-r1.ebuild 2575 SHA256 a9ff29d0be17892ce75ca05b8d5a4c297504d03fcc5d6ca9e928d44cc0f7753c SHA512 2fa55fee58a179ff2e2177d119b9adab645875642213a40a77445a127efe8128f65dbbe625b542929424e60e1c43330f5ee0bedd4312f379dd5483e33f69a82e WHIRLPOOL 689e83b5bec57126b1115f10b3642b472d22e3236e868f6aeac5444ded2c3077fc2b388751a2c3fd667e59fe0a732b15cbef7ea182dfa837ade0f844b0c9248b
 EBUILD splat-1.4.1.ebuild 2155 SHA256 9c703574a2eb1ad8867ff4f4aa9acb64438560228539883b8c08aa527b2a3cab SHA512 ed7c69021ff51cc2f0837fdd497c9d7f34dddd0b264aec8e2d44bfc8ebfdf889d25e166be1f65f27ed9a214470bf99630ba3254aa65fcc90f30f08f557727c59 WHIRLPOOL 17e5bd147b969e02f72fe67c5cee03857ce051211d91b728905a1dce32ace94b03a2c945264f36898d38a588eb15a34e565520c8a4ff0a1e9bc8dad6fb814f03
-MISC ChangeLog 2323 SHA256 b08ac0dcef2bc7ba3ea9e316b01423886c643984a1ed671a8ddb11dca5f8d8c9 SHA512 e4937ca78b5ad4372dc52a8250657edad8dd9d49fd23b11e7097ec81227c317c09d378dc5eddd7ee4cab8315d2a0eda78f2a9a380f6d5664d27fc99b40e07513 WHIRLPOOL d42a3f8a8639227e550d2a98b8a7a37717e3cc0d1af759e36b8fedb3cf36e8bce722476a5bdb7c84cd4070641ac181c81d440801401b530bb35be6da0dc0ea7b
-MISC metadata.xml 541 SHA256 4eda2e972391147ad0078ba0b9fc72171e8de550b05c70a244f9443d1a83982a SHA512 0469e1814ab4d37b120e8f81a52bcea1df923118cc42e99839f54aceb2674f17508a4a9fe12505b09e60e1193c53102881c8c042e5620f8e7a290a5eb5c776bc WHIRLPOOL 543fb27ee9a8f6ee71e5c3f4ac16b193400cd694d3547deb0ce9faf6af568f7ca7eee0f0f14e2136fcba1e57806f45a0eca77bb7a439b63ccf988429351d08f3
+MISC ChangeLog 2537 SHA256 7cf6a8ff5dd6d4a7192baee1e1ddbf51d7a54c55dbc238809bc64f0298d640b4 SHA512 f81a176fd63399dda61d94671d747eb5ce73598aaa94cb5e7cc1344cab99a55b80dc705da8c7805c8b007a53dd038ac8e8e3c89a14ce994f97dfba02e6ecd342 WHIRLPOOL 4bed8269a573ab92b26363abcc3789ee7ccffdb89766badc79d9413cdc7aa5ad5b461055932e792c757acfae36d25fb8a9d892337125b5683e8d2613b5743774
+MISC metadata.xml 652 SHA256 f3ba029040afd6d2d94f47b420635f71202ade795272778bc294a629a0c07ce3 SHA512 e2653a50454f64f19f977e4ef283d5d325f14165c35f408dabfa6d4b19868932a3c4a1a5c9961befe6d082de01c67948298c40ec3c7b1d9ec6168c7edaccc1af WHIRLPOOL e89b47c211c4909872a99d4e26d5d764fa7f7e898fed5ef22934286fc3b6316315157d4df6f9ac48ef11b462b94c354451366e9d572821373b5f3478e85fdad6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR5tjMACgkQQe4uqXYgU9Vi5ACfWbbm56XR/H18oGu5MYV4o+wG
-g7AAn2RIx04MDd41zjYNM0KFHlCN2fKx
-=NTE6
+iEYEAREIAAYFAlR5wqcACgkQQe4uqXYgU9X/6QCguwG7yP65PgHXhM244teP6L33
+1KgAoKiw9tnBRd/cRWUsMxln2JE5JsLF
+=+6A+
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/splat/metadata.xml b/sci-electronics/splat/metadata.xml
index e6e9dfbd17b2..e8f8307a22af 100644
--- a/sci-electronics/splat/metadata.xml
+++ b/sci-electronics/splat/metadata.xml
@@ -9,4 +9,8 @@
   coordination, communication system design, and terrestrial television and radio
   broadcasting.
   </longdescription>
+  <use>
+  	<flag name = 'hires'>Builds additional high resolution application 
+	'rfsplat-hd'. </flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-electronics/splat/splat-1.4.1-r1.ebuild b/sci-electronics/splat/splat-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..f9298b4fd8ed
--- /dev/null
+++ b/sci-electronics/splat/splat-1.4.1-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/splat/splat-1.4.1-r1.ebuild,v 1.1 2014/11/29 12:57:05 tomjbe Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="RF Signal Propagation, Loss, And Terrain analysis tool for the spectrum between 20 MHz and 20 GHz"
+HOMEPAGE="http://www.qsl.net/kd2bd/splat.html"
+SRC_URI="http://www.qsl.net/kd2bd/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc hires linguas_es"
+
+DEPEND="sys-libs/zlib
+	app-arch/bzip2"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2.2-gcc43.patch"
+}
+
+src_configure() {
+	# fake resulting file from interactive configuration script
+	# using default resolution
+	cat <<- EOF > "${S}/splat.h"
+		/* Parameters for 3 arc-second standard resolution mode of operation */
+		#define MAXPAGES 9
+		#define HD_MODE 0
+	EOF
+	if use hires; then
+		# fake resulting file from interactive configuration script
+		# using default resolution
+		cat <<- EOF > "${S}/hires.h"
+			/* Parameters for 3 arc-second hires resolution mode of operation */
+			#define MAXPAGES 9
+			#define HD_MODE 1
+	EOF
+	fi
+}
+
+src_compile() {
+
+	local CC=$(tc-getCC) CXX=$(tc-getCXX)
+
+	${CXX} -Wall ${CXXFLAGS} ${LDFLAGS} itwom3.0.cpp splat.cpp -o rfsplat -lm -lbz2 || die
+	if use hires; then
+		cp "${S}/hires.h" "${S}/splat.h"
+		${CXX} -Wall ${CXXFLAGS} ${LDFLAGS} itwom3.0.cpp splat.cpp -o rfsplat-hd -lm -lbz2 || die
+	fi
+
+	cd utils
+	${CC} -Wall ${CFLAGS} ${LDFLAGS} citydecoder.c -o citydecoder
+	${CC} -Wall ${CFLAGS} ${LDFLAGS} usgs2sdf.c    -o usgs2sdf
+	${CC} -Wall ${CFLAGS} ${LDFLAGS} srtm2sdf.c    -o srtm2sdf   -lbz2
+	#${CC} -Wall ${CFLAGS} ${LDFLAGS} fontdata.c    -o fontdata   -lz
+	${CC} -Wall ${CFLAGS} ${LDFLAGS} bearing.c     -o bearing    -lm
+}
+
+src_install() {
+	local SPLAT_LANG="english"
+	use linguas_es && SPLAT_LANG="spanish"
+	# splat binary
+	dobin rfsplat
+	if use hires; then
+		dobin rfsplat-hd
+	fi
+
+	# utilities
+	dobin utils/{citydecoder,usgs2sdf,srtm2sdf,postdownload,bearing}
+	newman docs/${SPLAT_LANG}/man/splat.man rfsplat.1
+
+	dodoc CHANGES README utils/fips.txt
+	newdoc utils/README README.UTILS
+
+	if use doc; then
+		dodoc docs/${SPLAT_LANG}/{pdf/splat.pdf,postscript/splat.ps}
+	fi
+	#sample data
+	docinto sample_data
+	dodoc sample_data/*
+}
+
+pkg_postinst() {
+	elog "The original SPLAT! command got renamed to 'rfsplat' to avoid"
+	elog "filename collission with app-portage/splat."
+	elog ""
+	elog "Be aware that it is still referenced as 'splat' in the documentation."
+}