| 1 |
jlec 10/02/25 08:06:28 |
| 2 |
|
| 3 |
Modified: 7.0.1-setup.patch 7.0.1-source-ccp4-if-needed.patch |
| 4 |
Log: |
| 5 |
Handle ccp4 installation correctly |
| 6 |
(Portage version: 2.2_rc63/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 sci-chemistry/arp-warp-bin/files/7.0.1-setup.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/arp-warp-bin/files/7.0.1-setup.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/arp-warp-bin/files/7.0.1-setup.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/arp-warp-bin/files/7.0.1-setup.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: 7.0.1-setup.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/files/7.0.1-setup.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- 7.0.1-setup.patch 4 Aug 2008 00:11:54 -0000 1.1 |
| 22 |
+++ 7.0.1-setup.patch 25 Feb 2010 08:06:27 -0000 1.2 |
| 23 |
@@ -58,7 +58,7 @@ |
| 24 |
echo "WARNING while setting up ARP/wARP" |
| 25 |
echo "No valid 'python' command was found" |
| 26 |
echo "flex-warp ('ARP/wARP Expert System' in the GUI) will not be available." |
| 27 |
-+ echo "Did you upgrade your python? Reemerge ArpWarp!" |
| 28 |
++ echo "Did you upgrade your python? Please run 'emerge sci-chemistry/arp-warp-bin!'" |
| 29 |
echo |
| 30 |
export flex_wARP_warpbin="Unavailable" |
| 31 |
export flex_wARP_cbin="Unavailable" |
| 32 |
@@ -140,7 +140,7 @@ |
| 33 |
echo "WARNING while setting up ARP/wARP" |
| 34 |
echo "No valid 'python' command was found" |
| 35 |
echo "flex-warp ('ARP/wARP Expert System' in the GUI) will not be available." |
| 36 |
-+ echo "Did you upgrade your python? Reemerge ArpWarp!" |
| 37 |
++ echo "Did you upgrade your python? Please run 'emerge sci-chemistry/arp-warp-bin!'" |
| 38 |
echo |
| 39 |
setenv flex_wARP_warpbin "Unavailable" |
| 40 |
setenv flex_wARP_cbin "Unavailable" |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.2 sci-chemistry/arp-warp-bin/files/7.0.1-source-ccp4-if-needed.patch |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/arp-warp-bin/files/7.0.1-source-ccp4-if-needed.patch?rev=1.2&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/arp-warp-bin/files/7.0.1-source-ccp4-if-needed.patch?rev=1.2&content-type=text/plain |
| 48 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/arp-warp-bin/files/7.0.1-source-ccp4-if-needed.patch?r1=1.1&r2=1.2 |
| 49 |
|
| 50 |
Index: 7.0.1-source-ccp4-if-needed.patch |
| 51 |
=================================================================== |
| 52 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/files/7.0.1-source-ccp4-if-needed.patch,v |
| 53 |
retrieving revision 1.1 |
| 54 |
retrieving revision 1.2 |
| 55 |
diff -u -r1.1 -r1.2 |
| 56 |
--- 7.0.1-source-ccp4-if-needed.patch 4 Aug 2008 00:11:54 -0000 1.1 |
| 57 |
+++ 7.0.1-source-ccp4-if-needed.patch 25 Feb 2010 08:06:27 -0000 1.2 |
| 58 |
@@ -1,6 +1,6 @@ |
| 59 |
--- share.orig/arpwarp_setup_base.bash 2008-08-03 16:50:03.000000000 -0700 |
| 60 |
+++ share/arpwarp_setup_base.bash 2008-08-03 16:51:20.000000000 -0700 |
| 61 |
-@@ -23,11 +23,14 @@ |
| 62 |
+@@ -23,11 +23,13 @@ |
| 63 |
# |
| 64 |
# Checks for CBIN variable |
| 65 |
if [ "$CBIN" = "" ]; then |
| 66 |
@@ -9,7 +9,6 @@ |
| 67 |
- echo 'Variable $CBIN is not defined' |
| 68 |
- echo "Please install CCP4 first" |
| 69 |
- testccp='1' |
| 70 |
-+ source /etc/profile.d/ccp4.setup.sh |
| 71 |
+ if [ "$CBIN" = "" ]; then |
| 72 |
+ echo |
| 73 |
+ echo "Cannot setup ARP/wARP" |
| 74 |
@@ -22,7 +21,7 @@ |
| 75 |
if [ ! -d $CBIN ]; then |
| 76 |
--- share.orig/arpwarp_setup_base.csh 2008-08-03 16:50:06.000000000 -0700 |
| 77 |
+++ share/arpwarp_setup_base.csh 2008-08-03 16:52:03.000000000 -0700 |
| 78 |
-@@ -22,11 +22,14 @@ |
| 79 |
+@@ -22,11 +22,13 @@ |
| 80 |
# Settings for python |
| 81 |
# Checks for CBIN variable |
| 82 |
if ( ! $?CBIN ) then |
| 83 |
@@ -31,7 +30,6 @@ |
| 84 |
- echo 'Variable $CBIN is not defined' |
| 85 |
- echo 'Please install CCP4 first' |
| 86 |
- goto errorsetup |
| 87 |
-+ source /etc/profile.d/ccp4.setup.sh |
| 88 |
+ if ( ! $?CBIN ) then |
| 89 |
+ echo |
| 90 |
+ echo 'Cannot setup ARP/wARP' |
Archives