Apply a fix from Arfrever on freenode to make installation with pypy work.

(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

3 files changed, 40 insertions, 7 deletions

diff --git a/dev-python/pyalsa/ChangeLog b/dev-python/pyalsa/ChangeLog
index cc2a0dd2e490..f0e1f80d0720 100644
--- a/dev-python/pyalsa/ChangeLog
+++ b/dev-python/pyalsa/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyalsa
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyalsa/ChangeLog,v 1.24 2012/02/20 14:42:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyalsa/ChangeLog,v 1.25 2012/02/25 23:48:55 marienz Exp $
+
+  25 Feb 2012; Marien Zwart <marienz@gentoo.org>
+  +files/pyalsa-1.0.25-no-build-symlinks.patch, pyalsa-1.0.25.ebuild:
+  Apply a fix from Arfrever on freenode to make installation with pypy work.
 
   20 Feb 2012; Patrick Lauer <patrick@gentoo.org> pyalsa-1.0.22.ebuild,
   pyalsa-1.0.24.ebuild, pyalsa-1.0.25.ebuild:
diff --git a/dev-python/pyalsa/files/pyalsa-1.0.25-no-build-symlinks.patch b/dev-python/pyalsa/files/pyalsa-1.0.25-no-build-symlinks.patch
new file mode 100644
index 000000000000..2b02c8afe776
--- /dev/null
+++ b/dev-python/pyalsa/files/pyalsa-1.0.25-no-build-symlinks.patch
@@ -0,0 +1,25 @@
+The build system creates some symlinks that are useful when developing
+but get in the way when we install for more than one python. Remove
+these.
+
+Not a patch for upstream, as it makes development slightly more
+complicated.
+
+Patch by Arfrever.
+
+--- setup.py
++++ setup.py
+@@ -57,12 +57,3 @@
+         packages=['pyalsa'],
+         scripts=[]
+ )
+-
+-uname = os.uname()
+-a = 'build/lib.%s-%s-%s' % (uname[0].lower(), uname[4], sys.version[:3])
+-for f in ['alsacard.so', 'alsacontrol.so', 'alsahcontrol.so', 'alsamixer.so', 'alsaseq.so']:
+-        if not os.path.exists('pyalsa/%s' % f):
+-                a = '../build/lib.%s-%s-%s/pyalsa/%s' % (uname[0].lower(),
+-                        uname[4], sys.version[:3], f)
+-                print a, f
+-                os.symlink(a, 'pyalsa/%s' % f)
+
diff --git a/dev-python/pyalsa/pyalsa-1.0.25.ebuild b/dev-python/pyalsa/pyalsa-1.0.25.ebuild
index 4f831040fb0f..3dec3805b1b5 100644
--- a/dev-python/pyalsa/pyalsa-1.0.25.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.0.25.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyalsa/pyalsa-1.0.25.ebuild,v 1.2 2012/02/20 14:42:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyalsa/pyalsa-1.0.25.ebuild,v 1.3 2012/02/25 23:48:55 marienz Exp $
 
 EAPI="2"
-PYTHON_DEPEND="2:2.5"
+PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-inherit distutils
+inherit distutils eutils
 
-DESCRIPTION="Python Bindings for Alsa lib"
+DESCRIPTION="Python bindings for ALSA library"
 HOMEPAGE="http://alsa-project.org/"
 SRC_URI="mirror://alsaproject/pyalsa/${P}.tar.bz2"
 
@@ -24,4 +24,8 @@ DEPEND="${RDEPEND}
 
 PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
 
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+src_prepare() {
+	distutils_src_prepare
+
+	epatch "${FILESDIR}/${P}-no-build-symlinks.patch"
+}