Handle ccp4 installation correctly

Package-Manager: portage-2.2_rc63/cvs/Linux i686

6 files changed, 27 insertions, 19 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/Manifest b/sci-chemistry/arp-warp-bin/Manifest
index f7f745fa659e..9876dd35a70a 100644
--- a/sci-chemistry/arp-warp-bin/Manifest
+++ b/sci-chemistry/arp-warp-bin/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 7.0.1-setup.patch 6330 RMD160 eb59c2023f3d023a1c50322960c4d3ee7d85b414 SHA1 7e4f8c375faea911dcf8787f735eeeca658b273b SHA256 f1136bb00c60194a504f0bf718733a13d5bea88fd88231a553f82993f97928da
-AUX 7.0.1-source-ccp4-if-needed.patch 1334 RMD160 e1c04014322a4406eb6421c12d9d97266e294a6b SHA1 0e7c8259f8996ebd13c3df1d2b1f894d7418a85b SHA256 0a554438fa7ba994762b463b7340af5f5cab3177c62e7632a313830d92228205
+AUX 7.0.1-setup.patch 6390 RMD160 64b0a1e4186294ed3a5dac58d073c25f706c39c6 SHA1 64417d3ff647f6d3d24deccfe3c212c0a6342116 SHA256 568059bea41429cc217c0246f2294cbf15d1a756f8bd2d7803c4c49bbc040b68
+AUX 7.0.1-source-ccp4-if-needed.patch 1252 RMD160 90856aafee9823ea45dbd5f3c2ab88bed9cfe77d SHA1 1d74549cd991bcbcf0687a2760cf71013489150f SHA256 33344b351ea53844fbfca00dc98fe1f5959a30b29f157f2f61f4be550e356c65
 DIST arp_warp_7.0.1.tar.gz 212443160 RMD160 b6b821a4135520456f489cb96e650b3be61c4892 SHA1 957ddb8ad5dde9556a6306643bb638288b144ca6 SHA256 368cff316fd05ca98937f2709b0ef8b391bc71697f61c7474c4681c99b24e677
-EBUILD arp-warp-bin-7.0.1-r1.ebuild 2624 RMD160 80f23c3489ba7a4647caa88b67b5cca0b2c1fd87 SHA1 f8ffd34d62309af30249998eef9a2487b2a1ab0a SHA256 8d7f1e3e43d0c21cc18d5cf4fb3eed26449516fe59b7b58c13ebafe00757f9fd
-MISC ChangeLog 725 RMD160 c18d1cf9bac45aaa0131df5a151c86510bd4f8c6 SHA1 a14489ca21b6795e0d83f4fd1549d570e76cf220 SHA256 0754f6c23f52aff8cce40983b7555a8c8168e37e65dca9ebaf19a70f2d9d18a4
+EBUILD arp-warp-bin-7.0.1-r2.ebuild 2645 RMD160 c807a9743411d092d916445d070522dd1dfcff11 SHA1 5ea6902146429ae1310984182b5875065e91c3fa SHA256 54e04359ea6833039789c2b1c7a56f35e7b346450cafb2f0448ea419e6d00241
+MISC ChangeLog 990 RMD160 833b2bcd8d2b5a7b991847199df05a5b9304607c SHA1 1ef0e1107a3fa2632db3af5cae0919f1875c4e27 SHA256 cf9edac39557e95f2c068370fd7f4c8f8c20f61f710e2d1b05285e0ba7d02a95
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktvOOMACgkQgAnW8HDreRYfAQCfdShpV9yNcg1SFEsNww8WlZxn
-ASwAniS78iYZynuu3VOSAXmd+xKkkw46
-=ITFI
+iEYEARECAAYFAkuGL44ACgkQgAnW8HDreRb1rgCglJr8OJFcnaeJSiz/dbPSPW+i
+WgIAnjeIi9qYwbvTp5CDRDCYWl8zQ6eL
+=MOa5
 -----END PGP SIGNATURE-----
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'
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index 51af90dea98a..e521f52a8a32 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -16,15 +16,17 @@ DIST analysis2.1.2_1.tar.gz 19227793 RMD160 f633a8338e3fbb9d8ad77c9482d63191419b
 DIST analysis2.1.3.tar.gz 18917835 RMD160 068fed988cb20d899266680f7dd7af2ca1ae2b46 SHA1 51d54036775cc271251c9deaf112903296db19e6 SHA256 6e614d0ab7d4ccaed9d5e0401f25a821c81def4bda28e1426f4112c521031e47
 DIST analysis2.1.3_1.tar.gz 18932918 RMD160 5f19ea6fe47c2910d16fcba8d1a78f0e1dead731 SHA1 683bdfb17d14979eb6477aaa99e4c4af5003beb2 SHA256 bbc1ba5434f896d38b6745c1dc9adc470a78d3be7b879160edcd635a19228b74
 DIST ccpn-update-100216.patch.bz2 37914 RMD160 92d2845f9a21a5ddc9fd71cf56928b61f497530c SHA1 de61701435675d10165826cf4cd590dca336cbb2 SHA256 13e062188e953ea62e779b7d89004ce103db61daf228cf6b9f7d3c77f39947fc
+DIST ccpn-update-100225.patch.bz2 2997 RMD160 0ba3740a8bd103ed783ce253887425aad4e3de2e SHA1 9adc0ca7ac7e0d05ee50af3dd62ee61395e6c9c1 SHA256 bdb9a3e27ad448a42bb8e7b2e512e61389f233a68676fbb28c28b669a276413a
 EBUILD ccpn-2.1.2.1_p100216.ebuild 4886 RMD160 d8e6a014c77a7ce40c40ae46416c2d5c15c14b09 SHA1 8e47f0a495d720eda820f94baca5b1088b26b4a8 SHA256 5478960144f864ebdcd57048084d54bfa6c0d59350223ab9404715fb36bdabd4
 EBUILD ccpn-2.1.3.1.ebuild 4983 RMD160 6530d19fe8905994325cba9515018d6f4078058a SHA1 197b2cb667c181c984a2a3f76db2361197c346ed SHA256 7c8db3232b161439abdb6581cb12caaef5b109664339f9fcc3dad7eddee752da
 EBUILD ccpn-2.1.3.ebuild 4981 RMD160 9404d1d8ee7c1638f024b9ea1b0de703510fcd64 SHA1 f2f1fd6496af93b8dc59affa6e9ed8188b8bcc84 SHA256 2411dbdc3631aa2606d6a6780fefaa02f6c1d66626b0321c7567136e769ae47c
-MISC ChangeLog 1581 RMD160 370f0a31d34009e47d11f31b7df7a04694722721 SHA1 196aedf2470bd0069874c1f5f3db451fb2c33c93 SHA256 26f46504c7b3019f78c8319a3dd050f58e4bce92be00ea503f8fb39d9ff91ec2
+EBUILD ccpn-2.1.3_p100225.ebuild 4988 RMD160 922be2dadbec5f2898da5b8a6307cdce6b670434 SHA1 65cd0decce5f75913fa50829483470916935e1d8 SHA256 1f8fe5823f7d3964e7ba46449ce9be8712d635a9a8609f07be0f82541f3e2ae9
+MISC ChangeLog 1735 RMD160 895470fdf02fd914f2bc7cbccd17448d0467d116 SHA1 e5981d7c596a80e157b3210a018159ca697bd529 SHA256 8f47a3bcebb2942de5bbe7ee708c1668704214d5a5f31a5afe2bb2c569fbc38e
 MISC metadata.xml 226 RMD160 0355d90bd8d1c106a19b136045ebdf970a0a2485 SHA1 1db0b2a470657641079d6613829df49a5c043ed6 SHA256 094a3ac740c81b9afbff3c855ba93cc20a593cad2392f6f4404715608a836fa1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkt9tXAACgkQgAnW8HDreRZ4+ACfYg09wrLoSPFNS8HRG28xpzj2
-IDQAn25Pk5HFnN+7r6LxANURB3KlFk2b
-=Cfwp
+iEYEARECAAYFAkuGL8cACgkQgAnW8HDreRYkDACeKpteQ7nShay201AqDQfdH1df
+TnUAn0Y0pddHxMnbbzgIYF5/Dr/YU71Q
+=Fol3
 -----END PGP SIGNATURE-----