Add patch to improve cython detection. Requested by Arfrever.

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

4 files changed, 44 insertions, 15 deletions

diff --git a/dev-lang/yasm/ChangeLog b/dev-lang/yasm/ChangeLog
index c85739137d9d..b4f43dd9da99 100644
--- a/dev-lang/yasm/ChangeLog
+++ b/dev-lang/yasm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/yasm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/ChangeLog,v 1.52 2012/01/26 13:13:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/ChangeLog,v 1.53 2012/04/03 23:33:17 floppym Exp $
+
+  03 Apr 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/yasm-1.2.0-fix_cython_check.patch, yasm-1.2.0.ebuild:
+  Add patch to improve cython detection. Requested by Arfrever.
 
   26 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> -yasm-1.1.0-r1.ebuild,
   -files/yasm-1.1.0-cython-0.14.patch,
diff --git a/dev-lang/yasm/Manifest b/dev-lang/yasm/Manifest
index a167ba922660..6b97cc57f6e4 100644
--- a/dev-lang/yasm/Manifest
+++ b/dev-lang/yasm/Manifest
@@ -1,18 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX yasm-1.2.0-fix_cython_check.patch 790 RMD160 7c0c58971df06ce7f4e06751beef21b8f09cb975 SHA1 5b8b1710ab2a08630ee5ddc6dbef83f4a87fc2a8 SHA256 1d44a5ea34426c84556e93d3f5774912ca8530c582ad6f1bf738850b515d977c
 DIST yasm-1.2.0.tar.gz 1436502 RMD160 6d2baf27a45d6dbe250f972f18fb6627f50394d9 SHA1 773d28f27f83c44ac35079add0d3167ca6c1def8 SHA256 768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31
-EBUILD yasm-1.2.0.ebuild 962 RMD160 905aa3cfe40858e12405452033e6d2d1e171d3df SHA1 9b0ec0133866d2d0318c1011be0f7481921cf712 SHA256 11f38eb1287f0a90130ee372df24d2d2da5c731d25b35a899cfad380e08fc70b
-MISC ChangeLog 6589 RMD160 e1b9a02cb9666b417d66757c2a6a39e4ab8d52b1 SHA1 4aea1054b4055b6c9eeddda5eece118631821f49 SHA256 8b4d1fd60295f8803fd6ab4137b3f0321ecb200bff179abc979284d0f24cd1b3
+EBUILD yasm-1.2.0.ebuild 1065 RMD160 e36b3d60179be8df44d2e97ac6e5e3602bfbde1e SHA1 69cec12ef20f5595f97172e03bad31158ba79cc3 SHA256 4a77354047805b0135ac95f36bec3930f6bb3c72d57e201aec9de300efe10d2a
+MISC ChangeLog 6764 RMD160 630259124089d9d3e6174095e251a5e8e8feb77e SHA1 e6166b755289834378aac96996bc38c2025bd614 SHA256 cbb7414695bce3cbc3838f978dfb64da45ca28ce3fa0d6ce3781bfc3d94d1d76
 MISC metadata.xml 159 RMD160 d52f9d709e07e1eca289e2940d4292c64fda6029 SHA1 021f81ae2e25595444e199cc4be3c122d37da802 SHA256 38c5ab0a3cf60ec0611d1112056b9ff16183715db2c60a2ac84590da0ce7fb76
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPIVENAAoJEEdUh39IaPFNAcQIAJkbvFFEdNEm4lpm71+0RFrC
-iz/Or7VlGNxErw4gDNb+Cuu4Kr8N9KyOwsz8mDPRRwJejB60chlPwabxOfa2GF9j
-grRHZtyku5RdFjlL8BjM0rG1fSTHfmrHk0tawqrb3/BihntcR1j6VZFdoJQIPaqe
-P660XCgLKREK5YACZQ1rUv8H2JeZI8XWb86PvWNtdiz5MFG8VVxjz/qYocoRb5DI
-IgRY4FHAg11hSTp5az8wdZE8R0rhblv3cHyAFFF+JchFcAhSo9idxRJiolVAIou9
-oOzHOM5lhA7PzMX5/xXl5sjYT/vBf42ZO5bhY38eeRGKamBqwzIGEYo75VSZapI=
-=ZS0X
+iF4EAREIAAYFAk97iMIACgkQC77qH+pIQ6SqUAD/cyzdwpgOCl1uV3ADA1HmwCgV
+E0JcvqXVbtU9Dd+uAuwA/iebag4KwGa/q70eACO/AtRY/TeQkTu5yPKbU7ABsayd
+=h7/L
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/yasm/files/yasm-1.2.0-fix_cython_check.patch b/dev-lang/yasm/files/yasm-1.2.0-fix_cython_check.patch
new file mode 100644
index 000000000000..c894f821a2aa
--- /dev/null
+++ b/dev-lang/yasm/files/yasm-1.2.0-fix_cython_check.patch
@@ -0,0 +1,23 @@
+http://tortall.lighthouseapp.com/projects/78676-yasm/tickets/249
+
+--- m4/cython.m4
++++ m4/cython.m4
+@@ -2,13 +2,14 @@
+ dnl be set before this function is called.
+ dnl  CYTHON_CHECK_VERSION([MIN-VERSION], [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+ AC_DEFUN([CYTHON_CHECK_VERSION],
+- [prog="import sys
++ [prog="import re, sys
+ from Cython.Compiler.Version import version
+ def get_int(arg):
+-    try:
+-        return int(arg)
+-    except ValueError:
++    matched = re.match(r'\d+', arg)
++    if matched is None:
+         return 0
++    else:
++        return int(matched.group(0))
+ # split strings by '.' and convert to numeric.  Append some zeros
+ # because we need at least 4 digits for the hex conversion.
+ ver = map(get_int, version.rstrip('abcdefghijklmnopqrstuvwxyz').split('.')) + [[0, 0, 0]]
diff --git a/dev-lang/yasm/yasm-1.2.0.ebuild b/dev-lang/yasm/yasm-1.2.0.ebuild
index 41fc8b2603a5..8b7310ab363b 100644
--- a/dev-lang/yasm/yasm-1.2.0.ebuild
+++ b/dev-lang/yasm/yasm-1.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-1.2.0.ebuild,v 1.5 2011/12/23 21:01:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/yasm/yasm-1.2.0.ebuild,v 1.6 2012/04/03 23:33:16 floppym Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2:2.7"
-inherit python
+inherit autotools eutils python
 
 DESCRIPTION="An assembler for x86 and x86_64 instruction sets"
 HOMEPAGE="http://www.tortall.net/projects/yasm/"
@@ -28,6 +28,11 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix_cython_check.patch"
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable python) \