diff options
| author |   Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-08-14 22:13:00 +0200 |
|---|---|---|
| committer | Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-08-15 00:21:57 +0200 |
| commit | d866a46d5d173428b9daedc8da6fea82049225d7 (patch) | |
| tree | 3bf359b9470dfdbf584106a972cbbbd0e8e22ab8 | |
| parent | . (diff) | |
| download | sci-d866a46d5d173428b9daedc8da6fea82049225d7.tar.gz sci-d866a46d5d173428b9daedc8da6fea82049225d7.tar.bz2 sci-d866a46d5d173428b9daedc8da6fea82049225d7.zip | |
sci-chemistry/ccp4-apps fix for bash/sh compatibility
| -rw-r--r-- | sci-chemistry/ccp4-apps/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-chemistry/ccp4-apps/Manifest | 3 | ||||
| -rw-r--r-- | sci-chemistry/ccp4-apps/ccp4-apps-6.1.2-r1.ebuild (renamed from sci-chemistry/ccp4-apps/ccp4-apps-6.1.2.ebuild) | 12 |
3 files changed, 18 insertions, 3 deletions
diff --git a/sci-chemistry/ccp4-apps/ChangeLog b/sci-chemistry/ccp4-apps/ChangeLog index bdb9e572c..0144de212 100644 --- a/sci-chemistry/ccp4-apps/ChangeLog +++ b/sci-chemistry/ccp4-apps/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*ccp4-apps-6.1.2-r1 (14 Aug 2009) + + 14 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> + -ccp4-apps-6.1.2.ebuild, +ccp4-apps-6.1.2-r1.ebuild: + fix for bash/sh compatibility + 14 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> ccp4-apps-6.1.2.ebuild: balbes-db dep is handled by sci-chemistry/ccp4 now diff --git a/sci-chemistry/ccp4-apps/Manifest b/sci-chemistry/ccp4-apps/Manifest index 1397d34cd..cc97b675b 100644 --- a/sci-chemistry/ccp4-apps/Manifest +++ b/sci-chemistry/ccp4-apps/Manifest @@ -11,6 +11,3 @@ AUX 6.1.2-gcc4.4.patch 1006 RMD160 5d66b599da41649b836080f18dcea292917c88eb SHA1 AUX 6.1.2-rename-rapper.patch 2856 RMD160 37504bed3cb4e1858d88331305deef6564616b02 SHA1 31f513c987e1408b868f8c9de4aaa9f2c35cb378 SHA256 d9fed1ec65089c4130358aeed771b32c1253e48a73e90f0ce7b92bd0abbb0c2b AUX 6.1.2-rename-truncate.patch 1515 RMD160 eff332faa67a1732e0f99cc6cdcb846932eadc87 SHA1 b504542cf710e1b54a684b0fa0e8d73d967c96ac SHA256 50a59a1856867daa3de1f8f53e92bcfe74dea3a6d3c4ba238a9ea83dbcdfbf07 DIST ccp4-6.1.2-core-src.tar.gz 247203188 RMD160 19019c6cd37e83cf6d2d19f91979edc978d18395 SHA1 2423178d3877dd44d3671a7eb4d6666de6852cb7 SHA256 bcae870675270be410278d9a6f2ee19f9caf32b73fd969e9381a4d510f174c75 -EBUILD ccp4-apps-6.1.2.ebuild 10181 RMD160 6323bd42319f240cb13078d232b5da3002292ff9 SHA1 f71e2726968845154b0538135ae5d968f0440989 SHA256 befee025645dcda7ba4b68afdf5e78d9fe80076de572b141f64d9d5336399592 -MISC ChangeLog 6074 RMD160 9c8afb973aef4e61806c316f677ab7127b13c793 SHA1 930bb8f31c33733e9631b474eb5cd2052f5b18b6 SHA256 6584cda4658e7f6cefda6d0dc60b57253a1bd76ba37316aba06ea7a55baf82fb -MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 diff --git a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.2.ebuild b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.2-r1.ebuild index ff7229507..5ff853b2e 100644 --- a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.2.ebuild +++ b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.2-r1.ebuild @@ -208,7 +208,9 @@ src_compile() { # Fix up variables -- need to reset CCP4_MASTER at install-time sed -i \ -e "s~^\(setenv CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \ + -e "s~^\(export CCP4_MASTER.*\)/.*~\1${WORKDIR}~g" \ -e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1/usr/bin~g" \ + -e "s~^\(export CCP4I_TCLTK.*\)/usr/local/bin~\1/usr/bin~g" \ "${S}"/include/ccp4.setup* # Set up variables for build @@ -289,6 +291,16 @@ src_install() { -e "s~^\(.*setenv MOLREPLIB .*\)\$CCP4.*~\1\$CCP4/share/ccp4/data/monomers/~g" \ -e "s~^\(.*setenv PYTHONPATH .*\)\$CCP4.*~\1\$CCP4/share/ccp4/python~g" \ -e "s~^\(.*setenv CCP4_BROWSER.*\).*~\1 firefox~g" \ + -e "s~^\(export CCP4_MASTER.*\)${WORKDIR}~\1/usr~g" \ + -e "s~^\(export CCP4.*\$CCP4_MASTER\).*~\1~g" \ + -e "s~^\(export CCP4I_TOP\).*~\1 \$CCP4/$(get_libdir)/ccp4/ccp4i~g" \ + -e "s~^\(export DBCCP4I_TOP\).*~\1 \$CCP4/share/ccp4/dbccp4i~g" \ + -e "s~^\(.*export CINCL.*\$CCP4\).*~\1/share/ccp4/include~g" \ + -e "s~^\(.*export CLIBD .*\$CCP4\).*~\1/share/ccp4/data~g" \ + -e "s~^\(.*export CLIBD_MON .*\)\$CCP4.*~\1\$CCP4/share/ccp4/data/monomers/~g" \ + -e "s~^\(.*export MOLREPLIB .*\)\$CCP4.*~\1\$CCP4/share/ccp4/data/monomers/~g" \ + -e "s~^\(.*export PYTHONPATH .*\)\$CCP4.*~\1\$CCP4/share/ccp4/python~g" \ + -e "s~^\(.*export CCP4_BROWSER.*\).*~\1 firefox~g" \ "${S}"/include/ccp4.setup* || die # Don't check for updates on every sourcing of /etc/profile |