diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-04-22 19:50:04 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-04-22 19:50:04 +0000 |
| commit | 7fc830822751df314c1e4b5965d3adb176bbbb7e (patch) | |
| tree | fbf58dbcf8e675f87a0d12fbc17dd0244463540c /sci-chemistry/ccp4-apps | |
| parent | Keyworded for ~*-linux (diff) | |
| download | historical-7fc830822751df314c1e4b5965d3adb176bbbb7e.tar.gz historical-7fc830822751df314c1e4b5965d3adb176bbbb7e.tar.bz2 historical-7fc830822751df314c1e4b5965d3adb176bbbb7e.zip | |
Fixes for Python ABIs, #316171
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sci-chemistry/ccp4-apps')
| -rw-r--r-- | sci-chemistry/ccp4-apps/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-chemistry/ccp4-apps/Manifest | 14 | ||||
| -rw-r--r-- | sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r2.ebuild | 8 |
3 files changed, 22 insertions, 5 deletions
diff --git a/sci-chemistry/ccp4-apps/ChangeLog b/sci-chemistry/ccp4-apps/ChangeLog index 629744305d06..2bc906243d24 100644 --- a/sci-chemistry/ccp4-apps/ChangeLog +++ b/sci-chemistry/ccp4-apps/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-chemistry/ccp4-apps # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.6 2010/03/29 19:19:25 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.7 2010/04/22 19:50:04 jlec Exp $ + + 22 Apr 2010; Justin Lecher <jlec@gentoo.org> ccp4-apps-6.1.3-r2.ebuild: + Fixes for Python ABIs, #316171 29 Mar 2010; Justin Lecher <jlec@gentoo.org> ccp4-apps-6.1.3-r2.ebuild: Removed balbes use again diff --git a/sci-chemistry/ccp4-apps/Manifest b/sci-chemistry/ccp4-apps/Manifest index 7002d9216b0a..f353400feb9e 100644 --- a/sci-chemistry/ccp4-apps/Manifest +++ b/sci-chemistry/ccp4-apps/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 6.1.3-clipper-mmdbold-ggc-4.3.patch 656 RMD160 6b302779b48217a14f5ac9110bc307db3a3b51eb SHA1 f5813d6769fa9dc11605425cdbda85691d3016bc SHA256 982eff0336a6dfaf4e280d51a59cf722fc063ca89d15ca0af46ce83727fb9a8a AUX 6.1.3-clipper-template.patch 2619 RMD160 a3a4998365c4e516325cf95472e8493729ee4b46 SHA1 f3d92469ac5ec4483818abbf50c32ac9b05a622c SHA256 a185a93f76c23ce06256866cfaf0e9854a5702b95a1e49e4d3a5f732e0d1e2a3 AUX 6.1.3-dont-build-balbes.patch 489 RMD160 7ee9ad48afcd6dd261277321be681bb41ce73fbb SHA1 56f045d3ec8dbf4e0c83dc9df2ac478bd4c5268c SHA256 dfe1b810fb07bf536528b9c955e3162dc470a803513ae6fa69848ed6d64503c4 @@ -18,6 +21,13 @@ AUX 6.1.3-setup.patch 12338 RMD160 2107d599dfe477863710d6b8098b3ca43b8cd22d SHA1 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 EBUILD ccp4-apps-6.1.3-r1.ebuild 12077 RMD160 a00f39bd4b8b0e6f2b614801abb90495c867c12c SHA1 1442d693038b8da3ccfaf33f11e266f90c54fbe6 SHA256 97039b674609109821d3e994c8edc22c6e4f12934a7ce467522faa1f3d690713 -EBUILD ccp4-apps-6.1.3-r2.ebuild 11969 RMD160 f81208c641ff9002a29a4788ca32becfc3627e2f SHA1 11992e6ce1d06c9c50a4e47e324522bc24b32f4d SHA256 e95c2e5b19634b6b607bd63b462702cd5b30187ddbfa52d6e6b529f2ebf083df -MISC ChangeLog 1697 RMD160 7e0503e8132a03df4661db19f3fc5610c9763413 SHA1 71120926c0485f6a99ec2ffdfb915dd3e480a1d6 SHA256 d4b85c003888c3ed1f6df01df847dfd88e5e3f85f3b55ff5a6a56cd9dbd99524 +EBUILD ccp4-apps-6.1.3-r2.ebuild 12056 RMD160 7e6161af1c75db56c9707584b74a7ee0f260ce32 SHA1 35ab109b5974d69b2deb0ad5d957a077c0ca072a SHA256 2a0fc76378e1ec7df01b65c54a61acce63c947b7be0236d19299f78cb32c454f +MISC ChangeLog 1805 RMD160 c63e421f155cca56fd09379418fd6381d75e9bb9 SHA1 39578b765b55f03c82ac2317f0524941cd691ee2 SHA256 b29739b5d91763e34bdffd826a7a66fd07bf012bbaf9785669e35f71634a2eeb MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkvQqHIACgkQgAnW8HDreRbucwCeI5DlMsDIIClNoeMZznXYU9oE +03wAoKDFynO8BU4KrJlo2ZHEQ/ltErew +=SpNj +-----END PGP SIGNATURE----- diff --git a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r2.ebuild b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r2.ebuild index 4d853478591e..1176a1dc4901 100644 --- a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r2.ebuild +++ b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r2.ebuild,v 1.3 2010/03/29 19:19:25 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r2.ebuild,v 1.4 2010/04/22 19:50:04 jlec Exp $ EAPI="2" @@ -104,6 +104,10 @@ PDEPEND="${SCIAPPS}" S="${WORKDIR}/${MY_P}" +pkg_setup() { + python_set_active_version 2 +} + src_prepare() { einfo "Applying upstream patches ..." for patch in $(seq $PATCH_TOT); do @@ -187,7 +191,7 @@ src_prepare() { gnuconfig_update - python_convert_shebangs 2 src/ccp4_pipeline_simple.py + python_convert_shebangs $(python_get_version) src/ccp4_pipeline_simple.py ./share/smartie/*.py } src_configure() { |