Fix underlinking in tests (bug #398369, thanks to Michael (kensington) for the patch).

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

diff --git a/media-libs/audiofile/ChangeLog b/media-libs/audiofile/ChangeLog
index d2f7e52d145f1617dbce35f51917f83fafb19c0a..bfdc99eae209a61c732c52983808ce2983926305 100644 (file)
--- a/media-libs/audiofile/ChangeLog
+++ b/media-libs/audiofile/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/audiofile
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/ChangeLog,v 1.93 2011/12/29 17:53:24 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/ChangeLog,v 1.94 2012/01/11 00:14:08 tetromino Exp $
+
+  11 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  audiofile-0.3.2.ebuild, +files/audiofile-0.3.2-gold.patch:
+  Fix underlinking in tests (bug #398369, thanks to Michael (kensington) for
+  the patch).
 
   29 Dec 2011; Pacho Ramos <pacho@gentoo.org> audiofile-0.3.2.ebuild:
   amd64 stable, bug 393007

diff --git a/media-libs/audiofile/Manifest b/media-libs/audiofile/Manifest
index cfc684e4906e6fec2de483772df6f230bf2b5e99..bdb1278ead6a9ab8868a05e767319a3105578db8 100644 (file)
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX audiofile-0.3.2-gold.patch 699 RMD160 11fab24f56a61d083f4ee9e73160f036357816ef SHA1 d84edd31823a9fb03199062ed538ba6dfdad3c0d SHA256 0ad5f85dd1cc098996cd3d652d42a579412f8f69437b883bc206de2b05128099
 DIST audiofile-0.3.1.tar.gz 722557 RMD160 26126ae4e095bc9d37b5184853fa545283684d03 SHA1 39de137a691a7c12ea5dc468566eb7a146880ac3 SHA256 6353dba997d480161e96a92dae3c58fb94666e35ef4ef00e8cc65950c1ae054a
 DIST audiofile-0.3.2.tar.xz 469944 RMD160 1a2deaab3ed8b9f2b3abf287a23e611b62db2347 SHA1 7195201a7ec524e6e5ee7cf4b823753e8ffcf502 SHA256 fac1706a8f87ad89206cdb76f886715d7bcff68d4492b50c347783656432b2a0
 EBUILD audiofile-0.3.1.ebuild 1137 RMD160 e9256110d9ac942ffca22a9db1e554d3cdcd8a20 SHA1 495f4e6a579fba4b7fcd33d345ad4238302a6af8 SHA256 2c0139f6bcc6296414bfb7dacd0b397efdca7699121e858a281f8a94eadb2559
-EBUILD audiofile-0.3.2.ebuild 1010 RMD160 b3476f79959cb218ca218f656966ab64dc4b9d2e SHA1 3f198619bd8b15a813768d1cc3e735159ab80da6 SHA256 2a0f767f8ca7164d6f28f16cb8d9ad1fd1fe821f9844f0efe7321f0365c53d95
-MISC ChangeLog 11411 RMD160 e527e3dea5ad22ec9859c8914406cc4265d74080 SHA1 3d41b66977d1efd3fd52cee936bc877ed99a3387 SHA256 572ebe920351eaeded5e6c7a9f17e2404d015e07ea30fb7bbde192df00121a95
+EBUILD audiofile-0.3.2.ebuild 1124 RMD160 740137379c312675577af3441e5f118ef156881a SHA1 58fc7211bf31f408b39141dbb924a69f03f35391 SHA256 ab0b5bcee7a45bd81660b5b524df2aa74107e90f59e0f2dd614262a9e9431bd7
+MISC ChangeLog 11627 RMD160 b5d83cb621c789923b8a30f03d012f5e80d91bcf SHA1 f8b37c6d73723dde7195bd092b9ced749559cd42 SHA256 7208a2f3b3133fef1b625ba04565af76874a189cbf8ffddbec1c45c22643292a
 MISC metadata.xml 177 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 SHA1 73b04fb757f8a6473a2c43b0807a95381da37afc SHA256 dfb196addaf8aa212436c53c3d47cda0d10c2850c59fa2dcb7554dfa10190af2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk78qRoACgkQCaWpQKGI+9T+3ACfaMncCeFEd6rKvlQyM/4X/7fW
-qZkAn2nqnF/VFSxc+K/aAPpjbLRf9cgH
-=eXX2
+iF4EAREIAAYFAk8M1FYACgkQdjK8w9WeBnACCQEAh23J5Ds3O9jvlVnCugp8uMl2
+P5+pqnJFXrW1zj9hoCAA/0yOFX9MT776sAhp9+OgMPqRYqUG5gMj9k9Z+GN+RvyN
+=U+xp
 -----END PGP SIGNATURE-----

diff --git a/media-libs/audiofile/audiofile-0.3.2.ebuild b/media-libs/audiofile/audiofile-0.3.2.ebuild
index 072e1351c2aa18a8a2c9fc65073a2017199af6a6..162990a719dbcc5e142c646f36fd33339348e8c4 100644 (file)
--- a/media-libs/audiofile/audiofile-0.3.2.ebuild
+++ b/media-libs/audiofile/audiofile-0.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/audiofile-0.3.2.ebuild,v 1.3 2011/12/29 17:53:24 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/audiofile-0.3.2.ebuild,v 1.4 2012/01/11 00:14:08 tetromino Exp $
 
 EAPI="4"
 
@@ -17,6 +17,9 @@ IUSE="static-libs"
 DOCS=( ACKNOWLEDGEMENTS AUTHORS ChangeLog NEWS NOTES README TODO )
 
 src_prepare() {
+       # Fix underlinking in tests, bug #398369; requires eautoreconf
+       epatch "${FILESDIR}/${PN}-0.3.2-gold.patch"
+
        # Don't build examples
        sed -i -e "/^SRC_SUBDIRS/s: examples::" Makefile.am || die
 

diff --git a/media-libs/audiofile/files/audiofile-0.3.2-gold.patch b/media-libs/audiofile/files/audiofile-0.3.2-gold.patch
new file mode 100644 (file)
index 0000000..e49f5b4
--- /dev/null
+++ b/media-libs/audiofile/files/audiofile-0.3.2-gold.patch
@@ -0,0 +1,27 @@
+From f9cd73065404f7abd8064fef42b91260ecce37f9 Mon Sep 17 00:00:00 2001
+From: Michael <kensington@astralcloak.net>
+Date: Tue, 10 Jan 2012 22:43:09 +1100
+Subject: [PATCH] Fix underlinking in test/printmarkers so that it will build
+ with gold.
+
+---
+ test/Makefile.am |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 187fe1a..cfa9d71 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -58,6 +58,9 @@ DEPENDENCIES = $(LIBAUDIOFILE)
+ 
+ LIBGTEST = gtest/libgtest.la
+ 
++printmarkers_SOURCES = printmarkers.c
++printmarkers_LDADD = $(LIBAUDIOFILE) -lm
++
+ sign_SOURCES = sign.cpp
+ sign_LDADD = $(LIBGTEST) $(LIBAUDIOFILE)
+ 
+-- 
+1.7.8.3
+