aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher (jlec) <jlec@j-schmitz.net>2009-08-17 21:19:32 +0200
committerJustin Lecher (jlec) <jlec@j-schmitz.net>2009-08-17 21:19:32 +0200
commit530b4e74ccaad13bc142efadac7a72872211ea8b (patch)
treecca269bbfa313711b71f1a6aaad06f8ee6fa7432
parentright clustalw added to overlay (diff)
downloadsci-530b4e74ccaad13bc142efadac7a72872211ea8b.tar.gz
sci-530b4e74ccaad13bc142efadac7a72872211ea8b.tar.bz2
sci-530b4e74ccaad13bc142efadac7a72872211ea8b.zip
collision ccp4i and mrbump
-rw-r--r--sci-chemistry/ccp4i/ChangeLog6
-rw-r--r--sci-chemistry/ccp4i/Manifest4
-rw-r--r--sci-chemistry/ccp4i/ccp4i-6.1.2-r2.ebuild (renamed from sci-chemistry/ccp4i/ccp4i-6.1.2-r1.ebuild)3
3 files changed, 11 insertions, 2 deletions
diff --git a/sci-chemistry/ccp4i/ChangeLog b/sci-chemistry/ccp4i/ChangeLog
index 2e7dc34ca..60eebf6d7 100644
--- a/sci-chemistry/ccp4i/ChangeLog
+++ b/sci-chemistry/ccp4i/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*ccp4i-6.1.2-r2 (17 Aug 2009)
+
+ 17 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+ +ccp4i-6.1.2-r2.ebuild, -ccp4i-6.1.2-r1.ebuild:
+ fix for collision with mrbump
+
*ccp4i-6.1.2-r1 (14 Aug 2009)
14 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-chemistry/ccp4i/Manifest b/sci-chemistry/ccp4i/Manifest
index 233864302..fdba886fd 100644
--- a/sci-chemistry/ccp4i/Manifest
+++ b/sci-chemistry/ccp4i/Manifest
@@ -14,6 +14,6 @@ EBUILD ccp4i-6.1.1-r1.ebuild 1219 RMD160 f2030fb10f766e5de0415e5cbb2edd78da5df5c
EBUILD ccp4i-6.1.1-r3.ebuild 1350 RMD160 281c23e4228348c0942f970ec932f4b6d3602c60 SHA1 89d241ee5f11c7bb6222bd3087e5fba610f8b0dc SHA256 bc0e4ca3ca917844680eb9db6a4384e5bf81f02a81b44096d18f4770d462f384
EBUILD ccp4i-6.1.1-r4.ebuild 1402 RMD160 11a0a5cc10a161de17ae5a89bf7196f5eedd2aab SHA1 a4497b1cb3e422de88e9101942c1f05792b2e361 SHA256 c33033c967364b1ab27957d09aedca70bc852dce8df7d1728c07c8d57c73974a
EBUILD ccp4i-6.1.1-r5.ebuild 1444 RMD160 c69583b66d51e059ef2ba00c304c7830d32bfebf SHA1 6a590ca81abdb2d41a6131d257595f01e2799da7 SHA256 44a1124ee6797fc66030ce4610655bfd4c74d451add4dd865f9806bde422c19b
-EBUILD ccp4i-6.1.2-r1.ebuild 1688 RMD160 5dacb841656ce9887f2bd3a181ae872c6eea07fd SHA1 04c2b7e0982b3da6b1138a55c1d2a133e91707a5 SHA256 5330a39f795bf9ddde4114dc90a22158d078dd10b61f84a4da32519f405fc577
-MISC ChangeLog 2146 RMD160 c62560ffd2a0f9f7209446f4c81483abb0fea929 SHA1 7aabfe3adff5be1cceb78c66de2364a5fc681854 SHA256 21d177cf20b26d0730653f180b46fbecdd4ad933a8badad4879f598b4dcf892a
+EBUILD ccp4i-6.1.2-r2.ebuild 1816 RMD160 93c888b85bb0949dc3e24f78d4d14b424c77ea66 SHA1 ef87a19733f86f6447b257884fee1b5e20bf8a88 SHA256 38fca125bb913beff72ad14f546fa513f38e0875317cf46c6bd266cad4e04a8f
+MISC ChangeLog 2317 RMD160 956bac28c937b8d4a8434a0875ac787ae392c982 SHA1 31e0ac58e5f2812104f654ee9fa18f113fd13eec SHA256 14784833fa5d47e34a65fe0ffc951c3d10c1d8cf3344d906ef0b3fe0f8830085
MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
diff --git a/sci-chemistry/ccp4i/ccp4i-6.1.2-r1.ebuild b/sci-chemistry/ccp4i/ccp4i-6.1.2-r2.ebuild
index 1b4aab149..8efb45653 100644
--- a/sci-chemistry/ccp4i/ccp4i-6.1.2-r1.ebuild
+++ b/sci-chemistry/ccp4i/ccp4i-6.1.2-r2.ebuild
@@ -67,6 +67,9 @@ src_install() {
# Is your name Gates?
rm -rf "${S}"/ccp4i/etc/WINDOWS
+ # This is installed by mrbump
+ rm -rf "${S}"/ccp4i/{tasks/{dbviewer.tcl,mrbump.*},templates/mrbump.com,scripts/mrbump.script}
+
# CCP4Interface - GUI
insinto /usr/$(get_libdir)/ccp4
doins -r "${S}"/ccp4i || die