version bump; cleanup old revisions

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

4 files changed, 31 insertions, 71 deletions

diff --git a/sci-electronics/splat/ChangeLog b/sci-electronics/splat/ChangeLog
index 42cccbcf3048..7de6a0dbf328 100644
--- a/sci-electronics/splat/ChangeLog
+++ b/sci-electronics/splat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-electronics/splat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/splat/ChangeLog,v 1.11 2011/01/10 20:14:15 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/splat/ChangeLog,v 1.12 2011/01/27 16:23:12 tomjbe Exp $
+
+*splat-1.3.0 (27 Jan 2011)
+
+  27 Jan 2011; Thomas Beierlein <tomjbe@gentoo.org> -splat-1.2.2.ebuild,
+  -splat-1.2.2-r1.ebuild, +splat-1.3.0.ebuild:
+  version bump; cleanup old revisions
 
 *splat-1.2.2-r2 (10 Jan 2011)
 
diff --git a/sci-electronics/splat/Manifest b/sci-electronics/splat/Manifest
index 2321e0064573..82fb4a0f3f33 100644
--- a/sci-electronics/splat/Manifest
+++ b/sci-electronics/splat/Manifest
@@ -1,7 +1,7 @@
 AUX splat-1.2.2-gcc43.patch 205 RMD160 05ed19f0575cf544b43c0e3d8a63ae833dd065d8 SHA1 36c35131cdd30f4c0c5e5c02065c8a79362109fc SHA256 d92a15175d7caf1f42fc821ae27dbe11d7d4d9f76baa28b4fa22168f7af5c1c5
 DIST splat-1.2.2.tar.bz2 301939 RMD160 2cf47606deaa0e1c857176c392337c680f1c34ca SHA1 444baf169d1de99868dcb7a43c412687e0671e2f SHA256 1716a2db1ff57d482009cc74534c6a96a4ea9fa6713ad59f27675445a6513b2e
-EBUILD splat-1.2.2-r1.ebuild 1682 RMD160 267bf42bf7190512c7cf682a49aaa41badbe7ed8 SHA1 4cd1ff8dacb942f456347d24336ea018433cbaef SHA256 784e668ad168c4d53810ab1442ea86997e1dae52a8c88ee35c3ae99bd76eede0
+DIST splat-1.3.0.tar.bz2 328074 RMD160 0d817b3b6052847769237430dad20311ee6f8919 SHA1 75007b5404ea3efa8c3879c0090158be73d0c00a SHA256 5075ced59c23155242332cceb6d04dce45bc092cc590f9ebfa47dce72900bd60
 EBUILD splat-1.2.2-r2.ebuild 1902 RMD160 39d5fbb7532b4fdad89719e1135bcc5e79cb0126 SHA1 9c1c2a5a0b629ffcccafd780ecd98eefce632776 SHA256 d08a714db6b0ed04b89f3224d2a6001bced09cdc52865fcbb78a0ae610786279
-EBUILD splat-1.2.2.ebuild 1671 RMD160 9c8ade1832fa05786eae008f606e3c8fd147a4d5 SHA1 a2788f42d49c7265e197f061864d735e2f950f6d SHA256 a715d0788d248a5affe5ce27d72069d56c9051ec59cc5b7714304b8702245df4
-MISC ChangeLog 1646 RMD160 d9a1dff99f404e28d8985524aa4cc08ae56a3b9a SHA1 7777f2c6345eda92ee0a11993dd4f5dccf8c313b SHA256 d831c0c091365195742e38dcec18f596e19b80d5e8cba32f542354c973c2cbda
+EBUILD splat-1.3.0.ebuild 2146 RMD160 09930430683e927bf99f24b432ff64e37cc7ab28 SHA1 3ef4a5de3fa45baaacb1141f8dd16acc532dd473 SHA256 c2ac8d20299d1f07febc043693d26a4c5a03173ad505a8ecf8819e17bf8ad8b7
+MISC ChangeLog 1833 RMD160 5d60443b4e71e4317597d41fac7398c3a33af03c SHA1 be529e1d6de7ba05b8903e61c7ba4dc40abb36b3 SHA256 ddb1702ef0157396ac67cdc32a04bcfe43ec0e3241f1a4c00986cd3c2de0fbde
 MISC metadata.xml 541 RMD160 0585dda02ed18202b4aeae6c096a7513ca2d80a8 SHA1 91fbd20bcf6a7d3ef46f521cc20c588e85186dad SHA256 4eda2e972391147ad0078ba0b9fc72171e8de550b05c70a244f9443d1a83982a
diff --git a/sci-electronics/splat/splat-1.2.2.ebuild b/sci-electronics/splat/splat-1.2.2.ebuild
deleted file mode 100644
index 0f4591a123c1..000000000000
--- a/sci-electronics/splat/splat-1.2.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/splat/splat-1.2.2.ebuild,v 1.2 2009/09/23 20:00:57 patrick Exp $
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="SPLAT! is an 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="~x86 ~ppc"
-IUSE="doc linguas_es"
-
-DEPEND="sys-libs/zlib
-	app-arch/bzip2"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-}
-
-src_compile() {
-	local CC=$(tc-getCC) CXX=$(tc-getCXX)
-
-	${CXX} -Wall ${CXXFLAGS} ${LDFLAGS} itm.cpp splat.cpp -o splat -lm -lbz2 || die
-
-	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 splat || die
-
-	# utilities
-	dobin utils/{citydecoder,usgs2sdf,srtm2sdf,postdownload,bearing} || die
-	newman docs/${SPLAT_LANG}/man/splat.man splat.1 || die
-
-	dodoc CHANGES README utils/fips.txt || die
-	newdoc utils/README README.UTILS || die
-
-	if use doc; then
-		dodoc docs/${SPLAT_LANG}/{pdf/splat.pdf,postscript/splat.ps} || die
-	fi
-	#sample data
-	docinto sample_data
-	dodoc sample_data/* || die
-
-}
diff --git a/sci-electronics/splat/splat-1.2.2-r1.ebuild b/sci-electronics/splat/splat-1.3.0.ebuild
index 2c6e57d1171f..bd5950b2990d 100644
--- a/sci-electronics/splat/splat-1.2.2-r1.ebuild
+++ b/sci-electronics/splat/splat-1.3.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/splat/splat-1.2.2-r1.ebuild,v 1.2 2009/09/23 20:00:57 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/splat/splat-1.3.0.ebuild,v 1.1 2011/01/27 16:23:12 tomjbe Exp $
 
 inherit toolchain-funcs eutils
 
-DESCRIPTION="SPLAT! is an RF Signal Propagation, Loss, And Terrain analysis tool for the spectrum between 20 MHz and 20 GHz."
+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"
 
@@ -21,13 +21,21 @@ RDEPEND="${DEPEND}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${PN}-1.2.2-gcc43.patch"
 }
 
 src_compile() {
+	# 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
+
 	local CC=$(tc-getCC) CXX=$(tc-getCXX)
 
-	${CXX} -Wall ${CXXFLAGS} ${LDFLAGS} itm.cpp splat.cpp -o splat -lm -lbz2 || die
+	${CXX} -Wall ${CXXFLAGS} ${LDFLAGS} itm.cpp splat.cpp -o rfsplat -lm -lbz2 || die
 
 	cd utils
 	${CC} -Wall ${CFLAGS} ${LDFLAGS} citydecoder.c -o citydecoder
@@ -41,11 +49,11 @@ src_install() {
 	local SPLAT_LANG="english"
 	use linguas_es && SPLAT_LANG="spanish"
 	# splat binary
-	dobin splat || die
+	dobin rfsplat || die
 
 	# utilities
 	dobin utils/{citydecoder,usgs2sdf,srtm2sdf,postdownload,bearing} || die
-	newman docs/${SPLAT_LANG}/man/splat.man splat.1 || die
+	newman docs/${SPLAT_LANG}/man/splat.man rfsplat.1 || die
 
 	dodoc CHANGES README utils/fips.txt || die
 	newdoc utils/README README.UTILS || die
@@ -56,5 +64,11 @@ src_install() {
 	#sample data
 	docinto sample_data
 	dodoc sample_data/* || die
+}
 
+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."
 }