Respect user FLAGS wrt bug 331799. Thanks to Diego for report. Drop perl from src_prepare.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 30 insertions, 7 deletions

diff --git a/sci-biology/prank/ChangeLog b/sci-biology/prank/ChangeLog
index dda9967c6100..1236f6930b9e 100644
--- a/sci-biology/prank/ChangeLog
+++ b/sci-biology/prank/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/prank
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/prank/ChangeLog,v 1.6 2010/07/15 15:56:45 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/prank/ChangeLog,v 1.7 2010/08/09 17:26:54 xarthisius Exp $
+
+  09 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> prank-100701.ebuild:
+  Respect user FLAGS wrt bug 331799. Thanks to Diego for report. Drop perl
+  from src_prepare.
 
 *prank-100701 (15 Jul 2010)
 
diff --git a/sci-biology/prank/Manifest b/sci-biology/prank/Manifest
index 383387d3b5c4..40fa6e9007c7 100644
--- a/sci-biology/prank/Manifest
+++ b/sci-biology/prank/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX prank-081202-gcc44.patch 1445 RMD160 6fc96d90cec6099b355ccac7af2ffb731e40ca10 SHA1 d93df76032d00d81e6faa4e70d7e402110c46504 SHA256 f0de65c36df7ce1fa2368053743c221bf5e431a6715493118a2564ee8f21c957
 DIST prank.src.081202.tgz 127430 RMD160 fa2710350c4e1fcc6f5093687bfd77ac7ac74f15 SHA1 cb3394a7fca63339138ba20d667a9d1ef3bb3071 SHA256 8ce5349b77c323bb230a7f4cb9de85a1c0e1bb3f46af81b9519ac5c34d441a78
 DIST prank.src.091016.tgz 134450 RMD160 c488d4209e13a3c4530d58b212f2edc9c441a934 SHA1 9613bdea5fcb7b72564c7487eaa0195f166c1683 SHA256 2df02c1957c71db2bcb8e5e646fb6fa679aeb4e6633fc112d5cf684de9467098
@@ -6,6 +9,15 @@ DIST prank.src.100701.tgz 115444 RMD160 f1c2b6bb321beb3c168fb8888dc6fe62d8e2e280
 EBUILD prank-081202.ebuild 677 RMD160 10ed14418400612db53f8c3a6e72262b9b7e62da SHA1 a411c2a0885f11541df5175e640cd184b5711031 SHA256 f090cb49fb4e7d0aa144b0b1341269be2d72624fcd583f734783ad53a8d00c31
 EBUILD prank-091016.ebuild 688 RMD160 d9a36edaa82849a869539547a8c908faa3965c31 SHA1 274637a13a529825736f8a19980af46d9cdf7539 SHA256 2f2cf4b440dce8a8bb6744e4dc1c23ec1a62dd75cacf4b9f984213376b914bb0
 EBUILD prank-100311.ebuild 628 RMD160 54a92b5eaf2c20e55db3079513ec489d7fe23028 SHA1 b7dbdf24fce505e7f508ba91800e803bb6b58a2a SHA256 b3f3d9e331980dcc77adcc51bfd36e8abbfa14cb8aef4e59ecdd5418cc87c2bf
-EBUILD prank-100701.ebuild 632 RMD160 4e865d085988c50a47667f9ef897228dd37df57f SHA1 f7a2dacfc6b1eb6a694f10121ae0edf565733e4a SHA256 675a586ecd3cda044647023ed3a5c028378c64d0ca32bbd5364b1fd0181a879a
-MISC ChangeLog 974 RMD160 b897d46fb767c7c7c0fed4c13cc5a7f40ae03ebc SHA1 3599f5ca49a3649af20af81f9c02eda266110c8d SHA256 73d6378b1a93a787ef4e307b6fe8de741796a394284726cc941287dbae942f8d
+EBUILD prank-100701.ebuild 745 RMD160 4f9491ac9c9b5594a5a3551e97ad76425abdbd82 SHA1 7e465a5ae58117bfe1672b2ab84b66c6dc91541d SHA256 36a72dd415884706be51f3f21ae41c6a95bd5a710d7070e269de4e1e0241931e
+MISC ChangeLog 1149 RMD160 02de17000b66432cf1840d6b30547199c046155d SHA1 d76367b8eea5b3cf391515c556731038346e34dc SHA256 37cacfd577ce6111831a36470ede2388e7982e9427e66d6334dd59fdc92aeb1b
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkxgOmkACgkQIiMqcbOVdxQg3QP+IG3/IqvSKMYc7aB/CXz70W8S
+dGC8toIO3ZVYrS6qVd9o23KeNcsMt3YuJw9z/ZskYkJQgB9CpXQQVC5Rba7t+pFt
+lqB3GPI9S5o3KflkiSK9FmrzOoVTr8LmE3q/vbQl/GkIz65QkSftvyZs5gTBBUY2
+If6oIafmrW7rd2ZIssY=
+=ddRf
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/prank/prank-100701.ebuild b/sci-biology/prank/prank-100701.ebuild
index c59e83fd1526..f8a32ec5de8f 100644
--- a/sci-biology/prank/prank-100701.ebuild
+++ b/sci-biology/prank/prank-100701.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/prank/prank-100701.ebuild,v 1.1 2010/07/15 15:56:45 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/prank/prank-100701.ebuild,v 1.2 2010/08/09 17:26:54 xarthisius Exp $
 
 EAPI="2"
 
+inherit toolchain-funcs
+
 DESCRIPTION="Probabilistic Alignment Kit"
 HOMEPAGE="http://www.ebi.ac.uk/goldman-srv/prank/prank/"
 SRC_URI="http://www.ebi.ac.uk/goldman-srv/prank/src/prank/prank.src.${PV}.tgz"
@@ -13,12 +15,17 @@ SLOT="0"
 IUSE=""
 KEYWORDS="~amd64 ~x86"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
 
 src_prepare() {
-	perl -i -pe 's/(CC|CXX|CFLAGS|CXXFLAGS)\s*=/#/' "${S}/Makefile" || die
+	sed -i -e "s/\$(LINK)/& \$(LDFLAGS)/" Makefile || die
+}
+
+src_compile() {
+	emake LINK="$(tc-getCXX)" CFLAGS="${CFLAGS}" \
+		CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" || die
 }
 
 src_install() {
-	dobin prank || die "dobin failed"
+	dobin prank || die
 }