sci-biology/phylip: Respect LDFLAGS, #337921

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 78 insertions, 68 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/Manifest b/sci-biology/phylip/Manifest
index 597346d52519..fbe38e6a08a3 100644
--- a/sci-biology/phylip/Manifest
+++ b/sci-biology/phylip/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX README.Gentoo 643 RMD160 7777b1b507126f9d7ac01a0fc39e4eceac2e0381 SHA1 431f528545f949ec8687175808bbdabcfbd8c60e SHA256 d8a737f2ca6e0366fcebb96fbc9e12200b6402fea4c4f71696f4d9175980dfbd
-DIST phylip-3.67.tar.gz 1467526 RMD160 5636707b2585077a793c71fa81f255dfd8708100 SHA1 7c2ef697250d7d78e2d0672af60190129ba10161 SHA256 089f31c0519b1af162628c02d4ff78570b42cd261f39b87c6406733f2f759b5d
-DIST phylip-3.68.tar.gz 1473441 RMD160 5f352457763c000f7dec991262bfcf4c94ac7057 SHA1 d3de831b0b8757581f240ff6b1e7ca750251c5b7 SHA256 30e4eaae0eff1d88a479af1ff5c8a9ef8167c86b83c1536327cd9d05ce941531
-DIST phylip-3.69.tar.gz 1511935 RMD160 a39080b959452957576c9b7daa2b9e7f25bef212 SHA1 ada364d1a588935ff59a23c08337d9dd99109c5e SHA256 27947ce8dab4416e4823db38b3d1b0bf17bc545b6907cf09dcf6177df94c1a8f
-EBUILD phylip-3.67.ebuild 1440 RMD160 1794062eaa5e0db4cae5d95e078b2135ced49b42 SHA1 388b455569c6b84678905f7fb92598386f4fc9a3 SHA256 738f79642a25e77ad3481214269d751154b6fe2f5abd691d1dbc5ee7553556b9
-EBUILD phylip-3.68.ebuild 1445 RMD160 e98f5c6883f9f59152344911ec55980e343e83cc SHA1 845d8c7390eaa6bd6e8aa3eec7e604c305f43fad SHA256 9089fcb5f74f452182cdf0c29cd2d2f4b113993dc7d3760a50d35158cf5d5b2e
-EBUILD phylip-3.69.ebuild 1477 RMD160 7ad12c0ab2453340c2bf04588c370394c5e39019 SHA1 7025301d6c3a6af42d815744a2399dc5902d2533 SHA256 cd11aa90972ef7eab59324c2a5aec86db72677d7ec678d14636a2d604c3797ea
-MISC ChangeLog 6123 RMD160 1350b3df0ea7ae14628d0311d746cc11f1bf9304 SHA1 fb9d970326834c24a9640904119fac2c97d3913e SHA256 744d5d5649fff252e7cc5cf1a445408899855bd81fc22e9c46693b034d426adf
-MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
+AUX README.Gentoo 643 SHA256 d8a737f2ca6e0366fcebb96fbc9e12200b6402fea4c4f71696f4d9175980dfbd SHA512 63ec15ce2788171e5351977bae21e11a7c8609eeed4893849fabc909f0c6713033e253768ea3f485245456a9083ad4aa613e2503ebb4eb71f7b670f1af593f2a WHIRLPOOL 671a6aa44cae7054d402ac111a572145b705052e6d084687a188fe451c8c6f30fd276f8abb89d40bf150be8d119616f696ccaa59fb3ed9177040eae8b3f8b80e
+DIST phylip-3.67.tar.gz 1467526 SHA256 089f31c0519b1af162628c02d4ff78570b42cd261f39b87c6406733f2f759b5d
+DIST phylip-3.69.tar.gz 1511935 SHA256 27947ce8dab4416e4823db38b3d1b0bf17bc545b6907cf09dcf6177df94c1a8f SHA512 e36d12bfe597896b4298c1d0e3b0b7bd783573dc03e861b9472d8284391b2339cb3fb58eb6580298724bbd516127b68925815455514f939da9272fcfed7e229d WHIRLPOOL 25c45ac2a96278eaef9a62aecc367aa32a894df0cd5aff9b626abd013ecbe52f9d4bdaf7805ba5c5d8699f9a74d3d26cfe6e1c1b22960c03061171625d16415f
+EBUILD phylip-3.67.ebuild 1440 SHA256 738f79642a25e77ad3481214269d751154b6fe2f5abd691d1dbc5ee7553556b9 SHA512 1bcbc890b8743ab31df74928c43b62eeea3fd53a821182fdd401922cff159d0a20b94521fe22de998280bf3144a25117d71bcaa5f531fc28bf69bfb18996b44c WHIRLPOOL 1b6681546ea0c1232d0dff7ec965f52b9724b0db61d1d82c618d5304ee10af4074eabe003353897517a62d4cb140aabaa02fc5e354e81e3a1057022e4d1bc108
+EBUILD phylip-3.69-r1.ebuild 1252 SHA256 7e51e62e314c66c504c6b82d201d0a02f67844dec283a08711fbcd96e2c3e366 SHA512 7b44e4b1dafc2b52f7c2cee4aa75e81e0c574ae80cd0133f6d169c8812e09b532568a5953170be3e67aa6cde89dcd87f1c3914efacd5520f32848ef2879bb369 WHIRLPOOL 4ec3ed92ffdeb68423d9ff714d77970f6a8bbc5d3009c80096aa3a9c874ff5720ec9481c0d7dbc0c6d21cfc8cbaf7f802c99768549aaa400549ce331ce4c42a6
+EBUILD phylip-3.69.ebuild 1477 SHA256 cd11aa90972ef7eab59324c2a5aec86db72677d7ec678d14636a2d604c3797ea SHA512 1ce1bf170042246a8c93eb8540ed27808bfb0efae988e36fb755f5e8f07ed981fd0f38b309f79de57e253cedd5af8f7d1551548f2bbc7f908bb6707b08e3c2bb WHIRLPOOL 2c8fa2dfa98ffc3429e33330ae8b30edb29275d7bbc97cb09a3a45013ce8a90c3bf618d2a16d09545186d90bb6483d53972a31e66845d7bc3f61aedf050baf6d
+MISC ChangeLog 6289 SHA256 75e1b1c27e2787b902c34ba4955e0ce4f18edaffaa60736f58380cd5c6f1b785 SHA512 e34505e909e0ae9c12d016637fd03b17d91eb4d05e344145b63b0212f656b91e76e7b30c101bb4e38d6fd3c4b37927fd8890b556f142a978c90e057a7391382a WHIRLPOOL 9300cb1fa18da92ef0010d481699dffea8757e0fa6813c0eb1d87b42347a57ea0f41ea85ff55bf1f42baaa33858a7024bad7ae9fc0c61e1d859c9682c5990f2e
+MISC metadata.xml 266 SHA256 98c7d1da8a728a1f1d796a79d51f25e4164e24048ec1aacbbf0ae2ffb171ff35 SHA512 879cdcca092d4c82b8c63672c91e08e7b01e81419d2c7c7b766de96ba2a32dd1e21c18968ed7172eec8604f52c92b19a31773f428bce9461d9b8190384680194 WHIRLPOOL 0f46288ab7090ad3da5b31816792427e4ad1a950e39a503bb406ebe8789cffedd9c85b46bfbf040fffb8aad443f512c28716a0a6436d0c06309155277060cdcd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAks+a08ACgkQNQqtfCuFneP7PACeIF/a9l78KKeVOJUqX4iscEBL
-H60AoJwaywYEFii1Jm4Bs+q03pbflKgQ
-=m2da
+iEYEAREKAAYFAlEgvuUACgkQgAnW8HDreRZHmQCgt+olUICE6JPAskNyWtscdIkY
+sY8AoInPJBNFBDeD1IvraJp/0N+x4JFK
+=pst+
 -----END PGP SIGNATURE-----
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
+}