diff options
| author |   Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-03-27 13:00:10 +0100 |
|---|---|---|
| committer | Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-03-27 13:00:10 +0100 |
| commit | 1d0df86997935e3ad09aba01ebd135536ee9f8dd (patch) | |
| tree | 0d44d80533b84c54f54312e9e912a9d3dae0f60e | |
| parent | sci-chemistry/ccp4 unmacked (diff) | |
| download | sci-1d0df86997935e3ad09aba01ebd135536ee9f8dd.tar.gz sci-1d0df86997935e3ad09aba01ebd135536ee9f8dd.tar.bz2 sci-1d0df86997935e3ad09aba01ebd135536ee9f8dd.zip | |
!media-libs/raptor removed from ccp4
| -rw-r--r-- | sci-chemistry/ccp4/ChangeLog | 3 | ||||
| -rw-r--r-- | sci-chemistry/ccp4/Manifest | 4 | ||||
| -rw-r--r-- | sci-chemistry/ccp4/ccp4-6.1.1.ebuild | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/sci-chemistry/ccp4/ChangeLog b/sci-chemistry/ccp4/ChangeLog index 016431978..1dfb4ccdf 100644 --- a/sci-chemistry/ccp4/ChangeLog +++ b/sci-chemistry/ccp4/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4/ChangeLog,v 1.18 2008/06/03 02:11:18 mr_bones_ Exp $ + 27 Mar 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> ccp4-6.1.1.ebuild: + removed !media-libs/raptor as collision is fixed + 12 Mar 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> ChangeLog: rapper conflict with media-libs/raptor resolved diff --git a/sci-chemistry/ccp4/Manifest b/sci-chemistry/ccp4/Manifest index 92e473d1b..c2a9aa16f 100644 --- a/sci-chemistry/ccp4/Manifest +++ b/sci-chemistry/ccp4/Manifest @@ -6,6 +6,6 @@ AUX 6.1.1-fix-setup-bash-incompatibility.patch 422 RMD160 e7e886ab030cf3324302c8 AUX 6.1.1-rename-rapper.patch 2856 RMD160 37504bed3cb4e1858d88331305deef6564616b02 SHA1 31f513c987e1408b868f8c9de4aaa9f2c35cb378 SHA256 d9fed1ec65089c4130358aeed771b32c1253e48a73e90f0ce7b92bd0abbb0c2b AUX 6.1.1-rename-truncate.patch 1515 RMD160 eff332faa67a1732e0f99cc6cdcb846932eadc87 SHA1 b504542cf710e1b54a684b0fa0e8d73d967c96ac SHA256 50a59a1856867daa3de1f8f53e92bcfe74dea3a6d3c4ba238a9ea83dbcdfbf07 DIST ccp4-6.1.1-core-src.tar.gz 246661086 RMD160 6722367727e4b6b1f8456f1458c9aac124923a89 SHA1 9141801e021f8a5107ed1e3989840e4de849b39c SHA256 56f971e05fe4543173451e48600813492fd0081b25d4a659cb0fed1fd2529407 -EBUILD ccp4-6.1.1.ebuild 11099 RMD160 418de44098ef2c68cc449cfeaecf1c516678fd15 SHA1 ae6ac1a0e7f7dd3226f898d0c1451791503e98e5 SHA256 ff6fecd07816f171d6ff07eb2f8d5b41aa8ce142fc038657dece73a6fb981a6e -MISC ChangeLog 3941 RMD160 9369503bab7a74f027137ba674b26308e290a95c SHA1 028110bb338ebdbfb999ecc7e81f9721a89bd295 SHA256 325b0185bd6c0cc8a41757feb81b6aeda7e9d3bc483fa25908b2e1df5e780b40 +EBUILD ccp4-6.1.1.ebuild 11078 RMD160 bdda0b25af939be1d59f1d25a3f5d1b603f8b17c SHA1 ceb05f4916197ca661660510e7eec70924032a1e SHA256 33214b5ca84c710112fb286de06073a843400fa2331715db1672713b33032024 +MISC ChangeLog 4069 RMD160 17d207b2ff775d3f2b645891a3808ccdd3cf414d SHA1 aea191881835797b13adfad06df382367c821b81 SHA256 af4305073445f6b5b7b00299e02faedfa7122fcb87a29b168bbfca5b26111fe9 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 diff --git a/sci-chemistry/ccp4/ccp4-6.1.1.ebuild b/sci-chemistry/ccp4/ccp4-6.1.1.ebuild index bbf3d2ce4..8f5d7c72e 100644 --- a/sci-chemistry/ccp4/ccp4-6.1.1.ebuild +++ b/sci-chemistry/ccp4/ccp4-6.1.1.ebuild @@ -67,8 +67,7 @@ RDEPEND="X? ( dev-tcltk/itcl dev-tcltk/itk sci-libs/ccp4-libs - !app-office/sc - !media-libs/raptor" + !app-office/sc" DEPEND="${RDEPEND} =sys-devel/automake-1.6* X? ( |