aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher (jlec) <jlec@j-schmitz.net>2009-08-01 00:02:06 +0200
committerJustin Lecher (jlec) <jlec@j-schmitz.net>2009-08-01 00:02:06 +0200
commitc0b8287379a60d008c72bd7f7cd2f186402ab3f0 (patch)
tree72046561d288a21b2297f08bb21d8bc9dd041829
parentccp4 -- ccp4-apps (diff)
downloadsci-c0b8287379a60d008c72bd7f7cd2f186402ab3f0.tar.gz
sci-c0b8287379a60d008c72bd7f7cd2f186402ab3f0.tar.bz2
sci-c0b8287379a60d008c72bd7f7cd2f186402ab3f0.zip
ccp4i adapted to ccp4-apps
-rw-r--r--sci-chemistry/ccp4i/Manifest2
-rw-r--r--sci-chemistry/ccp4i/ccp4i-6.1.2.ebuild12
2 files changed, 8 insertions, 6 deletions
diff --git a/sci-chemistry/ccp4i/Manifest b/sci-chemistry/ccp4i/Manifest
index 1f3c39653..8937f0786 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.ebuild 1400 RMD160 891285c15a78752e83b4cc1e4552571c226cd942 SHA1 9da0c105d3089b22c6c64f23d7510ad8d34f7bcc SHA256 2b941cf06a3dfcc39ccf797a2641ade710913e5fc7148e98d00e60ed37ba9fc9
+EBUILD ccp4i-6.1.2.ebuild 1567 RMD160 265130c5a80874772b8c4b0d23cdf7229aa1fc41 SHA1 dbb0d0b1293165037c8fdf90ed8fbd0e78ceb7a1 SHA256 e663d4754eb62fbd506f30511b2849e9c4b945032e1dfeca3523b1ac04f531f1
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
index e0dafe485..da0ed1192 100644
--- a/sci-chemistry/ccp4i/ccp4i-6.1.2.ebuild
+++ b/sci-chemistry/ccp4i/ccp4i-6.1.2.ebuild
@@ -9,16 +9,16 @@ inherit multilib base
MY_PN="${PN%i}"
MY_P="${MY_PN}-${PV}"
-UPDATE="04_03_09"
-PATCHDATE="090511"
+#UPDATE="04_03_09"
+#PATCHDATE="090511"
SRC="ftp://ftp.ccp4.ac.uk/ccp4"
-DESCRIPTION="Protein X-ray crystallography toolkit, graphical interface"
+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"
+[[ -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"
@@ -48,6 +48,8 @@ src_prepare() {
sed -i \
-e "s:share smartie:share ccp4 smartie:g" \
"${S}"/ccp4i/imosflm/src/processingwizard.tcl
+
+ [[ ! -z ${PATCHDATE} ]] && epatch "${WORKDIR}"/${PV}-${PATCHDATE}-updates.patch
}
src_configure() {