Patch from Daniel Black <dragonheart@gentoo.org> to build against curl-7.16.0

Package-Manager: portage-2.1.2_rc3

diff --git a/media-sound/vorbis-tools/ChangeLog b/media-sound/vorbis-tools/ChangeLog
index 61c869e7d6f9239a9b7ef6ddbd3aadbe9ac49258..d4417685beb87cc80c1abca4e416d0c8c2edfe9c 100644 (file)
--- 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.45 2006/11/17 23:49:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.46 2006/12/09 09:40:31 aballier Exp $
+
+  09 Dec 2006; Alexis Ballier <aballier@gentoo.org>
+  +files/vorbis-tools-1.1.1-curl-7.16.0.patch, vorbis-tools-1.1.1-r3.ebuild:
+  Patch from Daniel Black <dragonheart@gentoo.org> to build against curl-7.16.0
 
   17 Nov 2006; Alexis Ballier <aballier@gentoo.org>
   vorbis-tools-1.1.1-r3.ebuild:

diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index 1b36c7c6e1b919c8339d235e9de94351b90810ce..684d455c1d6fd986a7252de33ccd87f30b106fde 100644 (file)
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -5,6 +5,10 @@ AUX vorbis-tools-1.0.1-largefile.patch 458 RMD160 b21d8d7b75077b0596dfa670fa4e73
 MD5 bc135048b370b69a479ec79194774283 files/vorbis-tools-1.0.1-largefile.patch 458
 RMD160 b21d8d7b75077b0596dfa670fa4e73c6a59f8f0d files/vorbis-tools-1.0.1-largefile.patch 458
 SHA256 186201fa3079a653f4cc4b04d6c562820c40ba332b272fff42f2d54eb7bc7d1a files/vorbis-tools-1.0.1-largefile.patch 458
+AUX vorbis-tools-1.1.1-curl-7.16.0.patch 553 RMD160 4e50e2d6314fdeea6741301ae06df0dc6d39fc8a SHA1 94d9001330216f41f254054e904b3b5b0a24ad6f SHA256 542ed708e90c805da6a29ecf1ba2e80d0eb92b7697cec6c8e651a25df521700d
+MD5 ffc1a4ae45a778dd2251b8186d5dbdfb files/vorbis-tools-1.1.1-curl-7.16.0.patch 553
+RMD160 4e50e2d6314fdeea6741301ae06df0dc6d39fc8a files/vorbis-tools-1.1.1-curl-7.16.0.patch 553
+SHA256 542ed708e90c805da6a29ecf1ba2e80d0eb92b7697cec6c8e651a25df521700d files/vorbis-tools-1.1.1-curl-7.16.0.patch 553
 AUX vorbis-tools-1.1.1-utf8.patch 1307 RMD160 dbdd6a8394fc3cbdc4ded5ab067fdbcde15fddf1 SHA1 0689ad4e7b65fdc40117afaaa8fc153d20e7eab1 SHA256 e35ffa1b9eeadd218580dc947941b469cf886976a588425b2d53e1b98b4332f1
 MD5 107a8e0513369351db754cfb06e196aa files/vorbis-tools-1.1.1-utf8.patch 1307
 RMD160 dbdd6a8394fc3cbdc4ded5ab067fdbcde15fddf1 files/vorbis-tools-1.1.1-utf8.patch 1307
@@ -29,18 +33,18 @@ 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 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-r3.ebuild 1981 RMD160 12dc820c14e6dd79c13df45171ab87e2f2931047 SHA1 8a53f6fe499477ae7e6547a737c4c791b9b91f13 SHA256 509004e52fe1938bb4f1e1072eaadb9defc58438e4ebf3aa09965703113b434f
+MD5 196af5c79eed632704deeed486bfcefb vorbis-tools-1.1.1-r3.ebuild 1981
+RMD160 12dc820c14e6dd79c13df45171ab87e2f2931047 vorbis-tools-1.1.1-r3.ebuild 1981
+SHA256 509004e52fe1938bb4f1e1072eaadb9defc58438e4ebf3aa09965703113b434f vorbis-tools-1.1.1-r3.ebuild 1981
 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 6657 RMD160 f37c69cffc6d875131ea1b1ece4594b947bf8d79 SHA1 76cef220eaba8b35eeffbcbb2525ba43710f18b5 SHA256 57c60e877bd623fc7463cfcab36bd0b80e0672f825c847b8707ad80be2ca03c8
-MD5 0aa0b2522a0dd83c2afaa4a93dcc6f12 ChangeLog 6657
-RMD160 f37c69cffc6d875131ea1b1ece4594b947bf8d79 ChangeLog 6657
-SHA256 57c60e877bd623fc7463cfcab36bd0b80e0672f825c847b8707ad80be2ca03c8 ChangeLog 6657
+MISC ChangeLog 6867 RMD160 5852ec6896e88533511859a600f869950c7af371 SHA1 25ad54454384f4dee8c55295aae16b0124628692 SHA256 935c87bca1c3ddd2487b48900580731c3220ac73099a6e1d453af4e2996d0c15
+MD5 fa7511b44151a856b5c470e0242914ed ChangeLog 6867
+RMD160 5852ec6896e88533511859a600f869950c7af371 ChangeLog 6867
+SHA256 935c87bca1c3ddd2487b48900580731c3220ac73099a6e1d453af4e2996d0c15 ChangeLog 6867
 MISC metadata.xml 252 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a SHA1 6e5cc1551616801a2f257d688e6fc286044c3499 SHA256 5ab00710d822d203a1a38e1b6a9754137de4fe2cf5c4e79470419ed3f3927450
 MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252
 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a metadata.xml 252
@@ -64,9 +68,9 @@ 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)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFXkoYvFcC4BYPU0oRAkKcAKCy/TwOxYA38AsS0bsyOLTP53b3gQCgtGQ5
-V1yzxJB/PQ3x23JRrQT37Zg=
-=Odn1
+iD8DBQFFeoSGvFcC4BYPU0oRAhIaAJ9vAn5XDXlTv9nnns7sq/eEKfIK1wCfUlw8
+ESk9lAhVahCvSMyywhUR0Ek=
+=XduV
 -----END PGP SIGNATURE-----

diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.1.1-curl-7.16.0.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.1.1-curl-7.16.0.patch
new file mode 100644 (file)
index 0000000..2aabebe
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.1.1-curl-7.16.0.patch
@@ -0,0 +1,10 @@
+--- vorbis-tools-1.1.1/ogg123/http_transport.c.orig    2006-12-09 16:34:44.000000000 +1100
++++ vorbis-tools-1.1.1/ogg123/http_transport.c 2006-12-09 16:39:46.000000000 +1100
+@@ -116,7 +116,6 @@
+   if (inputOpts.ProxyTunnel)
+     curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel);
+   */
+-  curl_easy_setopt(handle, CURLOPT_MUTE, 1);
+   curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error);
+   curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback);
+   curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private);

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 32771495e1b52576c3d54fa4530d3451cde8d368..848c27f8d194baa18877b8aad30fa272275ce6bf 100644 (file)
--- 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,6 +1,6 @@
 # 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.2 2006/11/17 23:49:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.1.1-r3.ebuild,v 1.3 2006/12/09 09:40:31 aballier Exp $
 
 IUSE="nls flac speex"
 
@@ -42,6 +42,7 @@ src_unpack() {
        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"
+       epatch "${FILESDIR}/${P}-curl-7.16.0.patch"
        AT_M4DIR="m4" eautoreconf
 }