ccp4i bump to 6.1.2

7 files changed, 154 insertions, 1 deletions

diff --git a/sci-chemistry/ccp4i/ChangeLog b/sci-chemistry/ccp4i/ChangeLog
index 096a1df88..37afcdbeb 100644
--- a/sci-chemistry/ccp4i/ChangeLog
+++ b/sci-chemistry/ccp4i/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ccp4i-6.1.2 (29 Jul 2009)
+
+  29 Jul 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +files/6.1.2-fix-baubles.patch, +ccp4i-6.1.2.ebuild,
+  +files/6.1.2-rename-rapper.patch, +files/6.1.2-rename-superpose.patch,
+  +files/6.1.2-rename-truncate.patch:
+  this is still not released
+
   07 Jul 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
   ccp4i-6.1.1-r5.ebuild:
   added media-gfx/graphviz as dep
diff --git a/sci-chemistry/ccp4i/Manifest b/sci-chemistry/ccp4i/Manifest
index ea482fe9e..1f3c39653 100644
--- a/sci-chemistry/ccp4i/Manifest
+++ b/sci-chemistry/ccp4i/Manifest
@@ -2,12 +2,18 @@ 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-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
+AUX 6.1.2-rename-truncate.patch 810 RMD160 33f8cb14a3bc0f9c6cd249df07f469c9d6601e4d SHA1 ac13f02b6141802e3762efe50a3d270169da0a54 SHA256 5a298cce47726d78ece397affdf1f2d550be520565c7dc5b47a953ab01d23ccd
 DIST 6.1.1-090511-updates.patch.bz2 8915 RMD160 58114b0ba6d225078044a8a6f9245aab66c6b572 SHA1 15c327c0b218b542b0c3955a9e63d2c6de299f7e SHA256 c0dbbde05b72f2460ada22f556d4cfe1f286a448ceb1181fd48b758468e509ac
 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 247203373 RMD160 d2ead65da0a2561a8a256cdaa15a6b1a02b6d49e SHA1 fe94461fcafa7074231e01221760e24bb886d605 SHA256 875137beb74cb385b89fe3e49feeda78330c175861a590ee5f7cdbec26bc0e8a
 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
-MISC ChangeLog 1698 RMD160 69694b09b7d7e2ed3a8c8fa5efe0ef22cd07dc80 SHA1 92736df6aeec2fb216ce7833eff682c92f070d6a SHA256 4767d1fdcccffb9c87093dbedebbe40f661ef6575e5a0755aef5831af6f5c703
+EBUILD ccp4i-6.1.2.ebuild 1400 RMD160 891285c15a78752e83b4cc1e4552571c226cd942 SHA1 9da0c105d3089b22c6c64f23d7510ad8d34f7bcc SHA256 2b941cf06a3dfcc39ccf797a2641ade710913e5fc7148e98d00e60ed37ba9fc9
+MISC ChangeLog 1979 RMD160 535e9ee65921404f090798029f17593c4f2aaa7e SHA1 27a47ca852172e6077497d0d70a837289a31da43 SHA256 cc88d52759064da6650c8dafcd66d7b2e4f939c9acd7775979c429093ab200e4
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
diff --git a/sci-chemistry/ccp4i/ccp4i-6.1.2.ebuild b/sci-chemistry/ccp4i/ccp4i-6.1.2.ebuild
new file mode 100644
index 000000000..e0dafe485
--- /dev/null
+++ b/sci-chemistry/ccp4i/ccp4i-6.1.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit multilib base
+
+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
+	media-gfx/graphviz"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-rename-truncate.patch
+	"${FILESDIR}"/${PV}-rename-rapper.patch
+	"${FILESDIR}"/${PV}-rename-superpose.patch
+	"${FILESDIR}"/${PV}-fix-baubles.patch
+	)
+
+src_prepare() {
+	base_src_prepare
+
+	sed -i \
+		-e "s:share smartie:share ccp4 smartie:g" \
+		"${S}"/ccp4i/imosflm/src/processingwizard.tcl
+}
+
+src_configure() {
+	:
+}
+
+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/files/6.1.2-fix-baubles.patch b/sci-chemistry/ccp4i/files/6.1.2-fix-baubles.patch
new file mode 100644
index 000000000..2c5f659b8
--- /dev/null
+++ b/sci-chemistry/ccp4i/files/6.1.2-fix-baubles.patch
@@ -0,0 +1,22 @@
+--- ccp4i/etc/configure.def.dist	2009-01-09 16:45:08.000000000 +0100
++++ ccp4i/etc/configure.def.dist.new	2009-07-07 23:17:26.000000000 +0200
+@@ -53,8 +53,8 @@
+ RUN_IMOSFLM               _text "ccp4iwish [file join [GetEnvPath CCP4I_TOP] imosflm imosflm.tcl] project [GetCurrentProjectDir [GetCurrentProject]]"
+ RUN_CCP4MG                _text                     "ccp4mg"
+ RUN_COOT                  _text                     "coot"
+-RUN_BAUBLES               _text                     "python [file join [GetEnvPath CCP4] share smartie baubles.py]"
+-RUN_DBVIEWER              _text                     "wish [file join [GetEnvPath CCP4] share dbccp4i application viewer.tcl]"
++RUN_BAUBLES               _text                     "python [file join [GetEnvPath CCP4] share ccp4 smartie baubles.py]"
++RUN_DBVIEWER              _text                     "wish [file join [GetEnvPath DBCCP4I_TOP] application viewer.tcl]"
+ ENABLE_BUBBLE_HELP        _logical                  1
+ DISABLE_TASKS             _logical                  1
+ CCP4_SETUP_COMMAND        _text                     setup_ccp4
+@@ -62,7 +62,7 @@
+ BLT_LIBRARY               _text                     ""
+ MENU_LENGTH               _positiveint              25
+ HYPERTEXT_VIEWER          _text                     firefox
+-START_NETSCAPE	          _text			    netscape
++START_NETSCAPE	          _text			    firefox
+ O_MAPMAN                  _text                     mapman
+ MAPMAN_MAXSIZE		  _positiveint		    4194304
+ QUANTA_MBKALL             _text                     mbkall
diff --git a/sci-chemistry/ccp4i/files/6.1.2-rename-rapper.patch b/sci-chemistry/ccp4i/files/6.1.2-rename-rapper.patch
new file mode 100644
index 000000000..a50ae6dbd
--- /dev/null
+++ b/sci-chemistry/ccp4i/files/6.1.2-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]
+
diff --git a/sci-chemistry/ccp4i/files/6.1.2-rename-superpose.patch b/sci-chemistry/ccp4i/files/6.1.2-rename-superpose.patch
new file mode 100644
index 000000000..90480eb8e
--- /dev/null
+++ b/sci-chemistry/ccp4i/files/6.1.2-rename-superpose.patch
@@ -0,0 +1,12 @@
+diff -arNu ccp4-6.1.1/ccp4i/scripts/superpose.script ccp4-6.1.1.new/ccp4i/scripts/superpose.script
+--- ccp4-6.1.1/ccp4i/scripts/superpose.script	2006-07-26 16:22:49.000000000 +0200
++++ ccp4-6.1.1.new/ccp4i/scripts/superpose.script	2009-07-05 22:11:59.000000000 +0200
+@@ -21,7 +21,7 @@
+ 
+   if { [regexp SSM $SUPERPOSE_MODE ] } {
+ 
+-    set cmd "[BinPath superpose] \"$XYZIN2\" -s $SSM_MOVING \"$XYZIN1\" -s $SSM_FIXED \"$XYZOUT_LOCAL\""
++    set cmd "[BinPath superpose-ccp4] \"$XYZIN2\" -s $SSM_MOVING \"$XYZIN1\" -s $SSM_FIXED \"$XYZOUT_LOCAL\""
+     set status [Execute $cmd "" program_status report ]
+ 
+   } elseif { [regexp TOP $SUPERPOSE_MODE ] } {
diff --git a/sci-chemistry/ccp4i/files/6.1.2-rename-truncate.patch b/sci-chemistry/ccp4i/files/6.1.2-rename-truncate.patch
new file mode 100644
index 000000000..26f1cda3e
--- /dev/null
+++ b/sci-chemistry/ccp4i/files/6.1.2-rename-truncate.patch
@@ -0,0 +1,22 @@
+--- ./ccp4i/templates/truncate.com.orig	2009-03-02 23:31:04.000000000 -0800
++++ ./ccp4i/templates/truncate.com	2009-03-02 23:31:08.000000000 -0800
+@@ -11,7 +11,7 @@
+ $SYMMETRY symmetry $SPACE_GROUP
+ $CELL cell $CELL_1 $CELL_2 $CELL_3 $CELL_4 $CELL_5 $CELL_6
+ 
+-1 truncate
++1 ftruncate
+  - { [StringSame $APPLY_TRUNCATE "WILSON" ] } YES | NO
+ {[IfSet $ANOMALOUS]} anomalous 
+  - $ANOMALOUS YES | NO
+--- ./ccp4i/scripts/truncate.script.orig	2009-03-02 23:39:04.000000000 -0800
++++ ./ccp4i/scripts/truncate.script	2009-03-02 23:39:41.000000000 -0800
+@@ -45,7 +45,7 @@
+ 
+   CreateComScript truncate truncate_script
+ 
+-  set cmd "[BinPath truncate] HKLIN \"$HKLIN\""
++  set cmd "[BinPath ftruncate] HKLIN \"$HKLIN\""
+   if { ![StringSame $INPUT_DATA AMPLITUDES] } {
+     append cmd " HKLOUT \"$HKL_TRUNCATE\""
+   }