Attempts tp fix bug 314053

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-chemistry/ccp4i/ChangeLog b/sci-chemistry/ccp4i/ChangeLog
index 4451beec803fd2ed3d136892dd980fd8fd918512..a59ffc23513b1db6c42a88c409451a2d6ee37e92 100644 (file)
--- a/sci-chemistry/ccp4i/ChangeLog
+++ b/sci-chemistry/ccp4i/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/ccp4i
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4i/ChangeLog,v 1.4 2010/04/25 12:32:54 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4i/ChangeLog,v 1.5 2010/06/16 07:25:03 jlec Exp $
+
+*ccp4i-6.1.3-r3 (16 Jun 2010)
+
+  16 Jun 2010; Justin Lecher <jlec@gentoo.org> +ccp4i-6.1.3-r3.ebuild:
+  Attempts tp fix bug 314053
 
 *ccp4i-6.1.3-r2 (25 Apr 2010)
 

diff --git a/sci-chemistry/ccp4i/Manifest b/sci-chemistry/ccp4i/Manifest
index 41ecfef41dc75b89af423aa7587580ccabb9f7cc..edf8e5cf584ae6e36851058f92ff99df4d126595 100644 (file)
--- a/sci-chemistry/ccp4i/Manifest
+++ b/sci-chemistry/ccp4i/Manifest
@@ -9,12 +9,13 @@ DIST 6.1.3-oasis4.0.patch.bz2 946 RMD160 b448376114ba41e6999d533929fdb79812476f8
 DIST ccp4-6.1.3-core-src.tar.gz 242134076 RMD160 e9b7deb0766fb95d5e8946881f20e086f0896fe9 SHA1 ee5ada892694db5dc9b2d7d2330b4ac694f56580 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324
 DIST ccp4i-6.1.3-arpwarp.patch.bz2 58498 RMD160 3bf65f26a8635194e69ff9f33a457f9ff7e050d0 SHA1 0172a35d539ed3020228f20f0ddfa82540790cf0 SHA256 297e6f75354f3a1932302f7039bf449484c95eb41b8634ae96d93c754b47c687
 EBUILD ccp4i-6.1.3-r2.ebuild 2139 RMD160 3ee5efdce5b2373bc76139714cfe6cecf9878c52 SHA1 656f97dc6d3c9c40f010a24329e1357f855671f6 SHA256 3b9e0a3a7ff225c70df2889af731504e3b62bd5a25557fd8e50db9b646c43969
-MISC ChangeLog 1078 RMD160 8eedb944fbd18f7a33a2dab1f5021b71d34d3608 SHA1 fac07f34027e8c0cab2b44753964ee9d7434a52f SHA256 3923520a070569277e8305de9530c98d043655c4130848a8b45d906ebfca3295
+EBUILD ccp4i-6.1.3-r3.ebuild 2011 RMD160 209e3b232cbba3e61621515d242556d271eba5ff SHA1 a40e7234d8a12563dd98526fe52b47fadd6350e5 SHA256 48c0d7f337f25d58efe1e2f210cf29c8041f8dbe99c299e5a5bb185b5c78ea25
+MISC ChangeLog 1210 RMD160 e338f627361200fe53b9b879f6f8ca1b2c9c4cfe SHA1 89ff0b1d26bb66e7119b85ef9d8c0f7cb247793d SHA256 8a1f5b21857762360d9da2f3568bc2b8e57fb18b55d640307346b7053ecf671e
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvUNnsACgkQgAnW8HDreRZPOACgiQENXoIOuzZOkyKSkdlucRhb
-DWEAnRr99P7a3SU4MvFjef0u9GMZNYmE
-=Srg4
+iEYEARECAAYFAkwYfFUACgkQgAnW8HDreRaFhwCgj/ogNEemLIOikuE2p0+1xsha
+TD0An1DwQW1v/MfopFApHqhVKEh4TYZI
+=eR0/
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/ccp4i/ccp4i-6.1.3-r3.ebuild b/sci-chemistry/ccp4i/ccp4i-6.1.3-r3.ebuild
new file mode 100644 (file)
index 0000000..63c2309
--- /dev/null
+++ b/sci-chemistry/ccp4i/ccp4i-6.1.3-r3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4i/ccp4i-6.1.3-r3.ebuild,v 1.1 2010/06/16 07:25:03 jlec Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+
+inherit base multilib python
+
+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
+       mirror://gentoo/${P}-arpwarp.patch.bz2
+       http://dev.gentooexperimental.org/~jlec/distfiles/${PV}-oasis4.0.patch.bz2"
+[[ -n ${UPDATE} ]] && SRC_URI="${SRC_URI} ${SRC}/${PV}/updates/${P}-src-patch-${UPDATE}.tar.gz"
+[[ -n ${PATCHDATE} ]] && SRC_URI="${SRC_URI} http://dev.gentooexperimental.org/~jlec/science-dist/${PV}-${PATCHDATE}-updates.patch.bz2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="ccp4"
+IUSE=""
+
+RDEPEND="
+       app-shells/tcsh
+       media-gfx/graphviz
+       >=dev-lang/tk-8.3
+       >=dev-tcltk/blt-2.4"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+       "${FILESDIR}"/${PV}-fix-baubles.patch
+       "${WORKDIR}"/${P}-arpwarp.patch
+       )
+
+pkg_setup() {
+       python_set_active_version 2
+}
+
+src_prepare() {
+       base_src_prepare
+
+       [[ ! -z ${PATCHDATE} ]] && epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch
+
+       epatch "${WORKDIR}"/${PV}-oasis4.0.patch
+       python_convert_shebangs -r $(python_get_version) ccp4i/ share/dbccp4i/
+}
+
+src_configure() {
+       :
+}
+
+src_compile() {
+       :
+}
+
+src_install() {
+       # rm imosflm stuff
+       rm -rf "${S}"/ccp4i/{bin/imosflm,imosflm}
+
+       rm -rf "${S}"/ccp4i/{bin,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
+       exeinto /usr/$(get_libdir)/ccp4/ccp4i/bin
+       doexe "${S}"/ccp4i/bin/* || die
+
+       # dbccp4i
+       insinto /usr/share/ccp4
+       doins -r "${S}"/share/dbccp4i || die
+}