Gold fix, #369001

Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64

4 files changed, 44 insertions, 20 deletions

diff --git a/sci-biology/snpfile/ChangeLog b/sci-biology/snpfile/ChangeLog
index efa38a7ded45..6ea82f568758 100644
--- a/sci-biology/snpfile/ChangeLog
+++ b/sci-biology/snpfile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/snpfile
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/snpfile/ChangeLog,v 1.6 2010/10/02 07:52:04 xarthisius Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/snpfile/ChangeLog,v 1.7 2011/05/28 10:58:46 jlec Exp $
+
+  28 May 2011; Justin Lecher <jlec@gentoo.org> snpfile-2.0.1-r1.ebuild,
+  +files/snpfile-2.0.1-gold.patch:
+  Gold fix, #369001
 
   02 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org>
   files/snpfile-2.0.1-gentoo.diff:
diff --git a/sci-biology/snpfile/Manifest b/sci-biology/snpfile/Manifest
index d53d78e289b8..6410c4e5e4eb 100644
--- a/sci-biology/snpfile/Manifest
+++ b/sci-biology/snpfile/Manifest
@@ -3,17 +3,16 @@ Hash: SHA1
 
 AUX snpfile-2.0.1-gcc44.patch 387 RMD160 0a31eb4741dd824ab35c7559e89787ee589e3788 SHA1 a2abee114666c397f8f2d6c987ad3648d4aa37cf SHA256 349c6594759f16da2602415ff217c37bb677e2508437497b508c91ab4668956a
 AUX snpfile-2.0.1-gentoo.diff 20216 RMD160 7d1cae6f1ab05670633988b9a9df3a481d353adc SHA1 44a2884f28510d4018bdcb411bf5c8a04677dd51 SHA256 f12e5a9fc0aadf963f5abd198327bf5c8eec2cdeb76786467b11d6d116f1d704
+AUX snpfile-2.0.1-gold.patch 1066 RMD160 c617d6867f9b059371baa60a16a8fd927fa35f10 SHA1 d11f7b92fad2ddf91f3269a8275a9e2e7febbffc SHA256 e9c256f07aacf233a5bf159fd25f536f91b650b425f9f8e39f83ac03741600e8
 DIST snpfile-2.0.1.tar.gz 171854 RMD160 0d3f44bab5a59636aa4b1901c0ce5816b62a346a SHA1 d5f7c58540782d76a7aed9c13fc5bedab2d69a0b SHA256 71569e0dcd426447d1a5d215fb47615074a4c8d935cf70ef63c5f47a411b0b76
-EBUILD snpfile-2.0.1-r1.ebuild 823 RMD160 6f0a65c2a714e52e58706563f508b3e8b4c8bc9e SHA1 a98c0512466ebdeb8f4626fabf2e6a86a46e8fc0 SHA256 58fb5f9136d68e2614df6953da6297d7e78741c6d612718ca30ab5eb2a462598
+EBUILD snpfile-2.0.1-r1.ebuild 766 RMD160 83a46af9c0b967a5b807b4d1d482e992a409e678 SHA1 14b0c9033dea9b105eee4874e5895b9e56e561f4 SHA256 ad07a6348d35944a7e69a5a03a9e3135a91d99af198e07d96ccee3c6ce01e718
 EBUILD snpfile-2.0.1.ebuild 676 RMD160 e0519c79b1ed69b0541903c1ae72007a88746290 SHA1 c779886c1e6238ce7b86348f92b2a0e0cf8d4e76 SHA256 7f696bc551aa546e7225045b895452242779919cabed3b80d21aa8103ea232d9
-MISC ChangeLog 1157 RMD160 2616a43e57cd37d53c46388db499fc4e08faff3c SHA1 5f009e56edcfde179c7a45c7796a6de55c60c537 SHA256 50ee9182ff7397ef8c270ef1845f80bcc1b75e5156125346e251bba8e8d5e3fc
+MISC ChangeLog 1279 RMD160 4c83bf42cdec8ed1514f5081b2e4a7d09d52aa37 SHA1 9642e7de2a537881b8b1885d37716a60b31a10f5 SHA256 0f9eee271355734e1433c3aaf18d6e08846664bf7311ccc9caf48e1d258f4ec1
 MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAkym5K0ACgkQIiMqcbOVdxTXqAP9GgNXWhX6r0YAunEE/9/Gu0au
-Ef0Xb5uXmg6rRFWTu5GFQzin0BmcH/SOqiDoPKzbjw9HlO4oxTpYzTL08e1j1TKA
-fxaPm3tZ+1LOON5nWflDXJrqAsEDrGg7UzS1LZivnR6nk0cP0GgBMIfWLOI0tODN
-3B0lcI5RA8z29Rwj8AY=
-=SJmR
+iEYEARECAAYFAk3g1WsACgkQgAnW8HDreRZn0wCgyeJe3rtL2wx0ZcNboqH/xVbw
+sUgAnRZBXueMu5xmwWFxNw0StwF48X5Q
+=9MYj
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/snpfile/files/snpfile-2.0.1-gold.patch b/sci-biology/snpfile/files/snpfile-2.0.1-gold.patch
new file mode 100644
index 000000000000..2211aa36c0ca
--- /dev/null
+++ b/sci-biology/snpfile/files/snpfile-2.0.1-gold.patch
@@ -0,0 +1,23 @@
+ Makefile.am |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 06fd733..5805c48 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -32,7 +32,7 @@ noinst_PROGRAMS += make_test_snpfile test_test_snpfile
+ noinst_PROGRAMS += row_metadata_experiment metadata_cache_prototype matrix_benchmark \
+ 	matrix_benchmark_write matrix_benchmark_read
+ 
+-LDADD = $(top_builddir)/libsnpfile.la
++LDADD = $(top_builddir)/libsnpfile.la $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_SIGNALS_LIB) -lstdc++
+ 
+ matrix_test_SOURCES = test_util.hh test_util.cc input_archive.hh output_archive.hh matrix_test.cc
+ 
+@@ -88,5 +88,5 @@ libsnpfile_la_SOURCES = common.hh matrix.hh matrix.cc file_matrix.hh file_matrix
+ 	metadata.hh metadata.cc metadata_access.hh archive_common.hh archives.hh \
+ 	input_archive.hh output_archive.hh snpfile.hh snpfile.cc serialization_trait.hh \
+ 	type_trait.hh
+-libsnpfile_la_LIBADD = $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_SIGNALS_LIB)
++libsnpfile_la_LIBADD = $(BOOST_PROGRAM_OPTIONS_LIB) $(BOOST_SIGNALS_LIB) -lstdc++
+ 
diff --git a/sci-biology/snpfile/snpfile-2.0.1-r1.ebuild b/sci-biology/snpfile/snpfile-2.0.1-r1.ebuild
index 010abe9aecae..341e937a757b 100644
--- a/sci-biology/snpfile/snpfile-2.0.1-r1.ebuild
+++ b/sci-biology/snpfile/snpfile-2.0.1-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/snpfile/snpfile-2.0.1-r1.ebuild,v 1.1 2010/06/20 16:58:42 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/snpfile/snpfile-2.0.1-r1.ebuild,v 1.2 2011/05/28 10:58:46 jlec Exp $
+
+EAPI=4
 
-EAPI=2
 inherit autotools eutils
 
 DESCRIPTION="A library and API for manipulating large SNP datasets"
@@ -18,16 +19,13 @@ RDEPEND="dev-libs/boost"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-gentoo.diff
+	epatch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-gentoo.diff \
+		"${FILESDIR}"/${P}-gold.patch
 	eautoreconf
 }
 
 src_configure() {
 	econf $(use_enable static-libs static)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README NEWS || die
-}