Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sci-chemistry/ccp4i/ChangeLog10
-rw-r--r--sci-chemistry/ccp4i/Manifest8
-rw-r--r--sci-chemistry/ccp4i/ccp4i-6.1.1-r1.ebuild57
-rw-r--r--sci-chemistry/ccp4i/ccp4i-6.1.1-r3.ebuild65
-rw-r--r--sci-chemistry/ccp4i/ccp4i-6.1.1-r4.ebuild67
-rw-r--r--sci-chemistry/ccp4i/ccp4i-6.1.2-r3.ebuild (renamed from sci-chemistry/ccp4i/ccp4i-6.1.2-r2.ebuild)4
-rw-r--r--sci-chemistry/ccp4i/files/6.1.2-crank_shelxd.tcl.patch11
7 files changed, 26 insertions, 196 deletions
diff --git a/sci-chemistry/ccp4i/ChangeLog b/sci-chemistry/ccp4i/ChangeLog
index 60eebf6d7..dc29157ca 100644
--- a/sci-chemistry/ccp4i/ChangeLog
+++ b/sci-chemistry/ccp4i/ChangeLog
@@ -2,6 +2,16 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*ccp4i-6.1.2-r3 (02 Sep 2009)
+
+ 02 Sep 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+ +files/6.1.2-crank_shelxd.tcl.patch, -ccp4i-6.1.1-r1.ebuild,
+ -ccp4i-6.1.1-r3.ebuild, -ccp4i-6.1.1-r4.ebuild, -ccp4i-6.1.2-r2.ebuild,
+ +ccp4i-6.1.2-r3.ebuild:
+ added crank_shelxd.tcl.patch
+ QA rmoved WINDOWS and UNIX binary dirs
+ cleaned up old versions
+
*ccp4i-6.1.2-r2 (17 Aug 2009)
17 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-chemistry/ccp4i/Manifest b/sci-chemistry/ccp4i/Manifest
index fdba886fd..30fe12ae7 100644
--- a/sci-chemistry/ccp4i/Manifest
+++ b/sci-chemistry/ccp4i/Manifest
@@ -2,6 +2,7 @@ AUX 6.1.1-fix-baubles.patch 1542 RMD160 c952d16d1e009a9ff345393494bf198fff997934
AUX 6.1.1-rename-rapper.patch 380 RMD160 e8306cec04348a56fbe00026333b27ce2a8544f8 SHA1 f5a87898394add359a1e6f6ceb837530dc53646f SHA256 e15407959e565d32874d2db9003168559b7e9b14f0e68207560d4a5b4db8a728
AUX 6.1.1-rename-superpose.patch 655 RMD160 6647dc3e0a021f9809d74d5dd785dd6bde456c22 SHA1 485a2e3cd46864769c6cfe10b9b0224ca896d2d6 SHA256 75791921692a603baa88dfa45ff48331ea8b6985a63f04a15ad43dd5be93e52e
AUX 6.1.1-rename-truncate.patch 810 RMD160 33f8cb14a3bc0f9c6cd249df07f469c9d6601e4d SHA1 ac13f02b6141802e3762efe50a3d270169da0a54 SHA256 5a298cce47726d78ece397affdf1f2d550be520565c7dc5b47a953ab01d23ccd
+AUX 6.1.2-crank_shelxd.tcl.patch 539 RMD160 af90e7dc6c0437aac52a2ac734dac443d6866b5b SHA1 f121631ae38930f30be729807bc9c57c727015b7 SHA256 99a2108c8eec3e25e750f912d1d30a45a376fc9fc3bc5f3f1fa230b6ec5056ce
AUX 6.1.2-fix-baubles.patch 1542 RMD160 c952d16d1e009a9ff345393494bf198fff997934 SHA1 cdc8752026f3cdd96ee0fd6a3f558e0729f88a6a SHA256 37c217f339a46a6b830ce8e791cbd32655e31ab8d58267fb625e841e867402b4
AUX 6.1.2-rename-rapper.patch 380 RMD160 e8306cec04348a56fbe00026333b27ce2a8544f8 SHA1 f5a87898394add359a1e6f6ceb837530dc53646f SHA256 e15407959e565d32874d2db9003168559b7e9b14f0e68207560d4a5b4db8a728
AUX 6.1.2-rename-superpose.patch 655 RMD160 6647dc3e0a021f9809d74d5dd785dd6bde456c22 SHA1 485a2e3cd46864769c6cfe10b9b0224ca896d2d6 SHA256 75791921692a603baa88dfa45ff48331ea8b6985a63f04a15ad43dd5be93e52e
@@ -10,10 +11,7 @@ DIST 6.1.1-090511-updates.patch.bz2 8915 RMD160 58114b0ba6d225078044a8a6f9245aab
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
DIST ccp4-6.1.2-core-src.tar.gz 247203188 RMD160 19019c6cd37e83cf6d2d19f91979edc978d18395 SHA1 2423178d3877dd44d3671a7eb4d6666de6852cb7 SHA256 bcae870675270be410278d9a6f2ee19f9caf32b73fd969e9381a4d510f174c75
-EBUILD ccp4i-6.1.1-r1.ebuild 1219 RMD160 f2030fb10f766e5de0415e5cbb2edd78da5df5cd SHA1 b6e382f2591c44c1cad007fb7295f397ca464022 SHA256 49c498adffd6e7e3458313754379197c2d20c04a5b63cfcf714595a0bda93d9c
-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-r2.ebuild 1816 RMD160 93c888b85bb0949dc3e24f78d4d14b424c77ea66 SHA1 ef87a19733f86f6447b257884fee1b5e20bf8a88 SHA256 38fca125bb913beff72ad14f546fa513f38e0875317cf46c6bd266cad4e04a8f
-MISC ChangeLog 2317 RMD160 956bac28c937b8d4a8434a0875ac787ae392c982 SHA1 31e0ac58e5f2812104f654ee9fa18f113fd13eec SHA256 14784833fa5d47e34a65fe0ffc951c3d10c1d8cf3344d906ef0b3fe0f8830085
+EBUILD ccp4i-6.1.2-r3.ebuild 1850 RMD160 63dda16d9b999f45bda65fcff45d52318f6d1a57 SHA1 9f02903656e712659f2cbbe01f99648a78b85da6 SHA256 c3cab3b2b299d2abbea3e207aa5461561720b05196c5360faf9f71be60190e00
+MISC ChangeLog 2667 RMD160 6b2dfca5b8d74318ed0bb03809f29015997a5962 SHA1 04d4f360eb30a5e33f205a13d561939954a2f876 SHA256 b5412bdeacc56b4464d070e72ce6e16e5b852477dd2874ae6e21a71e75e58e00
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
deleted file mode 100644
index f403b12a1..000000000
--- a/sci-chemistry/ccp4i/ccp4i-6.1.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils multilib
-
-SRC="ftp://ftp.ccp4.ac.uk/ccp4"
-
-MY_PN="ccp4"
-MY_P="${MY_PN}-${PV}"
-PATCHDATE="04_03_09"
-DESCRIPTION="Protein X-ray crystallography toolkit, graphical interface"
-HOMEPAGE="http://www.ccp4.ac.uk/"
-RESTRICT="mirror"
-SRC_URI="${SRC}/${PV}/${MY_P}-core-src.tar.gz
- ${SRC}/${PV}/updates/${MY_P}-src-patch-${PATCHDATE}.tar.gz"
-LICENSE="ccp4"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND=">=dev-lang/tk-8.3
- >=dev-tcltk/blt-2.4
- app-shells/tcsh"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # 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 \
- "${S}"/ccp4i/imosflm/src/processingwizard.tcl
-}
-
-src_compile() {
- :
-}
-
-src_install() {
- # CCP4Interface - GUI
- insinto /usr/$(get_libdir)/ccp4
- doins -r "${S}"/ccp4i || die
- exeinto /usr/$(get_libdir)/ccp4/ccp4i/bin
- doexe "${S}"/ccp4i/bin/* || die
-
- # dbccp4i
- insinto /usr/share/ccp4
- doins -r "${S}"/share/dbccp4i || die
-}
diff --git a/sci-chemistry/ccp4i/ccp4i-6.1.1-r3.ebuild b/sci-chemistry/ccp4i/ccp4i-6.1.1-r3.ebuild
deleted file mode 100644
index 280ae557a..000000000
--- a/sci-chemistry/ccp4i/ccp4i-6.1.1-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils multilib
-
-MY_PN="${PN%i}"
-MY_P="${MY_PN}-${PV}"
-
-UPDATE="04_03_09"
-PATCHDATE="090511"
-
-SRC="ftp://ftp.ccp4.ac.uk/ccp4"
-
-DESCRIPTION="Protein X-ray crystallography toolkit, graphical interface"
-HOMEPAGE="http://www.ccp4.ac.uk/"
-SRC_URI="${SRC}/${PV}/${MY_P}-core-src.tar.gz
- ${SRC}/${PV}/updates/${MY_P}-src-patch-${UPDATE}.tar.gz
- http://dev.gentooexperimental.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="ccp4"
-IUSE=""
-
-RESTRICT="mirror"
-
-RDEPEND=">=dev-lang/tk-8.3
- >=dev-tcltk/blt-2.4
- app-shells/tcsh"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch
-
- # 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}"/ccp4i/imosflm/src/processingwizard.tcl
-}
-
-src_compile() {
- :
-}
-
-src_install() {
- # CCP4Interface - GUI
- insinto /usr/$(get_libdir)/ccp4
- doins -r "${S}"/ccp4i || die
- exeinto /usr/$(get_libdir)/ccp4/ccp4i/bin
- doexe "${S}"/ccp4i/bin/* || die
-
- # dbccp4i
- insinto /usr/share/ccp4
- doins -r "${S}"/share/dbccp4i || die
-}
diff --git a/sci-chemistry/ccp4i/ccp4i-6.1.1-r4.ebuild b/sci-chemistry/ccp4i/ccp4i-6.1.1-r4.ebuild
deleted file mode 100644
index 3e499c8f7..000000000
--- a/sci-chemistry/ccp4i/ccp4i-6.1.1-r4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils multilib
-
-MY_PN="${PN%i}"
-MY_P="${MY_PN}-${PV}"
-
-UPDATE="04_03_09"
-PATCHDATE="090511"
-
-SRC="ftp://ftp.ccp4.ac.uk/ccp4"
-
-DESCRIPTION="Protein X-ray crystallography toolkit, graphical interface"
-HOMEPAGE="http://www.ccp4.ac.uk/"
-SRC_URI="${SRC}/${PV}/${MY_P}-core-src.tar.gz
- ${SRC}/${PV}/updates/${MY_P}-src-patch-${UPDATE}.tar.gz
- http://dev.gentooexperimental.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="ccp4"
-IUSE=""
-
-RESTRICT="mirror"
-
-RDEPEND=">=dev-lang/tk-8.3
- >=dev-tcltk/blt-2.4
- app-shells/tcsh"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch
-
- # conflicts w/ coreutils
- epatch "${FILESDIR}"/${PV}-rename-truncate.patch
-
- epatch "${FILESDIR}"/${PV}-rename-rapper.patch
-
- epatch "${FILESDIR}"/${PV}-rename-superpose.patch
-
- sed -i \
- -e "s:share smartie:share ccp4 smartie:g" \
- "${S}"/ccp4i/imosflm/src/processingwizard.tcl
-}
-
-src_compile() {
- :
-}
-
-src_install() {
- # CCP4Interface - GUI
- insinto /usr/$(get_libdir)/ccp4
- doins -r "${S}"/ccp4i || die
- exeinto /usr/$(get_libdir)/ccp4/ccp4i/bin
- doexe "${S}"/ccp4i/bin/* || die
-
- # dbccp4i
- insinto /usr/share/ccp4
- doins -r "${S}"/share/dbccp4i || die
-}
diff --git a/sci-chemistry/ccp4i/ccp4i-6.1.2-r2.ebuild b/sci-chemistry/ccp4i/ccp4i-6.1.2-r3.ebuild
index 8efb45653..708c9ac58 100644
--- a/sci-chemistry/ccp4i/ccp4i-6.1.2-r2.ebuild
+++ b/sci-chemistry/ccp4i/ccp4i-6.1.2-r3.ebuild
@@ -40,6 +40,7 @@ PATCHES=(
"${FILESDIR}"/${PV}-rename-rapper.patch
"${FILESDIR}"/${PV}-rename-superpose.patch
"${FILESDIR}"/${PV}-fix-baubles.patch
+ "${FILESDIR}"/${PV}-crank_shelxd.tcl.patch
)
src_prepare() {
@@ -64,8 +65,7 @@ src_install() {
# rm imosflm stuff
rm -rf "${S}"/ccp4i/{bin/imosflm,imoslfm}
- # Is your name Gates?
- rm -rf "${S}"/ccp4i/etc/WINDOWS
+ rm -rf "${S}"/ccp4i/{bin,etc}/{UNIX,WINDOWS}
# This is installed by mrbump
rm -rf "${S}"/ccp4i/{tasks/{dbviewer.tcl,mrbump.*},templates/mrbump.com,scripts/mrbump.script}
diff --git a/sci-chemistry/ccp4i/files/6.1.2-crank_shelxd.tcl.patch b/sci-chemistry/ccp4i/files/6.1.2-crank_shelxd.tcl.patch
new file mode 100644
index 000000000..0996065f3
--- /dev/null
+++ b/sci-chemistry/ccp4i/files/6.1.2-crank_shelxd.tcl.patch
@@ -0,0 +1,11 @@
+--- ccp4i/crank/plugins/shelxd/crank_shelxd.tcl 2009-09-02 21:28:51.000000000 +0200
++++ ccp4i/crank/plugins/shelxd/crank_shelxd.tcl 2009-08-17 21:17:55.000000000 +0200
+@@ -114,7 +114,7 @@
+ puts $smalllog "Trial CCweak CC \$\$ \$\$"
+ for {set i 1} {$i <= $ntrial} {incr i} {
+ if { [info exists accweak($i)] && [info exists acc($i)] } {
+- if { $accweak($i) > maxaccweak } {
++ if { $accweak($i) > $maxaccweak } {
+ set maxaccweak accweak($i)
+ set trialmaxaccweak $i
+ set maxacc acc($i)