fixed build with cython-0.22 (bug #543136)

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

diff --git a/sci-physics/espresso/ChangeLog b/sci-physics/espresso/ChangeLog
index 7464f423e91eef5e7253c27fda999eee5a44d96a..e9ecf11924f356e791b8134011ff468067802b56 100644 (file)
--- a/sci-physics/espresso/ChangeLog
+++ b/sci-physics/espresso/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/espresso
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/ChangeLog,v 1.18 2015/03/07 23:40:50 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/ChangeLog,v 1.19 2015/03/16 16:11:55 ottxor Exp $
+
+  16 Mar 2015; Christoph Junghans <ottxor@gentoo.org>
+  +files/espresso-3.3.0-cython-0.22.patch, espresso-3.3.0.ebuild:
+  fixed build with cython-0.22 (bug #543136)
 
   07 Mar 2015; Christoph Junghans <ottxor@gentoo.org> espresso-3.2.0.ebuild,
   espresso-3.3.0.ebuild:

diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index f206fba2731b455e744f52ac280e1d6c2a3364b5..dea42149d74586e31986275f84718d7192f1ae92 100644 (file)
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX espresso-3.3.0-cython-0.22.patch 740 SHA256 4e64587a1133b4c42eb570370ea8c98b44ff70ee35fc997de22be2e7c8eb60f8 SHA512 ce35b5d657588c607d6ccaa4c4353de95f7f82ebf799ec4093f14ea912a1e26ea42144dc83ecb20f0e12855b5ef4403bb0ada5420e00c70ddc6e6c531ce16796 WHIRLPOOL 5180f33fb11d5ca4856d293cfddcad2e6956466a1fdbbeaf1fc63ce140f2f202dbed6a673c638884461bbc5d59794788cbb55469a4d15305f147a3937a49a7bf
 DIST espresso-3.2.0.tar.gz 16688287 SHA256 64f87b4a9cf02aa7b836a9c20d971aafae4b858e532ad2a9cb1ca750883f9118 SHA512 557127b82af97ca2eff1f3951e1c5792b22ef80d2d6e00c8f10c98540c64040fd02500126dd24f944c70de717b09e444a4e887f5da245391d0504fe66f59e10e WHIRLPOOL ed8b225bf4cb3a6eaa1fc1052c373345f0a317ceb4e2fea4df35c36fe5334c1fd40d5986d17624ed281c173c73217aeb109cbca822a0439768fdaac01ca7b09d
 DIST espresso-3.3.0.tar.gz 18952622 SHA256 64ea2684e4fc0d31c11969e49ec74c25138b4f74686f67b93c7e1103833ff08f SHA512 90edbbdc8d7f7247b5179fce0fad796a9488f82a1754519918c6588c932050675397d36e0167aae770db9803b6c22f7d14d23c04cf307d10802afd3d5d5edc20 WHIRLPOOL 3e9547f2da6676edf3de415fa848301f2959c3dfeef1c3f461b4e1eb202224ead7635748b47d42edb9f661dc5d672f38168e15ab6c55a9c9d7f102ae11f8574e
 EBUILD espresso-3.2.0.ebuild 2781 SHA256 8c523932cbba5891369dfc18173c555b1019d734c9e0b9f5b62cba31eeb81b96 SHA512 c9baf50c879e44719f5fb3f1a5ab11164ab9928d03c6df0f12e943e5104d90266c19ff95cb3d236a9e9783d0e1e6bfc732bb7972d8f42e7cc1bff57cb30c43f9 WHIRLPOOL a3162f34e9645021a453d1050902a7836a3fb83d59720811ab5c938f5b716c7faa6aa15cdbd93063d6f3a9c22d02c6ffd4b3f6d32b2660e532ea87d9e24232a0
-EBUILD espresso-3.3.0.ebuild 3209 SHA256 88c60b03fa3e364ccbd0386d3fa2766c1dbfeb52680377c990c7f6cd08c8dd9f SHA512 c22f711db6145ac1ba748ee4b8503e2de3bf472ca1f97d917e8afd425a0d000dbb33a1a82010ff7d4471fab333e86f08228295369fb03a15e535a54f6ec12304 WHIRLPOOL 6a5039a1d971205fa3528f21b6fad7017780a8f1c733f756a22b63d135085e5a93fad9a1ffb970ca151ffb1879028c5879b98a5806f5734a0811006e44dc4814
-MISC ChangeLog 2724 SHA256 1be71188bf11b931ebb1e3572e416c4c62202374a2948e100d60d813195447c7 SHA512 4ee5a779416ddd02e926b3cdfa3decae1483de2b8a212fa63673135cd8861ef0561581392764a750819abd0c363602cf2e6f51b5dc61f73743edb6983a7ab2e2 WHIRLPOOL 7245b31ee1019afbcf2e9685b7baa2a71f2b6f5a913eb2a86261f98a3eea4bf5370cb61be280b756bc4952fb6d0d454d6e81da85154d533d79c6f4f521af28e6
+EBUILD espresso-3.3.0.ebuild 3258 SHA256 7ec4eafd17ba383f6229fb6b9c12061a19fb33daeef459d60e5873eef6807876 SHA512 cb1502935a8696a9c0587b610807a3c2241ed5cfb6909c569ac81fc8945354b32c6f8fc9be025ac1287b4bbc2727309e265f52437bfe7042d8c41c1bfcf95cf0 WHIRLPOOL 94aff6339c9da35442a1f8b7901349e8140e7f14e82fab895390f464220907f4e5c665198b9f0762f16c41b6327d3b856e906b431c6115523965fb035f7b716f
+MISC ChangeLog 2890 SHA256 4056aa9fb026eefbc858d7448b3da6e72d90b3f5cad335c6ecb99db9d9fccd13 SHA512 9f719a29375240e90707c1ffa36c576c927378fee6d71969c5cf4505a75a5ad92f4dc5c69e35efbf99ec1f60c4bcd942f9933304a5254d43671a68ef0f51900a WHIRLPOOL 640287d2e55b7cb79e07ba023d81e2f9ad1bee99bb6e905c63629225f83535176af2c42dc9694af08e067abb5a2c3e5d9055f2f70fc9839119516a69fdfb3057
 MISC metadata.xml 451 SHA256 eb96c98f12bf924ab770da9e8d5ed1cefd98c2e1c7f415382551a37e4abac00d SHA512 e76a0532a764e6aaf565fb2e3d4fe2fc792243ae3381cdaae267c800ed96b7ef2087677e0fdd1d5aee9b0e3afb7810d8d2370ba28c6478b2738447b3c137d8bf WHIRLPOOL fa8022d0c2c3a4263149f8c23664042371e1c51af1eff20168c3a2d96b37270d344566e2270160956d0157265d507fca938e85ec7b6e2200bbe865d15b469bde
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJU+4yEAAoJEOeBhlrCAAWGdrIH/2ckiZHk2zxr3HndcT80Ioce
-82/YcLrFAMO1acmvg41nNrrBlwBTcJjArML23eOUevupnKQx1DztCK1VP8ecEOAj
-U1q+sLFKRa5F7LcstyKc0BqH6yuu0LrMhDEoR4F9u+RUgfkP0A9AKdfeO0kjkOGX
-PiaqcvGFWVi4/62d6Fix2hoji3QiSxSU1X9fD1Gnsser/4YJNpKOGj1u3rSF6SSY
-TYmQRnvbZxLpOLjOprA4SwOI5bWJPcUQ+m7D1vDdUySy5koLD0BJ5iUhWY6IAZIP
-laYIej5zPNR2rFpKZHhkr5Y3zi4n9H2ZKu+iHO8lHrA8Yh1NQxPzAqX98YdOoOk=
-=t0ac
+iQEcBAEBCAAGBQJVBwDQAAoJEOeBhlrCAAWGI2cH/1OrdCDhAMbHh1iv90t6ktKh
+Sngk0UA79rYqNjj+7F6K9WwQRklgvP8MydLITm8t6L+yaDAnS403plUbko3xOlC5
+r8iavtWQGI2fplJoaBn+lCTumyl8/7FdJnTEDoGFqU2irTCLfoLwtqzSi28g007g
+w8VmjbwTEsKqgjkQKYUtVLKMGWk9tSkl8X+lL4I9WsFFOXNZMJxM0nGgTh2b20Qj
+uM1+TqtcJ17xUydSMGUn75fp9gG5pEZbR0OGwAsnHYTZhjhlsFa5N+/mnw19HaRE
+reVvs8gs63uOfhdw/JAeteORkMOl9+ovFfPMuRd9ETfEV+dkM7+OJ3M/2UsXBmM=
+=PAjf
 -----END PGP SIGNATURE-----

diff --git a/sci-physics/espresso/espresso-3.3.0.ebuild b/sci-physics/espresso/espresso-3.3.0.ebuild
index 56feee77c7d73f3ac4f306a13a8e38da3e265035..63f96f7eba645abcc3ff619f529a9ed6566f836e 100644 (file)
--- a/sci-physics/espresso/espresso-3.3.0.ebuild
+++ b/sci-physics/espresso/espresso-3.3.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.3.0.ebuild,v 1.2 2015/03/07 23:40:50 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.3.0.ebuild,v 1.3 2015/03/16 16:11:55 ottxor Exp $
 
 EAPI=5
 
@@ -53,6 +53,7 @@ DEPEND="${RDEPEND}
                virtual/latex-base )"
 
 DOCS=( AUTHORS NEWS README ChangeLog )
+PATCHES=( "${FILESDIR}/${P}-cython-0.22.patch" )
 
 pkg_setup() {
        use python && python-single-r1_pkg_setup

diff --git a/sci-physics/espresso/files/espresso-3.3.0-cython-0.22.patch b/sci-physics/espresso/files/espresso-3.3.0-cython-0.22.patch
new file mode 100644 (file)
index 0000000..22b726b
--- /dev/null
+++ b/sci-physics/espresso/files/espresso-3.3.0-cython-0.22.patch
@@ -0,0 +1,23 @@
+From 9e6caa3294b0f5f377c16550a07429b73c871ac3 Mon Sep 17 00:00:00 2001
+From: Christoph Junghans <junghans@votca.org>
+Date: Thu, 12 Mar 2015 08:55:51 -0600
+Subject: [PATCH] fix build with cython-0.22
+
+---
+ src/python/espressomd/particle_data.pxd | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/python/espressomd/particle_data.pxd b/src/python/espressomd/particle_data.pxd
+index fff022b..4cc39e8 100644
+--- a/src/python/espressomd/particle_data.pxd
++++ b/src/python/espressomd/particle_data.pxd
+@@ -185,5 +185,5 @@ cdef class ParticleHandle(object):
+   cdef public int id
+   cdef bint valid
+   cdef Particle particleData
+-  cdef int updateParticleData(self)
++  cdef int updateParticleData(self) except -1
+ 
+-- 
+2.0.5
+