aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher (jlec) <jlec@j-schmitz.net>2009-08-03 21:39:05 +0200
committerJustin Lecher (jlec) <jlec@j-schmitz.net>2009-08-04 21:59:59 +0200
commitdad7237d2ff3157f4ce459719d4a8a58a6c5a0f5 (patch)
tree41e2c2b0727bab1fa760a4029ac1e4a0fd46fa9d
parentguile-www bump (diff)
downloadsci-dad7237d2ff3157f4ce459719d4a8a58a6c5a0f5.tar.gz
sci-dad7237d2ff3157f4ce459719d4a8a58a6c5a0f5.tar.bz2
sci-dad7237d2ff3157f4ce459719d4a8a58a6c5a0f5.zip
pointless bump
-rw-r--r--sci-chemistry/pointless/ChangeLog7
-rw-r--r--sci-chemistry/pointless/Manifest5
-rw-r--r--sci-chemistry/pointless/files/1.3.13-gcc4.4.patch10
-rw-r--r--sci-chemistry/pointless/pointless-1.3.13.ebuild51
4 files changed, 72 insertions, 1 deletions
diff --git a/sci-chemistry/pointless/ChangeLog b/sci-chemistry/pointless/ChangeLog
index adffbe8d2..dfd0b3e05 100644
--- a/sci-chemistry/pointless/ChangeLog
+++ b/sci-chemistry/pointless/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*pointless-1.3.13 (03 Aug 2009)
+
+ 03 Aug 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+ +files/1.3.13-gcc4.4.patch, +pointless-1.3.13.ebuild:
+ new version for ccp4-6.1.2
+ fixed for gcc4.4
+
*pointless-1.3.10 (07 Jul 2009)
07 Jul 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-chemistry/pointless/Manifest b/sci-chemistry/pointless/Manifest
index e30b362ea..dcf16599a 100644
--- a/sci-chemistry/pointless/Manifest
+++ b/sci-chemistry/pointless/Manifest
@@ -1,6 +1,9 @@
+AUX 1.3.13-gcc4.4.patch 274 RMD160 142a4073fcd2afb6ebe9ea666a5ef2026abe5015 SHA1 896bc4fef788e3c23022f937507e888e45b04bae SHA256 54256e3ac934da2429b08fb009f51495c6ead14ed2bc5cb58ef30f13cc67bdc9
DIST pointless-1.3.10.tar.gz 298000 RMD160 f1b488f536a82fcd2636b25a525adc56309c8598 SHA1 82355e2b887fd48ef203f6c8573e6a65cf7f04d1 SHA256 1125053ea1c5fe7208f61364bc7594531e159f05ffa79b0bf1545831556a30b6
+DIST pointless-1.3.13.tar.gz 299153 RMD160 25cef7d043d340bf80847bbfacd301e4ed4a04cf SHA1 6615d7154b2a21c6c4a6a99b965194544864dc2c SHA256 9367825d7b4e495f86481ee7ad9a1835a5c3aefd35d7500bf2d0950cc5209cf6
DIST pointless-1.3.9.tar.gz 297655 RMD160 dc710ea3cef779bd15d0f4cf03e479de148b3b5e SHA1 80c39791812a0c2534d9dbbd3d28be6ff9539590 SHA256 deb7ad5bae99bae7a532e8626228a45222a9e5ba68838c05062ccc7e4de79f27
EBUILD pointless-1.3.10.ebuild 1382 RMD160 6e930e15976c07b319fa9804d12ac1a662527e01 SHA1 ec5802b65acf5618b8d93ef5788ee26fa62fe210 SHA256 3cb3f4e6bb3cd245dec9ebd370ffcfa45d3380b39fd9af53a42f30049161f450
+EBUILD pointless-1.3.13.ebuild 1440 RMD160 2817438ec639a94340b99cc2f29a1c0471e70d4f SHA1 e80300dd6415d0227b6f0cbe2e70c0bcc16b1f43 SHA256 d4f48c5adf46dba5d386626d45203c46a0c715faf0f7bbda294115d048be1668
EBUILD pointless-1.3.9.ebuild 1382 RMD160 6e930e15976c07b319fa9804d12ac1a662527e01 SHA1 ec5802b65acf5618b8d93ef5788ee26fa62fe210 SHA256 3cb3f4e6bb3cd245dec9ebd370ffcfa45d3380b39fd9af53a42f30049161f450
-MISC ChangeLog 487 RMD160 e27057ec2befb443766c4f4e900838c793c91af0 SHA1 0baa19f8141c8c1c4f192c392125b1edfc82e0f9 SHA256 cbe5d1c267c68425f5afb996f975ea02519ef9d86e205c95af2bd4b52b4896c1
+MISC ChangeLog 682 RMD160 b24694c26c8cb177c8be6d9cd56c641c4c47b8ab SHA1 43e6a393af137494706a2fa895f550142aa25874 SHA256 35f4ccf9789666c36e6019151dddf8403f555521cf7bbd57c5badee4ff409383
MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
diff --git a/sci-chemistry/pointless/files/1.3.13-gcc4.4.patch b/sci-chemistry/pointless/files/1.3.13-gcc4.4.patch
new file mode 100644
index 000000000..153fe8829
--- /dev/null
+++ b/sci-chemistry/pointless/files/1.3.13-gcc4.4.patch
@@ -0,0 +1,10 @@
+--- Errors.cpp 2009-07-28 11:24:49.000000000 +0200
++++ Errors.cpp.new 2009-08-03 21:32:12.000000000 +0200
+@@ -2,6 +2,7 @@
+ //(c) 2000-2005 Cambridge University Technical Services Ltd
+ //All rights reserved
+ #include "Errors.hh"
++#include <cstdio>
+
+ namespace phaser_io {
+
diff --git a/sci-chemistry/pointless/pointless-1.3.13.ebuild b/sci-chemistry/pointless/pointless-1.3.13.ebuild
new file mode 100644
index 000000000..7135d48a2
--- /dev/null
+++ b/sci-chemistry/pointless/pointless-1.3.13.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit base toolchain-funcs multilib
+
+DESCRIPTION="Scores crystallographic Laue and space groups"
+HOMEPAGE="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/pointless.html"
+SRC_URI="ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="ccp4"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sci-chemistry/ccp4-apps
+ >=sci-libs/ccp4-libs-6.1.1-r5
+ sci-libs/cctbx"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-gcc4.4.patch
+ )
+
+src_compile() {
+ # Fails to link against my libcctbx
+ # Tried stealing autotools from ccp4 but that breaks differently with a weird boost error.
+ emake \
+ -f Makefile.make \
+ CC=$(tc-getCC) \
+ CXX=$(tc-getCXX) \
+ CFLAGS="${CFLAGS}" \
+ CXXFLAGS="${CXXFLAGS}" \
+ LFLAGS="${LDFLAGS}" \
+ CLIB="/usr/$(get_libdir)" \
+ CCTBX_sources=/usr/$(get_libdir)/cctbx/cctbx_sources \
+ CCTBX_VERSION=2009 \
+ ICCP4=-I/usr/include/ccp4 \
+ ICLPR="-I/usr/include -I/usr/$(get_libdir)/cctbx/cctbx_sources -I/usr/$(get_libdir)/cctbx/cctbx_build/include" \
+ LTBX="-L/usr/$(get_libdir)/cctbx/cctbx_build/lib -lcctbx" \
+ || die
+# LCCP4=" $(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -L/usr/$(get_libdir) -lgfortran -lgfortranbegin -lccp4c -lccp4f -lm" \
+# LCCP4="-L/usr/$(get_libdir) -lccp4c -lccp4f -lm" \
+}
+
+src_install() {
+ dobin pointless othercell || die
+}
+