sci-biology/phylip: Respect LDFLAGS, #337921

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

4 files changed, 65 insertions, 54 deletions

diff --git a/sci-biology/phylip/ChangeLog b/sci-biology/phylip/ChangeLog
index 60fbb7cb469e..6ff67edc1de1 100644
--- a/sci-biology/phylip/ChangeLog
+++ b/sci-biology/phylip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-biology/phylip
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/phylip/ChangeLog,v 1.39 2010/01/01 21:38:17 fauli Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/phylip/ChangeLog,v 1.40 2013/02/17 11:28:00 jlec Exp $
+
+*phylip-3.69-r1 (17 Feb 2013)
+
+  17 Feb 2013; Justin Lecher <jlec@gentoo.org> -phylip-3.68.ebuild,
+  +phylip-3.69-r1.ebuild, metadata.xml:
+  Respect LDFLAGS, #337921
 
   01 Jan 2010; Christian Faulhammer <fauli@gentoo.org> phylip-3.69.ebuild:
   Transfer Prefix keywords
diff --git a/sci-biology/phylip/metadata.xml b/sci-biology/phylip/metadata.xml
index 3302123e5718..fc7c76942a10 100644
--- a/sci-biology/phylip/metadata.xml
+++ b/sci-biology/phylip/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>weaver@gentoo.org</email>
-		<name>Andrey Kislyuk</name>
-	</maintainer>
-	<herd>sci-biology</herd>
+  <maintainer>
+    <email>weaver@gentoo.org</email>
+    <name>Andrey Kislyuk</name>
+  </maintainer>
+  <herd>sci-biology</herd>
 </pkgmetadata>
diff --git a/sci-biology/phylip/phylip-3.68.ebuild b/sci-biology/phylip/phylip-3.68.ebuild
deleted file mode 100644
index 02cbfe51121c..000000000000
--- a/sci-biology/phylip/phylip-3.68.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/phylip/phylip-3.68.ebuild,v 1.2 2009/09/01 19:19:29 ribosome Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="PHYLIP - The PHYLogeny Inference Package"
-LICENSE="freedist"
-HOMEPAGE="http://evolution.genetics.washington.edu/phylip.html"
-SRC_URI="http://evolution.gs.washington.edu/${PN}/download/${P}.tar.gz"
-
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="x11-libs/libXaw"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-S="${WORKDIR}/${P}/src"
-
-src_compile() {
-	sed -e "s/CFLAGS  = -O3 -fomit-frame-pointer/CFLAGS = ${CFLAGS}/" \
-		-e "s/CC        = cc/CC        = $(tc-getCC)/" \
-		-e "s/DC        = cc/DC        = $(tc-getCC)/" \
-		-i Makefile || die "Patching Makefile failed."
-	mkdir ../fonts
-	emake -j1 all put || die "Compilation failed."
-	mv ../exe/font* ../fonts || die "Font move failed."
-	mv ../exe/factor ../exe/factor-${PN} || die "Renaming factor failed."
-}
-
-src_install() {
-	cd "${WORKDIR}/${P}"
-
-	dobin exe/* || die "Failed to install programs."
-
-	dodoc "${FILESDIR}"/README.Gentoo || die "Failed to install Gentoo notes."
-
-	dohtml phylip.html || die "Failed to install HTML documentation index."
-	insinto /usr/share/doc/${PF}/html/doc
-	doins doc/* || die "Failed to install HTML documentation."
-
-	insinto /usr/share/${PN}/fonts
-	doins fonts/* || die "Fonts installation failed."
-}
diff --git a/sci-biology/phylip/phylip-3.69-r1.ebuild b/sci-biology/phylip/phylip-3.69-r1.ebuild
new file mode 100644
index 000000000000..366df64730b9
--- /dev/null
+++ b/sci-biology/phylip/phylip-3.69-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/phylip/phylip-3.69-r1.ebuild,v 1.1 2013/02/17 11:28:00 jlec Exp $
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="PHYLIP - The PHYLogeny Inference Package"
+HOMEPAGE="http://evolution.genetics.washington.edu/phylip.html"
+SRC_URI="http://evolution.gs.washington.edu/${PN}/download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="freedist"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="x11-libs/libXaw"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	sed \
+		-e "s/CFLAGS  = -O3 -fomit-frame-pointer/CFLAGS = ${CFLAGS}/" \
+		-e "s/CC        = cc/CC        = $(tc-getCC)/" \
+		-e "s/DC        = cc/DC        = $(tc-getCC)/" \
+		-e "/ -o /s:\(\$(CC)\):\1 ${LDFLAGS}:g" \
+		-i Makefile || die "Patching Makefile failed."
+	mkdir ../fonts
+}
+
+src_compile() {
+	emake -j1 all put
+}
+
+src_install() {
+	cd "${WORKDIR}/${P}"
+
+	mv exe/font* fonts || die "Font move failed."
+	mv exe/factor exe/factor-${PN} || die "Renaming factor failed."
+
+	dobin exe/*
+
+	dodoc "${FILESDIR}"/README.Gentoo
+
+	dohtml -r phylip.html doc
+
+	insinto /usr/share/${PN}/
+	doins -r fonts
+}