From: Alexis Ballier <aballier@gentoo.org>
Date: Fri, 17 Nov 2006 23:49:00 +0000 (+0000)
Subject: Add patches from Josh Coalson to be able to build with flac 1.1.3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f106c699077e0383031543c387feb549eeea49e8;p=gentoo.git

Add patches from Josh Coalson to be able to build with flac 1.1.3
Package-Manager: portage-2.1.2_rc1-r7
---

diff --git a/media-sound/vorbis-tools/ChangeLog b/media-sound/vorbis-tools/ChangeLog
index f301f0860330..61c869e7d6f9 100644
--- a/media-sound/vorbis-tools/ChangeLog
+++ b/media-sound/vorbis-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/vorbis-tools
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.44 2006/11/15 21:57:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.45 2006/11/17 23:49:00 aballier Exp $
+
+  17 Nov 2006; Alexis Ballier <aballier@gentoo.org>
+  vorbis-tools-1.1.1-r3.ebuild:
+  Add patches from Josh Coalson to be able to build with flac 1.1.3
 
 *vorbis-tools-1.1.1-r3 (15 Nov 2006)
 
diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index 836371c48548..1b36c7c6e1b9 100644
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -10,7 +10,8 @@ MD5 107a8e0513369351db754cfb06e196aa files/vorbis-tools-1.1.1-utf8.patch 1307
 RMD160 dbdd6a8394fc3cbdc4ded5ab067fdbcde15fddf1 files/vorbis-tools-1.1.1-utf8.patch 1307
 SHA256 e35ffa1b9eeadd218580dc947941b469cf886976a588425b2d53e1b98b4332f1 files/vorbis-tools-1.1.1-utf8.patch 1307
 DIST vorbis-tools-1.0.1.tar.gz 717697 RMD160 78a53430311c45463369ae6f836ca68ce900d741 SHA1 5555a55acd643fcca7020b7de4900aeb706725e5 SHA256 4f1f6ba6410e5f2aeb473d0a09caaa528cc926866735ab66e05cdff9c5093a37
-DIST vorbis-tools-1.0.tar.gz 425404
+DIST vorbis-tools-1.0.tar.gz 425404 RMD160 2f3874699be904fdf64c6edf09e21ccb8f0eee28 SHA1 5c2508786cf6a2a270c697d3debe66ee83df376d SHA256 38a8c76ffc63f491fbbae839f659845e596cde5c3c0c46a7000640b4fc12338f
+DIST vorbis-tools-1.1.1+flac-1.1.3.tar.bz2 4119 RMD160 8da2d4bd0f65681dbbb5e71c94ca7419633dde60 SHA1 02faba6b94fe7158430b10c4a381a480688e046f SHA256 2a5f74087c10f33b0891c41b71c6c51bda21e017287dd2190019cc4546645646
 DIST vorbis-tools-1.1.1.tar.gz 948837 RMD160 ed38929b8a81f833f726e489e55e9f62d5ed69ec SHA1 a1394b39905b389d72f12c2a9f0c86a33d07a487 SHA256 617b4aa69e600c215b34fa3fd5764bc1d9d205d9d7d9fe7812bde7ec956fcaad
 EBUILD vorbis-tools-1.0-r2.ebuild 871 RMD160 b1ebcb35881ef32adb4c2fa1c1450ce128e2c632 SHA1 e09c453ec1010787f89563c491c698076a4ceed4 SHA256 55180ebdb1534504725ccb3f7d45ce8a8c43c2b0f16f95eb7e979b9d93afcdd2
 MD5 a73db00f1c3bc8ab60df4554fd605bfa vorbis-tools-1.0-r2.ebuild 871
@@ -28,25 +29,25 @@ EBUILD vorbis-tools-1.1.1-r2.ebuild 1633 RMD160 08c14538d69c3eda8d64d1fbc4f0957a
 MD5 9b5386c7c6a366da31348657501b6cef vorbis-tools-1.1.1-r2.ebuild 1633
 RMD160 08c14538d69c3eda8d64d1fbc4f0957ada728996 vorbis-tools-1.1.1-r2.ebuild 1633
 SHA256 dd4485b2a773583b86cbd8cf9542756493443dfeef7a32c889452ffaaee96619 vorbis-tools-1.1.1-r2.ebuild 1633
-EBUILD vorbis-tools-1.1.1-r3.ebuild 1694 RMD160 20aa0e7b8e630efa52fa0c37b9ca971401f91634 SHA1 96ecd73d279a6a1872b9bfe7f227f0ef47b51dc1 SHA256 764dfe495d4921c19964f9016805463d89cc36225a5ca0617e521e95b2700ae6
-MD5 abeb370a5f28d404cc96634f6f682f92 vorbis-tools-1.1.1-r3.ebuild 1694
-RMD160 20aa0e7b8e630efa52fa0c37b9ca971401f91634 vorbis-tools-1.1.1-r3.ebuild 1694
-SHA256 764dfe495d4921c19964f9016805463d89cc36225a5ca0617e521e95b2700ae6 vorbis-tools-1.1.1-r3.ebuild 1694
+EBUILD vorbis-tools-1.1.1-r3.ebuild 1936 RMD160 86e8b580c6b21c0e99294199e2626572bec30421 SHA1 942845f710eed6558032d213cedb67789b5b9a61 SHA256 a93ca093a9095d832f350df810bc3c6ba41743fffadae11df12b82e236342f2b
+MD5 b44605e9ba0ee56b8b499888a9695136 vorbis-tools-1.1.1-r3.ebuild 1936
+RMD160 86e8b580c6b21c0e99294199e2626572bec30421 vorbis-tools-1.1.1-r3.ebuild 1936
+SHA256 a93ca093a9095d832f350df810bc3c6ba41743fffadae11df12b82e236342f2b vorbis-tools-1.1.1-r3.ebuild 1936
 EBUILD vorbis-tools-1.1.1.ebuild 1205 RMD160 cc858050d010cf171bf1a93fbcf36af83216332b SHA1 98c5b89fb7a84def9ed13e8c2e2dd1be07f556d4 SHA256 ab02d6a95cd3e2c769b4023620f35394f35b39c2a1ffc11a3775463070afe848
 MD5 8d13c8570dc6ad0586e78a23b84353a3 vorbis-tools-1.1.1.ebuild 1205
 RMD160 cc858050d010cf171bf1a93fbcf36af83216332b vorbis-tools-1.1.1.ebuild 1205
 SHA256 ab02d6a95cd3e2c769b4023620f35394f35b39c2a1ffc11a3775463070afe848 vorbis-tools-1.1.1.ebuild 1205
-MISC ChangeLog 6505 RMD160 3cee489f284884515999f70b6a8be83eebeaa3ae SHA1 1c314d3e50ff028ecdadf2d8c3298f32c5192b7b SHA256 d03a0c6a79c547fac2b79f4e5417a4a0c476253d79822825463efe0e5c32d94a
-MD5 6cd1ea351d88bd32df2ea210f5bc9007 ChangeLog 6505
-RMD160 3cee489f284884515999f70b6a8be83eebeaa3ae ChangeLog 6505
-SHA256 d03a0c6a79c547fac2b79f4e5417a4a0c476253d79822825463efe0e5c32d94a ChangeLog 6505
+MISC ChangeLog 6657 RMD160 f37c69cffc6d875131ea1b1ece4594b947bf8d79 SHA1 76cef220eaba8b35eeffbcbb2525ba43710f18b5 SHA256 57c60e877bd623fc7463cfcab36bd0b80e0672f825c847b8707ad80be2ca03c8
+MD5 0aa0b2522a0dd83c2afaa4a93dcc6f12 ChangeLog 6657
+RMD160 f37c69cffc6d875131ea1b1ece4594b947bf8d79 ChangeLog 6657
+SHA256 57c60e877bd623fc7463cfcab36bd0b80e0672f825c847b8707ad80be2ca03c8 ChangeLog 6657
 MISC metadata.xml 252 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a SHA1 6e5cc1551616801a2f257d688e6fc286044c3499 SHA256 5ab00710d822d203a1a38e1b6a9754137de4fe2cf5c4e79470419ed3f3927450
 MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a metadata.xml 252
 SHA256 5ab00710d822d203a1a38e1b6a9754137de4fe2cf5c4e79470419ed3f3927450 metadata.xml 252
-MD5 59ac94a6db4621c0ebd90d8b8fe8d9c0 files/digest-vorbis-tools-1.0-r2 68
-RMD160 b8ad82163df70280f4fb8127379d86363eb698ad files/digest-vorbis-tools-1.0-r2 68
-SHA256 2738406b3dd946a4c026a900f5945d6eeebb71cb17e2b573ae4111c654f6c103 files/digest-vorbis-tools-1.0-r2 68
+MD5 e21b8c5ba7df7e81ee543583b9316d17 files/digest-vorbis-tools-1.0-r2 250
+RMD160 a934425fd34342abe9ea592ff01d5ff6d2a88729 files/digest-vorbis-tools-1.0-r2 250
+SHA256 4cff8ee30c992dada3ae00f8cba35f7e80941b3d1c19e3cd06e926b846c52dc6 files/digest-vorbis-tools-1.0-r2 250
 MD5 db040e87e17840839e1afece5c1670c0 files/digest-vorbis-tools-1.0.1 256
 RMD160 eb5ea5aca74d1d2ebc08eab3f78d33064718c473 files/digest-vorbis-tools-1.0.1 256
 SHA256 9b1da5864e300511bedc15e988280a70e9f4848538bbfe5cfbe8f2cba6227227 files/digest-vorbis-tools-1.0.1 256
@@ -59,13 +60,13 @@ SHA256 3852a9d9af24fffe51fcb912cd4499ad17d3752fab8fe396a11f2ca65ca03f26 files/di
 MD5 73f1e0d720f815fec15a227f37d4a4de files/digest-vorbis-tools-1.1.1-r2 256
 RMD160 0776cd58cf1eefca88a1f5cb590d91699f546786 files/digest-vorbis-tools-1.1.1-r2 256
 SHA256 3852a9d9af24fffe51fcb912cd4499ad17d3752fab8fe396a11f2ca65ca03f26 files/digest-vorbis-tools-1.1.1-r2 256
-MD5 73f1e0d720f815fec15a227f37d4a4de files/digest-vorbis-tools-1.1.1-r3 256
-RMD160 0776cd58cf1eefca88a1f5cb590d91699f546786 files/digest-vorbis-tools-1.1.1-r3 256
-SHA256 3852a9d9af24fffe51fcb912cd4499ad17d3752fab8fe396a11f2ca65ca03f26 files/digest-vorbis-tools-1.1.1-r3 256
+MD5 a3e17187a6bde4b3b3fb7905eed40d7b files/digest-vorbis-tools-1.1.1-r3 542
+RMD160 8f9238fe9bc8920e78ec9c36e130b80ae7c1f77e files/digest-vorbis-tools-1.1.1-r3 542
+SHA256 75760e55dc5748bdd1938fd28296bd493f7090ea357b74b8a10a1be07655a0b9 files/digest-vorbis-tools-1.1.1-r3 542
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFW41rAiZjviIA2XgRAj7HAKCwAgGx/UFJILSV76u6yMaPJlm4AACgx+9s
-/ppgp6oiVkP8yhOF6T5G24Q=
-=5nV0
+iD8DBQFFXkoYvFcC4BYPU0oRAkKcAKCy/TwOxYA38AsS0bsyOLTP53b3gQCgtGQ5
+V1yzxJB/PQ3x23JRrQT37Zg=
+=Odn1
 -----END PGP SIGNATURE-----
diff --git a/media-sound/vorbis-tools/files/digest-vorbis-tools-1.0-r2 b/media-sound/vorbis-tools/files/digest-vorbis-tools-1.0-r2
index e389e42a2bed..b23be476cab8 100644
--- a/media-sound/vorbis-tools/files/digest-vorbis-tools-1.0-r2
+++ b/media-sound/vorbis-tools/files/digest-vorbis-tools-1.0-r2
@@ -1 +1,3 @@
 MD5 c0a9fee54835e9c5b32d1f42c02964c9 vorbis-tools-1.0.tar.gz 425404
+RMD160 2f3874699be904fdf64c6edf09e21ccb8f0eee28 vorbis-tools-1.0.tar.gz 425404
+SHA256 38a8c76ffc63f491fbbae839f659845e596cde5c3c0c46a7000640b4fc12338f vorbis-tools-1.0.tar.gz 425404
diff --git a/media-sound/vorbis-tools/files/digest-vorbis-tools-1.1.1-r3 b/media-sound/vorbis-tools/files/digest-vorbis-tools-1.1.1-r3
index 6e41b3b90627..549f8539ab4c 100644
--- a/media-sound/vorbis-tools/files/digest-vorbis-tools-1.1.1-r3
+++ b/media-sound/vorbis-tools/files/digest-vorbis-tools-1.1.1-r3
@@ -1,3 +1,6 @@
+MD5 fc64bbc3738e51d8f4bfa1c66c5ca01f vorbis-tools-1.1.1+flac-1.1.3.tar.bz2 4119
+RMD160 8da2d4bd0f65681dbbb5e71c94ca7419633dde60 vorbis-tools-1.1.1+flac-1.1.3.tar.bz2 4119
+SHA256 2a5f74087c10f33b0891c41b71c6c51bda21e017287dd2190019cc4546645646 vorbis-tools-1.1.1+flac-1.1.3.tar.bz2 4119
 MD5 47845fd76f5f2354a3619c4097575487 vorbis-tools-1.1.1.tar.gz 948837
 RMD160 ed38929b8a81f833f726e489e55e9f62d5ed69ec vorbis-tools-1.1.1.tar.gz 948837
 SHA256 617b4aa69e600c215b34fa3fd5764bc1d9d205d9d7d9fe7812bde7ec956fcaad vorbis-tools-1.1.1.tar.gz 948837
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild
index 50ef22569210..32771495e1b5 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild
@@ -1,14 +1,18 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild,v 1.1 2006/11/15 21:57:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild,v 1.2 2006/11/17 23:49:00 aballier Exp $
 
 IUSE="nls flac speex"
 
-inherit eutils toolchain-funcs flag-o-matic
+WANT_AUTOCONF=2.5
+WANT_AUTOMAKE=1.9
+
+inherit eutils toolchain-funcs flag-o-matic autotools
 
 DESCRIPTION="tools for using the Ogg Vorbis sound file format"
 HOMEPAGE="http://www.vorbis.com/"
-SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
+SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz
+	mirror://gentoo/${P}+flac-1.1.3.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,7 +22,7 @@ RDEPEND=">=media-libs/libvorbis-1.1.0
 	>=media-libs/libao-0.8.2
 	>=net-misc/curl-7.9
 	speex? ( media-libs/speex )
-	flac? ( ~media-libs/flac-1.1.2 )"
+	flac? ( media-libs/flac )"
 
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
@@ -35,6 +39,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-utf8.patch"
+	epatch "${WORKDIR}/${P}+flac-1.1.3-1.patch"
+	epatch "${WORKDIR}/${P}+flac-1.1.3-2.patch"
+	epatch "${WORKDIR}/${P}+flac-1.1.3-3.patch"
+	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {