Fix collision with app-portage/splat (Bug #122620)

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

3 files changed, 75 insertions, 13 deletions

diff --git a/sci-electronics/splat/ChangeLog b/sci-electronics/splat/ChangeLog
index 4d82ad684903..42cccbcf3048 100644
--- a/sci-electronics/splat/ChangeLog
+++ b/sci-electronics/splat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-electronics/splat
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/splat/ChangeLog,v 1.10 2010/06/02 06:22:04 tove Exp $
+# 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 $
+
+*splat-1.2.2-r2 (10 Jan 2011)
+
+  10 Jan 2011; Thomas Beierlein <tomjbe@gentoo.org> +splat-1.2.2-r2.ebuild:
+  Fix collision with app-portage/splat (Bug #122620)
 
   02 Jun 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove xmerlin from metadata.xml (#69210)
diff --git a/sci-electronics/splat/Manifest b/sci-electronics/splat/Manifest
index 31657b89d57e..2321e0064573 100644
--- a/sci-electronics/splat/Manifest
+++ b/sci-electronics/splat/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
+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 1483 RMD160 a0733d4cab684be0cb0e1d741decc28e396e68a2 SHA1 c0b03dc0b11fc11a9bfbd15b1300e7fe7abab048 SHA256 dbb118b646d39885dfa86ccef3e2eb640b15ff81850bff57c4f5c88d8043f8cb
+MISC ChangeLog 1646 RMD160 d9a1dff99f404e28d8985524aa4cc08ae56a3b9a SHA1 7777f2c6345eda92ee0a11993dd4f5dccf8c313b SHA256 d831c0c091365195742e38dcec18f596e19b80d5e8cba32f542354c973c2cbda
 MISC metadata.xml 541 RMD160 0585dda02ed18202b4aeae6c096a7513ca2d80a8 SHA1 91fbd20bcf6a7d3ef46f521cc20c588e85186dad SHA256 4eda2e972391147ad0078ba0b9fc72171e8de550b05c70a244f9443d1a83982a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwF+JEACgkQV3J2n04Eauy/ZgCgjzU9IdEVyESgnN6J3bMz1TWb
-0QsAmgNzr2ZkkCpXixxYDFmy2QvJ5qG7
-=u6Qd
------END PGP SIGNATURE-----
diff --git a/sci-electronics/splat/splat-1.2.2-r2.ebuild b/sci-electronics/splat/splat-1.2.2-r2.ebuild
new file mode 100644
index 000000000000..e26f452746f2
--- /dev/null
+++ b/sci-electronics/splat/splat-1.2.2-r2.ebuild
@@ -0,0 +1,66 @@
+# 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-r2.ebuild,v 1.1 2011/01/10 20:14:15 tomjbe Exp $
+
+inherit toolchain-funcs eutils
+
+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 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 rfsplat -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 rfsplat || die
+
+	# utilities
+	dobin utils/{citydecoder,usgs2sdf,srtm2sdf,postdownload,bearing} || die
+	newman docs/${SPLAT_LANG}/man/splat.man rfsplat.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
+}
+
+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."
+}