3 files changed, 31 insertions, 12 deletions
diff --git a/media-radio/wspr/ChangeLog b/media-radio/wspr/ChangeLog
index dc4e681398ca..1e8e60edca1b 100644
--- a/media-radio/wspr/ChangeLog
+++ b/media-radio/wspr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-radio/wspr
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/wspr/ChangeLog,v 1.1 2011/04/03 06:50:56 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/wspr/ChangeLog,v 1.2 2011/04/10 21:39:35 arfrever Exp $
+
+  10 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  wspr-2.00.ebuild:
+  Use Python 2 (bug #362339).
 
 *wspr-2.00 (03 Apr 2011)
 
diff --git a/media-radio/wspr/Manifest b/media-radio/wspr/Manifest
index 4950ffe6ab4f..9e47cecb9566 100644
--- a/media-radio/wspr/Manifest
+++ b/media-radio/wspr/Manifest
@@ -2,13 +2,23 @@
 Hash: SHA1
 
 DIST wspr-2.00.r1714.tgz 2096056 RMD160 71bc7ca20157a09cd3b837c822e18b3474685007 SHA1 d5f70e6118d8550c02d695adc76bbeed4c8c1a0e SHA256 6a0e13f354d4e228337ee550851f36027281e268385961505a6757fda1ffc423
-EBUILD wspr-2.00.ebuild 1851 RMD160 f5d96f88ad907846345a765eb40aa18d35c08da8 SHA1 588a1db1424d52124c3a2f96a68f505a6084c045 SHA256 64dc2de57acec993d6f509a65daacdcc0445e25507a9b79a4522cd6cb2a1617f
-MISC ChangeLog 1575 RMD160 0a3d3e72fa1e3ee3f19bcafd11bb74a479a2b152 SHA1 5ef86da8632538c65e2c767163d666a0a5c32928 SHA256 b0539eb39a9d36bf9554d2499f4cc46ac3a604a14fb57aea13c7ad6037cf1e35
+EBUILD wspr-2.00.ebuild 1910 RMD160 ec9de20e97e26a6aaa6a92e4649bba5373db879c SHA1 f4e4bd7a2d0d8c0961a4fe365cb50541750cb473 SHA256 077b0464a5db5b242e52df4252379c5398e56865d6488773783e1f2e9642ba61
+MISC ChangeLog 1701 RMD160 d103603499b5f7a1c14c9abb23d9255ee3a16f8f SHA1 c210d4892962ec36d48aa32101177c0c66ae99b8 SHA256 2c9a18cda9d120e05d578fcb3d65ffd02f5efc875d8927fd40018db4c41353c3
 MISC metadata.xml 258 RMD160 8dcd1b5ec7d563929e9bf5342287ac1bca5e2263 SHA1 a1e9f2c99c641f6c286b195e83d3236192d0499a SHA256 2d835c209f29ece6f3fee582b932a53ad40047911b35d4950e21da63da4f856f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2YGNwACgkQQe4uqXYgU9XylgCggaNtS2xTxkqZvcUbKjVF6WNq
-WfcAoJRDRdOTw2BVaUYZ5nVAM/JdINvJ
-=VPFf
+iQIcBAEBAgAGBQJNoiOqAAoJENgZr6v6gHY0AwIP/1apqwLQuxf+UCO3aXFAVjjf
+c7taN/0bcJ6FEvhMSmPLLs4AkojyL9FCIjaOHIQHjqc66s0aNKgOQTMrPAIALskW
+3CqDLgBOIv37e+Su5FLkY4vKLlx8xXogZ+p/BqTDOamuyAowAlyfA38ynU/01r59
+qJ3FPWCNrZ/x+3XU1+blh76iM3LRgyQO3KhQ2SdatAhvrBgHjaq3FxtE/vb9osmC
+kqad9zU4R9Kt7t60d2EkEBZn9Wzi9x9isXlLIPoQtngB9sA+0uX5TrpWOAC+/0mu
+pgFm0wAsT+Ocg7R31K0G62J7iBDTdWsBW5I07dnqQWXXzP/dFauVmqX/9ayiK+6C
+e2PZ8JO7bGwUhC935/iv7JWL/5NxpU/pZ9DTQ0JzT1vRhYzFJJbAhzmHpWlzxjaW
+QSta2aRDpOcuc+vAiZCwjk/070ay0a9/yDU/LeN+P8MKDWkZHMU0O+vTxY592CRi
+O8BmZxtmfhf9NpVhkZ9K4ah1E2PN6aduRfdEOb7e5ZCHYSIK/G9I/lKwBOtHakO4
+m2ITLCGcFFLjGKswwAIcxrdqnsiFiH9wNVSboTJ9jG3gW/a5H60fSFEcCckIYhq9
+JZxmIwwhfHjFynT4Vrz7HfXZiiNTYdF/ZUY7J0B1kCKgY0QqWtikoDEAuJ83OKvM
+YyY2fevQxwmj9icYYnBy
+=8W//
 -----END PGP SIGNATURE-----
diff --git a/media-radio/wspr/wspr-2.00.ebuild b/media-radio/wspr/wspr-2.00.ebuild
index 073bebf09eba..ea16b10d6b5c 100644
--- a/media-radio/wspr/wspr-2.00.ebuild
+++ b/media-radio/wspr/wspr-2.00.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/wspr/wspr-2.00.ebuild,v 1.1 2011/04/03 06:50:56 tomjbe Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/media-radio/wspr/wspr-2.00.ebuild,v 1.2 2011/04/10 21:39:35 arfrever Exp $
 
+EAPI="3"
 PYTHON_DEPEND="2"
-inherit autotools distutils flag-o-matic multilib python toolchain-funcs
+PYTHON_USE_WITH="tk"
+
+inherit autotools distutils flag-o-matic multilib toolchain-funcs
 
 MY_P=${P}.r1714
 
@@ -18,9 +19,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-lang/python[tk]
+RDEPEND="dev-python/imaging[tk]
 	dev-python/numpy
-	dev-python/imaging[tk]
 	dev-python/pmw
 	sci-libs/fftw:3.0
 	media-libs/hamlib
@@ -39,6 +39,11 @@ get_fcomp() {
 	esac
 }
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_prepare() {
 	tc-export FC
 	get_fcomp