Fix and bump for gcc-4.3, Closes bug #217972.

Package-Manager: portage-2.1.5.4

5 files changed, 83 insertions, 55 deletions

diff --git a/sci-electronics/splat/ChangeLog b/sci-electronics/splat/ChangeLog
index 90ebdd21c035..64ae4c7f5870 100644
--- a/sci-electronics/splat/ChangeLog
+++ b/sci-electronics/splat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-electronics/splat
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/splat/ChangeLog,v 1.6 2007/05/10 19:39:37 cardoe Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/splat/ChangeLog,v 1.7 2008/06/09 09:49:17 loki_val Exp $
+
+*splat-1.2.2 (09 Jun 2008)
+
+  09 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/splat-1.2.2-gcc43.patch, -splat-1.1.0.ebuild, +splat-1.2.2.ebuild:
+  Fix and bump for gcc-4.3, Closes bug #217972.
 
   10 May 2007; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   Fix metadata
diff --git a/sci-electronics/splat/Manifest b/sci-electronics/splat/Manifest
index 3135f50e43b2..30f608187e00 100644
--- a/sci-electronics/splat/Manifest
+++ b/sci-electronics/splat/Manifest
@@ -1,4 +1,5 @@
-DIST splat-1.1.0.tar.gz 142804 RMD160 4ada93286f41da2ff946e3862168ed321a19bb78 SHA1 69989ce536cdd3fbe4460f092fd9f972b5a05ae2 SHA256 e8d300c0dfd184c71eff635be2de588b6ab136a7142fd107adb338e4a309e4d8
-EBUILD splat-1.1.0.ebuild 1215 RMD160 e6ff760438f4568e2d4d2de28418d070a1e91a41 SHA1 4c5f8c12a4d4053ab612d193a9670565df07f836 SHA256 624e163f23a9c7d0be2298a0b0036b2fdac05f44c8ec2789616feab2218fd535
-MISC ChangeLog 880 RMD160 e8ee74c1c4389129b65cc7e2983139da7cc1cb91 SHA1 da04053524f1264f8dfabec7f991c91a50c69807 SHA256 52c6760ede28595211c7b5f82af36a6f39de35f52a11e5d455383fc80f7d7315
+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.ebuild 1686 RMD160 7258ea658b7ba5fa757b081ffe9ea7afd948e89a SHA1 87b56e1a3f1863b3190dfafa4ff7a9adf2e2aa35 SHA256 8b2ec94efa90ed31ee7e155f4aa5edd04e0bda83b42997dba7481918b5c7487c
+MISC ChangeLog 1088 RMD160 841ad2abe4d788080553eeeb4152fe70cc5fbcf1 SHA1 c2a8ee1e2ad1c8486f7e4d6190e96e3f3e0649ad SHA256 3941c12d2c01b258df876428b3f4e29eef870df9eb18922a3652ece684e00594
 MISC metadata.xml 645 RMD160 b5b149d6da4cf40cb8ef9ac52de24438a9391bb6 SHA1 a81a65457e157a4b0c4adb2d779442f083c9afcb SHA256 5ff2ed7fa8bc1d59168f59cb798834432a6f876b03bb76763dea6be6ba322355
diff --git a/sci-electronics/splat/files/splat-1.2.2-gcc43.patch b/sci-electronics/splat/files/splat-1.2.2-gcc43.patch
new file mode 100644
index 000000000000..11e65e77f14a
--- /dev/null
+++ b/sci-electronics/splat/files/splat-1.2.2-gcc43.patch
@@ -0,0 +1,10 @@
+--- splat-1.2.1.orig/utils/fontdata.c
++++ splat-1.2.1/utils/fontdata.c
+@@ -32,6 +32,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <zlib.h>
++#include <stdlib.h>
+ 
+ int main(argc,argv)
+ int argc;
diff --git a/sci-electronics/splat/splat-1.1.0.ebuild b/sci-electronics/splat/splat-1.1.0.ebuild
deleted file mode 100644
index ad658edaaaed..000000000000
--- a/sci-electronics/splat/splat-1.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/splat/splat-1.1.0.ebuild,v 1.3 2005/05/06 14:42:25 dholm Exp $
-
-inherit toolchain-funcs
-
-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="ftp://ftp.ibiblio.org/pub/linux/apps/ham/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-DEPEND="virtual/libc
-	sys-libs/zlib
-	app-arch/bzip2
-	"
-
-RDEPEND=""
-
-src_compile() {
-	local CC=$(tc-getCC) CXX=$(tc-getCXX)
-	local STRIP=""
-
-	if ! has nostrip ${FEATURES} ; then
-		local STRIP="-s"
-	fi
-
-	${CXX} -Wall ${CXXFLAGS} -lm -lbz2 itm.cpp splat.cpp -o splat || die
-
-	cd utils
-	${CC} -Wall ${CFLAGS} citydecoder.c -o citydecoder
-	${CC} -Wall ${CFLAGS} usgs2sdf.c -o usgs2sdf
-	${CC} -Wall ${CFLAGS} -lz fontdata.c -o fontdata
-
-}
-
-src_install() {
-	# splat binary
-	dobin splat || die
-
-	# utilities
-	dobin utils/{citydecoder,usgs2sdf,postdownload} || die
-	newman docs/man/splat.man splat.1
-
-	dodoc CHANGES README utils/fips.txt sample.lrp
-	newdoc utils/README README.UTILS
-}
diff --git a/sci-electronics/splat/splat-1.2.2.ebuild b/sci-electronics/splat/splat-1.2.2.ebuild
new file mode 100644
index 000000000000..4e3c91fe85be
--- /dev/null
+++ b/sci-electronics/splat/splat-1.2.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2008 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.1 2008/06/09 09:49:17 loki_val 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="virtual/libc
+	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
+
+}