Handle ccp4 installation correctly

(Portage version: 2.2_rc63/cvs/Linux i686)

4 files changed, 14 insertions, 8 deletions

diff --git a/sci-chemistry/arp-warp-bin/ChangeLog b/sci-chemistry/arp-warp-bin/ChangeLog
index a4c2cb1fe9e4..47fa19148bb1 100644
--- a/sci-chemistry/arp-warp-bin/ChangeLog
+++ b/sci-chemistry/arp-warp-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/arp-warp-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/ChangeLog,v 1.2 2010/02/07 22:04:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/ChangeLog,v 1.3 2010/02/25 08:06:28 jlec Exp $
+
+*arp-warp-bin-7.0.1-r2 (25 Feb 2010)
+
+  25 Feb 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  files/7.0.1-setup.patch, -arp-warp-bin-7.0.1-r1.ebuild,
+  files/7.0.1-source-ccp4-if-needed.patch, +arp-warp-bin-7.0.1-r2.ebuild:
+  Handle ccp4 installation correctly
 
   07 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org>
   arp-warp-bin-7.0.1-r1.ebuild:
diff --git a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.0.1-r1.ebuild b/sci-chemistry/arp-warp-bin/arp-warp-bin-7.0.1-r2.ebuild
index be86fe338f64..6f52ed205892 100644
--- a/sci-chemistry/arp-warp-bin/arp-warp-bin-7.0.1-r1.ebuild
+++ b/sci-chemistry/arp-warp-bin/arp-warp-bin-7.0.1-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/arp-warp-bin/arp-warp-bin-7.0.1-r1.ebuild,v 1.2 2010/02/07 22:04:14 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/arp-warp-bin/arp-warp-bin-7.0.1-r2.ebuild,v 1.1 2010/02/25 08:06:28 jlec Exp $
 
 inherit eutils python
 
@@ -62,6 +62,7 @@ src_install(){
 }
 
 pkg_postinst(){
+	python_need_rebuild
 	python_mod_optimize "${ROOT}"/opt/${PN}/byte-code/python-${PYVER}
 
 	testcommand=$(echo 3 2 | awk '{printf"%3.1f",$1/$2}')
diff --git a/sci-chemistry/arp-warp-bin/files/7.0.1-setup.patch b/sci-chemistry/arp-warp-bin/files/7.0.1-setup.patch
index 72bd06503deb..23dda9760bae 100644
--- a/sci-chemistry/arp-warp-bin/files/7.0.1-setup.patch
+++ b/sci-chemistry/arp-warp-bin/files/7.0.1-setup.patch
@@ -58,7 +58,7 @@ diff -Nu -Nu -uarN arp_warp_7.0.1.orig/share/arpwarp_setup_base.bash arp_warp_7.
          echo "WARNING while setting up ARP/wARP"
          echo "No valid 'python' command was found"
          echo "flex-warp ('ARP/wARP Expert System' in the GUI) will not be available."
-+	echo "Did you upgrade your python? Reemerge ArpWarp!"
++	echo "Did you upgrade your python? Please run 'emerge sci-chemistry/arp-warp-bin!'"
          echo
          export flex_wARP_warpbin="Unavailable"
          export flex_wARP_cbin="Unavailable"
@@ -140,7 +140,7 @@ diff -Nu -Nu -uarN arp_warp_7.0.1.orig/share/arpwarp_setup_base.csh arp_warp_7.0
      echo "WARNING while setting up ARP/wARP"
      echo "No valid 'python' command was found"
      echo "flex-warp ('ARP/wARP Expert System' in the GUI) will not be available."
-+    echo "Did you upgrade your python? Reemerge ArpWarp!"
++    echo "Did you upgrade your python? Please run 'emerge sci-chemistry/arp-warp-bin!'"
      echo
      setenv flex_wARP_warpbin "Unavailable"
      setenv flex_wARP_cbin "Unavailable"
diff --git a/sci-chemistry/arp-warp-bin/files/7.0.1-source-ccp4-if-needed.patch b/sci-chemistry/arp-warp-bin/files/7.0.1-source-ccp4-if-needed.patch
index ce23403d2add..aa6f67f845f2 100644
--- a/sci-chemistry/arp-warp-bin/files/7.0.1-source-ccp4-if-needed.patch
+++ b/sci-chemistry/arp-warp-bin/files/7.0.1-source-ccp4-if-needed.patch
@@ -1,6 +1,6 @@
 --- share.orig/arpwarp_setup_base.bash	2008-08-03 16:50:03.000000000 -0700
 +++ share/arpwarp_setup_base.bash	2008-08-03 16:51:20.000000000 -0700
-@@ -23,11 +23,14 @@
+@@ -23,11 +23,13 @@
  #
  # Checks for CBIN variable
  if [ "$CBIN" = "" ]; then
@@ -9,7 +9,6 @@
 -    echo 'Variable $CBIN is not defined'
 -    echo "Please install CCP4 first"
 -    testccp='1'
-+    source /etc/profile.d/ccp4.setup.sh
 +    if [ "$CBIN" = "" ]; then
 +        echo
 +        echo "Cannot setup ARP/wARP"
@@ -22,7 +21,7 @@
      if [ ! -d $CBIN ]; then
 --- share.orig/arpwarp_setup_base.csh	2008-08-03 16:50:06.000000000 -0700
 +++ share/arpwarp_setup_base.csh	2008-08-03 16:52:03.000000000 -0700
-@@ -22,11 +22,14 @@
+@@ -22,11 +22,13 @@
  # Settings for python
  # Checks for CBIN variable
  if ( ! $?CBIN ) then
@@ -31,7 +30,6 @@
 -    echo 'Variable $CBIN is not defined'
 -    echo 'Please install CCP4 first'
 -    goto errorsetup
-+    source /etc/profile.d/ccp4.setup.sh
 +    if ( ! $?CBIN ) then
 +        echo
 +        echo 'Cannot setup ARP/wARP'