Add upstream patches. The build system won't accept LDFLAGS, so unset them. (#142183) Source the setup script again in src_install() to make sure CBIN and CCP4_LIB get set. Not doing this breaks USE=X because the Imakefiles use them. Stop changing the value of CCP4_LIB, that was only necessary for the bindir=/usr/bin, libdir=/usr/libdir install, which was too much work.

(Portage version: 2.1.1_pre4-r2)
 (Unsigned Manifest commit)

1 files changed, 23 insertions, 4 deletions

diff --git a/sci-chemistry/ccp4/Manifest b/sci-chemistry/ccp4/Manifest
index b054adb8f587..80a4baea2e38 100644
--- a/sci-chemistry/ccp4/Manifest
+++ b/sci-chemistry/ccp4/Manifest
@@ -46,15 +46,31 @@ AUX pass-clipper-enablevals.patch 501 RMD160 23466922268a91570b0f64cf79809b988e3
 MD5 bcdb856dae7ea7b22d130474f6c17b7d files/pass-clipper-enablevals.patch 501
 RMD160 23466922268a91570b0f64cf79809b988e32689b files/pass-clipper-enablevals.patch 501
 SHA256 d476c9f231fb6cdfb5e57004b393644a88016318cdeed9c33c32de25e0d91b79 files/pass-clipper-enablevals.patch 501
+DIST act.f-6July2006.diff 16544 RMD160 24f48e95ec3363a2409da122bd0eb7ef5a91da36 SHA1 97ddeead440ce5b7d59fcb8e564f3907e6462c93 SHA256 ba807b19b834d68ff121e34bbfbb113ae528db1aeebfeb7e98cbb90c64c2c3c4
+DIST anisoanl.f-r1.22-r1.24.diff 9452 RMD160 02f9561362892cbbeed24592b5ed4e3eb51ace2c SHA1 76691ac9097a4132f3618e13d41d913d92e45b9a SHA256 1308ef91c63efd1c11287f68f386a62678d1ab48ddfe6e94cefdef1c92173940
+DIST cad.f-r1.70-r1.72.diff 12196 RMD160 a18c339223c8a6a66fda4cb210f2e533fea0d240 SHA1 30da509c9b51506541b0b49adbf7836c8fc5f7d4 SHA256 ba10591643f93fb310d451aacce286d8ec9386f2e781d631f794076d1021539f
 DIST ccp4-6.0.1-core-src.tar.gz 59311291 RMD160 0f514fe30f22a4f6eb2e05c8bab567d2132e8fae SHA1 e8f5fb325a13375793f7610160337090af8fb9b5 SHA256 26a5704d707c3bc2fbe4c1d0804abccc1c50255005d26a8ec3a03fcba63335f2
+DIST chainsaw.cpp-11May2006.diff 4720 RMD160 62c3b3a3da0d36aa8f0c67a55c068508858eeb17 SHA1 f6a4e0cd22438a8855796e82b5492bd8870aa49c SHA256 de2d2ccd365f2992e1ba9a385f1a2fcd9e52da5ff96bcbc4fa7b4404cf0bac6e
+DIST contact.f-12June2006.diff 43051 RMD160 577b454ed229be8c9b79e8c4622c870d589e2cca SHA1 aff0071b1130a3cc62b419fed5909f94a87ff9e1 SHA256 1336ea01da83aad21669b82cd3895f724db6db8d17d78acfec53154ea7ce690e
+DIST molrep.f-r1.28-r1.28.2.1.diff 755 RMD160 96a37ea54606583647ff9cdc9da728ce05d30849 SHA1 7fa0302e9e4309a86aad3bebde5359af740cecd8 SHA256 0bb22cb2f8e1486ec5cc6037427e9ec66189684d74b5939757b4ebe771a61084
+DIST mtztona4.f-r1.23-r1.24.diff 882 RMD160 1b34c6caaf5356574f65f2d092196cdd788cb720 SHA1 c6bfd2c3784fb385f0455f2638cd2d8ab11aaea7 SHA256 d7cf1b6ab2015b18c6b4b310e25b706a1f420d623383c17d0b51acfb00ae679a
+DIST omit.f-r1.12-r1.13.diff 2303 RMD160 5dda121b69fdc3b4e138e0b88012df1d46398d3a SHA1 0836a9fe21bf2acd87d4f87115bb1dc0645e6bb9 SHA256 14a8128809f78d2d08b81cde5f91b51a694d99b56215477a62571344024a6748
+DIST refmac5.tcl-r1.39.2.3-r1.42.diff 2464 RMD160 fca236184597ab86fc9ac7333834e68eab641dac SHA1 eecf37e89e200dcbea7544f320cd16160ab5615a SHA256 8418181bae8799d2fa5a004e84cb1c66391d0cb768df5d40b34e053aced6fd4c
+DIST rotmat.f-17July2006.diff 1002 RMD160 59cc822edbdc73b24e51cff013c71e4d68927979 SHA1 31fed5d06e8c8afc719f74d50acb0e833b893202 SHA256 1ee4f3288dba6404d59f51b9f9e1b4475413f7e40991204ab39474ee559605b1
+DIST sc.f-r1.9-r1.9.2.1.diff 8783 RMD160 815d25cff0fa76f73dc43da9757ad753ec392f9c SHA1 f55e2e8c84ec8cd3b94cb703b50abff625e3a7fb SHA256 418feea2ccf0014c3c2c83ab9460873114057480fd2a1dcabe305a1b956ad86b
+DIST setup.fh-r1.5-r1.5.2.1.diff 1317 RMD160 45a16b00792706553e7bf23a2f54415cd5ee1b43 SHA1 2a7417cf998b5e9fcac3b3b8a2deb05627d29d1a SHA256 637564c5723fb7de04d3a06817eec704ac708b74264716905690250e42aed146
+EBUILD ccp4-6.0.1-r1.ebuild 14020 RMD160 3341bb2f726baa0448366a8a8e43aa5c1d964520 SHA1 8bc5dd084c5e6991fb3a2a68dda5a1e87531e9cc SHA256 ca377b7488e57a86ca9fa42daa315d75107e81909c3f1692dad9b3e4b1238457
+MD5 18628222e60cc5706d1dd05346170930 ccp4-6.0.1-r1.ebuild 14020
+RMD160 3341bb2f726baa0448366a8a8e43aa5c1d964520 ccp4-6.0.1-r1.ebuild 14020
+SHA256 ca377b7488e57a86ca9fa42daa315d75107e81909c3f1692dad9b3e4b1238457 ccp4-6.0.1-r1.ebuild 14020
 EBUILD ccp4-6.0.1.ebuild 13729 RMD160 5fe2a8f1d42a810e8fda14c61e970f9146ab0b96 SHA1 25638dfbe892e82daccc6f40af9479ae88d2386f SHA256 d3d7ea08c1260eff42b49ead37d935bf3c9e38eac6e8eeb4fa86b3962ed25c7c
 MD5 48bda08719da61345f9297bdecd1b975 ccp4-6.0.1.ebuild 13729
 RMD160 5fe2a8f1d42a810e8fda14c61e970f9146ab0b96 ccp4-6.0.1.ebuild 13729
 SHA256 d3d7ea08c1260eff42b49ead37d935bf3c9e38eac6e8eeb4fa86b3962ed25c7c ccp4-6.0.1.ebuild 13729
-MISC ChangeLog 1294 RMD160 df51b121891b583b5ed2902a317685f18e7d8a89 SHA1 90145ffd0591e7e91509d839342a70ef7b0b33ef SHA256 3b5bfcdfbcb9b9fc54be3a4e79e25554305de0b1ddf2fcfc42f9d57d53357b22
-MD5 6fa8d57dc71f02621a1d0666e9de950f ChangeLog 1294
-RMD160 df51b121891b583b5ed2902a317685f18e7d8a89 ChangeLog 1294
-SHA256 3b5bfcdfbcb9b9fc54be3a4e79e25554305de0b1ddf2fcfc42f9d57d53357b22 ChangeLog 1294
+MISC ChangeLog 1788 RMD160 5beca7054df8ae7edde4c03b166b588467cfc7a2 SHA1 05c937c9b1b1c7c24f5db9927f633262c9b3adb2 SHA256 51580d514db58cf543c2ed532a5b394de86f40f26e53f3eb8e9c4a87da3cbf79
+MD5 361275a4deed84589af434b422ed510b ChangeLog 1788
+RMD160 5beca7054df8ae7edde4c03b166b588467cfc7a2 ChangeLog 1788
+SHA256 51580d514db58cf543c2ed532a5b394de86f40f26e53f3eb8e9c4a87da3cbf79 ChangeLog 1788
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
@@ -62,3 +78,6 @@ SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata
 MD5 af2485e5d663b3c625e3ee4f94748730 files/digest-ccp4-6.0.1 265
 RMD160 72caf22fe0480a8c577d84ff2ffb3bb3a6dcadd5 files/digest-ccp4-6.0.1 265
 SHA256 52ebe8c93194a9140171ac2e0d80b4750913b3e97ac1ee0f37c34ad9137deda8 files/digest-ccp4-6.0.1 265
+MD5 42c7b9d83453a9015d474ef4eaea76c1 files/digest-ccp4-6.0.1-r1 3286
+RMD160 9c65d5658b463f2aa751cb59c63d954c0b69568a files/digest-ccp4-6.0.1-r1 3286
+SHA256 3ccb5d939d1f0386093758fe8c5cfbb54be329869df7a77b85c0653d613f0a86 files/digest-ccp4-6.0.1-r1 3286