Fix SLOT operator and drop unsupported PYthon ABIs

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 32 insertions, 17 deletions

diff --git a/sci-libs/cctbx/ChangeLog b/sci-libs/cctbx/ChangeLog
index 79c4176b72ed..3152e4193c72 100644
--- a/sci-libs/cctbx/ChangeLog
+++ b/sci-libs/cctbx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/cctbx
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.34 2013/06/04 12:37:25 jlec Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.35 2015/04/03 13:41:28 jlec Exp $
+
+  03 Apr 2015; Justin Lecher <jlec@gentoo.org> cctbx-2010.03.29.2334-r6.ebuild,
+  cctbx-2010.03.29.2334-r7.ebuild:
+  Fix SLOT operator and drop unsupported PYthon ABIs
 
   04 Jun 2013; Justin Lecher <jlec@gentoo.org> cctbx-2010.03.29.2334-r7.ebuild:
   Fix deps for new python eclasses
@@ -171,4 +175,3 @@
   04 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org>
   +cctbx-2009.11.01.0123.ebuild, +metadata.xml:
   New ebuild, initialy written by dberkholz
-
diff --git a/sci-libs/cctbx/Manifest b/sci-libs/cctbx/Manifest
index a82aa619d575..1fb0bcc480d4 100644
--- a/sci-libs/cctbx/Manifest
+++ b/sci-libs/cctbx/Manifest
@@ -9,14 +9,26 @@ AUX 2010.03.29.2334-gcc-4.7.patch 6747 SHA256 ab01875a97ece09e4d729bb435b67960ef
 AUX 2010.03.29.2334-soname.patch 5177 SHA256 dd4ea6dbf34c1b2d9572adec5a33fe6a73b1a99e8c4364123e69382bb161ce74 SHA512 3f62bc52c32c3573fbcd90fc49234498d7c28fc0dc7a68497041af35da46cbd9cb386b9b13ed2269a5728e87526987ac49179e38b2bcb6a355ee4c180e9f7861 WHIRLPOOL cdd533d510defea65388ccd25c63055fc2798edd4222d1aa1b0201671d2c074107a151edc5ba62b5677908d5c045f98f26cd5ae5574e9fc83919632c4258c77c
 AUX 2010.03.29.2334-tst_server.py.patch 774 SHA256 df058d16d2dc5beaac9f1a1fbf2e640994c7e881d449eb01ac338dadbfb15ac3 SHA512 490918c3139355ecb0430d908ccafc6d66cb25ec7df285cedbb983d80f3473425c72d0766262c557c0c783626479edd2528eaf83b1decdeba416dde193472d5a WHIRLPOOL cc15b95661d8cba66bc3e06b3589188582c5e637faa860c70a4bbc53450a02afb36ec14c51796fe34441bd74842c06c938e22258a5ea5bf3264237a7afc169bc
 DIST cctbx-2010.03.29.2334.tar.gz 15570372 SHA256 e1fae804caaf8593c7a3f32e4544046f4c00293063d9099721578cc8fbd17213 SHA512 7aafd647db49925fc1df16a9ccb4f8caf040b4d73e9601731eb3da3051467c3005fb2cc95b498501c899cd1bd378e6a6135cffe734cb4f93eccacbc13575b2c8 WHIRLPOOL 5954ce6ae8bd3a29deaa5d7f8b354d9468a87a01fc7d6aa9a0545e1d323b1ee209348e88270e2f50d7985b1916a7b5bf687dfdf871013d3ec35925fde253d9a0
-EBUILD cctbx-2010.03.29.2334-r6.ebuild 6044 SHA256 286a1ec89b870058eb992ab948ddfba4443b027f2dfbf0b5b192432a384492d1 SHA512 9dd2e367877fa2373c17c22624f23f22856d45f4ea4dfb15f7ee913665410b98b6975f2b645314be51a252c18a0975bfcf3f4b75c3fd796d33bdc372d6f621fb WHIRLPOOL 8df1acf764d5899f282dc72ba3cc529e07ccc266ed6825cf1259e5eae88412071a427b8609af6246798e31affa41d87893b63339240dd216b393690390e9a757
-EBUILD cctbx-2010.03.29.2334-r7.ebuild 5783 SHA256 c0ddccb99b417ffb7049cad74794c651a4e96066ac922af355cec39e509c80ee SHA512 495ef52654073aa93854761a4e44647851e36ac97ce7f7ad59dfda220211e2c828ca64d08eb682695c2d223f222756dce4d15ce1b0959e2a5f18189af118e8e7 WHIRLPOOL 587c33f05ecb3f89d2f2862f435ff1571fedfa6716cc3dc8f435379d279849787fbdf840e116cf32e3f892fc7ce4468d0fbe4ffa70207bb82b13402b30ec370a
-MISC ChangeLog 6227 SHA256 289ba491cd28cab24cb2e29b58d69728c3a1b434576fa3d755f7c6589150a0f9 SHA512 4f08ebdcded016eccb4430adf5854a903b049a10220b3b367e8d1b616914d47a7cfad654f6551dcc098be95846600951e82c90c8c36b7455dcdf85f7748f9c65 WHIRLPOOL ee6e1577ab7ece157cde633bf067137a4bb6154b943a08d5db8174c052a141b7b505890faae71f73f6ad2b3a30f39bc120b779b55de58131734cd77b110b2e58
+EBUILD cctbx-2010.03.29.2334-r6.ebuild 6049 SHA256 1d47b6df4ff018bfa5676ce447f9166b522ddace9ef392ad31b33f49416602e5 SHA512 16ea8a628f1b887ecfb01ab9c923a68597581ca26778d5538b0af2e18fedef63b03df7734897a8805b4a05e8c4efb021a527fafaf3cdbd717ef56d0eba086aa8 WHIRLPOOL 41b2a4ca47931248ca69b2acaa330d223e48d7da6faf67e1ea7622efd1389fef51cc48db7deb9532a9b0aa1a148dfd322e89cec260a0ce280f8244db25e351a2
+EBUILD cctbx-2010.03.29.2334-r7.ebuild 5782 SHA256 2e4baa25d0f9e60b9ad92e9df8a84f9cd673a19481240eda7c90b6d676be145f SHA512 e80c4533f02aa7b712e70df55472932007629d0eed343fe95a2128c1309c232ff6e2d402c1adaa5c6f2277a92e7c150893401387610d7557e2ce104c4cb3a024 WHIRLPOOL 1d946b9e0b43780cc677eef40161235c20c1b9e19c5b0065392e2b81e887452531cb3041f9d13ec871d9be4f5a57593e5132c1d156db820a3c6f30c2590b6529
+MISC ChangeLog 6395 SHA256 92cd9d0e47bf90982845a6174aa8604a9bc7e530fc51b37f526910ef72cf9d7a SHA512 4d3c1488ccf9779f7df5c7e810f5e497a1ae674706acc46754f39192a3e890e9a5c2f76c197a4208f497916af8469bd9ccb8486c5ed91a5559ddf791aac78ca3 WHIRLPOOL 7e68e041d21fa12082154b1fbf0f92b61459ecfeafac7f3e5d25ba5a7a31d9e6dea49525eb9bce31f24084b1149f9dd4a351cbbe7989f0ebd56eb1c4d68627b6
 MISC metadata.xml 773 SHA256 6d424e7d549ba25e0ed4efaa2114679116006dca9592bac473a78baef48af1f0 SHA512 81ddc8d7808b9ca772955e865e49bcff68fc686672679758433d0d3bf8d27047f9dfeb29b36e72bd0b5c86c4a1e50ecd01bce96c71d0790084a0ef5894094899 WHIRLPOOL dee8ca57313ed6cecef6f4108f06feb614fe4f450f2feeacf88a9da534a0a6ebb7b791abb19fed1f9cff771579fec96883a63caf6d4b2c3b3c2e8cf6ff799746
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREKAAYFAlGt34YACgkQgAnW8HDreRYqZQCeMCgn7Z4sqE1vR0cxmYf8g2v7
-PWkAn2BIvOLy0DyQ67f4vGdeb5FRcNhu
-=i2pA
+iQJ8BAEBCgBmBQJVHpiJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViriKkP/2KIWokqzO/IAJg7WBRpHPFy
+yTQDUBTe4faCIzr3whW2ukBQHSiRw89pe2WkxDrnkcVxo6ouWtvCgY/2whbMAeLi
+axpmfJMdONZonYlAVMpC/TQ7l4gLhUO7Xt58ukYYU+6vnrMFdAcBqBuTBneQPc/B
+rOtetN6kB7o0FvE2t8YrI/3wF4YpbavdCoGIYDs8bg1bwC7AK0DhcDW4eeK6ndZZ
+ezNRXuplY4hPdOE+47fELezkWNdjyt5YKVHVcvQmwMWVjPfX828SaTWu/ETAjJeQ
+ETynFkIhHZzKaa+OUxPOcUdwFxfqtqJDZZm16b5OLBohaKeWF0v0FPyvYwBcD4XR
+lrVguIU39sn+bOAg9Brp1fM6XE6lj12bs6isBITtQIk73XFVERK86PVcn3+Q0Ogl
+3nVJExgZ3FPI3Y7VqU/jaI7dVTDwzWtmA+V4h85AdnCV/YeXedfuaDgrAvkFbtPe
+WW0Nka4MfZtFXg3dNyyOfADwXGC3LJuZGjBnSw6fIWJAOYVpUJF8HdSf2Bkbgo/S
+M7ObVJ5aA0NIXG556RioTr2IzWZ8FtmVzXdahdhLj564VjseTXXW8CT5W/dfZV2u
+m+u7sIQ+iYSUM2zeeA38aRXbDJSuCWtPv10O6YAAo85qoHMLBVYkNv2d6S/jHZ/B
+zsei9AxDelwNmxYlDOdA
+=Cr47
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild b/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild
index c80b3dd9c751..e15d16e75a46 100644
--- a/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild
+++ b/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild,v 1.9 2013/03/17 14:46:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r6.ebuild,v 1.10 2015/04/03 13:41:28 jlec Exp $
 
 EAPI="3"
 
@@ -22,7 +22,7 @@ IUSE="+minimal openmp threads"
 RDEPEND="
 	>=dev-libs/boost-1.48[python]
 	sci-libs/clipper
-	sci-libs/fftw
+	sci-libs/fftw:3.0
 	!minimal? (
 		sci-chemistry/cns
 		sci-chemistry/shelx )"
diff --git a/sci-libs/cctbx/cctbx-2010.03.29.2334-r7.ebuild b/sci-libs/cctbx/cctbx-2010.03.29.2334-r7.ebuild
index 2c41eb3e9f7f..bee52e53951f 100644
--- a/sci-libs/cctbx/cctbx-2010.03.29.2334-r7.ebuild
+++ b/sci-libs/cctbx/cctbx-2010.03.29.2334-r7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r7.ebuild,v 1.4 2013/06/04 12:37:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r7.ebuild,v 1.5 2015/04/03 13:41:28 jlec Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit eutils fortran-2 multilib prefix python-single-r1 toolchain-funcs
 
@@ -27,7 +27,7 @@ RDEPEND="
 	${PYTHON_DEPS}
 	>=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
 	sci-libs/clipper
-	sci-libs/fftw
+	sci-libs/fftw:3.0=
 	!minimal? (
 		sci-chemistry/cns
 		sci-chemistry/shelx )"