Use largefile flags when building emul-linux- pkgs wrt #313259 by Marc Joliet and...

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

diff --git a/media-libs/libsndfile/ChangeLog b/media-libs/libsndfile/ChangeLog
index c6b548381c196627e42f0bb2afb14b0440ad483a..606d04a0bcf72271380bb533cadd1d2e6f782e37 100644 (file)
--- a/media-libs/libsndfile/ChangeLog
+++ b/media-libs/libsndfile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libsndfile
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.129 2011/09/12 15:22:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.130 2011/09/27 19:39:02 ssuominen Exp $
+
+  27 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> libsndfile-1.0.25.ebuild:
+  Use largefile flags when building emul-linux- pkgs wrt #313259 by Marc Joliet
+  and Pacho Ramos
 
   12 Sep 2011; Alexis Ballier <aballier@gentoo.org> -libsndfile-1.0.23.ebuild,
   -libsndfile-1.0.24.ebuild:

diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 02387772a6161537e1ba94e76448f2f043f463b8..b209c619fe59b82aefa579c5c5a17cae471669dc 100644 (file)
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -3,13 +3,17 @@ Hash: SHA1
 
 AUX libsndfile-1.0.17-regtests-need-sqlite.patch 894 RMD160 a36d14dc91a8768386f414cbfe8b0cc53de938c3 SHA1 522d55e46ef6c83a158fb026d5f37f63b78438ad SHA256 c53026864c6a05b1ccc8b12e7af895f5d0e2d3a00335fd9f49ed7cc9aecece73
 DIST libsndfile-1.0.25.tar.gz 1060692 RMD160 7330ea9fc1cfa3809fa7d2a6e2a0593b6e0233c7 SHA1 e95d9fca57f7ddace9f197071cbcfb92fa16748e SHA256 59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882
-EBUILD libsndfile-1.0.25.ebuild 1584 RMD160 28ecbb607dbedc49cad8e024327d078bf882d89d SHA1 f30ffee94769b92f9719e0313bfd3e6c03a154a2 SHA256 2c9119c2d30536cb3c3fdb614833862907d799faa6c7b368236ad2af00081864
-MISC ChangeLog 19088 RMD160 b0293eee43c07531814dc768b1619f5f262987cc SHA1 cf51c775387ff798e42f1a7bbbac547256447ca3 SHA256 63f7dcb3bbbc1596fd80486e429027ce38b44aef4ca7ff8918efbe2aa986e158
+EBUILD libsndfile-1.0.25.ebuild 1774 RMD160 d63d701a6665d2891e31a3c1ea542d9916eba6b9 SHA1 6c59ebb0bb9ba190f0f207d4cd941d689e241097 SHA256 10cf91abb79b7aa32a3ff12b4743b41ba8fbc69711a115d26fd065369cb12d99
+MISC ChangeLog 19268 RMD160 f6e62fc18664e16c4ebb16087915e3ccb5a35107 SHA1 f9ff84f966596273086abe71e1489b709575821e SHA256 c874f4a4eca1ce556817ca7a7ef90ed5f9bc7f47ae9fc70c9bfa790ad6d13b41
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5uI7cACgkQvFcC4BYPU0qejgCfYgCheZ6W48d3Q+FUA5YvHGf/
-nsAAoM0rXdNYeXDSCv8gu0HBualG5gYt
-=th9x
+iQEcBAEBAgAGBQJOgiaAAAoJEEdUh39IaPFN3JUIAIx5JDmQChNnH1gvh0h8lX/p
+k44RkUV71XS/2Ckk5gsFRu1r2tZbkTXWX43FwQWfcWJ6hiUfHOmz/z8lA/ERLr8X
+6bir6DAuuNSxfXJ4rhoN4deCOT9oJSy0fIE4MMVArpE3UbjPYXhzleXHypZQqHy8
+MgTuS6sa+A8vOvlSYoMxUxxBmHi8kE8FcJUR4qDNqNT8q4kxD9T5otFhZ+nlMDPp
+9mnmkI5mt6BUiw1se0sLp7Lcc1L3GhpZe5qmRzR1kCemMbVwKeMFtocZI+28oTIY
+bxpzyH2SqPVDLD3PHGPAOZ/ov8x1i3FCe4A7zeWkCFP6dnMGh6kiZWXmZJzmF0U=
+=nphE
 -----END PGP SIGNATURE-----

diff --git a/media-libs/libsndfile/libsndfile-1.0.25.ebuild b/media-libs/libsndfile/libsndfile-1.0.25.ebuild
index 7e899373e6fac7cafd160c5994297a355dd99df6..88428ad1ded961ea86d9f1ff082aedd6b5f27ebf 100644 (file)
--- a/media-libs/libsndfile/libsndfile-1.0.25.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.25.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25.ebuild,v 1.6 2011/09/12 14:43:23 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.25.ebuild,v 1.7 2011/09/27 19:39:02 ssuominen Exp $
 
 EAPI=4
-inherit eutils autotools
+inherit autotools eutils flag-o-matic multilib
 
 MY_P=${P/_pre/pre}
 
@@ -30,9 +30,13 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
+# Keep this function synced with x11-libs/pango ebuild!
+function multilib_enabled() {
+       has_multilib_profile || ( use x86 && [ "$(get_libdir)" = "lib32" ] )
+}
+
 src_prepare() {
-       sed -i -e "s/noinst_PROGRAMS/check_PROGRAMS/" "${S}/tests/Makefile.am" \
-               "${S}/examples/Makefile.am" || die "sed failed"
+       sed -i -e 's:noinst_PROGRAMS:check_PROGRAMS:' {examples,tests}/Makefile.am || die
 
        epatch "${FILESDIR}"/${PN}-1.0.17-regtests-need-sqlite.patch
 
@@ -41,7 +45,10 @@ src_prepare() {
 }
 
 src_configure() {
-       econf $(use_enable sqlite) \
+       multilib_enabled && append-lfs-flags #313259
+
+       econf \
+               $(use_enable sqlite) \
                $(use_enable static-libs static) \
                $(use_enable alsa) \
                $(use_enable !minimal external-libs) \