Improve build logic. Thanks for help Michal

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

3 files changed, 35 insertions, 38 deletions

diff --git a/media-radio/wspr/ChangeLog b/media-radio/wspr/ChangeLog
index 596d04d3d869..529c54a43097 100644
--- a/media-radio/wspr/ChangeLog
+++ b/media-radio/wspr/ChangeLog
@@ -1,6 +1,9 @@
 # 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.8 2013/03/03 16:59:10 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/wspr/ChangeLog,v 1.9 2013/03/03 18:42:51 tomjbe Exp $
+
+  03 Mar 2013; Thomas Beierlein <tomjbe@gentoo.org> wspr-2.00-r1.ebuild:
+  Improve build logic. Thanks for help Michal
 
   03 Mar 2013; Thomas Beierlein <tomjbe@gentoo.org> wspr-2.00-r1.ebuild:
   Fix lookup for portaudio (bug #459024). Thanks for reporting Michal
diff --git a/media-radio/wspr/Manifest b/media-radio/wspr/Manifest
index a89f3438a4f6..ce1f3041623c 100644
--- a/media-radio/wspr/Manifest
+++ b/media-radio/wspr/Manifest
@@ -5,14 +5,14 @@ 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
 DIST wspr-2.00.r1714.tgz 2096056 SHA256 6a0e13f354d4e228337ee550851f36027281e268385961505a6757fda1ffc423 SHA512 221ca3c4ac433d5fb292830e183ef4ce44a9b0b31c8c1446faf30c1c2d6fe88cb471434c01126450843af49249e33bf6eccf1cbf839e6c5a09a3206c64a01d78 WHIRLPOOL c46fa1232c16ba42f8a9cf5fe1821291c339a776f2c1afe9ca4933574c026607bc789c31a496581f06d746297d9dfcc4252b79f52b1b38f8292134b445ab353b
-EBUILD wspr-2.00-r1.ebuild 2066 SHA256 a659de9c29fba1c20a2bc760bd98b551b58c0a1cc678c6018bea64f6a191f2aa SHA512 fc981f643dccbede8eab340e0134bce113ddf855c07c3cb43432109ca52e76d30f2ec40b83ee795692f62c1925f7d5dce1ca803ecbbf62edd1016542dd8e77a1 WHIRLPOOL 7baf7bc07533583e6405aa80108026b7afcafc21669ee0c8f6842a897c9a78815088e212cdb863b3c30ee30f0b743a931619249cb441907a2e5690b1e636c07a
+EBUILD wspr-2.00-r1.ebuild 2139 SHA256 e7282d022ac6799e1cf446b8271f777c13916c7192fd48a74ec9cf56747e12eb SHA512 531af0c44867eb7ec88c1d0bc3768fbdb36d17aebcddeb07c02a747077a78ee65216ad81a1f5e3659d079702a876b6c9f5fbb7cc70d20eea902ea2a589808217 WHIRLPOOL 070876754b2c5a8613f9801924b9c734bb82e7ac28240f31ec152406a7268c8b53a1e930519a67aa4fceb4a3c4f9d45646513c737acccbfa756440116ae9e76d
 EBUILD wspr-2.00.ebuild 1941 SHA256 6dc6655a5616b8928d53a7455aaa4d181f4120c0268aca0d8bd80ad5fcf3f2fe SHA512 2f823e1cfcd21e418c7c85b1e27f7fc02e47aaf9d868a82385b6c73fd52481bde2d8dd29fe68d2a97f49d0f721fc9cb559e7f413ae66cff6ad54887c77446b11 WHIRLPOOL 172d97f0d38d36c33dbb3f15e0b3ca66da785dd92703d0316c255632ae2da1be680e4e0c583e963893dc30bafe3926ee83a100d5738afbdc3c95f8cce61a98e7
-MISC ChangeLog 2590 SHA256 8f0f36f82994c894bdb28e08733bd7a57114c2c17b4d6074845618250a122b4e SHA512 9512ea575b847039ea0d89cfbf811a361a1cc768fec70228ba689697d38a1f9269c33ce59bd2806581e4b993024483aa3f7411c1bf913d0b72fe6e1d5bc0d1e4 WHIRLPOOL 29fef4a2467f6b375a593f4c1ad0868e89ed9985adfdca914ad88b678a831e81aba8a548a25e659d8381f1c8c562cdf4b2ec54488360c1d5c17573d1cf4eed8c
+MISC ChangeLog 2710 SHA256 b0cd1afa5b8c58db93c21753cea29efba63bbe4204a313dcfce69104bcbb67d2 SHA512 7339f3ec6afeb6a5f8b5a660ebf979e207bd9e37f0f24c16aa3d3528996468988aa48a6f43a67eb72b2d894cb7a89136dc2b4288cf77143df52dc15940937d61 WHIRLPOOL 156fe91e83caa5914cdde3cad9ddd21317c67f659174ee4524e12135ca39d2a776cc39c27a2fc9bef8d968d897b8780ed03c0170ceedd1e3a3ba856b7604b1d2
 MISC metadata.xml 241 SHA256 865a729cb9a1d82ea72849efc0d66c4c499e1c87b59757996f3d45bae77df6cc SHA512 eff33b80d9c4469f6f71c50b6cd7d173d7670c28f7e4162c3be23fdd5b4adacf3f0365ebe0827cd1721f24cc5a40440ae1edd78f59e606648e951bbb10378f2d WHIRLPOOL c248807b5f958ae6b54ed780eef3c255eff1c65f5afdf77fa64c4fd0a51cbeeeeef25e1d5ad550c748ba75bd2f1523d0f8d2d71bcf966306d010751c5ace5e4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEzgWUACgkQQe4uqXYgU9UTNgCggGz9ojwtiI7PUNlhJNo/1TdI
-1q8AniaiBylLYEZ78uajJSQlH2jvBjDx
-=OGJm
+iEYEAREIAAYFAlEzmbQACgkQQe4uqXYgU9XH7wCgpr4PllA9xs5vDAZnsKS+XA8B
+BG0An1QegNYUFmd9rv/SELm9Spw5LVd9
+=GEmS
 -----END PGP SIGNATURE-----
diff --git a/media-radio/wspr/wspr-2.00-r1.ebuild b/media-radio/wspr/wspr-2.00-r1.ebuild
index bb20f05cc373..98ec86e26d7b 100644
--- a/media-radio/wspr/wspr-2.00-r1.ebuild
+++ b/media-radio/wspr/wspr-2.00-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/wspr/wspr-2.00-r1.ebuild,v 1.2 2013/03/03 16:59:10 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/wspr/wspr-2.00-r1.ebuild,v 1.3 2013/03/03 18:42:51 tomjbe Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@@ -31,16 +31,8 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-libdir.patch
-	"${FILESDIR}"/${P}-verbose.patch
-	"${FILESDIR}"/${P}-script.patch
-	)
-
 DOCS=( BUGS WSPR_Announcement.TXT WSPR_Instructions.TXT WSPR_Quick_Start.TXT )
 
-DISTUTILS_IN_SOURCE_BUILD=1
-
 pkg_setup() {
 	fortran-2_pkg_setup
 }
@@ -52,48 +44,50 @@ get_fcomp() {
 	esac
 }
 
-python_prepare() {
-	sed -i -e "s#/usr/local/lib#/usr/$(get_libdir)#" configure.ac || die
-	eautoreconf
-}
-
-src_prepare() {
+python_prepare_all() {
 	tc-export FC
 	get_fcomp
 	export FC="${FCOMP}"
 
+	local PATCHES=(
+		"${FILESDIR}"/${P}-libdir.patch
+		"${FILESDIR}"/${P}-verbose.patch
+		"${FILESDIR}"/${P}-script.patch
+	)
+
 	distutils-r1_python_prepare_all
-	python_foreach_impl run_in_build_dir python_prepare
+
+	sed -i -e "s#/usr/local/lib#/usr/$(get_libdir)#" configure.ac || die
+	sed -i -e '/makedirs/d' setup.py || die
+	eautoreconf
 }
 
-python_configure() {
-	# configure the built of the fortran module
+# 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
 }
 
-src_install() {
-	doit() {
-		rm -rf build || die
-		distutils-r1_python_install
-	}
-
-	python_foreach_impl run_in_build_dir doit
+python_install_all() {
 	distutils-r1_python_install_all
 
 	dobin wspr
 	insinto /usr/share/${PN}
 	doins hamlib_rig_numbers
-}
-
-run_in_build_dir() {
-	pushd "${BUILD_DIR}" > /dev/null || die
-	"$@"
-	popd > /dev/null
-}
+}
\ No newline at end of file