Add patch from Josh Coalson to be able to build with flac 1.1.3

Package-Manager: portage-2.1.2_rc1-r7

5 files changed, 39 insertions, 24 deletions

diff --git a/media-libs/libsndfile/ChangeLog b/media-libs/libsndfile/ChangeLog
index 1ace2d4038fb..6f2ef1245c04 100644
--- a/media-libs/libsndfile/ChangeLog
+++ b/media-libs/libsndfile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libsndfile
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.58 2006/10/19 17:29:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/ChangeLog,v 1.59 2006/11/17 23:05:35 aballier Exp $
+
+  17 Nov 2006; Alexis Ballier <aballier@gentoo.org>
+  libsndfile-1.0.17.ebuild:
+  Add patch from Josh Coalson to be able to build with flac 1.1.3
 
   19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
   libsndfile-1.0.17.ebuild:
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 9b611e3f2508..f16becf2912f 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,34 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST libsndfile-1.0.11.tar.gz 816107
+DIST libsndfile-1.0.11.tar.gz 816107 RMD160 3829d1fa9f5caf16f4b589d03877d229cb8f5603 SHA1 16372a7814530178a2642bd22f203641e0392ebb SHA256 fd107e7923dd09f48a2ede31ba11e9965478d9c3e094d19cb81124a971ff9ecf
+DIST libsndfile-1.0.17+flac-1.1.3.patch.bz2 3127 RMD160 fc6e6f03069c1ad8ee43f600f6ac2aa6e97bb1f5 SHA1 10e0d19dfc8cf2a6bf499e0fa0d1ab17dca4c519 SHA256 2c8b6df283309061e8e9aaedd0bc20c7ebf75fa8ad4ed8b01f7bf04162206df1
 DIST libsndfile-1.0.17.tar.gz 819456 RMD160 ae93822a4c587dcdd7c70d043d2a38ed2fe3a188 SHA1 2f66798d596a15491fbd1191ded8125ed71ef411 SHA256 1792e4e60386b450ef8ec07c756e8f3ecfe96ebda7d0b09148da5f436d065ef2
 EBUILD libsndfile-1.0.11.ebuild 1065 RMD160 1772e653e45671ec1748255fd00c9c7b701196b3 SHA1 f2db4243e61fa362ef391a88b8f698da2eb7c96f SHA256 92b08714819b8783ce1b92600fc3983a186ac88b04c9c27532c077c26b40707e
 MD5 1ba2b26087ac68ababe4e25d94a5850c libsndfile-1.0.11.ebuild 1065
 RMD160 1772e653e45671ec1748255fd00c9c7b701196b3 libsndfile-1.0.11.ebuild 1065
 SHA256 92b08714819b8783ce1b92600fc3983a186ac88b04c9c27532c077c26b40707e libsndfile-1.0.11.ebuild 1065
-EBUILD libsndfile-1.0.17.ebuild 1189 RMD160 c6a3ff26935417917b090f272564f96326462da2 SHA1 47f1af797a9d1549afff60f14504b2ff64c8bdae SHA256 2c6f4d8eced58edb10a57783dbeed94c789e30525233e6d19bb685e5b509ecdf
-MD5 fe3fe4a17cd01b8856bca87f903989a5 libsndfile-1.0.17.ebuild 1189
-RMD160 c6a3ff26935417917b090f272564f96326462da2 libsndfile-1.0.17.ebuild 1189
-SHA256 2c6f4d8eced58edb10a57783dbeed94c789e30525233e6d19bb685e5b509ecdf libsndfile-1.0.17.ebuild 1189
-MISC ChangeLog 8655 RMD160 1c626b76dfa770408f2ff654769624d6167977b4 SHA1 1763d2a5c980875d68187b4fa0962f4d99e9fad8 SHA256 ef14a16d904c16a42d95396017c5674e29fbcf5db898cd7900d3083b2362452f
-MD5 3753a83db0b92fb0ab5020348cf0018b ChangeLog 8655
-RMD160 1c626b76dfa770408f2ff654769624d6167977b4 ChangeLog 8655
-SHA256 ef14a16d904c16a42d95396017c5674e29fbcf5db898cd7900d3083b2362452f ChangeLog 8655
+EBUILD libsndfile-1.0.17.ebuild 1314 RMD160 47c494176073dc1250d9566984920842eea88a5f SHA1 1fa213af1182eccd4b45032ec0503ab02db8a067 SHA256 db2f6d1fa44f8682a1fe8ae89251a5f46dc1ac1c5f10ded4684452282e8dd957
+MD5 e2591d08a659682f3dbbaf97ace7c4bf libsndfile-1.0.17.ebuild 1314
+RMD160 47c494176073dc1250d9566984920842eea88a5f libsndfile-1.0.17.ebuild 1314
+SHA256 db2f6d1fa44f8682a1fe8ae89251a5f46dc1ac1c5f10ded4684452282e8dd957 libsndfile-1.0.17.ebuild 1314
+MISC ChangeLog 8801 RMD160 2e1a2f59a7d30ebca10864cceb67198e18a03a7a SHA1 e20f7852e717a5671e9e88d56aa5f2199dff536c SHA256 e9a4df309a89ffe95a8ccdf68136aed55875e412e7148bc2d73c9162df4aacba
+MD5 810ca28a6cd4ca87dea08658c7e50f22 ChangeLog 8801
+RMD160 2e1a2f59a7d30ebca10864cceb67198e18a03a7a ChangeLog 8801
+SHA256 e9a4df309a89ffe95a8ccdf68136aed55875e412e7148bc2d73c9162df4aacba ChangeLog 8801
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
-MD5 03568645ed600c683b4289c8a28a3beb files/digest-libsndfile-1.0.11 69
-RMD160 7c063919433e5c27c4c430e0902744cf0cd92a42 files/digest-libsndfile-1.0.11 69
-SHA256 5b00f4d405b448157b19f0f207783938af917852a324384348cfa3367e6b995a files/digest-libsndfile-1.0.11 69
-MD5 b41c76122a30c57cc48a4fd801a48727 files/digest-libsndfile-1.0.17 253
-RMD160 7ddd101eadfc7ddaefe602ad896494c8b7517af8 files/digest-libsndfile-1.0.17 253
-SHA256 b203ebc4e6f00965f54be7a7f54b361b3b887682d0e6008986fe0da815f93852 files/digest-libsndfile-1.0.17 253
+MD5 d17e7890a0f116a03c016439950b6334 files/digest-libsndfile-1.0.11 253
+RMD160 0db9289d3094321d138361070b436d64b1418c5e files/digest-libsndfile-1.0.11 253
+SHA256 b1cfb822666ed86954799d615197e17fb6c54159d3404972225c3c680a52fbd6 files/digest-libsndfile-1.0.11 253
+MD5 67beb9269bb978b47656f0631b663c41 files/digest-libsndfile-1.0.17 542
+RMD160 93bd725af5a0483ba690f30147515b13cb0e7151 files/digest-libsndfile-1.0.17 542
+SHA256 597f7792ec7f2a23a7dff42dcef2df934fde455c3c602db799d22ac4fc220fbd files/digest-libsndfile-1.0.17 542
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFN7YPAiZjviIA2XgRAitNAKCMNxL3VrOA3QpNQdjl3hOWRf+6dQCfczUg
-KBS2Oh8a+hAZ8HubEloM+nw=
-=UxSw
+iD8DBQFFXj/6vFcC4BYPU0oRApNiAJ9V3HF7SaZY73KK+juoIGhhskxajwCeKFjh
+Cz0iZ3Aw+kGZW0czkF97j6s=
+=7C4B
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsndfile/files/digest-libsndfile-1.0.11 b/media-libs/libsndfile/files/digest-libsndfile-1.0.11
index 124cc32a41e8..71f849a62156 100644
--- a/media-libs/libsndfile/files/digest-libsndfile-1.0.11
+++ b/media-libs/libsndfile/files/digest-libsndfile-1.0.11
@@ -1 +1,3 @@
 MD5 9ec0b3610041423a57387f284849f2fc libsndfile-1.0.11.tar.gz 816107
+RMD160 3829d1fa9f5caf16f4b589d03877d229cb8f5603 libsndfile-1.0.11.tar.gz 816107
+SHA256 fd107e7923dd09f48a2ede31ba11e9965478d9c3e094d19cb81124a971ff9ecf libsndfile-1.0.11.tar.gz 816107
diff --git a/media-libs/libsndfile/files/digest-libsndfile-1.0.17 b/media-libs/libsndfile/files/digest-libsndfile-1.0.17
index 5960c4e472a2..349f0760973e 100644
--- a/media-libs/libsndfile/files/digest-libsndfile-1.0.17
+++ b/media-libs/libsndfile/files/digest-libsndfile-1.0.17
@@ -1,3 +1,6 @@
+MD5 21b433470305ccf5ad9a2d4dbadca30a libsndfile-1.0.17+flac-1.1.3.patch.bz2 3127
+RMD160 fc6e6f03069c1ad8ee43f600f6ac2aa6e97bb1f5 libsndfile-1.0.17+flac-1.1.3.patch.bz2 3127
+SHA256 2c8b6df283309061e8e9aaedd0bc20c7ebf75fa8ad4ed8b01f7bf04162206df1 libsndfile-1.0.17+flac-1.1.3.patch.bz2 3127
 MD5 2d126c35448503f6dbe33934d9581f6b libsndfile-1.0.17.tar.gz 819456
 RMD160 ae93822a4c587dcdd7c70d043d2a38ed2fe3a188 libsndfile-1.0.17.tar.gz 819456
 SHA256 1792e4e60386b450ef8ec07c756e8f3ecfe96ebda7d0b09148da5f436d065ef2 libsndfile-1.0.17.tar.gz 819456
diff --git a/media-libs/libsndfile/libsndfile-1.0.17.ebuild b/media-libs/libsndfile/libsndfile-1.0.17.ebuild
index f279fa7d8ec8..fda02a0cf73e 100644
--- a/media-libs/libsndfile/libsndfile-1.0.17.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.0.17.ebuild
@@ -1,12 +1,16 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.17.ebuild,v 1.3 2006/10/19 17:29:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsndfile/libsndfile-1.0.17.ebuild,v 1.4 2006/11/17 23:05:35 aballier Exp $
 
-inherit eutils libtool
+WANT_AUTOCONF=2.5
+WANT_AUTOMAKE=1.9
+
+inherit eutils libtool autotools
 
 DESCRIPTION="A C library for reading and writing files containing sampled sound"
 HOMEPAGE="http://www.mega-nerd.com/libsndfile/"
-SRC_URI="http://www.mega-nerd.com/libsndfile/${P}.tar.gz"
+SRC_URI="http://www.mega-nerd.com/libsndfile/${P}.tar.gz
+	mirror://gentoo/${P}+flac-1.1.3.patch.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -14,7 +18,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-
 IUSE="sqlite flac alsa"
 RESTRICT="test"
 
-RDEPEND="flac? ( ~media-libs/flac-1.1.2 )
+RDEPEND="flac? ( media-libs/flac )
 	alsa? ( media-libs/alsa-lib )
 	sqlite? ( >=dev-db/sqlite-3.2 )"
 
@@ -22,7 +26,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	elibtoolize
+	epatch "${WORKDIR}/${P}+flac-1.1.3.patch"
+	eautoreconf
 	epunt_cxx
 }