diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-05-22 12:49:34 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-05-22 12:49:34 +0000 |
| commit | 0093d2f052fd56c14aa2ca9acc00532d105af442 (patch) | |
| tree | 0807137dca6afaa406d694253ad66b8df84e2953 /sci-chemistry | |
| parent | Update syntax for the new eclass changes, add a dependency on itself or tests... (diff) | |
| download | historical-0093d2f052fd56c14aa2ca9acc00532d105af442.tar.gz historical-0093d2f052fd56c14aa2ca9acc00532d105af442.tar.bz2 historical-0093d2f052fd56c14aa2ca9acc00532d105af442.zip | |
Removed last collision
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sci-chemistry')
| -rw-r--r-- | sci-chemistry/ccp4-apps/Manifest | 8 | ||||
| -rw-r--r-- | sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r3.ebuild | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sci-chemistry/ccp4-apps/Manifest b/sci-chemistry/ccp4-apps/Manifest index bc1caf58da47..99e141ea4089 100644 --- a/sci-chemistry/ccp4-apps/Manifest +++ b/sci-chemistry/ccp4-apps/Manifest @@ -22,13 +22,13 @@ DIST 6.1.3-oasis4.0.patch.bz2 946 RMD160 b448376114ba41e6999d533929fdb79812476f8 DIST ccp4-6.1.3-core-src.tar.gz 242134076 RMD160 e9b7deb0766fb95d5e8946881f20e086f0896fe9 SHA1 ee5ada892694db5dc9b2d7d2330b4ac694f56580 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324 EBUILD ccp4-apps-6.1.3-r1.ebuild 12077 RMD160 a00f39bd4b8b0e6f2b614801abb90495c867c12c SHA1 1442d693038b8da3ccfaf33f11e266f90c54fbe6 SHA256 97039b674609109821d3e994c8edc22c6e4f12934a7ce467522faa1f3d690713 EBUILD ccp4-apps-6.1.3-r2.ebuild 12075 RMD160 d71b0b504061cdfbf0ddbf16c4abdf538d117dba SHA1 34690331e2cc3f682474027e2065f666f3447d31 SHA256 2bb54b125d1a9635e36f3a4a6a1540eb65afb6693591afd92cd1ec5955341996 -EBUILD ccp4-apps-6.1.3-r3.ebuild 12600 RMD160 c8642b290ede663c5b329ea2f9ce335ca24fb222 SHA1 335f4fa8d2103eaf893cfb73977d133517977e24 SHA256 d14d70cd8917aa4c98bd82c8731994268fc35571702985aebb37b77744f7ae83 +EBUILD ccp4-apps-6.1.3-r3.ebuild 12658 RMD160 77bf80ead7d1b5d85ac841f6a8793cf20cc28c5f SHA1 639a7a59962812a4f89b904bc42bcda0bfa4bd19 SHA256 acb503dddb2479ac05c5c0143b3026643fab51fe34564956c6138e42fe6f690c MISC ChangeLog 2015 RMD160 5c60b0803faa5e8db38e3e8f6add6ffef9fc99e4 SHA1 c951f6d3aa90b8d734b6f124e998a433005ee611 SHA256 007521e6fccef8eb989b8348a092c31e8bac7cf651e90e22909f0ef59fa314bc MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkv3wUQACgkQgAnW8HDreRZ2xQCgrfxOAeF9mvJ0zUb30ErlPBSo -DvIAoLaHa1fDK4/3nT9P1VerCD0+BVJG -=Gty1 +iEYEARECAAYFAkv30uMACgkQgAnW8HDreRZCUwCghF1FIGufQkgU7x4Y3spPRMVK +uUsAoI/V4uJcsN5oDIb7AdvD+VO6Q16r +=0Soc -----END PGP SIGNATURE----- diff --git a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r3.ebuild b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r3.ebuild index d32bf415f82f..110a0e448757 100644 --- a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r3.ebuild +++ b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r3.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/ccp4-apps/ccp4-apps-6.1.3-r3.ebuild,v 1.1 2010/05/22 11:34:22 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r3.ebuild,v 1.2 2010/05/22 12:49:34 jlec Exp $ EAPI="3" @@ -422,7 +422,8 @@ src_install() { dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/ccp4/html # Fix overlaps with other packages - rm -f "${D}"/usr/share/man/man1/rasmol.1* "${D}"/usr/lib/font84.dat || die + rm -f "${ED}"/usr/share/man/man1/rasmol.1* "${ED}"/usr/lib/font84.dat || die + mv "${ED}"/usr/share/man/man1/truncate{,-ccp4}* || die cat >> "${T}"/baubles <<- EOF #!${EPREFIX}/bin/bash |