diff options
| author |   Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-03-12 23:39:30 +0100 |
|---|---|---|
| committer | Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-03-12 23:39:30 +0100 |
| commit | 54cd13f54d7d6275e9f15810e82236f72a6ba374 (patch) | |
| tree | 52d1dd9f9346a0b37c757e42c6d73e23c636e051 /sci-chemistry | |
| parent | sci-chemistry/ccp4 repper --> rappermc renaming (diff) | |
| download | sci-54cd13f54d7d6275e9f15810e82236f72a6ba374.tar.gz sci-54cd13f54d7d6275e9f15810e82236f72a6ba374.tar.bz2 sci-54cd13f54d7d6275e9f15810e82236f72a6ba374.zip | |
sci-chemistry/ccp4i conflict of rapper with media-libs/raptor
(Portage version: 2.2_rc25/git/Linux x86_64)
(Unsigned Manifest commit)
Diffstat (limited to 'sci-chemistry')
| -rw-r--r-- | sci-chemistry/ccp4i/ChangeLog | 4 | ||||
| -rw-r--r-- | sci-chemistry/ccp4i/Manifest | 5 | ||||
| -rw-r--r-- | sci-chemistry/ccp4i/ccp4i-6.1.1-r1.ebuild | 2 | ||||
| -rw-r--r-- | sci-chemistry/ccp4i/files/6.1.1-rename-rapper.patch | 12 |
4 files changed, 21 insertions, 2 deletions
diff --git a/sci-chemistry/ccp4i/ChangeLog b/sci-chemistry/ccp4i/ChangeLog index 0429e6119..abf546891 100644 --- a/sci-chemistry/ccp4i/ChangeLog +++ b/sci-chemistry/ccp4i/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 12 Mar 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> + +files/6.1.1-rename-rapper.patch, ccp4i-6.1.1-r1.ebuild: + rapper conflict with media-libs/raptor resolved + *ccp4i-6.1.1-r1 (05 Mar 2009) 05 Mar 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> diff --git a/sci-chemistry/ccp4i/Manifest b/sci-chemistry/ccp4i/Manifest index 5fb866c35..7becc47c9 100644 --- a/sci-chemistry/ccp4i/Manifest +++ b/sci-chemistry/ccp4i/Manifest @@ -1,7 +1,8 @@ +AUX 6.1.1-rename-rapper.patch 380 RMD160 e8306cec04348a56fbe00026333b27ce2a8544f8 SHA1 f5a87898394add359a1e6f6ceb837530dc53646f SHA256 e15407959e565d32874d2db9003168559b7e9b14f0e68207560d4a5b4db8a728 AUX 6.1.1-rename-truncate.patch 810 RMD160 33f8cb14a3bc0f9c6cd249df07f469c9d6601e4d SHA1 ac13f02b6141802e3762efe50a3d270169da0a54 SHA256 5a298cce47726d78ece397affdf1f2d550be520565c7dc5b47a953ab01d23ccd DIST ccp4-6.1.1-core-src.tar.gz 246661086 RMD160 6722367727e4b6b1f8456f1458c9aac124923a89 SHA1 9141801e021f8a5107ed1e3989840e4de849b39c SHA256 56f971e05fe4543173451e48600813492fd0081b25d4a659cb0fed1fd2529407 DIST ccp4-6.1.1-src-patch-04_03_09.tar.gz 279642 RMD160 1a7c3b6cc846d315fc577e78b4aa00ab85a3d3d2 SHA1 29dbb84f3d63fc860694473ca99cf8bb71dae18a SHA256 eb806168235b55fbafdd72591ba94d35b78cc715a56a8b90979644d420ad672a -EBUILD ccp4i-6.1.1-r1.ebuild 1170 RMD160 03da14d24c74922f72dfb3cce77ca7fc8cde5903 SHA1 a95a595e5bae5de038be34473f9fb78546a2d3f6 SHA256 5dffc8f4e553b92ada314ca83ea4ecebc0fd745325d87827213976c5675513c2 +EBUILD ccp4i-6.1.1-r1.ebuild 1219 RMD160 f2030fb10f766e5de0415e5cbb2edd78da5df5cd SHA1 b6e382f2591c44c1cad007fb7295f397ca464022 SHA256 49c498adffd6e7e3458313754379197c2d20c04a5b63cfcf714595a0bda93d9c EBUILD ccp4i-6.1.1.ebuild 1089 RMD160 e225f61af93a358cac3f45e4054efb2f8a769058 SHA1 0440ec99a916c3e9f2a60a1d46923448b53df725 SHA256 102cc32d340a91539dedef01240863d9c947f2ef14b6dc93ca2ae9b95e8b86de -MISC ChangeLog 469 RMD160 08a62443d166b84e7b8da489fef781a6d3a1b1a7 SHA1 4317f05a0af4c1f1e7030be3dcca63812c803dbe SHA256 e26719f516a6442235411f9779ae4c10d3f2a65f3521b168f2252e5dc2f15fb8 +MISC ChangeLog 636 RMD160 618ed42907bcd729c757a6af527be5583018a08c SHA1 bc066c14e25f45c8d873e8260d80bb13dcbb9452 SHA256 6e5b4d5470666b2cc199e349be594f2adc13cbd8320157cc1138aa7ddb70e877 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 diff --git a/sci-chemistry/ccp4i/ccp4i-6.1.1-r1.ebuild b/sci-chemistry/ccp4i/ccp4i-6.1.1-r1.ebuild index 7a7f33db5..f403b12a1 100644 --- a/sci-chemistry/ccp4i/ccp4i-6.1.1-r1.ebuild +++ b/sci-chemistry/ccp4i/ccp4i-6.1.1-r1.ebuild @@ -32,6 +32,8 @@ src_unpack() { # conflicts w/ coreutils epatch "${FILESDIR}"/${PV}-rename-truncate.patch + epatch "${FILESDIR}"/${PV}-rename-rapper.patch + sed -i \ -e "s:share smartie:share ccp4 smartie:g" \ "${S}"/etc/configure.def.dist \ diff --git a/sci-chemistry/ccp4i/files/6.1.1-rename-rapper.patch b/sci-chemistry/ccp4i/files/6.1.1-rename-rapper.patch new file mode 100644 index 000000000..a50ae6dbd --- /dev/null +++ b/sci-chemistry/ccp4i/files/6.1.1-rename-rapper.patch @@ -0,0 +1,12 @@ +--- ccp4i/scripts/rapper.script 2009-02-03 11:49:50.000000000 +0100 ++++ ccp4i/scripts/rapper.script.new 2009-03-12 23:34:47.000000000 +0100 +@@ -17,7 +17,7 @@ + + #set up command line + +-set cmd "[BinPath rapper]" ++set cmd "[BinPath rappermc]" + + set rapperdatadir [FileJoin [GetEnvPath CCP4] share rapper] + set paramsfile [FileJoin [GetEnvPath CCP4] share rapper params.xml] + |