diff options
| author |   Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-08-15 00:05:09 +0200 |
|---|---|---|
| committer | Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-08-15 00:22:09 +0200 |
| commit | a77b2478f172a40f370b67740fd860197311c5ad (patch) | |
| tree | 05bfe5ee9c9ff3254472188d879039c01096788f | |
| parent | imosflm bump and lib fix (diff) | |
| download | sci-a77b2478f172a40f370b67740fd860197311c5ad.tar.gz sci-a77b2478f172a40f370b67740fd860197311c5ad.tar.bz2 sci-a77b2478f172a40f370b67740fd860197311c5ad.zip | |
ccp4 setup.sh part 2
| -rw-r--r-- | sci-chemistry/ccp4-apps/Manifest | 6 | ||||
| -rw-r--r-- | sci-chemistry/ccp4-apps/ccp4-apps-6.1.2-r1.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sci-chemistry/ccp4-apps/Manifest b/sci-chemistry/ccp4-apps/Manifest index cc97b675b..0ae744f46 100644 --- a/sci-chemistry/ccp4-apps/Manifest +++ b/sci-chemistry/ccp4-apps/Manifest @@ -11,3 +11,9 @@ 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 +<<<<<<< HEAD:sci-chemistry/ccp4-apps/Manifest +======= +EBUILD ccp4-apps-6.1.2-r1.ebuild 10881 RMD160 4b5c4cbd8577f09a12b6b4f1d42eb066a8ad62bc SHA1 1acb99d05232a37594f0372cae835af2ce8dbad2 SHA256 e2b2789ba7f5109657888fc46d7b9825bcedddcf71256ba8acd4621c7975832a +MISC ChangeLog 6117 RMD160 0eaaa268dfbc2ae87194c396d78d3df6c6d69c4b SHA1 adc84e1a64b07a3f69a1f0fa9f8f45aa58830f50 SHA256 a178de4a9ccce3f3ff5ef00717f4815316dee418226c591b8cb7c87e0c6ec193 +MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 +>>>>>>> ccp4 setup.sh part 2:sci-chemistry/ccp4-apps/Manifest diff --git a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.2-r1.ebuild b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.2-r1.ebuild index 5ff853b2e..7bf860afe 100644 --- a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.2-r1.ebuild +++ b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.2-r1.ebuild @@ -290,17 +290,15 @@ src_install() { -e "s~^\(.*setenv CLIBD_MON .*\)\$CCP4.*~\1\$CCP4/share/ccp4/data/monomers/~g" \ -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 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 |