From: Justin Lecher <jlec@gentoo.org>
Date: Sun, 16 May 2010 11:50:16 +0000 (+0000)
Subject: Version Bump
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5b2eda16077ca9e1ce2585aea583cde47d751219;p=gentoo.git

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

diff --git a/sci-chemistry/pointless/ChangeLog b/sci-chemistry/pointless/ChangeLog
index 8b3511ced840..171489d1bb84 100644
--- a/sci-chemistry/pointless/ChangeLog
+++ b/sci-chemistry/pointless/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/pointless
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/ChangeLog,v 1.3 2010/04/25 11:29:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/ChangeLog,v 1.4 2010/05/16 11:50:16 jlec Exp $
+
+*pointless-1.5.1 (16 May 2010)
+
+  16 May 2010; Justin Lecher <jlec@gentoo.org> +files/1.5.1-gcc4.4.patch,
+  +pointless-1.5.1.ebuild:
+  Version Bump
 
 *pointless-1.4.9 (26 Feb 2010)
 
diff --git a/sci-chemistry/pointless/Manifest b/sci-chemistry/pointless/Manifest
index 0b1f00c35960..8f5c135d4c89 100644
--- a/sci-chemistry/pointless/Manifest
+++ b/sci-chemistry/pointless/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.5.1-gcc4.4.patch 290 RMD160 02088f424953afbc8ceddb87f47d801cfddc919a SHA1 8e0296d09524997cead1f36b22c0957158d30397 SHA256 6f6f4435d4ec3248b06adfa16bf2ee635a993f9d4670667d80505dea5f0b7a95
 DIST pointless-1.4.8.tar.gz 331746 RMD160 7d5e1f8187d8d66d47d59d4195701d485e6c9674 SHA1 e77384225c4942fd93964821e4b30604a2fdfa83 SHA256 1760861335e878aac16dcb2b50c8abb4730d60c685952964224d12e08284c612
 DIST pointless-1.4.9.tar.gz 335796 RMD160 219c8af240bbaa04ae090eb2e40ce6cbf702d3b0 SHA1 025885fc9609bd9fffdcffafe52594a402469594 SHA256 ea93fb4fe9ea0e9de0c896e9289aa50e5c1bb5af59b18435675f8529f61caad8
+DIST pointless-1.5.1.tar.gz 350560 RMD160 c2945eb452b573085dfa4da5bc74da02422b4cfd SHA1 a85468a8beaf8aba165dd10900d9d854ae93b1e6 SHA256 f0bd20a49d7d42fe158c817a5325a668ee6a261b759a2ac8e9671dd00b16bb17
 EBUILD pointless-1.4.8.ebuild 1396 RMD160 63ca2c0f7e08d63a035c6eb78e51054c1a41a614 SHA1 b1d455d88bcc0793aa808329241409fab79570af SHA256 de2e10bf25581ad15c6af415cdf6596b8796e9f544e748472e6b43751a416033
 EBUILD pointless-1.4.9.ebuild 1396 RMD160 2188b800cae71a7f65aca11e4e045c606ebe1806 SHA1 61400121c5ca5736f61b719a122bb4eb6aa45c10 SHA256 40f7f37433eb80d029075fe98dae67df5637d938443c6cdccf6da7dceb51d4eb
-MISC ChangeLog 492 RMD160 b7df94abf7c9146accd4ba0b3443849a98e79e0c SHA1 cc5d66c6d1463cc7b3f745a131ba312a79481922 SHA256 b05aa430f08284433e362a39a29be437f2d696cec6196329f72590d3e466bd3e
+EBUILD pointless-1.5.1.ebuild 1494 RMD160 76d31cc579584e88349122bb97169ebcdd77af5c SHA1 67828fbf7cec89c1a336e1c0eb17cb548576e56f SHA256 888627ee9fc189eb97c6475356837ebd5ec61a47b3e8adaf465cc9021ec25abc
+MISC ChangeLog 641 RMD160 0116dd03b97bdcfac345fb2cf3917f84ab652fa5 SHA1 3f0209faa57c63f6a4c10c2773a183c8945779c6 SHA256 b3af9577cf0273c91703cda45f8d1583cac868f732a8175c6c3f14d0d99e535c
 MISC metadata.xml 216 RMD160 04a6fc4e2160b439296b52aa97d5b7d83af75508 SHA1 9561c9e6eada6aac9b503407917900529ce703e9 SHA256 24f5c205c2655ef27138c8aa087701626f5b4c666229c9ef7fe814e63ea2e776
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvUJ7wACgkQgAnW8HDreRa+TwCfU82H6HRzZ/52H6QWBQ6WpicQ
-3+wAnjy0Lpqqs9jEoLG+FBl7jDh78nHU
-=t2Sw
+iEYEARECAAYFAkvv2/0ACgkQgAnW8HDreRZ5vwCePO6ort1OJK5d6kpR+HedEvFZ
+j0EAoKlQmgku2cBV42j7qEXlxSM31sbJ
+=jGSX
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pointless/files/1.5.1-gcc4.4.patch b/sci-chemistry/pointless/files/1.5.1-gcc4.4.patch
new file mode 100644
index 000000000000..ca67dbd3f336
--- /dev/null
+++ b/sci-chemistry/pointless/files/1.5.1-gcc4.4.patch
@@ -0,0 +1,12 @@
+diff --git a/string_util.hh b/string_util.hh
+index 66af6f3..047512b 100644
+--- a/string_util.hh
++++ b/string_util.hh
+@@ -3,6 +3,7 @@
+ 
+ #include <string>
+ #include <vector>
++#include <stdio.h>
+ #include "range.hh"
+ 
+ //======================================================================
diff --git a/sci-chemistry/pointless/pointless-1.5.1.ebuild b/sci-chemistry/pointless/pointless-1.5.1.ebuild
new file mode 100644
index 000000000000..21bd0dbda03c
--- /dev/null
+++ b/sci-chemistry/pointless/pointless-1.5.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/pointless-1.5.1.ebuild,v 1.1 2010/05/16 11:50:16 jlec Exp $
+
+EAPI="3"
+
+inherit eutils multilib toolchain-funcs
+
+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="test"
+
+RDEPEND="
+	sci-chemistry/ccp4-apps
+	>=sci-libs/ccp4-libs-6.1.3
+	sci-libs/cctbx"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-gcc4.4.patch
+#epatch "${FILESDIR}"/${PV}-linking.patch
+}
+
+src_compile() {
+	emake  \
+		-f Makefile.make \
+		CC=$(tc-getCC) \
+		CXX=$(tc-getCXX) \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LFLAGS="${LDFLAGS}" \
+		CLIB="${EPREFIX}/usr/$(get_libdir)" \
+		CCTBX_sources="${EPREFIX}"/usr/$(get_libdir)/cctbx/cctbx_sources \
+		CCTBX_VERSION=2009 \
+		ICCP4=-I"${EPREFIX}"/usr/include/ccp4 \
+		ICLPR="-I${EPREFIX}/usr/include -I${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_sources -I${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build/include" \
+		LTBX="-L${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build/lib -lcctbx" \
+		SLIB="$(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -L${EPREFIX}/usr/$(get_libdir) -lgfortran -lgfortranbegin" \
+		|| die
+}
+
+src_install() {
+	dobin pointless othercell || die
+}