Adapt to >=numpy-1.9.0 (bug #544504). Thanks Teun.

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0x762053D5

5 files changed, 136 insertions, 20 deletions

diff --git a/media-radio/wspr/ChangeLog b/media-radio/wspr/ChangeLog
index d253ac9c4659..5ed4377aea59 100644
--- a/media-radio/wspr/ChangeLog
+++ b/media-radio/wspr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-radio/wspr
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/wspr/ChangeLog,v 1.15 2015/04/08 18:14:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/wspr/ChangeLog,v 1.16 2015/05/18 14:32:00 tomjbe Exp $
+
+*wspr-3.01-r1 (18 May 2015)
+
+  18 May 2015; Thomas Beierlein <tomjbe@gentoo.org> wspr-3.01.ebuild,
+  +wspr-3.01-r1.ebuild, +files/wspr-3.01-numpy.patch:
+  Adapt to >=numpy-1.9.0 (bug #544504). Thanks Teun.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> wspr-2.00-r2.ebuild,
   wspr-3.01.ebuild:
diff --git a/media-radio/wspr/Manifest b/media-radio/wspr/Manifest
index 0adbfd6c6091..5ecdc1a384bb 100644
--- a/media-radio/wspr/Manifest
+++ b/media-radio/wspr/Manifest
@@ -6,30 +6,20 @@ AUX wspr-2.00-libdir.patch 1675 SHA256 3f662904c9b3c4e41a6254c8cabb588c7372aefce
 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-numpy.patch 691 SHA256 101665674d6746fe0ec1d44006d4a5474329c27a60b1f8898fd0f689d1c54499 SHA512 2e5912a65b87e1770d8f041d4d170a0ce3a86650659fbffc9d2e6fa34893008627ae966cf2cba95574de4e454a23d5b366ae6df456bfbba6aa4b19147d016021 WHIRLPOOL 0e5e5d5d6979a712fec152f006c723d3046ded7ea2a6a6ad03f870d7619a07f284c4043a03c5ed0dc4d7d0fff9b81d31a5e528865649df9d5e0c291a57ad6cc2
 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 2171 SHA256 16141dd753d208be81cb6c8204dc0c5bf919247834c7becd8ee7d84b86313aef SHA512 2bf607217377f84f789d47b639c224f3f59f7b0807c443c0eacdbcd96bdb5f53acf964907f5b8f115af8a853da653fdf2714635d838bd2800aa6a481e09fdfb5 WHIRLPOOL 765e10c71b395f98e1ddd2f39e83ca035ea4f175c6a7f310513f5cd7fa4228105aa033044c4979cd641df43930cf990e3294cc26fac332c4a50638cbc938ffed
-EBUILD wspr-3.01.ebuild 2255 SHA256 b877996b38ddfe3cca71986b185cb1c5bf66ce1bc09245af5319ab78760ee147 SHA512 3c5cae543b88863480c09e247ca2ebe84ef831ba3a2bd373f4dc5af7d2f13baefc5b20f9a3ef7f359f6b2110c1b596cf46ba3c434a8e4704571bcf3e9b960efd WHIRLPOOL c2e74d2a4fd2dc05db1d1e57ad6d1396b1eec19314751bc1ce5ab4a202fd55176b0f96bd1770111412567bbd9482690fd7d18e3da4028433c364500d2614831c
-MISC ChangeLog 3693 SHA256 3661b09d80e0cd50f9315e70bf974e4ee4c0de133a25419099d90b285629ecc3 SHA512 1b5b1d09200b9dbd7a218247c6de2288e5681ddece4e66e7527abaf2b0b1a37b2a6b2a98642c8d4148d91739d1cef11633a5a9cc67d90392abd0858c3c095638 WHIRLPOOL a0170a4ea2348931ecb8621f51cd7dbc5f9721646eef7ffbdf6a66a591ab5cae779d72e8dbd4e9a1f62d4b327b8aa926c345f9ef63107cdb11c7657e6b36cd58
+EBUILD wspr-3.01-r1.ebuild 2336 SHA256 20ecc305e948fbc0ef251ee3a4306e6d4d6258ecd02ee90696942582b8fea93c SHA512 340403e189a2742fcc1ee6b61192b44a066a36b15f8c1574838d4808cacf7b5e6d15ba1bb52a90b177cceeda259c7e73a5941e4efe5b3a656177eea7a70fa2d4 WHIRLPOOL 6e684042842e7f988f22cde87c53278621657fbd39e5a80214010fa399dfe5eaca7c048005c3c8b505e80d826a9ae9976fd95cf8fbe3ab529011ad5554d0de37
+EBUILD wspr-3.01.ebuild 2262 SHA256 5a9ca5123462db9bf8d99a18c18e0259f1e5cc965fed003a4d74f1651b69d4cf SHA512 ee08386f2e13973fe7825feb09bc8822f6bd9b4c9520a22e4cdd1cb38f6f15ae5005bf8221acacafdc02ca2adb99f8b4255388c9634bbf19e2a069d5d17a123e WHIRLPOOL c17cc15c667dadbf00912949f1b59fcc708daa825b41b42cb0fe72a35327df5d6f294f5a70c3fb513ce34ca8bf48fc716fcb844b40c204bd00cc774b5139a5ed
+MISC ChangeLog 3900 SHA256 64df512bf40d623f83ae0ea515e880c960376e2c8ec6f9a2dd6e7fc4cec5d75f SHA512 d60b9bbbed5dcdd0e351dcc6d08ddf6e08dd1f5dd6b8c0c59ee7eb9f90ff9ee9a216ac8f2defd968fc350f8bdb2dabc56ffc79bab57de21946e033e8be73351e WHIRLPOOL 0fd08ae8be4c7b5c352d4ab68c6c04c8d3b845e4fba5186e4c6a12a6834d8811850f94fb6fbcfab0aba13f8460c30b4f78647815a95753a3f54ee9ed996c287f
 MISC metadata.xml 241 SHA256 865a729cb9a1d82ea72849efc0d66c4c499e1c87b59757996f3d45bae77df6cc SHA512 eff33b80d9c4469f6f71c50b6cd7d173d7670c28f7e4162c3be23fdd5b4adacf3f0365ebe0827cd1721f24cc5a40440ae1edd78f59e606648e951bbb10378f2d WHIRLPOOL c248807b5f958ae6b54ed780eef3c255eff1c65f5afdf77fa64c4fd0a51cbeeeeef25e1d5ad550c748ba75bd2f1523d0f8d2d71bcf966306d010751c5ace5e4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJXASXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOp3IQAMRdnwA9Q+y3krcVPFxB+RIo
-uQyrorDFdgaOtu+8+yA01EZAEFVz6+eiLH3VW7Y/jD10XhHOJZYW0nNzfXXruW90
-x++detZWRw3rJerJMAV02hgF3MyPHQ/byTe+xqcIHNpbIi9ePed2dLgOCFoqb3El
-Pk/FEvpBDIBQKtFKEklztS7KNmy4IgxOYEspllfNbKTITdLlsfs0vWxfKufU7vow
-+gWEwVa4BCiP78lSQuZGbiz3mXT1MiWeLVVLCiiT/ADsyAKheb49YuXt1NpEiVLy
-VtpeEf4FVaqrW7qnao6xIM1hsP8eSqFp2K2F/6DbfHayx+cKDJGeycaw95U7u8pI
-yrqAWBK4Nmzu2QpDgFVCB/pna5u8lFLQ6sRUwhaHcKdc5OOo2zLol886H9pZJRhd
-WLLFZZTC37wMzSexqFu7sCggTv4DTfsVJGEC15Bu6+UhgT2cGHR7oUT+JzhWB5X1
-T7dA+GQJtDh8Bsgck1YwMCLOpJCd5/etJzoXGbHmjNo1mrpCPHxG8lt9QVbFOEHg
-D+zfg2E4ZCdvUE4xRLNjgWuY2XYKiWj/Sd9C+YUn60DIt8WJy8Bs1hR5oMQSpxf8
-Ec+D14/oXkHY2f7JnAju3LV8k9Lyu38E73IGIk7m6yFDwguGPPlFOGRd1fB5rac1
-4jILM1OvSFlIs179+vBz
-=sVPW
+iEYEAREIAAYFAlVZ9+oACgkQQe4uqXYgU9Xw9QCZAXk6aKV/4FaIGkkdl/tn+2ZK
+VGcAoJemcS2AC3L//eVtWeCY1lhmay0p
+=zYXp
 -----END PGP SIGNATURE-----
diff --git a/media-radio/wspr/files/wspr-3.01-numpy.patch b/media-radio/wspr/files/wspr-3.01-numpy.patch
new file mode 100644
index 000000000000..2c9174dff58a
--- /dev/null
+++ b/media-radio/wspr/files/wspr-3.01-numpy.patch
@@ -0,0 +1,23 @@
+# Numpy-1.9 dropped oldnumeric and numarray
+--- WsprMod/specjt.py.orig	2015-05-18 15:49:37.000000000 +0200
++++ WsprMod/specjt.py	2015-05-18 15:49:48.000000000 +0200
+@@ -12,7 +12,7 @@
+ import w
+ 
+ try:
+-    from numpy.oldnumeric import zeros, multiarray
++    from numpy import zeros, multiarray
+ except:
+     from Numeric import zeros, multiarray
+ import Image, ImageTk, ImageDraw
+--- wspr.py.orig	2015-05-18 15:47:13.000000000 +0200
++++ wspr.py	2015-05-18 15:47:38.000000000 +0200
+@@ -31,7 +31,7 @@
+ from WsprMod import palettes

+ from math import log10

+ try:

+-    from numpy.oldnumeric import zeros

++    from numpy import zeros

+ except: 

+     from Numeric import zeros

+ import array

diff --git a/media-radio/wspr/wspr-3.01-r1.ebuild b/media-radio/wspr/wspr-3.01-r1.ebuild
new file mode 100644
index 000000000000..732de0ce64a6
--- /dev/null
+++ b/media-radio/wspr/wspr-3.01-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/wspr/wspr-3.01-r1.ebuild,v 1.1 2015/05/18 14:32:00 tomjbe Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_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-1.9.0[${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
+		# adapt to numpy-1.9 - bug #544504
+		"${FILESDIR}"/${P}-numpy.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
+}
diff --git a/media-radio/wspr/wspr-3.01.ebuild b/media-radio/wspr/wspr-3.01.ebuild
index 33dfe14a7117..a5b559be55e3 100644
--- a/media-radio/wspr/wspr-3.01.ebuild
+++ b/media-radio/wspr/wspr-3.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.2 2015/04/08 18:14:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/wspr/wspr-3.01.ebuild,v 1.3 2015/05/18 14:32:00 tomjbe Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -21,7 +21,7 @@ IUSE=""
 
 RDEPEND="
 	virtual/python-imaging[tk,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
+	<dev-python/numpy-1.9.0[${PYTHON_USEDEP}]
 	virtual/pmw[${PYTHON_USEDEP}]
 	sci-libs/fftw:3.0
 	media-libs/hamlib