Fix build with python enabled (bug #421167), use native python implementation (C implementation is deprecated), and force lv2 support when tests are enabled.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

3 files changed, 24 insertions, 17 deletions

diff --git a/media-sound/ecasound/ChangeLog b/media-sound/ecasound/ChangeLog
index 8cd8f296fb97..996ffff64a0b 100644
--- a/media-sound/ecasound/ChangeLog
+++ b/media-sound/ecasound/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/ecasound
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ChangeLog,v 1.64 2012/06/14 06:22:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ChangeLog,v 1.65 2012/06/18 08:36:51 radhermit Exp $
+
+  18 Jun 2012; Tim Harder <radhermit@gentoo.org> ecasound-2.9.0.ebuild:
+  Fix build with python enabled (bug #421167), use native python implementation
+  (C implementation is deprecated), and force lv2 support when tests are
+  enabled.
 
 *ecasound-2.9.0 (14 Jun 2012)
 
diff --git a/media-sound/ecasound/Manifest b/media-sound/ecasound/Manifest
index 73f60979ca6c..00bcef5ae338 100644
--- a/media-sound/ecasound/Manifest
+++ b/media-sound/ecasound/Manifest
@@ -7,17 +7,17 @@ DIST ecasound-2.8.1.tar.gz 1056331 RMD160 f4b86264e43d2ae7b7bedb7cd75955125a1aa2
 DIST ecasound-2.9.0.tar.gz 1055913 RMD160 f30bd6a0b491bca8466564ebe2c70f3945fd3906 SHA1 aed604742968085a8e95cdebb21dc62f1d90d2b5 SHA256 e2b0b8f8cce6074d660e460b3a02fc0132a51e1e982b78b3a68fa14e79fcc6c6
 EBUILD ecasound-2.6.0.ebuild 1977 RMD160 720e073a2acaf7a00d4e3fd34a30729e6e66ae23 SHA1 29d160128724df3a02d5d532a369a5af8934e3a0 SHA256 544554827269fcb5a3fea26bf9b0df1b180f6d6d4eb229b2be02b7a5da121597
 EBUILD ecasound-2.8.1.ebuild 2420 RMD160 24f1cf50518a7a59925913bfa088d497d47f2907 SHA1 f728f28dcc4f3c5d12835941ef0975fa88897c74 SHA256 956accf4a805a9bd9ccf946f5adb3aef692071557fa5470a55561d5b92ccf9b6
-EBUILD ecasound-2.9.0.ebuild 2407 RMD160 b0a6f15be7b797dc70704b482d0a96b8c93af1f9 SHA1 9cba1d0450bc6aaff292c629e65c231c50571132 SHA256 e85ca0c33524e5be6c0cd39e4c5d785f9a55f8ea0fcb74faa02247367a306be3
-MISC ChangeLog 9943 RMD160 efd28b1b8c03630244ec48fee75e2f3be1a97356 SHA1 4b4d44c883e59681f69f98c39e00bde8a93d4057 SHA256 dbc9fe64e73a27790ad244812a29c5048f1fa375ec3b567ac31e3c21c40c4153
+EBUILD ecasound-2.9.0.ebuild 2446 RMD160 c3f9d7286586c8b0895766ec7684b451f3428a7b SHA1 39d9601340786377b0fe28c55f62bd78872128e4 SHA256 8004b8b8982e126d482a12c1f94facdbfbc10f73f4e37809a084d50d474f6f67
+MISC ChangeLog 10180 RMD160 43c9b20ee4afccf50e5f804a2e0679951b7126fd SHA1 023f1019a3513e7b3f8a1d74c25032afd56ccf01 SHA256 09c84906036982f489e0e2e5af1c43e0a5fa08d8eb4dfeba1d20a7c771926cc1
 MISC metadata.xml 897 RMD160 56b648b106e82baa0b7eef80f12c5763d435243f SHA1 ad42a9626b32d9c21da60fa98bbb54e5f5844c92 SHA256 730adb94504de6b61b6614960773d218f759bad74bc4fd208d780524384f9f66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP2YM8AAoJEEqz6FtPBkyjQrsIAIAPTW8dxW9WO56TzrYudBum
-l8EzWvJrvWkWWLBoNlZ3xC6+LHiNRGJPc7u3T2V4ZcHVYI1DrONfeMbcIoyQ6/j8
-C+9i9BPq8fRPxeCrWtEFXesMyy4xfuEYEGgLuIivQYZtTTaC5YcduEPSdxtpB6xD
-X8No/YuhBP+RPwhnBO3r26+Bs2tCFBdtwfgO1kg0EEsL43yOaEJD+VpxS8/kFfdt
-naH5YnBIsUeFj8fWTIkYVUwhHv+FObC8ZHSJ/d/m0CyYPLL0/XfzKhthQDDF4orU
-fKyI9hU9oplQFPuL5UcAW2dDx2WCuhmY1St24pEkmbvNE3SzEvhZ4txKcFhyltc=
-=9syF
+iQEcBAEBCgAGBQJP3uitAAoJEEqz6FtPBkyjGAcH+wZlEIL7CoJggZ7oTrfn1oVX
+rE1MoleqSE62JawU9cO1u6+moiPwBclpFP7DPIv9aQyEdKKO8EFZpeImJLYBvGwu
+wmu7FJ3B8JqAlZMGlyz813q57BGELfbs6R+lLP78JtzkxbXq2k3remdeo+j1QZBd
+zlg4lqpgkD5qTk3xB4SYWMgy6iQhkXTiAj3y6eXTHIvnKh0wK5JOZQjuDxH4+W4P
+9CJPelN2c53T5dAHW8/aD4xLeAXnugRtJGVgwYldIlJaI7kOOAhIcyzOrQhf/Qzr
+aa6JYzWjvNzKKFJK932twPzYWlFXsUlIRbyuGhHGNSD+DgzpYtXsB7Jvw34h+Fw=
+=OtzL
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ecasound/ecasound-2.9.0.ebuild b/media-sound/ecasound/ecasound-2.9.0.ebuild
index 7a07eec141ae..18b77a5cc9eb 100644
--- a/media-sound/ecasound/ecasound-2.9.0.ebuild
+++ b/media-sound/ecasound/ecasound-2.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ecasound-2.9.0.ebuild,v 1.1 2012/06/14 06:22:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ecasound-2.9.0.ebuild,v 1.2 2012/06/18 08:36:51 radhermit Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2"
@@ -15,7 +15,8 @@ LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="~amd64 ~x86"
 IUSE="alsa audiofile debug doc jack libsamplerate lv2 mikmod ncurses oil osc oss
-python ruby sndfile static-libs"
+python ruby sndfile static-libs test"
+REQUIRED_USE="test? ( lv2 )"
 
 RDEPEND="sys-libs/readline
 	alsa? ( media-libs/alsa-lib )
@@ -34,7 +35,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 pkg_setup() {
-	use python && python_set_active_version 2
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
 }
 
 src_prepare() {
@@ -52,11 +56,8 @@ src_configure() {
 	local pyconf
 
 	if use python ; then
-		pyconf="--enable-pyecasound=c
-			--with-python-includes=$(python_get_includedir)
+		pyconf="--with-python-includes=$(python_get_includedir)
 			--with-python-modules=$(python_get_libdir)"
-	else
-		pyconf="--disable-pyecasound"
 	fi
 
 	econf \
@@ -74,6 +75,7 @@ src_configure() {
 		$(use_enable oil liboil) \
 		$(use_enable osc liblo) \
 		$(use_enable oss) \
+		$(use_enable python pyecasound) \
 		$(use_enable ruby rubyecasound) \
 		$(use_enable sndfile) \
 		$(use_enable static-libs static) \