Don't build tests during compile, just during check (bug #226277). Also extend the constantise patch and load it on mirrors (it almost doubled its size).

Package-Manager: portage-2.1.5.5

4 files changed, 67 insertions, 10 deletions

diff --git a/media-libs/audiofile/ChangeLog b/media-libs/audiofile/ChangeLog
index 4968a0ff1a0e..cfb3ea25c0ab 100644
--- a/media-libs/audiofile/ChangeLog
+++ b/media-libs/audiofile/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/audiofile
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/ChangeLog,v 1.60 2007/09/22 04:54:01 tgall Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/ChangeLog,v 1.61 2008/06/16 12:12:55 flameeyes Exp $
+
+*audiofile-0.2.6-r4 (16 Jun 2008)
+
+  16 Jun 2008; Diego Pettenò <flameeyes@gentoo.org>
+  files/sfconvert-eradicator.patch, +audiofile-0.2.6-r4.ebuild:
+  Don't build tests during compile, just during check (bug #226277). Also
+  extend the constantise patch and load it on mirrors (it almost doubled its
+  size).
 
   21 Sep 2007; Tom Gall <tgall@gentoo.org> audiofile-0.2.6-r3.ebuild:
   stable on ppc64
diff --git a/media-libs/audiofile/Manifest b/media-libs/audiofile/Manifest
index 5afe9ada942b..bf6093ec7882 100644
--- a/media-libs/audiofile/Manifest
+++ b/media-libs/audiofile/Manifest
@@ -5,15 +5,17 @@ AUX audiofile-0.2.6-constantise.patch 11783 RMD160 7477baadd07b8e0b9ffad8f127406
 AUX audiofile-0.2.6-fmod.patch 404 RMD160 8115847b6bdeb0aea1d87292ae330b50f439e08a SHA1 9a29eead0e2ace7f13c90329952ce91abb32c5fe SHA256 91f638dd3c84cf3a41533c976fe7dfe94b164ee490593cf5f2f22e57f0a10a29
 AUX audiofile-0.2.6-m4.patch 273 RMD160 c9b99a3b3d7c5e9a62d3aec0cfa7ea6e7b3932f5 SHA1 f78b0d1573fc8e2c66e2d3e7a74dda8e504d806c SHA256 4e92a0e146dd4340c7e68e9f0bf301a4ee5c485d2d13cc3d2796b08c112ca74f
 AUX audiofile-largefile.patch 490 RMD160 76e578566a76bc9e1f1346df989774b361dc6165 SHA1 9520cfde511529e023d6516a59be53818d1cdd8e SHA256 308a925b0a3ce66a3df4832e447235cec50eeccc450b965a66c2130221309b6f
-AUX sfconvert-eradicator.patch 4345 RMD160 eda6048771abb9565516e5d8429644d71de7d0c8 SHA1 c464e0a62c236916977cd67fb46b3da4bbc78f28 SHA256 02193e1db0d0d9ee0c299dbb6f0225d92a2103c84f385017f0596c783452c402
+AUX sfconvert-eradicator.patch 4387 RMD160 1dc67c79dd5f96e5f790c4da2556118a7d0465c1 SHA1 c2689fdce91f9aea489d86d167c5116b67bea0d6 SHA256 ccb469f70391331145f7f0bbb1d37f2ed3486cd2bf6a9ea38c45d87b1efde3a3
+DIST audiofile-0.2.6-constantise.patch.bz2 4455 RMD160 4b52bf57f168930589d26d22f76a4e74bc44babd SHA1 82904fecdc6d24afd77abe56657e3b95e5d761f0 SHA256 82a7bfc145c014c27f24b88ecbae8e9c3814a5f38caa7f459298e4df22864185
 DIST audiofile-0.2.6.tar.gz 374688 RMD160 b61fbc856768a5838ca5c0fad602f35205e8d037 SHA1 94a6ab8e5122bc1971cf186e5a52d032811c9bc5 SHA256 4b6167b56e21556fb07c9ef06962fe32817064c62181ba47afd3322e0d0f22a9
 EBUILD audiofile-0.2.6-r3.ebuild 1030 RMD160 2d901fbecd2d2c491434dd4203b83151a34e736b SHA1 bce6be5704db2515c2d729f36cce41261f6038c8 SHA256 2e0aeec33475668eb4ec01c1f71939f5e6d0fddc652dcf434b315149876926dc
-MISC ChangeLog 7406 RMD160 5bc0980ee0cc31159e51ef07ad7abc7c47d87b71 SHA1 faec3d879aeabe0b14528f4599b735c8ba51fb9b SHA256 c029c6dae5cbeea13aa9c946b279b9208255a5a07c0e7848ba068d4081ca892f
+EBUILD audiofile-0.2.6-r4.ebuild 1191 RMD160 4a2894dab5200e7f56a05badbb441ca9e6aeb215 SHA1 be9cad9bea44eed08efdd63c56bca5464e2cb578 SHA256 13454641b111dd97a52dab86f5c061015da69f0f42a2c1af056b877bdfa8de28
+MISC ChangeLog 7723 RMD160 ec1c9d29a15da5e176ec77301b550831a885e367 SHA1 21c9e065a8b3a40701f2adac8855f3948baccc71 SHA256 ab97a1580d1aa713424be7d4b8b5e6fd2d73f5de3a4ddfcdf4cdf462e9a01070
 MISC metadata.xml 177 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 SHA1 73b04fb757f8a6473a2c43b0807a95381da37afc SHA256 dfb196addaf8aa212436c53c3d47cda0d10c2850c59fa2dcb7554dfa10190af2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkfVu2cACgkQkeYb6olFHJdowwCfdKNdGxFLmTZVgvwgmaFk+Sm7
-tfYAoMeL5B9f1E7ubanhqfa1pPrbEQQF
-=a4Zm
+iEYEARECAAYFAkhWWM0ACgkQAiZjviIA2Xg3jQCdEQhwpuJUskdUh681LgpWcgPQ
+fyIAoMFIqBEIwV30H7dwrx92kmb+3Hjz
+=IzO1
 -----END PGP SIGNATURE-----
diff --git a/media-libs/audiofile/audiofile-0.2.6-r4.ebuild b/media-libs/audiofile/audiofile-0.2.6-r4.ebuild
new file mode 100644
index 000000000000..9b4b1da3aea6
--- /dev/null
+++ b/media-libs/audiofile/audiofile-0.2.6-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/audiofile-0.2.6-r4.ebuild,v 1.1 2008/06/16 12:12:55 flameeyes Exp $
+
+inherit libtool autotools base
+
+DESCRIPTION="An elegant API for accessing audio files"
+HOMEPAGE="http://www.68k.org/~michael/audiofile/"
+SRC_URI="http://www.68k.org/~michael/audiofile/${P}.tar.gz
+	mirror://gentoo/${P}-constantise.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/sfconvert-eradicator.patch
+	"${FILESDIR}"/${P}-m4.patch
+	"${WORKDIR}"/${P}-constantise.patch
+	"${FILESDIR}"/${P}-fmod.patch
+
+	### Patch for bug #118600
+	"${FILESDIR}"/${PN}-largefile.patch
+)
+
+src_unpack() {
+	base_src_unpack
+	cd "${S}"
+
+	sed -i -e 's:noinst_PROGRAMS:check_PROGRAMS:' \
+		"${S}"/test/Makefile.am \
+		|| die "unable to disable tests building"
+
+	eautoreconf
+	elibtoolize
+}
+
+src_compile() {
+	econf --enable-largefile || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ACKNOWLEDGEMENTS AUTHORS ChangeLog README TODO NEWS NOTES
+}
diff --git a/media-libs/audiofile/files/sfconvert-eradicator.patch b/media-libs/audiofile/files/sfconvert-eradicator.patch
index d25b79cff81e..8959947b86e7 100644
--- a/media-libs/audiofile/files/sfconvert-eradicator.patch
+++ b/media-libs/audiofile/files/sfconvert-eradicator.patch
@@ -1,5 +1,5 @@
---- sfconvert.c.orig	2004-04-04 23:39:56.000000000 -0700
-+++ sfconvert.c	2004-04-05 00:00:25.000000000 -0700
+--- audiofile/sfcommands/sfconvert.c.orig	2004-04-04 23:39:56.000000000 -0700
++++ audiofile/sfcommands/sfconvert.c	2004-04-05 00:00:25.000000000 -0700
 @@ -66,12 +66,14 @@
  
  	AFfilehandle	infile, outfile;