| 1 |
jlec 10/04/22 19:50:05 |
| 2 |
|
| 3 |
Modified: ChangeLog ccp4-apps-6.1.3-r2.ebuild |
| 4 |
Log: |
| 5 |
Fixes for Python ABIs, #316171 |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.7 sci-chemistry/ccp4-apps/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog?rev=1.7&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog?rev=1.7&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog?r1=1.6&r2=1.7 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v |
| 18 |
retrieving revision 1.6 |
| 19 |
retrieving revision 1.7 |
| 20 |
diff -u -r1.6 -r1.7 |
| 21 |
--- ChangeLog 29 Mar 2010 19:19:25 -0000 1.6 |
| 22 |
+++ ChangeLog 22 Apr 2010 19:50:04 -0000 1.7 |
| 23 |
@@ -1,6 +1,9 @@ |
| 24 |
# ChangeLog for sci-chemistry/ccp4-apps |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.6 2010/03/29 19:19:25 jlec Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.7 2010/04/22 19:50:04 jlec Exp $ |
| 28 |
+ |
| 29 |
+ 22 Apr 2010; Justin Lecher <jlec@g.o> ccp4-apps-6.1.3-r2.ebuild: |
| 30 |
+ Fixes for Python ABIs, #316171 |
| 31 |
|
| 32 |
29 Mar 2010; Justin Lecher <jlec@g.o> ccp4-apps-6.1.3-r2.ebuild: |
| 33 |
Removed balbes use again |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.4 sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r2.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r2.ebuild?rev=1.4&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r2.ebuild?rev=1.4&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r2.ebuild?r1=1.3&r2=1.4 |
| 42 |
|
| 43 |
Index: ccp4-apps-6.1.3-r2.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r2.ebuild,v |
| 46 |
retrieving revision 1.3 |
| 47 |
retrieving revision 1.4 |
| 48 |
diff -u -r1.3 -r1.4 |
| 49 |
--- ccp4-apps-6.1.3-r2.ebuild 29 Mar 2010 19:19:25 -0000 1.3 |
| 50 |
+++ ccp4-apps-6.1.3-r2.ebuild 22 Apr 2010 19:50:04 -0000 1.4 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2010 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $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 $ |
| 55 |
+# $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 $ |
| 56 |
|
| 57 |
EAPI="2" |
| 58 |
|
| 59 |
@@ -104,6 +104,10 @@ |
| 60 |
|
| 61 |
S="${WORKDIR}/${MY_P}" |
| 62 |
|
| 63 |
+pkg_setup() { |
| 64 |
+ python_set_active_version 2 |
| 65 |
+} |
| 66 |
+ |
| 67 |
src_prepare() { |
| 68 |
einfo "Applying upstream patches ..." |
| 69 |
for patch in $(seq $PATCH_TOT); do |
| 70 |
@@ -187,7 +191,7 @@ |
| 71 |
|
| 72 |
gnuconfig_update |
| 73 |
|
| 74 |
- python_convert_shebangs 2 src/ccp4_pipeline_simple.py |
| 75 |
+ python_convert_shebangs $(python_get_version) src/ccp4_pipeline_simple.py ./share/smartie/*.py |
| 76 |
} |
| 77 |
|
| 78 |
src_configure() { |
Archives