Fixes for Python ABIs, keyworded for *-linux

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-chemistry/ccp4i/ChangeLog b/sci-chemistry/ccp4i/ChangeLog
index 439b9f5fdcdcc6eed285ed23140d03ead6f602db..a94d1b5c294d09448dde861ab57f14be48460e02 100644 (file)
--- a/sci-chemistry/ccp4i/ChangeLog
+++ b/sci-chemistry/ccp4i/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-chemistry/ccp4i
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4i/ChangeLog,v 1.2 2010/03/20 17:27:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4i/ChangeLog,v 1.3 2010/04/22 20:19:04 jlec Exp $
+
+  22 Apr 2010; Justin Lecher <jlec@gentoo.org> ccp4i-6.1.3-r1.ebuild:
+  Fixes for Python ABIs, keyworded for *-linux
 
 *ccp4i-6.1.3-r1 (20 Mar 2010)
 

diff --git a/sci-chemistry/ccp4i/Manifest b/sci-chemistry/ccp4i/Manifest
index aee590f85cd4ad78121b987f087d5b4ad4b2af0a..246e0babd8730da1eb4b1bbe6c833fde83d2c2f7 100644 (file)
--- a/sci-chemistry/ccp4i/Manifest
+++ b/sci-chemistry/ccp4i/Manifest
@@ -8,14 +8,14 @@ AUX 6.1.3-rename-truncate.patch 810 RMD160 33f8cb14a3bc0f9c6cd249df07f469c9d6601
 DIST 6.1.3-oasis4.0.patch.bz2 946 RMD160 b448376114ba41e6999d533929fdb79812476f87 SHA1 7667aca14d28cec01bfa7d2eee9cbce11624f4fa SHA256 12d7c5965e0c46b0f482514d9083d6be94d65eeb14ba29c17d507d5f9669f84b
 DIST ccp4-6.1.3-core-src.tar.gz 242134076 RMD160 e9b7deb0766fb95d5e8946881f20e086f0896fe9 SHA1 ee5ada892694db5dc9b2d7d2330b4ac694f56580 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324
 DIST ccp4i-6.1.3-arpwarp.patch.bz2 58498 RMD160 3bf65f26a8635194e69ff9f33a457f9ff7e050d0 SHA1 0172a35d539ed3020228f20f0ddfa82540790cf0 SHA256 297e6f75354f3a1932302f7039bf449484c95eb41b8634ae96d93c754b47c687
-EBUILD ccp4i-6.1.3-r1.ebuild 1972 RMD160 cfdde3786e49998860d7953c53c39efe6492e9e0 SHA1 3b5c0d98f0eaf8472085c28417c0955d5740b496 SHA256 9b1d2b282c7bece5a079fcdc1cbaf06beb755e24d8f3d85adf12dcebf6b12270
+EBUILD ccp4i-6.1.3-r1.ebuild 2139 RMD160 3052552d0e4a26e5987e4a3e60f05e741f77bd6b SHA1 b03539739e883c9c0d459fbf48f2919fd7170693 SHA256 009464493a7ea3242a4f0b882d543a0a1e58e903795a4d9e7eb5f693e4e4e261
 EBUILD ccp4i-6.1.3.ebuild 1896 RMD160 3b8c19bab9c7e4099aad28e24e091d9ee56eeb5e SHA1 d763e0a7a7ebdbc89876a2aff3e6bffdbe2e4c17 SHA256 dffa32057d1dd0d49bebc26a5714e466c450d4d35377e906925e7e37267a0361
-MISC ChangeLog 646 RMD160 1b43529e7b6c1e04b8e1acd27c87013e40e027e2 SHA1 9cde928df98c6fee4297556d86d1b4d2a64f9e91 SHA256 2ddb8540fa21536f5089d10a0a7d3283f68b5a5a67d9169fd4fe1d98eb4117d0
+MISC ChangeLog 764 RMD160 ee0c2c9e5ad5a8214a23c24ea32c871f253a118f SHA1 c694e9d78abce31684b283d0847ed0100c44ab9b SHA256 30387d46b532fb13086705dc2ec66052205dbde7dc2fbee02d8d74d5fbbbc0c3
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkulBXMACgkQgAnW8HDreRbhHwCgkfmf1bxWhTXay9tos2gxWl7F
-6IYAniczXdZ8lEUcc6Ayb7yxPe7jKIB8
-=MK1W
+iEYEARECAAYFAkvQrz0ACgkQgAnW8HDreRZOowCeOfruJWgm2Vby4cs2e5zMHqB5
+1vYAnR1GNSFo/DreDXTF+KHKtp2qm5IF
+=ATwa
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/ccp4i/ccp4i-6.1.3-r1.ebuild b/sci-chemistry/ccp4i/ccp4i-6.1.3-r1.ebuild
index c7f3b5130d541eb93032b56858c05502857f3e33..47b04b4e3c2a80bf3cf8d10cf01bb342e34b98f6 100644 (file)
--- a/sci-chemistry/ccp4i/ccp4i-6.1.3-r1.ebuild
+++ b/sci-chemistry/ccp4i/ccp4i-6.1.3-r1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4i/ccp4i-6.1.3-r1.ebuild,v 1.1 2010/03/20 17:27:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4i/ccp4i-6.1.3-r1.ebuild,v 1.2 2010/04/22 20:19:04 jlec Exp $
 
 EAPI="2"
 
-inherit base multilib
+inherit base multilib python
 
+PYTHON_DEPEND="2"
 MY_PN="${PN%i}"
 MY_P="${MY_PN}-${PV}"
 
@@ -24,7 +25,7 @@ SRC_URI="
 [[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentooexperimental.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 LICENSE="ccp4"
 IUSE=""
 
@@ -45,12 +46,17 @@ PATCHES=(
        "${WORKDIR}"/${P}-arpwarp.patch
        )
 
+pkg_setup() {
+       python_set_active_version 2
+}
+
 src_prepare() {
        base_src_prepare
 
        [[ ! -z ${PATCHDATE} ]] && epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch
 
        epatch "${WORKDIR}"/${PV}-oasis4.0.patch
+       python_convert_shebangs -r $(python_get_version) ccp4i/ share/dbccp4i/
 }
 
 src_configure() {

diff --git a/sci-chemistry/coot/Manifest b/sci-chemistry/coot/Manifest
index 05893c4e9fcc742b5b4e9c204bd10fe7d138d706..77e1c7c7f8b63e41e297c73f948200486e3d488a 100644 (file)
--- a/sci-chemistry/coot/Manifest
+++ b/sci-chemistry/coot/Manifest
@@ -13,13 +13,13 @@ AUX glib.m4 8444 RMD160 f3f4b2987796f16d17758f2af3459279351d6f2c SHA1 201eb58c2b
 AUX gtk.m4 8516 RMD160 3860fe211902d5b9290f0a70e7d75ebec6b0ec67 SHA1 98b93b820423a52ebd80e3f1822a8f2bd4b3f15d SHA256 4eb6e0bb2c6863139d1fb4ca2d1d0f0ef07e3a85fdbb5ba98d03373f610f0c37
 DIST coot-0.6.tar.gz 11929700 RMD160 6485a56f1d17b103e69b07b5fc128d266e83aa27 SHA1 ec3d486eda514e36bdbc99e8796484e584e4f851 SHA256 7700e7e758934ee5b4177c7bb8e1d7d564b838966dd3c77919fa08778627353b
 DIST greg-data-0.6.tar.gz 7929638 RMD160 d152fb3703eec8c4b3df37b24a1fa2a80a4a9d9f SHA1 5dda8e7e393e3602aa51b2ae830287f93534312f SHA256 032f223f86c0ac504ace427ac84a2bf31f9adaf4da581207526b198f4bb2d76d
-EBUILD coot-0.6.ebuild 3478 RMD160 fb02ad120a761ecf21b0a111ee47084310a15762 SHA1 4361f8fa2a4d63f0f744993b819b45775b23d3eb SHA256 a8b2f7fd8cc429a29663f2cad8d26e58dbee31afa6de999d4fc0be795555485a
-MISC ChangeLog 3924 RMD160 3ac9b4c970d95ecb0b15dee79d78dfd4db832edb SHA1 793a2a67d62ffcc1b6061a2e071217febdafcd5d SHA256 e090a5080e4470509c1410796d06213a4e208c133ddf26a794a766663b03c483
+EBUILD coot-0.6.ebuild 3567 RMD160 ec42d87d686c57031317e13ba225530068fd281c SHA1 9d17f01d2165255f4916df85af3075b04850773e SHA256 cbab8a5cd7ce5ecc7cadc585067537342a060eac0afd527652a996059b287134
+MISC ChangeLog 4013 RMD160 9e8c0c6e89bf9c47faec549b55bf54960f90bf4a SHA1 9f8dbcf9dd6ed6c95b717b27ff97eae399762ad9 SHA256 bced32c99cc5484d860cd6f693ed5d3f8fc543d65efc93985b491aa36b7d3d8a
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuIGsEACgkQgAnW8HDreRZSxwCgiNxr6ABWT+wxgdzqpkJ2oZDg
-EQMAnAmP0Po2UtcU2ounUDsLtkUaIjou
-=jHwj
+iEYEARECAAYFAkvQsFEACgkQgAnW8HDreRZepgCgzmJVBBVdzz5Y2VeFaYu8Uzar
+YgEAoInjdnIhzvlOoO9S9h5m6VUf4mHk
+=hhNB
 -----END PGP SIGNATURE-----