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

(Portage version: 2.1.5.4)

4 files changed, 79 insertions, 52 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/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
+
+}