6 files changed, 157 insertions, 7 deletions
diff --git a/media-radio/wspr/ChangeLog b/media-radio/wspr/ChangeLog
index 9b3af59ac518..976a9bc825eb 100644
--- a/media-radio/wspr/ChangeLog
+++ b/media-radio/wspr/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-radio/wspr
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/wspr/ChangeLog,v 1.13 2013/07/30 13:22:04 tomjbe Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/wspr/ChangeLog,v 1.14 2014/06/26 09:15:52 tomjbe Exp $
+
+*wspr-3.01 (26 Jun 2014)
+
+  26 Jun 2014; Thomas Beierlein <tomjbe@gentoo.org> +wspr-3.01.ebuild,
+  +files/wspr-3.01-PIL.patch, +files/wspr-3.01-script.patch,
+  +files/wspr-3.01-verbose.patch:
+  Add newer version from SVN snapshot which does not segfault (bug #511630).
+  Thanks for reporting Teun
 
   30 Jul 2013; Thomas Beierlein <tomjbe@gentoo.org> -wspr-2.00.ebuild:
   Drop pre EAPI=4 version wrt bug #478576
diff --git a/media-radio/wspr/Manifest b/media-radio/wspr/Manifest
index 959698f07b93..fa56df1d9601 100644
--- a/media-radio/wspr/Manifest
+++ b/media-radio/wspr/Manifest
@@ -5,14 +5,19 @@ AUX wspr-2.00-PIL.patch 455 SHA256 9653c83cac2b1a8406315912847949d4fe06f8a5321d5
 AUX wspr-2.00-libdir.patch 1675 SHA256 3f662904c9b3c4e41a6254c8cabb588c7372aefcec6b3a5d70d363d34326c808 SHA512 40912019b0c4605e7fc1ebacd5775927d474cd32cddc5a752df9a21067b78ce629d2cf7095d4aab05f9eeb40fd41e039617be6c803d8f49e8de2b2148770be49 WHIRLPOOL ca348b579b984a39c5d9906b2d4a83a443eb07b178674a0d2a5bdbb90ce6edd1423ecb5792b63eb7fc4c53a2fced4249ac486cd19425ddd7d44af556ab8e8590
 AUX wspr-2.00-script.patch 666 SHA256 24a8fd5a571eac5a11c1d48e00743c181ee752148df4fc1ee3a1665201a85420 SHA512 6108a94f0acf2fea143817926d570dc103f66d342803295cacd2ff6b6615a2b51ee6d53cc313730daabd4742864468cc99c202efb7d907b5c1f3a556620e8bb9 WHIRLPOOL ca9fa6afff80d8e923211be201b354ffadc719a68eac3b16665b68756b0c10e5759f0024e0a918d2a2b85ac81ffdae72f70541d4389ce477a8022de0952dd8c8
 AUX wspr-2.00-verbose.patch 457 SHA256 9eb34712226466e4bc27e576150ac72d5a3f7ba98aa2c9b74c94e8050dbe01ce SHA512 35d6aa9876bc9de80ab0f9a05616fbe694b6bc51b969bc55cdf5ab961185c41b492232601cf61e592c8cfcf9470b23451219a5953fcb03fe7ff1fbb3d3f17a79 WHIRLPOOL 11329da4ca8f562464bb0189940d4e8803ef230e52e6392e3ca83af3f068b5572161d542f3c69c156451d7c90daab9881950e500fd6a9c56a3e947a81256b99f
+AUX wspr-3.01-PIL.patch 431 SHA256 421e4562fb0bc1aa6695916a1f5e32233e1f6f601ad9794cbaed7188a312a036 SHA512 021ed43cc45b840f3f9a2401ad27dd6a6322301b584a0ea618f59e38935e27cdcca99277fd85e3cb8fbb0f8126b64c097bff28547b024e51754a5720cefb0382 WHIRLPOOL 35c64d2b4906156334ad8865e005d0fe2a366366c6c44252aada5aa65ae4d47235949d983d3b1352fadc04512edfae2489cc74e804c28bc52a107e8b92a6cd81
+AUX wspr-3.01-script.patch 531 SHA256 796f1475bc0f2d1593fe8d1519a171594ce6889ca6192a97b20d06f78b3dddc4 SHA512 e3a8acb038694847cde91adbe1f040f9f5fdbb969dca999fde423f8f7aead09a3a906aed1ec81825395960f60e0fbf210f9cf8182a49effc75747ffa3727dd7c WHIRLPOOL 509303739867506c8f4519ac8e6bbf3639baaeae4ed3a56e89ee8fd10251b41317e2d75095861073b628e47e6ee734dbecd9615252bf2d953bf1cde02d03657f
+AUX wspr-3.01-verbose.patch 467 SHA256 50f9850d73f0df7ca9e018a3abea1f1d9f06e2d2e446fbd6d003ea4b31b795e1 SHA512 83ffabc81539e18a0dac143811ee93bd79ba3803d1a0287c77cf80d9236d6e7dcfbaaa0af0ce0186ee7fb63a2e6e2395cbeea780d7975f9c8cf36a0acb41b2ec WHIRLPOOL 9dddafddbaff74f54466bdd566717ca53d8b2a5550b0805066ddfd510b6ad8c5d93efaf3ee805785f96904757ec5a2757455ace100661fc0c11b2d69c44bb2b4
 DIST wspr-2.00.r1714.tgz 2096056 SHA256 6a0e13f354d4e228337ee550851f36027281e268385961505a6757fda1ffc423 SHA512 221ca3c4ac433d5fb292830e183ef4ce44a9b0b31c8c1446faf30c1c2d6fe88cb471434c01126450843af49249e33bf6eccf1cbf839e6c5a09a3206c64a01d78 WHIRLPOOL c46fa1232c16ba42f8a9cf5fe1821291c339a776f2c1afe9ca4933574c026607bc789c31a496581f06d746297d9dfcc4252b79f52b1b38f8292134b445ab353b
+DIST wspr-3.01.r2792.tgz 2145037 SHA256 a57218432b6086d823749ab7114c5e3f91066dd6a0969e5dd7b81ec770f5b18c SHA512 0aad8bf518b217fcf14fd0fd5ec0f8f3833c2768eff9eec20dee213dfd057dc283d81290a042f464c729e03502d3b8e1c2b22d5d1c2932eccc13b4ef1eaf0698 WHIRLPOOL bbca4146a925dbf5946f5d50ce7eb662a1d9a7a86bcc0433dc3fc01292e8affe944ffb36e7d2af8e2ac2d7e3a304d439324e2da9d6237070063c5a5c6d894a07
 EBUILD wspr-2.00-r2.ebuild 2176 SHA256 7e464ed3ef205ad2f03b47e5dd5e7d5ba3e07021f15179d69c9f4bf0d4f4f911 SHA512 50f9bf4ce8647cfc8d764397deb2769928f7d395811c8fefb52f2a438cb4be63d9776a1ef8a1815e208bc7159e906507f6b03037a84bc1a78e6bd2f95045664c WHIRLPOOL ecf0c9ed5198ddf8ec6fe8dfa08bfdaaade51c29cfc338d1172f29efaeb0900ed76c98b4e505b5286af47f6f505255c49b98975be08621143ece16ab5fd01ab4
-MISC ChangeLog 3269 SHA256 5117501bc9a0b6d51feec328d202812ac504ba681fd09cfb87a6a17622613c4a SHA512 d33558c0e1d72caf2ebb2f938187c1eb1dcfa7c5f5fd0a1a65ae4ae6c324dc6aeb0455bce2095bb0a41510778aec918a70a2440708b6908e9f7e3d923e7ac18d WHIRLPOOL fa4e996a7c8fa30976507cc5a3e63b5c3229c816733f9324aa54361049aa12ac3cc1acb1bd53e69fb8fee97b466e3a9c6341e55d1d2aa254339c276b2d94376e
+EBUILD wspr-3.01.ebuild 2259 SHA256 b7e7a5a2709e37aa46894f747bcceb358c9a7903a0a9fe19a782dbac384615e5 SHA512 40542ee3a2f5647272c4694c6862339d6d16fc639051aa8146ebad8b268c4f038a258b5250b6a7d991b4be57d126bbb07c4f7d6020751495cae037cda2e52c81 WHIRLPOOL 53ee3f7d0202ee87ebb30fadac1135478864ca3b61ffea79f586899075806c68500e6b62f2c281ea109ba83f4d4d9e4d2cefe4c32576fceff9fd8a1166bde4c5
+MISC ChangeLog 3567 SHA256 4effede02ff24493d02af427d4a21caeefbd20eb1ae3550528a641a1f0df54c7 SHA512 483cb89959ffc16070b9f38e29e5b9b96382ec88890bb14ef7c170ccc1eee3cb940fcd7a007ffa1a25db7ccad06c06181944af052750bb78696f4106f7c3a060 WHIRLPOOL 63111e5c04e5fc437f2631bd22ce2d9f08b5210d9738ddd824c7454640398939284f3cabb6c17dcc153398e4ea1539cc7c03046f5c0748fa949bb575cc78cbd7
 MISC metadata.xml 241 SHA256 865a729cb9a1d82ea72849efc0d66c4c499e1c87b59757996f3d45bae77df6cc SHA512 eff33b80d9c4469f6f71c50b6cd7d173d7670c28f7e4162c3be23fdd5b4adacf3f0365ebe0827cd1721f24cc5a40440ae1edd78f59e606648e951bbb10378f2d WHIRLPOOL c248807b5f958ae6b54ed780eef3c255eff1c65f5afdf77fa64c4fd0a51cbeeeeef25e1d5ad550c748ba75bd2f1523d0f8d2d71bcf966306d010751c5ace5e4f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlH3vgQACgkQQe4uqXYgU9VqZwCfYYGdczJtH2LQzVRPnVmKr768
-ZJEAn0oYFQTyoV/PaicBGh7OCTvMYv3d
-=yHrG
+iEYEAREIAAYFAlOr5NMACgkQQe4uqXYgU9V6HgCggHQrnhAnlclpcMMhjtlUzmvB
+S5IAnRLijyEHM1SdXOYZsG3ifW/09wCw
+=GH3t
 -----END PGP SIGNATURE-----
diff --git a/media-radio/wspr/files/wspr-3.01-PIL.patch b/media-radio/wspr/files/wspr-3.01-PIL.patch
new file mode 100644
index 000000000000..ce4689195147
--- /dev/null
+++ b/media-radio/wspr/files/wspr-3.01-PIL.patch
@@ -0,0 +1,11 @@
+--- wspr.py.orig	2014-06-23 21:25:51.000000000 +0200
++++ wspr.py	2014-06-23 21:26:03.000000000 +0200
+@@ -35,7 +35,7 @@
+     from Numeric import zeros
+ import array
+ import dircache
+-import Image, ImageTk, ImageDraw
++from PIL import Image, ImageTk, ImageDraw
+ from WsprMod.palettes import colormapblue, colormapgray0, colormapHot, \
+      colormapAFMHot, colormapgray1, colormapLinrad, Colormap2Palette
+ from types import *
diff --git a/media-radio/wspr/files/wspr-3.01-script.patch b/media-radio/wspr/files/wspr-3.01-script.patch
new file mode 100644
index 000000000000..f64a11b68a64
--- /dev/null
+++ b/media-radio/wspr/files/wspr-3.01-script.patch
@@ -0,0 +1,19 @@
+--- wspr.py.orig	2014-06-24 19:13:55.000000000 +0200
++++ wspr.py	2014-06-24 19:14:43.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/python
+ #-------------------------------------------------------------------- WSPR
+ # $Date: 2014/06/26 09:15:53 $ $Revision: 1.1 $
+ #
+--- wspr.orig	2014-06-24 18:57:00.000000000 +0200
++++ wspr	2014-06-24 19:09:50.000000000 +0200
+@@ -1,2 +1,7 @@
+-LD_LIBRARY_PATH=./lib 
+-python -O wspr.py
++#!/bin/sh
++if [ ! -e ~/.wspr ] ; then
++	mkdir ~/.wspr
++	mkdir ~/.wspr/save
++fi
++cd ~/.wspr
++/usr/bin/wspr.py
diff --git a/media-radio/wspr/files/wspr-3.01-verbose.patch b/media-radio/wspr/files/wspr-3.01-verbose.patch
new file mode 100644
index 000000000000..b697cfe444dd
--- /dev/null
+++ b/media-radio/wspr/files/wspr-3.01-verbose.patch
@@ -0,0 +1,12 @@
+# make f2py verbose
+--- Makefile.in.orig	2014-06-23 21:14:51.000000000 +0200
++++ Makefile.in	2014-06-23 21:15:11.000000000 +0200
+@@ -95,7 +95,7 @@
+ OBJS2C  = ${SRCS2C:.c=.o}
+ 
+ WsprMod/w.so:	${OBJS2C} $(SRCS2C) $(SRCS2F90) $(SRCS2F77) acom1.f90
+-	${F2PY} -c --quiet --noopt --debug -m w \
++	${F2PY} -c --noopt --debug -m w \
+ 	--f77flags="${FFLAGS}" --f90flags="${FFLAGS}" \
+ 	--fcompiler=${FCV} --f77exec=${FC} --f90exec=${FC} \
+ 	--opt="-fbounds-check ${FFLAGS}" \
diff --git a/media-radio/wspr/wspr-3.01.ebuild b/media-radio/wspr/wspr-3.01.ebuild
new file mode 100644
index 000000000000..f8e6b9889602
--- /dev/null
+++ b/media-radio/wspr/wspr-3.01.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/wspr/wspr-3.01.ebuild,v 1.1 2014/06/26 09:15:52 tomjbe Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_REQ_USE="tk"
+
+inherit autotools fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
+
+MY_P=${P}.r2792
+
+DESCRIPTION="Weak Signal Propagation Reporter"
+HOMEPAGE="http://www.physics.princeton.edu/pulsar/K1JT/wspr.html"
+SRC_URI="http://dev.gentoo.org/~tomjbe/distfiles/${MY_P}.tgz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	virtual/python-imaging[tk,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	virtual/pmw[${PYTHON_USEDEP}]
+	sci-libs/fftw:3.0
+	media-libs/hamlib
+	media-libs/portaudio
+	media-libs/libsamplerate"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( BUGS WSPR_Announcement.TXT WSPR0_Instructions.TXT WSPR_Quick_Start.TXT )
+
+pkg_setup() {
+	fortran-2_pkg_setup
+}
+
+get_fcomp() {
+	case $(tc-getFC) in
+	*gfortran* )	FCOMP="gfortran" ;;
+	* ) 			FCOMP=$(tc-getFC) ;;
+	esac
+}
+
+python_prepare_all() {
+	tc-export FC
+	get_fcomp
+	export FC="${FCOMP}"
+
+	local PATCHES=(
+		"${FILESDIR}"/${PN}-2.00-libdir.patch
+		"${FILESDIR}"/${P}-verbose.patch
+		"${FILESDIR}"/${PN}-3.01-script.patch
+		"${FILESDIR}"/${P}-PIL.patch
+	)
+
+	distutils-r1_python_prepare_all
+
+	sed -i -e "s/LDFLAGS} ${LIBS}/LDFLAGS} -fPIC ${LIBS}/" Makefile.in || die
+	sed -i -e "s#/usr/local/lib#/usr/$(get_libdir)#" configure.ac || die
+	sed -i -e '/makedirs/d' setup.py || die
+	eautoreconf
+}
+
+# Note: very hacky build system.
+# autoconf which doesn't really need Python
+# then custom Makefile which compiles the Python module with f2py
+# and finally hacked setup.py which relies on w.so created by make
+
+src_configure() {
+	# configure the build of the fortran module
+	econf --with-portaudio-lib-dir=/usr/$(get_libdir)
+
+	# then fork the sources
+	python_copy_sources
+	DISTUTILS_IN_SOURCE_BUILD=1
+}
+
+python_compile() {
+	# -shared is neded by f2py but cannot be set earlier as configure does
+	# not like it
+	local LDFLAGS=${LDFLAGS}
+	append-ldflags -shared
+	emake -j1
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	dobin wspr
+	insinto /usr/share/${PN}
+	doins hamlib_rig_numbers
+}